diff --git a/api/src/main/java/edu/cornell/mannlib/semservices/bo/Concept.java b/api/src/main/java/edu/cornell/mannlib/semservices/bo/Concept.java
index 1b5e9c915..795496f11 100644
--- a/api/src/main/java/edu/cornell/mannlib/semservices/bo/Concept.java
+++ b/api/src/main/java/edu/cornell/mannlib/semservices/bo/Concept.java
@@ -20,7 +20,7 @@ public class Concept {
    private List<String> exactMatchURIList;
    private List<String> closeMatchURIList;
    private List<String> altLabelList;
-   
+
    /**
     * default constructor
     */
@@ -30,7 +30,7 @@ public class Concept {
       this.exactMatchURIList = new ArrayList<String>();
       this.closeMatchURIList = new ArrayList<String>();
    }
-   
+
    /**
     * @return the conceptId
     */
diff --git a/api/src/main/java/edu/cornell/mannlib/semservices/util/SKOSUtils.java b/api/src/main/java/edu/cornell/mannlib/semservices/util/SKOSUtils.java
index 5b8955a87..028b59fed 100644
--- a/api/src/main/java/edu/cornell/mannlib/semservices/util/SKOSUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/semservices/util/SKOSUtils.java
@@ -263,4 +263,4 @@ public class SKOSUtils {
 		return URIs;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/beans/ButtonForm.java b/api/src/main/java/edu/cornell/mannlib/vedit/beans/ButtonForm.java
index 8728d3fa4..d9a7fc161 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/beans/ButtonForm.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/beans/ButtonForm.java
@@ -8,35 +8,35 @@ public class ButtonForm {
     private String label  = "no label specified";
     private String cssClass = null;
     private HashMap<String,String> params = null;
-    
+
     public ButtonForm() {
         action = ""; // submits to same page
         cssClass = null;
         label = "no label specified";
         params = null;
     }
-    
+
     public ButtonForm(String actionStr, String classStr, String labelStr, HashMap<String,String> paramMap) {
         action = actionStr;
         cssClass = classStr; // can be null
         label = labelStr;
         params = paramMap;
     }
-    
+
     public String getAction(){
         return action;
     }
     public void setAction(String s){
         action = s;
     }
-    
+
     public String getLabel(){
         return label;
     }
     public void setLabel(String s){
         label = s;
     }
-    
+
     public String getCssClass(){
         if (cssClass==null){
             return "";
@@ -46,7 +46,7 @@ public class ButtonForm {
     public void setCssClass(String s){
         cssClass=s;
     }
-    
+
     public HashMap<String,String> getParams(){
         return params;
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/beans/EditProcessObject.java b/api/src/main/java/edu/cornell/mannlib/vedit/beans/EditProcessObject.java
index 20ce0b49d..0e3190e8c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/beans/EditProcessObject.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/beans/EditProcessObject.java
@@ -63,7 +63,7 @@ public class EditProcessObject implements Serializable {
     private Map<String, String[]> requestParameterMap = null;
 
     private Map<String, String> badValueMap = new HashMap<String, String>();
-    
+
     private Map<String,Object> attributeMap = new HashMap<String, Object>();
 
     private Method getMethod = null;
@@ -311,13 +311,13 @@ public class EditProcessObject implements Serializable {
     public Map<String, Object> getAttributeMap() {
     	return this.attributeMap;
     }
-    
+
     public Object getAttribute(String key) {
     	return this.attributeMap.get(key);
     }
-    
+
     public void setAttribute(String key, Object value) {
     	this.attributeMap.put(key, value);
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/beans/Option.java b/api/src/main/java/edu/cornell/mannlib/vedit/beans/Option.java
index 406d94513..d4547c35b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/beans/Option.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/beans/Option.java
@@ -37,7 +37,7 @@ public class Option implements Serializable {
     //default constructor
     public Option() {
     }
-    
+
     public Option (String value, String body, boolean selected) {
         this.value = value;
         this.body = body;
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/controller/BaseEditController.java b/api/src/main/java/edu/cornell/mannlib/vedit/controller/BaseEditController.java
index 2eb753a48..65ecd722d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/controller/BaseEditController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/controller/BaseEditController.java
@@ -37,9 +37,9 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 public class BaseEditController extends VitroHttpServlet {
 
 	public static final boolean FORCE_NEW = true; // when you know you're starting a new edit process
-    
+
     public static final String JSP_PREFIX = "/templates/edit/specific/";
-	
+
     protected static DateFormat DISPLAY_DATE_FORMAT = new SimpleDateFormat("MM/dd/yyyy");
     protected static final int BASE_10 = 10;
 
@@ -57,7 +57,7 @@ public class BaseEditController extends VitroHttpServlet {
     protected EditProcessObject createEpo(HttpServletRequest request) {
     	return createEpo(request, false);
     }
-    
+
     protected EditProcessObject createEpo(HttpServletRequest request, boolean forceNew) {
         /* this is actually a bit of a misnomer, because we will reuse an epo
         if an epoKey parameter is passed */
@@ -156,22 +156,22 @@ public class BaseEditController extends VitroHttpServlet {
             }
         }
     }
-    
+
     public List<Option> getSortedList(HashMap<String,Option> hashMap, List<Option> optionList, VitroRequest vreq){
-        
+
         class ListComparator implements Comparator<String>{
-            
+
             Collator collator;
-            
+
             public ListComparator(Collator collator) {
                 this.collator = collator;
             }
-            
+
             @Override
             public int compare(String str1, String str2) {
                 return collator.compare(str1, str2);
             }
-            
+
         }
 
        List<String> bodyVal = new ArrayList<String>();
@@ -180,23 +180,23 @@ public class BaseEditController extends VitroHttpServlet {
             hashMap.put(option.getBody(), option);
             bodyVal.add(option.getBody());
         }
-        
-                
+
+
        bodyVal.sort(new ListComparator(vreq.getCollator()));
         for (String aBodyVal : bodyVal) {
             options.add(hashMap.get(aBodyVal));
         }
        return options;
    }
-    
+
     protected WebappDaoFactory getWebappDaoFactory() {
     	return ModelAccess.on(getServletContext()).getWebappDaoFactory(ASSERTIONS_ONLY);
     }
-    
+
     protected WebappDaoFactory getWebappDaoFactory(String userURI) {
         return getWebappDaoFactory().getUserAwareDaoFactory(userURI);
     }
-    
+
     public String getDefaultLandingPage(HttpServletRequest request) {
     	return(request.getContextPath() + DEFAULT_LANDING_PAGE);
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/controller/EditFrontController.java b/api/src/main/java/edu/cornell/mannlib/vedit/controller/EditFrontController.java
index 98e0e03c0..354bd990a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/controller/EditFrontController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/controller/EditFrontController.java
@@ -44,13 +44,13 @@ public class EditFrontController extends VitroHttpServlet {
                 ((HttpServlet)controllerInstance).init(getServletConfig());
             } catch (Exception e) {
             	String errMsg = "doPost() could not instantiate specific " +
-        		        "controller " + controllerName; 
+        		        "controller " + controllerName;
                 log.error(errMsg, e);
                 throw new RuntimeException(errMsg, e);
             }
         } catch (ClassNotFoundException e){
         	String errMsg = "doPost() could not find controller " +
-        	        CONTROLLER_PKG + "." + controllerName; 
+        	        CONTROLLER_PKG + "." + controllerName;
             log.error(errMsg);
             throw new RuntimeException(errMsg);
         }
@@ -74,11 +74,11 @@ public class EditFrontController extends VitroHttpServlet {
         		        "while invoking " + controllerName;
                 log.error(errMsg, e);
                 throw new RuntimeException(errMsg, e);
-            }	
+            }
         } catch (NoSuchMethodException e){
             log.error("could not find doPost() method in " + controllerName);
             throw new RuntimeException("could not find doPost() method in " +
-            		controllerName); 
+            		controllerName);
         }
     }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/controller/OperationController.java b/api/src/main/java/edu/cornell/mannlib/vedit/controller/OperationController.java
index b9b78b384..f925dfe36 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/controller/OperationController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/controller/OperationController.java
@@ -30,7 +30,7 @@ import edu.cornell.mannlib.vedit.validator.Validator;
 
 @WebServlet(name = "OperationController", urlPatterns = {"/doEdit"} )
 public class OperationController extends BaseEditController {
-	
+
     private static final Log log = LogFactory.getLog(OperationController.class.getName());
 
     public void doPost (HttpServletRequest request, HttpServletResponse response) {
@@ -61,7 +61,7 @@ public class OperationController extends BaseEditController {
         	}
             return;
         }
-        
+
         // if we're canceling, we don't need to do anything
         if (request.getParameter("_cancel") != null){
             String referer = epo.getReferer();
@@ -94,15 +94,15 @@ public class OperationController extends BaseEditController {
         }
 
         try {
-        	
+
             Object newObj = getNewObj(epo);
-            
+
             //populate this object from the req. params
             boolean valid = populateObjectFromRequestParamsAndValidate(epo, newObj, request);
-            
+
             //run preprocessors
             runPreprocessors(epo, newObj);
-            
+
             //applySimpleMask(epo, newObj);
 
             //put the newObj back in the epo where other things can look at it
@@ -115,14 +115,14 @@ public class OperationController extends BaseEditController {
             	return;
             }
 
-            String action = getAction(request);       
-            
+            String action = getAction(request);
+
             boolean status = performEdit(epo, newObj, action);
             if (status == FAILURE) {
             	retry(request, response, epo);
             	return;
             }
-            
+
             /* put request parameters and attributes into epo where the listeners can see */
             epo.setRequestParameterMap(request.getParameterMap());
 
@@ -165,13 +165,13 @@ public class OperationController extends BaseEditController {
 
         } catch (Exception e) {
             log.error("Error performing edit", e);
-            
+
             String errMsg = (e.getMessage() != null)
                 ? e.getMessage()
                 : "Error performing edit";
-            
+
             epo.setAttribute("globalErrorMsg", errMsg);
-       
+
             try {
             	retry(request, response, epo);
             } catch (IOException ioe) {
@@ -179,30 +179,30 @@ public class OperationController extends BaseEditController {
             }
         }
     }
-    
-    private void retry(HttpServletRequest request, 
-    		           HttpServletResponse response, 
+
+    private void retry(HttpServletRequest request,
+    		           HttpServletResponse response,
     		           EditProcessObject epo) throws IOException {
-        String referer = request.getHeader("Referer");        
+        String referer = request.getHeader("Referer");
         referer = (referer == null) ? epo.getReferer() : referer;
         if( referer != null ){
             int epoKeyIndex = referer.indexOf("_epoKey");
             if (epoKeyIndex >= 0){
-                String url = referer.substring(0,epoKeyIndex) + "_epoKey=" + 
+                String url = referer.substring(0,epoKeyIndex) + "_epoKey=" +
                         request.getParameter("_epoKey");
                 response.sendRedirect(url);
                 return;
             }
-            String redirectUrl = (referer.indexOf("?") > -1) 
-                    ? referer + "&"  
+            String redirectUrl = (referer.indexOf("?") > -1)
+                    ? referer + "&"
                     : referer + "?";
             redirectUrl += "_epoKey="+request.getParameter("_epoKey");
-            response.sendRedirect(redirectUrl);        
+            response.sendRedirect(redirectUrl);
         } else {
         	response.sendRedirect(getDefaultLandingPage(request));
         }
     }
-    
+
     private void runPreprocessors(EditProcessObject epo, Object newObj) {
     	if (epo.getPreProcessorList() != null && epo.getPreProcessorList().size()>0) {
             for (EditPreProcessor epp : epo.getPreProcessorList()) {
@@ -210,14 +210,14 @@ public class OperationController extends BaseEditController {
             }
         }
     }
-    
+
     private Object getNewObj(EditProcessObject epo) {
     	Object newObj = null;
     	if (epo.getOriginalBean() != null) { // we're updating or deleting an existing bean
             if (epo.getImplementationClass() != null) {
                 newObj = OperationUtils.cloneBean(
-                        epo.getOriginalBean(), 
-                        epo.getImplementationClass(), 
+                        epo.getOriginalBean(),
+                        epo.getImplementationClass(),
                         epo.getBeanClass());
             } else {
                 newObj = OperationUtils.cloneBean(epo.getOriginalBean());
@@ -235,7 +235,7 @@ public class OperationController extends BaseEditController {
         epo.setNewBean(newObj); // is this dangerous?
         return newObj;
     }
-    
+
     private boolean populateObjectFromRequestParamsAndValidate(EditProcessObject epo, Object newObj, HttpServletRequest request) {
         boolean valid = true;
         String currParam="";
@@ -298,7 +298,7 @@ public class OperationController extends BaseEditController {
                     } catch (NegativeIntegerException nie) {
                         valid = false;
                         epo.getErrMsgMap().put(currParam,"Please enter a positive integer");
-                        epo.getBadValueMap().put(currParam,currValue);                    	
+                        epo.getBadValueMap().put(currParam,currValue);
                     } catch (IllegalArgumentException f) {
                         valid=false;
                         log.error("doPost() reports IllegalArgumentException for "+currParam);
@@ -311,7 +311,7 @@ public class OperationController extends BaseEditController {
         }
         return valid;
     }
-    
+
     private String getAction(HttpServletRequest request) {
     	if (request.getParameter("_update") != null ) {
         	return "update";
@@ -321,7 +321,7 @@ public class OperationController extends BaseEditController {
         	return "insert";
         }
     }
-    
+
     private void notifyChangeListeners(EditProcessObject epo, String action) {
     	List<ChangeListener> changeListeners = epo.getChangeListenerList();
         if (changeListeners != null){
@@ -340,10 +340,10 @@ public class OperationController extends BaseEditController {
             }
         }
     }
-    
+
     private boolean SUCCESS = false;
     private boolean FAILURE = !SUCCESS;
-    
+
     private boolean performEdit(EditProcessObject epo, Object newObj, String action) {
     	/* do the actual edit operation */
         String partialClassName;
@@ -366,7 +366,7 @@ public class OperationController extends BaseEditController {
         Method meth=null;
         Method deleteMeth=null;
         Method insertMeth=null;
-        
+
         // probably want to change this so it will walk up the class tree indefinitely looking for a good method to use
         if ("update".equals(action)){
         	if (epo.getUpdateMethod() != null) {
@@ -475,7 +475,7 @@ public class OperationController extends BaseEditController {
             	return FAILURE;
             }
         }
-        
+
         if (result != null) {
             // need to put the result of the insert in the id of the newbean
             try {
@@ -504,9 +504,9 @@ public class OperationController extends BaseEditController {
                 //log.error("doPost() could not set id of new bean.");
             }
         }
-        
+
         return SUCCESS;
-        
+
     }
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java b/api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java
index fa63f41c7..a9b1afcbd 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java
@@ -33,11 +33,11 @@ public class FormUtils {
 
     protected static final Log log = LogFactory.getLog(FormUtils.class.getName());
     protected static final int BASE_10 = 10;
-    protected static final Class[] SUPPORTED_TYPES = { String.class, 
-            int.class, 
-            Integer.class, 
-            boolean.class, 
-            Date.class 
+    protected static final Class[] SUPPORTED_TYPES = { String.class,
+            int.class,
+            Integer.class,
+            boolean.class,
+            Date.class
           };
 
     protected static final List<Class> SUPPORTED_TYPE_LIST = Arrays
@@ -45,15 +45,15 @@ public class FormUtils {
 
     /* this class needs to be reworked */
 
-    public static void populateFormFromBean (Object bean, 
-    		                                 String action, 
+    public static void populateFormFromBean (Object bean,
+    		                                 String action,
     		                                 FormObject foo) {
         populateFormFromBean(bean,action,null,foo,new HashMap());
     }
 
-    public static void populateFormFromBean (Object bean, 
-    		                                 String action, 
-    		                                 FormObject foo, 
+    public static void populateFormFromBean (Object bean,
+    		                                 String action,
+    		                                 FormObject foo,
     		                                 Map<String, String> badValuesHash) {
         populateFormFromBean(bean,action,null,foo,badValuesHash);
     }
@@ -61,14 +61,14 @@ public class FormUtils {
     /**
      * Populates form objects with bean values
      */
-    public static void populateFormFromBean (Object bean, 
-    		                                 String action, 
-    		                                 EditProcessObject epo, 
-    		                                 FormObject foo, 
+    public static void populateFormFromBean (Object bean,
+    		                                 String action,
+    		                                 EditProcessObject epo,
+    		                                 FormObject foo,
     		                                 Map<String, String> BadValuesHash) {
-        Class beanClass = 
-        	    (epo != null && epo.getBeanClass() != null) 
-        	            ? epo.getBeanClass() 
+        Class beanClass =
+        	    (epo != null && epo.getBeanClass() != null)
+        	            ? epo.getBeanClass()
         	            : bean.getClass();
 
         Method[] meths = beanClass.getMethods();
@@ -121,20 +121,20 @@ public class FormUtils {
         }
     }
 
-    public static List<Option> makeOptionListFromBeans (List beanList, 
-    		                                            String valueField, 
-    		                                            String bodyField, 
-    		                                            String selectedValue, 
+    public static List<Option> makeOptionListFromBeans (List beanList,
+    		                                            String valueField,
+    		                                            String bodyField,
+    		                                            String selectedValue,
     		                                            String selectedBody) {
         return makeOptionListFromBeans (
         		beanList, valueField, bodyField, selectedValue, selectedBody, true);
     }
 
-    public static List<Option> makeOptionListFromBeans(List beanList, 
-    		                                           String valueField, 
-    		                                           String bodyField, 
-    		                                           String selectedValue, 
-    		                                           String selectedBody, 
+    public static List<Option> makeOptionListFromBeans(List beanList,
+    		                                           String valueField,
+    		                                           String bodyField,
+    		                                           String selectedValue,
+    		                                           String selectedBody,
     		                                           boolean forceSelectedInclusion) {
         List<Option> optList = new LinkedList();
 
@@ -155,7 +155,7 @@ public class FormUtils {
                 		"get" + valueField, (Class[]) null);
                 valueObj = valueMeth.invoke(bean, (Object[]) null);
             } catch (Exception e) {
-                log.warn("Could not find method get" + valueField + " on " + 
+                log.warn("Could not find method get" + valueField + " on " +
                 		bean.getClass());
             }
 
@@ -200,11 +200,11 @@ public class FormUtils {
 
         }
 
-        // if the list of beans doesn't include the selected value/body, 
+        // if the list of beans doesn't include the selected value/body,
         // insert it anyway so we don't inadvertently change the value of the
-        // field to the first thing that happens to be in the select list 
+        // field to the first thing that happens to be in the select list
         boolean skipThisStep = !forceSelectedInclusion;
-        // For now, if the value is a negative integer, we won't try to 
+        // For now, if the value is a negative integer, we won't try to
         // preserve it, as the bean was probably just instantiated.
         // Should switch to a more robust way of handling inital bean values.
         if (selectedValue == null) {
@@ -231,8 +231,8 @@ public class FormUtils {
         return optList;
 
     }
-    
-    public static List<Option> makeVClassOptionList(WebappDaoFactory wadf, 
+
+    public static List<Option> makeVClassOptionList(WebappDaoFactory wadf,
     		                                        String selectedVClassURI) {
         List<Option> vclassOptionList = new LinkedList<Option>();
         for (VClass vclass : wadf.getVClassDao().getAllVclasses()) {
@@ -246,15 +246,15 @@ public class FormUtils {
         }
         return vclassOptionList;
     }
-    
+
 	public static List<Option> makeOptionListOfSubVClasses(
 			WebappDaoFactory wadf, String parentVClassUri,
 			String selectedVClassURI) {
 		VClassDao vClassDao = wadf.getVClassDao();
-		
+
 		Set<String> uris = new HashSet<>(vClassDao.getAllSubClassURIs(parentVClassUri));
 		uris.add(parentVClassUri);
-		
+
 		List<Option> options = new LinkedList<>();
 		for (String vclassUri: uris) {
 			VClass vclass = vClassDao.getVClassByURI(vclassUri);
@@ -266,9 +266,9 @@ public class FormUtils {
         	    option.setSelected(true);
         	}
 		}
-		
+
 		options.sort((o1, o2) -> o1.getBody().compareTo(o2.getBody()));
-		
+
 		return options;
 	}
 
@@ -276,38 +276,38 @@ public class FormUtils {
         beanSet (newObj, field, value, null);
     }
 
-    public static void beanSet(Object newObj, 
-    		                   String field, 
-    		                   String value, 
+    public static void beanSet(Object newObj,
+    		                   String field,
+    		                   String value,
     		                   EditProcessObject epo) {
         SimpleDateFormat standardDateFormat = new SimpleDateFormat(
         		"yyyy-MM-dd HH:mm:ss");
         SimpleDateFormat minutesOnlyDateFormat = new SimpleDateFormat(
         		"yyyy-MM-dd HH:mm");
-        Class cls = 
-        	    (epo != null && epo.getBeanClass() != null) 
-        	            ? epo.getBeanClass() 
+        Class cls =
+        	    (epo != null && epo.getBeanClass() != null)
+        	            ? epo.getBeanClass()
         	            : newObj.getClass();
         Class[] paramList = new Class[1];
         Method setterMethod = getSetterMethod(cls, field, SUPPORTED_TYPE_LIST);
         if (setterMethod == null) {
-        	log.debug("Could not find method set" + field + " on " 
+        	log.debug("Could not find method set" + field + " on "
         			+ cls.getName());
         	return;
         }
-        Class argumentType = setterMethod.getParameterTypes()[0];   
+        Class argumentType = setterMethod.getParameterTypes()[0];
         Object[] arglist = new Object[1];
-        if (int.class.equals(argumentType) 
+        if (int.class.equals(argumentType)
         		|| Integer.class.equals(argumentType)) {
             arglist[0] = (int.class.equals(argumentType)) ? -1 : null;
-            if (!value.isEmpty()) { 
+            if (!value.isEmpty()) {
                 int parsedInt = Integer.parseInt(value, BASE_10);
                 if (parsedInt < 0) {
-                	throw new FormUtils.NegativeIntegerException();    	
+                	throw new FormUtils.NegativeIntegerException();
                 } else {
                 	arglist[0] = parsedInt;
                 }
-            }                	
+            }
         } else if (Date.class.equals(argumentType)) {
             // this isn't so great ; should probably be in a validator
             if (value != null && value.length() > 0 && value.indexOf(":") < 1) {
@@ -331,7 +331,7 @@ public class FormUtils {
             } else {
                 arglist[0] = null;
             }
-        } else if (boolean.class.equals(argumentType)) {      	
+        } else if (boolean.class.equals(argumentType)) {
             arglist[0] = (value.equalsIgnoreCase("true"));
         } else {
             arglist[0] = value;
@@ -343,8 +343,8 @@ public class FormUtils {
         }
     }
 
-    private static Method getSetterMethod(Class beanClass, 
-    		                              String fieldName, 
+    private static Method getSetterMethod(Class beanClass,
+    		                              String fieldName,
     		                              List<Class> supportedTypes) {
     	for (Class clazz : supportedTypes) {
     		try {
@@ -354,12 +354,12 @@ public class FormUtils {
     		} catch (NoSuchMethodException nsme) {
     			// just try the next type
     		}
-     	} 
+     	}
     	return null;
     }
 
     /**
-     * Decodes a Base-64-encoded String of format 
+     * Decodes a Base-64-encoded String of format
      * key:value;key2:value2;key3:value, and puts the keys and values in a Map
      * @param params Parameters
      */
@@ -372,7 +372,7 @@ public class FormUtils {
         }
         return beanParamMap;
     }
-    
+
     public static class NegativeIntegerException extends RuntimeException {}
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/util/OperationUtils.java b/api/src/main/java/edu/cornell/mannlib/vedit/util/OperationUtils.java
index 6b0e36803..00efdf8d8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/util/OperationUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/util/OperationUtils.java
@@ -152,4 +152,4 @@ public class OperationUtils {
 		return newBean;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/util/Stemmer.java b/api/src/main/java/edu/cornell/mannlib/vedit/util/Stemmer.java
index bd57587cf..3149aaca9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/util/Stemmer.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/util/Stemmer.java
@@ -54,9 +54,9 @@ class Stemmer
                j, k;
    private static final int INC = 50;
                      /* unit of size whereby b is increased */
-   
+
    private static final Log log = LogFactory.getLog(Stemmer.class.getName());
-   
+
    public Stemmer()
    {  b = new char[INC];
       i = 0;
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/validator/impl/IntValidator.java b/api/src/main/java/edu/cornell/mannlib/vedit/validator/impl/IntValidator.java
index c1fec41c3..5b1676c95 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/validator/impl/IntValidator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/validator/impl/IntValidator.java
@@ -48,7 +48,7 @@ public class IntValidator implements Validator {
     }
 
     public IntValidator(){}
-    
+
     public IntValidator (int minVal, int maxVal){
         this.minVal = minVal;
         this.maxVal = maxVal;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/VitroHomeDirectory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/VitroHomeDirectory.java
index 06513cdfb..b55f9d87e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/VitroHomeDirectory.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/application/VitroHomeDirectory.java
@@ -22,7 +22,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class VitroHomeDirectory {
 	private static final Log log = LogFactory.getLog(VitroHomeDirectory.class);
-	
+
 	public static VitroHomeDirectory find(ServletContext ctx) {
 		HomeDirectoryFinder finder = new HomeDirectoryFinder(ctx);
 		return new VitroHomeDirectory(ctx, finder.getPath(),
@@ -51,12 +51,12 @@ public class VitroHomeDirectory {
 	public String getDiscoveryMessage() {
 		return discoveryMessage;
 	}
-	
+
 	/**
 	 * Find something that specifies the location of the Vitro home directory.
 	 * Look in the JDNI environment, the system properties, and the
 	 * build.properties file.
-	 * 
+	 *
 	 * If we don't find it, fail. If we find it more than once, use the first
 	 * one (with a warning). If it is not an existing, readable directory, fail.
 	 */
@@ -90,7 +90,7 @@ public class VitroHomeDirectory {
 		public Path getPath() {
 			return foundLocations.get(0).getPath();
 		}
-		
+
 		public void getVhdFromJndi() {
 			try {
 				String vhdPath = (String) new InitialContext()
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/ActiveIdentifierBundleFactories.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/ActiveIdentifierBundleFactories.java
index 0c57ab81f..1c88ee07c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/ActiveIdentifierBundleFactories.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/ActiveIdentifierBundleFactories.java
@@ -68,7 +68,7 @@ public class ActiveIdentifierBundleFactories {
 	/**
 	 * Get the Identifiers from the list of factories. This might return an
 	 * empty bundle, but it never returns null.
-	 * 
+	 *
 	 * This is package access, and should only be called by RequestIdentifiers.
 	 * Everyone else should ask RequestIdentifiers to fetch them from the
 	 * request.
@@ -94,7 +94,7 @@ public class ActiveIdentifierBundleFactories {
 		if (req == null) {
 			throw new NullPointerException("req may not be null.");
 		}
-		
+
 		return getActiveFactories(req.getSession().getServletContext());
 	}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/ArrayIdentifierBundle.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/ArrayIdentifierBundle.java
index 567eddb12..107c7889e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/ArrayIdentifierBundle.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/ArrayIdentifierBundle.java
@@ -14,7 +14,7 @@ public class ArrayIdentifierBundle extends ArrayList<Identifier> implements
 	public ArrayIdentifierBundle(Collection<? extends Identifier> ids) {
 		super(ids);
 	}
-	
+
 	public ArrayIdentifierBundle(Identifier... ids) {
 		this(Arrays.asList(ids));
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/Identifier.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/Identifier.java
index 5e5dd0128..53b8d97ab 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/Identifier.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/Identifier.java
@@ -2,27 +2,27 @@
 
 package edu.cornell.mannlib.vitro.webapp.auth.identifier;
 
-/** 
+/**
  * Indicates who the user is and what roles/groups they belong to.
  * The objects returned by this could be anything.  For example, RoleBacedPolicy
  * looks for RoleBacedPolicy.AuthRole objects.
- *  
+ *
  * This is a marker interface to indicate that a object is an identifier,
  * implementations of Identifier may provide any sort of identifying functionality or
- * methods.  
- * 
+ * methods.
+ *
  * <h3>Justification for a methodless interface</h3>
  * This is better than using Object since having method signatures that have
- * Identifier at least indicates the intent of the parameter, even if it is the 
+ * Identifier at least indicates the intent of the parameter, even if it is the
  * same to the compiler.
- * 
+ *
  * Policy objects are expected to examine the IdentiferBundle to find the
  * information needed to make a decision.  There is no set pattern as to
  * what will and will not be a configuration of Identifiers that will create
- * a AUTHORIZED decision.  Reflection, Pattern Matching or something similar 
- * will be needed.  
- * 
- * We have no compile time information about what will structures will map 
+ * a AUTHORIZED decision.  Reflection, Pattern Matching or something similar
+ * will be needed.
+ *
+ * We have no compile time information about what will structures will map
  * to which Authorization, let's not pretend that we do.
  */
 public interface Identifier {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/IdentifierBundle.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/IdentifierBundle.java
index ea39f783a..dc097dbe7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/IdentifierBundle.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/IdentifierBundle.java
@@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.auth.identifier;
 
 import java.util.List;
 
-/** 
+/**
  * A group of Identifiers, very commonly used in method signatures
  * since a session will usually have more than one associated identifier.
 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/RequestIdentifiers.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/RequestIdentifiers.java
index 82f5a49a3..cfb8b1456 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/RequestIdentifiers.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/RequestIdentifiers.java
@@ -21,7 +21,7 @@ public class RequestIdentifiers {
 	 * If the currently applicable Identifiers have been cached in the request,
 	 * get them. If not, assemble them from the active factories, and cache them
 	 * in the request.
-	 * 
+	 *
 	 * This method might return an empty bundle, but it never returns null.
 	 */
 	public static IdentifierBundle getIdBundleForRequest(ServletRequest request) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/RoleIdentifier.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/RoleIdentifier.java
index c1395cd03..6e4f8ab77 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/RoleIdentifier.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/RoleIdentifier.java
@@ -5,7 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.auth.identifier;
 public abstract class  RoleIdentifier implements Identifier {
     public abstract String getRole();
     public abstract String getUri();
-    
+
     public static String getUri( Identifier id){
         if( id == null ) return null;
         if( id instanceof RoleIdentifier ){
@@ -14,12 +14,12 @@ public abstract class  RoleIdentifier implements Identifier {
             return null;
         }
     }
-    
+
     public static String getUri( IdentifierBundle idb){
         for( Identifier id : idb ){
             if (id instanceof RoleIdentifier) {
                 RoleIdentifier roleId = (RoleIdentifier) id;
-                return roleId.getUri();                
+                return roleId.getUri();
             }
         }
         return null;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/HasAssociatedIndividual.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/HasAssociatedIndividual.java
index fe237a6ec..afaba81a2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/HasAssociatedIndividual.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/HasAssociatedIndividual.java
@@ -12,7 +12,7 @@ import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
 /**
  * The current user is associated with this Individual page, and has editing
  * rights relating to it.
- * 
+ *
  * Subclasses exist to indicate how that association is created, as either a
  * Self-Editor or a Proxy Editor. In some cases (e.g., the MyProfile link) the
  * distinction is important.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/HasPermissionSet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/HasPermissionSet.java
index 2dd010346..cf94e1437 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/HasPermissionSet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/HasPermissionSet.java
@@ -34,7 +34,7 @@ public class HasPermissionSet extends AbstractCommonIdentifier implements
 		}
 		return set;
 	}
-	
+
 	private final PermissionSet permissionSet; // never null
 
 	public HasPermissionSet(PermissionSet permissionSet) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsBlacklisted.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsBlacklisted.java
index 74504298b..36275f37b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsBlacklisted.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsBlacklisted.java
@@ -69,10 +69,10 @@ public class IsBlacklisted extends AbstractCommonIdentifier implements
 
 	/**
 	 * Runs through .sparql files in the BLACKLIST_SPARQL_DIR.
-	 * 
+	 *
 	 * The first that returns one or more rows will be cause the user to be
 	 * blacklisted.
-	 * 
+	 *
 	 * The first variable from the first solution set will be returned.
 	 */
 	private static String checkForBlacklisted(Individual ind,
@@ -113,10 +113,10 @@ public class IsBlacklisted extends AbstractCommonIdentifier implements
 	/**
 	 * Runs the SPARQL query in the file with the uri of the individual
 	 * substituted in.
-	 * 
+	 *
 	 * The URI of ind will be substituted into the query where ever the token
 	 * "?individualURI" is found.
-	 * 
+	 *
 	 * If there are any solution sets, then the URI of the variable named
 	 * "cause" will be returned. Make sure that it is a resource with a URI.
 	 * Otherwise null will be returned.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/HasProfileOrIsBlacklistedFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/HasProfileOrIsBlacklistedFactory.java
index 8d79827e9..674c79562 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/HasProfileOrIsBlacklistedFactory.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/HasProfileOrIsBlacklistedFactory.java
@@ -65,4 +65,4 @@ public class HasProfileOrIsBlacklistedFactory extends
 
 		return individuals;
 	}
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionRegistry.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionRegistry.java
index ff50e7888..fab6cfff6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionRegistry.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionRegistry.java
@@ -21,7 +21,7 @@ import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 /**
  * A collection of Permission objects, keyed by URI. Resides in the
  * ServletContext.
- * 
+ *
  * This is not thread-safe, so Permissions should be added only during context
  * initialization.
  */
@@ -123,7 +123,7 @@ public class PermissionRegistry {
 	/**
 	 * Get the permission that is registered with this URI. If there is no such
 	 * Permission, return a BrokenPermission that always denies authorization.
-	 * 
+	 *
 	 * If you want to know whether an actual Permission has been registered at
 	 * this URI, call isPermission() instead.
 	 */
@@ -183,7 +183,7 @@ public class PermissionRegistry {
 		 * property may be given an edit-level of "PUBLIC", but that may also
 		 * simply be the default assigned to it when editing, and we don't want
 		 * to recognize that.
-		 * 
+		 *
 		 * Other permissions give self-editors their editing privileges.
 		 */
 		private Collection<Permission> createEditByRolePermissions() {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionSetsSmokeTest.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionSetsSmokeTest.java
index b86e97f08..766f4c136 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionSetsSmokeTest.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionSetsSmokeTest.java
@@ -17,9 +17,9 @@ import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 
 /**
  * Load the initial configuration of PermissionSets and Permissions.
- * 
+ *
  * The UserAccounts model must be created before this runs.
- * 
+ *
  * The PermissionRegistry must be created before this runs.
  */
 public class PermissionSetsSmokeTest implements ServletContextListener {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/permissions/SimplePermission.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/permissions/SimplePermission.java
index c5640f6e9..82ee603fa 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/permissions/SimplePermission.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/permissions/SimplePermission.java
@@ -109,8 +109,8 @@ public class SimplePermission extends Permission {
 			NAMESPACE + "PageViewableEditor");
 		public static final SimplePermission PAGE_VIEWABLE_PUBLIC = new SimplePermission(
 			NAMESPACE + "PageViewablePublic");
-	
-	
+
+
 	public static List<SimplePermission> getAllInstances() {
 		return new ArrayList<SimplePermission>(allInstances.values());
 	}
@@ -120,7 +120,7 @@ public class SimplePermission extends Permission {
 
 	public SimplePermission(String uri) {
 		super(uri);
-		
+
 		if (uri == null) {
 			throw new NullPointerException("uri may not be null.");
 		}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/BasicPolicyDecision.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/BasicPolicyDecision.java
index 2fc390080..b831be9dd 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/BasicPolicyDecision.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/BasicPolicyDecision.java
@@ -51,8 +51,8 @@ public class BasicPolicyDecision implements PolicyDecision{
     public void setStackTrace(String stackTrace) {
         StackTrace = stackTrace;
     }
-    
-    public String toString(){ 
+
+    public String toString(){
         return authorized + ": " + message;
     }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/CompositPolicyDecision.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/CompositPolicyDecision.java
index 9e8a83abc..22d568f2f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/CompositPolicyDecision.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/CompositPolicyDecision.java
@@ -8,16 +8,16 @@ import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
 
 /**
- * Policy decision that is made from some analysis of a set of decisions. 
+ * Policy decision that is made from some analysis of a set of decisions.
  * @author bdc34
  *
  */
 public class CompositPolicyDecision extends BasicPolicyDecision implements PolicyDecision {
     List<PolicyDecision> subDecisions;
-    
+
     public CompositPolicyDecision(Authorization auth, String message, List<PolicyDecision> subDecisions){
         super( auth, message);
-        this.subDecisions = subDecisions;    
+        this.subDecisions = subDecisions;
     }
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/DisplayRestrictedDataToSelfPolicy.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/DisplayRestrictedDataToSelfPolicy.java
index 0b20f56ff..2c536813c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/DisplayRestrictedDataToSelfPolicy.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/DisplayRestrictedDataToSelfPolicy.java
@@ -27,7 +27,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Property;
 /**
  * Permit display of various data if it relates to the user's associated
  * individual.
- * 
+ *
  * This policy is only to handle the case where a user would not be able to see
  * data except for their self-editing status. If the data would be visible
  * without that status, we assume that some other policy will grant access.
@@ -176,4 +176,4 @@ public class DisplayRestrictedDataToSelfPolicy implements PolicyIface {
 		return this.getClass().getSimpleName() + " - " + hashCode();
 	}
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyDecisionLogger.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyDecisionLogger.java
index a6aea3132..1880c7693 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyDecisionLogger.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyDecisionLogger.java
@@ -19,7 +19,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.developer.Key;
 /**
  * If enabled in the developer settings (and log levels), log each
  * PolicyDecision (subject to restrictions).
- * 
+ *
  * Some restrictions apply to the logger as a whole. Others apply to the
  * particular policy or the particular decision.
  */
@@ -65,7 +65,7 @@ public class PolicyDecisionLogger {
 	 * The identifier bundle passes if there is no restriction, or if the
 	 * restriction pattern is found within concatenated string of the identifier
 	 * bundle.
-	 * 
+	 *
 	 * If the restriction is invalid, the action fails.
 	 */
 	private boolean passesUserRestriction() {
@@ -77,7 +77,7 @@ public class PolicyDecisionLogger {
 	/**
 	 * The requested action passes if there is no restriction, or if the
 	 * restriction pattern is found within the class name of the action.
-	 * 
+	 *
 	 * If the restriction is invalid, the action fails.
 	 */
 	private boolean passesActionRestriction() {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper.java
index 194997f9f..67f61897c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper.java
@@ -56,7 +56,7 @@ public class PolicyHelper {
 			Iterable<? extends AuthorizationRequest> actions) {
 		return isAuthorizedForActions(req, AuthorizationRequest.andAll(actions));
 	}
-	
+
 	/**
 	 * Are these actions authorized for the current user by the current
 	 * policies?
@@ -80,7 +80,7 @@ public class PolicyHelper {
 	 * Is the email/password authorized for these actions? This should be used
 	 * when a controller or something needs allow actions if the user passes in
 	 * their email and password.
-	 * 
+	 *
 	 * It may be better to check this as part of a servlet Filter and add an
 	 * identifier bundle.
 	 */
@@ -109,7 +109,7 @@ public class PolicyHelper {
 			}
 			log.debug(String.format("password accepted for %s, "
 					+ "account URI: %s", email, uri));
-			
+
 			// figure out if that account can do the actions
 			IdentifierBundle ids = ActiveIdentifierBundleFactories
 					.getUserIdentifierBundle(req, user);
@@ -124,7 +124,7 @@ public class PolicyHelper {
 	/**
 	 * Do the current policies authorize the current user to add this statement
 	 * to this model?
-	 * 
+	 *
 	 * The statement is expected to be fully-populated, with no null fields.
 	 */
 	public static boolean isAuthorizedToAdd(HttpServletRequest req,
@@ -159,7 +159,7 @@ public class PolicyHelper {
 	/**
 	 * Do the current policies authorize the current user to drop this statement
 	 * from this model?
-	 * 
+	 *
 	 * The statement is expected to be fully-populated, with no null fields.
 	 */
 	public static boolean isAuthorizedToDrop(HttpServletRequest req,
@@ -195,11 +195,11 @@ public class PolicyHelper {
 	 * Do the current policies authorize the current user to modify this model
 	 * by adding all of the statments in the additions model and dropping all of
 	 * the statements in the retractions model?
-	 * 
+	 *
 	 * This differs from the other calls to "isAuthorized..." because we always
 	 * expect the answer to be true. If the answer is false, it should be logged
 	 * as an error.
-	 * 
+	 *
 	 * Even if a statement fails the test, continue to test the others, so the
 	 * log will contain a full record of all failures. This is no more expensive
 	 * than if all statements succeeded.
@@ -229,10 +229,10 @@ public class PolicyHelper {
 		 * authorized unless others are added first. The client code should not
 		 * need to know which sequence will be successful. The client code only
 		 * cares that such a sequence does exist.
-		 * 
+		 *
 		 * There are 3 obvious ways to test this, ranging from the most rigorous
 		 * (and most costly) to the least costly (and least rigorous).
-		 * 
+		 *
 		 * 1. Try all sequences to find one that works. First, try to add each
 		 * statement to the modelBeingModified. If any statement succeeds,
 		 * construct a temporary model that joins that statement to the
@@ -241,7 +241,7 @@ public class PolicyHelper {
 		 * we eventually find all of the statements authorized, declare success.
 		 * This is logically rigorous, but could become geometrically expensive
 		 * as statements are repeatedly tried against incremented models. O(n!).
-		 * 
+		 *
 		 * 2. Try each statement on the assumption that all of the others have
 		 * already been added. So for each statement we create a temporary
 		 * modeol that joins the other additions to the JenaOntModel. If all
@@ -250,14 +250,14 @@ public class PolicyHelper {
 		 * each other, but that neither statement could be added first. However,
 		 * that seems like a small risk, and the algorithm is considerably less
 		 * expensive. O(n).
-		 * 
+		 *
 		 * 3. Try each statement on the assumption that all of the statements
 		 * (including itself) have already been added. If all statements pass
 		 * this test, declare success. This has the additional minor flaw of
 		 * allowing a statement to authorize its own addition, but this seems
 		 * very unlikely. This is about as expensive as choice 2., but much
 		 * simpler to code.
-		 * 
+		 *
 		 * For now, I am going with choice 3.
 		 */
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyList.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyList.java
index 6cdabb1d1..8baf48889 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyList.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyList.java
@@ -16,12 +16,12 @@ import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction;
 
 /**
  * This is a List of Policy Objects that implements PolciyIface.  The intent
- * is to make it easy to query a list of policies for a PolicyDecision.  
- * 
+ * is to make it easy to query a list of policies for a PolicyDecision.
+ *
  *  The Policy objects in the PolicyList are queried for authorization in order
  *  and return the first AUTHORIZED or UNAUTHROIZED decision.  INCONCLUSIVE
  *  or null decisions will be ignored and the next policy on the list will
- *  be queried. 
+ *  be queried.
  */
 public class PolicyList extends ArrayList<PolicyIface> implements PolicyIface{
     private static final Log log = LogFactory.getLog(PolicyList.class.getName());
@@ -38,7 +38,7 @@ public class PolicyList extends ArrayList<PolicyIface> implements PolicyIface{
 	public PolicyDecision isAuthorized(IdentifierBundle whoToAuth, RequestedAction whatToAuth) {
 	    PolicyDecision pd = null;
 	    PolicyDecisionLogger logger = new PolicyDecisionLogger(whoToAuth, whatToAuth);
-	    for(PolicyIface policy : this){ 
+	    for(PolicyIface policy : this){
             try{
                 pd = policy.isAuthorized(whoToAuth, whatToAuth);
                 logger.log(policy, pd);
@@ -56,7 +56,7 @@ public class PolicyList extends ArrayList<PolicyIface> implements PolicyIface{
                 log.error("ignoring exception in policy " + policy.toString(), th );
             }
         }
-	    
+
 		pd = new BasicPolicyDecision(Authorization.INCONCLUSIVE,
 				"No policy returned a conclusive decision on " + whatToAuth);
 		logger.logNoDecision(pd);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/RequestPolicyList.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/RequestPolicyList.java
index 3d6e8224f..c077daac5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/RequestPolicyList.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/RequestPolicyList.java
@@ -52,13 +52,13 @@ public class RequestPolicyList extends PolicyList {
 		if (request == null) {
 			throw new NullPointerException("request may not be null.");
 		}
-		
+
 		Object obj = request.getAttribute(ATTRIBUTE_POLICY_ADDITIONS);
 		if (obj == null) {
 			obj = new PolicyList();
 			request.setAttribute(ATTRIBUTE_POLICY_ADDITIONS, obj);
 		}
-		
+
 		if (!(obj instanceof PolicyList)) {
 			throw new IllegalStateException("Expected to find an instance of "
 					+ PolicyList.class.getName()
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/RootUserPolicy.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/RootUserPolicy.java
index 1ad842cec..e72436152 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/RootUserPolicy.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/RootUserPolicy.java
@@ -27,10 +27,10 @@ import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 
 /**
  * If the user has an IsRootUser identifier, they can do anything!
- * 
+ *
  * On setup, check to see that the specified root user exists. If not, create
  * it. If we can't create it, abort.
- * 
+ *
  * If any other root users exist, warn about them.
  */
 public class RootUserPolicy implements PolicyIface {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/ServletPolicyList.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/ServletPolicyList.java
index 1a163e482..f724a5039 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/ServletPolicyList.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/ServletPolicyList.java
@@ -44,7 +44,7 @@ public class ServletPolicyList {
 		if (policy == null) {
 			return;
 		}
-		
+
 		PolicyList policies = getPolicyList(sc);
 		if (!policies.contains(policy)) {
 			policies.add(policy);
@@ -62,7 +62,7 @@ public class ServletPolicyList {
 		if (policy == null) {
 			return;
 		}
-		
+
 		PolicyList policies = getPolicyList(sc);
 		if (!policies.contains(policy)) {
 			policies.add(0, policy);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBean.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBean.java
index 993d21aab..51c113ee5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBean.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBean.java
@@ -21,12 +21,12 @@ import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 /**
  * Assists the role-based policies in determining whether a property or resource
  * may be displayed, modified, or published in linked open data.
- * 
+ *
  * There is a singleton bean that holds the current threshold role levels for
  * displaying, modifying, or publishing restricted properties.
- * 
+ *
  * Create this bean after the context models are in place.
- * 
+ *
  * Add PropertyRestrictionListener to your EditProcessObject if you are editing
  * a property, to ensure that the bean stays current.
  */
@@ -62,7 +62,7 @@ public abstract class PropertyRestrictionBean {
 
 	/**
 	 * Any resource can be displayed.
-	 * 
+	 *
 	 * (Someday we may want to implement display restrictions based on VClass.)
 	 */
 	public abstract boolean canDisplayResource(String resourceUri,
@@ -71,7 +71,7 @@ public abstract class PropertyRestrictionBean {
 	/**
 	 * A resource cannot be modified if its namespace is in the prohibited list
 	 * (but some exceptions are allowed).
-	 * 
+	 *
 	 * (Someday we may want to implement modify restrictions based on VClass.)
 	 */
 	public abstract boolean canModifyResource(String resourceUri,
@@ -79,7 +79,7 @@ public abstract class PropertyRestrictionBean {
 
 	/**
 	 * Any resource can be published.
-	 * 
+	 *
 	 * (Someday we may want to implement publish restrictions based on VClass.)
 	 */
 	public abstract boolean canPublishResource(String resourceUri,
@@ -95,7 +95,7 @@ public abstract class PropertyRestrictionBean {
 	/**
 	 * A predicate cannot be modified if its namespace is in the prohibited list
 	 * (some exceptions are allowed).
-	 * 
+	 *
 	 * If modification of a predicate is restricted, the user's role must be at
 	 * least as high as the restriction level.
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImpl.java
index 0ddbb5ee7..7676396dc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImpl.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImpl.java
@@ -33,37 +33,37 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ContextModelAccess;
 
 /**
  * On creation, populate a map of PropertyRestrictionLevels.
- * 
+ *
  * When a change is detected, update the map accordingly.
- * 
+ *
  * ------------------------------
- * 
+ *
  * How is authorization determined?
- * 
+ *
  * Resources are easy. If they aren't in a prohibited namespace, or are an
  * exception to the prohibition, they are accessible.
- * 
+ *
  * Properties are harder. The prohibited namespace and exceptions still apply,
  * but if we pass that test, then we check the threshold map.
- * 
+ *
  * When a test is made, we look for thresholds in the map. First we look for the
  * full key of domain-base-range, in case we are testing a faux property. Faux
  * properties are recorded in the map with the full key.
- * 
+ *
  * If we don't find the full key, then perhaps we are testing a faux property
  * that has no settings, or perhaps we are testing an object property. We look
  * for the partial key of null-base-null, which covers both of these cases,
  * since object properties (and data properties) are recorded the map with a
  * partial key.
- * 
+ *
  * Similarly, if we find a null threshold value in the full key, we look back to
  * the partial key for a threshold.
- * 
+ *
  * If we find no non-null threshold value then the property is unrestricted for
  * that feature.
- * 
+ *
  * -----------------------------
- * 
+ *
  * It would perhaps be a silly optimization, but if we find a key with 3 null
  * thresholds, we could remove it from the map without changing the behavior.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionLevels.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionLevels.java
index 866e9cfd2..369c07470 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionLevels.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionLevels.java
@@ -7,7 +7,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.PropertyDao.FullPropertyKey;
 
 /**
  * The threshold levels for operations on a given property.
- * 
+ *
  * This is based on the assumption that the FullPropertyKey is sufficient to
  * distinguish all properties. An object property and a data property may not
  * share the same key. A faux property must have a different key from any object
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/ifaces/PolicyDecision.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/ifaces/PolicyDecision.java
index 19356bf3c..c174776c1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/ifaces/PolicyDecision.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/ifaces/PolicyDecision.java
@@ -5,7 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces;
 /**
  * Object to represent a decision from a policy.  The intent is
  * that the message would be presented to users to indicate why
- * they are not authorized for some action.  
+ * they are not authorized for some action.
  */
 public interface PolicyDecision {
     public Authorization getAuthorized();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/specialrelationships/RelationshipChecker.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/specialrelationships/RelationshipChecker.java
index dd3bfd482..31625f912 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/specialrelationships/RelationshipChecker.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/specialrelationships/RelationshipChecker.java
@@ -25,7 +25,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 /**
  * Look for relationships within an OntModel. Types of resources, links between
  * resources, and links between resources via a context node.
- * 
+ *
  * Also provides some convenience methods for test lists of URIs and for
  * creating PolicyDecisions.
  */
@@ -85,9 +85,9 @@ public class RelationshipChecker {
 
 	/**
 	 * Get a list of the object URIs that satisfy this statement:
-	 * 
+	 *
 	 * {@code <resourceUri> <propertyUri> <objectUri> }
-	 * 
+	 *
 	 * May return an empty list, but never returns null.
 	 */
 	public List<String> getObjectsOfProperty(String resourceUri,
@@ -116,11 +116,11 @@ public class RelationshipChecker {
 
 	/**
 	 * Get a list of the object URIs that satisfy these statements:
-	 * 
+	 *
 	 * {@code <resourceUri> <linkUri> <contextNodeUri> }
-	 * 
+	 *
 	 * {@code <contextNodeUri> <propertyUri> <objectUri> }
-	 * 
+	 *
 	 * May return an empty list, but never returns null.
 	 */
 	public List<String> getObjectsOfLinkedProperty(String resourceUri,
@@ -158,13 +158,13 @@ public class RelationshipChecker {
 	 * Get a list of URIs for object that link to the specified resource, by
 	 * means of the specified properties, through a linking node of the
 	 * specified type.
-	 * 
+	 *
 	 * So we're looking for object URIs that statisfy these statements:
-	 * 
+	 *
 	 * {@code <resourceUri> <property1Uri> <linkNodeUri> }
-	 * 
+	 *
 	 * {@code <linkNodeUri> rdfs:type <linkNodeTypeUri> }
-	 * 
+	 *
 	 * {@code <linkNodeUri> <property2Uri> <objectUri> }
 	 */
 	public List<String> getObjectsThroughLinkingNode(String resourceUri,
@@ -176,7 +176,7 @@ public class RelationshipChecker {
 				list.addAll(getObjectsOfProperty(linkNodeUri, property2Uri));
 			}
 		}
-		
+
 		return list;
 	}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/AuthorizationRequest.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/AuthorizationRequest.java
index 766977efe..80e3f32cf 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/AuthorizationRequest.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/AuthorizationRequest.java
@@ -9,7 +9,7 @@ import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
 
 /**
  * A base class for RequestedAction that permits boolean operations on them.
- * 
+ *
  * A null request is ignored, so in "and" it is equivalent to true, while in
  * "or" it is equivalent to false.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/SimpleRequestedAction.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/SimpleRequestedAction.java
index 313ff11f3..28ff5ba77 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/SimpleRequestedAction.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/SimpleRequestedAction.java
@@ -35,7 +35,7 @@ public class SimpleRequestedAction extends RequestedAction {
 		}
 		return false;
 	}
-	
+
 	private boolean equivalent(Object o1, Object o2) {
 		return (o1 == null) ? (o2 == null) : o1.equals(o2);
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/RequiresActions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/RequiresActions.java
index a5c16bbd8..7199b0f9f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/RequiresActions.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/RequiresActions.java
@@ -6,31 +6,31 @@ import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationReques
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 
 /**
- * Interface to objects that provide a list of Actions that are 
+ * Interface to objects that provide a list of Actions that are
  * required for the object to be used.
- * 
+ *
  * This is intended to provide a way to setup DataGetter
  * objects to be used with the FreemarkerHttpServlet.requiredActions()
  * method.
- * 
- * @author bdc34 
+ *
+ * @author bdc34
  */
 public interface RequiresActions {
-    
+
     /**
      * Returns Actions that are required to be authorized for
-     * the object to be used. 
-     * 
+     * the object to be used.
+     *
      * The code that is calling this method
-     * could use methods from PolicyHelper to check if the 
+     * could use methods from PolicyHelper to check if the
      * request has authorization to do these Actions. The code
      * calling this method would then have the ability to
-     * deny the action if it is not authorized. 
-     * 
+     * deny the action if it is not authorized.
+     *
      * @param vreq Vitro request
      * @return Should not be null. Return Actions.AUTHORIZED
      * if no authorization is required to do use the object.
      */
     public AuthorizationRequest requiredActions(VitroRequest vreq) ;
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/SingleParameterAction.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/SingleParameterAction.java
index de3131028..f460e4feb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/SingleParameterAction.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/SingleParameterAction.java
@@ -20,6 +20,6 @@ public abstract class SingleParameterAction extends RequestedAction {
 
     @Override
 	public String toString(){
-        return this.getClass().getName() + " <"+subjectUri+">"; 
+        return this.getClass().getName() + " <"+subjectUri+">";
     }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractDataPropertyStatementAction.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractDataPropertyStatementAction.java
index b1614eafb..2d9a17338 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractDataPropertyStatementAction.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractDataPropertyStatementAction.java
@@ -49,7 +49,7 @@ public abstract class AbstractDataPropertyStatementAction extends
 	public Property getPredicate() {
 	    return predicate;
 	}
-	
+
 	@Override
 	public String getPredicateUri() {
 		return predicateUri;
@@ -59,7 +59,7 @@ public abstract class AbstractDataPropertyStatementAction extends
 	public String[] getResourceUris() {
 		return new String[] {subjectUri};
 	}
-	
+
 	public String dataValue() {
 		return dataValue;
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractPropertyStatementAction.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractPropertyStatementAction.java
index 501870692..b0351a9d4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractPropertyStatementAction.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractPropertyStatementAction.java
@@ -29,6 +29,6 @@ public abstract class AbstractPropertyStatementAction extends RequestedAction {
 	public abstract String[] getResourceUris();
 
 	public abstract Property getPredicate();
-	
+
 	public abstract String getPredicateUri();
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ApplicationBean.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ApplicationBean.java
index c3d51788c..c083d44f3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ApplicationBean.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ApplicationBean.java
@@ -15,7 +15,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class ApplicationBean {
 	private static final Log log = LogFactory.getLog(ApplicationBean.class);
-	
+
     public final static int      CALS_SEARCHBOX_SIZE         = 25;
     public final static int      VIVO_SEARCHBOX_SIZE         = 20;
 
@@ -24,7 +24,7 @@ public class ApplicationBean {
     private final static int     DEFAULT_ROOT_LOGOTYPE_WIDTH  = 0;
     private final static int     DEFAULT_ROOT_LOGOTYPE_HEIGHT = 0;
     private final static String  DEFAULT_ROOT_LOGOTYPE_TITLE  = "";
-    
+
     // Value gets set in default theme setup context listener at application startup
     public static ThemeInfo themeInfo  = new ThemeInfo(null, "no_default_theme", new ArrayList<String>());
 
@@ -33,12 +33,12 @@ public class ApplicationBean {
     private boolean   initialized             = false;
     private String    sessionIdStr            = null;
     private String    applicationName         = DEFAULT_APPLICATION_NAME;
- 
+
     private String    rootLogotypeImage       = DEFAULT_ROOT_LOGOTYPE_IMAGE;
     private int       rootLogotypeWidth       = DEFAULT_ROOT_LOGOTYPE_WIDTH;
     private int       rootLogotypeHeight      = DEFAULT_ROOT_LOGOTYPE_HEIGHT;
     private String    rootLogotypeTitle       = DEFAULT_ROOT_LOGOTYPE_TITLE;
-    
+
     private String    aboutText;
     private String    acknowledgeText;
     private String    contactMail;
@@ -46,7 +46,7 @@ public class ApplicationBean {
     private String    copyrightURL;
     private String    copyrightAnchor;
     private String    themeDir;
-       
+
     public String toString() {
         String output = "Application Bean Contents:\n";
         output += "  initialized from DB:    [" + initialized             + "]\n";
@@ -84,7 +84,7 @@ public class ApplicationBean {
     public void setRootLogotypeTitle(String string_val) {
         rootLogotypeTitle=string_val;
     }
-    
+
     public void setAboutText(String string_val) {
         aboutText = string_val;
     }
@@ -92,7 +92,7 @@ public class ApplicationBean {
     public void setAcknowledgeText(String string_val) {
         acknowledgeText = string_val;
     }
-    
+
     public void setContactMail(String string_val) {
         contactMail = string_val;
     }
@@ -100,7 +100,7 @@ public class ApplicationBean {
     public void setCorrectionMail(String string_val) {
         correctionMail = string_val;
     }
-    
+
     public void setCopyrightURL(String string_val) {
         copyrightURL = string_val;
     }
@@ -108,7 +108,7 @@ public class ApplicationBean {
     public void setCopyrightAnchor(String string_val) {
         copyrightAnchor = string_val;
     }
-    
+
 	public void setThemeDir(String string_val) {
 		themeDir = string_val;
 	}
@@ -138,7 +138,7 @@ public class ApplicationBean {
     public String getRootLogotypeTitle() {
         return rootLogotypeTitle;
     }
-    
+
     public String getAboutText() {
         return aboutText;
     }
@@ -146,7 +146,7 @@ public class ApplicationBean {
     public String getAcknowledgeText() {
         return acknowledgeText;
     }
-    
+
     public String getContactMail() {
         return contactMail;
     }
@@ -154,7 +154,7 @@ public class ApplicationBean {
     public String getCorrectionMail() {
         return correctionMail;
     }
-    
+
     public String getCopyrightURL() {
         return copyrightURL;
     }
@@ -168,11 +168,11 @@ public class ApplicationBean {
     public String getRootBreadCrumbURL() {
     	return "";
     }
-    
+
     public String getRootBreadCrumbAnchor() {
     	return "";
     }
-    
+
     public String getShortHand() {
     	return "";
     }
@@ -194,9 +194,9 @@ public class ApplicationBean {
 	/**
 	 * Hold the names of the available themes, the name of the default theme,
 	 * and the base directory that contains the theme directories.
-	 * 
+	 *
 	 * The theme names are stored as simple strings, like "wilma".
-	 * 
+	 *
 	 * To be backwards compatible, we need to be able to test a string like
 	 * "themes/wilma/ to see whether it is available, or to return the default
 	 * directory in that form.
@@ -248,6 +248,6 @@ public class ApplicationBean {
 		}
 
 	}
-	
+
 }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java
index e51e7401b..9633414c3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/BaseResourceBean.java
@@ -17,18 +17,18 @@ import edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSets;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 
 public class BaseResourceBean implements ResourceBean {
-	
+
 	private static final Log log = LogFactory.getLog(BaseResourceBean.class.getName());
     protected String URI          = null;
     protected String namespace    = null;
     protected String localName    = null;
     protected String localNameWithPrefix = null;
     protected String pickListName = null;
-    
+
     protected RoleLevel hiddenFromDisplayBelowRoleLevel = null;
     protected RoleLevel prohibitedFromUpdateBelowRoleLevel = null;
     protected RoleLevel hiddenFromPublishBelowRoleLevel = null;
-    
+
 	public enum RoleLevel {
 		PUBLIC("http://vitro.mannlib.cornell.edu/ns/vitro/role#public",
 				"all users, including public", "all users who can log in",
@@ -78,7 +78,7 @@ public class BaseResourceBean implements ResourceBean {
 		public String getShorthand() {
 			return shorthand;
 		}
-		
+
 		// Never returns null.
 		public static RoleLevel getRoleByUri(String uri2) {
 			if (uri2 == null)
@@ -116,22 +116,22 @@ public class BaseResourceBean implements ResourceBean {
 	public BaseResourceBean() {
 	    // default constructor
 	}
-	
+
 	public BaseResourceBean(String uri) {
 	    buildLocalAndNS(uri);
 	}
-	
+
     @Override
-	public boolean isAnonymous() {        
+	public boolean isAnonymous() {
     	return (this.URI==null || VitroVocabulary.PSEUDO_BNODE_NS.equals(this.getNamespace()));
     }
-    
+
     @Override
 	public String getURI() {
         return URI;
     }
     @Override
-	public void setURI(String URI) {  
+	public void setURI(String URI) {
         if( this.localName != null || this.namespace != null)
             buildLocalAndNS(URI);
         else
@@ -150,11 +150,11 @@ public class BaseResourceBean implements ResourceBean {
             this.localName = uri.getLocalName();
         }
     }
-    
+
     @Override
 	public String getNamespace() {
         if( namespace == null && this.URI != null)
-            buildLocalAndNS(this.URI);        
+            buildLocalAndNS(this.URI);
         return namespace;
     }
     @Override
@@ -164,7 +164,7 @@ public class BaseResourceBean implements ResourceBean {
             this.URI = namespace + localName;
         }
     }
-    
+
     @Override
 	public String getLabel() {
         return getLocalName();
@@ -173,10 +173,10 @@ public class BaseResourceBean implements ResourceBean {
     @Override
 	public String getLocalName() {
         if( localName == null && this.URI != null)
-            buildLocalAndNS(this.URI);        
+            buildLocalAndNS(this.URI);
         return localName;
     }
-    
+
     @Override
 	public void setLocalName(String localName) {
         this.localName = localName;
@@ -186,33 +186,33 @@ public class BaseResourceBean implements ResourceBean {
     }
 
     public String getLocalNameWithPrefix() {
-        return localNameWithPrefix != null ? localNameWithPrefix : 
+        return localNameWithPrefix != null ? localNameWithPrefix :
                     getLocalName() != null ?  getLocalName() :
                         URI != null ? URI : "(no name)" ;
     }
     public void setLocalNameWithPrefix(String prefixedLocalName) {
         this.localNameWithPrefix = prefixedLocalName;
     }
-    
+
     @Override
 	public String getPickListName() {
-        return pickListName==null ? getLocalName()==null ? 
+        return pickListName==null ? getLocalName()==null ?
                 (URI==null ? "(no name)" : URI ): getLocalName() : pickListName;
     }
     public void setPickListName(String pickListName) {
         this.pickListName = pickListName;
     }
-    
+
     @Override
 	public RoleLevel getHiddenFromDisplayBelowRoleLevel() {
         return hiddenFromDisplayBelowRoleLevel;
     }
-    
+
     @Override
 	public void setHiddenFromDisplayBelowRoleLevel(RoleLevel level) {
         hiddenFromDisplayBelowRoleLevel = level;
     }
-    
+
     @Override
 	public void setHiddenFromDisplayBelowRoleLevelUsingRoleUri(String roleUri) {
         hiddenFromDisplayBelowRoleLevel = RoleLevel.getRoleByUri(roleUri);
@@ -222,12 +222,12 @@ public class BaseResourceBean implements ResourceBean {
 	public RoleLevel getProhibitedFromUpdateBelowRoleLevel() {
         return prohibitedFromUpdateBelowRoleLevel;
     }
-    
+
     @Override
 	public void setProhibitedFromUpdateBelowRoleLevel(RoleLevel level) {
         prohibitedFromUpdateBelowRoleLevel = level;
     }
-    
+
     @Override
 	public void setProhibitedFromUpdateBelowRoleLevelUsingRoleUri(String roleUri) {
         prohibitedFromUpdateBelowRoleLevel = RoleLevel.getRoleByUri(roleUri);
@@ -237,20 +237,20 @@ public class BaseResourceBean implements ResourceBean {
 	public RoleLevel getHiddenFromPublishBelowRoleLevel() {
         return hiddenFromPublishBelowRoleLevel;
 	}
-    
+
     @Override
 	public void setHiddenFromPublishBelowRoleLevel(RoleLevel level) {
         hiddenFromPublishBelowRoleLevel = level;
     }
-    
+
     @Override
 	public void setHiddenFromPublishBelowRoleLevelUsingRoleUri(String roleUri) {
     	hiddenFromPublishBelowRoleLevel = BaseResourceBean.RoleLevel.getRoleByUri(roleUri);
     }
-    
+
 	@Override
 	public boolean equals(Object obj) {
-		if(obj == null ) 
+		if(obj == null )
 			return false;
 		else if (obj instanceof BaseResourceBean ){
 			String thisURI = this.getURI();
@@ -259,9 +259,9 @@ public class BaseResourceBean implements ResourceBean {
 				return thisURI.equals(thatURI);
 			}
 		}
-		return obj.hashCode() == this.hashCode();			
+		return obj.hashCode() == this.hashCode();
 	}
-	
+
 	@Override
 	public int hashCode() {
 		if( getURI() != null )
@@ -270,5 +270,5 @@ public class BaseResourceBean implements ResourceBean {
 			return super.hashCode();
 	}
 
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/Classes2Classes.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/Classes2Classes.java
index db6c515f5..a9aa81ed2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/Classes2Classes.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/Classes2Classes.java
@@ -36,4 +36,4 @@ public class Classes2Classes {
     public String getSubclassLocalName(){ return subclassLocalName; }
     public void setSubclassLocalName(String subclassLocalName){ this.subclassLocalName=subclassLocalName;}
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataProperty.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataProperty.java
index 8b97fffa5..8ca2f8f39 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataProperty.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataProperty.java
@@ -21,9 +21,9 @@ public class DataProperty extends Property implements Comparable<DataProperty>,
 
     private String domainClassURI = null;
     private String rangeDatatypeURI = null;
-    
+
     private String editing = null;
-    
+
     private boolean functional = false;
 
     private String example = null;
@@ -38,7 +38,7 @@ public class DataProperty extends Property implements Comparable<DataProperty>,
     private boolean externalId = false;
 
     private List<DataPropertyStatement> dataPropertyStatements = null;
-    
+
     public DataProperty() { //default constructor needed since Property has one
         super();
     }
@@ -66,7 +66,7 @@ public class DataProperty extends Property implements Comparable<DataProperty>,
     public void setPublicName(String publicName) {
         this.publicName = publicName;
     }
-    
+
     public String getLabel() {
         return getPublicName();
     }
@@ -74,7 +74,7 @@ public class DataProperty extends Property implements Comparable<DataProperty>,
     public String getDomainClassURI() {
         return domainClassURI;
     }
-    
+
     @Override
     public String getDomainVClassURI() {
         return domainClassURI;
@@ -91,11 +91,11 @@ public class DataProperty extends Property implements Comparable<DataProperty>,
     public void setRangeDatatypeURI(String rangeDatatypeURI) {
         this.rangeDatatypeURI = rangeDatatypeURI;
     }
-    
+
     public void setEditing(String editing) {
     	this.editing = editing;
     }
-    
+
     public String getEditing() {
     	return this.editing;
     }
@@ -103,11 +103,11 @@ public class DataProperty extends Property implements Comparable<DataProperty>,
     public boolean getFunctional() {
     	return this.functional;
     }
-    
+
     public void setFunctional(boolean functional) {
     	this.functional = functional;
     }
-    
+
     public String getExample() {
         return example;
     }
@@ -123,7 +123,7 @@ public class DataProperty extends Property implements Comparable<DataProperty>,
     public void setDescription(String description) {
         this.description = description;
     }
-    
+
     public String getPublicDescription() {
         return publicDescription;
     }
@@ -185,10 +185,10 @@ public class DataProperty extends Property implements Comparable<DataProperty>,
     }
 
     public String toString(){
-        if( getURI() != null ) 
+        if( getURI() != null )
             return getURI();
-        else 
-            return "DataProperty without URI(" + hashCode() + ")"; 
+        else
+            return "DataProperty without URI(" + hashCode() + ")";
     }
 }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyComparator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyComparator.java
index 642ee49d8..5890a0d99 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyComparator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyComparator.java
@@ -9,8 +9,8 @@ import org.apache.commons.logging.LogFactory;
 
 import org.apache.jena.vocabulary.XSD;
 
-/* This class is used to order authorships on the add author form. It should be removed in favor of using whatever 
- * method is used to order authorships on the publication profile page instead. I've implemented this due to 
+/* This class is used to order authorships on the add author form. It should be removed in favor of using whatever
+ * method is used to order authorships on the publication profile page instead. I've implemented this due to
  * time constraints.
  */
 public class DataPropertyComparator implements Comparator<Individual> {
@@ -18,7 +18,7 @@ public class DataPropertyComparator implements Comparator<Individual> {
     private static final Log log = LogFactory.getLog(DataPropertyComparator.class);
 
     private String dataPropertyUri = null;
-    
+
     public DataPropertyComparator(String dataPropertyUri) {
         this.dataPropertyUri = dataPropertyUri;
     }
@@ -28,16 +28,16 @@ public class DataPropertyComparator implements Comparator<Individual> {
         DataPropertyStatement dps2 = ind2.getDataPropertyStatement(dataPropertyUri);
 
         int result;
-        
+
         // Push null values to the end of the list.
-        // Is this generally what's wanted? Or should this class be 
+        // Is this generally what's wanted? Or should this class be
         // NullLastDataPropertyComparator?
         if (dps1 == null) {
             result = (dps2 == null) ? 0 : 1;
         } else if (dps2 == null) {
             result = -1;
         } else {
-        
+
             String datatype = dps1.getDatatypeURI();
             if (datatype == null) {
                 datatype = dps2.getDatatypeURI();
@@ -47,14 +47,14 @@ public class DataPropertyComparator implements Comparator<Individual> {
                 // Perhaps we should throw an error here, but for now we need it to set the datatype
                 datatype = XSD.xint.toString();
             }
-            
+
             if (XSD.xint.toString().equals(datatype)) {
                 int i1 = Integer.valueOf(dps1.getData());
                 int i2 = Integer.valueOf(dps2.getData());
                 result = Integer.compare(i1, i2);
             }
             else if (XSD.xstring.toString().equals(datatype)) {
-                result = dps1.getData().compareTo(dps2.getData());            
+                result = dps1.getData().compareTo(dps2.getData());
             }
             // Fill in other types here
             else {
@@ -65,7 +65,7 @@ public class DataPropertyComparator implements Comparator<Individual> {
         }
         return result;
     }
-    
-    
+
+
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatement.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatement.java
index 4e1e95b70..630c90976 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatement.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatement.java
@@ -7,11 +7,11 @@ package edu.cornell.mannlib.vitro.webapp.beans;
  *
  */
 public interface DataPropertyStatement {
-    
+
     public Individual getIndividual();
-    
+
     public void setIndividual(Individual individual);
-    
+
     public String getIndividualURI();
 
     public void setIndividualURI(String individualURI);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatementImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatementImpl.java
index 98768ea56..8da7a7743 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatementImpl.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatementImpl.java
@@ -14,7 +14,7 @@ public class DataPropertyStatementImpl implements DataPropertyStatement
     private String datapropURI = null;
     private String datatypeURI = null;
     private String language = null;
-    
+
     public DataPropertyStatementImpl(){
     }
 
@@ -23,7 +23,7 @@ public class DataPropertyStatementImpl implements DataPropertyStatement
             this.individualURI = individual.getURI();
         }
     }
-    
+
     public DataPropertyStatementImpl(String individualUri, String propertyUri, String data){
         individualURI = individualUri;
         datapropURI = propertyUri;
@@ -33,11 +33,11 @@ public class DataPropertyStatementImpl implements DataPropertyStatement
     public Individual getIndividual() {
         return this.individual;
     }
-    
+
     public void setIndividual(Individual individual) {
         this.individual = individual;
     }
-    
+
     public String getIndividualURI() {
         return individualURI;
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DisplayMessage.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DisplayMessage.java
index 00bd4c59a..421ea2533 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DisplayMessage.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/DisplayMessage.java
@@ -41,7 +41,7 @@ public class DisplayMessage {
 	/**
 	 * Get the current message from the session, and remove it from the session
 	 * so it won't be displayed again.
-	 * 
+	 *
 	 * If there is no message, return the empty string.
 	 */
 	public static String getMessageAndClear(HttpServletRequest request) {
@@ -55,7 +55,7 @@ public class DisplayMessage {
 	/**
 	 * Get the current message from the session, and remove it from the session
 	 * so it won't be displayed again.
-	 * 
+	 *
 	 * If there is no message, return the empty string.
 	 */
 	public static String getMessageAndClear(HttpSession session) {
@@ -64,14 +64,14 @@ public class DisplayMessage {
 			Object sessionMessage = session.getAttribute(ATTRIBUTE_NAME);
 			if (sessionMessage != null) {
     			if (sessionMessage instanceof String) {
-    				log.debug("Get message: '" + sessionMessage + "'");    				
+    				log.debug("Get message: '" + sessionMessage + "'");
     				message = (String) sessionMessage;
-    			} 
-    			session.removeAttribute(ATTRIBUTE_NAME);	
+    			}
+    			session.removeAttribute(ATTRIBUTE_NAME);
 			} else {
 			    log.debug("Get no message.");
 			}
-		}				
+		}
 		return message;
 	}
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java
index 167c388a0..7eeb8ef43 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/FauxProperty.java
@@ -45,7 +45,7 @@ public class FauxProperty extends BaseResourceBean implements ResourceBean,
 	/**
 	 * Arguments are in this order to mimic the relationship: subject ==&gt;
 	 * property ==&gt; object
-	 * 
+	 *
 	 * @param domainURI
 	 *            URI of the subject class. May be null.
 	 * @param baseURI
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/Individual.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/Individual.java
index 704063a55..df780d918 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/Individual.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/Individual.java
@@ -17,10 +17,10 @@ public interface Individual extends ResourceBean, Comparable<Individual> {
     String getName();
     void setName(String in);
 
-    /** 
+    /**
      * Returns an rdfs:label if there is one on the individual.  Returns null
      * if none can be found.  If more than one rdfs:label can be found for the individual
-     * one of the labels will be returned, which one is undefined.  
+     * one of the labels will be returned, which one is undefined.
      */
     String getRdfsLabel();
     void setRdfsLabel(String in);
@@ -43,44 +43,44 @@ public interface Individual extends ResourceBean, Comparable<Individual> {
      */
     List<ObjectProperty> getPopulatedObjectPropertyList();
     void setPopulatedObjectPropertyList(List<ObjectProperty> propertyList);
-    
+
     Map<String,ObjectProperty> getObjectPropertyMap();
     void setObjectPropertyMap(Map<String,ObjectProperty> propertyMap);
-    
+
     List<DataProperty> getDataPropertyList();
     void setDatatypePropertyList(List<DataProperty> datatypePropertyList);
 
     List<DataProperty> getPopulatedDataPropertyList();
     void setPopulatedDataPropertyList(List<DataProperty> dataPropertyList);
-    
+
     Map<String,DataProperty> getDataPropertyMap();
     void setDataPropertyMap(Map<String,DataProperty> propertyMap);
-    
+
     void setDataPropertyStatements(List<DataPropertyStatement> list);
     List<DataPropertyStatement> getDataPropertyStatements();
     List<DataPropertyStatement> getDataPropertyStatements(String propertyUri);
     DataPropertyStatement getDataPropertyStatement(String propertyUri);
-    
+
     List<String> getDataValues(String propertyUri);
     String getDataValue(String propertyUri);
 
     VClass getVClass();
     void setVClass(VClass class1);
-    
+
     List<VClass> getVClasses();
-    
+
     List<VClass> getVClasses(boolean direct);
     void setVClasses(List<VClass> vClassList, boolean direct);
-    
+
     /** Does the individual belong to this class? */
     boolean isVClass(String uri);
-    
+
     List<String> getMostSpecificTypeURIs();
 
     void setObjectPropertyStatements(List<ObjectPropertyStatement> list);
     List<ObjectPropertyStatement> getObjectPropertyStatements();
     List<ObjectPropertyStatement> getObjectPropertyStatements(String propertyUri);
-    
+
     List<Individual> getRelatedIndividuals(String propertyUri);
     Individual getRelatedIndividual(String propertyUri);
 
@@ -89,7 +89,7 @@ public interface Individual extends ResourceBean, Comparable<Individual> {
 
     void setMainImageUri(String mainImageUri);
     String getMainImageUri();
-    
+
     String getImageUrl();
     String getThumbUrl();
     boolean hasThumb();
@@ -97,13 +97,13 @@ public interface Individual extends ResourceBean, Comparable<Individual> {
     void sortForDisplay();
 
     JsonNode toJSON();
-    
+
     Float getSearchBoost();
     void setSearchBoost( Float boost );
-    
+
     String getSearchSnippet();
     void setSearchSnippet( String snippet );
-    
+
     /**
      * This is crap. It was put in so IndividualFiltering could filter object properties properly,
      * but what we really need is either: filters have a reference to a webappDaoFactory, or
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java
index eb36922ce..5ce3509e8 100755
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java
@@ -51,12 +51,12 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp
     protected ImageInfo imageInfo = null;
     protected Float searchBoost;
     protected String searchSnippet;
-    
+
     /** indicates if sortForDisplay has been called  */
     protected boolean sorted = false;
     protected boolean DIRECT = true;
     protected boolean ALL = false;
-    
+
     public IndividualImpl() {
     }
 
@@ -76,7 +76,7 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp
     public void setName(String in){name=in;}
 
     public String getRdfsLabel(){ return rdfsLabel; }
-    public void setRdfsLabel(String s){ rdfsLabel = s; }    	
+    public void setRdfsLabel(String s){ rdfsLabel = s; }
 
     public String getVClassURI(){return vClassURI;}
     public void setVClassURI(String in){vClassURI=in;}
@@ -134,7 +134,7 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp
     public List<DataPropertyStatement> getDataPropertyStatements(){
         return dataPropertyStatements;
     }
-    
+
     public List<DataPropertyStatement> getDataPropertyStatements(String propertyUri) {
         List<DataPropertyStatement> stmts = getDataPropertyStatements();
         List<DataPropertyStatement> stmtsForProp = new ArrayList<DataPropertyStatement>();
@@ -143,15 +143,15 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp
                 stmtsForProp.add(stmt);
             }
         }
-        return stmtsForProp;        
+        return stmtsForProp;
     }
 
     public DataPropertyStatement getDataPropertyStatement(String propertyUri) {
         List<DataPropertyStatement> stmts = getDataPropertyStatements(propertyUri);
-        return stmts.isEmpty() ? null : stmts.get(0);       
+        return stmts.isEmpty() ? null : stmts.get(0);
     }
-    
-    public List<String> getDataValues(String propertyUri) {     
+
+    public List<String> getDataValues(String propertyUri) {
         List<DataPropertyStatement> stmts = getDataPropertyStatements(propertyUri);
         List<String> dataValues = new ArrayList<String>(stmts.size());
         for (DataPropertyStatement stmt : stmts) {
@@ -159,7 +159,7 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp
         }
         return dataValues;
     }
- 
+
     public String getDataValue(String propertyUri) {
         List<DataPropertyStatement> stmts = getDataPropertyStatements(propertyUri);
         return stmts.isEmpty() ? null : stmts.get(0).getData();
@@ -171,11 +171,11 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp
     public void setVClass(VClass class1) {
         vClass = class1;
     }
-    
+
     public List<VClass> getVClasses() {
     	return allVClasses;
     }
-    
+
     @Override
 	public boolean isVClass(String uri) {
     	if (uri == null) {
@@ -196,15 +196,15 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp
     		return allVClasses;
     	}
     }
-    
+
     public void setVClasses(List<VClass> vClassList, boolean direct) {
     	if (direct) {
-    		this.directVClasses = vClassList; 
+    		this.directVClasses = vClassList;
     	} else {
     		this.allVClasses = vClassList;
     	}
     }
-    
+
     @Override
     public List<String> getMostSpecificTypeURIs() {
         List<String> typeURIs = new ArrayList<String>();
@@ -226,7 +226,7 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp
     public List <ObjectPropertyStatement> getObjectPropertyStatements(){
         return objectPropertyStatements;
     }
-    
+
     public List<ObjectPropertyStatement> getObjectPropertyStatements(String propertyUri) {
         List<ObjectPropertyStatement> stmts = getObjectPropertyStatements();
         List<ObjectPropertyStatement> stmtsForProp = new ArrayList<ObjectPropertyStatement>();
@@ -237,18 +237,18 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp
         }
         return stmtsForProp;
     }
-    
+
     public List<Individual> getRelatedIndividuals(String propertyUri) {
         List<ObjectPropertyStatement> stmts = getObjectPropertyStatements(propertyUri);
         List<Individual> relatedIndividuals = new ArrayList<Individual>(stmts.size());
         for (ObjectPropertyStatement stmt : stmts) {
             relatedIndividuals.add(stmt.getObject());
         }
-        return relatedIndividuals;       
+        return relatedIndividuals;
     }
-    
+
     public Individual getRelatedIndividual(String propertyUri) {
-        List<ObjectPropertyStatement> stmts = getObjectPropertyStatements(propertyUri);    
+        List<ObjectPropertyStatement> stmts = getObjectPropertyStatements(propertyUri);
         return stmts.isEmpty() ? null : stmts.get(0).getObject();
     }
 
@@ -258,7 +258,7 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp
     public void setExternalIds(List<DataPropertyStatement> externalIds){
         this.externalIds = externalIds;
     }
-    
+
 	@Override
 	public String getMainImageUri() {
 		return (mainImageUri == NOT_INITIALIZED) ? null : mainImageUri;
@@ -280,12 +280,12 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp
 		return "thumbUrl";
 	}
 
-    public Float getSearchBoost() { return searchBoost;  }    
+    public Float getSearchBoost() { return searchBoost;  }
     public void setSearchBoost(Float boost) { searchBoost = boost; }
-    
+
     public String getSearchSnippet() { return searchSnippet; }
     public void setSearchSnippet(String snippet) { searchSnippet = snippet; }
-    
+
     /**
      * Sorts the ents2ents records into the proper order for display.
      *
@@ -335,11 +335,11 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp
            return getURI() + " " + getName();
        }
    }
-    
+
     public boolean hasThumb() {
         return getThumbUrl() != null && ! getThumbUrl().isEmpty();
     }
-    
+
 	@Override
 	public void resolveAsFauxPropertyStatements(List<ObjectPropertyStatement> list) {
 		// No webappDaoFactory, so nothing to do.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java
index 05c27ed83..fa7f261bf 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java
@@ -26,7 +26,7 @@ import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.RoleRestrictedProperty;
 public class ObjectProperty extends Property implements Comparable<ObjectProperty>, ResourceBean, Cloneable, RoleRestrictedProperty
 {
 	private static final Log log = LogFactory.getLog(ObjectProperty.class.getName());
-	
+
     private String parentURI = null;
 
     private String domainVClassURI = null;
@@ -43,7 +43,7 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
     private boolean symmetric = false;
     private boolean functional = false;
     private boolean inverseFunctional = false;
-    
+
     private List<ObjectPropertyStatement> objectPropertyStatements = null;
     private String example = null;
     private String description = null;
@@ -58,17 +58,17 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
     private Integer domainDisplayLimit = null;
 
     private String objectIndividualSortPropertyURI = null;
-    
+
     private String rangeEntitySortDirection = null;
     private Integer rangeDisplayTier = null;
     private Integer rangeDisplayLimit = null;
-    
+
     private boolean selectFromExisting = true;
     private boolean offerCreateNewOption = false;
     private boolean stubObjectRelation = false;
-    
+
     private boolean collateBySubclass = false;
-    
+
     public ObjectProperty() {
         super();
     }
@@ -83,7 +83,7 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
     public String getDomainVClassURI() {
         return domainVClassURI;
     }
-    
+
     @Override
     public void setDomainVClassURI(String domainClassURI) {
         this.domainVClassURI = domainClassURI;
@@ -99,7 +99,7 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
     public String getLabel() {
         return getDomainPublic();
     }
-    
+
     public String getDomainPublic() {
         return domainPublic;
     }
@@ -118,12 +118,12 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
     public void setParentURI(String parentURI) {
         this.parentURI = parentURI;
     }
-    
+
     @Override
     public String getRangeVClassURI() {
         return rangeVClassURI;
     }
-    
+
     @Override
     public void setRangeVClassURI(String rangeClassURI) {
         this.rangeVClassURI = rangeClassURI;
@@ -210,35 +210,35 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
             this.URIInverse = namespaceInverse + localNameInverse;
         }
     }
-    
+
     public boolean getTransitive() {
     	return transitive;
     }
-    
+
     public void setTransitive(boolean transitive) {
     	this.transitive = transitive;
     }
-    
+
     public boolean getSymmetric() {
     	return symmetric;
     }
-    
+
     public void setSymmetric(boolean symmetric) {
     	this.symmetric = symmetric;
     }
-    
+
     public boolean getFunctional() {
     	return functional;
     }
-    
+
     public void setFunctional(boolean functional) {
     	this.functional = functional;
     }
-    
+
     public boolean getInverseFunctional() {
     	return inverseFunctional;
     }
-    
+
     public void setInverseFunctional(boolean inverseFunctional) {
     	this.inverseFunctional = inverseFunctional;
     }
@@ -246,11 +246,11 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
 	public void setCollateBySubclass(boolean collate) {
 		collateBySubclass = collate;
 	}
-	
+
 	public boolean getCollateBySubclass() {
 		return collateBySubclass;
 	}
-    
+
     /**
      * adds a single ObjectPropertyStatement object to Property's object property statements List.
      */
@@ -284,7 +284,7 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
     }
     /**
      * @return display tier, or null for an unset value
-     */    
+     */
     public Integer getDomainDisplayTierInteger() {
         return domainDisplayTier;
     }
@@ -342,27 +342,27 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
     public boolean getSelectFromExisting() {
         return selectFromExisting;
     }
-    
+
     public void setSelectFromExisting(boolean b) {
         this.selectFromExisting = b;
     }
-    
+
     public boolean getOfferCreateNewOption() {
         return offerCreateNewOption;
     }
-    
+
     public void setOfferCreateNewOption(boolean b) {
         this.offerCreateNewOption = b;
     }
-    
+
     public boolean getStubObjectRelation() {
         return stubObjectRelation;
     }
-    
+
     public void setStubObjectRelation(boolean b) {
         this.stubObjectRelation = b;
-    }    
-    
+    }
+
     /**
      * Sorts alphabetically by public name
      */
@@ -385,14 +385,14 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
             tier2 = (tier2 == null) ? 0 : tier2;
             return tier1 - tier2;
         }
-    }  
-    
+    }
+
     /**
      * Sorts the object property statements taking into account the sort order.
      */
     public static List<ObjectPropertyStatement> sortObjectPropertyStatementsForDisplay(
     		ObjectProperty prop, List objPropStmtsList) {
-    	
+
         if (objPropStmtsList == null) {
             log.error("incoming object property statement list is null; " +
             		  "returning null");
@@ -401,27 +401,27 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
         if (objPropStmtsList.size() < 2) { // no need to sort
             return objPropStmtsList;
         }
-        
-        String tmpDirection = prop.getDomainEntitySortDirection(); 
+
+        String tmpDirection = prop.getDomainEntitySortDirection();
         // Valid values are "desc" and "asc";
         // anything else will default to ascending.
         final boolean ascending = !"desc".equalsIgnoreCase(tmpDirection);
 
         String objIndivSortPropURI = prop.getObjectIndividualSortPropertyURI();
-        if (prop.getObjectIndividualSortPropertyURI() == null 
+        if (prop.getObjectIndividualSortPropertyURI() == null
         		|| prop.getObjectIndividualSortPropertyURI().length() == 0) {
             log.debug("objectIndividualSortPropertyURI is null or blank " +
                       "so sorting by name ");
-            
+
             Comparator fieldComp = new Comparator() {
-                
+
                 public final int compare(Object o1, Object o2) {
-                    ObjectPropertyStatement e2e1 = (ObjectPropertyStatement) o1, 
+                    ObjectPropertyStatement e2e1 = (ObjectPropertyStatement) o1,
                                             e2e2 = (ObjectPropertyStatement) o2;
                     Individual e1 , e2;
                     e1 = e2e1 != null ? e2e1.getObject():null;
                     e2 = e2e2 != null ? e2e2.getObject():null;
-    
+
                     Object val1 = null, val2 = null;
                     if( e1 != null ) {
                         val1 = e1.getName();
@@ -442,7 +442,7 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
                         		rv = -1;
                         	} else {
                                 Collator collator = Collator.getInstance();
-                            	rv = collator.compare( ((String)val1) , ((String)val2) );                		
+                            	rv = collator.compare( ((String)val1) , ((String)val2) );
                         	}
                         } else if( val1 instanceof Date ) {
                             DateTime dt1 = new DateTime((Date)val1);
@@ -454,7 +454,7 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
                     } catch (NullPointerException e) {
                         e.printStackTrace();
                     }
-    
+
                     if( ascending ) {
                         return rv;
                     } else {
@@ -472,13 +472,13 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
             final String objIndSortPropURI = prop.getObjectIndividualSortPropertyURI();
             Comparator dpComp = new Comparator() {
                 final String cDatapropURI = objIndSortPropURI;
-    
+
                 public final int compare(Object o1, Object o2){
                     ObjectPropertyStatement e2e1= (ObjectPropertyStatement)o1, e2e2=(ObjectPropertyStatement)o2;
                     Individual e1 , e2;
                     e1 = e2e1 != null ? e2e1.getObject():null;
                     e2 = e2e2 != null ? e2e2.getObject():null;
-    
+
                     Object val1 = null, val2 = null;
                     if( e1 != null ){
                         try {
@@ -499,7 +499,7 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
                         }
                     } else
                         log.debug( "PropertyWebapp.sortObjectPropertiesForDisplay passed object property statement with no range entity.");
-    
+
                     if( e2 != null ){
                         try {
                             List<DataPropertyStatement> dataPropertyStatements = e2.getDataPropertyStatements();
@@ -521,14 +521,14 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
                         log.debug( "PropertyWebapp.sortObjectPropertyStatementsForDisplay passed object property statement with no range entity.");
                     }
                     int rv = 0;
-                    try {	
+                    try {
                     	if (val1 == null && val2 == null) {
                     		 rv = 0;
                     	} else if (val1==null) {
                              rv = 1;
                         } else if (val2==null) {
                              rv = -1;
-                        }  else {                        
+                        }  else {
 	                           if( val1 instanceof String ) {
 	                              Collator collator = Collator.getInstance();
 	                              rv = collator.compare( ((String)val1) , ((String)val2) ); //was rv = ((String)val1).compareTo((String)val2);
@@ -545,19 +545,19 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
                     } catch (NullPointerException e) {
                         e.printStackTrace();
                     }
- 
-                    
+
+
                     if ( !ascending ) {
                     	rv = rv * -1;
                     }
-                    
+
                     // sort alphabetically by name if have same dataproperty value
                     if ( rv == 0 ) {
                     	String nameValue1 = ( e1.getName() != null ) ? e1.getName() : "";
                     	String nameValue2 = ( e2.getName() != null ) ? e2.getName() : "";
                     	rv = Collator.getInstance().compare( nameValue1, nameValue2 );
                     }
-                    
+
                     return rv;
                 }
             };
@@ -611,7 +611,7 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
         "offerCreateNewOption" + getOfferCreateNewOption() + "\n\t" +
         "** object property statements: " + list + "\n";
     }
-    
+
     @Override
     public ObjectProperty clone()
     {
@@ -660,6 +660,6 @@ public class ObjectProperty extends Property implements Comparable<ObjectPropert
         clone.setTransitive(this.getTransitive());
         clone.setURI(this.getURI());
         clone.setURIInverse(this.getURIInverse());
-        return clone;     
+        return clone;
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatement.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatement.java
index ea381929f..06f41ebc7 100755
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatement.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatement.java
@@ -32,4 +32,4 @@ public interface ObjectPropertyStatement {
 
     public PropertyInstance toPropertyInstance();
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatementImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatementImpl.java
index c13ebeb4b..6293aa394 100755
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatementImpl.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatementImpl.java
@@ -17,14 +17,14 @@ public class ObjectPropertyStatementImpl implements ObjectPropertyStatement
 
     private String propertyURI = null;
     private ObjectProperty property = null;
-    private boolean subjectOriented = true; //is the range the item of interest?  
-    
+    private boolean subjectOriented = true; //is the range the item of interest?
+
    public ObjectPropertyStatementImpl() { }
 
    public ObjectPropertyStatementImpl(String subjectUri, String propertyUri, String objectUri) {
         subjectURI = subjectUri;
         propertyURI = propertyUri;
-        objectURI = objectUri;        
+        objectURI = objectUri;
     }
 
     /* (non-Javadoc)
@@ -82,7 +82,7 @@ public class ObjectPropertyStatementImpl implements ObjectPropertyStatement
     public void setSubject(Individual subject) {
         this.subject = subject;
         if (subject == null || subject.isAnonymous()) {
-            setSubjectURI(null);    
+            setSubjectURI(null);
         } else {
             setSubjectURI(subject.getURI());
         }
@@ -123,7 +123,7 @@ public class ObjectPropertyStatementImpl implements ObjectPropertyStatement
     public void setObject(Individual object) {
         this.object = object;
         if (object == null || object.isAnonymous()) {
-            setObjectURI(null);    
+            setObjectURI(null);
         } else {
             setObjectURI(object.getURI());
         }
@@ -147,10 +147,10 @@ public class ObjectPropertyStatementImpl implements ObjectPropertyStatement
      * Sorts entity object for display presentation.
      * @author bdc34
      */
-    public static class DisplayComparator implements Comparator{    	    	
+    public static class DisplayComparator implements Comparator{
         public int compare(Object o1, Object o2) {
             Individual ent1 = ((ObjectPropertyStatement) o1).getSubject();
-            Individual ent2 = ((ObjectPropertyStatement) o2).getSubject();            
+            Individual ent2 = ((ObjectPropertyStatement) o2).getSubject();
             return ent1.getName().compareTo(ent2.getName());
         }
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/Ontology.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/Ontology.java
index edd6d8142..e3f42bd6e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/Ontology.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/Ontology.java
@@ -14,9 +14,9 @@ import org.apache.commons.logging.LogFactory;
  */
 public class Ontology implements Comparable<Ontology>
 {
-	
+
 	private static final Log log = LogFactory.getLog(Ontology.class.getName());
-	
+
     private int myID = -1;
     public int getId()          { return myID; }
     public void setId( int id ) { myID = id; }
@@ -28,7 +28,7 @@ public class Ontology implements Comparable<Ontology>
     private String myType = null;
     public String getType()             { return myType; }
     public void setType( String type )  { myType = type; }
-    
+
     private String myPrefix = null;
     public String getPrefix()               { return myPrefix; }
     public void setPrefix( String prefix )  { myPrefix = prefix; }
@@ -52,7 +52,7 @@ public class Ontology implements Comparable<Ontology>
     private List myEntitiesList = null;
     public List getEntsList()                  { return myEntitiesList; }
     public void setEntsList( List entsList )   { myEntitiesList = entsList; }
-    
+
     public int compareTo(Ontology o2) {
     	Collator collator = Collator.getInstance();
         if (o2 == null) {
@@ -61,7 +61,7 @@ public class Ontology implements Comparable<Ontology>
         }
         return collator.compare(this.getName(), o2.getName());
     }
-    
+
 	@Override
 	public String toString() {
 		return "Ontology[myID=" + myID + ", myName=" + myName + ", myType="
@@ -70,5 +70,5 @@ public class Ontology implements Comparable<Ontology>
 				+ myVClassesList + ", myPropsList=" + myPropsList
 				+ ", myEntitiesList=" + myEntitiesList + "]";
 	}
-    
-}
\ No newline at end of file
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/Property.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/Property.java
index 80c6140f9..ce98feaa1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/Property.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/Property.java
@@ -10,7 +10,7 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.jena.rdf.model.ResourceFactory;
 
 public class Property extends BaseResourceBean implements ResourceBean {
-    
+
     private static Log log = LogFactory.getLog( Property.class );
 
     private String  customEntryForm       = null;
@@ -22,12 +22,12 @@ public class Property extends BaseResourceBean implements ResourceBean {
     private boolean editLinkSuppressed    = false;
     private boolean addLinkSuppressed     = false;
     private boolean deleteLinkSuppressed  = false;
-    
+
     public Property() {
         this.groupURI = null;
         this.label = null;
     }
-    
+
     public Property(String URI) {
         this.setURI(URI);
     }
@@ -35,81 +35,81 @@ public class Property extends BaseResourceBean implements ResourceBean {
     public String getCustomEntryForm() {
         return customEntryForm;
     }
-    
+
     public void setCustomEntryForm(String s) {
         this.customEntryForm = s;
     }
-    
-	public String getGroupURI() { 
+
+	public String getGroupURI() {
 		return groupURI;
 	}
 	public void setGroupURI(String in) {
 		this.groupURI = in;
 	}
-	
+
     public String getLabel() {
         return label;
     }
     public void setLabel(String label) {
         this.label = label;
     }
-    
+
     public String getDomainVClassURI() {
         return this.domainVClassURI;
     }
-    
+
     public void setDomainVClassURI(String domainVClassURI) {
         this.domainVClassURI = domainVClassURI;
     }
-    
+
     public String getRangeVClassURI() {
         return this.rangeVClassURI;
     }
-    
+
     public void setRangeVClassURI(String rangeVClassURI) {
         this.rangeVClassURI = rangeVClassURI;
     }
-    
+
     public boolean isSubjectSide() {
         return subjectSide;
     }
-    
+
     public boolean isEditLinkSuppressed() {
         return editLinkSuppressed;
     }
-    
+
     public boolean isAddLinkSuppressed() {
         return addLinkSuppressed;
     }
-    
+
     public boolean isDeleteLinkSuppressed() {
         return deleteLinkSuppressed;
     }
-    
+
     public void setEditLinkSuppressed(boolean editLinkSuppressed) {
         this.editLinkSuppressed = editLinkSuppressed;
     }
-    
+
     public void setAddLinkSuppressed(boolean addLinkSuppressed) {
         if (this.addLinkSuppressed) {
             throw new RuntimeException("addLinkSuppressed already true");
         }
         this.addLinkSuppressed = addLinkSuppressed;
     }
-    
+
     public void setDeleteLinkSuppressed(boolean deleteLinkSuppressed) {
         this.deleteLinkSuppressed = deleteLinkSuppressed;
     }
-    
+
 	@Override
 	public String toString() {
-		return this.getClass().getSimpleName() + "[" 
+		return this.getClass().getSimpleName() + "["
 				+ localNameFor(getURI())
-				+ ", domain=" + localNameFor(getDomainVClassURI()) 
-				+ ", range=" + localNameFor(getRangeVClassURI()) 
+				+ ", domain=" + localNameFor(getDomainVClassURI())
+				+ ", range=" + localNameFor(getRangeVClassURI())
 				+ "]";
 	}
-    
+
 	private String localNameFor(String uri) {
 		try {
 			return ResourceFactory.createResource(uri).getLocalName();
@@ -122,24 +122,24 @@ public class Property extends BaseResourceBean implements ResourceBean {
      * Sorts Property objects, by property rank, then alphanumeric.
      * @author bdc34
      */
-    public static class DisplayComparatorIgnoringPropertyGroup implements Comparator {        
+    public static class DisplayComparatorIgnoringPropertyGroup implements Comparator {
         public int compare(Object o1, Object o2) {
             //log.warn("starting property display comparator; ignoring group ");
             Property p1 = o1 == null ? null : (Property) o1;
             Property p2 = o2 == null ? null : (Property) o2;
-            if (p1==null || p2==null) {                
+            if (p1==null || p2==null) {
                 return 0;
             }
             //log.warn("comparing property "+p1.getLocalName()+" (rank "+determineDisplayRank(p1)+") to property "+p2.getLocalName()+" (rank "+determineDisplayRank(p2)+") ...");
             int diff = determineDisplayRank(p1) - determineDisplayRank(p2);
             if (diff==0) {
-                String p1Str = p1.getLabel() == null ? p1.getURI() : p1.getLabel();                
-                String p2Str = p2.getLabel() == null ? p2.getURI() : p2.getLabel();                
+                String p1Str = p1.getLabel() == null ? p1.getURI() : p1.getLabel();
+                String p2Str = p2.getLabel() == null ? p2.getURI() : p2.getLabel();
                 return p1Str.compareTo(p2Str);
             }
             return diff;
         }
-        
+
         private int determineDisplayRank(Property p) {
             if (p instanceof DataProperty) {
                 DataProperty dp = (DataProperty) p;
@@ -148,7 +148,7 @@ public class Property extends BaseResourceBean implements ResourceBean {
                 ObjectProperty op = (ObjectProperty) p;
                 return op.getDomainDisplayTier();
             } else {
-                log.error("Property is of unknown class in PropertyRanker()");  
+                log.error("Property is of unknown class in PropertyRanker()");
             }
             return 0;
         }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/PropertyGroup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/PropertyGroup.java
index f76d026b5..0d7fce6a8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/PropertyGroup.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/PropertyGroup.java
@@ -9,55 +9,55 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 public class PropertyGroup extends BaseResourceBean implements Comparable<PropertyGroup> {
-    
+
     private static final Log log = LogFactory.getLog(PropertyGroup.class.getName());
-    
+
 	private int displayRank;
 	private String name;
 	private List<Property> propertyList;
 	private int statementCount;
 	private String publicDescription;
-	
+
 	public int getDisplayRank() {
 		return this.displayRank;
 	}
-	
+
 	public void setDisplayRank(int in) {
 		this.displayRank = in;
 	}
-	
+
 	public String getName() {
 		return this.name;
 	}
-	
+
 	public void setName(String in) {
 		this.name = in;
 	}
-	
+
 	public List<Property> getPropertyList() {
 		return this.propertyList;
 	}
-	
+
 	public void setPropertyList(List<Property> in) {
 		this.propertyList = in;
 	}
-	
+
 	public int getStatementCount() {
 	    return statementCount;
 	}
-	
+
 	public void setStatementCount(int count) {
 	    statementCount = count;
 	}
-	
+
 	public String getPublicDescription() {
 	    return publicDescription;
 	}
-	
+
 	public void setPublicDescription(String s) {
 	    publicDescription = s;
 	}
-			
+
 
 
     /**
@@ -75,5 +75,5 @@ public class PropertyGroup extends BaseResourceBean implements Comparable<Proper
         }
         return diff;
     }
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstance.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstance.java
index 61b0600e3..afbefae21 100755
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstance.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstance.java
@@ -170,7 +170,7 @@ public class PropertyInstance implements PropertyInstanceIface, Comparable<Prope
         }
         return out;
     }
-    
+
     public int compareTo(PropertyInstance pi) {
 
         try {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ResourceBean.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ResourceBean.java
index 65d8dd1cb..1e8a2cdfb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ResourceBean.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ResourceBean.java
@@ -10,9 +10,9 @@ import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
  * Time: 3:41:23 PM
  */
 public interface ResourceBean {
-    
+
     String getURI();
-    
+
     boolean isAnonymous();
 
     void setURI(String URI);
@@ -24,27 +24,27 @@ public interface ResourceBean {
     String getLocalName();
 
     void setLocalName(String localName);
-    
+
     String getLabel();
-    
+
     public RoleLevel getHiddenFromDisplayBelowRoleLevel() ;
-    
+
     public void setHiddenFromDisplayBelowRoleLevel(RoleLevel eR) ;
-    
+
     public void setHiddenFromDisplayBelowRoleLevelUsingRoleUri(String roleUri) ;
 
     public RoleLevel getProhibitedFromUpdateBelowRoleLevel() ;
-    
+
     public void setProhibitedFromUpdateBelowRoleLevel(RoleLevel eR) ;
-    
+
     public void setProhibitedFromUpdateBelowRoleLevelUsingRoleUri(String roleUri) ;
-  
+
     public RoleLevel getHiddenFromPublishBelowRoleLevel() ;
-    
+
     public void setHiddenFromPublishBelowRoleLevel(RoleLevel eR) ;
-    
+
     public void setHiddenFromPublishBelowRoleLevelUsingRoleUri(String roleUri) ;
-    
+
     public String getPickListName();
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/SelfEditingConfiguration.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/SelfEditingConfiguration.java
index ce76b4819..06eab4472 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/SelfEditingConfiguration.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/SelfEditingConfiguration.java
@@ -40,7 +40,7 @@ public class SelfEditingConfiguration {
 	/**
 	 * Get the bean from the context. If there no bean, create one on the fly
 	 * and store it in the context.
-	 * 
+	 *
 	 * Never returns null.
 	 */
 	public static SelfEditingConfiguration getBean(ServletRequest request) {
@@ -61,7 +61,7 @@ public class SelfEditingConfiguration {
 	/**
 	 * Get the bean from the context. If there no bean, create one on the fly
 	 * and store it in the context.
-	 * 
+	 *
 	 * Never returns null.
 	 */
 	public static SelfEditingConfiguration getBean(ServletContext ctx) {
@@ -111,7 +111,7 @@ public class SelfEditingConfiguration {
 
 	/**
 	 * What is the matching property? (might be null).
-	 * 
+	 *
 	 * TODO This seems to expose the property unnecessarily, but how else can I
 	 * do a SPARQL query for the Individual profiles that don't have matching
 	 * property values?
@@ -164,7 +164,7 @@ public class SelfEditingConfiguration {
 	/**
 	 * This Individual, if it exists, should be associated with this
 	 * UserAccount.
-	 * 
+	 *
 	 * No other Individual should be associated with this UserAccount.
 	 */
 	public void associateIndividualWithUserAccount(IndividualDao indDao,
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/UserAccount.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/UserAccount.java
index d5c153af8..7b9d49792 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/UserAccount.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/UserAccount.java
@@ -11,7 +11,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
 
 /**
  * Information about the account of a user. URI, email, password, etc.
- * 
+ *
  * The "password link expires hash" is just a string that is derived from the
  * value in the passwordLinkExpires field. It doesn't have to be a hash, and
  * there is no need for it to be cryptographic, but it seems embarrassing to
@@ -66,7 +66,7 @@ public class UserAccount {
 	private Set<String> permissionSetUris = Collections.emptySet();
 
 	private boolean rootUser = false;
-	
+
 	/** This may be empty, but should never be null. */
 	private Set<String> proxiedIndividualUris = Collections.emptySet();
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/VClass.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/VClass.java
index c7877bf91..c6d73affd 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/VClass.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/VClass.java
@@ -14,7 +14,7 @@ import java.util.List;
  */
 public class VClass extends BaseResourceBean implements Comparable<VClass>
 {
-	
+
     /**
      * What this VClass is called
      */
@@ -44,11 +44,11 @@ public class VClass extends BaseResourceBean implements Comparable<VClass>
     // this type in the database.  Is this the case?
     // [bjl23 2007-08-12] Yep.  A count of individuals in the class.
     protected int  myEntityCount = -1;
-    
+
     // rjy7 Removing deprecation since currently we have no other means to get this value.
     // @Deprecated
     public  int  getEntityCount()         { return myEntityCount; }
-    
+
     public  void setEntityCount( int ec ) { myEntityCount = ec; }
 
     protected Integer  displayLimit = null;
@@ -74,26 +74,26 @@ public class VClass extends BaseResourceBean implements Comparable<VClass>
     protected String customEntryForm = null;
     public  String getCustomEntryForm()         { return customEntryForm; }
     public  void   setCustomEntryForm(String s) { this.customEntryForm = s; }
-    
+
     protected String customDisplayView = null;
     public  String getCustomDisplayView()         { return customDisplayView; }
     public  void   setCustomDisplayView(String s) { this.customDisplayView = s; }
-    
+
     protected String customShortView = null;
     public  String getCustomShortView()         { return customShortView; }
     public  void   setCustomShortView(String s) { this.customShortView = s; }
-    
+
     protected String customSearchView = null;
     public  String getCustomSearchView()         { return customSearchView; }
-    public  void   setCustomSearchView(String s) { this.customSearchView = s; }    
+    public  void   setCustomSearchView(String s) { this.customSearchView = s; }
 
     protected Float searchBoost = null;
     public Float getSearchBoost() { return searchBoost; }
     public void setSearchBoost( Float boost ){ searchBoost = boost;}
-    
+
     public boolean isUnion() { return false; }
     public List<VClass> getUnionComponents() { return new ArrayList<VClass>(); }
-    
+
     /**
      * Default constructor
      */
@@ -125,16 +125,16 @@ public class VClass extends BaseResourceBean implements Comparable<VClass>
         super(uriString);
         myName = getLocalName();
     }
-    
+
     /**
-	 * Constructs the VClass as a deep copy of an existing VClass. 
+	 * Constructs the VClass as a deep copy of an existing VClass.
 	 */
     public VClass copy() {
     	VClass that = new VClass();
     	copyFields(that);
     	return that;
     }
-    
+
 	protected void copyFields(VClass that) {
 		that.myName = this.myName;
     	that.namespace = this.namespace;
@@ -154,7 +154,7 @@ public class VClass extends BaseResourceBean implements Comparable<VClass>
     	that.customShortView = this.customShortView;
     	that.customSearchView = this.customSearchView;
 	}
-    
+
     /**
      * Sorts alphabetically by name
      */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/VClassGroup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/VClassGroup.java
index d6fd3406c..c7108db76 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/VClassGroup.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/VClassGroup.java
@@ -14,20 +14,20 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 public class VClassGroup extends LinkedList <VClass> implements Comparable<VClassGroup> {
-	
+
 	private static final Log log = LogFactory.getLog(VClassGroup.class.getName());
-	
+
     private String URI          = null;
     private String namespace    = null;
     private String localName    = null;
     private String publicName   = null;
     private int    displayRank  = -1;
     private int individualCount = -1;
-    
+
     public boolean isIndividualCountSet(){
         return individualCount >= 0;
     }
-    
+
     public int getIndividualCount() {
         return individualCount;
     }
@@ -61,7 +61,7 @@ public class VClassGroup extends LinkedList <VClass> implements Comparable<VClas
         this.displayRank = rank;
         this.publicName = name;
     }
-    
+
     public VClassGroup(VClassGroup vcg) {
     	this.URI = vcg.URI;
     	this.namespace = vcg.namespace;
@@ -149,12 +149,12 @@ public class VClassGroup extends LinkedList <VClass> implements Comparable<VClas
             groups.remove(it.next());
         }
     }
-    
+
     /**
      * Sorts VClassGroup objects by group rank, then alphanumeric.
      * @return a negative integer, zero, or a positive integer as the
      *         first argument is less than, equal to, or greater than the
-     *         second. 
+     *         second.
      */
     public int compareTo(VClassGroup o2) {
     	Collator collator = Collator.getInstance();
@@ -164,7 +164,7 @@ public class VClassGroup extends LinkedList <VClass> implements Comparable<VClas
         }
         int diff = (this.getDisplayRank() - o2.getDisplayRank());
         if (diff == 0 ) {
-            
+
             //put null public name classgrups at end of list
             if( this.getPublicName() == null ){
                 if( o2.getPublicName() == null )
@@ -179,5 +179,5 @@ public class VClassGroup extends LinkedList <VClass> implements Comparable<VClas
         }
         return diff;
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/ConfigurationProperties.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/ConfigurationProperties.java
index 7e9e4a0a4..49fe5e81d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/ConfigurationProperties.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/ConfigurationProperties.java
@@ -18,7 +18,7 @@ import org.apache.commons.logging.LogFactory;
 /**
  * Provides an mechanism for modules to read the configuration properties that
  * are attached to the servlet context.
- * 
+ *
  * The customary behavior is for ConfigurationPropertiesSetup to create a
  * ConfigurationPropertiesImpl, which will obtain the properties from the
  * build.properties file and the runtime.properties file.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesImpl.java
index be0da808f..3e9951882 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesImpl.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesImpl.java
@@ -19,9 +19,9 @@ import org.apache.commons.logging.LogFactory;
  * also permits the caller to supply a map of "preemptive" properties that will
  * be included and will override any matching properties from the file, and a
  * map of "build" properties that may be overridden by the file.
- * 
+ *
  * Leading and trailing white space are trimmed from the property values.
- * 
+ *
  * Once the properties have been parsed and stored, they are immutable.
  */
 public class ConfigurationPropertiesImpl extends ConfigurationProperties {
@@ -34,7 +34,7 @@ public class ConfigurationPropertiesImpl extends ConfigurationProperties {
 			Map<String, String> preemptiveProperties,
 			Map<String, String> buildProperties) throws IOException {
 		Map<String, String> map = new HashMap<>(buildProperties);
-		
+
 		Properties props = loadFromPropertiesFile(stream);
 		for (String key: props.stringPropertyNames()) {
 			map.put(key, props.getProperty(key));
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesSmokeTests.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesSmokeTests.java
index bdfda1e7f..7c5e630f1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesSmokeTests.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesSmokeTests.java
@@ -199,7 +199,7 @@ public class ConfigurationPropertiesSmokeTests implements
 		} catch (IOException e) {
 			throw new RuntimeException("Failed to find language files", e);
 		}
-	}  
+	}
 
 	/**
 	 * Fail if there are no config properties for the Argon2 encryption.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoBean.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoBean.java
index c43251d42..e1633798d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoBean.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoBean.java
@@ -19,18 +19,18 @@ import com.ibm.icu.text.SimpleDateFormat;
 /**
  * Information about the provenance of this application: release, revision
  * level, build date, etc.
- * 
+ *
  * Except for the build date, the information is stored for all levels of the
  * application. So an instance of NIHVIVO might read:
- * 
+ *
  * date: 2010-11-09 12:15:44
- * 
+ *
  * level: vitro-core, trunk, 1234:1236M
- * 
+ *
  * level: vivo, branch rel_1.1_maint, 798
- * 
+ *
  * Note that the levels should be listed from inner to outer.
- * 
+ *
  * Instances of this class are immutable.
  */
 public class RevisionInfoBean {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoSetup.java
index 85bd1a349..5d024a68b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoSetup.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoSetup.java
@@ -31,16 +31,16 @@ import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 /**
  * <pre>
  * Read the revision information, and store it in the servlet context.
- * 
- * - The revision information is in a file in the classpath. 
+ *
+ * - The revision information is in a file in the classpath.
  * - The name of the file is in RESOURCE_PATH, below.
  * - The first line is the build date, with a format as in DATE_FORMAT, below.
  * - Each additional non-blank line holds revision info for one application level:
  *    - level info is from inner (vitro) to outer (top-level product).
- *    - level info appears as product name, release name and revision level, 
- *        delimited by " ~ ". 
+ *    - level info appears as product name, release name and revision level,
+ *        delimited by " ~ ".
  *    - additional white space before and after info values is ignored.
- * 
+ *
  * Example file:
  *    2010-11-14 23:58:00
  *    vitroCore ~ Release 1.1 ~ 6604
@@ -59,9 +59,9 @@ public class RevisionInfoSetup implements ServletContextListener {
 	/**
 	 * On startup, read the revision info from the resource file in the
 	 * classpath.
-	 * 
+	 *
 	 * If we can't find the file, or can't parse it, store an empty bean.
-	 * 
+	 *
 	 * Don't allow any Exceptions to percolate up past this point.
 	 */
 	@Override
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/AbstractPageHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/AbstractPageHandler.java
index f09141189..fe28d8573 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/AbstractPageHandler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/AbstractPageHandler.java
@@ -33,7 +33,7 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 /**
  * A base class with some utility routines for page handler (created by
  * controller classes.
- * 
+ *
  * The controller logic is often complicated by the fact that the servlet must
  * be multi-threaded. If a "page handler" instance is created for each request,
  * it may share instance variables among its methods, which frequently makes for
@@ -113,7 +113,7 @@ public abstract class AbstractPageHandler {
 	/**
 	 * Treat the presence of a certain parameter, with a desired value, as a
 	 * boolean flag.
-	 * 
+	 *
 	 * An example would be radio buttons with values of "yes" and "no". The
 	 * expected value would be "yes".
 	 */
@@ -150,7 +150,7 @@ public abstract class AbstractPageHandler {
 	/**
 	 * Set one of these on the session, so it can be interpreted and displayed
 	 * at the next request. It will only be displayed once.
-	 * 
+	 *
 	 * Allows one page handler to pass a message to another page handler through
 	 * a re-direct.
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/Controllers.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/Controllers.java
index 3e198b9dc..4e901584b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/Controllers.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/Controllers.java
@@ -16,32 +16,32 @@ import java.util.List;
  */
 
 public class Controllers {
-    
+
     // Servlet urls
 
     public static final String ABOUT = "/about";
     public static final String CONTACT_URL = "/comments";
     public static final String TERMS_OF_USE_URL = "/termsOfUse";
-    public static final String SEARCH_URL = "/search";    
+    public static final String SEARCH_URL = "/search";
     public static final String ENTITY = "/entity";
 
     public static final String RETRY_URL = "editForm";
-    public static final String TAB_ENTITIES = "/TabEntitiesController";  
+    public static final String TAB_ENTITIES = "/TabEntitiesController";
 
     public static final String SITE_ADMIN = "/siteAdmin";
     public static final String LOGIN = "/login";
     public static final String LOGOUT = "/logout";
     public static final String AUTHENTICATE = "/authenticate";
-    
+
     public static final String EXPORT_RDF = "/export";
-    
+
     // jsps go here:
-    
+
     public static final String TAB = "/index.jsp";
 
     public static final String DEBUG_JSP = "/templates/page/debug.jsp";
     public static final Object BODY_MSG = "/templates/page/bodyMsg.jsp";
-    
+
     public static final String DASHBOARD_PROP_LIST_JSP = "edit/dashboardPropsList.jsp";
 
     public static final String ENTITY_EDITABLE_JSP = "templates/entity/entityEditable.jsp";
@@ -57,14 +57,14 @@ public class Controllers {
 
     public static final String HORIZONTAL_JSP = "/templates/edit/fetch/horizontal.jsp";
     public static final String VERTICAL_JSP = "/templates/edit/fetch/vertical.jsp";
-    
+
     public static final String CHECK_DATATYPE_PROPERTIES = "/jsp/checkDatatypeProperties.jsp";
     public static final String EXPORT_SELECTION_JSP = "/jenaIngest/exportSelection.jsp";
 
     public static final String VCLASS_RETRY_URL = "vclass_retry";
 
     public static final String TOGGLE_SCRIPT_ELEMENT = "<script language='JavaScript' type='text/javascript' src='js/toggle.js'></script>";
-    
+
     //public static final String TAB_ENTITIES_LIST_JSP = "templates/tab/tabEntities.jsp";
 
     private static List<String> letters = null;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/DashboardPropertyListController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/DashboardPropertyListController.java
index c30ae3688..3709a73b0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/DashboardPropertyListController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/DashboardPropertyListController.java
@@ -51,10 +51,10 @@ public class DashboardPropertyListController extends VitroHttpServlet {
      * Expected Attributes:
      * entity - set to entity to display properties for.
      */
-    
+
     private static final Log log = LogFactory.getLog(DashboardPropertyListController.class.getName());
     private static final int MAX_GROUP_DISPLAY_RANK = 99;
-    
+
     public void doGet( HttpServletRequest req, HttpServletResponse res )
     throws IOException, ServletException {
         try {
@@ -64,7 +64,7 @@ public class DashboardPropertyListController extends VitroHttpServlet {
                 throw new HelpException("EntityMergedPropertyListController requires request.attribute 'entity' to be of"
                         +" type " + Individual.class.getName() );
             Individual subject =(Individual)obj;
-            
+
             String groupForUngroupedProperties = null;
             String unassignedStr = req.getParameter("unassignedPropsGroupName");
             if (unassignedStr != null && unassignedStr.length()>0) {
@@ -73,13 +73,13 @@ public class DashboardPropertyListController extends VitroHttpServlet {
                 req.setAttribute("unassignedPropsGroupName", unassignedStr);
                 log.debug("found temp group parameter \""+unassignedStr+"\" for unassigned properties");
             }
-            
+
             boolean groupedMode = false;
             String groupedStr = req.getParameter("grouped");
             if (groupedStr != null && groupedStr.equalsIgnoreCase("true")) {
                 groupedMode = true;
             }
-            
+
             boolean onlyPopulatedProps = true;
             String allPossiblePropsStr = req.getParameter("allProps");
             if (allPossiblePropsStr != null && allPossiblePropsStr.length()>0) {
@@ -91,22 +91,22 @@ public class DashboardPropertyListController extends VitroHttpServlet {
 
             VitroRequest vreq = new VitroRequest(req);
             WebappDaoFactory wdf = vreq.getWebappDaoFactory();
-            
+
             PropertyGroupDao pgDao = null;
             List <PropertyGroup> groupsList = null;
             if (groupedMode) {
                 pgDao = wdf.getPropertyGroupDao();
                 groupsList = pgDao.getPublicGroups(false); // may be returned empty but not null
             }
-           
+
             PropertyInstanceDao piDao = wdf.getPropertyInstanceDao();
             ObjectPropertyDao opDao = wdf.getObjectPropertyDao();
-            
+
             // set up a new list for the combined object and data properties
             List<Property> mergedPropertyList = new ArrayList<Property>();
-            
+
             if (onlyPopulatedProps) {
-                // now first get the properties this entity actually has, presumably populated with statements 
+                // now first get the properties this entity actually has, presumably populated with statements
                 List<ObjectProperty> objectPropertyList = subject.getObjectPropertyList();
                 for (ObjectProperty op : objectPropertyList) {
                     op.setLabel(op.getDomainPublic());
@@ -129,7 +129,7 @@ public class DashboardPropertyListController extends VitroHttpServlet {
                     log.error("a null Collection is returned from PropertyInstanceDao.getAllPossiblePropInstForIndividual()");
                 }
             }
-            
+
             DataPropertyDao dpDao = wdf.getDataPropertyDao();
             if (onlyPopulatedProps) {
                 // now do much the same with data properties: get the list of populated data properties, then add in placeholders for missing ones
@@ -137,7 +137,7 @@ public class DashboardPropertyListController extends VitroHttpServlet {
                 for (DataProperty dp : dataPropertyList) {
                     dp.setLabel(dp.getPublicName());
                     mergedPropertyList.add(dp);
-                }                
+                }
             } else {
                 log.debug("getting all possible data property choices");
                 Collection <DataProperty> allDatapropColl = dpDao.getAllPossibleDatapropsForIndividual(subject.getURI());
@@ -154,7 +154,7 @@ public class DashboardPropertyListController extends VitroHttpServlet {
                     log.error("a null Collection is returned from DataPropertyDao.getAllPossibleDatapropsForIndividual())");
                 }
             }
-            
+
             if (mergedPropertyList!=null) {
                 try {
                     mergedPropertyList.sort(new PropertyRanker(vreq));
@@ -220,7 +220,7 @@ public class DashboardPropertyListController extends VitroHttpServlet {
     throws ServletException,IOException {
         doGet(request, response);
     }
-    
+
     private boolean alreadyOnPropertyList(List<Property> propsList, Property p) {
         if (p.getURI() == null) {
             log.error("Property p has no propertyURI in alreadyOnPropertyList()");
@@ -305,7 +305,7 @@ public class DashboardPropertyListController extends VitroHttpServlet {
             super(string);
         }
     }
-    
+
     private class PropertyRanker implements Comparator {
         VitroRequest vreq;
         WebappDaoFactory wdf;
@@ -316,14 +316,14 @@ public class DashboardPropertyListController extends VitroHttpServlet {
             this.wdf = vreq.getWebappDaoFactory();
             this.pgDao = wdf.getPropertyGroupDao();
         }
-        
+
         public int compare (Object o1, Object o2) {
             Property p1 = (Property) o1;
             Property p2 = (Property) o2;
-            
+
             // sort first by property group rank; if the same, then sort by property rank
             final int MAX_GROUP_RANK=99;
-            
+
             int p1GroupRank=MAX_GROUP_RANK;
             if (p1.getGroupURI()!=null) {
                 PropertyGroup pg1 = pgDao.getGroupByURI(p1.getGroupURI());
@@ -331,7 +331,7 @@ public class DashboardPropertyListController extends VitroHttpServlet {
                     p1GroupRank=pg1.getDisplayRank();
                 }
             }
-            
+
             int p2GroupRank=MAX_GROUP_RANK;
             if (p2.getGroupURI()!=null) {
                 PropertyGroup pg2 = pgDao.getGroupByURI(p2.getGroupURI());
@@ -339,7 +339,7 @@ public class DashboardPropertyListController extends VitroHttpServlet {
                     p2GroupRank=pg2.getDisplayRank();
                 }
             }
-            
+
             // int diff = pgDao.getGroupByURI(p1.getGroupURI()).getDisplayRank() - pgDao.getGroupByURI(p2.getGroupURI()).getDisplayRank();
             int diff=p1GroupRank - p2GroupRank;
             if (diff==0) {
@@ -352,7 +352,7 @@ public class DashboardPropertyListController extends VitroHttpServlet {
             }
             return diff;
         }
-        
+
         private int determineDisplayRank(Property p) {
             if (p instanceof DataProperty) {
                 DataProperty dp = (DataProperty)p;
@@ -361,7 +361,7 @@ public class DashboardPropertyListController extends VitroHttpServlet {
                 ObjectProperty op = (ObjectProperty)p;
                 return op.getDomainDisplayTier();
             } else {
-                log.error("Property is of unknown class in PropertyRanker()");  
+                log.error("Property is of unknown class in PropertyRanker()");
             }
             return 0;
         }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java
index 9163f571f..c9d0fc4cb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java
@@ -31,7 +31,7 @@ import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory;
 @WebServlet(name = "mailusers", urlPatterns = {"/mailusers"}, loadOnStartup = 5)
 public class MailUsersServlet extends VitroHttpServlet {
 	private static final Log log = LogFactory.getLog(MailUsersServlet.class);
-	
+
     public static HttpServletRequest request;
     public static HttpServletRequest response;
 
@@ -43,7 +43,7 @@ public class MailUsersServlet extends VitroHttpServlet {
         String   confirmpage    = "/confirmUserMail.jsp";
         String   errpage        = "/contact_err.jsp";
         String status = null; // holds the error status
-        
+
         if (!FreemarkerEmailFactory.isConfigured(vreq)) {
 			status = "This application has not yet been configured to send mail. "
 					+ "Email properties must be specified in the configuration properties file.";
@@ -77,13 +77,13 @@ public class MailUsersServlet extends VitroHttpServlet {
         List<String> deliverToArray = null;
         int recipientCount = 0;
         String deliveryfrom = null;
-        
+
         // get Individuals that the User mayEditAs
         deliverToArray = getEmailsForAllUserAccounts(vreq);
-        
+
         //Removed all form type stuff b/c recipients pre-configured
         recipientCount=(deliverToArray == null) ? 0 : deliverToArray.size();
-        
+
         if (recipientCount == 0) {
             //log.error("recipientCount is 0 when DeliveryType specified as \""+formType+"\"");
             throw new Error(
@@ -98,9 +98,9 @@ public class MailUsersServlet extends VitroHttpServlet {
         //webusername = "hjk54";
         //webuseremail = "hjk54@cornell.edu";
         //comments = "following are comments";
-        
+
        webusername=webusername.trim();
-       deliveryfrom = webuseremail; 
+       deliveryfrom = webuseremail;
        comments=comments.trim();
         //Removed spam filtering code
 
@@ -160,7 +160,7 @@ public class MailUsersServlet extends VitroHttpServlet {
             msg.setFrom( new InternetAddress( webuseremail ));
 
             // Set the recipient address
-            
+
             if (recipientCount>0){
                 InternetAddress[] address=new InternetAddress[recipientCount];
                 for (int i=0; i<recipientCount; i++){
@@ -208,10 +208,10 @@ public class MailUsersServlet extends VitroHttpServlet {
         }
 
     }
-    
+
 	private List<String> getEmailsForAllUserAccounts(VitroRequest vreq) {
 		UserAccountsDao uaDao = vreq.getWebappDaoFactory().getUserAccountsDao();
-		
+
 		List<String> emails = new ArrayList<String>();
 		for (UserAccount user : uaDao.getAllUserAccounts()) {
 			emails.add(user.getEmailAddress());
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MultipartRequestWrapper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MultipartRequestWrapper.java
index d5439df6c..97a711c16 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MultipartRequestWrapper.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/MultipartRequestWrapper.java
@@ -30,22 +30,22 @@ import org.apache.commons.logging.LogFactory;
 /**
  * Wraps a multipart HTTP request, and pre-parses it for file uploads, without
  * losing the request parameters.
- * 
+ *
  * Parsing through the request with an Apache ServletFileUpload builds a list of
  * FileItems that includes the parameters and the file parts. After that,
  * however, the parameters are no longer accessible from the request. This
  * wrapper will see that they don't get lost.
- * 
+ *
  * The List of FileItems includes both "formField" items and "file" items. As
  * with the usual parameters on a request, we can have more than one value with
  * the same name. So this creates a map of &lt;String, List&lt;String&gt;&gt; to hold the
  * parameters, and a map of &lt;String, List&lt;FileItem&gt;&gt; to hold the files.
- * 
+ *
  * The parameters will be available to the wrapper through the normal methods.
  * The files will be available as an attribute that holds the map. Also, a
  * separate attribute will hold a Boolean to indicate that this was indeed a
  * multipart request.
- * 
+ *
  * Conveninence methods in VitroRequest will make these easy to handle, without
  * actually touching the attributes.
  */
@@ -180,7 +180,7 @@ public class MultipartRequestWrapper extends HttpServletRequestWrapper {
 
 	/**
 	 * Parse the raw request into a list of parts.
-	 * 
+	 *
 	 * If there is a parsing error, let the strategy handle it. If the strategy
 	 * throws it back, wrap it in an IOException and throw it on up.
 	 */
@@ -289,7 +289,7 @@ public class MultipartRequestWrapper extends HttpServletRequestWrapper {
 
 		/**
 		 * Allows you to handle the exception in your code.
-		 * 
+		 *
 		 * Be aware that the multipart parameters have been lost, and that may
 		 * include form fields.
 		 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/OntologyController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/OntologyController.java
index 58b859a77..e7fe124a4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/OntologyController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/OntologyController.java
@@ -34,66 +34,66 @@ import edu.cornell.mannlib.vitro.webapp.web.ContentType;
 @WebServlet(name = "ontology", urlPatterns = {"/ontology/*"})
 public class OntologyController extends VitroHttpServlet{
     private static final Log log = LogFactory.getLog(OntologyController.class.getName());
-    
+
 	public void doPost(HttpServletRequest request, HttpServletResponse response)
 	throws ServletException,IOException{
 		doGet(request, response);
 	}
-	
+
 	public void doGet(HttpServletRequest req, HttpServletResponse res)
 	throws ServletException,IOException{
-		super.doGet(req, res);            
-       
+		super.doGet(req, res);
+
         //get URL without hostname or servlet context
-        String url = req.getRequestURI().substring(req.getContextPath().length()); 
-        
+        String url = req.getRequestURI().substring(req.getContextPath().length());
+
         String redirectURL = checkForRedirect ( url, req.getHeader("accept") );
-       
+
         if( redirectURL != null ){
         	doRedirect( req, res, redirectURL );
         	return;
-        }            	    
-		
+        }
+
         ContentType rdfFormat = checkForLinkedDataRequest(url,req.getHeader("accept"));
-   
+
        if( rdfFormat != null ){
         	doRdf(req, res, rdfFormat );
        }
 	}
-	
+
 	private static Pattern RDF_REQUEST = Pattern.compile("^/ontology/([^/]*)/([^/]*).rdf$");
     private static Pattern N3_REQUEST = Pattern.compile("^/ontology/([^/]*)/([^/]*).n3$");
     private static Pattern TTL_REQUEST = Pattern.compile("^/ontology/([^/]*)/([^/]*).ttl$");
     private static Pattern HTML_REQUEST = Pattern.compile("^/ontology/([^/]*)$");
-	
-	protected ContentType checkForLinkedDataRequest(String url, String acceptHeader) {		
+
+	protected ContentType checkForLinkedDataRequest(String url, String acceptHeader) {
 		try {
-			//check the accept header			
+			//check the accept header
 			if (acceptHeader != null) {
-				List<ContentType> actualContentTypes = new ArrayList<ContentType>();				
+				List<ContentType> actualContentTypes = new ArrayList<ContentType>();
 				actualContentTypes.add(new ContentType( XHTML_MIMETYPE ));
-				actualContentTypes.add(new ContentType( HTML_MIMETYPE ));				
-				
+				actualContentTypes.add(new ContentType( HTML_MIMETYPE ));
+
 				actualContentTypes.add(new ContentType( RDFXML_MIMETYPE ));
 				actualContentTypes.add(new ContentType( N3_MIMETYPE ));
 				actualContentTypes.add(new ContentType( TTL_MIMETYPE ));
-				
-								
+
+
 				ContentType best = ContentType.getBestContentType(acceptHeader,actualContentTypes);
 				if (best!=null && (
-						RDFXML_MIMETYPE.equals(best.getMediaType()) || 
+						RDFXML_MIMETYPE.equals(best.getMediaType()) ||
 						N3_MIMETYPE.equals(best.getMediaType()) ||
 						TTL_MIMETYPE.equals(best.getMediaType()) ))
-					return best;				
+					return best;
 			}
-			
+
 			/*
 			 * check for parts of URL that indicate request for RDF
 			   http://vivo.cornell.edu/ontology/(ontologyname)/n23.rdf
 			   http://vivo.cornell.edu/ontology/(ontologyname)/n23.n3
 			   http://vivo.cornell.edu/ontology/(ontologyname)/n23.ttl
 			 */
-						
+
 			Matcher m = RDF_REQUEST.matcher(url);
 			if( m.matches() ){
 				return new ContentType(RDFXML_MIMETYPE);}
@@ -103,20 +103,20 @@ public class OntologyController extends VitroHttpServlet{
 			m = TTL_REQUEST.matcher(url);
 			if( m.matches() ){
 				return new ContentType(TTL_MIMETYPE);}
-			
+
 		} catch (Throwable th) {
 			log.error("problem while checking accept header " , th);
-		} 
+		}
 		//return null;
 		// Returning null would default to html in the calling method.
 		// But since we don't have a useful html representation yet,
 		// we're going to default to returning RDF/XML.
 		return new ContentType(RDFXML_MIMETYPE);
-	}  
-	
+	}
+
 	private void doRdf(HttpServletRequest req, HttpServletResponse res,
-			ContentType rdfFormat) throws IOException, ServletException {   
-		
+			ContentType rdfFormat) throws IOException, ServletException {
+
 		VitroRequest vreq = new VitroRequest(req);
 		int index = vreq.getRequestURL().lastIndexOf("/");
 	     String ontology = vreq.getRequestURL().substring(0, index);
@@ -126,12 +126,12 @@ public class OntologyController extends VitroHttpServlet{
 	    	 classOrProperty = classOrProperty.substring(0, indexx);
 	     }
 	     String url = ontology;
-	     
-	    		
+
+
 		OntModel ontModel = ModelAccess.on(getServletContext()).getOntModel();
 
         boolean found = false;
-        Model newModel = ModelFactory.createDefaultModel();			
+        Model newModel = ModelFactory.createDefaultModel();
 		ontModel.enterCriticalSection(Lock.READ);
         try{
             OntResource ontResource = ontModel.getOntResource(url);
@@ -142,7 +142,7 @@ public class OntologyController extends VitroHttpServlet{
                 Resource resource = (Resource)ontResource;
                 QueryExecution qexec = null;
                 try{
-                    String queryString = "Describe <" + resource.getURI() + ">"; 
+                    String queryString = "Describe <" + resource.getURI() + ">";
                     qexec = QueryExecutionFactory.create(QueryFactory.create(queryString), ontModel);
                     newModel = qexec.execDescribe();
                 } finally{
@@ -161,57 +161,57 @@ public class OntologyController extends VitroHttpServlet{
         } else {
         	JenaOutputUtils.setNameSpacePrefixes(newModel,vreq.getWebappDaoFactory());
             res.setContentType(rdfFormat.getMediaType());
-            String format = ""; 
+            String format = "";
             if ( RDFXML_MIMETYPE.equals(rdfFormat.getMediaType()))
                 format = "RDF/XML";
             else if( N3_MIMETYPE.equals(rdfFormat.getMediaType()))
                 format = "N3";
             else if ( TTL_MIMETYPE.equals(rdfFormat.getMediaType()))
                 format ="TTL";
-		
+
             newModel.write( res.getOutputStream(), format );
         }
 	}
-	
+
 	private static Pattern URI_PATTERN = Pattern.compile("^/ontology/([^/]*)/([^/]*)$");
     //Redirect if the request is for http://hostname/individual/localname
     // if accept is nothing or text/html redirect to ???
     // if accept is some RDF thing redirect to the URL for RDF
 	private String checkForRedirect(String url, String acceptHeader) {
-		ContentType c = checkForLinkedDataRequest(url, acceptHeader);	
+		ContentType c = checkForLinkedDataRequest(url, acceptHeader);
 		Matcher m = URI_PATTERN.matcher(url);
 		if( m.matches() && m.groupCount() <=2 ){
 			String group2="";
-			
+
 			if(m.group(2).indexOf(".")!=-1){
 				group2 = m.group(2).substring(0, m.group(2).indexOf("."));
 				System.out.println("group2 " + group2);
 				System.out.println("group1 " + m.group(1));}
-			
-			
+
+
 			if( c != null && !group2.trim().equals(m.group(1).trim()) ){
 				String redirectUrl = null;
 				if(m.group(2).isEmpty() || m.group(2) == null){
 					redirectUrl = "/ontology/" + m.group(1) + "/" + m.group(1); }
 				else{
 					redirectUrl = "/ontology/" + m.group(1) + "/" + m.group(2) + "/" + m.group(2) ; }
-					
-				
+
+
 				if( RDFXML_MIMETYPE.equals( c.getMediaType())  ){
 					return redirectUrl + ".rdf";
 				}else if( N3_MIMETYPE.equals( c.getMediaType() )){
 					return redirectUrl + ".n3";
 				}else if( TTL_MIMETYPE.equals( c.getMediaType() )){
 					return redirectUrl + ".ttl";
-				}//else send them to html													
+				}//else send them to html
 			}
 			//else redirect to HTML representation
 			return null;
-		}else{			
+		}else{
 			return null;
 		}
 	}
-	
+
 	 private void doRedirect(HttpServletRequest req, HttpServletResponse res,
 	            String redirectURL) throws IOException {
 	        //It seems like there must be a more standard way to do a redirect in tomcat.
@@ -227,12 +227,12 @@ public class OntologyController extends VitroHttpServlet{
 	        }
 	       res.setStatus(res.SC_SEE_OTHER);
 	    }
-	 
-	 
+
+
 	private void doNotFound(HttpServletRequest req, HttpServletResponse res)
     throws IOException, ServletException {
         VitroRequest vreq = new VitroRequest(req);
-        
+
         ApplicationBean appBean = vreq.getAppBean();
 
         //set title before we do the highlighting so we don't get markup in it.
@@ -246,8 +246,8 @@ public class OntologyController extends VitroHttpServlet{
 
 		JSPPageHandler.renderBasicPage(req, res, "/"+Controllers.ENTITY_NOT_FOUND_JSP);
     }
-	
-	
-	
-	
+
+
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryBuilderServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryBuilderServlet.java
index 89b60a12b..2879af9dd 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryBuilderServlet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryBuilderServlet.java
@@ -32,7 +32,7 @@ public class SparqlQueryBuilderServlet extends BaseEditController {
     private static final Log log = LogFactory.getLog(SparqlQueryBuilderServlet.class.getName());
 
     protected static final Syntax SYNTAX = Syntax.syntaxARQ;
-    
+
     protected static HashMap<String,ResultsFormat>formatSymbols = new HashMap<String,ResultsFormat>();
     static{
         formatSymbols.put( ResultsFormat.FMT_RS_XML.getSymbol(),   ResultsFormat.FMT_RS_XML);
@@ -42,7 +42,7 @@ public class SparqlQueryBuilderServlet extends BaseEditController {
         formatSymbols.put( ResultsFormat.FMT_RS_JSON.getSymbol() , ResultsFormat.FMT_RS_JSON);
         formatSymbols.put( "vitro:csv", null);
     }
-    
+
     protected static HashMap<String,String> rdfFormatSymbols = new HashMap<String,String>();
     static {
     	rdfFormatSymbols.put( "RDF/XML", "application/rdf+xml" );
@@ -68,18 +68,18 @@ public class SparqlQueryBuilderServlet extends BaseEditController {
     {
         this.doGet(request,response);
     }
-    
+
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
     throws ServletException, IOException
-    {    	    	   	
+    {
 		if (!isAuthorizedToDisplayPage(request, response,
 				SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION)) {
     		return;
     	}
 
     	VitroRequest vreq = new VitroRequest(request);
-        
+
         Model model = vreq.getJenaOntModel(); // getModel()
         if( model == null ){
             doNoModelInContext(request,response);
@@ -88,7 +88,7 @@ public class SparqlQueryBuilderServlet extends BaseEditController {
 
         doHelp(request,response);
     }
-    
+
     private void doNoModelInContext(HttpServletRequest request, HttpServletResponse res){
         try {
             res.setStatus(HttpServletResponse.SC_NOT_IMPLEMENTED);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java
index 7b6b556bc..0d0c3453e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java
@@ -67,7 +67,7 @@ public class VitroHttpServlet extends HttpServlet implements MultipartRequestWra
 			if (log.isTraceEnabled()) {
 				dumpRequestHeaders(hreq);
 			}
-	
+
 			super.service(hreq, resp);
 		} else {
 			super.service(req, resp);
@@ -82,7 +82,7 @@ public class VitroHttpServlet extends HttpServlet implements MultipartRequestWra
 	public long maximumMultipartFileSize() {
 		return 50 * 1024 * 1024; // default is 50 megabytes
 	}
-	
+
 	/**
 	 * Override this to change the way that exceptions are handled when parsing
 	 * a multipart request. Be aware that multipart parameters have been lost,
@@ -113,7 +113,7 @@ public class VitroHttpServlet extends HttpServlet implements MultipartRequestWra
 
 	/**
 	 * Don't display a page that the user isn't authorized to see.
-	 * 
+	 *
 	 * @param actions
 	 *            the combination of RequestedActions that must be authorized.
 	 */
@@ -148,7 +148,7 @@ public class VitroHttpServlet extends HttpServlet implements MultipartRequestWra
 			redirectToLoginPage(request, response);
 		}
 	}
-	
+
 	/**
 	 * Logged in, but with insufficient authorization. Send them to the home page
 	 * with a message. They won't be coming back.
@@ -202,24 +202,24 @@ public class VitroHttpServlet extends HttpServlet implements MultipartRequestWra
 		return request.getContextPath() + Controllers.AUTHENTICATE
 				+ "?afterLogin=" + encodedAfterLoginUrl;
 	}
-	
-	protected void sortForPickList(List<? extends ResourceBean> beans, 
+
+	protected void sortForPickList(List<? extends ResourceBean> beans,
 	        VitroRequest vreq) {
 	    beans.sort(new PickListSorter(vreq));
 	}
-	
+
 	protected class PickListSorter implements Comparator<ResourceBean> {
-	    
+
 	    Collator collator;
-	    
+
 	    public PickListSorter(VitroRequest vreq) {
 	        this.collator = vreq.getCollator();
 	    }
-	    
+
 	    public int compare(ResourceBean b1, ResourceBean b2) {
 	        return collator.compare(b1.getPickListName(), b2.getPickListName());
 	    }
-	    
+
 	}
 
 	/**
@@ -252,10 +252,10 @@ public class VitroHttpServlet extends HttpServlet implements MultipartRequestWra
 	 */
 	protected void dumpRequestParameters(HttpServletRequest req) {
 		Log subclassLog = LogFactory.getLog(this.getClass());
-		
+
 		@SuppressWarnings("unchecked")
 		Map<String, String[]> map = req.getParameterMap();
-		
+
 		for (String key : map.keySet()) {
 			String[] values = map.get(key);
 			subclassLog.debug("Parameter '" + key + "' = "
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java
index bc7110de6..05448c233 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java
@@ -37,17 +37,17 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 
 public class VitroRequest extends HttpServletRequestWrapper {
-    
+
     final static Log log = LogFactory.getLog(VitroRequest.class);
-    
+
     //Attribute in case of special model editing such as display model editing
-    public static final String SPECIAL_WRITE_MODEL = "specialWriteModel";     
+    public static final String SPECIAL_WRITE_MODEL = "specialWriteModel";
 
     public  static final String ID_FOR_WRITE_MODEL = "idForWriteModel";
     public  static final String ID_FOR_TBOX_MODEL = "idForTboxModel";
     public  static final String ID_FOR_ABOX_MODEL = "idForAboxModel";
     public static final String ID_FOR_DISPLAY_MODEL = "idForDisplayModel";
-    
+
     private HttpServletRequest _req;
 
     public VitroRequest(HttpServletRequest _req) {
@@ -58,96 +58,96 @@ public class VitroRequest extends HttpServletRequestWrapper {
     public RDFService getRDFService() {
     	return ModelAccess.on(this).getRDFService();
     }
-    
+
     public RDFService getUnfilteredRDFService() {
     	return ModelAccess.on(this).getRDFService(CONTENT, LANGUAGE_NEUTRAL);
     }
-    
+
     /** Gets WebappDaoFactory with appropriate filtering for the request */
     public WebappDaoFactory getWebappDaoFactory(){
     	return ModelAccess.on(this).getWebappDaoFactory();
     }
-    
+
     /** gets assertions+inference WebappDaoFactory with no policy filtering */
     public WebappDaoFactory getUnfilteredWebappDaoFactory() {
     	return ModelAccess.on(this).getWebappDaoFactory(POLICY_NEUTRAL);
     }
-    
+
     /** gets assertions-only WebappDaoFactory with no policy filtering */
     public WebappDaoFactory getUnfilteredAssertionsWebappDaoFactory() {
     	return ModelAccess.on(this).getWebappDaoFactory(POLICY_NEUTRAL, ASSERTIONS_ONLY);
     }
-    
+
     public Dataset getDataset() {
     	return ModelAccess.on(this).getDataset(CONTENT);
     }
-    
+
     public Dataset getUnfilteredDataset() {
     	return ModelAccess.on(this).getDataset(CONTENT, LANGUAGE_NEUTRAL);
     }
-    
+
     //Method that retrieves write model, returns special model in case of write model
     public OntModel getWriteModel() {
-    	//if special write model doesn't exist use get ont model 
+    	//if special write model doesn't exist use get ont model
     	if(this.getAttribute(SPECIAL_WRITE_MODEL) != null) {
     		return (OntModel)this.getAttribute(SPECIAL_WRITE_MODEL);
     	} else {
     		return getJenaOntModel();
     	}
     }
-    
+
     public OntModelSelector getOntModelSelector() {
     	return ModelAccess.on(this).getOntModelSelector();
     }
-    
+
     public OntModel getJenaOntModel() {
     	return ModelAccess.on(this).getOntModel(ModelNames.FULL_UNION);
     }
-    
+
     public OntModel getDisplayModel(){
     	return ModelAccess.on(this).getOntModel(DISPLAY);
     }
-        
+
     /**
-     * Gets an identifier for the display model associated 
+     * Gets an identifier for the display model associated
      * with this request.  It may have been switched from
      * the normal display model to a different one.
      * This could be a URI or a {@link ModelName}
      */
     public String getIdForDisplayModel(){
-        return (String)getAttribute(ID_FOR_DISPLAY_MODEL);        
+        return (String)getAttribute(ID_FOR_DISPLAY_MODEL);
     }
-    
+
     /**
-     * Gets an identifier for the a-box model associated 
+     * Gets an identifier for the a-box model associated
      * with this request.  It may have been switched from
      * the standard one to a different one.
      * This could be a URI or a {@link ModelName}
-     */    
+     */
     public String  getNameForABOXModel(){
-        return (String)getAttribute(ID_FOR_ABOX_MODEL);        
+        return (String)getAttribute(ID_FOR_ABOX_MODEL);
     }
-    
+
     /**
-     * Gets an identifier for the t-box model associated 
+     * Gets an identifier for the t-box model associated
      * with this request.  It may have been switched from
      * the standard one to a different one.
      * This could be a URI or a {@link ModelName}
-     */    
+     */
     public String  getNameForTBOXModel(){
-        return (String)getAttribute(ID_FOR_TBOX_MODEL);        
+        return (String)getAttribute(ID_FOR_TBOX_MODEL);
     }
-    
+
     /**
-     * Gets an identifier for the write model associated 
+     * Gets an identifier for the write model associated
      * with this request.  It may have been switched from
      * the standard one to a different one.
      * This could be a URI or a {@link ModelName}
-     */    
+     */
     public String  getNameForWriteModel(){
-        return (String)getAttribute(ID_FOR_WRITE_MODEL);        
+        return (String)getAttribute(ID_FOR_WRITE_MODEL);
     }
-    
+
     public ApplicationBean getAppBean(){
     	return getWebappDaoFactory().getApplicationDao().getApplicationBean();
     }
@@ -156,53 +156,53 @@ public class VitroRequest extends HttpServletRequestWrapper {
      * Gets the the ip of the client.
      * This will be X-forwarded-for header or, if that header is not
      * set, getRemoteAddr(). This still may not be the client's address
-     * as they may be using a proxy. 
-     * 
+     * as they may be using a proxy.
+     *
      */
     public String getClientAddr(){
         String xff = getHeader("x-forwarded-for");
         return ( xff == null || xff.trim().isEmpty() ) ? getRemoteAddr() : xff;
     }
-    
+
     @SuppressWarnings("unchecked")
 	@Override
-    public Map<String, String[]> getParameterMap() {        
-        return _req.getParameterMap();        
+    public Map<String, String[]> getParameterMap() {
+        return _req.getParameterMap();
     }
-    
+
     @Override
-    public String getParameter(String name) {        
-        return _req.getParameter(name);        
+    public String getParameter(String name) {
+        return _req.getParameter(name);
     }
 
     @Override
     public String[] getParameterValues(String name) {
-        return _req.getParameterValues(name);        
+        return _req.getParameterValues(name);
     }
 
 	public OntModel getLanguageNeutralUnionFullModel() {
 		return ModelAccess.on(this).getOntModel(ModelNames.FULL_UNION, LANGUAGE_NEUTRAL);
-	}           
-	
+	}
+
 	public void setCollator(Collator collator) {
 	    setAttribute("collator", collator);
 	}
-	
+
 	public Collator getCollator() {
 	    return (Collator) getAttribute("collator");
 	}
-	
+
     public WebappDaoFactory getLanguageNeutralWebappDaoFactory() {
 		// It is also policy neutral, because that's how it was originally
 		// implemented, and at least some of the client code expects it that
 		// way.
     	return ModelAccess.on(this).getWebappDaoFactory(LANGUAGE_NEUTRAL, POLICY_NEUTRAL);
     }
-    
+
     // ----------------------------------------------------------------------
 	// Deal with parsed multipart requests.
 	// ----------------------------------------------------------------------
-    
+
 	public boolean isMultipart() {
 		return getAttribute(ATTRIBUTE_IS_MULTIPART) != null;
 	}
@@ -235,7 +235,7 @@ public class VitroRequest extends HttpServletRequestWrapper {
 		}
 		return null;
 	}
-	
+
 	/**
 	 * If the uploaded file exceeded the maximum size, and if the strategy said
 	 * to stash the exception, it will be stored as a request attribute.
@@ -243,7 +243,7 @@ public class VitroRequest extends HttpServletRequestWrapper {
 	public boolean hasFileSizeException() {
 		return getFileSizeException() != null;
 	}
-	
+
 	/**
 	 * Could be either FileSizeLimitExceededException or
 	 * SizeLimitExceededException, so return their common ancestor.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsPage.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsPage.java
index a4bf15ac4..7da8a5eb7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsPage.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsPage.java
@@ -71,7 +71,7 @@ public abstract class UserAccountsPage extends AbstractPageHandler {
 
 	/**
 	 * Create a list of possible profile types.
-	 * 
+	 *
 	 * TODO Right now, these are foaf:Person and it's sub-classes. What will it
 	 * be for Vitro?
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectionCriteria.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectionCriteria.java
index 52cbf20b1..652537689 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectionCriteria.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectionCriteria.java
@@ -4,7 +4,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.accounts;
 
 /**
  * On what basis are we selecting user accounts?
- * 
+ *
  * Search terms are matched against email, and against firstName combined with
  * lastName. Searches are case-insensitive.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPage.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPage.java
index 5bddbe63b..bdbc5dbce 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPage.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPage.java
@@ -206,16 +206,16 @@ public class UserAccountsAddPage extends UserAccountsPage {
 			body.put(PARAMETER_LAST_NAME, "");
 			body.put("selectedRoles", getDefaultRolesForNewUsers());
 		}
-		
+
 		body.put("roles", buildListOfSelectableRoles());
 		body.put("profileTypes", buildProfileTypesList());
 		body.put(PARAMETER_NEW_PROFILE_CLASS_URI, newProfileClassUri);
 		body.put("formUrls", buildUrlsMap());
-		
+
 		if (externalAuthOnly) {
 			body.put(PARAMETER_EXTERNAL_AUTH_ONLY, Boolean.TRUE);
 		}
-		
+
 		if (!associatedProfileUri.isEmpty()) {
 			body.put("associatedProfileInfo",
 					buildProfileInfo(associatedProfileUri));
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsListPage.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsListPage.java
index 1eff96041..f02e17b8e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsListPage.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsListPage.java
@@ -37,7 +37,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem
 
 /**
  * Handle the List page.
- * 
+ *
  * TODO: auto-complete
  */
 public class UserAccountsListPage extends UserAccountsPage {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsProfileCreator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsProfileCreator.java
index 8e4c24071..25d5e1540 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsProfileCreator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsProfileCreator.java
@@ -29,7 +29,7 @@ public class UserAccountsProfileCreator {
 
 		String label = account.getLastName() + ", " + account.getFirstName();
 		addProp(dpsDao, indUri, VitroVocabulary.LABEL, label);
-		
+
 		return indUri;
 	}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/ExternalAuthChecker.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/ExternalAuthChecker.java
index d69f10b76..e34facb99 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/ExternalAuthChecker.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/ExternalAuthChecker.java
@@ -22,14 +22,14 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
 
 /**
  * What is our reaction to this possible External Auth ID?
- * 
+ *
  * Is somebody already using it (other than ourselves)? Does it match an
  * existing Profile? Neither?
- * 
+ *
  * If we are creating a new account, the userAccountUri will be empty, so if
  * someone is using the externalAuthID, their URI won't match ours, which is
  * what we want.
- * 
+ *
  * If the externalAuthId is empty, or if there is any error, say "neither".
  */
 class ExternalAuthChecker extends AbstractAjaxResponder {
@@ -123,4 +123,4 @@ class ExternalAuthChecker extends AbstractAjaxResponder {
 		return jsonObject.toString();
 	}
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/ProfileAutoCompleter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/ProfileAutoCompleter.java
index 539a295fa..4775b4644 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/ProfileAutoCompleter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/ProfileAutoCompleter.java
@@ -51,9 +51,9 @@ import edu.cornell.mannlib.vitro.webapp.utils.searchengine.SearchResponseFilter;
  * that have no matching property, unless it matches the current externalAuthId.
  * (So a Profile that is currently associated with the user is not excluded from
  * the list.)
- * 
+ *
  * For each such Profile, return the label, the URL and the URI.
- * 
+ *
  * If the matching property is not defined, or if the search term is empty, or
  * if an error occurs, return an empty result.
  */
@@ -168,7 +168,7 @@ class ProfileAutoCompleter extends AbstractAjaxResponder implements
 	/**
 	 * To test whether a search result is acceptable, find the matching property
 	 * for the individual.
-	 * 
+	 *
 	 * We will accept any individual without a matching property, or with a
 	 * matching property that matches the user we are editing.
 	 */
@@ -223,4 +223,4 @@ class ProfileAutoCompleter extends AbstractAjaxResponder implements
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ManageProxiesController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ManageProxiesController.java
index bfd135034..01f74d62c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ManageProxiesController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ManageProxiesController.java
@@ -42,7 +42,7 @@ public class ManageProxiesController extends FreemarkerHttpServlet {
 		String action = vreq.getPathInfo();
 		log.debug("action = '" + action + "'");
 
-		
+
 		if (ACTION_CREATE.equals(action)) {
 			return handleCreateRequest(vreq);
 		} else if (ACTION_EDIT.equals(action)) {
@@ -67,17 +67,17 @@ public class ManageProxiesController extends FreemarkerHttpServlet {
 
 	private ResponseValues handleEditRequest(VitroRequest vreq) {
 		ManageProxiesEditPage page = new ManageProxiesEditPage(vreq);
-		
+
 		if (page.isValid()) {
 			page.applyEdits();
 			Message.setMessage(vreq, new SuccessMessage());
 		} else {
 			Message.setMessage(vreq, new FailureMessage());
 		}
-		
+
 		return redirectToList();
 	}
-	
+
 	private ResponseValues handleListRequest(VitroRequest vreq) {
 		ManageProxiesListPage page = new ManageProxiesListPage(vreq);
 		return page.showPage();
@@ -103,6 +103,6 @@ public class ManageProxiesController extends FreemarkerHttpServlet {
 		public Map<String, Object> getMessageInfoMap() {
 			return assembleMap("failure", Boolean.TRUE);
 		}
-		
+
 	}
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ManageProxiesCreatePage.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ManageProxiesCreatePage.java
index 51be9c046..4626e727e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ManageProxiesCreatePage.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ManageProxiesCreatePage.java
@@ -20,17 +20,17 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 /**
  * Create a new relationship, or set of relationships, between zero or more
  * proxies and zero or more profiles.
- * 
+ *
  * Note that this is additive, so if a proxy already has some profiles, they
  * will be preserved, even if they are not listed here.
- * 
+ *
  * It is possible that one or more profiles might be the "self" pages of one or
  * more proxies, so as we do each proxy, we exclude any profile which is the
  * "self" for that proxy.
- * 
+ *
  * If there are zero proxies here, or zero profiles, it doesn't hurt anything,
  * it just doesn't accomplish anything either.
- * 
+ *
  * This is not really a page, in that it doesn't display anything. It's just a
  * way to separate out some of the logic of the ManageProxies list page.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationship.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationship.java
index d9ac0dbe2..9bc7666cb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationship.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationship.java
@@ -8,7 +8,7 @@ import java.util.List;
 
 /**
  * An immutable relationship between Proxies and Profiles.
- * 
+ *
  * In most cases, this will either be between one Proxy and many Profiles (view
  * by Proxy), or between on Profile and many Proxies (view by Profile). However,
  * we can imagine it being a many-to-many relationship.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectionBuilder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectionBuilder.java
index f053636cd..54268526a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectionBuilder.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectionBuilder.java
@@ -9,9 +9,9 @@ import java.util.List;
  * A mutable version of ProxyRelationshipSelection, that can be assembled
  * piecemeal as the info becomes available and then translated to an immutable
  * ProxyRelationshipSelection.
- * 
+ *
  * Uses mutable subclasses Relationship and ItemInfo.
- * 
+ *
  * ItemInfo contains a field for externalAuthId only because it is useful when
  * gathering the classLabel and imageUrl.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectionCriteria.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectionCriteria.java
index 44bdbfd90..dd94013a9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectionCriteria.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectionCriteria.java
@@ -5,10 +5,10 @@ package edu.cornell.mannlib.vitro.webapp.controller.accounts.manageproxies;
 
 /**
  * On what basis are we selecting proxy relationships?
- * 
+ *
  * Are we viewing by Proxy or by Profile? What is the search term, if any? How
  * many results per page, and what page are we on?
- * 
+ *
  * Search terms are matched against last name combined with first name, of
  * either UserAccount(Proxy) or Individual(Profile), depending on how we are
  * listing. Searches are case-insensitive.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/BasicProfilesGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/BasicProfilesGetter.java
index cb78c3d15..262368398 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/BasicProfilesGetter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/BasicProfilesGetter.java
@@ -35,7 +35,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.searchengine.SearchQueryUtils;
 
 /**
  * Get the basic auto-complete info for the profile selection.
- * 
+ *
  */
 public class BasicProfilesGetter extends AbstractAjaxResponder {
 	private static final Log log = LogFactory.getLog(BasicProfilesGetter.class);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/MoreProxyInfo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/MoreProxyInfo.java
index 0143c9f1d..f02b9e13c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/MoreProxyInfo.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/MoreProxyInfo.java
@@ -26,7 +26,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao;
 
 /**
  * Get more information (class label and image URL) about a selected proxy.
- * 
+ *
  * If there is no image URL, just omit it from the result. The proxy already has
  * a placeholder image.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPage.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPage.java
index 55e860670..fc11f665d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPage.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPage.java
@@ -23,7 +23,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem
 /**
  * Handle the first-time login of an Externally Authenticated user who has no
  * UserAccount - let's create one!
- * 
+ *
  * If they get here from the login, there should be an ExternalLoginInfo waiting
  * in the session. Otherwise, they should get here by submitting the form, which
  * will have the info in hidden fields.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPageStrategy.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPageStrategy.java
index 811a41adb..447d2d223 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPageStrategy.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPageStrategy.java
@@ -16,7 +16,7 @@ import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailMessage;
 /**
  * Handle the variations in the UserAccountsFirstTimeExternal page. If email is
  * available, inform the template, and send a notification to the user.
- * 
+ *
  * If not, then don't.
  */
 public abstract class UserAccountsFirstTimeExternalPageStrategy extends
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsUserController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsUserController.java
index 0fa6d4903..45be8f553 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsUserController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsUserController.java
@@ -148,7 +148,7 @@ public class UserAccountsUserController extends FreemarkerHttpServlet {
 	 * TODO The LoginRedirector gives a URI that includes the context path. But
 	 * the RedirectResponseValues wants a URI that does not include the context
 	 * path.
-	 * 
+	 *
 	 * Bridge the gap.
 	 */
 	private String stripContextPath(VitroRequest vreq, String uri) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/RestrictLoginsController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/RestrictLoginsController.java
index 88a437dd2..04e22d03b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/RestrictLoginsController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/RestrictLoginsController.java
@@ -93,7 +93,7 @@ public class RestrictLoginsController extends FreemarkerHttpServlet {
 					PARAMETER_RESTRICT, "true"));
 			body.put("openUrl", UrlBuilder.getUrl("/admin/restrictLogins",
 					PARAMETER_OPEN, "true"));
-			
+
 			return new TemplateResponseValues("admin-restrictLogins.ftl", body);
 		}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowBackgroundThreadsController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowBackgroundThreadsController.java
index dcd7b5487..2734b5cdd 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowBackgroundThreadsController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowBackgroundThreadsController.java
@@ -29,7 +29,7 @@ public class ShowBackgroundThreadsController extends FreemarkerHttpServlet {
 	private static final String TEMPLATE_NAME = "admin-showThreads.ftl";
 	private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
 
-	
+
 	@Override
 	protected ResponseValues processRequest(VitroRequest vreq) throws Exception {
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowSourcesController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowSourcesController.java
index c04199160..c0d5e3fc3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowSourcesController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowSourcesController.java
@@ -39,37 +39,37 @@ import javax.servlet.annotation.WebServlet;
 /**
  * Show the details of where our RDF data is coming from. What are the
  * structures that supply the triples?
- * 
+ *
  * <pre>
  * Display like this:
- * 
+ *
  * ModelAccess for Context
  * blah-blah
- * 
+ *
  * ModelAccess for Request
- * blah-blah 
- * 
+ * blah-blah
+ *
  * RDFServices
  *               CONTEXT    REQUEST
  * CONTENT       blah-blah  argle-bargle
  * CONFIGURATION balderdash obstreporous
- * 
+ *
  * Datasets  [same]
- * 
+ *
  * Models
  * Name                     ContextOnly
  * DISPLAY                  blah-blah
  * filegraph:tbox/junk.owl  bork-bork-bork
- * 
+ *
  * OntModels
  * Name                     Context        REQUEST
  * DISPLAY                  blah-blah      song-and-dance
  * filegraph:tbox/junk.owl  bork-bork-bork bogus-malarkey
- * 
- * For the request object, 
+ *
+ * For the request object,
  *     Get the LANGUAGE_NEUTRAL versions, since they have fewer decorators.
  *     If the string is the same as the corresponding object in the context, show as "SAME AS CONTEXT"
- * 
+ *
  * Structure for freemarker:
  * map:
  *    modelAccess:
@@ -86,22 +86,22 @@ import javax.servlet.annotation.WebServlet;
  *       [same]
  *    models:
  *       content:
- *          name1: 
+ *          name1:
  *             context: text
- *          name2: 
+ *          name2:
  *             context: text
  *          ...
  *       configuration:
- *          name3: 
+ *          name3:
  *             context: text
  *             request: text
  *          ...
  *    ontModels:
- *       name1: 
+ *       name1:
  *          context: text
  *          request: text
  *       ...
- *       
+ *
  * At the same time, write these to the log as INFO messages, without the fancy formatting.
  * </pre>
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/WaitForBackgroundThreadsController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/WaitForBackgroundThreadsController.java
index 69ea5ed4d..5384bf5ba 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/WaitForBackgroundThreadsController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/WaitForBackgroundThreadsController.java
@@ -28,18 +28,18 @@ import edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread.Work
 
 /**
  * Wait for background threads to complete. Used in Selenium testing.
- * 
+ *
  * This servlet will poll background threads (instances of
  * VitroBackgroundThread) until all living threads are idle, or until a maximum
  * wait time has been met. The wait time can be specified with a "waitLimit"
  * parameter on the request (in seconds), or the default value will be used.
- * 
+ *
  * If the maximum time expires before all threads become idle, the result will
  * be 503 (Service Unavailable)
- * 
+ *
  * Else if a "return" parameter exists, and a "referer" header exists, the
  * result will be a 307 (Temporary Redirect) back to the referer URL.
- * 
+ *
  * Otherwise, the result will be 200 (OK), with a brief message.
  */
 @WebServlet(name = "WaitForBackgroundThreads", urlPatterns = {"/admin/wait"} )
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/AbstractAjaxResponder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/AbstractAjaxResponder.java
index d773a88ef..dff97fd18 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/AbstractAjaxResponder.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/AbstractAjaxResponder.java
@@ -122,7 +122,7 @@ public abstract class AbstractAjaxResponder {
 		/**
 		 * Subclasses must implement. Return a map of field names and values,
 		 * which will become a row in the result.
-		 * 
+		 *
 		 * Or return null, and no row will be created in the result.
 		 */
 		protected abstract Map<String, String> parseSolutionRow(
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java
index 93a8ff861..59d93ee13 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java
@@ -27,7 +27,7 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 /**
  * Handle an AJAX request for a SPARQL query. On entry, the "query" parameter
  * contains the query string.
- * 
+ *
  * The result is delivered in JSON format.
  */
 @WebServlet(name = "ajaxSparqlQuery", urlPatterns = {"/ajax/sparqlQuery"} )
@@ -97,5 +97,5 @@ public class SparqlQueryAjaxController extends VitroAjaxController {
 					+ PARAMETER_QUERY + "' parameter is required");
 		}
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlUtils.java
index 78a389341..34a14b641 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlUtils.java
@@ -26,7 +26,7 @@ import org.apache.jena.rdf.model.Model;
 /**
  * Handle an AJAX request for a SPARQL query. On entry, the "query" parameter
  * contains the query string.
- * 
+ *
  * The result is delivered in JSON format.
  */
 public class SparqlUtils {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/VitroAjaxController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/VitroAjaxController.java
index d1398f010..51a68e602 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/VitroAjaxController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/VitroAjaxController.java
@@ -59,10 +59,10 @@ public abstract class VitroAjaxController extends HttpServlet {
 			throws ServletException, IOException {
 		doGet(req, resp);
 	}
-	
+
     /**
      * By default, a controller requires authorization for no actions.
-     * Subclasses that require authorization to process their page will override 
+     * Subclasses that require authorization to process their page will override
 	 *    to return the actions that require authorization.
 	 * In some cases, the choice of actions will depend on the contents of the request.
      */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlQueryApiController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlQueryApiController.java
index 16e75d06b..074d081e1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlQueryApiController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlQueryApiController.java
@@ -28,9 +28,9 @@ import edu.cornell.mannlib.vitro.webapp.utils.http.NotAcceptableException;
 
 /**
  * Process SPARQL queries as an API.
- * 
+ *
  * Supports GET or POST requests. May produce these responses:
- * 
+ *
  * <pre>
  * 200 Success
  * 400 Failed to parse SPARQL query
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java
index 83103b05b..5965332c3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiController.java
@@ -35,9 +35,9 @@ import edu.cornell.mannlib.vitro.webapp.modules.searchIndexer.SearchIndexer;
 
 /**
  * Process SPARQL Updates, as an API.
- * 
+ *
  * Supports only POST requests, not GET or HEAD. May produce these responses:
- * 
+ *
  * <pre>
  * 200 Success
  * 400 Failed to parse SPARQL update
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/VitroApiServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/VitroApiServlet.java
index 65553f2f1..47bcdfd21 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/VitroApiServlet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/VitroApiServlet.java
@@ -24,7 +24,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.http.NotAcceptableException;
 
 /**
  * The base class for Vitro servlets that implement the API.
- * 
+ *
  * We don't want the API servlets to extend VitroHttpServlet, because we want
  * the following behavior:
  * <ul>
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/RdfResultMediaType.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/RdfResultMediaType.java
index 4c9114a54..03ffcd93a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/RdfResultMediaType.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/RdfResultMediaType.java
@@ -21,7 +21,7 @@ public enum RdfResultMediaType {
 	TTL("text/turtle", false, "N3", "TTL"),
 
 	JSON("application/json", false, "N3", "JSON"),
-	
+
 	JSON_LD("application/ld+json", false, "N3", "JSON");
 
 	// ----------------------------------------------------------------------
@@ -75,7 +75,7 @@ public enum RdfResultMediaType {
 	private final String serializationFormat;
 
 	/**
-	 * What format shall we ask the resulting OntModel to write? 
+	 * What format shall we ask the resulting OntModel to write?
 	 */
 	private final String jenaResponseFormat;
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiAskExecutor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiAskExecutor.java
index 685e8b846..c8747b4cc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiAskExecutor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiAskExecutor.java
@@ -23,7 +23,7 @@ public class SparqlQueryApiAskExecutor extends SparqlQueryApiResultSetProducer {
 	/**
 	 * The RDFService returns a boolean from an ASK query, without regard to a
 	 * requested format.
-	 * 
+	 *
 	 * For TEXT, CSV and TSV, we can simple return the String value of the
 	 * boolean as an InputStream. For XML and JSON, however, the W3C documents
 	 * require something a bit more fancy.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutor.java
index 9794145d3..bc59421c8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/SparqlQueryApiExecutor.java
@@ -21,7 +21,7 @@ public abstract class SparqlQueryApiExecutor {
 	/**
 	 * Get an instance that is appropriate to the query and the acceptable
 	 * types.
-	 * 
+	 *
 	 * @throws AcceptHeaderParsingException
 	 *             if the accept header was not in a valid format
 	 * @throws NotAcceptableException
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java
index 041a6deb3..36a7601b2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java
@@ -28,7 +28,7 @@ import javax.servlet.annotation.WebServlet;
 /**
  * Provide a "hidden" login page for systems where the Login Widget has been
  * modified to only show the link to an External Authentication system.
- * 
+ *
  * This page is only hidden because there is no link to it. Anyone who knows the
  * URL can come here, but they need to pass Internal Authentication to proceed.
  */
@@ -189,7 +189,7 @@ public class AdminLoginController extends FreemarkerHttpServlet {
 			body.put("password", password);
 			body.put("newPassword", newPassword);
 			body.put("confirmPassword", confirmPassword);
-			
+
 			body.put("minPasswordLength", MIN_PASSWORD_LENGTH);
 			body.put("maxPasswordLength", MAX_PASSWORD_LENGTH);
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/Authenticator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/Authenticator.java
index 5fa995f13..e8bbec516 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/Authenticator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/Authenticator.java
@@ -23,11 +23,11 @@ import java.util.List;
 /**
  * The tool that a login process will use to interface with the user records in
  * the model (or wherever).
- * 
+ *
  * This needs to be based on a HttpSession, because things like the UserDAO are
  * tied to the session. It seemed easier to base it on a HttpServletRequest,
  * which we can use to get the session.
- * 
+ *
  * TODO: Wouldn't it be cool if we could remove the LoginNotPermitted exception?
  * Perhaps we could have a sub-object called an Authenticator.ForUser, and you
  * call a getAuthenticatorForUser() method which returns null if your login has
@@ -54,7 +54,7 @@ public abstract class Authenticator {
 	/**
 	 * Ask the currently configured AuthenticatorFactory to give us an
 	 * Authenticator for this request.
-	 * 
+	 *
 	 * If there is no factory, configure a Basic one.
 	 */
 
@@ -98,11 +98,11 @@ public abstract class Authenticator {
 	/**
 	 * Is this user permitted to login? Some Authenticators might disable logins
 	 * for certain users.
-	 * 
+	 *
 	 * Behavior when userAccount is null depends on the particular
 	 * Authenticator. An answer of "true" presumably means that the user will be
 	 * permitted to login and create an account on the fly.
-	 * 
+	 *
 	 * Note that this method may rely on the HttpServletRequest object that was
 	 * provided to the factory when this instance was created.
 	 */
@@ -152,7 +152,7 @@ public abstract class Authenticator {
 
 	/**
 	 * <pre>
-	 * Record that the user has logged in, with all of the housekeeping that 
+	 * Record that the user has logged in, with all of the housekeeping that
 	 * goes with it:
 	 * - update the user record
 	 * - set login status and timeout limit in the session
@@ -160,7 +160,7 @@ public abstract class Authenticator {
 	 * - record the user in the session map
 	 * - notify other users of the model
 	 * </pre>
-	 * 
+	 *
 	 * @throws LoginNotPermitted
 	 *             if the Authenticator denies this user the ability to login.
 	 *             This should be thrown if and only if isUserPermittedToLogin()
@@ -172,7 +172,7 @@ public abstract class Authenticator {
 	/**
 	 * <pre>
 	 * Record that the current user has logged out: - notify other users of the
-	 * model. 
+	 * model.
 	 * - invalidate the session.
 	 * </pre>
 	 */
@@ -243,7 +243,7 @@ public abstract class Authenticator {
 	 * Check whether the form of the emailAddress is syntactically correct. Does
 	 * not allow multiple addresses. Does not allow local addresses (without a
 	 * hostname).
-	 * 
+	 *
 	 * Does not confirm that the host actually exists, or has a mailbox by that
 	 * name.
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/BaseLoginServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/BaseLoginServlet.java
index 4af7f9e44..aa9a11209 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/BaseLoginServlet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/BaseLoginServlet.java
@@ -25,19 +25,19 @@ public class BaseLoginServlet extends HttpServlet {
 	protected static Message messageLoginFailed(HttpServletRequest req) {
 		return new LoginProcessBean.Message(req, MLevel.ERROR, "external_login_failed");
 	}
-	
+
 	/** Tell the user that it's nothing personal, they just aren't allowed in. */
 	protected static Message messageLoginDisabled(HttpServletRequest req) {
 		return new LoginProcessBean.Message(req, MLevel.ERROR, "logins_temporarily_disabled");
 	}
-	
+
 	protected Authenticator getAuthenticator(HttpServletRequest req) {
 		return Authenticator.getInstance(req);
 	}
 
 	/**
 	 * Store an error message in the login bean and go back where we came from.
-	 * 
+	 *
 	 * Remove the referring URL from the session after using it.
 	 */
 	protected void complainAndReturnToReferrer(HttpServletRequest req,
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/BasicAuthenticator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/BasicAuthenticator.java
index 946e1ff6c..f6f95081b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/BasicAuthenticator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/BasicAuthenticator.java
@@ -242,7 +242,7 @@ public class BasicAuthenticator extends Authenticator {
 
 	/**
 	 * Record the login in the user/session map.
-	 * 
+	 *
 	 * TODO What is this map used for?
 	 */
 	private void recordInUserSessionMap(String userUri, HttpSession session) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ExternalAuthHelper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ExternalAuthHelper.java
index 5d0fd5c62..9971521ab 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ExternalAuthHelper.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ExternalAuthHelper.java
@@ -18,7 +18,7 @@ import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
 /**
  * Capture the properties used by the External Authorization system, and use
  * them to assist in the process.
- * 
+ *
  * The first time this bean is requested, it is created from the configuration
  * properties and cached in the session. After that, the cached version is used.
  */
@@ -43,7 +43,7 @@ public class ExternalAuthHelper {
 
 	/**
 	 * Get the bean from the servlet context. If there is no bean, create one.
-	 * 
+	 *
 	 * Never returns null.
 	 */
 	public static ExternalAuthHelper getHelper(ServletRequest request) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FakeExternalAuthController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FakeExternalAuthController.java
index 0c4ad8a89..a42e1fa48 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FakeExternalAuthController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FakeExternalAuthController.java
@@ -25,7 +25,7 @@ import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 /**
  * This allows J. Random User to pretend that he's passed external
  * authentication.
- * 
+ *
  * This should not be included in web.xml in a production deployment!!!
  */
 public class FakeExternalAuthController extends FreemarkerHttpServlet {
@@ -43,10 +43,10 @@ public class FakeExternalAuthController extends FreemarkerHttpServlet {
 	@Override
 	public void init() throws ServletException {
 		log.debug("storing the bean.");
-		
+
 		ExternalAuthHelper.setBean(getServletContext(),
 				new FakeExternalAuthHelper(null));
-		
+
 		new SecurityWarning().warn(getServletContext(),
 				"The FakeExternalAuthController is enabled. "
 						+ "If that's not what you wanted, "
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthReturn.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthReturn.java
index 153520974..0d9af1122 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthReturn.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthReturn.java
@@ -37,14 +37,14 @@ public class LoginExternalAuthReturn extends BaseLoginServlet {
 	 * <pre>
 	 * Returning from the external authorization server. If we were successful,
 	 * the header will contain the name of the user who just logged in.
-	 * 
-	 * Deal with these possibilities: 
+	 *
+	 * Deal with these possibilities:
 	 * - The header name was not configured in runtime.properties. Complain.
-	 * - No username: the login failed. Complain 
-	 * - User corresponds to a User acocunt. Record the login. 
-	 * - User corresponds to an Individual (self-editor). 
+	 * - No username: the login failed. Complain
+	 * - User corresponds to a User acocunt. Record the login.
+	 * - User corresponds to an Individual (self-editor).
 	 * - User is not recognized.
-	 * 
+	 *
 	 * On entry, we expect to find:
 	 * - A LoginProcessBean, which will give us the afterLoginUrl if the login
 	 *      succeeds.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthSetup.java
index 5dbd4b069..20fa362e5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthSetup.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthSetup.java
@@ -17,9 +17,9 @@ import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean;
 
 /**
  * Set up the external authorization process.
- * 
+ *
  * Write down the page that triggered the request, so we can get back to it.
- * 
+ *
  * Send a request to the external authorization server that will return us to
  * the LoginExternalAuthReturn servlet for further processing.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginInProcessFlag.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginInProcessFlag.java
index faeb0b8b5..f35064b4b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginInProcessFlag.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginInProcessFlag.java
@@ -7,10 +7,10 @@ import javax.servlet.http.HttpSession;
 
 /**
  * This sits in the session to say that a login is in process.
- * 
+ *
  * Authenticate sets the flag each time it redirects to the login widget, and
  * the login widget inspects the flag and resets it.
- * 
+ *
  * If ever the login widget finds that the flag is already reset, it knows that
  * the user navigated to the widget directly, rather than coming through
  * Authenticate, and so it discards any existing LoginProcessBean as obsolete.
@@ -26,7 +26,7 @@ public class LoginInProcessFlag {
 		if (request == null) {
 			throw new NullPointerException("request may not be null.");
 		}
-		
+
 		request.getSession().setAttribute(ATTRIBUTE_NAME, Boolean.TRUE);
 	}
 
@@ -37,12 +37,12 @@ public class LoginInProcessFlag {
 		if (request == null) {
 			throw new NullPointerException("request may not be null.");
 		}
-		
+
 		HttpSession session = request.getSession(false);
 		if (session == null) {
 			return false;
 		}
-		
+
 		Object flag = session.getAttribute(ATTRIBUTE_NAME);
 		if (flag == null) {
 			return false;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LogoutRedirector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LogoutRedirector.java
index a5eb7c6b1..88965f855 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LogoutRedirector.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LogoutRedirector.java
@@ -79,7 +79,7 @@ public class LogoutRedirector {
 	/**
 	 * This must be called each time VitroHttpRequest checks to see whether a
 	 * page's restrictions are met, so we know which pages are restricted.
-	 * 
+	 *
 	 * We might be content to just know the last restricted page, but that could
 	 * lead to problems if two pages are nested.
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLogin.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLogin.java
index 3a241d965..5bfeb295d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLogin.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLogin.java
@@ -209,4 +209,4 @@ public class ProgramLogin extends HttpServlet {
 			writer.println(message);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/RestrictedAuthenticator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/RestrictedAuthenticator.java
index 1f6533f5c..bb4fb6322 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/RestrictedAuthenticator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/RestrictedAuthenticator.java
@@ -47,7 +47,7 @@ public class RestrictedAuthenticator extends Authenticator {
 		if (userAccount == null) {
 			return false;
 		}
-		
+
 		ArrayIdentifierBundle ids = new ArrayIdentifierBundle();
 		ids.addAll(getIdsForUserAccount(req, userAccount));
 		ids.addAll(RequestIdentifiers.getIdBundleForRequest(req));
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpModelsAction.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpModelsAction.java
index 1c985bbbe..63f0779d1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpModelsAction.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpModelsAction.java
@@ -20,10 +20,10 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
 
 /**
  * The user has requested a dump.
- * 
+ *
  * First time through, figure out what filename we would like to put on the
  * dump, and send a redirect.
- * 
+ *
  * Second time thorugh, actually create the dump.
  */
 class DumpModelsAction extends AbstractDumpRestoreAction {
@@ -57,7 +57,7 @@ class DumpModelsAction extends AbstractDumpRestoreAction {
 			String query = "SELECT * WHERE { GRAPH ?g {?s ?p ?o}}";
 
 			resp.setContentType(N_QUADS_MIME_TYPE);
-			
+
 			dumpNQuads(rdfService, query);
 		} catch (Throwable t) {
 			log.error("Failed to dump " + which + " models as N-Quads.", t);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpParser.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpParser.java
index 861722f1b..5e67d023f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpParser.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpParser.java
@@ -15,7 +15,7 @@ public interface DumpParser extends AutoCloseable, Iterable<DumpQuad> {
 		public BadInputException(String message) {
 			super(message);
 		}
-		
+
 		public BadInputException(String message, Throwable cause) {
 			super(message, cause);
 		}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpRestoreController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpRestoreController.java
index 6b1ef67f6..77f22b375 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpRestoreController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/DumpRestoreController.java
@@ -26,11 +26,11 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
 /**
  * Allow the user to dump the knowledge base from either RDFService, or restore
  * it.
- * 
+ *
  * Show the user the selection page. If they select "dump" parameters, redirect
  * to an appropriate filename-based URL, so they will receive a nicely named
  * file. If they chose to "restore", just do it.
- * 
+ *
  * The first request, the selection and the redirected dump should all be GET
  * requests. A restore should be a POST request.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/NQuadLineSplitter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/NQuadLineSplitter.java
index 7bff579c0..eccc08892 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/NQuadLineSplitter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/NQuadLineSplitter.java
@@ -13,7 +13,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.datatools.dumprestore.DumpNod
 /**
  * A utility class for NquadsParser. Breaks an NQuad line into 3 or 4 strings,
  * each holding the text representation of a node.
- * 
+ *
  * It's a little tricky where literals are involved, because white space is
  * significant, except between quotes, and quotes are only quotes if they aren't
  * escaped.
@@ -110,4 +110,4 @@ class NQuadLineSplitter {
 		return pieces;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/RestoreModelsAction.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/RestoreModelsAction.java
index 896387464..9cb102be4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/RestoreModelsAction.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/datatools/dumprestore/RestoreModelsAction.java
@@ -40,15 +40,15 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
 
 /**
  * Load from a dump file of NQuads, or something equivalent.
- * 
+ *
  * We could process it all a line at a time, except for the blank nodes. If
  * there are two references to the same blank node, they must be processed in
  * the same method call to the RDFService.
- * 
+ *
  * So, process each line as it comes in, unless it contains a blank node. Lines
  * with blank nodes get put into buckets, with one bucket for each model (and
  * one for the default model). At the end, we'll empty each of the buckets.
- * 
+ *
  * And if they ask to purge the models before restoring, do that.
  */
 public class RestoreModelsAction extends AbstractDumpRestoreAction {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ApplicationBeanRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ApplicationBeanRetryController.java
index 3c06dfae4..936279e83 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ApplicationBeanRetryController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ApplicationBeanRetryController.java
@@ -26,16 +26,16 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.ApplicationDao;
 
 public class ApplicationBeanRetryController extends BaseEditController {
-	
+
 	private static final Log log = LogFactory.getLog(ApplicationBeanRetryController.class.getName());
-	
+
     public void doPost (HttpServletRequest req, HttpServletResponse response) {
 
 		if (!isAuthorizedToDisplayPage(req, response,
 				SimplePermission.EDIT_SITE_INFORMATION.ACTION)) {
         	return;
         }
-    	
+
     	VitroRequest request = new VitroRequest(req);
 
         try {
@@ -54,7 +54,7 @@ public class ApplicationBeanRetryController extends BaseEditController {
         ApplicationDao aDao = request.getUnfilteredWebappDaoFactory().getApplicationDao();
         ApplicationBean applicationForEditing = aDao.getApplicationBean();
         epo.setDataAccessObject(aDao);
- 
+
         if (!epo.getUseRecycledBean()){
             action = "update";
             epo.setOriginalBean(applicationForEditing);
@@ -75,15 +75,15 @@ public class ApplicationBeanRetryController extends BaseEditController {
         foo.setErrorMap(epo.getErrMsgMap());
 
         HashMap optionMap = new HashMap();
-        
+
         List<Option> themeOptions = getThemeOptions(applicationForEditing);
         optionMap.put("ThemeDir", themeOptions);
-        
+
         foo.setOptionLists(optionMap);
 
         epo.setFormObject(foo);
         FormUtils.populateFormFromBean(applicationForEditing, epo.getAction(), foo);
-   
+
         request.setAttribute("formJsp","/templates/edit/specific/applicationBean_retry.jsp");
         request.setAttribute("scripts","/templates/edit/formBasic.js");
         request.setAttribute("title","Site Information");
@@ -102,22 +102,22 @@ public class ApplicationBeanRetryController extends BaseEditController {
     public void doGet (HttpServletRequest request, HttpServletResponse response) {
         doPost(request, response);
     }
-    
+
     /**
      * Returns a list of Option objects for valid themes in the application, based on names of subdirectories
      * of the "/themes" directory.
-     * 
+     *
      * @return list of Options for valid themes
      */
     private final List<Option> getThemeOptions(ApplicationBean application) {
-    	 
+
     	// Get the available themes
     	ServletContext sc = getServletContext();
     	boolean doSort = true;
     	List<String> themeNames = ApplicationBean.themeInfo.getThemeNames();
 
         // Create the list of theme Options
-        String currentThemeDir = application.getThemeDir(); 
+        String currentThemeDir = application.getThemeDir();
         Iterator<String> i = themeNames.iterator();
         List<Option> themeOptions = new ArrayList<Option>(themeNames.size());
         String themeName, themeDir;
@@ -128,9 +128,9 @@ public class ApplicationBeanRetryController extends BaseEditController {
         	selected = themeDir.equals(currentThemeDir);
         	themeOptions.add(new Option(themeDir, themeName, selected));
         }
-        
+
         return themeOptions;
     }
-    
+
 }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
index ce002659b..68e07a7fe 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
@@ -51,7 +51,7 @@ public class Authenticate extends VitroHttpServlet {
 	/**
 	 * If this is set at any point in the process, store it as the post-login
 	 * destination.
-	 * 
+	 *
 	 * NOTE: we expect URL-encoding on this parameter, and will decode it when
 	 * we read it.
 	 */
@@ -174,12 +174,12 @@ public class Authenticate extends VitroHttpServlet {
 	/**
 	 * If they supply an after-login page, record it and use the Login page for
 	 * the process. Note that we expect it to be URL-encoded.
-	 * 
+	 *
 	 * If they supply a return flag, record the current page as the after-login
 	 * page and use the Login page for the process.
-	 * 
+	 *
 	 * Otherwise, use the current page for the process.
-	 * 
+	 *
 	 * The "current page" is the referrer, unless there is no referrer for some
 	 * reason. In that case, pretend it's the login page.
 	 */
@@ -379,10 +379,10 @@ public class Authenticate extends VitroHttpServlet {
 
 	/**
 	 * <pre>
-	 * They are changing passwords. 
-	 * - If they cancel, let them out without checking for problems. 
-	 * - Otherwise, 
-	 *   - If they get it wrong, let them know. 
+	 * They are changing passwords.
+	 * - If they cancel, let them out without checking for problems.
+	 * - Otherwise,
+	 *   - If they get it wrong, let them know.
 	 *   - If they get it right, record it.
 	 * </pre>
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java
index 7001a6ee2..27bebc566 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java
@@ -31,7 +31,7 @@ public class Classes2ClassesOperationController extends BaseEditController {
 
     	VitroRequest request = new VitroRequest(req);
         String defaultLandingPage = getDefaultLandingPage(request);
-        
+
         HashMap epoHash = null;
         EditProcessObject epo = null;
         try {
@@ -60,12 +60,12 @@ public class Classes2ClassesOperationController extends BaseEditController {
         }
 
         VClassDao vcDao = request.getLanguageNeutralWebappDaoFactory().getVClassDao();
-        
+
         String modeStr = request.getParameter("opMode");
         modeStr = (modeStr == null) ? "" : modeStr;
-        
+
         if (request.getParameter("_cancel") == null) {
-        
+
 	        try {
 	            if (request.getParameter("operation").equals("remove")) {
 	                String[] subclassURIstrs = request.getParameterValues("SubclassURI");
@@ -131,10 +131,10 @@ public class Classes2ClassesOperationController extends BaseEditController {
 	            log.error(e, e);
 	        }
         }
-	        
+
         //if no page forwarder was set, just go back to referring page:
         //the referer stuff all will be changed so as not to rely on the HTTP header
-        
+
         String referer = epo.getReferer();
         if (referer == null) {
             try {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java
index 8d8c98079..d4417e6a3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java
@@ -22,7 +22,7 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
 
 public class Classes2ClassesRetryController extends BaseEditController {
-	
+
 	private static final Log log = LogFactory.getLog(Classes2ClassesRetryController.class.getName());
 
     public void doPost (HttpServletRequest req, HttpServletResponse response) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java
index d74aa1fd3..5c1535489 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java
@@ -29,7 +29,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao;
 
 
 public class ClassgroupRetryController extends BaseEditController {
-	
+
 	private static final Log log = LogFactory.getLog(ClassgroupRetryController.class.getName());
 
     public void doPost (HttpServletRequest req, HttpServletResponse response) {
@@ -66,7 +66,7 @@ public class ClassgroupRetryController extends BaseEditController {
                 } catch (NullPointerException e) {
                     log.error("Need to implement 'record not found' error message.");
                 }
-                if (vclassGroupForEditing == null) {                    
+                if (vclassGroupForEditing == null) {
                     //UTF-8 expected due to URIEncoding on Connector in server.xml
                     String uriToFind = request.getParameter("uri");
                     vclassGroupForEditing = (VClassGroup)cgDao.getGroupByURI(uriToFind);
@@ -78,7 +78,7 @@ public class ClassgroupRetryController extends BaseEditController {
         } else {
             vclassGroupForEditing = (VClassGroup) epo.getNewBean();
         }
-        
+
         //validators
         List<Validator> validatorList = new ArrayList<Validator>();
         validatorList.add(new RequiredFieldValidator());
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java
index 876aa79dd..8d6ddb4e2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DataPropertyStatementRetryController.java
@@ -29,9 +29,9 @@ import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao;
 import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
 
 public class DataPropertyStatementRetryController extends BaseEditController {
-	
+
 	private static final Log log = LogFactory.getLog(DataPropertyStatementRetryController.class.getName());
-	
+
     public void doPost (HttpServletRequest request, HttpServletResponse response) {
 		if (!isAuthorizedToDisplayPage(request, response,
 				SimplePermission.DO_BACK_END_EDITING.ACTION)) {
@@ -44,8 +44,8 @@ public class DataPropertyStatementRetryController extends BaseEditController {
         String action = "insert";
 
         VitroRequest vreq = new VitroRequest(request);
-        
-        DataPropertyStatementDao dataPropertyStatementDao = 
+
+        DataPropertyStatementDao dataPropertyStatementDao =
         		vreq.getUnfilteredWebappDaoFactory().getDataPropertyStatementDao();
         epo.setDataAccessObject(dataPropertyStatementDao);
         DataPropertyDao dpDao = vreq.getUnfilteredWebappDaoFactory().getDataPropertyDao();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java
index 4c300fb39..a076d9aa5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java
@@ -32,7 +32,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
 
 @WebServlet(name = "DatapropEditController", urlPatterns = {"/datapropEdit"} )
 public class DatapropEditController extends BaseEditController {
-	
+
 	private static final Log log = LogFactory.getLog(DatapropEditController.class.getName());
 
     public void doPost (HttpServletRequest request, HttpServletResponse response) {
@@ -41,7 +41,7 @@ public class DatapropEditController extends BaseEditController {
         }
 
     	VitroRequest vreq = new VitroRequest(request);
-    	
+
         final int NUM_COLS=18;
 
         String datapropURI = request.getParameter("uri");
@@ -50,10 +50,10 @@ public class DatapropEditController extends BaseEditController {
         DataPropertyDao dpDaoLangNeut = vreq.getLanguageNeutralWebappDaoFactory().getDataPropertyDao();
         VClassDao vcDao = vreq.getLanguageNeutralWebappDaoFactory().getVClassDao();
         VClassDao vcDaoWLang = vreq.getUnfilteredWebappDaoFactory().getVClassDao();
-        
+
         DataProperty dp = dpDao.getDataPropertyByURI(datapropURI);
         DataProperty pLangNeut = dpDaoLangNeut.getDataPropertyByURI(request.getParameter("uri"));
-        
+
         PropertyGroupDao pgDao = vreq.getUnfilteredWebappDaoFactory().getPropertyGroupDao();
 
         ArrayList results = new ArrayList();
@@ -78,7 +78,7 @@ public class DatapropEditController extends BaseEditController {
 
         results.add(dp.getPickListName()); // column 1
         results.add(dp.getPublicName() == null ? "(no public label)" : dp.getPublicName()); // column 2
-        
+
         if (dp.getGroupURI() != null) {
             PropertyGroup pGroup = pgDao.getGroupByURI(dp.getGroupURI());
             if (pGroup != null) {
@@ -89,7 +89,7 @@ public class DatapropEditController extends BaseEditController {
         } else {
             results.add("(unspecified)");
         }
-        
+
         String ontologyName = null;
         if (dp.getNamespace() != null) {
             Ontology ont = vreq.getUnfilteredWebappDaoFactory().getOntologyDao().getOntologyByURI(dp.getNamespace());
@@ -104,11 +104,11 @@ public class DatapropEditController extends BaseEditController {
         // we support parents now, but not the simple getParent() style method
         //String parentPropertyStr = "<i>(datatype properties are not yet modeled in a property hierarchy)</i>"; // TODO - need multiple inheritance
         //results.add(parentPropertyStr);
-        
-        String domainStr = ""; 
+
+        String domainStr = "";
         if (pLangNeut.getDomainVClassURI() != null) {
             VClass domainClass = vcDao.getVClassByURI(pLangNeut.getDomainVClassURI());
-            VClass domainWLang = vcDaoWLang.getVClassByURI(pLangNeut.getDomainVClassURI()); 
+            VClass domainWLang = vcDaoWLang.getVClassByURI(pLangNeut.getDomainVClassURI());
             if (domainClass != null && domainClass.getURI() != null && domainClass.getPickListName() != null) {
                 try {
                     if (domainClass.isAnonymous()) {
@@ -125,16 +125,16 @@ public class DatapropEditController extends BaseEditController {
 
         String rangeStr = (dp.getRangeDatatypeURI() == null) ? "<i>untyped</i> (rdfs:Literal)" : dp.getRangeDatatypeURI();
         results.add(rangeStr); // column 7
-        
+
         results.add(dp.getFunctional() ? "true" : "false"); // column 8
-        
+
         String publicDescriptionStr = (dp.getPublicDescription() == null) ? "" : dp.getPublicDescription(); // column 9
-        results.add(publicDescriptionStr);        
+        results.add(publicDescriptionStr);
         String exampleStr = (dp.getExample() == null) ? "" : dp.getExample();  // column 10
         results.add(exampleStr);
         String descriptionStr = (dp.getDescription() == null) ? "" : dp.getDescription();  // column 11
         results.add(descriptionStr);
-        
+
 		results.add(dp.getHiddenFromDisplayBelowRoleLevel() == null ? "(unspecified)"
 				: dp.getHiddenFromDisplayBelowRoleLevel().getDisplayLabel()); // column 12
 		results.add(dp.getProhibitedFromUpdateBelowRoleLevel() == null ? "(unspecified)"
@@ -150,7 +150,7 @@ public class DatapropEditController extends BaseEditController {
         request.setAttribute("suppressquery","true");
 
         boolean FORCE_NEW = true;
-        
+
         EditProcessObject epo = super.createEpo(request, FORCE_NEW);
         FormObject foo = new FormObject();
         HashMap OptionMap = new HashMap();
@@ -159,7 +159,7 @@ public class DatapropEditController extends BaseEditController {
         epo.setFormObject(foo);
 
         DataPropertyDao assertionsDpDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getDataPropertyDao();
-        
+
         List<DataProperty> superProps = getDataPropertiesForURIList(
                 assertionsDpDao.getSuperPropertyURIs(dp.getURI(), false), assertionsDpDao);
         sortForPickList(superProps, vreq);
@@ -169,14 +169,14 @@ public class DatapropEditController extends BaseEditController {
                 assertionsDpDao.getSubPropertyURIs(dp.getURI()), assertionsDpDao);
         sortForPickList(subProps, vreq);
         request.setAttribute("subproperties", subProps);
-        
+
         List<DataProperty> eqProps = getDataPropertiesForURIList(
                 assertionsDpDao.getEquivalentPropertyURIs(dp.getURI()), assertionsDpDao);
         sortForPickList(eqProps, vreq);
         request.setAttribute("equivalentProperties", eqProps);
-        
+
         ApplicationBean appBean = vreq.getAppBean();
-        
+
         request.setAttribute("epoKey",epo.getKey());
         request.setAttribute("datatypeProperty", dp);
         request.setAttribute("title","Data Property Control Panel");
@@ -195,8 +195,8 @@ public class DatapropEditController extends BaseEditController {
     public void doGet (HttpServletRequest request, HttpServletResponse response) {
         doPost(request,response);
     }
-    
-    private List<DataProperty> getDataPropertiesForURIList(List<String> propertyURIs, 
+
+    private List<DataProperty> getDataPropertiesForURIList(List<String> propertyURIs,
             DataPropertyDao dpDao) {
         List<DataProperty> properties = new ArrayList<DataProperty>();
         for (String propertyURI : propertyURIs) {
@@ -208,4 +208,4 @@ public class DatapropEditController extends BaseEditController {
         return properties;
     }
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java
index b389fdf20..c8f3ced07 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java
@@ -39,7 +39,7 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 
 
 public class DatapropRetryController extends BaseEditController {
-	
+
 	private static final Log log = LogFactory.getLog(DatapropRetryController.class.getName());
 
     @Override
@@ -51,11 +51,11 @@ public class DatapropRetryController extends BaseEditController {
         //create an EditProcessObject for this and put it in the session
         EditProcessObject epo = super.createEpo(request);
         epo.setBeanClass(DataProperty.class);
-        
+
         VitroRequest vreq = new VitroRequest(request);
 
         WebappDaoFactory wadf = ModelAccess.on(getServletContext()).getWebappDaoFactory();
-        
+
         DatatypeDao dDao = wadf.getDatatypeDao();
         DataPropertyDao dpDao = wadf.getDataPropertyDao();
         epo.setDataAccessObject(dpDao);
@@ -129,49 +129,49 @@ public class DatapropRetryController extends BaseEditController {
 
         FormObject foo = new FormObject();
         foo.setErrorMap(epo.getErrMsgMap()); // retain error messages from previous time through the form
-        
+
         epo.setFormObject(foo);
         FormUtils.populateFormFromBean(objectForEditing,action,foo);
         //for now, this is also making the value hash - need to separate this out
-        
+
         HashMap optionMap = new HashMap();
         List namespaceList = FormUtils.makeOptionListFromBeans(ontDao.getAllOntologies(),"URI","Name", ((objectForEditing.getNamespace()==null) ? "" : objectForEditing.getNamespace()), null, (objectForEditing.getNamespace()!=null));
 	    namespaceList.add(0, new Option(vreq.getUnfilteredWebappDaoFactory().getDefaultNamespace(),"default"));
         optionMap.put("Namespace", namespaceList);
-        
+
         List<Option> domainOptionList = FormUtils.makeVClassOptionList(vreq.getUnfilteredWebappDaoFactory(), objectForEditing.getDomainClassURI());
         if (objectForEditing.getDomainClassURI() != null) {
         	VClass domain = vreq.getWebappDaoFactory().getVClassDao()
         	        .getVClassByURI(objectForEditing.getDomainClassURI());
         	if (domain != null && domain.isAnonymous()) {
         		domainOptionList.add(0, new Option(
-        			    domain.getURI(), 
-        			    domain.getName(), 
+        			    domain.getURI(),
+        			    domain.getName(),
         			    true));
         	}
         }
         domainOptionList.add(0, new Option("","(none specified)"));
         optionMap.put("DomainClassURI", domainOptionList);
-        
+
         List datatypeOptionList = FormUtils.makeOptionListFromBeans(dDao.getAllDatatypes(),"Uri","Name",objectForEditing.getRangeDatatypeURI(),null);
         datatypeOptionList.add(0,new Option("http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral","XML literal (allows XHTML markup)"));
         datatypeOptionList.add(0,new Option(null,"untyped (use if language tags desired)"));
         optionMap.put("RangeDatatypeURI", datatypeOptionList);
-        
+
         List groupOptList = FormUtils.makeOptionListFromBeans(vreq.getUnfilteredWebappDaoFactory().getPropertyGroupDao().getPublicGroups(true),"URI","Name", ((objectForEditing.getGroupURI()==null) ? "" : objectForEditing.getGroupURI()), null, (objectForEditing.getGroupURI()!=null));
         HashMap<String,Option> hashMap = new HashMap<String,Option>();
         groupOptList = getSortedList(hashMap,groupOptList,vreq);
         groupOptList.add(0,new Option("","none"));
         optionMap.put("GroupURI", groupOptList);
 
-        optionMap.put("HiddenFromDisplayBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getDisplayOptionsList(objectForEditing));    
+        optionMap.put("HiddenFromDisplayBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getDisplayOptionsList(objectForEditing));
         optionMap.put("ProhibitedFromUpdateBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getUpdateOptionsList(objectForEditing));
-        optionMap.put("HiddenFromPublishBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getPublishOptionsList(objectForEditing));    
+        optionMap.put("HiddenFromPublishBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getPublishOptionsList(objectForEditing));
 
         foo.setOptionLists(optionMap);
-        
+
         request.setAttribute("functional",objectForEditing.getFunctional());
-        
+
         //checkboxes are pretty annoying : we don't know if someone *unchecked* a box, so we have to default to false on updates.
         if (objectForEditing.getURI() != null) {
         	objectForEditing.setFunctional(false);
@@ -202,7 +202,7 @@ public class DatapropRetryController extends BaseEditController {
     }
 
     class DataPropertyInsertPageForwarder implements PageForwarder {
-    	
+
         public void doForward(HttpServletRequest request, HttpServletResponse response, EditProcessObject epo){
             String newPropertyUrl = "datapropEdit?uri=";
             DataProperty p = (DataProperty) epo.getNewBean();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatatypeRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatatypeRetryController.java
index 54c99473e..852ebcf60 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatatypeRetryController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatatypeRetryController.java
@@ -27,7 +27,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.DatatypeDao;
 public class DatatypeRetryController extends BaseEditController {
 
 	private static final Log log = LogFactory.getLog(DatatypeRetryController.class.getName());
-	
+
     public void doPost (HttpServletRequest req, HttpServletResponse response) {
         if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) {
         	return;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DeletePageController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DeletePageController.java
index a557308af..727f209db 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DeletePageController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DeletePageController.java
@@ -34,10 +34,10 @@ import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
  */
 @WebServlet(name = "DeletePageController", urlPatterns = {"/deletePageController"} )
 public class DeletePageController extends VitroHttpServlet {
-   
+
    private final static String REDIRECT_URL = "/pageList";
-   private static Model removeStatements = null; 
-    
+   private static Model removeStatements = null;
+
     @Override
     protected void doPost(HttpServletRequest rawRequest, HttpServletResponse resp)
             throws ServletException, IOException {
@@ -56,21 +56,21 @@ public class DeletePageController extends VitroHttpServlet {
     protected void doGet(HttpServletRequest rawRequest, HttpServletResponse resp)  throws ServletException, IOException {
     	doPost(rawRequest, resp);
     }
-    
-    
+
+
     //Parameter retrieval is identical, but in one case an entirey new menu item needs to be created
     //along with a new page
     public void doDeletePage(String pageUri, VitroRequest vreq, HttpServletResponse resp) {
-    	
+
     	OntModel displayModel = getDisplayModel(vreq);
     	if(displayModel == null) {
     		//Throw some kind of exception
     		log.error("Display model not being retrieved correctly");
     	}
-    	
+
     	String errorMessage = "";
     		processDelete(pageUri, displayModel, vreq);
-    	
+
     	//Edits to model occur here
     	displayModel.enterCriticalSection(Lock.WRITE);
     	try {
@@ -80,7 +80,7 @@ public class DeletePageController extends VitroHttpServlet {
     		log.debug(r.toString());
     		r.close();
     		displayModel.remove(removeStatements);
-    	
+
     	} catch(Exception ex) {
     		log.error("An error occurred in processing command", ex);
     		errorMessage += "An error occurred and the operation could not be completed successfully.";
@@ -88,30 +88,30 @@ public class DeletePageController extends VitroHttpServlet {
     		displayModel.leaveCriticalSection();
     	}
     }
-    
-   
-	
-		
+
+
+
+
 
 	private void processDelete(String pageUri, OntModel displayModel, VitroRequest vreq) {
 		//get the page resource
 		Resource pageResource = getExistingPage(pageUri, displayModel);
-		//if the page is related to a menu item, get the menu item information 
+		//if the page is related to a menu item, get the menu item information
     	Resource menuItemResource = getExistingMenuItem(pageResource, displayModel);
-    	
+
 		//What statements should be added and removed
    		removeStatements.add(getStatementsToRemove(displayModel, menuItemResource, pageResource));
    		//No statements to add
 	}
 
-	
-	
 
-	
+
+
+
 	//What statements need to be removed
 	private Model getStatementsToRemove(OntModel displayModel,
 			Resource menuItemResource, Resource pageResource) {
-		Model removeModel = ModelFactory.createDefaultModel();		
+		Model removeModel = ModelFactory.createDefaultModel();
 		removeModel.add(displayModel.listStatements(pageResource, null, (RDFNode) null));
 		//if menu item exists for this page, get all statements related to menu item and page
 		if(menuItemResource != null) {
@@ -127,12 +127,12 @@ public class DeletePageController extends VitroHttpServlet {
 
 	//Get all data getters associated with page
 	private Model getDataGettersStatements(Resource pageResource, OntModel displayModel) {
-		Model dataGettersModel = ModelFactory.createDefaultModel();		
+		Model dataGettersModel = ModelFactory.createDefaultModel();
 		//To iterate through to get all data getters and then all their statements
 		//PAge to data getter statements have already been added when all page statements were added
 		StmtIterator dataGetterIt = displayModel.listStatements(
-				pageResource, 
-				ResourceFactory.createProperty(DisplayVocabulary.HAS_DATA_GETTER), 
+				pageResource,
+				ResourceFactory.createProperty(DisplayVocabulary.HAS_DATA_GETTER),
 				(RDFNode) null);
 		while(dataGetterIt.hasNext()) {
 			Statement dataGetterStmt = dataGetterIt.nextStatement();
@@ -151,8 +151,8 @@ public class DeletePageController extends VitroHttpServlet {
 
 	private Resource getExistingMenuItem(Resource pageResource,  OntModel displayModel) {
 		Resource menuItemResource = null;
-		StmtIterator menuItemIt = displayModel.listStatements(null, 
-				DisplayVocabulary.TO_PAGE, 
+		StmtIterator menuItemIt = displayModel.listStatements(null,
+				DisplayVocabulary.TO_PAGE,
 				pageResource);
 		while(menuItemIt.hasNext()) {
 			Statement menuStmt = menuItemIt.nextStatement();
@@ -164,8 +164,8 @@ public class DeletePageController extends VitroHttpServlet {
 	//This code is called without model switching, so in this case
 	//we just want the regular model
     private OntModel getDisplayModel(VitroRequest vreq) {
-    	return vreq.getDisplayModel();    
+    	return vreq.getDisplayModel();
     }
-    
+
     Log log = LogFactory.getLog(MenuManagementEdit.class);
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java
index e2523248f..87735d417 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java
@@ -36,7 +36,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.PropertyInstanceDao;
 
 @WebServlet(name = "EntityEditController", urlPatterns = {"/entityEdit"} )
 public class EntityEditController extends BaseEditController {
-	
+
 	private static final Log log = LogFactory.getLog(EntityEditController.class.getName());
 
     public void doGet (HttpServletRequest request, HttpServletResponse response) {
@@ -48,7 +48,7 @@ public class EntityEditController extends BaseEditController {
         String entURI = request.getParameter("uri");
         VitroRequest vreq = (new VitroRequest(request));
         ApplicationBean application = vreq.getAppBean();
-        
+
         //Individual ent = vreq.getWebappDaoFactory().getIndividualDao().getIndividualByURI(entURI);
         Individual ent = vreq.getUnfilteredAssertionsWebappDaoFactory().getIndividualDao().getIndividualByURI(entURI);
         if (ent == null) {
@@ -62,12 +62,12 @@ public class EntityEditController extends BaseEditController {
                 log.error(e.getStackTrace());
             }
         }
-        
+
         Individual inferredEnt = vreq.getUnfilteredWebappDaoFactory().getIndividualDao().getIndividualByURI(entURI);
         if (inferredEnt == null) {
         	inferredEnt = new IndividualImpl(entURI);
         }
-        
+
         request.setAttribute("entity",ent);
 
         ArrayList<String> results = new ArrayList<String>();
@@ -82,7 +82,7 @@ public class EntityEditController extends BaseEditController {
         colCount++;
         results.add("publish level");
         colCount++;
-        
+
         String rName = null;
         if (ent.getName() != null && ent.getName().length() > 0) {
         	rName = ent.getName();
@@ -94,7 +94,7 @@ public class EntityEditController extends BaseEditController {
         	rName = "[resource]";
         }
         results.add(rName);
-        
+
         StringBuilder classStr = new StringBuilder();
         List<VClass> classList = inferredEnt.getVClasses(false);
         sortForPickList(classList, vreq);
@@ -104,7 +104,7 @@ public class EntityEditController extends BaseEditController {
 	        	String rClassName = "";
 	            try {
 	                rClassName = "<a href=\"vclassEdit?uri=" +
-	                		URLEncoder.encode(vc.getURI(),"UTF-8")+"\">" + 
+	                		URLEncoder.encode(vc.getURI(),"UTF-8")+"\">" +
 	                		vc.getPickListName()+"</a>";
 	            } catch (Exception e) {
 	                rClassName = vc.getLocalNameWithPrefix();
@@ -116,7 +116,7 @@ public class EntityEditController extends BaseEditController {
 	        }
         }
         results.add(classStr.toString());
-                
+
 		results.add(ent.getHiddenFromDisplayBelowRoleLevel() == null ? "unspecified"
 				: ent.getHiddenFromDisplayBelowRoleLevel().getDisplayLabel());
 		results.add(ent.getProhibitedFromUpdateBelowRoleLevel() == null ? "unspecified"
@@ -130,17 +130,17 @@ public class EntityEditController extends BaseEditController {
         request.setAttribute("results",results);
         request.setAttribute("columncount", colCount);
         request.setAttribute("suppressquery","true");
-        
+
         EditProcessObject epo = super.createEpo(request,FORCE_NEW);
         request.setAttribute("epo", epo);
 
         FormObject foo = new FormObject();
         HashMap<String, List<Option>> OptionMap = new HashMap<String, List<Option>>();
-        
+
         List<VClass> types = ent.getVClasses(false);
         sortForPickList(types, vreq);
         request.setAttribute("types", types); // we're displaying all assertions, including indirect types
-        
+
         try {
             List<Option> externalIdOptionList = new LinkedList<Option>();
             if (ent.getExternalIds() != null) {
@@ -153,15 +153,15 @@ public class EntityEditController extends BaseEditController {
         } catch (Exception e) {
             log.error(e, e);
         }
-                
+
         try{
             OptionMap.put("VClassURI", FormUtils.makeOptionListFromBeans(
                     vreq.getUnfilteredWebappDaoFactory().getVClassDao().getAllVclasses(),
-                            "URI", "PickListName", ent.getVClassURI(), null, false));        
+                            "URI", "PickListName", ent.getVClassURI(), null, false));
         } catch (Exception e) {
             log.error(e, e);
         }
-        
+
         PropertyInstanceDao piDao = vreq.getUnfilteredWebappDaoFactory().getPropertyInstanceDao();
         // existing property statements
         try {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java
index ddffaa236..1593c1eb3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java
@@ -54,7 +54,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.listener.impl.IndividualDataPropert
 
 @WebServlet(name = "EntityRetryController", urlPatterns = {"/entity_retry"} )
 public class EntityRetryController extends BaseEditController {
-	
+
 	private static final Log log = LogFactory.getLog(EntityRetryController.class.getName());
 
     public void doPost (HttpServletRequest request, HttpServletResponse response) {
@@ -62,13 +62,13 @@ public class EntityRetryController extends BaseEditController {
 				SimplePermission.DO_BACK_END_EDITING.ACTION)) {
         	return;
         }
-		
+
         VitroRequest vreq = new VitroRequest(request);
         String siteAdminUrl = vreq.getContextPath() + Controllers.SITE_ADMIN;
 
         //create an EditProcessObject for this and put it in the session
         EditProcessObject epo = super.createEpo(request);
-        
+
         epo.setBeanClass(Individual.class);
         epo.setImplementationClass(IndividualImpl.class);
 
@@ -79,7 +79,7 @@ public class EntityRetryController extends BaseEditController {
         } else {
             action = epo.getAction();
         }
-        
+
         LoginStatusBean loginBean = LoginStatusBean.getBean(request);
         WebappDaoFactory myWebappDaoFactory = getWebappDaoFactory(loginBean.getUserURI());
 
@@ -142,7 +142,7 @@ public class EntityRetryController extends BaseEditController {
         epo.setIdFieldClass(String.class);
 
         HashMap hash = new HashMap();
-        
+
         if (individualForEditing.getVClassURI() == null) {
 	        // we need to do a special thing here to make an option list with option groups for the classgroups.
 	        List classGroups = cgDao.getPublicGroupsWithVClasses(true,true,false); // order by displayRank, include uninstantiated classes, don't get the counts of individuals
@@ -169,10 +169,10 @@ public class EntityRetryController extends BaseEditController {
     		optList.add(opt);
 			hash.put("VClassURI", optList);
         }
-        
-        hash.put("HiddenFromDisplayBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getDisplayOptionsList(individualForEditing));    
+
+        hash.put("HiddenFromDisplayBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getDisplayOptionsList(individualForEditing));
         hash.put("ProhibitedFromUpdateBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getUpdateOptionsList(individualForEditing));
-        hash.put("HiddenFromPublishBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getPublishOptionsList(individualForEditing));    
+        hash.put("HiddenFromPublishBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getPublishOptionsList(individualForEditing));
 
         FormObject foo = new FormObject();
         foo.setOptionLists(hash);
@@ -209,7 +209,7 @@ public class EntityRetryController extends BaseEditController {
         	}
         }
         Collections.sort(allApplicableDataprops);
-        
+
         if (allApplicableDataprops != null) {
 
             for (DataProperty d : allApplicableDataprops) {
@@ -279,12 +279,12 @@ public class EntityRetryController extends BaseEditController {
         cList.add(new IndividualDataPropertyStatementProcessor());
         //cList.add(new SearchReindexer()); // handled for now by SearchReindexingListener on model
         epo.setChangeListenerList(cList);
-        
+
         epo.getAdditionalDaoMap().put("DataPropertyStatement",myWebappDaoFactory.getDataPropertyStatementDao()); // EntityDatapropProcessor will look for this
         epo.getAdditionalDaoMap().put("DataProperty",myWebappDaoFactory.getDataPropertyDao()); // EntityDatapropProcessor will look for this
 
         ApplicationBean appBean = vreq.getAppBean();
-        
+
         request.setAttribute("formJsp","/templates/edit/specific/entity_retry.jsp");
         request.setAttribute("epoKey",epo.getKey());
         request.setAttribute("title","Individual Editing Form");
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java
index fed6e02c7..9c2de3c0c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java
@@ -31,7 +31,7 @@ public class IndividualTypeOperationController extends BaseEditController {
 
     	VitroRequest request = new VitroRequest(req);
     	String defaultLandingPage = getDefaultLandingPage(request);
-    	
+
         HashMap epoHash = null;
         EditProcessObject epo = null;
         try {
@@ -60,7 +60,7 @@ public class IndividualTypeOperationController extends BaseEditController {
         }
 
         IndividualDao dao = request.getUnfilteredAssertionsWebappDaoFactory().getIndividualDao();
-        
+
         if (request.getParameter("_cancel") == null) {
 	        try {
 	            if (request.getParameter("operation").equals("remove")) {
@@ -81,7 +81,7 @@ public class IndividualTypeOperationController extends BaseEditController {
 
         //if no page forwarder was set, just go back to referring page:
         //the referer stuff all will be changed so as not to rely on the HTTP header
-        
+
         String referer = epo.getReferer();
         if (referer == null) {
             try {
@@ -104,5 +104,5 @@ public class IndividualTypeOperationController extends BaseEditController {
     public void doPost(HttpServletRequest request, HttpServletResponse response) {
         doGet(request, response);
     }
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java
index 3d6d29ddc..f6dbeed4c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java
@@ -30,7 +30,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 
 public class IndividualTypeRetryController extends BaseEditController {
-	
+
 	private static final Log log = LogFactory.getLog(IndividualTypeRetryController.class.getName());
 
 	public void doGet (HttpServletRequest request, HttpServletResponse response) {
@@ -41,24 +41,24 @@ public class IndividualTypeRetryController extends BaseEditController {
 
         //create an EditProcessObject for this and put it in the session
         EditProcessObject epo = super.createEpo(request);
-		
+
         VitroRequest vreq = new VitroRequest(request);
-        
+
         WebappDaoFactory wadf = vreq.getUnfilteredAssertionsWebappDaoFactory();
         IndividualDao iDao = wadf.getIndividualDao();
         VClassDao vcDao = wadf.getVClassDao();
-        
+
         String individualURI = request.getParameter("IndividualURI");
-        
+
         Individual ind = iDao.getIndividualByURI(individualURI);
         if (ind == null) {
         	ind = new IndividualImpl(individualURI);
         }
         request.setAttribute("individual", ind);
-        
+
 		List<VClass> allVClasses = vcDao.getAllVclasses();
 	    sortForPickList(allVClasses, vreq);
-			
+
 		Set<String> prohibitedURIset = new HashSet<String>();
 		for (VClass vc : ind.getVClasses(false)) {
 			if (vc.isAnonymous()) {
@@ -67,27 +67,27 @@ public class IndividualTypeRetryController extends BaseEditController {
 			prohibitedURIset.add(vc.getURI());
 			prohibitedURIset.addAll(vcDao.getDisjointWithClassURIs(vc.getURI()));
 		}
-		
+
 		List<VClass> eligibleVClasses = new ArrayList<VClass>();
 		for (VClass vc : allVClasses) {
 		    if(vc.getURI() != null && !(prohibitedURIset.contains(vc.getURI()))) {
 		        eligibleVClasses.add(vc);
 		    }
 		}
-		
+
 		FormObject foo = new FormObject();
 		epo.setFormObject(foo);
 		HashMap optionMap = new HashMap();
 		foo.setOptionLists(optionMap);
 
-		List<Option> typeOptionList = new ArrayList<Option>(); 
+		List<Option> typeOptionList = new ArrayList<Option>();
 		for (VClass vc : eligibleVClasses) {
 			Option opt = new Option(vc.getURI(), vc.getPickListName());
 			typeOptionList.add(opt);
 		}
-		
+
 		optionMap.put("types",typeOptionList);
-		
+
 	       request.setAttribute("editAction","individualTypeOp");
 	        request.setAttribute("scripts","/templates/edit/formBasic.js");
         	request.setAttribute("formJsp","/templates/edit/specific/individualType_retry.jsp");
@@ -102,11 +102,11 @@ public class IndividualTypeRetryController extends BaseEditController {
 	            log.error(e.getMessage());
 	            log.error(e.getStackTrace());
 	        }
-	        
+
 	}
-	
+
 	public void doPost (HttpServletRequest request, HttpServletResponse response) {
 		// shouldn't be posting to this controller
-	}	
-	
+	}
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Logout.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Logout.java
index faf883375..f9001307f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Logout.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Logout.java
@@ -33,7 +33,7 @@ public class Logout extends HttpServlet {
 
 			Authenticator.getInstance(request).recordUserIsLoggedOut();
 			DisplayMessage.setMessage(request, I18n.bundle(request).text("logged_out"));
-			
+
 			response.sendRedirect(redirectUrl);
 		} catch (Exception ex) {
 			log.error(ex, ex);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java
index f4a18ee63..f187c3fc1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java
@@ -35,20 +35,20 @@ import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
  */
 @WebServlet(name = "MenuManagementEdit", urlPatterns = {"/menuManagementEdit"} )
 public class MenuManagementEdit extends VitroHttpServlet {
-   private static final String CMD_PARAM = "cmd";   
+   private static final String CMD_PARAM = "cmd";
    private final static String REORDER_PARAM_VALUE = "Reorder";
    private final static String REDIRECT_URL = "/individual?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fontologies%2Fdisplay%2F1.1%23DefaultMenu&switchToDisplayModel=true";
-   private static Model removeStatements = null; 
-   private static Model addStatements = null; 
-    
+   private static Model removeStatements = null;
+   private static Model addStatements = null;
+
     @Override
     protected void doPost(HttpServletRequest rawRequest, HttpServletResponse resp)
             throws ServletException, IOException {
-    	
+
     	removeStatements = ModelFactory.createDefaultModel();
     	addStatements = ModelFactory.createDefaultModel();
     	VitroRequest vreq = new VitroRequest(rawRequest);
-    	
+
     	String command = getCommand(vreq);
     	if(command != null) {
     		processCommand(command, vreq, resp);
@@ -59,7 +59,7 @@ public class MenuManagementEdit extends VitroHttpServlet {
     	if(!isReorder(command)){
     		resp.sendRedirect(rawRequest.getContextPath() + REDIRECT_URL);
     	} else {
-    		
+
     	}
     }
 
@@ -68,16 +68,16 @@ public class MenuManagementEdit extends VitroHttpServlet {
     	String command = vreq.getParameter(CMD_PARAM);
     	return command;
     }
-    
+
     public boolean isReorder(String command) {
     	return command.equals(REORDER_PARAM_VALUE);
     }
-    
+
     public boolean isHomePage(String uri) {
     	return uri.equals(DisplayVocabulary.DISPLAY_NS + "Home");
     }
-    
-   
+
+
     //Process command: in this case just reorder, but may be extended to include delete later
     public void processCommand(String command, VitroRequest vreq, HttpServletResponse resp) {
 
@@ -91,7 +91,7 @@ public class MenuManagementEdit extends VitroHttpServlet {
     	if(isReorder(command)) {
     		errorMessage = processReorder(displayModel, vreq);
     	}
-    	
+
     	//Edits to model occur here
     	displayModel.enterCriticalSection(Lock.WRITE);
     	try {
@@ -110,46 +110,46 @@ public class MenuManagementEdit extends VitroHttpServlet {
     		//Remove and add statements
      		displayModel.remove(removeStatements);
      		displayModel.add(addStatements);
-    	
+
     	} catch(Exception ex) {
     		log.error("An error occurred in processing command", ex);
     		errorMessage += "An error occurred and the operation could not be completed successfully.";
     	}finally {
     		displayModel.leaveCriticalSection();
     	}
-    	
+
     	//if reorder, need to send back an AJAX response
     	if(isReorder(command)){
     		sendReorderResponse(errorMessage, resp);
     	}
-    	
+
     }
-    
+
     private String processReorder(OntModel displayModel, VitroRequest vreq) {
     	//Assuming individual uris passed in the order of their new menu positions
     	String[]individuals = vreq.getParameterValues("individuals");
 		String errorMessage = null;
 		if(individuals.length > 0 ) {
 			removeStatements = removePositionStatements(displayModel, individuals);
-			addStatements = addPositionStatements(displayModel, individuals); 
+			addStatements = addPositionStatements(displayModel, individuals);
 		} else {
 			errorMessage = "No individuals passed";
 		}
 		return errorMessage;
 	}
-    
+
     private void sendReorderResponse(String errorMessage, HttpServletResponse resp) {
     	try{
 			ObjectNode rObj = JsonNodeFactory.instance.objectNode();
 			resp.setCharacterEncoding("UTF-8");
 			resp.setContentType("application/json;charset=UTF-8");
-      
+
 			if( errorMessage != null && !errorMessage.isEmpty()){
 				rObj.put("errorMessage", errorMessage);
 				resp.setStatus(500 /*HttpURLConnection.HTTP_SERVER_ERROR*/);
 			}else{
 				rObj.put("errorMessage", "");
-			}            
+			}
            Writer writer = resp.getWriter();
            writer.write(rObj.toString());
 		} catch(Exception ex) {
@@ -161,17 +161,17 @@ public class MenuManagementEdit extends VitroHttpServlet {
 	private Model removePositionStatements(OntModel displayModel,
 			String[] individuals) {
 		Model removePositionStatements = ModelFactory.createDefaultModel();
-		
+
 		for(String individual: individuals) {
 			Resource individualResource = ResourceFactory.createResource(individual);
-			
+
 			removePositionStatements.add(displayModel.listStatements(
-					individualResource, 
-					DisplayVocabulary.MENU_POSITION, 
+					individualResource,
+					DisplayVocabulary.MENU_POSITION,
 					(RDFNode) null));
-			
+
 		}
-		
+
 		return removePositionStatements;
 	}
 
@@ -184,17 +184,17 @@ public class MenuManagementEdit extends VitroHttpServlet {
 			Resource individualResource = ResourceFactory.createResource(individuals[index]);
 			int position = index + 1;
 			addPositionStatements.add(addPositionStatements.createStatement(
-					individualResource, 
-					DisplayVocabulary.MENU_POSITION, 
+					individualResource,
+					DisplayVocabulary.MENU_POSITION,
 					addPositionStatements.createTypedLiteral(position)));
-			
+
 		}
 		return addPositionStatements;
 	}
 
-	
-   
-	
+
+
+
 	//This should be in write mode
     //TODO: find better way of doing this
     private OntModel getDisplayModel(VitroRequest vreq) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/N3MultiPartUploadDELETEME.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/N3MultiPartUploadDELETEME.java
index f78480b73..cfbb9a68b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/N3MultiPartUploadDELETEME.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/N3MultiPartUploadDELETEME.java
@@ -8,5 +8,5 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
  *TO BE DELETED.
  */
 public class N3MultiPartUploadDELETEME extends VitroHttpServlet {
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java
index af5997efa..356569c54 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java
@@ -68,22 +68,22 @@ public class NamespacePrefixOperationController extends BaseEditController {
             }
             return;
         }
-        
+
         if (request.getParameter("_cancel") == null) {
-        	
+
     		OntModel ontModel = ModelAccess.on(getServletContext()).getOntModel();
         	String namespaceStr = request.getParameter("namespace");
         	String prefixStr = request.getParameter("prefix");
 
         	if ( (namespaceStr != null) && (prefixStr != null) ) {
-        		
+
         		Property namespaceURIProp = ontModel.getProperty(VitroVocabulary.NAMESPACE_NAMESPACEURI);
-                
+
                 ontModel.enterCriticalSection(Lock.WRITE);
                 try {
-                		
+
                 			Individual namespaceInd = null;
-                	
+
                 			StmtIterator stmtIt = ontModel.listStatements((Resource)null,(Property)namespaceURIProp,ontModel.createLiteral(namespaceStr));
                 			if (stmtIt.hasNext()) {
                 				Statement stmt = stmtIt.nextStatement();
@@ -92,14 +92,14 @@ public class NamespacePrefixOperationController extends BaseEditController {
                 					namespaceInd = (Individual) namespaceRes.as(Individual.class);
                 				}
                 			}
-                			
+
                 			if (namespaceInd == null) {
                 				namespaceInd = ontModel.createIndividual(ontModel.getResource(VitroVocabulary.NAMESPACE));
                 				namespaceInd.addProperty(namespaceURIProp,namespaceStr);
                 			}
-                			
+
                 			HashSet<Individual> mappingSet = new HashSet<Individual>();
-                			
+
                 			StmtIterator mappingStatementIt = namespaceInd.listProperties(ontModel.getProperty(VitroVocabulary.NAMESPACE_HASPREFIXMAPPING));
                 			while (mappingStatementIt.hasNext()) {
                 				Statement stmt = mappingStatementIt.nextStatement();
@@ -107,17 +107,17 @@ public class NamespacePrefixOperationController extends BaseEditController {
                 					mappingSet.add( (Individual) stmt.getObject().as(Individual.class) );
                 				}
                 			}
-                			
+
                 			for (Individual oldMapping : mappingSet) {
-                				oldMapping.remove();	
+                				oldMapping.remove();
                 			}
-                			
+
                 			if (request.getParameter("_delete")==null) {
                 				Individual newMappingInd = ontModel.createIndividual(ontModel.getResource(VitroVocabulary.NAMESPACE_PREFIX_MAPPING));
                 				newMappingInd.addProperty(ontModel.getProperty(VitroVocabulary.NAMESPACE_PREFIX),prefixStr);
                 				namespaceInd.addProperty(ontModel.getProperty(VitroVocabulary.NAMESPACE_HASPREFIXMAPPING),newMappingInd);
-                			} 
-                			
+                			}
+
                 } finally {
                    	ontModel.leaveCriticalSection();
                 }
@@ -126,7 +126,7 @@ public class NamespacePrefixOperationController extends BaseEditController {
 
         //if no page forwarder was set, just go back to referring page:
         //the referer stuff all will be changed so as not to rely on the HTTP header
-        
+
         String referer = epo.getReferer();
         if (referer == null) {
             try {
@@ -149,5 +149,5 @@ public class NamespacePrefixOperationController extends BaseEditController {
     public void doGet(HttpServletRequest request, HttpServletResponse response) {
         // don't use get; state changes
     }
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixRetryController.java
index e877c7aca..525fa7976 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixRetryController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixRetryController.java
@@ -14,9 +14,9 @@ import edu.cornell.mannlib.vedit.controller.BaseEditController;
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
 
 public class NamespacePrefixRetryController extends BaseEditController {
-	
+
 	private static final Log log = LogFactory.getLog(NamespacePrefixRetryController.class.getName());
-	
+
 	public void doGet(HttpServletRequest request, HttpServletResponse response) {
 		if (!isAuthorizedToDisplayPage(request, response,
 				SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION)) {
@@ -25,7 +25,7 @@ public class NamespacePrefixRetryController extends BaseEditController {
 
         //create an EditProcessObject for this and put it in the session
         EditProcessObject epo = super.createEpo(request);
-        
+
         if (request.getParameter("prefix") != null) {
         	epo.setAction("update");
         	request.setAttribute("_action","update");
@@ -33,7 +33,7 @@ public class NamespacePrefixRetryController extends BaseEditController {
         	epo.setAction("insert");
         	request.setAttribute("_action","insert");
         }
-				
+
 	       request.setAttribute("editAction","namespacePrefixOp");
 	        request.setAttribute("scripts","/templates/edit/formBasic.js");
         	request.setAttribute("formJsp","/templates/edit/specific/namespacePrefix_retry.jsp");
@@ -49,7 +49,7 @@ public class NamespacePrefixRetryController extends BaseEditController {
 	        }
 
 	}
-	
+
 	public void doPost(HttpServletRequest request, HttpServletResponse response) {
 		// shouldn't be posting to this controller
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ObjectPropertyStatementRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ObjectPropertyStatementRetryController.java
index d7f51a08d..618e23520 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ObjectPropertyStatementRetryController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ObjectPropertyStatementRetryController.java
@@ -33,7 +33,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.PropertyInstanceDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
 
 public class ObjectPropertyStatementRetryController extends BaseEditController {
-	
+
 	private static final Log log = LogFactory.getLog(ObjectPropertyStatementRetryController.class.getName());
 
     public void doPost (HttpServletRequest request, HttpServletResponse response) {
@@ -54,7 +54,7 @@ public class ObjectPropertyStatementRetryController extends BaseEditController {
         } catch (NoSuchMethodException nsme) {
         	log.error("Unable to find "+PropertyInstanceDao.class.getName()+".insertProp("+PropertyInstanceIface.class.getName()+")");
         }
-        
+
         try {
         	epo.setDeleteMethod(
         			PropertyInstanceDao.class.getMethod(
@@ -64,7 +64,7 @@ public class ObjectPropertyStatementRetryController extends BaseEditController {
         			".deletePropertyInstance("+
         					PropertyInstanceIface.class.getName()+")");
         }
-                
+
         String action = "insert";
 
         PropertyInstanceDao piDao = vreq.getUnfilteredWebappDaoFactory().getPropertyInstanceDao();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyEditController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyEditController.java
index 8a588f391..cfe7f6e8a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyEditController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyEditController.java
@@ -79,13 +79,13 @@ public class OntologyEditController extends BaseEditController {
         // add the options
         foo.setOptionLists(OptionMap);
         epo.setFormObject(foo);
-        
+
         // funky hack because Ontology.getURI() will append a hash for a hash namespace
         // See OntologyDaoJena.ontologyFromOntologyResource() comments
         String realURI = OntologyDaoJena.adjustOntologyURI(o.getURI());
         request.setAttribute("realURI", realURI);
         request.setAttribute("exportURL", request.getContextPath() + Controllers.EXPORT_RDF);
-        
+
         request.setAttribute("epoKey",epo.getKey());
         request.setAttribute("title","Ontology Control Panel");
         request.setAttribute("css", "<link rel=\"stylesheet\" type=\"text/css\" href=\""+request.getAppBean().getThemeDir()+"css/edit.css\"/>");
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyRetryController.java
index 848872ef8..d4f530cc5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyRetryController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyRetryController.java
@@ -29,7 +29,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
 
 public class OntologyRetryController extends BaseEditController {
-	
+
 	private static final Log log = LogFactory.getLog(OntologyRetryController.class.getName());
 
     public void doPost (HttpServletRequest req, HttpServletResponse response) {
@@ -74,7 +74,7 @@ public class OntologyRetryController extends BaseEditController {
         } else {
             ontologyForEditing = (Ontology) epo.getNewBean();
         }
-        
+
         //validators
         List<Validator> validatorList = new ArrayList<Validator>();
         validatorList.add(new RequiredFieldValidator());
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveDelete.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveDelete.java
index aeea323ee..be8fc3df3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveDelete.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveDelete.java
@@ -23,26 +23,26 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 public class PrimitiveDelete extends VitroAjaxController {
 
     private static final long serialVersionUID = 1L;
-    private static final Log log = LogFactory.getLog(PrimitiveDelete.class);  
+    private static final Log log = LogFactory.getLog(PrimitiveDelete.class);
 
     @Override
     protected AuthorizationRequest requiredActions(VitroRequest vreq) {
     	return SimplePermission.USE_BASIC_AJAX_CONTROLLERS.ACTION;
     }
-    
+
     @Override
     protected void doRequest(VitroRequest vreq, HttpServletResponse response) {
-     
+
         String uriToDelete = vreq.getParameter("deletion");
         if (StringUtils.isEmpty(uriToDelete)) {
             doError(response, "No individual specified for deletion", 500);
             return;
         }
-        
+
         // Check permissions
         // The permission-checking code should be inherited from superclass
         boolean hasPermission = true;
-        
+
         if( !hasPermission ){
             //if not okay, send error message
             doError(response,"Insufficent permissions.", SC_UNAUTHORIZED);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java
index 1e4b4ee22..d67ee938b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java
@@ -41,31 +41,31 @@ public class PrimitiveRdfEdit extends VitroAjaxController {
     protected AuthorizationRequest requiredActions(VitroRequest vreq) {
     	return SimplePermission.USE_BASIC_AJAX_CONTROLLERS.ACTION;
     }
-    
+
     @Override
     protected void doRequest(VitroRequest vreq,
             HttpServletResponse response) throws ServletException, IOException {
-        
+
         //Test error case
         /*
         if (1==1) {
             doError(response, "Test error", 500);
             return;
         } */
-        
-        /* Predefined values for RdfFormat are "RDF/XML", 
-         * "N-TRIPLE", "TURTLE" (or "TTL") and "N3". null represents 
+
+        /* Predefined values for RdfFormat are "RDF/XML",
+         * "N-TRIPLE", "TURTLE" (or "TTL") and "N3". null represents
          * the default language, "RDF/XML". "RDF/XML-ABBREV" is a synonym for "RDF/XML" */
-        String format = vreq.getParameter("RdfFormat");      
-        if( format == null )            
-            format = "N3";      
+        String format = vreq.getParameter("RdfFormat");
+        if( format == null )
+            format = "N3";
         if ( ! ("N-TRIPLE".equals(format) || "TURTLE".equals(format) || "TTL".equals(format)
                 || "N3".equals(format)|| "RDF/XML-ABBREV".equals(format) || "RDF/XML".equals(format) )){
             doError(response,"RdfFormat was not recognized.",500);
             return;
         }
-        
-        //parse RDF 
+
+        //parse RDF
         Set<Model> additions= null;
         try {
             additions = parseRdfParam(vreq.getParameterValues("additions"),format);
@@ -73,7 +73,7 @@ public class PrimitiveRdfEdit extends VitroAjaxController {
             doError(response,"Error reading RDF, set log level to debug for this class to get error messages in the server logs.",SC_BAD_REQUEST);
             return;
         }
-                        
+
         Set<Model> retractions = null;
         try {
             retractions = parseRdfParam(vreq.getParameterValues("retractions"),format);
@@ -82,7 +82,7 @@ public class PrimitiveRdfEdit extends VitroAjaxController {
             return;
         }
 
-        String editorUri = N3EditUtils.getEditorUri(vreq);           
+        String editorUri = N3EditUtils.getEditorUri(vreq);
         try {
 			Model a = mergeModels(additions);
 			Model r = mergeModels(retractions);
@@ -97,10 +97,10 @@ public class PrimitiveRdfEdit extends VitroAjaxController {
         	processChanges(editorUri, getWriteModel(vreq), toBeAdded, toBeRetracted);
         } catch (Exception e) {
             doError(response,e.getMessage(),SC_INTERNAL_SERVER_ERROR);
-        }           
-        
+        }
+
     }
-    
+
 	/** Package access to allow for unit testing. */
 	void processChanges(String editorUri, Model writeModel,
 			Model toBeAdded, Model toBeRetracted) throws Exception {
@@ -129,14 +129,14 @@ public class PrimitiveRdfEdit extends VitroAjaxController {
 
     /**
      * Convert the values from a parameters into RDF models.
-     * 
+     *
      * Package access to allow for unit testing.
-     * 
+     *
      * @param parameters - the result of request.getParameters(String)
      * @param format - a valid format string for Jena's Model.read()
      */
     Set<Model> parseRdfParam(String[] parameters, String format) throws Exception{
-        Set<Model> models = new HashSet<Model>();               
+        Set<Model> models = new HashSet<Model>();
         for( String param : parameters){
             try{
                 StringReader reader = new StringReader(param);
@@ -152,7 +152,7 @@ public class PrimitiveRdfEdit extends VitroAjaxController {
     }
 
     private Model getWriteModel(VitroRequest vreq){
-    	return StandardModelSelector.selector.getModel(vreq,getServletContext());  
+    	return StandardModelSelector.selector.getModel(vreq,getServletContext());
     }
 
 	/** Package access to allow for unit testing. */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java
index 0fb4c8689..8ae9d27a4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java
@@ -21,22 +21,22 @@ import edu.cornell.mannlib.vitro.webapp.dao.PropertyDao;
 @WebServlet(name = "Properties2PropertiesOperationController", urlPatterns = {"/props2PropsOp"} )
 public class Properties2PropertiesOperationController extends
 		BaseEditController {
-	
+
 	private static final Log log = LogFactory.getLog(Properties2PropertiesOperationController.class.getName());
 
 	private static final boolean ADD = false;
 	private static final boolean REMOVE = true;
-	
+
     public void doPost(HttpServletRequest req, HttpServletResponse response) {
         if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) {
         	return;
         }
-    	
+
     	String defaultLandingPage = getDefaultLandingPage(req);
-    	
+
     	try {
 			VitroRequest request = new VitroRequest(req);
-		    
+
 		    HashMap epoHash = null;
 		    EditProcessObject epo = null;
 		    try {
@@ -52,7 +52,7 @@ public class Properties2PropertiesOperationController extends
 		        }
 		        return;
 		    }
-		
+
 		    if (epo == null) {
 		        log.debug("null epo");
 		        try {
@@ -62,9 +62,9 @@ public class Properties2PropertiesOperationController extends
 		        }
 		        return;
 		    }
-		    
+
 		    // get parameters from request
-		   	        
+
 		    String modeStr = request.getParameter("opMode");
 		    modeStr = (modeStr == null) ? "" : modeStr;
 		    String operationStr = request.getParameter("operation");
@@ -77,14 +77,14 @@ public class Properties2PropertiesOperationController extends
 		    	throw new IllegalArgumentException(
 		    	    "request parameter 'operation' must have value 'add' or 'remove'");
 		    }
-		    	    
+
 		    if (request.getParameter("_cancel") == null) {
 		    	doEdit(modeStr, operation, request);
 		    }
-		    	     
+
 		    //if no page forwarder was set, just go back to referring page:
 		    //the referer stuff all will be changed so as not to rely on the HTTP header
-		    
+
 		    String referer = epo.getReferer();
 		    if (referer == null) {
 		        try {
@@ -108,21 +108,21 @@ public class Properties2PropertiesOperationController extends
 	    }
 
     }
-    
+
     public void doGet(HttpServletRequest request, HttpServletResponse response) {
-    	
+
     	String defaultLandingPage = getDefaultLandingPage(request);
-    	
+
     	try {
             response.sendRedirect(defaultLandingPage);
         } catch (IOException e) {
             log.error("Unable to redirect to default landing page", e);
         }
     }
-    
+
     private void doEdit(String modeStr, boolean operation, VitroRequest request) {
     	PropertyDao opDao = request.getUnfilteredWebappDaoFactory().getObjectPropertyDao();
-   	 
+
         if (operation == REMOVE) {
             String[] subpropertyURIstrs = request.getParameterValues("SubpropertyURI");
             if ((subpropertyURIstrs != null) && (subpropertyURIstrs.length > 1)) {
@@ -156,7 +156,7 @@ public class Properties2PropertiesOperationController extends
         		opDao.addSuperproperty(request.getParameter("SubpropertyURI"), request.getParameter("SuperpropertyURI"));
         	}
         }
-    
+
     }
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java
index 835a6f791..98df5b0f5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java
@@ -32,7 +32,7 @@ public class Properties2PropertiesRetryController extends BaseEditController {
         }
 
     	VitroRequest request = new VitroRequest(req);
-        
+
         //create an EditProcessObject for this and put it in the session
         EditProcessObject epo = super.createEpo(request);
 
@@ -47,42 +47,42 @@ public class Properties2PropertiesRetryController extends BaseEditController {
         ObjectPropertyDao opDao = request.getUnfilteredWebappDaoFactory().getObjectPropertyDao();
         DataPropertyDao dpDao = request.getUnfilteredWebappDaoFactory().getDataPropertyDao();
         epo.setDataAccessObject(opDao);
-        
-        List propList = ("data".equals(request.getParameter("propertyType"))) 
+
+        List propList = ("data".equals(request.getParameter("propertyType")))
     	? dpDao.getAllDataProperties()
     	: opDao.getAllObjectProperties();
-        
+
     	sortForPickList(propList, request);
-    	
+
     	 String superpropertyURIstr = request.getParameter("SuperpropertyURI");
          String subpropertyURIstr = request.getParameter("SubpropertyURI");
-       
+
         HashMap<String,Option> hashMap = new HashMap<String,Option>();
         List<Option> optionList = FormUtils.makeOptionListFromBeans(propList,"URI","PickListName",superpropertyURIstr,null);
         List<Option> superPropertyOptions = getSortedList(hashMap, optionList, request);
         optionList = FormUtils.makeOptionListFromBeans(propList,"URI","PickListName",subpropertyURIstr,null);
         List<Option> subPropertyOptions = getSortedList(hashMap, optionList, request);
-        
+
         HashMap hash = new HashMap();
     	hash.put("SuperpropertyURI", superPropertyOptions);
         hash.put("SubpropertyURI", subPropertyOptions);
-        
+
         FormObject foo = new FormObject();
         foo.setOptionLists(hash);
 
         epo.setFormObject(foo);
-        
+
         request.setAttribute("operation","add");
-        
+
         request.setAttribute("scripts","/templates/edit/formBasic.js");
         String modeStr = request.getParameter("opMode");
         if (modeStr != null && ( modeStr.equals("superproperty") || modeStr.equals("subproperty") || modeStr.equals("equivalentProperty") ) ) {
         	request.setAttribute("editAction","props2PropsOp");
         	request.setAttribute("formJsp","/templates/edit/specific/properties2properties_retry.jsp");
         	request.setAttribute("title", (modeStr.equals("superproperty") ? "Add Superproperty" : modeStr.equals("equivalentProperty") ? "Add Equivalent Property" : "Add Subproperty") );
-        } 
+        }
         request.setAttribute("opMode", modeStr);
-        
+
         request.setAttribute("_action",action);
         setRequestAttributes(request,epo);
 
@@ -95,5 +95,5 @@ public class Properties2PropertiesRetryController extends BaseEditController {
         }
 
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java
index 97620f9be..52e271291 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java
@@ -35,7 +35,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
 public class PropertyEditController extends BaseEditController {
 
 	private static final Log log = LogFactory.getLog(PropertyEditController.class.getName());
-	
+
     @Override
 	public void doPost (HttpServletRequest request, HttpServletResponse response) {
 		if (!isAuthorizedToDisplayPage(request, response,
@@ -46,7 +46,7 @@ public class PropertyEditController extends BaseEditController {
         final int NUM_COLS=26;
 
         VitroRequest vreq = new VitroRequest(request);
-        
+
         ObjectPropertyDao propDao = vreq.getUnfilteredWebappDaoFactory().getObjectPropertyDao();
         ObjectPropertyDao propDaoLangNeut = vreq.getLanguageNeutralWebappDaoFactory().getObjectPropertyDao();
         VClassDao vcDao = vreq.getLanguageNeutralWebappDaoFactory().getVClassDao();
@@ -85,7 +85,7 @@ public class PropertyEditController extends BaseEditController {
         results.add("publish level");         // column 25
 
         results.add(p.getPickListName()); // column 1
-        
+
         String parentPropertyStr = "";
         if (p.getParentURI() != null) {
         	ObjectProperty parent = propDao.getObjectPropertyByURI(p.getParentURI());
@@ -96,9 +96,9 @@ public class PropertyEditController extends BaseEditController {
         		    log.error(e, e);
         		}
         	}
-    	} 
+    	}
         results.add(parentPropertyStr); // column 2
-        
+
         if (p.getGroupURI() != null) {
             PropertyGroup pGroup = pgDao.getGroupByURI(p.getGroupURI());
             if (pGroup != null){
@@ -109,7 +109,7 @@ public class PropertyEditController extends BaseEditController {
         } else {
             results.add("(unspecified)"); // column 3
         }
-        
+
         String ontologyName = null;
         if (p.getNamespace() != null) {
             Ontology ont = vreq.getUnfilteredWebappDaoFactory().getOntologyDao().getOntologyByURI(p.getNamespace());
@@ -118,15 +118,15 @@ public class PropertyEditController extends BaseEditController {
             }
         }
         results.add(ontologyName==null ? "(not identified)" : ontologyName); // column 4
-        
+
         results.add(p.getLocalName());  // column 5
-        
+
         results.add(p.getDomainPublic() == null ? "(no public label)" : p.getDomainPublic()); // column 6
-        
-        String domainStr = ""; 
+
+        String domainStr = "";
         if (pLangNeut.getDomainVClassURI() != null) {
         	VClass domainClass = vcDao.getVClassByURI(pLangNeut.getDomainVClassURI());
-        	VClass domainWLang = vcDaoWLang.getVClassByURI(pLangNeut.getDomainVClassURI()); 
+        	VClass domainWLang = vcDaoWLang.getVClassByURI(pLangNeut.getDomainVClassURI());
         	if (domainClass != null && domainClass.getURI() != null && domainClass.getPickListName() != null) {
         		try {
         			if (domainClass.isAnonymous()) {
@@ -140,11 +140,11 @@ public class PropertyEditController extends BaseEditController {
         	}
         }
         results.add(domainStr); // column 7
-        
-        String rangeStr = ""; 
+
+        String rangeStr = "";
         if (pLangNeut.getRangeVClassURI() != null) {
         	VClass rangeClass = vcDao.getVClassByURI(pLangNeut.getRangeVClassURI());
-        	VClass rangeWLang = vcDaoWLang.getVClassByURI(pLangNeut.getRangeVClassURI()); 
+        	VClass rangeWLang = vcDaoWLang.getVClassByURI(pLangNeut.getRangeVClassURI());
         	if (rangeClass != null && rangeClass.getURI() != null && rangeClass.getPickListName() != null) {
         		try {
         			if (rangeClass.isAnonymous()) {
@@ -158,32 +158,32 @@ public class PropertyEditController extends BaseEditController {
         	}
         }
         results.add(rangeStr); // column 8
-        
+
         results.add(p.getTransitive() ? "true" : "false");        // column 9
         results.add(p.getSymmetric() ? "true" : "false");         // column 10
         results.add(p.getFunctional() ? "true" : "false");        // column 11
         results.add(p.getInverseFunctional() ? "true" : "false"); // column 12
-        
+
         String publicDescriptionStr = (p.getPublicDescription() == null) ? "" : p.getPublicDescription();
         results.add(publicDescriptionStr);     // column 13
         String exampleStr = (p.getExample() == null) ? "" : p.getExample();
         results.add(exampleStr);               // column 14
         String descriptionStr = (p.getDescription() == null) ? "" : p.getDescription();
         results.add(descriptionStr);           // column 15
-        
+
 		results.add(p.getHiddenFromDisplayBelowRoleLevel() == null ? "(unspecified)"
 				: p.getHiddenFromDisplayBelowRoleLevel().getDisplayLabel()); // column 16
 		results.add(p.getProhibitedFromUpdateBelowRoleLevel() == null ? "(unspecified)"
 				: p.getProhibitedFromUpdateBelowRoleLevel().getUpdateLabel()); // column 17
-        
+
         results.add("property: "+p.getDomainDisplayTier() + ", inverse: "+p.getRangeDisplayTier()); // column 18
         results.add("property: "+p.getDomainDisplayLimitInteger() + ", inverse: "+p.getRangeDisplayLimit());
         results.add(p.getCollateBySubclass() ? "true" : "false"); // column 19
- 
+
         results.add(p.getCustomEntryForm() == null ? "(unspecified)" : p.getCustomEntryForm()); // column 20
         results.add(p.getSelectFromExisting() ? "true" : "false");   // column 21
         results.add(p.getOfferCreateNewOption() ? "true" : "false"); // column 22
-        
+
         results.add(p.getDomainEntitySortDirection() == null ? "ascending" : p.getDomainEntitySortDirection()); // column 23
 
         results.add(p.getURI()); // column 24
@@ -201,7 +201,7 @@ public class PropertyEditController extends BaseEditController {
         epo.setFormObject(foo);
 
         // superproperties and subproperties
-        
+
         ObjectPropertyDao opDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getObjectPropertyDao();
         List<ObjectProperty> superProps = getObjectPropertiesForURIList(
                 opDao.getSuperPropertyURIs(p.getURI(), false), opDao);
@@ -212,19 +212,19 @@ public class PropertyEditController extends BaseEditController {
                 opDao.getSubPropertyURIs(p.getURI()), opDao);
         sortForPickList(subProps, vreq);
         request.setAttribute("subproperties", subProps);
-        
-        // equivalent properties and faux properties 
-        
+
+        // equivalent properties and faux properties
+
         List<ObjectProperty> eqProps = getObjectPropertiesForURIList(
                 opDao.getEquivalentPropertyURIs(p.getURI()), opDao);
         sortForPickList(eqProps, vreq);
         request.setAttribute("equivalentProperties", eqProps);
-        
+
         List<FauxProperty> fauxProps = vreq.getUnfilteredAssertionsWebappDaoFactory().getFauxPropertyDao().
         		getFauxPropertiesForBaseUri(p.getURI());
         sortForPickList(fauxProps, vreq);
         request.setAttribute("fauxproperties", fauxProps);
-        
+
         request.setAttribute("epoKey",epo.getKey());
         request.setAttribute("propertyWebapp", p);
         request.setAttribute("title","Object Property Control Panel");
@@ -244,8 +244,8 @@ public class PropertyEditController extends BaseEditController {
 	public void doGet (HttpServletRequest request, HttpServletResponse response) {
         doPost(request,response);
     }
-    
-    private List<ObjectProperty> getObjectPropertiesForURIList(List<String> propertyURIs, 
+
+    private List<ObjectProperty> getObjectPropertiesForURIList(List<String> propertyURIs,
             ObjectPropertyDao opDao) {
         List<ObjectProperty> properties = new ArrayList<ObjectProperty>();
         for (String propertyURI : propertyURIs) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java
index d12316fe5..d84b15db5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyGroupRetryController.java
@@ -28,7 +28,7 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao;
 
 public class PropertyGroupRetryController extends BaseEditController {
-	
+
 	private static final Log log = LogFactory.getLog(PropertyGroupRetryController.class.getName());
 
    public void doPost (HttpServletRequest req, HttpServletResponse response) {
@@ -77,7 +77,7 @@ public class PropertyGroupRetryController extends BaseEditController {
         } else {
             propertyGroupForEditing = (PropertyGroup) epo.getNewBean();
         }
-        
+
         //validators
         List<Validator> validatorList = new ArrayList<Validator>();
         validatorList.add(new RequiredFieldValidator());
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java
index 47184f55b..5e35fb369 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java
@@ -37,9 +37,9 @@ import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 
 public class PropertyRetryController extends BaseEditController {
-    
+
     private static final Log log = LogFactory.getLog(PropertyRetryController.class.getName());
-    
+
     @Override
     public void doPost (HttpServletRequest req, HttpServletResponse response) {
         if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) {
@@ -132,7 +132,7 @@ public class PropertyRetryController extends BaseEditController {
         }
 
         FormObject foo = new FormObject();
-        foo.setErrorMap(epo.getErrMsgMap());     
+        foo.setErrorMap(epo.getErrMsgMap());
 
         HashMap<String, List<Option>> optionMap = new HashMap<String, List<Option>>();
         try {
@@ -142,18 +142,18 @@ public class PropertyRetryController extends BaseEditController {
             throw new RuntimeException(e);
         }
 
-        optionMap.put("HiddenFromDisplayBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getDisplayOptionsList(propertyForEditing));    
+        optionMap.put("HiddenFromDisplayBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getDisplayOptionsList(propertyForEditing));
         optionMap.put("ProhibitedFromUpdateBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getUpdateOptionsList(propertyForEditing));
-        optionMap.put("HiddenFromPublishBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getPublishOptionsList(propertyForEditing));    
+        optionMap.put("HiddenFromPublishBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getPublishOptionsList(propertyForEditing));
 
         List<Option> groupOptList = FormUtils.makeOptionListFromBeans(request.getUnfilteredWebappDaoFactory().getPropertyGroupDao().getPublicGroups(true),"URI","Name", ((propertyForEditing.getGroupURI()==null) ? "" : propertyForEditing.getGroupURI()), null, (propertyForEditing.getGroupURI()!=null));
         HashMap<String,Option> hashMap = new HashMap<String,Option>();
         groupOptList = getSortedList(hashMap,groupOptList,request);
         groupOptList.add(0,new Option("","none"));
         optionMap.put("GroupURI", groupOptList);
-        
+
         foo.setOptionLists(optionMap);
-        
+
         request.setAttribute("transitive",propertyForEditing.getTransitive());
         request.setAttribute("symmetric",propertyForEditing.getSymmetric());
         request.setAttribute("functional",propertyForEditing.getFunctional());
@@ -163,7 +163,7 @@ public class PropertyRetryController extends BaseEditController {
         request.setAttribute("objectIndividualSortPropertyURI", propertyForEditing.getObjectIndividualSortPropertyURI());
         request.setAttribute("domainEntitySortDirection", propertyForEditing.getDomainEntitySortDirection());
         request.setAttribute("collateBySubclass", propertyForEditing.getCollateBySubclass());
-        
+
         //checkboxes are pretty annoying : we don't know if someone *unchecked* a box, so we have to default to false on updates.
         if (propertyForEditing.getURI() != null) {
              propertyForEditing.setTransitive(false);
@@ -202,32 +202,32 @@ public class PropertyRetryController extends BaseEditController {
         doPost(request, response);
     }
 
-    private void populateOptionMap(HashMap<String, List<Option>> optionMap, 
-                                   ObjectProperty propertyForEditing, 
-                                   VitroRequest request, 
-                                   OntologyDao ontDao, 
+    private void populateOptionMap(HashMap<String, List<Option>> optionMap,
+                                   ObjectProperty propertyForEditing,
+                                   VitroRequest request,
+                                   OntologyDao ontDao,
                                    ObjectPropertyDao propDao) {
-    	
+
         List<Option> namespaceIdList = FormUtils.makeOptionListFromBeans(
-                ontDao.getAllOntologies(), "URI", "Name", 
+                ontDao.getAllOntologies(), "URI", "Name",
                         ((propertyForEditing.getNamespace() == null)
-                                ? "" 
-                                : propertyForEditing.getNamespace()), 
+                                ? ""
+                                : propertyForEditing.getNamespace()),
                         null, (propertyForEditing.getNamespace() != null));
         namespaceIdList.add(0, new Option(
                 request.getUnfilteredWebappDaoFactory().getDefaultNamespace(), "default"));
         optionMap.put("Namespace", namespaceIdList);
-        
+
         List<Option> namespaceIdInverseList = FormUtils.makeOptionListFromBeans(
-                ontDao.getAllOntologies(), "URI", "Name", 
-                        ((propertyForEditing.getNamespaceInverse() == null) 
-                                ? "" 
-                                : propertyForEditing.getNamespaceInverse()), 
+                ontDao.getAllOntologies(), "URI", "Name",
+                        ((propertyForEditing.getNamespaceInverse() == null)
+                                ? ""
+                                : propertyForEditing.getNamespaceInverse()),
                         null, (propertyForEditing.getNamespaceInverse() != null));
         namespaceIdInverseList.add(0, new Option(
                 request.getUnfilteredWebappDaoFactory().getDefaultNamespace(),"default"));
         optionMap.put("NamespaceInverse", namespaceIdInverseList);
-        
+
         List<ObjectProperty> objPropList = propDao.getAllObjectProperties();
         Collections.sort(objPropList);
         List<Option> parentIdList = FormUtils.makeOptionListFromBeans(
@@ -236,34 +236,34 @@ public class PropertyRetryController extends BaseEditController {
         parentIdList = getSortedList(hashMap,parentIdList,request);
         parentIdList.add(0,new Option("-1","none (root property)", false));
         optionMap.put("ParentURI", parentIdList);
-        
+
         List<Option> domainOptionList = FormUtils.makeVClassOptionList(
-                request.getUnfilteredWebappDaoFactory(), 
+                request.getUnfilteredWebappDaoFactory(),
                         propertyForEditing.getDomainVClassURI());
-        if (propertyForEditing.getDomainVClass() != null 
+        if (propertyForEditing.getDomainVClass() != null
                 && propertyForEditing.getDomainVClass().isAnonymous()) {
             domainOptionList.add(0, new Option(
-                    propertyForEditing.getDomainVClass().getURI(), 
-                    propertyForEditing.getDomainVClass().getPickListName(), 
+                    propertyForEditing.getDomainVClass().getURI(),
+                    propertyForEditing.getDomainVClass().getPickListName(),
                     true));
         }
         domainOptionList.add(0, new Option("","(none specified)"));
         optionMap.put("DomainVClassURI", domainOptionList);
-        
+
         List<Option> rangeOptionList = FormUtils.makeVClassOptionList(
-                request.getUnfilteredWebappDaoFactory(), 
+                request.getUnfilteredWebappDaoFactory(),
                         propertyForEditing.getRangeVClassURI());
-        if (propertyForEditing.getRangeVClass() != null 
+        if (propertyForEditing.getRangeVClass() != null
                 && propertyForEditing.getRangeVClass().isAnonymous()) {
             rangeOptionList.add(0, new Option(
-                    propertyForEditing.getRangeVClass().getURI(), 
-                    propertyForEditing.getRangeVClass().getPickListName(), 
+                    propertyForEditing.getRangeVClass().getURI(),
+                    propertyForEditing.getRangeVClass().getPickListName(),
                     true));
         }
         rangeOptionList.add(0, new Option("","(none specified)"));
         optionMap.put("RangeVClassURI", rangeOptionList);
     }
-    
+
     private static class PropertyInsertPageForwarder implements PageForwarder {
         @Override
 		public void doForward(HttpServletRequest request, HttpServletResponse response, EditProcessObject epo){
@@ -281,6 +281,6 @@ public class PropertyRetryController extends BaseEditController {
             }
         }
     }
-    
+
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java
index 947f1748f..156a12810 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java
@@ -60,10 +60,10 @@ import edu.cornell.mannlib.vitro.webapp.servlet.setup.FileGraphSetup;
 
 @WebServlet(name = "RefactorOperationController", urlPatterns = {"/refactorOp"} )
 public class RefactorOperationController extends BaseEditController {
-	
+
 	private static final Log log = LogFactory.getLog(RefactorOperationController.class.getName());
 	private static final boolean NOTIFY = true;
-	
+
 	private String doFixDataTypes(HttpServletRequest request, HttpServletResponse response)
 	{
 		try {
@@ -75,11 +75,11 @@ public class RefactorOperationController extends BaseEditController {
 
         request.setAttribute("title","Check Datatype Properties");
         request.setAttribute("css", "<link rel=\"stylesheet\" type=\"text/css\" href=\""+vreq.getAppBean().getThemeDir()+"css/edit.css\"/>");
-        
+
         OntModel ontModel = ModelAccess.on(getServletContext()).getOntModel(FULL_ASSERTIONS);
 		ontModel.enterCriticalSection(Lock.WRITE);
 		ArrayList<String> results = new ArrayList<String>();
-				
+
 		try
 		{
 			ExtendedIterator dataProperties = ontModel.listDatatypeProperties();
@@ -116,7 +116,7 @@ public class RefactorOperationController extends BaseEditController {
 								usingPandL.close();
 								boolean valid = range.getURI().equals(l.getDatatypeURI());
 								if(valid) consistent+= size;
-								else 
+								else
 									{
 										results.add(p.getLocalName()+" has object "+l.getLexicalForm()+" of type "+l.getDatatypeURI()+" which is inconsistent");
 										String typeName = "";
@@ -132,7 +132,7 @@ public class RefactorOperationController extends BaseEditController {
 										StmtIterator badStatements = ontModel.listStatements(null, p, l);
 										StmtIterator toRemove = ontModel.listStatements(null, p, l);
 										ArrayList<Statement> queue = new ArrayList<Statement>();
-										while(badStatements.hasNext()) 
+										while(badStatements.hasNext())
 										{
 											Statement badState = badStatements.nextStatement();
 											Statement goodState = ontModel.createStatement(badState.getSubject(), p, newLiteral);
@@ -153,17 +153,17 @@ public class RefactorOperationController extends BaseEditController {
 							}
 					}
 					else results.add("ERROR: "+node.toString()+" is not a literal");
-					
+
 				}
 				n.close();
 			}
 			dataProperties.close();
-			
+
 			results.add(hasRange+" of "+total+" datatype properties have defined ranges.");
 			results.add("Of the statements that contain datatype properties with defined ranges, "+consistent+" are consistent and "+fixed+" are inconsistent.");
 			results.add(fixed+" statements have been fixed.");
 			//for(int i=0; i<results.size(); i++) System.out.println(results.get(i));
-			
+
 		}
 		finally
 		{
@@ -180,13 +180,13 @@ public class RefactorOperationController extends BaseEditController {
 
 		return "";
 	}
-	
+
 	private String doRenameResource(VitroRequest request, HttpServletResponse response, EditProcessObject epo) {
-		
+
 		String userURI = LoginStatusBean.getBean(request).getUserURI();
 		String oldURIStr = (String) epo.getAttribute("oldURI");
 		String newURIStr = request.getParameter("newURI");
-			
+
 		// validateURI
 		String errorMsg = null;
 		try {
@@ -194,7 +194,7 @@ public class RefactorOperationController extends BaseEditController {
 		} catch (InvalidPropertyURIException ipue) {
 			// TODO We don't know if we're editing a property's URI or not here!
 		}
-		
+
 		if (errorMsg != null) {
 			epo.setAttribute("errorMsg",errorMsg);
             String referer = request.getHeader("Referer");
@@ -211,31 +211,31 @@ public class RefactorOperationController extends BaseEditController {
             }
             return "STOP";
 		}
-		
+
 		// find the models that the resource is referred to in and change
-		// the name in each of those models.		
+		// the name in each of those models.
 		String queryStr = "SELECT distinct ?graph WHERE {{ GRAPH ?graph { ?subj <" +  oldURIStr  + "> ?obj }} ";
 		queryStr += " union { GRAPH ?graph { <" + oldURIStr + "> ?prop ?obj }} ";
 		queryStr += " union { GRAPH ?graph { ?subj ?prop <" +  oldURIStr  + ">}}}";
 		Dataset dataset = request.getDataset();
-		
+
         QueryExecution qexec = null;
-    	dataset.getLock().enterCriticalSection(Lock.READ);        
+    	dataset.getLock().enterCriticalSection(Lock.READ);
     	try {
             qexec = QueryExecutionFactory.create(QueryFactory.create(queryStr), dataset);
     		ResultSet resultSet = qexec.execSelect();
-    		
+
     		while (resultSet.hasNext()) {
     			QuerySolution qs = resultSet.next();
     			String graphURI = qs.get("graph").asNode().toString();
-    			
+
     			if (graphURI.startsWith(FileGraphSetup.FILEGRAPH_URI_ROOT)) {
-    			   continue;	
+    			   continue;
     			}
-    			
+
     			boolean doNotify = false;
     			Model model = null;
-    			
+
     			if (TBOX_ASSERTIONS.equals(graphURI)) {
     				model = ModelAccess.on(getServletContext()).getOntModel(TBOX_ASSERTIONS).getBaseModel();
     				doNotify = true;
@@ -245,22 +245,22 @@ public class RefactorOperationController extends BaseEditController {
     			} else {
     			    model = dataset.getNamedModel(graphURI);
     		    }
-    			
+
     			renameResourceInModel(model, userURI, oldURIStr, newURIStr, doNotify);
-    		}	
+    		}
     	} finally {
             if(qexec != null) qexec.close();
     		dataset.getLock().leaveCriticalSection();
     	}
-		
-		renameResourceInModel(ModelAccess.on(getServletContext()).getOntModel(USER_ACCOUNTS), 
+
+		renameResourceInModel(ModelAccess.on(getServletContext()).getOntModel(USER_ACCOUNTS),
 				        userURI, oldURIStr, newURIStr, !NOTIFY);
-    	
+
 		// there are no statements to delete, but we want indexes updated appropriately
 		request.getUnfilteredWebappDaoFactory().getIndividualDao().deleteIndividual(oldURIStr);
-		
+
 		String redirectStr = null;
-		
+
 		/* we can't go back to the referer, because the URI is now different. */
 		String refererStr;
 		if ( (refererStr = epo.getReferer()) != null) {
@@ -278,19 +278,19 @@ public class RefactorOperationController extends BaseEditController {
 				redirectStr = controllerStr+"?uri="+newURIStr;
 			}
 		}
-		
+
 		return redirectStr;
-		
+
 	}
-	
+
 	private void renameResourceInModel(Model model, String userURI, String oldURIStr, String newURIStr, boolean doNotify) {
-				
+
 		model.enterCriticalSection(Lock.WRITE);
-		
+
 		if (doNotify) {
 		   model.notifyEvent(new EditEvent(userURI,true));
 		}
-		
+
 		try {
 			Property prop = model.getProperty(oldURIStr); // this will create a resource if there isn't
 			                                              // one by this URI (we don't expect this to happen
@@ -314,32 +314,32 @@ public class RefactorOperationController extends BaseEditController {
 				}
 				model.remove(model.listStatements(null, prop, (RDFNode)null));
 			} catch (InvalidPropertyURIException ipue) {
-				/* if it can't be a property, don't bother with predicates */ 
-			}			
+				/* if it can't be a property, don't bother with predicates */
+			}
 			Resource res = model.getResource(oldURIStr);
 			ResourceUtils.renameResource(res,newURIStr);
-			
+
 		} finally {
 			if (doNotify) {
 			   model.notifyEvent(new EditEvent(userURI,false));
 			}
 			model.leaveCriticalSection();
-		}		
+		}
 	}
-	
+
 	private void doMovePropertyStatements(VitroRequest request, HttpServletResponse response, EditProcessObject epo) {
 		String userURI = LoginStatusBean.getBean(request).getUserURI();
-		
+
 		OntModel ontModel = ModelAccess.on(getServletContext()).getOntModel(FULL_ASSERTIONS);
-		
+
 		Model tempRetractModel = ModelFactory.createDefaultModel();
 		Model tempAddModel = ModelFactory.createDefaultModel();
-		
+
 		String oldURIStr = (String) epo.getAttribute("propertyURI");
 		String newURIStr = request.getParameter("NewPropertyURI");
 		String subjectClassURIStr = request.getParameter("SubjectClassURI");
 		String objectClassURIStr = request.getParameter("ObjectClassURI");
-		
+
 		ontModel.enterCriticalSection(Lock.READ);
 		try {
 			Resource subjClass = (subjectClassURIStr.equals("") ? null : ResourceFactory.createResource(subjectClassURIStr));
@@ -354,13 +354,13 @@ public class RefactorOperationController extends BaseEditController {
 			}
 			try {
 				newPropInv = ontModel.getObjectProperty(newProp.getURI()).getInverse();
-			} catch (Exception e) { 
+			} catch (Exception e) {
 			    // forget about dealing with an inverse if we hit any trouble here
 			}
-			RDFNode objClass = (objectClassURIStr == null || objectClassURIStr.equals("")) 
-			        ? null 
+			RDFNode objClass = (objectClassURIStr == null || objectClassURIStr.equals(""))
+			        ? null
 			        : ResourceFactory.createResource(objectClassURIStr);
-			
+
 			StmtIterator closeIt = (epo.getAttribute("propertyType").equals("ObjectProperty")) ?
 				ontModel.listStatements(null,prop,(Resource)null) :
 				ontModel.listStatements(null,prop,(Literal)null);
@@ -410,18 +410,18 @@ public class RefactorOperationController extends BaseEditController {
 		}
 
 	}
-	
+
 	private void doMoveInstances(VitroRequest request, HttpServletResponse response, EditProcessObject epo) {
 		String userURI = LoginStatusBean.getBean(request).getUserURI();
-		
+
 		OntModel ontModel = ModelAccess.on(getServletContext()).getOntModel(FULL_ASSERTIONS);
-		
+
 		String oldClassURIStr = (String) epo.getAttribute("VClassURI");
 		String newClassURIStr = (String) request.getParameter("NewVClassURI");
-		
+
 		Model tempRetractModel = ModelFactory.createDefaultModel();
 		Model tempAddModel = ModelFactory.createDefaultModel();
-		
+
 		ontModel.enterCriticalSection(Lock.READ);
 		try {
 			Resource oldClassRes = ontModel.getResource(oldClassURIStr);
@@ -441,7 +441,7 @@ public class RefactorOperationController extends BaseEditController {
 		} finally {
 			ontModel.leaveCriticalSection();
 		}
-		
+
 		ontModel.enterCriticalSection(Lock.WRITE);
 		ontModel.getBaseModel().notifyEvent(new EditEvent(userURI,true));
 		try {
@@ -451,9 +451,9 @@ public class RefactorOperationController extends BaseEditController {
 			ontModel.getBaseModel().notifyEvent(new EditEvent(userURI,false));
 			ontModel.leaveCriticalSection();
 		}
-		
+
 	}
-	
+
     public void doPost(HttpServletRequest req, HttpServletResponse response) {
         if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) {
         	return;
@@ -461,7 +461,7 @@ public class RefactorOperationController extends BaseEditController {
 
     	VitroRequest vreq = new VitroRequest(req);
     	String defaultLandingPage = getDefaultLandingPage(vreq);
-    	
+
         HashMap epoHash = null;
         EditProcessObject epo = null;
         try {
@@ -477,18 +477,18 @@ public class RefactorOperationController extends BaseEditController {
             }
             return;
         }
-        
+
         String modeStr;
-        if (epo == null) 
+        if (epo == null)
         {
         	// Handles the case where we want to a type check on objects of datatype properties
         	handleConsistencyCheckRequest(vreq, response);
         	return;
         }
         else modeStr = (String)epo.getAttribute("modeStr");
-        
+
         String redirectStr = null;
-        
+
         if (vreq.getParameter("_cancel") == null) {
 	        if (modeStr != null) {
 
@@ -505,7 +505,7 @@ public class RefactorOperationController extends BaseEditController {
 				}
 	        }
         }
-        
+
         if (!"STOP".equals(redirectStr)) {
 	        if (redirectStr == null) {
 	        	redirectStr = (epo.getReferer()==null) ? defaultLandingPage : epo.getReferer();
@@ -519,20 +519,20 @@ public class RefactorOperationController extends BaseEditController {
         }
 
     }
-    
-    
+
+
     private void handleConsistencyCheckRequest(HttpServletRequest req, HttpServletResponse response)
     {
     	String modeStr = req.getParameter("modeStr");
     	if(modeStr != null)
     		if (modeStr.equals("fixDataTypes")) doFixDataTypes(req,response);
     }
-    
+
     public void doGet(HttpServletRequest req, HttpServletResponse response)
     {
     	doPost(req, response);
     }
-        
-}
-        
+
+}
+
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java
index 8fb612d77..326b9d4aa 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorRetryController.java
@@ -24,7 +24,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 
 public class RefactorRetryController extends BaseEditController {
-	
+
 	private static final Log log = LogFactory.getLog(RefactorRetryController.class.getName());
 
 	private void doRenameResource(VitroRequest request, HttpServletResponse response, EditProcessObject epo) {
@@ -38,7 +38,7 @@ public class RefactorRetryController extends BaseEditController {
 		request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp");
         request.setAttribute("scripts","/templates/edit/formBasic.js");
 	}
-	
+
 	private void doMovePropertyStatements(VitroRequest request, HttpServletResponse response, EditProcessObject epo) {
 		epo.setAttribute("modeStr","movePropertyStatements");
 		String propertyURI = request.getParameter("propertyURI");
@@ -52,7 +52,7 @@ public class RefactorRetryController extends BaseEditController {
 		subjectClassOpts.add(0,new Option("","? wildcard",true));
 		optMap.put("SubjectClassURI", subjectClassOpts);
 		optMap.put("ObjectClassURI", subjectClassOpts);
-		
+
 		List newPropertyOpts;
 		if (epo.getAttribute("propertyType").equals("ObjectProperty"))  {
 			List<ObjectProperty> opList = request.getUnfilteredWebappDaoFactory().getObjectPropertyDao().getAllObjectProperties();
@@ -66,8 +66,8 @@ public class RefactorRetryController extends BaseEditController {
 		HashMap<String,Option> hashMap = new HashMap<String,Option>();
         newPropertyOpts = getSortedList(hashMap,newPropertyOpts,request);
 		newPropertyOpts.add(new Option("","(move to trash)"));
-		optMap.put("NewPropertyURI", newPropertyOpts);				
-		
+		optMap.put("NewPropertyURI", newPropertyOpts);
+
 		request.setAttribute("editAction","refactorOp");
 		request.setAttribute("title", "Move Property Statements");
 		request.setAttribute("formJsp", "/templates/edit/specific/movePropertyStatements_retry.jsp");
@@ -75,7 +75,7 @@ public class RefactorRetryController extends BaseEditController {
 		request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp");
         request.setAttribute("scripts","/templates/edit/formBasic.js");
 	}
-	
+
 	public void doMoveInstances(VitroRequest request, HttpServletResponse response, EditProcessObject epo) {
 		epo.setAttribute("modeStr","moveInstances");
 		String propertyURI = request.getParameter("VClassURI");
@@ -94,17 +94,17 @@ public class RefactorRetryController extends BaseEditController {
 		request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp");
         request.setAttribute("scripts","/templates/edit/formBasic.js");
 	}
-	
+
 	public void doGet(HttpServletRequest request, HttpServletResponse response) {
         if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) {
         	return;
         }
-	
+
 	    //create an EditProcessObject for this and put it in the session
 	    EditProcessObject epo = super.createEpo(request);
-	    
+
 	    VitroRequest vreq = new VitroRequest(request);
-	    
+
 	    String modeStr = request.getParameter("mode");
 
 	    if (modeStr != null) {
@@ -131,9 +131,9 @@ public class RefactorRetryController extends BaseEditController {
             log.error(e.getStackTrace());
         }
 
-	    
+
 	}
-	
-	
-    
+
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ReorderController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ReorderController.java
index 550bb851a..dac1a9eae 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ReorderController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/ReorderController.java
@@ -36,7 +36,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent;
 import java.io.IOException;
 
 /**
- * This controller receives Ajax requests for reordering a list of individuals. 
+ * This controller receives Ajax requests for reordering a list of individuals.
  * Parameters:
  * predicate: the data property used for ranking
  * individuals: an ordered list of individuals to be ranked
@@ -56,7 +56,7 @@ public class ReorderController extends VitroAjaxController {
     protected AuthorizationRequest requiredActions(VitroRequest vreq) {
     	return SimplePermission.USE_BASIC_AJAX_CONTROLLERS.ACTION;
     }
-    
+
    @Override
     protected void doRequest(VitroRequest vreq, HttpServletResponse response) {
 
@@ -73,30 +73,30 @@ public class ReorderController extends VitroAjaxController {
         if (individualUris == null || individualUris.length == 0) {
             errorMsg = "No individuals specified";
             log.error(errorMsg);
-            doError(response, errorMsg, SC_BAD_REQUEST);  
+            doError(response, errorMsg, SC_BAD_REQUEST);
             return;
         }
 
-        WebappDaoFactory wadf = vreq.getWebappDaoFactory();        
+        WebappDaoFactory wadf = vreq.getWebappDaoFactory();
         if( vreq.getWebappDaoFactory() == null) {
             errorMsg = "No WebappDaoFactory available";
             log.error(errorMsg);
             doError(response, errorMsg, SC_INTERNAL_SERVER_ERROR);
             return;
-        }  
+        }
 
-        DataPropertyStatementDao dpsDao = wadf.getDataPropertyStatementDao();  
+        DataPropertyStatementDao dpsDao = wadf.getDataPropertyStatementDao();
         if( dpsDao == null) {
             errorMsg = "No DataPropertyStatementDao available";
             log.error(errorMsg);
             doError(response, errorMsg, SC_INTERNAL_SERVER_ERROR);
             return;
-        }  
+        }
 
-        //check permissions     
+        //check permissions
         //TODO: (bdc34)This is not yet implemented, must check the IDs against the policies for permissons before doing an edit!
         // rjy7 This should be inherited from the superclass
-        boolean hasPermission = true;        
+        boolean hasPermission = true;
         if( !hasPermission ){
             //if not okay, send error message
             doError(response,"Insufficent permissions", SC_UNAUTHORIZED);
@@ -114,7 +114,7 @@ public class ReorderController extends VitroAjaxController {
            e.printStackTrace();
        }
     }
-    
+
     private void reorderIndividuals(String[] individualUris, VitroRequest vreq, String rankPredicate) {
     	//Testing new mechanism
     	OntModel writeModel = vreq.getOntModelSelector().getABoxModel();
@@ -124,7 +124,7 @@ public class ReorderController extends VitroAjaxController {
     	DataProperty dp = vreq.getWebappDaoFactory().getDataPropertyDao().getDataPropertyByURI(rankPredicate);
     	String datapropURI = dp.getRangeDatatypeURI();
     	int counter = 1;
-        for (String individualUri : individualUris) {           
+        for (String individualUri : individualUris) {
         	Resource individualResource = ResourceFactory.createResource(individualUri);
         	//Deletions are all old statements with rank predicate
         	retractions.add(writeModel.listStatements(individualResource, rankPredicateProperty, (RDFNode) null));
@@ -141,12 +141,12 @@ public class ReorderController extends VitroAjaxController {
         	log.debug("additions = " + additions);
         	counter++;
         }
-        
+
         Lock lock = null;
         try{
             lock =  writeModel.getLock();
             lock.enterCriticalSection(Lock.WRITE);
-            writeModel.getBaseModel().notifyEvent(new EditEvent(null,true));   
+            writeModel.getBaseModel().notifyEvent(new EditEvent(null,true));
             writeModel.remove( retractions );
             writeModel.add( additions );
         }catch(Throwable t){
@@ -154,29 +154,29 @@ public class ReorderController extends VitroAjaxController {
         }finally{
             writeModel.getBaseModel().notifyEvent(new EditEvent(null,false));
             lock.leaveCriticalSection();
-        }       
-        
-        
+        }
+
+
     	//old code that for some reason doesn't seem to actually commit the changes
     	/*
     	 * int counter = 1;
-        for (String individualUri : individualUris) {           
+        for (String individualUri : individualUris) {
             // Retract all existing rank statements for this individual
             dpsDao.deleteDataPropertyStatementsForIndividualByDataProperty(individualUri, rankPredicate);
-        
+
             // Then add the new rank statement for this individual
             // insertNewDataPropertyStatement will insert the rangeDatatype of the property, so we don't need to set that here.
             dpsDao.insertNewDataPropertyStatement(new DataPropertyStatementImpl(individualUri, rankPredicate, String.valueOf(counter)));
-            
+
             counter++;
         }
-        
+
     	 */
-	
+
     }
 
 	protected void doError(HttpServletResponse response, String errorMsg, int httpstatus) {
         super.doError(response, "Error: " + errorMsg, httpstatus);
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java
index 1fbefad91..f704b5b39 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionOperationController.java
@@ -38,7 +38,7 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 public class RestrictionOperationController extends BaseEditController {
 
 	private static final Log log = LogFactory.getLog(RestrictionOperationController.class.getName());
-	
+
 	public void doPost(HttpServletRequest req, HttpServletResponse response) {
         if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) {
         	return;
@@ -46,11 +46,11 @@ public class RestrictionOperationController extends BaseEditController {
 
 		VitroRequest request = new VitroRequest(req);
 		String defaultLandingPage = getDefaultLandingPage(request);
-		
+
 	    try {
 			OntModel ontModel = ModelAccess.on(getServletContext())
 					.getOntModel(TBOX_ASSERTIONS);
-		    
+
             HashMap epoHash = null;
             EditProcessObject epo = null;
             try {
@@ -65,12 +65,12 @@ public class RestrictionOperationController extends BaseEditController {
             if (epo == null) {
                 response.sendRedirect(defaultLandingPage);
                 return;
-            } 
-                
-            if ( (request.getParameter("_cancel") == null ) ) {
-                processRestriction(request, epo, ontModel);   
             }
-                        
+
+            if ( (request.getParameter("_cancel") == null ) ) {
+                processRestriction(request, epo, ontModel);
+            }
+
             //if no page forwarder was set, just go back to referring page:
             String referer = epo.getReferer();
             if (referer == null) {
@@ -78,7 +78,7 @@ public class RestrictionOperationController extends BaseEditController {
             } else {
                 response.sendRedirect(referer);
             }
-		    
+
 	    } catch (Exception e) {
 	    	log.error(e, e);
 	    	try {
@@ -89,52 +89,52 @@ public class RestrictionOperationController extends BaseEditController {
 	    	}
 	    }
 	}
-	
+
 	private void processRestriction(VitroRequest request, EditProcessObject epo, OntModel ontModel) {
         ontModel.enterCriticalSection(Lock.WRITE);
         try {
-            
+
             ontModel.getBaseModel().notifyEvent(new EditEvent(request.getUnfilteredWebappDaoFactory().getUserURI(),true));
-            
+
             if ("delete".equals(request.getParameter("_action"))) {
-                processDelete(request, ontModel);   
+                processDelete(request, ontModel);
             }  else {
-                processCreate(request, epo, ontModel);            
+                processCreate(request, epo, ontModel);
             }
-            
+
         } finally {
             ontModel.getBaseModel().notifyEvent(new EditEvent(request.getUnfilteredWebappDaoFactory().getUserURI(),false));
             ontModel.leaveCriticalSection();
         }
-    
+
     }
 
     private void processDelete(VitroRequest request, OntModel ontModel) {
-        
+
         String restId = request.getParameter("restrictionId");
-        
+
         if (restId != null) {
-            
+
             OntClass restrictedClass = ontModel.getOntClass( request.getParameter( "classUri" ) );
-            
+
             OntClass rest = null;
-            
+
             for ( Iterator i = restrictedClass.listEquivalentClasses(); i.hasNext(); ) {
                 OntClass equivClass = (OntClass) i.next();
                 if (equivClass.isAnon() && equivClass.getId().toString().equals(restId)) {
                     rest = equivClass;
                 }
             }
-            
-            if ( rest == null ) { 
+
+            if ( rest == null ) {
                 for ( Iterator i = restrictedClass.listSuperClasses(); i.hasNext(); ) {
                     OntClass  superClass = (OntClass) i.next();
                     if (superClass.isAnon() && superClass.getId().toString().equals(restId)) {
                         rest = superClass;
                     }
-                }   
+                }
             }
-            
+
             /**
              * removing by graph subtraction so that statements with blank nodes
              * stick together and are processed appropriately by the bulk update
@@ -143,37 +143,37 @@ public class RestrictionOperationController extends BaseEditController {
             if ( rest != null ) {
                 Model temp = ModelFactory.createDefaultModel();
                 temp.add(rest.listProperties());
-                ontModel.getBaseModel().remove(temp);                
+                ontModel.getBaseModel().remove(temp);
             }
-            
+
         }
     }
-    
+
     private void processCreate(VitroRequest request, EditProcessObject epo, OntModel origModel) {
-        
+
         Model temp = ModelFactory.createDefaultModel();
         Model dynamicUnion = ModelFactory.createUnion(temp, origModel);
         OntModel ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, dynamicUnion);
-        
+
         OntProperty onProperty = ontModel.getOntProperty( (String) request.getParameter("onProperty") );
-        
+
         String conditionTypeStr = request.getParameter("conditionType");
-        
+
         String restrictionTypeStr = (String) epo.getAttribute("restrictionType");
         Restriction rest = null;
-        
+
         OntClass ontClass = ontModel.getOntClass( (String) epo.getAttribute("VClassURI") );
-        
+
         String roleFillerURIStr = request.getParameter("ValueClass");
         Resource roleFiller = null;
         if (roleFillerURIStr != null) {
             roleFiller = ontModel.getResource(roleFillerURIStr);
-        }               
-        
+        }
+
         int cardinality = -1;
         String cardinalityStr = request.getParameter("cardinality");
         if (cardinalityStr != null) {
-            cardinality = Integer.decode(cardinalityStr); 
+            cardinality = Integer.decode(cardinalityStr);
         }
 
         switch (restrictionTypeStr) {
@@ -224,15 +224,15 @@ public class RestrictionOperationController extends BaseEditController {
                 rest = ontModel.createCardinalityRestriction(null, onProperty, cardinality);
                 break;
         }
-        
+
         if (conditionTypeStr.equals("necessary")) {
             ontClass.addSuperClass(rest);
         } else if (conditionTypeStr.equals("necessaryAndSufficient")) {
             ontClass.addEquivalentClass(rest);
         }
-        
+
         origModel.add(temp);
-        
+
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java
index ec6d6e6ba..5412c0684 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RestrictionRetryController.java
@@ -29,11 +29,11 @@ import edu.cornell.mannlib.vitro.webapp.dao.DatatypeDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
 
 public class RestrictionRetryController extends BaseEditController {
-	
+
 	private static final Log log = LogFactory.getLog(RestrictionRetryController.class.getName());
 	private static final boolean DATA = true;
 	private static final boolean OBJECT = false;
-	
+
 	public void doGet(HttpServletRequest req, HttpServletResponse response) {
         if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) {
         	return;
@@ -42,28 +42,28 @@ public class RestrictionRetryController extends BaseEditController {
 		VitroRequest request = new VitroRequest(req);
 
 		try {
-			
+
 			EditProcessObject epo = createEpo(request);
-			
+
 			request.setAttribute("editAction","addRestriction");
 			epo.setAttribute("VClassURI", request.getParameter("VClassURI"));
-			
+
 			String restrictionTypeStr = request.getParameter("restrictionType");
 			epo.setAttribute("restrictionType",restrictionTypeStr);
 			request.setAttribute("restrictionType",restrictionTypeStr);
-				
+
 			// default to object property restriction
 			boolean propertyType = ("data".equals(request.getParameter("propertyType"))) ? DATA : OBJECT ;
-			
-			List<? extends ResourceBean> pList = (propertyType == OBJECT) 
+
+			List<? extends ResourceBean> pList = (propertyType == OBJECT)
 				? request.getUnfilteredWebappDaoFactory().getObjectPropertyDao().getAllObjectProperties()
 			    : request.getUnfilteredWebappDaoFactory().getDataPropertyDao().getAllDataProperties();
-			List<Option> onPropertyList = new LinkedList<Option>(); 
+			List<Option> onPropertyList = new LinkedList<Option>();
 			sortForPickList(pList, request);
 			for (ResourceBean p: pList) {
 				onPropertyList.add( new Option(p.getURI(),p.getPickListName()));
 			}
-					
+
 			epo.setFormObject(new FormObject());
 			epo.getFormObject().getOptionLists().put("onProperty", onPropertyList);
 
@@ -98,13 +98,13 @@ public class RestrictionRetryController extends BaseEditController {
 					request.setAttribute("specificRestrictionForm", "cardinalityRestriction_retry.jsp");
 					break;
 			}
-			
+
 	        request.setAttribute("formJsp","/templates/edit/specific/restriction_retry.jsp");
 	        request.setAttribute("scripts","/templates/edit/formBasic.js");
 	        request.setAttribute("title","Add Restriction");
 	        request.setAttribute("_action","insert");
 	        setRequestAttributes(request,epo);
-	
+
 	        try {
 				JSPPageHandler.renderBasicPage(request, response, "/templates/edit/formBasic.jsp");
 	        } catch (Exception e) {
@@ -112,13 +112,13 @@ public class RestrictionRetryController extends BaseEditController {
 	            log.error(e.getMessage());
 	            log.error(e.getStackTrace());
 	        }
-        
+
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		
+
 	}
-	
+
 	private List<Option> getValueClassOptionList(VitroRequest request) {
 		List<Option> valueClassOptionList = new LinkedList<Option>();
 		VClassDao vcDao = request.getUnfilteredWebappDaoFactory().getVClassDao();
@@ -139,7 +139,7 @@ public class RestrictionRetryController extends BaseEditController {
 		}
 		return valueClassOptionList;
 	}
-	
+
 	private List<Option> getValueDatatypeOptionList(VitroRequest request) {
 		List<Option> valueDatatypeOptionList = new LinkedList<Option>();
 		DatatypeDao dtDao = request.getUnfilteredWebappDaoFactory().getDatatypeDao();
@@ -149,6 +149,6 @@ public class RestrictionRetryController extends BaseEditController {
 		valueDatatypeOptionList.add(new Option(RDFS.Literal.getURI(), "rdfs:Literal"));
 		return valueDatatypeOptionList;
 	}
-	
-	
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java
index af5bab5c6..340a846e4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java
@@ -34,7 +34,7 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 
 @WebServlet(name = "VclassEditController", urlPatterns = {"/vclassEdit"} )
 public class VclassEditController extends BaseEditController {
-	
+
 	private static final Log log = LogFactory.getLog(VclassEditController.class.getName());
 	private static final int NUM_COLS = 14;
 
@@ -50,14 +50,14 @@ public class VclassEditController extends BaseEditController {
 
         VClassDao vcwDao = ModelAccess.on(getServletContext()).getWebappDaoFactory(ASSERTIONS_ONLY).getVClassDao();
         VClass vcl = (VClass)vcwDao.getVClassByURI(request.getParameter("uri"));
-        
+
         if (vcl == null) {
         	vcl = request.getUnfilteredWebappDaoFactory()
         	        .getVClassDao().getTopConcept();
         }
 
         request.setAttribute("VClass",vcl);
-        
+
         ArrayList results = new ArrayList();
         results.add("class");                // 1
         results.add("class label");          // 2
@@ -67,14 +67,14 @@ public class VclassEditController extends BaseEditController {
         results.add("short definition");     // 6
         results.add("example");              // 7
         results.add("editor description");   // 8
-        //results.add("curator comments"); 
+        //results.add("curator comments");
         results.add("display level");        // 9
         results.add("update level");         // 10
         results.add("display rank");         // 11
         results.add("custom entry form");    // 12
         results.add("URI");                  // 13
         results.add("publish level");        // 14
-        
+
         String ontologyName = null;
         if (vcl.getNamespace() != null) {
             Ontology ont = request.getUnfilteredWebappDaoFactory().getOntologyDao().getOntologyByURI(vcl.getNamespace());
@@ -86,7 +86,7 @@ public class VclassEditController extends BaseEditController {
         WebappDaoFactory wadf = request.getUnfilteredWebappDaoFactory();
         String groupURI = vcl.getGroupURI();
         String groupName = "none";
-        if(groupURI != null) { 
+        if(groupURI != null) {
             VClassGroupDao groupDao= wadf.getVClassGroupDao();
             VClassGroup classGroup = groupDao.getGroupByURI(groupURI);
             if (classGroup != null) {
@@ -97,7 +97,7 @@ public class VclassEditController extends BaseEditController {
         String shortDef = (vcl.getShortDef()==null) ? "" : vcl.getShortDef();
         String example = (vcl.getExample()==null) ? "" : vcl.getExample();
         String description = (vcl.getDescription()==null) ? "" : vcl.getDescription();
-        
+
         boolean foundComment = false;
         StringBuffer commSb = null;
         for (String s : request.getUnfilteredWebappDaoFactory().getCommentsForResource(vcl.getURI())) {
@@ -110,7 +110,7 @@ public class VclassEditController extends BaseEditController {
         if (!foundComment) {
             commSb = new StringBuffer("no comments yet");
         }
-               
+
 		String hiddenFromDisplay = (vcl.getHiddenFromDisplayBelowRoleLevel() == null ? "(unspecified)"
 				: vcl.getHiddenFromDisplayBelowRoleLevel().getDisplayLabel());
 		String ProhibitedFromUpdate = (vcl
@@ -120,11 +120,11 @@ public class VclassEditController extends BaseEditController {
 				: vcl.getHiddenFromPublishBelowRoleLevel().getDisplayLabel());
 
         String customEntryForm = (vcl.getCustomEntryForm() == null ? "(unspecified)" : vcl.getCustomEntryForm());
-        
+
        //String lastModified = "<i>not implemented yet</i>"; // TODO
-        
+
         String uri = (vcl.getURI() == null) ? "" : vcl.getURI();
-        
+
         results.add(vcl.getPickListName());                                // 1
         results.add(vcl.getName() == null ? "(no public label)" : vcl.getName()); // 2
         results.add(groupName);                                                   // 3
@@ -133,7 +133,7 @@ public class VclassEditController extends BaseEditController {
         results.add(shortDef);               // 6
         results.add(example);                // 7
         results.add(description);            // 8
-        //results.add(commSb.toString());    // 
+        //results.add(commSb.toString());    //
         results.add(hiddenFromDisplay);      // 9
         results.add(ProhibitedFromUpdate);   // 10
         results.add(String.valueOf(vcl.getDisplayRank())); // 11
@@ -154,7 +154,7 @@ public class VclassEditController extends BaseEditController {
         // if supported, we want to show only the asserted superclasses and subclasses.
         VClassDao vcDao = ModelAccess.on(getServletContext()).getWebappDaoFactory(ASSERTIONS_ONLY).getVClassDao();
         VClassDao displayVcDao = ModelAccess.on(getServletContext()).getWebappDaoFactory().getVClassDao();
-        
+
         List<VClass> superVClasses = getVClassesForURIList(
                 vcDao.getSuperClassURIs(vcl.getURI(),false), displayVcDao);
         sortForPickList(superVClasses, request);
@@ -164,7 +164,7 @@ public class VclassEditController extends BaseEditController {
                 vcDao.getSubClassURIs(vcl.getURI()), displayVcDao);
         sortForPickList(subVClasses, request);
         request.setAttribute("subclasses",subVClasses);
-            
+
         List<VClass> djVClasses = getVClassesForURIList(
                 vcDao.getDisjointWithClassURIs(vcl.getURI()), displayVcDao);
         sortForPickList(djVClasses, request);
@@ -174,13 +174,13 @@ public class VclassEditController extends BaseEditController {
                 vcDao.getEquivalentClassURIs(vcl.getURI()), displayVcDao);
         sortForPickList(eqVClasses, request);
         request.setAttribute("equivalentClasses",eqVClasses);
-   
+
         // add the options
         foo.setOptionLists(OptionMap);
         epo.setFormObject(foo);
 
         boolean instantiable = !vcl.getURI().equals(OWL.Nothing.getURI());
-        
+
         request.setAttribute("epoKey",epo.getKey());
         request.setAttribute("vclassWebapp", vcl);
         request.setAttribute("instantiable", instantiable);
@@ -200,7 +200,7 @@ public class VclassEditController extends BaseEditController {
     public void doGet (HttpServletRequest request, HttpServletResponse response) {
         doPost(request,response);
     }
-    
+
     private List<VClass> getVClassesForURIList(List<String> vclassURIs, VClassDao vcDao) {
         List<VClass> vclasses = new ArrayList<VClass>();
         for (String vclassURI : vclassURIs) {
@@ -212,4 +212,4 @@ public class VclassEditController extends BaseEditController {
         return vclasses;
     }
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java
index 5cc9ba747..ee00bc64e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java
@@ -39,7 +39,7 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 
 @WebServlet(name = "VclassRetryController", urlPatterns = {"/vclass_retry"} )
 public class VclassRetryController extends BaseEditController {
-	
+
 	private static final Log log = LogFactory.getLog(VclassRetryController.class.getName());
 
     public void doPost (HttpServletRequest req, HttpServletResponse response) {
@@ -48,7 +48,7 @@ public class VclassRetryController extends BaseEditController {
         }
 
     	VitroRequest request = new VitroRequest(req);
-    	
+
         //create an EditProcessObject for this and put it in the session
         EditProcessObject epo = super.createEpo(request);
 
@@ -67,7 +67,7 @@ public class VclassRetryController extends BaseEditController {
         }
 
         WebappDaoFactory wadf = ModelAccess.on(getServletContext()).getWebappDaoFactory();
-        
+
         VClassDao vcwDao = wadf.getVClassDao();
         epo.setDataAccessObject(vcwDao);
         VClassGroupDao cgDao = wadf.getVClassGroupDao();
@@ -146,9 +146,9 @@ public class VclassRetryController extends BaseEditController {
             log.error(this.getClass().getName() + "unable to create Namespace option list");
         }
 
-        optionMap.put("HiddenFromDisplayBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getDisplayOptionsList(vclassForEditing));    
+        optionMap.put("HiddenFromDisplayBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getDisplayOptionsList(vclassForEditing));
         optionMap.put("ProhibitedFromUpdateBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getUpdateOptionsList(vclassForEditing));
-        optionMap.put("HiddenFromPublishBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getPublishOptionsList(vclassForEditing));    
+        optionMap.put("HiddenFromPublishBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getPublishOptionsList(vclassForEditing));
 
         FormObject foo = new FormObject();
         foo.setErrorMap(epo.getErrMsgMap());
@@ -193,7 +193,7 @@ public class VclassRetryController extends BaseEditController {
             Classes2Classes c2c = new Classes2Classes();
             c2c.setSubclassURI(((VClass)newObj).getURI());
             c2c.setSuperclassURI(superclassURI);
-            daoFactory.getVClassDao().insertNewClasses2Classes(c2c);            
+            daoFactory.getVClassDao().insertNewClasses2Classes(c2c);
         }
         public void doUpdated(Object oldObj, Object newObj, EditProcessObject epo) {
             // nothing to do
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/AllClassGroupsListingController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/AllClassGroupsListingController.java
index ca02a2c0f..e9ddf5720 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/AllClassGroupsListingController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/AllClassGroupsListingController.java
@@ -30,12 +30,12 @@ public class AllClassGroupsListingController extends BaseEditController {
     	if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) {
     		return;
     	}
-    	
+
         VitroRequest vreq = new VitroRequest(request);
 
         VClassGroupDao dao = vreq.getUnfilteredWebappDaoFactory().getVClassGroupDao();
 
-        List<VClassGroup> groups = dao.getPublicGroupsWithVClasses(); 
+        List<VClassGroup> groups = dao.getPublicGroupsWithVClasses();
         // uses an unfiltered dao so will see all classes
 
         List<String> results = new ArrayList<String>();
@@ -51,7 +51,7 @@ public class AllClassGroupsListingController extends BaseEditController {
                 String publicName = vcg.getPublicName();
                 if ( StringUtils.isBlank(publicName) ) {
                     publicName = "(unnamed group)";
-                }           
+                }
                 try {
                     results.add("<a href=\"./editForm?uri="+URLEncoder.encode(vcg.getURI(),"UTF-8")+"&amp;controller=Classgroup\">"+publicName+"</a>");
                 } catch (Exception e) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyStatementListingController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyStatementListingController.java
index 3ef92c160..1815c8d1d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyStatementListingController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyStatementListingController.java
@@ -45,7 +45,7 @@ public class DataPropertyStatementListingController extends BaseEditController {
                 throw new Error("Cannot interpret "+startAtParam+" as a number");
             }
         }
-        
+
         int endAt=50;
         String endAtParam = request.getParameter("endAt");
         if (endAtParam!=null && endAtParam.trim().length()>0) {
@@ -63,24 +63,24 @@ public class DataPropertyStatementListingController extends BaseEditController {
                 throw new Error("Cannot interpret "+endAtParam+" as a number");
             }
         }
-        
+
         ArrayList results = new ArrayList();
-        
+
         request.setAttribute("results",results);
-        
+
         results.add("XX");
         results.add("subject");
         results.add("property");
         results.add("object");
-        
+
         DataPropertyStatementDao dpsDao = vrequest.getUnfilteredWebappDaoFactory().getDataPropertyStatementDao();
         DataPropertyDao dpDao = vrequest.getUnfilteredWebappDaoFactory().getDataPropertyDao();
         IndividualDao iDao = vrequest.getUnfilteredWebappDaoFactory().getIndividualDao();
-        
+
         String propURIStr = request.getParameter("propertyURI");
-        
-        DataProperty dp = dpDao.getDataPropertyByURI(propURIStr);        
-        
+
+        DataProperty dp = dpDao.getDataPropertyByURI(propURIStr);
+
         int count = 0;
 
        for (DataPropertyStatement dataPropertyStatement : dpsDao.getDataPropertyStatements(dp, startAt, endAt)) {
@@ -92,14 +92,14 @@ public class DataPropertyStatementListingController extends BaseEditController {
            results.add(dp.getPublicName());
            results.add(dps.getData());
        }
-        
+
         if (count == 0) {
         	results.add("XX");
         	results.add("No statements found for property \""+dp.getPublicName()+"\"");
         	results.add("");
         	results.add("");
         }
-        
+
         request.setAttribute("columncount",new Integer(4));
         request.setAttribute("suppressquery","true");
         request.setAttribute("title","Data Property Statements");
@@ -108,11 +108,11 @@ public class DataPropertyStatementListingController extends BaseEditController {
         } catch (Throwable t) {
             t.printStackTrace();
         }
-        
+
    }
-   
+
    public void doPost(HttpServletRequest request, HttpServletResponse response) {
 	   // don't post to this controller
    }
-   
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/IndividualsListingController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/IndividualsListingController.java
index 2dda13159..5d9d0f06f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/IndividualsListingController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/IndividualsListingController.java
@@ -39,22 +39,22 @@ public class IndividualsListingController extends BaseEditController {
         //need to figure out how to structure the results object to put the classes underneath
 
         String assertedOnlyStr = request.getParameter("assertedOnly");
-        
+
         WebappDaoFactory wadf = null;
-        
+
         if (assertedOnlyStr != null && assertedOnlyStr.equalsIgnoreCase("true")) {
         	wadf = vrequest.getUnfilteredAssertionsWebappDaoFactory();
         }
         if (wadf == null) {
         	wadf = vrequest.getUnfilteredWebappDaoFactory();
         }
-        
+
         IndividualDao dao = wadf.getIndividualDao();
         VClassDao vcDao = wadf.getVClassDao();
 
         String vclassURI = request.getParameter("VClassURI");
         VClass vc = vcDao.getVClassByURI(vclassURI);
-        
+
         List<Individual> inds = dao.getIndividualsByVClassURI(vclassURI);
         //List inds = dao.getIndividualsByVClassURI(vclassURI,1,MAX_INDIVIDUALS);
 
@@ -105,12 +105,12 @@ public class IndividualsListingController extends BaseEditController {
         // new individual button
         List <ButtonForm> buttons = new ArrayList<ButtonForm>();
         HashMap<String,String> newIndividualParams=new HashMap<String,String>();
-        newIndividualParams.put("VClassURI",vclassURI);    
+        newIndividualParams.put("VClassURI",vclassURI);
         newIndividualParams.put("controller","Entity");
         ButtonForm newIndividualButton = new ButtonForm(Controllers.RETRY_URL,"buttonForm","Add instance",newIndividualParams);
         buttons.add(newIndividualButton);
         request.setAttribute("topButtons", buttons);
-          
+
         try {
             JSPPageHandler.renderBasicPage(request, response, Controllers.HORIZONTAL_JSP);
         } catch (Throwable t) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ListingControllerWebUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ListingControllerWebUtils.java
index 42571a31a..59b6f9a85 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ListingControllerWebUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ListingControllerWebUtils.java
@@ -13,7 +13,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 
 public class ListingControllerWebUtils {
-	
+
 	private static final Log log = LogFactory.getLog(ListingControllerWebUtils.class.getName());
 
 	public static synchronized String formatIndividualLink(Individual ind) {
@@ -27,7 +27,7 @@ public class ListingControllerWebUtils {
     		return ind.getName();
     	}
 	}
-	
+
 	public static synchronized String formatVClassLinks(List<VClass> vList) {
 	    StringBuilder linksStr= new StringBuilder();
 	    if (vList!=null) {
@@ -44,12 +44,12 @@ public class ListingControllerWebUtils {
 	                ++count;
 	        	} catch (Exception e) {
 	        		if (obj == null) {
-	        			log.error(ListingControllerWebUtils.class.getName()+" could not format null VClass");	        		
+	        			log.error(ListingControllerWebUtils.class.getName()+" could not format null VClass");
 	        		}
 	        	}
 	        }
 	    }
 	    return linksStr.toString();
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java
index 8d022f6de..237727f4a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java
@@ -27,7 +27,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler;
 @WebServlet(name = "ObjectPropertyStatementListingController", urlPatterns = {"/listObjectPropertyStatements"} )
 public class ObjectPropertyStatementListingController extends
 		BaseEditController {
-	
+
    public void doGet(HttpServletRequest request, HttpServletResponse response) {
        if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) {
        	return;
@@ -36,18 +36,18 @@ public class ObjectPropertyStatementListingController extends
         VitroRequest vrequest = new VitroRequest(request);
 
         boolean assertedStatementsOnly = false;
-     
+
         String assertParam = request.getParameter("assertedStmts");
         if (assertParam!=null && assertParam.equalsIgnoreCase("true")) {
             assertedStatementsOnly = true;
         }
-                
+
         boolean showVClasses = false;
         String displayParam = request.getParameter("showVClasses");
         if (displayParam!=null && displayParam.equalsIgnoreCase("true")) {
             showVClasses = true;  // this will trigger a limitation to asserted vclasses, since we can't easily display all vclasses for an individual
         }
-        
+
         int startAt=1;
         String startAtParam = request.getParameter("startAt");
         if (startAtParam!=null && startAtParam.trim().length()>0) {
@@ -60,7 +60,7 @@ public class ObjectPropertyStatementListingController extends
                 throw new Error("Cannot interpret "+startAtParam+" as a number");
             }
         }
-        
+
         int endAt=50;
         String endAtParam = request.getParameter("endAt");
         if (endAtParam!=null && endAtParam.trim().length()>0) {
@@ -79,18 +79,18 @@ public class ObjectPropertyStatementListingController extends
             }
         }
 
-        
+
         ArrayList<String> results = new ArrayList();
-        
+
         request.setAttribute("results",results);
-        
+
         results.add("XX");
         results.add("subject");
         if (showVClasses) results.add("type");
         results.add("property");
         results.add("object");
         if (showVClasses) results.add("type");
-        
+
         ObjectPropertyStatementDao opsDao = null;
         if (assertedStatementsOnly){ // get only asserted, not inferred, object property statements
             opsDao = vrequest.getUnfilteredAssertionsWebappDaoFactory().getObjectPropertyStatementDao();
@@ -100,18 +100,18 @@ public class ObjectPropertyStatementListingController extends
 
         // get all object properties -- no concept of asserted vs. inferred object properties
         ObjectPropertyDao opDao = vrequest.getUnfilteredWebappDaoFactory().getObjectPropertyDao();
-        
+
         IndividualDao iDao = null;
         if (showVClasses) {
             iDao = vrequest.getUnfilteredAssertionsWebappDaoFactory().getIndividualDao();
         } else {
             iDao = vrequest.getUnfilteredWebappDaoFactory().getIndividualDao();
         }
-        
+
         String propURIStr = request.getParameter("propertyURI");
-        
-        ObjectProperty op = opDao.getObjectPropertyByURI(propURIStr);        
-        
+
+        ObjectProperty op = opDao.getObjectPropertyByURI(propURIStr);
+
         int count = 0;
 
 
@@ -139,7 +139,7 @@ public class ObjectPropertyStatementListingController extends
                }
            }
        }
-        
+
         if (count == 0) {
         	results.add("XX");
         	results.add("No statements found for property \""+op.getPickListName()+"\"");
@@ -150,7 +150,7 @@ public class ObjectPropertyStatementListingController extends
         	    results.add("");
         	}
         }
-        
+
         if (showVClasses){
             request.setAttribute("columncount",new Integer(6));
         } else {
@@ -179,11 +179,11 @@ public class ObjectPropertyStatementListingController extends
         } catch (Throwable t) {
             t.printStackTrace();
         }
-        
+
    }
-      
+
    public void doPost(HttpServletRequest request, HttpServletResponse response) {
 	   // don't post to this controller
    }
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/OntologiesListingController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/OntologiesListingController.java
index 522d2d6e1..d68202328 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/OntologiesListingController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/OntologiesListingController.java
@@ -26,7 +26,7 @@ public class OntologiesListingController extends BaseEditController {
     	if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) {
     		return;
     	}
-    	
+
         VitroRequest vrequest = new VitroRequest(request);
 
         //need to figure out how to structure the results object to put the classes underneath
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyGroupsListingController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyGroupsListingController.java
index dd1e64415..ae2d22fb4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyGroupsListingController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyGroupsListingController.java
@@ -40,13 +40,13 @@ public class PropertyGroupsListingController extends BaseEditController {
 				SimplePermission.EDIT_ONTOLOGY.ACTION)) {
     		return;
     	}
-    	
+
         VitroRequest vreq = new VitroRequest(request);
 
         PropertyGroupDao dao = vreq.getUnfilteredWebappDaoFactory().getPropertyGroupDao();
 
         List<PropertyGroup> groups = dao.getPublicGroups(WITH_PROPERTIES);
-        
+
         Comparator<Property> comparator = new PropertySorter(vreq.getCollator());
 
         List<String> results = new ArrayList<String>();
@@ -62,7 +62,7 @@ public class PropertyGroupsListingController extends BaseEditController {
                 String publicName = pg.getName();
                 if ( StringUtils.isBlank(publicName) ) {
                     publicName = "(unnamed group)";
-                }           
+                }
                 try {
                     results.add("<a href=\"./editForm?uri="+URLEncoder.encode(pg.getURI(),"UTF-8")+"&amp;controller=PropertyGroup\">"+publicName+"</a>");
                 } catch (Exception e) {
@@ -86,9 +86,9 @@ public class PropertyGroupsListingController extends BaseEditController {
                         Property prop = propIt.next();
                         results.add("XX");
                         String controllerStr = "propertyEdit";
-                        String nameStr = 
-                        	   (prop.getLabel() == null) 
-                        	           ? "" 
+                        String nameStr =
+                        	   (prop.getLabel() == null)
+                        	           ? ""
                         	           : prop.getLabel();
                         if (prop instanceof ObjectProperty) {
                         	nameStr = ((ObjectProperty) prop).getDomainPublic();
@@ -98,9 +98,9 @@ public class PropertyGroupsListingController extends BaseEditController {
                         }
                         if (prop.getURI() != null) {
                             try {
-                                results.add("<a href=\"" + controllerStr + 
+                                results.add("<a href=\"" + controllerStr +
                                 		"?uri="+URLEncoder.encode(
-                                				prop.getURI(),"UTF-8") + 
+                                				prop.getURI(),"UTF-8") +
                                 				"\">" + nameStr +"</a>");
                             } catch (Exception e) {
                                 results.add(nameStr);
@@ -133,15 +133,15 @@ public class PropertyGroupsListingController extends BaseEditController {
         }
 
     }
-    
+
     private class PropertySorter implements Comparator<Property> {
-    	
+
         Collator collator;
-        
+
         public PropertySorter(Collator collator) {
             this.collator = collator;
         }
-    	
+
     	public int compare(Property p1, Property p2) {
     		String name1 = getName(p1);
     		String name2 = getName(p2);
@@ -154,7 +154,7 @@ public class PropertyGroupsListingController extends BaseEditController {
     		}
     		return collator.compare(name1, name2);
     	}
-    	
+
     	private String getName(Property prop) {
     		if (prop instanceof ObjectProperty) {
     			return ((ObjectProperty) prop).getDomainPublic();
@@ -165,5 +165,5 @@ public class PropertyGroupsListingController extends BaseEditController {
     		}
     	}
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappWithInstancesListingController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappWithInstancesListingController.java
index d8a4c3458..29c6d1f6a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappWithInstancesListingController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/VClassWebappWithInstancesListingController.java
@@ -23,7 +23,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.JSPPageHandler;
 public class VClassWebappWithInstancesListingController extends BaseEditController {
 
     private int NUM_COLS = 6;
-    
+
     public void doGet(HttpServletRequest request, HttpServletResponse response) {
         if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) {
         	return;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java
index c6a09d0d2..05acd18ad 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java
@@ -29,34 +29,34 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 @WebServlet(name = "NamespacesListingController", urlPatterns = {"/listNamespaces"} )
 public class NamespacesListingController extends BaseEditController {
 
-    public void doGet(HttpServletRequest request, HttpServletResponse response) {    	
+    public void doGet(HttpServletRequest request, HttpServletResponse response) {
 		if (!isAuthorizedToDisplayPage(request, response,
 				SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION)) {
         	return;
         }
 
         VitroRequest vrequest = new VitroRequest(request);
-               
+
 		OntModel ontModel = ModelAccess.on(getServletContext()).getOntModel();
-               
+
         ArrayList results = new ArrayList();
         request.setAttribute("results",results);
         results.add("XX");
         results.add("namespace");
         results.add("prefix");
-        
+
         Property namespaceURIProp = ontModel.getProperty(VitroVocabulary.NAMESPACE_NAMESPACEURI);
-        
+
         ontModel.enterCriticalSection(Lock.READ);
         try {
         	ClosableIterator closeIt = ontModel.listIndividuals(ontModel.getResource(VitroVocabulary.NAMESPACE));
         	try {
         		for (Iterator namespaceIt=closeIt; namespaceIt.hasNext();) {
         			Individual namespaceInd = (Individual) namespaceIt.next();
-        			
+
         			String namespaceURI = "";
         			try {
-        				namespaceURI = ((Literal)namespaceInd.getPropertyValue(namespaceURIProp)).getLexicalForm(); 
+        				namespaceURI = ((Literal)namespaceInd.getPropertyValue(namespaceURIProp)).getLexicalForm();
         			} catch (Exception e) { /* ignore it for now */ }
         			results.add("XX");
         			results.add(namespaceURI);
@@ -99,5 +99,5 @@ public class NamespacesListingController extends BaseEditController {
         }
 
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java
index 4072bd835..02b176969 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java
@@ -42,10 +42,10 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 public class RestrictionsListingController extends BaseEditController {
 
 	private static String LAMBDA = "";
-	
+
 	private EditProcessObject epo = null;
-	
-    public void doGet(HttpServletRequest request, HttpServletResponse response) {    	
+
+    public void doGet(HttpServletRequest request, HttpServletResponse response) {
         if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTION)) {
         	return;
         }
@@ -53,13 +53,13 @@ public class RestrictionsListingController extends BaseEditController {
         VitroRequest vrequest = new VitroRequest(request);
 
         epo = super.createEpo(request);
-        
+
 		OntModel ontModel = ModelAccess.on(getServletContext()).getOntModel();
 
         ObjectPropertyDao opDao = vrequest.getUnfilteredWebappDaoFactory().getObjectPropertyDao();
         VClassDao vcDao = vrequest.getUnfilteredWebappDaoFactory().getVClassDao();
         IndividualDao iDao = vrequest.getUnfilteredWebappDaoFactory().getIndividualDao();
-        
+
         ArrayList results = new ArrayList();
         request.setAttribute("results",results);
         results.add("XX");
@@ -67,7 +67,7 @@ public class RestrictionsListingController extends BaseEditController {
         results.add("restriction");
         results.add("filler(s)");
         results.add(LAMBDA);
-        
+
         String vClassURI = request.getParameter("VClassURI");
 
         if (vClassURI != null) {
@@ -104,7 +104,7 @@ public class RestrictionsListingController extends BaseEditController {
         }
 
 
-        
+
 
         request.setAttribute("columncount",new Integer(5));
         request.setAttribute("suppressquery","true");
@@ -116,7 +116,7 @@ public class RestrictionsListingController extends BaseEditController {
         }
 
     }
-    
+
     private void tryRestriction(OntClass theClass, VClassDao vcDao, ObjectPropertyDao opDao, IndividualDao iDao, ArrayList results, String vClassURI) {
 		if (theClass.isRestriction()) {
 			Restriction rest = (Restriction) theClass.as(Restriction.class);
@@ -129,7 +129,7 @@ public class RestrictionsListingController extends BaseEditController {
 					results.add("all values from");
 					AllValuesFromRestriction avfrest = (AllValuesFromRestriction) rest.as(AllValuesFromRestriction.class);
 					Resource allValuesFrom = avfrest.getAllValuesFrom();
-					results.add(printAsClass(vcDao, allValuesFrom));	        					
+					results.add(printAsClass(vcDao, allValuesFrom));
 				} else if (rest.isSomeValuesFromRestriction()) {
 					results.add("some values from");
 					SomeValuesFromRestriction svfrest = (SomeValuesFromRestriction) rest.as(SomeValuesFromRestriction.class);
@@ -152,7 +152,7 @@ public class RestrictionsListingController extends BaseEditController {
 							results.add("???");
 						}
 					}
-					
+
 				} else if (rest.isMinCardinalityRestriction()) {
 					MinCardinalityRestriction crest = (MinCardinalityRestriction) rest.as(MinCardinalityRestriction.class);
 					results.add("at least "+crest.getMinCardinality());
@@ -166,22 +166,22 @@ public class RestrictionsListingController extends BaseEditController {
 					results.add("exactly "+crest.getCardinality());
 					results.add(LAMBDA);
 				}
-				
+
 				results.add("<form action=\"addRestriction\" method=\"post\">" +
 						        "<input type=\"hidden\" name=\"_action\" value=\"delete\"/>" +
-						        "<input type=\"submit\" value=\"Delete\"/>" + 
+						        "<input type=\"submit\" value=\"Delete\"/>" +
 						        "<input type=\"hidden\" name=\"_epoKey\" value=\""+epo.getKey()+"\"/>" +
 						        "<input type=\"hidden\" name=\"classUri\" value=\""+vClassURI+"\"/>" +
 						        "<input type=\"hidden\" name=\"restrictionId\" value=\""+( (rest.getId() != null) ? rest.getId() : rest.getURI() )+"\"/>" +
 						    "</form>");
-				
+
 			} catch (Exception e) {
 				e.printStackTrace(); // results.add("unknown property");
 			}
-					
-		}	
+
+		}
     }
-    
+
     private String printAsClass(VClassDao vcDao, Resource res) {
     	String UNKNOWN = "???";
     	try {
@@ -199,6 +199,6 @@ public class RestrictionsListingController extends BaseEditController {
     	results.add(LAMBDA);
     	results.add(LAMBDA);
     }
-    
-	
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/LocalNamespaceClassUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/LocalNamespaceClassUtils.java
index f499a325b..1d943db00 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/LocalNamespaceClassUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/LocalNamespaceClassUtils.java
@@ -15,7 +15,7 @@ import org.apache.commons.logging.LogFactory;
 
 public class LocalNamespaceClassUtils {
     private static final Log log = LogFactory.getLog(LocalNamespaceClassUtils.class.getName());
-    
+
     //Expects hash where key = namespace uri
     //return hash where key = class uri, and value = display Name + (prefix) of ontology
     public static HashMap<String, String> getLocalNamespacesClasses(VitroRequest vreq, HashMap<String, String> namespaces) {
@@ -24,7 +24,7 @@ public class LocalNamespaceClassUtils {
        for(VClass v: allClasses) {
     	   String classNamespace = v.getNamespace();
     	   String classUri = v.getURI();
-    	   
+
     	   if(namespaces.containsKey(classNamespace)){
     		   String namespaceLabel = namespaces.get(classNamespace);
     		   String prefix = namespaceLabel.substring(namespaceLabel.indexOf("(") + 1, namespaceLabel.indexOf(")"));
@@ -33,7 +33,7 @@ public class LocalNamespaceClassUtils {
        }
        return localClasses;
     }
-    
+
     private static HashMap<String, String> convertToHash(List<String> namespaces) {
     	HashMap<String, String> namespaceHash = new HashMap<String, String>();
     	for(String n: namespaces){
@@ -41,15 +41,15 @@ public class LocalNamespaceClassUtils {
     	}
     	return namespaceHash;
     }
-    
-    //Retrieve all VClasses and sort into local namespaces 
+
+    //Retrieve all VClasses and sort into local namespaces
     //TODO: Check better mechanism utilizing sparql query
     //Can't depend on retrieval of classes b/c an ontology may not have any classes yet
     //Display name and URI, with URI being key
     public static HashMap<String, String> getLocalOntologyNamespaces(VitroRequest vreq) {
         HashMap<String, String> foundNamespaces = new HashMap<String, String>();
         String defaultNamespacePattern = getDefaultOntologyNamespace(vreq);
-        
+
     	//Get all namespacs
     	//There's an APP for that!
         //defualt namespace pattern is null if the default namespace does not employ /individual
@@ -65,10 +65,10 @@ public class LocalNamespaceClassUtils {
 	        	}
 	         }
         }
-    	
+
         return foundNamespaces;
     }
-    
+
     public static String getDefaultOntologyNamespace(VitroRequest vreq) {
     	String defaultNamespace= vreq.getWebappDaoFactory().getDefaultNamespace();
     	//Assuming following linked data approach so expects /individual at end
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/RoleLevelOptionsSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/RoleLevelOptionsSetup.java
index 1f9222bb5..c460e43ea 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/RoleLevelOptionsSetup.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/RoleLevelOptionsSetup.java
@@ -14,7 +14,7 @@ import org.apache.commons.logging.LogFactory;
 
 public class RoleLevelOptionsSetup {
     private static final Log log = LogFactory.getLog(RoleLevelOptionsSetup.class.getName());
-    
+
     public static List<Option> getDisplayOptionsList(ResourceBean b) {
         List<Option> hiddenFromDisplayList = new LinkedList<Option>();
         try {
@@ -41,7 +41,7 @@ public class RoleLevelOptionsSetup {
         }
         return hiddenFromDisplayList;
     }
-    
+
     public static List<Option> getUpdateOptionsList(ResourceBean b) {
         List<Option> prohibitedFromUpdateList = new LinkedList<Option>();
         try {
@@ -95,6 +95,6 @@ public class RoleLevelOptionsSetup {
         }
         return hiddenFromPublishList;
     }
-    
+
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/AboutController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/AboutController.java
index 545c62299..3099f5e4a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/AboutController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/AboutController.java
@@ -1,6 +1,6 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
-package edu.cornell.mannlib.vitro.webapp.controller.freemarker; 
+package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -17,19 +17,19 @@ import javax.servlet.annotation.WebServlet;
 
 @WebServlet(name = "AboutController", urlPatterns = {"/about"} )
 public class AboutController extends FreemarkerHttpServlet {
-	
+
     private static final long serialVersionUID = 1L;
     private static final Log log = LogFactory.getLog(AboutController.class);
     private static final String TEMPLATE_DEFAULT = "about.ftl";
-    
+
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
         ApplicationBean application = vreq.getAppBean();
-        
+
         Map<String, Object> body = new HashMap<String, Object>();
         body.put("aboutText", application.getAboutText());
         body.put("acknowledgeText", application.getAcknowledgeText());
-        
+
         return new TemplateResponseValues(TEMPLATE_DEFAULT, body);
     }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
index 90dfee2b2..2dc1d5891 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
@@ -31,7 +31,7 @@ import edu.cornell.mannlib.vitro.webapp.search.controller.IndexController;
 import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 
 public class BaseSiteAdminController extends FreemarkerHttpServlet {
-	
+
     private static final long serialVersionUID = 1L;
     private static final Log log = LogFactory.getLog(BaseSiteAdminController.class);
     protected static final String TEMPLATE_DEFAULT = "siteAdmin-main.ftl";
@@ -82,7 +82,7 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
 
         registerSiteConfigData("pageManagement", "/pageList", null, SimplePermission.MANAGE_MENUS.ACTION);
     }
-    
+
     @Override
 	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
     	return REQUIRED_ACTIONS;
@@ -95,20 +95,20 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
 
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
-        
-        Map<String, Object> body = new HashMap<String, Object>();        
+
+        Map<String, Object> body = new HashMap<String, Object>();
 
         body.put("dataInput", getDataInputData(vreq));
-        body.put("siteConfig", getSiteConfigData(vreq));        
-        body.put("siteMaintenance", getSiteMaintenanceUrls(vreq));     
+        body.put("siteConfig", getSiteConfigData(vreq));
+        body.put("siteMaintenance", getSiteMaintenanceUrls(vreq));
         body.put("ontologyEditor", getOntologyEditorData(vreq));
         body.put("dataTools", getDataToolsUrls(vreq));
 
         return new TemplateResponseValues(TEMPLATE_DEFAULT, body);
     }
-    
+
     protected Map<String, Object> getSiteMaintenanceUrls(VitroRequest vreq) {
-        
+
         Map<String, Object> urls = new HashMap<>();
 
         for (AdminUrl adminUrl : siteMaintenanceUrls) {
@@ -133,25 +133,25 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
     }
 
     protected Map<String, Object> getDataInputData(VitroRequest vreq) {
-    
+
         Map<String, Object> map = new HashMap<String, Object>();
-        
+
 		if (PolicyHelper.isAuthorizedForActions(vreq,
 				SimplePermission.DO_BACK_END_EDITING.ACTION)) {
 
             map.put("formAction", UrlBuilder.getUrl("/editRequestDispatch"));
-            
+
             WebappDaoFactory wadf = vreq.getUnfilteredWebappDaoFactory();
-            
+
             // Create map for data input entry form options list
             List<VClassGroup> classGroups = wadf.getVClassGroupDao().getPublicGroupsWithVClasses(true,true,false); // order by displayRank, include uninstantiated classes, don't get the counts of individuals
-    
+
             Set<String> seenGroupNames = new HashSet<String>();
-            
+
             Iterator<VClassGroup> classGroupIt = classGroups.iterator();
             LinkedHashMap<String, List<Option>> orderedClassGroups = new LinkedHashMap<String, List<Option>>(classGroups.size());
             while (classGroupIt.hasNext()) {
-                VClassGroup group = classGroupIt.next();            
+                VClassGroup group = classGroupIt.next();
                 List<Option> opts = FormUtils.makeOptionListFromBeans(group.getVitroClassList(),"URI","PickListName",null,null,false);
                 if( seenGroupNames.contains(group.getPublicName() )){
                     //have a duplicate classgroup name, stick in the URI
@@ -162,14 +162,14 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
                 }else{
                     orderedClassGroups.put(group.getPublicName(),opts);
                     seenGroupNames.add(group.getPublicName());
-                }             
+                }
             }
-            
+
             map.put("groupedClassOptions", orderedClassGroups);
         }
         return map;
     }
-    
+
     protected Map<String, Object> getSiteConfigData(VitroRequest vreq) {
 
         Map<String, Object> data = new HashMap<String, Object>();
@@ -190,13 +190,13 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
 
         return data;
     }
-    
+
     protected Map<String, Object> getOntologyEditorData(VitroRequest vreq) {
 
         Map<String, Object> map = new HashMap<String, Object>();
- 
+
         if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.EDIT_ONTOLOGY.ACTION)) {
-            
+
             String error = null;
             String explanation = null;
             TBoxReasonerStatus status = ApplicationUtils.instance().getTBoxReasonerModule().getStatus();
@@ -206,7 +206,7 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
             } else if ( status.isInErrorState() ) {
                 error = "An error occurred during reasoning. Reasoning has been halted. See error log for details.";
             }
-    
+
             if (error != null) {
                 Map<String, String> tboxReasonerStatus = new HashMap<String, String>();
                 tboxReasonerStatus.put("error", error);
@@ -215,36 +215,36 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
                 }
                 map.put("tboxReasonerStatus", tboxReasonerStatus);
             }
-                    
+
             Map<String, String> urls = new HashMap<String, String>();
-            
+
             urls.put("ontologies", UrlBuilder.getUrl("/listOntologies"));
             urls.put("classHierarchy", UrlBuilder.getUrl("/showClassHierarchy"));
             urls.put("classGroups", UrlBuilder.getUrl("/listGroups"));
             urls.put("dataPropertyHierarchy", UrlBuilder.getUrl("/showDataPropertyHierarchy"));
             urls.put("fauxPropertyList", UrlBuilder.getUrl("/listFauxProperties"));
-            urls.put("propertyGroups", UrlBuilder.getUrl("/listPropertyGroups"));            
+            urls.put("propertyGroups", UrlBuilder.getUrl("/listPropertyGroups"));
             urls.put("objectPropertyHierarchy", UrlBuilder.getUrl("/showObjectPropertyHierarchy", new ParamMap("iffRoot", "true")));
             map.put("urls", urls);
         }
-        
+
         return map;
     }
 
     protected Map<String, String> getDataToolsUrls(VitroRequest vreq) {
 
         Map<String, String> urls = new HashMap<String, String>();
-        
-        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION)) {            
+
+        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION)) {
             urls.put("ingest", UrlBuilder.getUrl("/ingest"));
             urls.put("rdfData", UrlBuilder.getUrl("/uploadRDFForm"));
             urls.put("rdfExport", UrlBuilder.getUrl("/export"));
 //            urls.put("sparqlQueryBuilder", UrlBuilder.getUrl("/admin/sparqlquerybuilder"));
         }
-        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_SPARQL_QUERY_PAGE.ACTION)) {            
+        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_SPARQL_QUERY_PAGE.ACTION)) {
         	urls.put("sparqlQuery", UrlBuilder.getUrl("/admin/sparqlquery"));
         }
-        
+
         return urls;
     }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java
index 5b97f51f1..0ee20f2fe 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java
@@ -23,22 +23,22 @@ import javax.servlet.annotation.WebServlet;
 @WebServlet(name = "browsecontroller", urlPatterns = {"/browse"}, loadOnStartup = 5)
 public class BrowseController extends FreemarkerHttpServlet {
     static final long serialVersionUID=2006030721126L;
-    
+
     private static final Log log = LogFactory.getLog(BrowseController.class);
-    
+
     private static final String TEMPLATE_DEFAULT = "classGroups.ftl";
-     
+
     @Override
     protected String getTitle(String siteName, VitroRequest vreq) {
         return "Index of Contents";
     }
-    
+
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
-        
+
         Map<String, Object> body = new HashMap<String, Object>();
         String templateName = TEMPLATE_DEFAULT;
-                       
+
         List<VClassGroup> groups = null;
         VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
         groups =vcgc.getGroups();
@@ -47,7 +47,7 @@ public class BrowseController extends FreemarkerHttpServlet {
             vcgroups.add(new VClassGroupTemplateModel(group));
         }
         body.put("classGroups", vcgroups);
-        
+
         return new TemplateResponseValues(templateName, body);
     }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java
index b442f61fa..9c3395956 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java
@@ -26,39 +26,39 @@ public class ContactFormController extends FreemarkerHttpServlet {
 
     private static final long serialVersionUID = 1L;
     private static final Log log = LogFactory.getLog(ContactFormController.class.getName());
-    
+
     private static final String TEMPLATE_DEFAULT = "contactForm-form.ftl";
     private static final String TEMPLATE_ERROR = "contactForm-error.ftl";
-    
+
     @Override
     protected String getTitle(String siteName, VitroRequest vreq) {
         return siteName + " Feedback Form";
     }
-    
+
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
 
         ApplicationBean appBean = vreq.getAppBean();
-    	
+
         String templateName;
         Map<String, Object> body = new HashMap<String, Object>();
-        
+
         if (!FreemarkerEmailFactory.isConfigured(vreq)) {
-            body.put("errorMessage", 
+            body.put("errorMessage",
                      "This application has not yet been configured to send mail. " +
                      "Email properties must be specified in the configuration properties file.");
             templateName = TEMPLATE_ERROR;
         }
-        
+
         else if (StringUtils.isBlank(appBean.getContactMail())) {
-            body.put("errorMessage", 
+            body.put("errorMessage",
             		"The feedback form is currently disabled. In order to activate the form, a site administrator must provide a contact email address in the <a href='editForm?home=1&amp;controller=ApplicationBean&amp;id=1'>Site Configuration</a>");
-            
-            templateName = TEMPLATE_ERROR;          
+
+            templateName = TEMPLATE_ERROR;
         }
-        
+
         else {
-          
+
             body.put("formAction", "submitFeedback");
 
             if (vreq.getHeader("Referer") == null) {
@@ -66,10 +66,10 @@ public class ContactFormController extends FreemarkerHttpServlet {
             } else {
                 vreq.getSession().setAttribute("contactFormReferer",vreq.getHeader("Referer"));
             }
-           
+
             templateName = TEMPLATE_DEFAULT;
         }
-        
+
         return new TemplateResponseValues(templateName, body);
     }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java
index fdb706414..1444e9115 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactMailController.java
@@ -40,34 +40,34 @@ public class ContactMailController extends FreemarkerHttpServlet {
 	private static final Log log = LogFactory
 			.getLog(ContactMailController.class);
     private static final long serialVersionUID = 1L;
-	
+
     private final static String SPAM_MESSAGE        = "Your message was flagged as spam.";
-    
+
     private final static String WEB_USERNAME_PARAM  = "webusername";
     private final static String WEB_USEREMAIL_PARAM = "webuseremail";
     private final static String COMMENTS_PARAM      = "s34gfd88p9x1";
-	
+
     private final static String TEMPLATE_CONFIRMATION = "contactForm-confirmation.ftl";
     private final static String TEMPLATE_EMAIL = "contactForm-email.ftl";
     private final static String TEMPLATE_BACKUP = "contactForm-backup.ftl";
     private final static String TEMPLATE_ERROR = "contactForm-error.ftl";
     private final static String TEMPLATE_FORM = "contactForm-form.ftl";
-    
+
 	private static final String EMAIL_JOURNAL_FILE_DIR = "emailJournal";
 	private static final String EMAIL_JOURNAL_FILE_NAME = "contactFormEmails.html";
-    
+
 	@Override
     protected String getTitle(String siteName, VitroRequest vreq) {
         return siteName + " Feedback Form";
     }
-    
+
 
     @Override
 	protected ResponseValues processRequest(VitroRequest vreq) {
     	if (!FreemarkerEmailFactory.isConfigured(vreq)) {
 			return errorNoSmtpServer();
 		}
-		
+
 		String[] recipients = figureRecipients(vreq);
 		if (recipients.length == 0) {
 			return errorNoRecipients();
@@ -85,7 +85,7 @@ public class ContactMailController extends FreemarkerHttpServlet {
 		if ( errorMsg != null) {
 			return errorParametersNotValid(errorMsg, webusername, webuseremail, comments);
 		}
-		
+
 		String spamReason = checkForSpam(comments, formType);
 		if (spamReason != null) {
 			return errorSpam();
@@ -99,7 +99,7 @@ public class ContactMailController extends FreemarkerHttpServlet {
 		if ((contactMailAddresses == null) || contactMailAddresses.isEmpty()) {
 			return new String[0];
 		}
-		
+
 		return contactMailAddresses.split(",");
 	}
 
@@ -113,15 +113,15 @@ public class ContactMailController extends FreemarkerHttpServlet {
 
 	    String originalReferer = getOriginalRefererFromSession(vreq);
 
-	    String msgText = composeEmail(webusername, webuseremail, comments, 
+	    String msgText = composeEmail(webusername, webuseremail, comments,
 	    		deliveryfrom, originalReferer, vreq.getRemoteAddr(), vreq);
-	    
+
 	    try {
 	    	// Write the message to the journal file
 	    	FileWriter fw = new FileWriter(locateTheJournalFile(), true);
-	        PrintWriter outFile = new PrintWriter(fw); 
+	        PrintWriter outFile = new PrintWriter(fw);
 	        writeBackupCopy(outFile, msgText, vreq);
-  
+
 	        try {
 	        	// Send the message
 	        	Session s = FreemarkerEmailFactory.getEmailSession(vreq);
@@ -144,17 +144,17 @@ public class ContactMailController extends FreemarkerHttpServlet {
 	        outFile.close();
 	    }
 	    catch (IOException e){
-	    	log.error("Can't open file to write email backup");                   
-	    }         
-	    
-	    if (statusMsg == null) {                  
+	    	log.error("Can't open file to write email backup");
+	    }
+
+	    if (statusMsg == null) {
 	    	// Message was sent successfully
 	    	return new TemplateResponseValues(TEMPLATE_CONFIRMATION);
 	    } else {
 	    	Map<String, Object> body = new HashMap<String, Object>();
 	        body.put("errorMessage", statusMsg);
 			return new TemplateResponseValues(TEMPLATE_ERROR, body);
-	    }   
+	    }
 	}
 
 	/**
@@ -179,14 +179,14 @@ public class ContactMailController extends FreemarkerHttpServlet {
 
 
 	private String getOriginalRefererFromSession(VitroRequest vreq) {
-		String originalReferer = (String) vreq.getSession().getAttribute("contactFormReferer");        		
+		String originalReferer = (String) vreq.getSession().getAttribute("contactFormReferer");
 	    if (originalReferer != null) {
 	    	vreq.getSession().removeAttribute("contactFormReferer");
 	    	/* does not support legitimate clients that don't send the Referer header
 	    	  String referer = request.getHeader("Referer");
-	          if (referer == null || 
-	          		(referer.indexOf("comments") <0 
-	          		  && referer.indexOf("correction") <0) ) {    
+	          if (referer == null ||
+	          		(referer.indexOf("comments") <0
+	          		  && referer.indexOf("correction") <0) ) {
 	              spamReason = "The form was not submitted from the " +
 	              			   "Contact Us or Corrections page.";
 	              statusMsg = SPAM_MESSAGE;
@@ -206,15 +206,15 @@ public class ContactMailController extends FreemarkerHttpServlet {
         else
             return in.replaceAll("http://", "host: " );
     }
-    
+
     private String composeEmail(String webusername, String webuseremail,
     							String comments, String deliveryfrom,
     							String originalReferer, String ipAddr,
     							HttpServletRequest request) {
- 
+
         Map<String, Object> email = new HashMap<String, Object>();
-        String template = TEMPLATE_EMAIL; 
-        
+        String template = TEMPLATE_EMAIL;
+
         email.put("subject", deliveryfrom);
         email.put("name", webusername);
         email.put("emailAddress", webuseremail);
@@ -223,37 +223,37 @@ public class ContactMailController extends FreemarkerHttpServlet {
         if ( !(originalReferer == null || originalReferer.equals("none")) ) {
             email.put("referrer", UrlBuilder.urlDecode(originalReferer));
         }
-    	
+
         try {
             return processTemplateToString(template, email, request);
         } catch (TemplateProcessingException e) {
             log.error("Error processing email text through template: " + e.getMessage(), e);
-            return null;            
+            return null;
         }
     }
-    
-    private void writeBackupCopy(PrintWriter outFile, String msgText, 
+
+    private void writeBackupCopy(PrintWriter outFile, String msgText,
     		HttpServletRequest request) {
 
         Map<String, Object> backup = new HashMap<String, Object>();
-        String template = TEMPLATE_BACKUP; 
-        
+        String template = TEMPLATE_BACKUP;
+
     	Calendar cal = Calendar.getInstance();
     	backup.put("datetime", cal.getTime().toString());
         backup.put("msgText", msgText);
-        
+
         try {
             String backupText = processTemplateToString(template, backup, request);
             outFile.print(backupText);
             outFile.flush();
-            //outFile.close(); 
+            //outFile.close();
         } catch (TemplateProcessingException e) {
             log.error("Error processing backup text throug template: " + e.getMessage(), e);
         }
     }
-    
+
     private void sendMessage(Session s, String webuseremail, String webusername,
-    		String[] recipients, String deliveryfrom, String msgText) 
+    		String[] recipients, String deliveryfrom, String msgText)
     		throws AddressException, SendFailedException, MessagingException {
         // Construct the message
         MimeMessage msg = new MimeMessage( s );
@@ -294,7 +294,7 @@ public class ContactMailController extends FreemarkerHttpServlet {
         Transport.send( msg ); // try to send the message via smtp - catch error exceptions
 
     }
-    
+
 	private String nonNullAndTrim(HttpServletRequest req, String key) {
 		String value = req.getParameter(key);
 		return (value == null) ? "" : value.trim();
@@ -302,30 +302,30 @@ public class ContactMailController extends FreemarkerHttpServlet {
 
     private String validateInput(String webusername, String webuseremail,
     							 String comments, String captchaInput, String captchaDisplay) {
-    	
+
         if( webusername.isEmpty() ){
             return "Please enter a value in the Full name field.";
-        } 
+        }
 
         if( webuseremail.isEmpty() ){
             return "Please enter a valid email address.";
-        } 
+        }
 
-        if (comments.isEmpty()) { 
+        if (comments.isEmpty()) {
             return "Please enter your comments or questions in the space provided.";
-        } 
-        
-        if (captchaInput.isEmpty()) { 
+        }
+
+        if (captchaInput.isEmpty()) {
             return "Please enter the contents of the gray box in the security field provided.";
-        } 
-        
+        }
+
 		if ( !captchaHash(captchaInput).equals(captchaDisplay) ) {
 			return "The value you entered in the security field did not match the letters displayed in the gray box.";
 		}
 
         return null;
     }
-    
+
     /**
      * @return null if message not judged to be spam, otherwise a String
      * containing the reason the message was flagged as spam.
@@ -349,11 +349,11 @@ public class ContactMailController extends FreemarkerHttpServlet {
         if (comments.length()<15) {
             return "The message was too short.";
         }
-        
+
         return null;
-        
+
     }
-    
+
 	private String captchaHash(String value) {
 		int hash = 5381;
 		value = value.toUpperCase();
@@ -365,12 +365,12 @@ public class ContactMailController extends FreemarkerHttpServlet {
 
 	private ResponseValues errorNoSmtpServer() {
         Map<String, Object> body = new HashMap<String, Object>();
-        body.put("errorMessage", 
+        body.put("errorMessage",
                 "This application has not yet been configured to send mail. " +
                 "Email properties must be specified in the configuration properties file.");
 		return new TemplateResponseValues(TEMPLATE_ERROR, body);
 	}
-    
+
 	private ResponseValues errorNoRecipients() {
 		Map<String, Object> body = new HashMap<String, Object>();
 		body.put("errorMessage", "To establish the Contact Us mail capability "
@@ -378,7 +378,7 @@ public class ContactMailController extends FreemarkerHttpServlet {
 				+ "at least one email address.");
 		return new TemplateResponseValues(TEMPLATE_ERROR, body);
 	}
-	
+
 	private ResponseValues errorParametersNotValid(String errorMsg, String webusername, String webuseremail, String comments) {
         Map<String, Object> body = new HashMap<String, Object>();
 		body.put("errorMessage", errorMsg);
@@ -388,7 +388,7 @@ public class ContactMailController extends FreemarkerHttpServlet {
 		body.put("comments", comments);
 		return new TemplateResponseValues(TEMPLATE_FORM, body);
 	}
-	
+
 	private ResponseValues errorSpam() {
 		Map<String, Object> body = new HashMap<String, Object>();
 		body.put("errorMessage", SPAM_MESSAGE);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java
index e53e257c4..c62a2c87a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java
@@ -26,13 +26,13 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3EditUtils;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.web.URLEncoder;
 /*
- * Custom deletion controller to which deletion requests from default property form are sent. May be replaced 
+ * Custom deletion controller to which deletion requests from default property form are sent. May be replaced
  * later with additional features in process rdf form controller or alternative location.
  */
 @WebServlet(name = "DeletePropertyController", urlPatterns = {"/deletePropertyController"} )
 public class DeletePropertyController extends FreemarkerHttpServlet {
     private static final Log log = LogFactory.getLog(DeletePropertyController.class);
- 
+
     @Override
 	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
     	return SimplePermission.DO_FRONT_END_EDITING.ACTION ;
@@ -45,7 +45,7 @@ public class DeletePropertyController extends FreemarkerHttpServlet {
     	if(errorMessage != null) {
     		return doErrorMessage(errorMessage);
     	}
-    	
+
     	//handle based on whether object property or data property
     	if(EditConfigurationUtils.isObjectProperty(
     			EditConfigurationUtils.getPredicateUri(vreq), vreq))
@@ -54,12 +54,12 @@ public class DeletePropertyController extends FreemarkerHttpServlet {
     	} else {
     		processDataProperty(vreq);
     	}
-   
+
     	String redirectUrl = getRedirectUrl(vreq);
     	return new RedirectResponseValues(redirectUrl, HttpServletResponse.SC_SEE_OTHER);
     }
-    
-    
+
+
     private String getRedirectUrl(VitroRequest vreq) {
 		// TODO Auto-generated method stub
     	String subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
@@ -81,7 +81,7 @@ public class DeletePropertyController extends FreemarkerHttpServlet {
     	if(subject == null) {
     		return "could not find subject " + EditConfigurationUtils.getSubjectUri(vreq);
     	}
-    	
+
     	//if object property, check object property otherwise check data property
     	String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
     	if(EditConfigurationUtils.isObjectProperty(predicateUri, vreq)) {
@@ -91,14 +91,14 @@ public class DeletePropertyController extends FreemarkerHttpServlet {
     		}
     	} else {
     		DataProperty prop = getDataProperty(vreq);
-    		
+
     		if(prop == null) {
     			return "In delete property controller, could not find data property " + predicateUri;
     		}
     	}
-    	
+
     	return null;
-		
+
 	}
 
 	private DataProperty getDataProperty(VitroRequest vreq) {
@@ -116,16 +116,16 @@ public class DeletePropertyController extends FreemarkerHttpServlet {
 	private TemplateResponseValues doErrorMessage(String errorMessage) {
 		HashMap<String,Object> map = new HashMap<String,Object>();
 	   	map.put("errorMessage", errorMessage);
-	   	return new TemplateResponseValues("error-message.ftl", map); 
+	   	return new TemplateResponseValues("error-message.ftl", map);
 	}
-		
+
 
 
 	//process data property
     private void processDataProperty(VitroRequest vreq) {
-    	deleteDataPropertyStatement(vreq);		
+    	deleteDataPropertyStatement(vreq);
     }
-    
+
     private void deleteDataPropertyStatement(VitroRequest vreq) {
     	String subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
 		String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
@@ -133,9 +133,9 @@ public class DeletePropertyController extends FreemarkerHttpServlet {
     	int dataHash = EditConfigurationUtils.getDataHash(vreq);
 		DataPropertyStatement dps = EditConfigurationUtils.getDataPropertyStatement(vreq, vreq.getSession(), dataHash, predicateUri);
 		WebappDaoFactory wdf = vreq.getWebappDaoFactory();
-		
-		
-		
+
+
+
 		if(dps != null) {
 			logDataPropertyDeletionMessages(dps);
 			processDataPropertyStatement(dps, subjectUri, predicateUri);
@@ -164,14 +164,14 @@ public class DeletePropertyController extends FreemarkerHttpServlet {
         log.debug( "predicateURI <" + dps.getDatapropURI() + ">");
         log.debug( "literal \"" + dps.getData() + "\"" );
         log.debug( "lang @" + (dps.getLanguage() == null ? "null" : dps.getLanguage()));
-        log.debug( "datatype ^^" + (dps.getDatatypeURI() == null ? "null" : dps.getDatatypeURI() ));       
-		
+        log.debug( "datatype ^^" + (dps.getDatatypeURI() == null ? "null" : dps.getDatatypeURI() ));
+
 	}
 
 	//process object property
     private void processObjectProperty(VitroRequest vreq) {
     	ObjectProperty prop = EditConfigurationUtils.getObjectProperty(vreq);
-    	    	
+
     	//if this property is true, it means the object needs to be deleted along with statement
     	//while the second test is to see if a different object uri (i.e. not the direct objet of the predicate)
     	//needs to be deleted
@@ -179,13 +179,13 @@ public class DeletePropertyController extends FreemarkerHttpServlet {
     	{
     		deleteObjectIndividual(vreq);
     	}
-    	
+
     	if(!hasDeleteObjectUri(vreq)) {
     		deleteObjectPropertyStatement(vreq);
     	}
-		
+
     }
-    
+
     private void deleteObjectPropertyStatement(VitroRequest vreq) {
 		WebappDaoFactory wdf = vreq.getWebappDaoFactory();
 		String objectUri = EditConfigurationUtils.getObjectUri(vreq);
@@ -196,17 +196,17 @@ public class DeletePropertyController extends FreemarkerHttpServlet {
 	}
 
 	private Individual getObjectIndividualForDeletion(VitroRequest vreq, String objectUri) {
-    
+
     	Individual object = EditConfigurationUtils.getIndividual(vreq, objectUri);
     	if(object == null) {
 			WebappDaoFactory wadf = ModelAccess.on(vreq.getSession().getServletContext()).getWebappDaoFactory();
     		object = wadf.getIndividualDao().getIndividualByURI(objectUri);
     	}
-    	
+
     	return object;
-    	
+
     }
-    
+
     private void deleteObjectIndividual(VitroRequest vreq) {
     	String objectUri = EditConfigurationUtils.getObjectUri(vreq);
     	if(hasDeleteObjectUri(vreq)) {
@@ -223,21 +223,21 @@ public class DeletePropertyController extends FreemarkerHttpServlet {
     		log.error("could not find object as request attribute or in model " + objectUri);
     	}
     }
-    
+
     //This checks if the object uri is not the individual to be deleted but another individual connected
     private String getDeleteObjectUri(VitroRequest vreq) {
     	return (String) vreq.getParameter("deleteObjectUri");
     }
-    
+
     private boolean hasDeleteObjectUri(VitroRequest vreq) {
     	String deleteObjectUri = getDeleteObjectUri(vreq);
     	return (deleteObjectUri != null && !deleteObjectUri.isEmpty());
     }
 
-    
 
-    
-    
-    
-    
+
+
+
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DelimitingTemplateLoader.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DelimitingTemplateLoader.java
index 4d9242ad0..88b61a1b7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DelimitingTemplateLoader.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DelimitingTemplateLoader.java
@@ -15,12 +15,12 @@ import freemarker.cache.TemplateLoader;
  * Wrap a TemplateLoader, so each time a template is read, delimiters will be
  * inserted at the beginning and end. This makes it easier for a developer can
  * see what lines of HTML come from which templates.
- * 
+ *
  * TemplateLoader returns a token object when finding a template, and then
  * recognizes that object when it is used as an argument to getLastModified() or
  * getReader(). In order to keep track of the template name, we wrap the token
  * object and the name in a token of our own.
- * 
+ *
  * Taking the easy way out and reading in the entire template into a string.
  * This limits the template size to less than 2^31 characters (~2 GBytes). That
  * seems adequate.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DumpTestController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DumpTestController.java
index 00fa6abdc..4848d81c9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DumpTestController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DumpTestController.java
@@ -38,44 +38,44 @@ public class DumpTestController extends FreemarkerHttpServlet {
 
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
-        
+
         Map<String, Object> body = new HashMap<String, Object>();
-        
+
         body.put("title", "Freemarker Test");
-        
+
         body.put("dog", "Rover");
         body.put("int", 7);
         body.put("bool", false);
         body.put("now", new Date());
-        
+
         java.sql.Date date = new java.sql.Date(1302297332043L);
         body.put("date", date);
-        
+
         Time time = new Time(1302297332043L);
         body.put("time", time);
-        
+
         Timestamp ts = new Timestamp(1302297332043L);
         body.put("timestamp", ts);
-        
+
         // List of strings
         List<String> fruit = new ArrayList<String>();
         fruit.add("apples");
         fruit.add("bananas");
         fruit.add("peaches");
         body.put("fruit", fruit);
-        
+
         // Mixed list
         List<Object> mixedList = new ArrayList<Object>();
-        
+
         String myString = "apples";
         mixedList.add(myString);
-        
+
         int myInt = 4;
         mixedList.add(myInt);
-        
+
         boolean myBool = true;
         mixedList.add(myBool);
-        
+
         List<String> myList = new ArrayList<String>();
         myList.add("dog");
         myList.add("cat");
@@ -91,7 +91,7 @@ public class DumpTestController extends FreemarkerHttpServlet {
             }
         }
         body.put("oddNums", new SimpleCollection(odds));
-        
+
         // String-string map
         Map<String, String> myMap = new HashMap<String, String>();
         myMap.put("Albany", "New York");
@@ -100,14 +100,14 @@ public class DumpTestController extends FreemarkerHttpServlet {
         myMap.put("Sacramento", "California");
         myMap.put("Richmond", "Virginia");
         body.put("capitals", myMap);
-        
-        
+
+
         // Mixed map
         Map<String, Object> mixedMap = new HashMap<String, Object>();
-        
-        mixedMap.put("myString", myString);        
+
+        mixedMap.put("myString", myString);
         mixedMap.put("myBoolean", myBool);
-        mixedMap.put("myNumber", myInt);        
+        mixedMap.put("myNumber", myInt);
         Date myDate = new Date();
         mixedMap.put("myDate", myDate);
         mixedMap.put("myList", myList);
@@ -125,18 +125,18 @@ public class DumpTestController extends FreemarkerHttpServlet {
             e.printStackTrace();
         }
 
-        return new TemplateResponseValues(TEMPLATE_DEFAULT, body);       
+        return new TemplateResponseValues(TEMPLATE_DEFAULT, body);
     }
-    
+
     @Override
     protected String getTitle(String siteName, VitroRequest vreq) {
         return "Test";
     }
 
     public static class Employee {
-        
+
         private static int count = 0;
-        
+
         private String firstName;
         private String lastName;
         private String nickname;
@@ -147,7 +147,7 @@ public class DumpTestController extends FreemarkerHttpServlet {
         private List<String> favoriteColors;
         private Employee supervisor;
         private float salary;
-        
+
         Employee(String firstName, String lastName, int id, Date birthdate) {
             this.firstName = firstName;
             this.lastName = lastName;
@@ -167,11 +167,11 @@ public class DumpTestController extends FreemarkerHttpServlet {
         void setSalary(float salary) {
             this.salary = salary;
         }
-        
+
         public void setNickname(String nickname) {
             this.nickname = nickname;
         }
-         
+
         public void setFavoriteColors(String...colors) {
             Collections.addAll(favoriteColors, colors);
         }
@@ -179,21 +179,21 @@ public class DumpTestController extends FreemarkerHttpServlet {
         float getSalary() {
             return salary;
         }
-        
+
         public static int getEmployeeCount() {
             return count;
         }
-        
+
         /*  Public accessor methods for templates */
-        
+
         public String getFullName() {
             return firstName + " " + lastName;
         }
-        
+
         public String getName(String which) {
             return "first".equals(which) ? firstName : lastName;
         }
-        
+
         public String getMiddleName() {
             return middleName;
         }
@@ -201,19 +201,19 @@ public class DumpTestController extends FreemarkerHttpServlet {
         public String getNickname() {
             return nickname;
         }
-        
+
         public Date getBirthdate() {
             return birthdate;
         }
-        
+
         public int getId() {
             return id;
-        }      
-        
+        }
+
         public boolean isMarried() {
             return married;
         }
- 
+
         @Deprecated
         public int getFormerId() {
             return id % 10000;
@@ -222,12 +222,12 @@ public class DumpTestController extends FreemarkerHttpServlet {
         public Employee getSupervisor() {
             return supervisor;
         }
-        
+
         public List<String> getFavoriteColors() {
             return favoriteColors;
         }
     }
-    
+
     private Employee getEmployee() {
 
         Calendar c = Calendar.getInstance();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerComponentGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerComponentGenerator.java
index 1478db39c..04bcb29ad 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerComponentGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerComponentGenerator.java
@@ -17,7 +17,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.TemplateProcessing
 /**
  * TEMPORARY for transition from JSP to FreeMarker. Once transition
  * is complete and no more pages are generated in JSP, this can be removed.
- * 
+ *
  * @author rjy7
  *
  */
@@ -25,15 +25,15 @@ public class FreemarkerComponentGenerator extends FreemarkerHttpServlet {
 
     private static final long serialVersionUID = 1L;
     private static final Log log = LogFactory.getLog(FreemarkerComponentGenerator.class);
-    
+
     private static ServletContext context = null;
-    
+
     FreemarkerComponentGenerator(HttpServletRequest request) {
-   
+
         // Mimic what FreemarkerHttpServlet does for a new request
-        VitroRequest vreq = new VitroRequest(request);       
+        VitroRequest vreq = new VitroRequest(request);
         Map<String, Object> map = getPageTemplateValues(vreq);
-        
+
         request.setAttribute("ftl_head", getHead("head", map, vreq));
         request.setAttribute("ftl_identity", get("identity", map, vreq));
         request.setAttribute("ftl_menu", get("menu", map, vreq));
@@ -51,16 +51,16 @@ public class FreemarkerComponentGenerator extends FreemarkerHttpServlet {
             return null;
         }
     }
-    
+
     private String getHead(String templateName, Map<String, Object> root, HttpServletRequest request) {
         // The Freemarker head template displays the page title in the <title> tag. Get the value out of the request.
         String title = (String) request.getAttribute("title");
         if (!StringUtils.isEmpty(title)) {
             root.put("title", title);
         }
-        return get(templateName, root, request);        
+        return get(templateName, root, request);
     }
-    
+
     // JB Because this is pretending to be a servlet, but the init method has not been called, providing the context.
     // Do that in the constructor, and we should be fine. VIVO-251
     // RY We need the servlet context in getConfig(). For some reason using the method inherited from
@@ -69,7 +69,7 @@ public class FreemarkerComponentGenerator extends FreemarkerHttpServlet {
     public ServletContext getServletContext() {
         return context;
     }
-    
+
     protected static void setServletContext(ServletContext sc) {
         context = sc;
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
index ab339e3d8..bc7766e83 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
@@ -55,16 +55,16 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
 
     private static final long serialVersionUID = 1L;
     private static final Log log = LogFactory.getLog(FreemarkerHttpServlet.class);
-  
+
     public static final String PAGE_TEMPLATE_TYPE = "page";
     public static final String BODY_TEMPLATE_TYPE = "body";
 
     protected enum Template {
-        
+
         SETUP("setup.ftl"),
-        
+
         PAGE_DEFAULT("page.ftl"),
-        
+
         // error templates
         ERROR_DISPLAY("error-display.ftl"),
         ERROR_EMAIL("error-email.ftl"),
@@ -76,9 +76,9 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
         MESSAGE("message.ftl"),
         TITLED_MESSAGE("message-titled.ftl");
 
-        
+
         private final String filename;
-        
+
         Template(String filename) {
             this.filename = filename;
         }
@@ -87,26 +87,26 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
             return filename;
         }
     }
-    
+
     @Override
 	public void doGet( HttpServletRequest request, HttpServletResponse response )
         throws IOException, ServletException {
-        
-        super.doGet(request,response);   
-        
+
+        super.doGet(request,response);
+
         VitroRequest vreq = new VitroRequest(request);
         ResponseValues responseValues = null;
-        
+
     	try {
 
-            // This method does a redirect if the required authorizations are not met, so just return. 
+            // This method does a redirect if the required authorizations are not met, so just return.
             if (!isAuthorizedToDisplayPage(request, response, requiredActions(vreq))) {
                 return;
             }
-            
-			responseValues = processRequest(vreq);			
-	        doResponse(vreq, response, responseValues);	 
-	        
+
+			responseValues = processRequest(vreq);
+	        doResponse(vreq, response, responseValues);
+
     	} catch (Throwable e) {
     	    if (e instanceof IOException || e instanceof ServletException) {
     	        try {
@@ -118,7 +118,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
     	    handleException(vreq, response, e);
     	}
     }
-    
+
     /** In case of a processing error, display an error page. To an authorized user, the page displays
      * details of the error. Otherwise, these details are sent to the site administrator.
      */
@@ -127,18 +127,18 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
             Map<String, Object> templateMap = new HashMap<String, Object>();
             String templateName = Template.ERROR_DISPLAY.toString();
             int statusCode = HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
-            
+
             // adminErrorData will be viewable only by an admin, either on the
             // page or in an email.
-            Map<String, Object> adminErrorData = new HashMap<String, Object>();            
+            Map<String, Object> adminErrorData = new HashMap<String, Object>();
 
             StringBuffer requestedUrl = vreq.getRequestURL();
-            String queryString = vreq.getQueryString();   
+            String queryString = vreq.getQueryString();
             if (queryString != null) {
                 requestedUrl.append(queryString);
             }
             adminErrorData.put("requestedUrl", requestedUrl);
-            
+
             String errorMessage = t.getMessage();
             adminErrorData.put("errorMessage", errorMessage);
 
@@ -146,44 +146,44 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
             t.printStackTrace(new PrintWriter(sw));
             String stackTrace = sw.toString();
             adminErrorData.put("stackTrace", stackTrace);
-            
+
             sw = new StringWriter();
             Throwable c = t.getCause();
             String cause;
             if (c != null) {
                 c.printStackTrace(new PrintWriter(sw));
                 cause = sw.toString();
-               
+
             } else {
                 cause = "";
             }
             adminErrorData.put("cause", cause);
-            
+
             adminErrorData.put("datetime", new Date());
 
             templateMap.put("errorOnHomePage", this instanceof HomePageController);
-            
+
             boolean sentEmail = false;
-            
+
             // If the user is authorized, display the error data on the page
-            if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION)) {                              
-                templateMap.put("adminErrorData", adminErrorData);   
-                
+            if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION)) {
+                templateMap.put("adminErrorData", adminErrorData);
+
             // Else send the data to the site administrator
             } else if (FreemarkerEmailFactory.isConfigured(vreq)) {
                 FreemarkerEmailMessage email = FreemarkerEmailFactory.createNewMessage(vreq);
-                email.addRecipient(TO, email.getReplyToAddress());          
+                email.addRecipient(TO, email.getReplyToAddress());
                 email.setTemplate(Template.ERROR_EMAIL.toString());
                 email.setBodyMap(adminErrorData);
                 email.processTemplate();
-                sentEmail = email.send();      
+                sentEmail = email.send();
             }
-            
+
             templateMap.put("sentEmail", sentEmail);
-            
+
             ExceptionResponseValues rv = new ExceptionResponseValues(templateName, templateMap, t, statusCode);
             doResponse(vreq, response, rv);
-            
+
         } catch (TemplateProcessingException e) {
             // We'll get here if the error was in one of the page templates; then attempting
             // to display the error page also generates an error.
@@ -196,31 +196,31 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
         throws ServletException, IOException {
         doGet(request, response);
     }
-   
+
     /**
      * By default, a page requires authorization for no actions.
-     * Subclasses that require authorization to process their page will override 
+     * Subclasses that require authorization to process their page will override
 	 *    to return the actions that require authorization.
 	 * In some cases, the choice of actions will depend on the contents of the request.
 	 *
      * NB This method can't be static, because then the superclass method gets called rather than
      * the subclass method. For the same reason, it can't refer to a static or instance field
      * REQUIRED_ACTIONS which is overridden in the subclass.
-     * 
-     */    
+     *
+     */
     protected AuthorizationRequest requiredActions(VitroRequest vreq) {
         return AUTHORIZED;
     }
-    
+
     // Subclasses will override
     protected ResponseValues processRequest(VitroRequest vreq) throws Exception {
         return null;
     }
-       
-    protected void doResponse(VitroRequest vreq, HttpServletResponse response, 
+
+    protected void doResponse(VitroRequest vreq, HttpServletResponse response,
             ResponseValues values) throws TemplateProcessingException {
         try {
-            
+
             int statusCode = values.getStatusCode();
             if (statusCode > 0) {
                 response.setStatus(statusCode);
@@ -248,44 +248,44 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
 
 	private void doNotAuthorized(VitroRequest vreq,
 			HttpServletResponse response, NotAuthorizedResponseValues values) {
-		// This method does a redirect if the required authorizations are 
+		// This method does a redirect if the required authorizations are
 		// not met (and they won't be), so just return.
 		isAuthorizedToDisplayPage(vreq, response, values.getUnauthorizedAction());
     }
 
-	protected void doTemplate(VitroRequest vreq, HttpServletResponse response, 
+	protected void doTemplate(VitroRequest vreq, HttpServletResponse response,
             ResponseValues values) throws TemplateProcessingException {
-     
-        Map<String, Object> templateDataModel = new HashMap<String, Object>();        
+
+        Map<String, Object> templateDataModel = new HashMap<String, Object>();
         templateDataModel.putAll(getPageTemplateValues(vreq));
 
         // Add the values that we got from the subcontroller processRequest() method, and merge to the template.
         // Subcontroller values (for example, for page title) will override what's already been set at the page
         // level.
         templateDataModel.putAll(values.getMap());
-        
+
         // If a body template is specified, merge it with the template data model.
         String bodyString;
-        String bodyTemplate = values.getTemplateName();        
+        String bodyTemplate = values.getTemplateName();
         if (bodyTemplate != null) {
             // Tell the template and any directives it uses that we're processing a body template.
             templateDataModel.put("templateType", BODY_TEMPLATE_TYPE);
-            bodyString = processTemplateToString(bodyTemplate, templateDataModel, vreq); 
+            bodyString = processTemplateToString(bodyTemplate, templateDataModel, vreq);
         } else {
-            // The subcontroller has not defined a body template. All markup for the page 
+            // The subcontroller has not defined a body template. All markup for the page
             // is specified in the main page template.
             bodyString = "";
         }
         templateDataModel.put("body", bodyString);
-        
+
         // Tell the template and any directives it uses that we're processing a page template.
-        templateDataModel.put("templateType", PAGE_TEMPLATE_TYPE);  
-        
-        writePage(templateDataModel, vreq, response, values.getStatusCode(), values);       
+        templateDataModel.put("templateType", PAGE_TEMPLATE_TYPE);
+
+        writePage(templateDataModel, vreq, response, values.getStatusCode(), values);
     }
-    
-    protected void doRedirect(HttpServletRequest request, HttpServletResponse response, ResponseValues values) 
-        throws ServletException, IOException { 
+
+    protected void doRedirect(HttpServletRequest request, HttpServletResponse response, ResponseValues values)
+        throws ServletException, IOException {
         String redirectUrl = values.getRedirectUrl();
         if( values.getStatusCode() == 0 || values.getStatusCode() == response.SC_FOUND ){
             setResponseStatus(response, values.getStatusCode());
@@ -295,15 +295,15 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
             response.setHeader("Location", redirectUrl);
         }
     }
-    
+
     private void setResponseStatus(HttpServletResponse response, int statusCode) {
         if (statusCode > 0) {
             response.setStatus(statusCode);
         }
     }
-    
-    protected void doForward(HttpServletRequest request, HttpServletResponse response, ResponseValues values) 
-        throws ServletException, IOException {        
+
+    protected void doForward(HttpServletRequest request, HttpServletResponse response, ResponseValues values)
+        throws ServletException, IOException {
         String forwardUrl = values.getForwardUrl();
         if (forwardUrl.contains("://")) {
             // It's a full URL, so redirect.
@@ -313,13 +313,13 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
             request.getRequestDispatcher(forwardUrl).forward(request, response);
         }
     }
-    
-    protected void doRdf(HttpServletRequest request, HttpServletResponse response, ResponseValues values) 
+
+    protected void doRdf(HttpServletRequest request, HttpServletResponse response, ResponseValues values)
         throws IOException {
-        
+
         String mediaType = values.getContentType().getMediaType();
         response.setContentType(mediaType);
-                
+
         String format = "";
         if ( RDFXML_MIMETYPE.equals(mediaType)) {
             format = "RDF/XML";
@@ -333,10 +333,10 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
         values.getModel().write( response.getOutputStream(), format );
     }
 
-    protected void doException(VitroRequest vreq, HttpServletResponse response, 
+    protected void doException(VitroRequest vreq, HttpServletResponse response,
             ResponseValues values) throws TemplateProcessingException {
-        // Log the error, and display an error message on the page.        
-        log.error(values.getException(), values.getException());      
+        // Log the error, and display an error message on the page.
+        log.error(values.getException(), values.getException());
         doTemplate(vreq, response, values);
     }
 
@@ -351,24 +351,24 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
 	 */
     private Map<String, Object> buildRequestUrls(VitroRequest vreq) {
         Map<String, Object> requestUrls = new HashMap<String, Object>();
-    	
+
         Configuration config = FreemarkerConfiguration.getConfig(vreq);
         TemplateModel urlModel = config.getSharedVariable("urls");
-        
+
         try {
             @SuppressWarnings("unchecked")
 			Map<String, Object> configUrls = (Map<String, Object>) DeepUnwrap.permissiveUnwrap(urlModel);
 			requestUrls.putAll(configUrls);
-            
+
             // This is request-specific because email can be configured
-            // and de-configured in the application interface. 
+            // and de-configured in the application interface.
             if (FreemarkerEmailFactory.isConfigured(vreq)) {
                 requestUrls.put("contact", UrlBuilder.getUrl(Route.CONTACT));
-            }      
-            
+            }
+
             requestUrls.put("currentPage", getCurrentPageUrl(vreq));
             requestUrls.put("referringPage", getReferringPageUrl(vreq));
-            
+
             if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.EDIT_OWN_ACCOUNT.ACTION)) {
             	requestUrls.put("myAccount", UrlBuilder.getUrl("/accounts/myAccount"));
             }
@@ -377,17 +377,17 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
         }
         return requestUrls;
     }
-    
+
     private String getCurrentPageUrl(HttpServletRequest request) {
         String path = request.getServletPath().replaceFirst("/", "");
         String pathInfo = request.getPathInfo();
         if (pathInfo != null) {
             path += pathInfo;
         }
-        path = normalizeServletName(path);        
+        path = normalizeServletName(path);
         return UrlBuilder.getUrl(path);
     }
-    
+
     private String getReferringPageUrl(HttpServletRequest request) {
 		String referrer = request.getHeader("referer");
 		return (referrer == null) ? UrlBuilder.getHomeUrl() : referrer;
@@ -397,11 +397,11 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
         BeansWrapper wrapper = getBeansWrapper(exposureLevel);
         return wrapper.wrap(obj);
     }
-    
+
     protected TemplateModel wrap(Object obj, BeansWrapper wrapper) throws TemplateModelException {
         return wrapper.wrap(obj);
     }
-    
+
     protected BeansWrapper getBeansWrapper(int exposureLevel) {
         BeansWrapper wrapper = new DefaultObjectWrapper();
         wrapper.setExposureLevel(exposureLevel);
@@ -410,26 +410,26 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
 
     /** Add variables that are needed to generate the page template (they will also be accessible
      *  to the body template). These are specific to the request, so are not defined as
-     *  shared variables in the Configuration. (Though we could reset them like other 
+     *  shared variables in the Configuration. (Though we could reset them like other
      *  shared variables. These variables are not needed outside the page and body templates,
      *  however. If they are needed elsewhere, add to shared variables.
      */
     // RY This is protected instead of private so FreeMarkerComponentGenerator can access.
     // Once we don't need that (i.e., jsps have been eliminated) it can be made private.
     protected Map<String, Object> getPageTemplateValues(VitroRequest vreq) {
-        
+
         Map<String, Object> map = new HashMap<String, Object>();
-        
+
         ApplicationBean appBean = vreq.getAppBean();
         // This may be overridden by the body data model received from the subcontroller.
         map.put("title", getTitle(vreq.getAppBean().getApplicationName(), vreq));
 
         map.put("siteName", vreq.getAppBean().getApplicationName());
-        
+
         map.put("urls", buildRequestUrls(vreq));
 
         map.put("menu", getDisplayModelMenu(vreq));
-        
+
         map.put("user", new User(vreq));
 
         String flashMessage = DisplayMessage.getMessageAndClear(vreq);
@@ -441,30 +441,30 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
         map.put("currentServlet", normalizeServletName(vreq.getServletPath().replaceFirst("/", "")));
         // NIHVIVO-3307: we need this here instead of FreemarkerConfiguration.java so that updates to
         // the copyright text can be viewed with having to restart Tomcat
-        map.put("copyright", getCopyrightInfo(appBean));    
-        
-        // Add these accumulator objects. They will collect tags so the template can write them 
+        map.put("copyright", getCopyrightInfo(appBean));
+
+        // Add these accumulator objects. They will collect tags so the template can write them
         // at the appropriate location.
         map.put("stylesheets", new Tags().wrap());
         map.put("scripts", new Tags().wrap());
         map.put("headScripts", new Tags().wrap());
         map.put("metaTags", new Tags().wrap());
 
-        return map;        
-    }  
-    
+        return map;
+    }
+
     private String normalizeServletName(String name) {
         // Return a uniform value for the home page.
         // Note that if servletName is "index.jsp", it must be the home page,
         // since we don't get here on other tabs.
         return (name.length() == 0 || name.equals("index.jsp")) ? "home" : name;
     }
-    
+
     protected MainMenu getDisplayModelMenu(VitroRequest vreq){
         String url = vreq.getRequestURI().substring(vreq.getContextPath().length());
         return vreq.getWebappDaoFactory().getMenuDao().getMainMenu(vreq, url);
     }
-    
+
     // NIHVIVO-3307: we need this here instead of FreemarkerConfiguration.java so that updates to
     // the copyright text can be viewed with having to restart Tomcat
     private final Map<String, Object> getCopyrightInfo(ApplicationBean appBean) {
@@ -479,70 +479,70 @@ public class FreemarkerHttpServlet extends VitroHttpServlet  {
             //SimpleDate thisYear = new SimpleDate(Calendar.getInstance().getTime(), TemplateDateModel.DATE); // use ${copyrightYear?string("yyyy")} in template
             copyright.put("year", thisYear);
             copyright.put("url", appBean.getCopyrightURL());
-        } 
+        }
         return copyright;
     }
 
     // Subclasses may override. This serves as a default.
-    protected String getTitle(String siteName, VitroRequest vreq) {        
+    protected String getTitle(String siteName, VitroRequest vreq) {
         return siteName;
     }
 
-    protected StringWriter processTemplate(String templateName, Map<String, Object> map, 
+    protected StringWriter processTemplate(String templateName, Map<String, Object> map,
             HttpServletRequest request) throws TemplateProcessingException {
         TemplateProcessingHelper helper = new TemplateProcessingHelper(request);
         return helper.processTemplate(templateName, map);
     }
-    
+
     // In fact, we can put StringWriter objects directly into the data model, so perhaps we should eliminate the processTemplateToString() methods.
-    protected String processTemplateToString(String templateName, Map<String, Object> map, 
+    protected String processTemplateToString(String templateName, Map<String, Object> map,
             HttpServletRequest request) throws TemplateProcessingException {
         return processTemplate(templateName, map, request).toString();
     }
-  
+
     protected void writePage(Map<String, Object> root, HttpServletRequest request,
             HttpServletResponse response, int statusCode, ResponseValues rv) throws TemplateProcessingException {
-        
+
         // For an error page, use the standard page template rather than a special one, in case that is the source
         // of the error. (The standard page template could also be the source of the error, but that is
         // less likely.
-        String pageTemplateName = 
+        String pageTemplateName =
             rv instanceof ExceptionResponseValues ? Template.PAGE_DEFAULT.toString() : getPageTemplateName();
-        writeTemplate(pageTemplateName, root, request, response, statusCode);                   
+        writeTemplate(pageTemplateName, root, request, response, statusCode);
     }
-    
-    protected void writeTemplate(String templateName, Map<String, Object> map, 
-            HttpServletRequest request, HttpServletResponse response) throws TemplateProcessingException { 
+
+    protected void writeTemplate(String templateName, Map<String, Object> map,
+            HttpServletRequest request, HttpServletResponse response) throws TemplateProcessingException {
         writeTemplate(templateName, map, request, response, 0);
     }
 
     protected void writeTemplate(String templateName, Map<String, Object> map,
-            HttpServletRequest request, HttpServletResponse response, int statusCode) throws TemplateProcessingException {       
-        StringWriter sw = processTemplate(templateName, map, request);     
+            HttpServletRequest request, HttpServletResponse response, int statusCode) throws TemplateProcessingException {
+        StringWriter sw = processTemplate(templateName, map, request);
         write(sw, response, statusCode);
     }
-    
-    protected void write(StringWriter sw, HttpServletResponse response, int statusCode) {        
+
+    protected void write(StringWriter sw, HttpServletResponse response, int statusCode) {
         try {
             setResponseStatus(response, statusCode);
             PrintWriter out = response.getWriter();
-            out.print(sw);     
+            out.print(sw);
         } catch (IOException e) {
             log.error("FreeMarkerHttpServlet cannot write output", e);
-        }            
+        }
     }
-    
+
     // Can be overridden by individual controllers to use a different basic page layout.
     protected String getPageTemplateName() {
         return Template.PAGE_DEFAULT.toString();
     }
 
-    // TEMPORARY method for transition from JSP to Freemarker. 
+    // TEMPORARY method for transition from JSP to Freemarker.
     // It's a static method because it needs to be called from JSPs that don't go through a servlet.
     public static void getFreemarkerComponentsForJsp(HttpServletRequest request) {
         // We need to create a FreeMarkerHttpServlet object in order to call the instance methods
         // to set up the data model.
         new FreemarkerComponentGenerator(request);
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerSetup.java
index f7355bc0f..2314d6c67 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerSetup.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerSetup.java
@@ -10,15 +10,15 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 public class FreemarkerSetup implements ServletContextListener {
-    
+
     private static final Log log = LogFactory.getLog(FreemarkerSetup.class);
 
 	@Override
-	public void contextInitialized(ServletContextEvent event) {	
-		ServletContext sc = event.getServletContext();	
+	public void contextInitialized(ServletContextEvent event) {
+		ServletContext sc = event.getServletContext();
         FreemarkerComponentGenerator.setServletContext(sc);
 		UrlBuilder.contextPath = sc.getContextPath();
-		
+
 		log.info("Freemarker templating system initialized.");
 	}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java
index d327571e2..6f59dbd42 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java
@@ -28,35 +28,35 @@ public class HomePageController extends FreemarkerHttpServlet {
     private static final String BODY_TEMPLATE = "home.ftl";
 
     @Override
-    protected ResponseValues processRequest(VitroRequest vreq) throws InstantiationException, IllegalAccessException, ClassNotFoundException, NoSuchMethodException, InvocationTargetException { 
-        
-        Map<String, Object> body = new HashMap<String, Object>();    
-        
+    protected ResponseValues processRequest(VitroRequest vreq) throws InstantiationException, IllegalAccessException, ClassNotFoundException, NoSuchMethodException, InvocationTargetException {
+
+        Map<String, Object> body = new HashMap<String, Object>();
+
         List<DataGetter> dgList = DataGetterUtils.getDataGettersForPage(vreq, vreq.getDisplayModel(), DisplayVocabulary.HOME_PAGE_URI);
 
-        for( DataGetter dg : dgList){            
-            Map<String,Object> moreData = dg.getData(body);            
+        for( DataGetter dg : dgList){
+            Map<String,Object> moreData = dg.getData(body);
             if( moreData != null ){
                 body.putAll(moreData);
             }
-        }    
+        }
         /*
         for(PageDataGetter dataGetter: dataGetters) {
 	        if( dataGetter != null ){
-	            String uriOfPageInDisplayModel = "not defined";            
-	            Map<String, Object> pageData = 
-	                dataGetter.getData(getServletContext(), vreq, 
+	            String uriOfPageInDisplayModel = "not defined";
+	            Map<String, Object> pageData =
+	                dataGetter.getData(getServletContext(), vreq,
 	                        uriOfPageInDisplayModel, body);
 	            if(pageData != null)
-	                body.putAll(pageData);            
+	                body.putAll(pageData);
 	        }
         }*/
         body.put("dataServiceUrlVClassesForVClassGroup", UrlBuilder.getUrl("/dataservice?getVClassesForVClassGroup=1&classgroupUri="));
 	    body.put("geoFocusMapsEnabled", getGeoFocusMapsFlag(vreq));
-        
+
         return new TemplateResponseValues(BODY_TEMPLATE, body);
     }
-    
+
     @Override
     protected String getTitle(String siteName, VitroRequest vreq) {
         return siteName;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java
index 1ffe091ce..326e4d3ed 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java
@@ -118,7 +118,7 @@ public class ImageUploadController extends FreemarkerHttpServlet {
 		super.init();
 		fileStorage = ApplicationUtils.instance().getFileStorage();
 	}
-	
+
 	/**
 	 * How large an image file will we accept?
 	 */
@@ -144,7 +144,7 @@ public class ImageUploadController extends FreemarkerHttpServlet {
 			String action = vreq.getParameter(PARAMETER_ACTION);
 			Individual entity = validateEntityUri(vreq);
 			String imageUri = entity.getMainImageUri();
-			
+
 			Property indMainImage = new Property();
 			indMainImage.setURI(VitroVocabulary.IND_MAIN_IMAGE);
 
@@ -178,9 +178,9 @@ public class ImageUploadController extends FreemarkerHttpServlet {
 		Individual entity = null;
 		try {
 			entity = validateEntityUri(vreq);
-			
+
 			checkForFileTooBigException(vreq);
-			
+
 			String action = vreq.getParameter(PARAMETER_ACTION);
 			if (ACTION_UPLOAD.equals(action)) {
 				return doUploadImage(vreq, entity);
@@ -388,7 +388,7 @@ public class ImageUploadController extends FreemarkerHttpServlet {
 
 	/**
 	 * The individual has no image - go to the Add Image page.
-	 * 
+	 *
 	 * @param entity
 	 *            if this is null, then all URLs lead to the welcome page.
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadHelper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadHelper.java
index ea2ebc13d..6d0222adf 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadHelper.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadHelper.java
@@ -105,12 +105,12 @@ public class ImageUploadHelper {
 	/**
 	 * The image must be present and non-empty, and must have a mime-type that
 	 * represents an image we support.
-	 * 
+	 *
 	 * We rely on the fact that a FileUploadServletRequest will always
 	 * have a map of {@link FileItem}s, even if it is empty. However, that map
 	 * may not contain the field that we want, or that field may contain an
 	 * empty file.
-	 * 
+	 *
 	 * @throws UserMistakeException
 	 *             if there is no file, if it is empty, or if it is not an image
 	 *             file.
@@ -121,7 +121,7 @@ public class ImageUploadHelper {
 		if (map == null) {
 			throw new IllegalStateException(ERROR_CODE_BAD_MULTIPART_REQUEST);
 		}
-		
+
 		List<FileItem> list = map.get(PARAMETER_UPLOADED_FILE);
 		if ((list == null) || list.isEmpty()) {
 			throw new UserMistakeException(ERROR_CODE_FORM_FIELD_MISSING,
@@ -147,7 +147,7 @@ public class ImageUploadHelper {
 	/**
 	 * The user has uploaded a new main image, but we're not ready to assign it
 	 * to them.
-	 * 
+	 *
 	 * Put it into the file storage system, and attach it as a temp file on the
 	 * session until we need it.
 	 */
@@ -180,7 +180,7 @@ public class ImageUploadHelper {
 
 	/**
 	 * Find out how big this image is.
-	 * 
+	 *
 	 * @throws UserMistakeException
 	 *             if the image is smaller than a thumbnail.
 	 */
@@ -225,7 +225,7 @@ public class ImageUploadHelper {
 
 	/**
 	 * Get the info for the new image, from where we stored it in the session.
-	 * 
+	 *
 	 * @throws UserMistakeException
 	 *             if it isn't there.
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java
index f2aab469e..d246d8f39 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListController.java
@@ -30,38 +30,38 @@ import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.Listed
 
 import javax.servlet.annotation.WebServlet;
 
-/** 
- * Generates a list of individuals for display in a template 
+/**
+ * Generates a list of individuals for display in a template
  */
 @WebServlet(name = "IndividualListController", urlPatterns = {"/individuallist"} )
 public class IndividualListController extends FreemarkerHttpServlet {
-  
-    private static final long serialVersionUID = 1L;   
+
+    private static final long serialVersionUID = 1L;
     private static final Log log = LogFactory.getLog(IndividualListController.class.getName());
-    
+
     private static final int INDIVIDUALS_PER_PAGE = 30;
     private static final int MAX_PAGES = 40;  // must be even
-    
+
     private static final String TEMPLATE_DEFAULT = "individualList.ftl";
 
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
- 
+
         String templateName = TEMPLATE_DEFAULT;
         Map<String, Object> body = new HashMap<String, Object>();
         String errorMessage = null;
-        
+
         try {
             Object obj = vreq.getAttribute("vclass");
             VClass vclass = null;
             if ( obj == null ) { // look for vitroclass id parameter
                 String vitroClassIdStr = vreq.getParameter("vclassId");
-                if ( !StringUtils.isEmpty(vitroClassIdStr)) { 
+                if ( !StringUtils.isEmpty(vitroClassIdStr)) {
                     try {
                         //TODO have to change this so vclass's group and entity count are populated
                         vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(vitroClassIdStr);
                         if (vclass == null) {
-                            log.error("Couldn't retrieve vclass " + vitroClassIdStr);   
+                            log.error("Couldn't retrieve vclass " + vitroClassIdStr);
                             errorMessage = "Class " + vitroClassIdStr + " not found";
                         }
                     } catch (Exception ex) {
@@ -74,15 +74,15 @@ public class IndividualListController extends FreemarkerHttpServlet {
                 throw new HelpException("IndividualListController: attribute 'vclass' must be of type "
                         + VClass.class.getName() + ".");
             }
-            
+
             if (vclass != null) {
-                
+
             	String vclassUri = vclass.getURI();
             	body.put("vclassId", vclassUri);
             	vreq.setAttribute("displayType", vclassUri); // used by the template model object
-            	
-                // Set title and subtitle. 
-                VClassGroup classGroup = vclass.getGroup();  
+
+                // Set title and subtitle.
+                VClassGroup classGroup = vclass.getGroup();
                 String title;
                 if (classGroup == null) {
                     title = vclass.getName();
@@ -91,14 +91,14 @@ public class IndividualListController extends FreemarkerHttpServlet {
                     body.put("subtitle", vclass.getName());
                 }
                 body.put("title", title);
-  
+
                 String alpha = getAlphaParameter(vreq);
                 int page = getPageParameter(vreq);
                 IndividualListResults vcResults = getResultsForVClass(
-                        vclass.getURI(), 
-                        page, 
-                        alpha, 
-                        vreq);                                
+                        vclass.getURI(),
+                        page,
+                        alpha,
+                        vreq);
                 body.putAll(vcResults.asFreemarkerMap());
 
                 List<Individual> inds = vcResults.getEntities();
@@ -108,24 +108,24 @@ public class IndividualListController extends FreemarkerHttpServlet {
                         indsTm.add(ListedIndividualBuilder.build(ind,vreq));
                     }
                 }
-                body.put("individuals", indsTm);    
-                body.put("rdfUrl", UrlBuilder.getUrl("/listrdf", "vclass", vclass.getURI()));    
-            }   
+                body.put("individuals", indsTm);
+                body.put("rdfUrl", UrlBuilder.getUrl("/listrdf", "vclass", vclass.getURI()));
+            }
         } catch (SearchException e) {
             errorMessage = "Error retrieving results for display.";
         } catch (HelpException help){
-            errorMessage = "Request attribute 'vclass' or request parameter 'vclassId' must be set before calling. Its value must be a class uri."; 
+            errorMessage = "Request attribute 'vclass' or request parameter 'vclassId' must be set before calling. Its value must be a class uri.";
         } catch (Throwable e) {
             return new ExceptionResponseValues(e);
         }
-        
+
         if (errorMessage != null) {
             body.put("errorMessage", errorMessage);
         }
-        
+
         return new TemplateResponseValues(templateName, body);
     }
-      
+
     private class HelpException extends Throwable {
         private static final long serialVersionUID = 1L;
 
@@ -133,26 +133,26 @@ public class IndividualListController extends FreemarkerHttpServlet {
             super(string);
         }
     }
-    
+
     public static class SearchException extends Throwable {
         private static final long serialVersionUID = 1L;
-        
+
         public SearchException(String string) {
             super(string);
         }
     }
-    
+
     //TODO: Remove and update reference within JsonServlet
     public static String getAlphaParameter(VitroRequest request){
         return SearchQueryUtils.getAlphaParameter(request);
     }
-    
+
   //TODO: Remove and update reference within JsonServlet
     public static int getPageParameter(VitroRequest request) {
         return SearchQueryUtils.getPageParameter(request);
     }
-    
-    public static IndividualListResults getResultsForVClass(String vclassURI, int page, String alpha, VitroRequest vreq) 
+
+    public static IndividualListResults getResultsForVClass(String vclassURI, int page, String alpha, VitroRequest vreq)
     throws SearchException{
    	 	try{
             List<String> classUris = Collections.singletonList(vclassURI);
@@ -168,7 +168,7 @@ public class IndividualListController extends FreemarkerHttpServlet {
 	   		return IndividualListResults.EMPTY;
 	    }
     }
-    
+
     public static IndividualListResults getResultsForVClassIntersections(List<String> vclassURIs, int page, int pageSize, String alpha, VitroRequest vreq) {
         try{
             IndividualListQueryResults results = buildAndExecuteVClassQuery(vclassURIs, alpha, page, pageSize, vreq.getWebappDaoFactory().getIndividualDao());
@@ -178,7 +178,7 @@ public class IndividualListController extends FreemarkerHttpServlet {
        	    return IndividualListResults.EMPTY;
         }
     }
-	
+
     public static IndividualListResults getRandomResultsForVClass(String vclassURI, int page, int pageSize, VitroRequest vreq) {
    	 	try{
             List<String> classUris = Collections.singletonList(vclassURI);
@@ -198,15 +198,15 @@ public class IndividualListController extends FreemarkerHttpServlet {
         	return new IndividualListResults(hitCount, results.getIndividuals(), alpha, false, Collections.<PageRecord>emptyList());
         }
     }
-     
-    
+
+
     private static IndividualListQueryResults buildAndExecuteVClassQuery(
 			List<String> vclassURIs, String alpha, int page, int pageSize, IndividualDao indDao)
 			throws SearchEngineException {
 		 SearchQuery query = SearchQueryUtils.getQuery(vclassURIs, alpha, page, pageSize);
 		 IndividualListQueryResults results = IndividualListQueryResults.runQuery(query, indDao);
 		 log.debug("Executed search query for " + vclassURIs);
-		 if (results.getIndividuals().isEmpty()) { 
+		 if (results.getIndividuals().isEmpty()) {
 			 log.debug("entities list is null for vclass " + vclassURIs);
 		 }
 		return results;
@@ -218,53 +218,53 @@ public class IndividualListController extends FreemarkerHttpServlet {
 		 SearchQuery query = SearchQueryUtils.getRandomQuery(vclassURIs, page, pageSize);
 		 IndividualListQueryResults results = IndividualListQueryResults.runQuery(query, indDao);
 		 log.debug("Executed search query for " + vclassURIs);
-		 if (results.getIndividuals().isEmpty()) { 
+		 if (results.getIndividuals().isEmpty()) {
 			 log.debug("entities list is null for vclass " + vclassURIs);
 		 }
 		return results;
 	}
 
-    
-    public static List<PageRecord> makePagesList( long size, int pageSize,  int selectedPage , VitroRequest vreq) {        
+
+    public static List<PageRecord> makePagesList( long size, int pageSize,  int selectedPage , VitroRequest vreq) {
 
         List<PageRecord> records = new ArrayList<PageRecord>( MAX_PAGES + 1 );
         int requiredPages = (int) (size/pageSize) ;
-        int remainder = (int) (size % pageSize) ; 
+        int remainder = (int) (size % pageSize) ;
         if( remainder > 0 )
             requiredPages++;
-         
+
         if( selectedPage < MAX_PAGES && requiredPages > MAX_PAGES ){
             //the selected pages is within the first maxPages, just show the normal pages up to maxPages.
             for(int page = 1; page < requiredPages && page <= MAX_PAGES ; page++ ){
-                records.add( new PageRecord( "page=" + page, Integer.toString(page), Integer.toString(page), selectedPage == page ) );            
+                records.add( new PageRecord( "page=" + page, Integer.toString(page), Integer.toString(page), selectedPage == page ) );
             }
             records.add( new PageRecord( "page="+ (MAX_PAGES+1), Integer.toString(MAX_PAGES+1), I18n.text(vreq, "paging_link_more"), false));
         }else if( requiredPages > MAX_PAGES && selectedPage+1 > MAX_PAGES && selectedPage < requiredPages - MAX_PAGES){
             //the selected pages is in the middle of the list of page
             int startPage = selectedPage - MAX_PAGES / 2;
-            int endPage = selectedPage + MAX_PAGES / 2;            
+            int endPage = selectedPage + MAX_PAGES / 2;
             for(int page = startPage; page <= endPage ; page++ ){
-                records.add( new PageRecord( "page=" + page, Integer.toString(page), Integer.toString(page), selectedPage == page ) );            
+                records.add( new PageRecord( "page=" + page, Integer.toString(page), Integer.toString(page), selectedPage == page ) );
             }
             records.add( new PageRecord( "page="+ (endPage+1), Integer.toString(endPage+1), I18n.text(vreq, "paging_link_more"), false));
         }else if ( requiredPages > MAX_PAGES && selectedPage > requiredPages - MAX_PAGES ){
-            //the selected page is in the end of the list 
-            int startPage = requiredPages - MAX_PAGES;      
+            //the selected page is in the end of the list
+            int startPage = requiredPages - MAX_PAGES;
             double max = Math.ceil(size/pageSize);
             for(int page = startPage; page <= max; page++ ){
-                records.add( new PageRecord( "page=" + page, Integer.toString(page), Integer.toString(page), selectedPage == page ) );            
-            }          
+                records.add( new PageRecord( "page=" + page, Integer.toString(page), Integer.toString(page), selectedPage == page ) );
+            }
         }else{
-            //there are fewer than maxPages pages.            
+            //there are fewer than maxPages pages.
             for(int i = 1; i <= requiredPages; i++ ){
-                records.add( new PageRecord( "page=" + i, Integer.toString(i), Integer.toString(i), selectedPage == i ) );            
-             }    
-        }                
+                records.add( new PageRecord( "page=" + i, Integer.toString(i), Integer.toString(i), selectedPage == i ) );
+             }
+        }
         return records;
     }
 
     public static class PageRecord  {
-        public PageRecord(String param, String index, String text, boolean selected) {            
+        public PageRecord(String param, String index, String text, boolean selected) {
             this.param = param;
             this.index = index;
             this.text = text;
@@ -272,7 +272,7 @@ public class IndividualListController extends FreemarkerHttpServlet {
         }
         public String param;
         public String index;
-        public String text;        
+        public String text;
         public boolean selected=false;
 
         public String getParam() {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListQueryResults.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListQueryResults.java
index cc46c7fb0..fe3dcf821 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListQueryResults.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualListQueryResults.java
@@ -21,7 +21,7 @@ import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames;
 
 /**
  * Holds the Individuals that were found in a search query.
- * 
+ *
  * Provides a convenience method to run the query and to find the Individuals.
  */
 public class IndividualListQueryResults {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsController.java
index a06b88709..6647fc98f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsController.java
@@ -29,14 +29,14 @@ import javax.servlet.annotation.WebServlet;
 public class ListClassGroupsController extends FreemarkerHttpServlet {
 
     private static final Log log = LogFactory.getLog(ListClassGroupsController.class.getName());
-    
+
     private static final String TEMPLATE_NAME = "siteAdmin-classHierarchy.ftl";
-        
+
     @Override
 	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
 		return SimplePermission.EDIT_ONTOLOGY.ACTION;
 	}
-    
+
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
 
@@ -48,7 +48,7 @@ public class ListClassGroupsController extends FreemarkerHttpServlet {
 
             VClassGroupDao dao = vreq.getUnfilteredWebappDaoFactory().getVClassGroupDao();
 
-            List<VClassGroup> groups = dao.getPublicGroupsWithVClasses(); 
+            List<VClassGroup> groups = dao.getPublicGroupsWithVClasses();
 
             StringBuilder json = new StringBuilder();
             int counter = 0;
@@ -61,16 +61,16 @@ public class ListClassGroupsController extends FreemarkerHttpServlet {
                     String publicName = vcg.getPublicName();
                     if ( StringUtils.isBlank(publicName) ) {
                         publicName = "(unnamed group)";
-                    }           
+                    }
                     try {
                         json.append("{ \"name\": ").append(JacksonUtils.quote("<a href='./editForm?uri=" + URLEncoder.encode(vcg.getURI()) + "&amp;controller=Classgroup'>" + publicName + "</a>")).append(", ");
                     } catch (Exception e) {
                         json.append("{ \"name\": ").append(JacksonUtils.quote(publicName)).append(", ");
                     }
                     Integer t;
-                    
+
                     json.append("\"data\": { \"displayRank\": \"").append(((t = Integer.valueOf(vcg.getDisplayRank())) != -1) ? t.toString() : "").append("\"}, ");
-                    
+
                     List<VClass> classList = vcg.getVitroClassList();
                     if (classList != null && classList.size()>0) {
                         json.append("\"children\": [");
@@ -91,7 +91,7 @@ public class ListClassGroupsController extends FreemarkerHttpServlet {
                             json.append("\"data\": { \"shortDef\": ").append(JacksonUtils.quote(shortDefStr)).append("}, \"children\": [] ");
                             if (classIt.hasNext())
                                 json.append("} , ");
-                            else 
+                            else
                                 json.append("}] ");
                         }
                     }
@@ -108,7 +108,7 @@ public class ListClassGroupsController extends FreemarkerHttpServlet {
         } catch (Throwable t) {
                 t.printStackTrace();
         }
-        
+
         return new TemplateResponseValues(TEMPLATE_NAME, body);
     }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java
index 7efc567f2..533f21e33 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java
@@ -37,12 +37,12 @@ public class ListDatatypePropertiesController extends FreemarkerHttpServlet {
     private static Log log = LogFactory.getLog( ListDatatypePropertiesController.class );
 
     private static final String TEMPLATE_NAME = "siteAdmin-objectPropHierarchy.ftl";
-        
+
     @Override
 	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
 		return SimplePermission.EDIT_ONTOLOGY.ACTION;
 	}
-    
+
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
 
@@ -111,7 +111,7 @@ public class ListDatatypePropertiesController extends FreemarkerHttpServlet {
                         if ( counter > 0 ) {
                             json.append(", ");
                         }
-                        
+
                         String nameStr = prop.getPickListName()==null ? prop.getName()==null ? prop.getURI()==null ? "(no name)" : prop.getURI() : prop.getName() : prop.getPickListName();
 
                         try {
@@ -119,9 +119,9 @@ public class ListDatatypePropertiesController extends FreemarkerHttpServlet {
                         } catch (Exception e) {
                             json.append("{ \"name\": ").append(JacksonUtils.quote(nameStr)).append(", ");
                         }
-                        
+
                         json.append("\"data\": { \"internalName\": ").append(JacksonUtils.quote(prop.getPickListName())).append(", ");
-                        
+
 /*                        VClass vc = null;
                         String domainStr="";
                         if (prop.getDomainClassURI() != null) {
@@ -134,12 +134,12 @@ public class ListDatatypePropertiesController extends FreemarkerHttpServlet {
                                 }
                             }
                         }
-*/                        
+*/
                         DataProperty dpLangNeut = dpDaoLangNeut.getDataPropertyByURI(prop.getURI());
                         if(dpLangNeut == null) {
                             dpLangNeut = prop;
                         }
-                        String domainStr = getVClassNameFromURI(dpLangNeut.getDomainVClassURI(), vcDao, vcDaoLangNeut); 
+                        String domainStr = getVClassNameFromURI(dpLangNeut.getDomainVClassURI(), vcDao, vcDaoLangNeut);
                         json.append("\"domainVClass\": ").append(JacksonUtils.quote(domainStr)).append(", ");
 
                         Datatype rangeDatatype = dDao.getDatatypeByURI(prop.getRangeDatatypeURI());
@@ -162,14 +162,14 @@ public class ListDatatypePropertiesController extends FreemarkerHttpServlet {
         }
         return new TemplateResponseValues(TEMPLATE_NAME, body);
     }
-    
+
     private String getVClassNameFromURI(String vclassURI, VClassDao vcDao, VClassDao vcDaoLangNeut) {
         if(vclassURI == null) {
             return "";
         }
         VClass vclass = vcDaoLangNeut.getVClassByURI(vclassURI);
         if(vclass == null) {
-            return ""; 
+            return "";
         }
         if(vclass.isAnonymous()) {
             return vclass.getPickListName();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListFauxPropertiesController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListFauxPropertiesController.java
index 8675d4d6b..0970c0a61 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListFauxPropertiesController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListFauxPropertiesController.java
@@ -29,19 +29,19 @@ import javax.servlet.annotation.WebServlet;
 public class ListFauxPropertiesController extends FreemarkerHttpServlet {
 
 	private static final Log log = LogFactory.getLog(ListFauxPropertiesController.class.getName());
-	
+
     private static final String TEMPLATE_NAME = "siteAdmin-fauxPropertiesList.ftl";
 
     private ObjectPropertyDao opDao = null;
     private PropertyGroupDao pgDao = null;
     private FauxPropertyDao fpDao = null;
 	private String notFoundMessage = "";
-	
+
     @Override
 	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
 		return SimplePermission.EDIT_ONTOLOGY.ACTION;
 	}
-    
+
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
 
@@ -49,7 +49,7 @@ public class ListFauxPropertiesController extends FreemarkerHttpServlet {
         try {
 
             String displayOption = "";
-            
+
             if ( vreq.getParameter("displayOption") != null ) {
                 displayOption = vreq.getParameter("displayOption");
             }
@@ -57,14 +57,14 @@ public class ListFauxPropertiesController extends FreemarkerHttpServlet {
                 displayOption = "listing";
             }
             body.put("displayOption", displayOption);
-            
+
             if ( displayOption.equals("listing") ) {
                 body.put("pageTitle", "Faux Property Listing");
             }
             else {
                 body.put("pageTitle", "Faux Properties by Base Property");
             }
-                        
+
             opDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getObjectPropertyDao();
 			fpDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getFauxPropertyDao();
 			pgDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getPropertyGroupDao();
@@ -73,14 +73,14 @@ public class ListFauxPropertiesController extends FreemarkerHttpServlet {
             objectProps = opDao.getRootObjectProperties();
 
 			Map<String, Object> allFauxProps = new TreeMap<String, Object>();
-			// get the faux depending on the display option 
+			// get the faux depending on the display option
 			if ( displayOption.equals("listing") ) {
                 allFauxProps = getFauxPropertyList(objectProps);
             }
 			else {
 				allFauxProps = getFauxByBaseList(objectProps);
 			}
-			
+
 			log.debug(allFauxProps.toString());
 
 			if ( notFoundMessage.length() == 0 ) {
@@ -89,7 +89,7 @@ public class ListFauxPropertiesController extends FreemarkerHttpServlet {
 			else {
             	body.put("fauxProps", allFauxProps);
 			}
-                    
+
         } catch (Throwable t) {
             t.printStackTrace();
         }
@@ -100,21 +100,21 @@ public class ListFauxPropertiesController extends FreemarkerHttpServlet {
 	private TreeMap<String, Object> getFauxPropertyList(List<ObjectProperty> objectProps) {
 		List<FauxProperty> fauxProps = null;
 		TreeMap<String, Object> theFauxProps = new TreeMap<String, Object>();
-        if ( objectProps != null ) {	
+        if ( objectProps != null ) {
             Iterator<ObjectProperty> opIt = objectProps.iterator();
             if ( !opIt.hasNext()) {
-                notFoundMessage = "No object properties found."; 
-            } 
+                notFoundMessage = "No object properties found.";
+            }
 			else {
                 while (opIt.hasNext()) {
-					
+
                     ObjectProperty op = opIt.next();
 					String baseURI = op.getURI();
                     fauxProps = fpDao.getFauxPropertiesForBaseUri(baseURI);
 					if ( fauxProps != null ) {
 						Iterator<FauxProperty> fpIt = fauxProps.iterator();
 						if ( !fpIt.hasNext()) {
-							notFoundMessage = "No faux properties found."; 
+							notFoundMessage = "No faux properties found.";
 						}
 						else {
 							while (fpIt.hasNext()) {
@@ -143,12 +143,12 @@ public class ListFauxPropertiesController extends FreemarkerHttpServlet {
 								tmpHash.put("rangeURI", rangeURI);
 								tmpHash.put("domain", domainLabel);
 								tmpHash.put("domainURI", domainURI);
-								// add the faux and its details to the treemap	
+								// add the faux and its details to the treemap
 								theFauxProps.put(fauxLabel + "@@" + domainLabel, tmpHash);
-							} 
-						} 
+							}
+						}
 					}
-            	}	
+            	}
             }
         }
         return theFauxProps;
@@ -157,11 +157,11 @@ public class ListFauxPropertiesController extends FreemarkerHttpServlet {
 	private TreeMap<String, Object> getFauxByBaseList(List<ObjectProperty> objectProps) {
 		List<FauxProperty> fauxProps = null;
 		TreeMap<String, Object> fauxByBaseProps = new TreeMap<String, Object>();
-        if ( objectProps != null ) {	
+        if ( objectProps != null ) {
             Iterator<ObjectProperty> opIt = objectProps.iterator();
             if ( !opIt.hasNext()) {
-                notFoundMessage = "No object properties found."; 
-            } 
+                notFoundMessage = "No object properties found.";
+            }
 			else {
                 while (opIt.hasNext()) {
 					TreeMap<String, Object> fauxForGivenBase = new TreeMap<String, Object>();
@@ -172,7 +172,7 @@ public class ListFauxPropertiesController extends FreemarkerHttpServlet {
 					if ( fauxProps != null ) {
 						Iterator<FauxProperty> fpIt = fauxProps.iterator();
 						if ( !fpIt.hasNext()) {
-							notFoundMessage = "No faux properties found."; 
+							notFoundMessage = "No faux properties found.";
 						}
 						else {
 							String baseLabel = getDisplayLabel(op) == null ? "(no name)" : getDisplayLabel(op);
@@ -199,13 +199,13 @@ public class ListFauxPropertiesController extends FreemarkerHttpServlet {
 								tmpHash.put("rangeURI", rangeURI);
 								tmpHash.put("domain", domainLabel);
 								tmpHash.put("domainURI", domainURI);
-								// add the faux and its details to the treemap	
+								// add the faux and its details to the treemap
 								fauxForGivenBase.put(fauxLabel + "@@" + domainLabel, tmpHash);
 							}
 							 fauxByBaseProps.put(baseLabel, fauxForGivenBase);
-						} 
+						}
 					}
-            	}	
+            	}
             }
         }
         return fauxByBaseProps;
@@ -216,10 +216,10 @@ public class ListFauxPropertiesController extends FreemarkerHttpServlet {
      */
     public static String getDisplayLabel(ObjectProperty op) {
         String displayLabel = op.getPickListName();
-    	displayLabel = (displayLabel != null && displayLabel.length() > 0)  
-			? displayLabel 
+    	displayLabel = (displayLabel != null && displayLabel.length() > 0)
+			? displayLabel
 			: op.getLocalName();
 		return (displayLabel != null) ? displayLabel : "[object property]" ;
     }
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyGroupsController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyGroupsController.java
index e9ce65a74..a5a46ed52 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyGroupsController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyGroupsController.java
@@ -38,10 +38,10 @@ public class ListPropertyGroupsController extends FreemarkerHttpServlet {
 	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
 		return SimplePermission.EDIT_ONTOLOGY.ACTION;
 	}
-    
+
     @Override
 	protected ResponseValues processRequest(VitroRequest vreq) {
-    	
+
         Map<String, Object> body = new HashMap<String, Object>();
         try {
 
@@ -62,7 +62,7 @@ public class ListPropertyGroupsController extends FreemarkerHttpServlet {
                         String publicName = pg.getName();
                         if ( StringUtils.isBlank(publicName) ) {
                             publicName = "(unnamed group)";
-                        }           
+                        }
                         try {
                             json.append("{ \"name\": ").append(JacksonUtils.quote("<a href='./editForm?uri=" + URLEncoder.encode(pg.getURI(), "UTF-8") + "&amp;controller=PropertyGroup'>" + publicName + "</a>")).append(", ");
                         } catch (Exception e) {
@@ -79,9 +79,9 @@ public class ListPropertyGroupsController extends FreemarkerHttpServlet {
                             while (propIt.hasNext()) {
                                 Property prop = propIt.next();
                                 String controllerStr = "propertyEdit";
-                                String nameStr = 
-                                	   (prop.getLabel() == null) 
-                                	           ? "" 
+                                String nameStr =
+                                	   (prop.getLabel() == null)
+                                	           ? ""
                                 	           : prop.getLabel();
                                 if (prop instanceof ObjectProperty) {
                                 	nameStr = ((ObjectProperty) prop).getDomainPublic();
@@ -103,7 +103,7 @@ public class ListPropertyGroupsController extends FreemarkerHttpServlet {
                                 json.append("\"data\": { \"shortDef\": \"\"}, \"children\": [] ");
                                 if (propIt.hasNext())
                                     json.append("} , ");
-                                else 
+                                else
                                     json.append("}] ");
                             }
                         }
@@ -123,5 +123,5 @@ public class ListPropertyGroupsController extends FreemarkerHttpServlet {
 
             return new TemplateResponseValues(TEMPLATE_NAME, body);
         }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsController.java
index b6620f65a..800d882b7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsController.java
@@ -40,12 +40,12 @@ public class ListPropertyWebappsController extends FreemarkerHttpServlet {
     private static Log log = LogFactory.getLog( ListPropertyWebappsController.class );
 
     private static final String TEMPLATE_NAME = "siteAdmin-objectPropHierarchy.ftl";
-        
+
     @Override
 	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
 		return SimplePermission.EDIT_ONTOLOGY.ACTION;
 	}
-    
+
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
 
@@ -68,16 +68,16 @@ public class ListPropertyWebappsController extends FreemarkerHttpServlet {
             PropertyGroupDao pgDao = vreq.getUnfilteredWebappDaoFactory().getPropertyGroupDao();
 
             String vclassURI = vreq.getParameter("vclassUri");
-        
+
             List<ObjectProperty> props = new ArrayList<ObjectProperty>();
             if (vreq.getParameter("propsForClass") != null) {
                 noResultsMsgStr = "There are no object properties that apply to this class.";
-            
+
                 // incomplete list of classes to check, but better than before
                 List<String> superclassURIs = vcDao.getAllSuperClassURIs(vclassURI);
                 superclassURIs.add(vclassURI);
                 superclassURIs.addAll(vcDao.getEquivalentClassURIs(vclassURI));
-            
+
                 Map<String, PropertyInstance> propInstMap = new HashMap<String, PropertyInstance>();
                 for (String classURI : superclassURIs) {
             	    Collection<PropertyInstance> propInsts = piDao.getAllPropInstByVClass(classURI);
@@ -88,7 +88,7 @@ public class ListPropertyWebappsController extends FreemarkerHttpServlet {
                 List<PropertyInstance> propInsts = new ArrayList<PropertyInstance>();
                 propInsts.addAll(propInstMap.values());
                 Collections.sort(propInsts);
-            
+
                 Iterator<PropertyInstance> propInstIt = propInsts.iterator();
                 HashSet<String> propURIs = new HashSet<String>();
                 while (propInstIt.hasNext()) {
@@ -106,7 +106,7 @@ public class ListPropertyWebappsController extends FreemarkerHttpServlet {
                     ? dao.getRootObjectProperties()
                     : dao.getAllObjectProperties();
             }
-        
+
             OntologyDao oDao = vreq.getUnfilteredWebappDaoFactory().getOntologyDao();
             HashMap<String,String> ontologyHash = new HashMap<String,String>();
 
@@ -191,14 +191,14 @@ public class ListPropertyWebappsController extends FreemarkerHttpServlet {
 
         return new TemplateResponseValues(TEMPLATE_NAME, body);
     }
-    
+
     private String getVClassNameFromURI(String vclassURI, VClassDao vcDao, VClassDao vcDaoLangNeut) {
         if(vclassURI == null) {
             return "";
         }
         VClass vclass = vcDaoLangNeut.getVClassByURI(vclassURI);
         if(vclass == null) {
-            return ""; 
+            return "";
         }
         if(vclass.isAnonymous()) {
             return vclass.getPickListName();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java
index d0e4b3b14..6c5b622bd 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java
@@ -33,17 +33,17 @@ import javax.servlet.annotation.WebServlet;
 public class ListVClassWebappsController extends FreemarkerHttpServlet {
 
     private static final Log log = LogFactory.getLog(ListVClassWebappsController.class.getName());
-    
+
     private static final String TEMPLATE_NAME = "siteAdmin-classHierarchy.ftl";
-        
+
     @Override
 	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
 		return SimplePermission.EDIT_ONTOLOGY.ACTION;
 	}
-    
+
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
-        
+
         Map<String, Object> body = new HashMap<String, Object>();
 
         body.put("displayOption", "all");
@@ -130,8 +130,8 @@ public class ListVClassWebappsController extends FreemarkerHttpServlet {
 				}
 			}
             body.put("jsonTree", json.toString());
-        }      
-        
+        }
+
         return new TemplateResponseValues(TEMPLATE_NAME, body);
     }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageLabelsForIndividualController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageLabelsForIndividualController.java
index 1e5254048..da90e80d5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageLabelsForIndividualController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageLabelsForIndividualController.java
@@ -25,7 +25,7 @@ public class ManageLabelsForIndividualController extends FreemarkerHttpServlet {
 
     private static final Log log = LogFactory.getLog(ManageLabelsForIndividualController.class.getName());
     private static final String TEMPLATE_NAME = "manageLabelsForIndividual.ftl";
-    
+
     @Override
 	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
 		return SimplePermission.DO_FRONT_END_EDITING.ACTION;
@@ -37,14 +37,14 @@ public class ManageLabelsForIndividualController extends FreemarkerHttpServlet {
         Map<String, Object> body = new HashMap<String, Object>();
 
         String subjectUri = vreq.getParameter("subjectUri");
-        
+
         body.put("subjectUri", subjectUri);
 
 
         ArrayList<Literal> labels = getLabels(subjectUri, vreq);
         log.debug("labels = " + labels) ;
         body.put("labels", labels);
-        
+
         Individual subject = vreq.getWebappDaoFactory().getIndividualDao().getIndividualByURI(subjectUri);
         if( subject != null && subject.getName() != null ){
              body.put("subjectName", subject.getName());
@@ -54,17 +54,17 @@ public class ManageLabelsForIndividualController extends FreemarkerHttpServlet {
 
         return new TemplateResponseValues(TEMPLATE_NAME, body);
     }
-  
-    
+
+
     private static String LABEL_QUERY = ""
         + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
         + "SELECT DISTINCT ?label WHERE { \n"
         + "    ?subject rdfs:label ?label \n"
         + "} ORDER BY ?label";
-    
-       
+
+
     ArrayList<Literal>  getLabels(String subjectUri, VitroRequest vreq) {
-          
+
         String queryStr = QueryUtils.subUriForQueryVar(LABEL_QUERY, "subject", subjectUri);
         log.debug("queryStr = " + queryStr);
 
@@ -74,14 +74,14 @@ public class ManageLabelsForIndividualController extends FreemarkerHttpServlet {
             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;
     }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java
index 29ac5e1b8..4d0a62cbc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java
@@ -32,24 +32,24 @@ import edu.cornell.mannlib.vitro.webapp.i18n.I18n;
 import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.DataGetter;
 import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.DataGetterUtils;
 /**
- * Controller for getting data for pages defined in the display model. 
- * 
- * This controller passes these variables to the template: 
+ * Controller for getting data for pages defined in the display model.
+ *
+ * This controller passes these variables to the template:
  * page: a map with information about the page from the display model.
- * pageUri: the URI of the page that identifies the page in the model 
+ * pageUri: the URI of the page that identifies the page in the model
  *  (note that this is not the URL address of the page).
- *    
- * See implementations of PageDataGetter for more variables. 
+ *
+ * See implementations of PageDataGetter for more variables.
  */
 @WebServlet(name = "PageController", urlPatterns = "/pageController")
 public class PageController extends FreemarkerHttpServlet{
     private static final Log log = LogFactory.getLog(PageController.class);
-    
-    protected final static String DEFAULT_TITLE = "Page";        
-    protected final static String DEFAULT_BODY_TEMPLATE = "emptyPage.ftl";     
+
+    protected final static String DEFAULT_TITLE = "Page";
+    protected final static String DEFAULT_BODY_TEMPLATE = "emptyPage.ftl";
 
     protected static final String DATA_GETTER_MAP = "pageTypeToDataGetterMap";
- 
+
     /**
      * Get the required actions for all the data getters then
      * AND them together.
@@ -62,7 +62,7 @@ public class PageController extends FreemarkerHttpServlet{
         } catch (Exception e) {
             log.warn(e);
             return UNAUTHORIZED;
-        }                
+        }
     }
 
     /**
@@ -78,20 +78,20 @@ public class PageController extends FreemarkerHttpServlet{
         }
         return auth;
     }
-    
+
     /**
      * Get Actions object for the data getters for the page.
      */
     private AuthorizationRequest getActionsForDataGetters(VitroRequest vreq ){
         try {
-            List<DataGetter> dgList = 
+            List<DataGetter> dgList =
                 DataGetterUtils.getDataGettersForPage(
                     vreq, vreq.getDisplayModel(), getPageUri(vreq));
 
             AuthorizationRequest auth = AUTHORIZED;
             for( DataGetter dg : dgList){
                 if( dg instanceof RequiresActions ){
-                    auth = auth.and(((RequiresActions) dg).requiredActions(vreq));                        
+                    auth = auth.and(((RequiresActions) dg).requiredActions(vreq));
                 }
             }
             return auth;
@@ -100,23 +100,23 @@ public class PageController extends FreemarkerHttpServlet{
             return UNAUTHORIZED;
         }
     }
-    
+
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) throws Exception {
-                   
-        Map<String,Object> mapForTemplate = new HashMap<String,Object>();                                
+
+        Map<String,Object> mapForTemplate = new HashMap<String,Object>();
         Map<String,Object>page;
-        
-        //figure out what page we are trying to get            
+
+        //figure out what page we are trying to get
         String pageUri = getPageUri( vreq );
         if( StringUtils.isEmpty( pageUri ) )
-            return doNoPageSpecified(vreq);              
-        else           
+            return doNoPageSpecified(vreq);
+        else
             mapForTemplate.put("pageUri", pageUri);
-        
+
         //try to get the page RDF from the model
         try{
-            page =  vreq.getWebappDaoFactory().getPageDao().getPage(pageUri);                
+            page =  vreq.getWebappDaoFactory().getPageDao().getPage(pageUri);
             mapForTemplate.put( "page", page);
             if( page.containsKey("title") ){
                 mapForTemplate.put("title", page.get("title"));
@@ -124,31 +124,31 @@ public class PageController extends FreemarkerHttpServlet{
         }catch( Throwable th){
             return doNotFound(vreq);
         }
-        
+
         //these should all be DataGetters now, not PageDataGetters
         executeDataGetters( pageUri, vreq, mapForTemplate);
 
         mapForTemplate.putAll( getPageControllerValues( pageUri, vreq, getServletContext(), mapForTemplate));
-        
-        ResponseValues rv = new TemplateResponseValues(getTemplate( mapForTemplate ), mapForTemplate);            
-        return rv;       
+
+        ResponseValues rv = new TemplateResponseValues(getTemplate( mapForTemplate ), mapForTemplate);
+        return rv;
     }
 
-    private void executeDataGetters(String pageUri, VitroRequest vreq, Map<String, Object> mapForTemplate) 
+    private void executeDataGetters(String pageUri, VitroRequest vreq, Map<String, Object> mapForTemplate)
     throws Exception {
         List<DataGetter> dgList = DataGetterUtils.getDataGettersForPage(vreq, vreq.getDisplayModel(), pageUri);
-                        
-        for( DataGetter dg : dgList){            
-            Map<String,Object> moreData = dg.getData(mapForTemplate);            
+
+        for( DataGetter dg : dgList){
+            Map<String,Object> moreData = dg.getData(mapForTemplate);
             if( moreData != null ){
                 mapForTemplate.putAll(moreData);
             }
-        }                       
+        }
     }
 /*
-    private void executePageDataGetters(String pageUri, VitroRequest vreq, ServletContext context, Map<String, Object> mapForTemplate) 
-    throws Exception{                
-        mapForTemplate.putAll( DataGetterUtils.getDataForPage(pageUri, vreq, context) );        
+    private void executePageDataGetters(String pageUri, VitroRequest vreq, ServletContext context, Map<String, Object> mapForTemplate)
+    throws Exception{
+        mapForTemplate.putAll( DataGetterUtils.getDataForPage(pageUri, vreq, context) );
     }
 */
     /**
@@ -159,18 +159,18 @@ public class PageController extends FreemarkerHttpServlet{
             String pageUri, VitroRequest vreq, ServletContext servletContext,
             Map<String, Object> mapForTemplate) {
         Map<String,Object> map = new HashMap<String,Object>();
-        
-        //Add editing link for page if authorized        
-        Map<String,Object> pageMap = (Map<String, Object>) mapForTemplate.get("page");        
+
+        //Add editing link for page if authorized
+        Map<String,Object> pageMap = (Map<String, Object>) mapForTemplate.get("page");
         if( PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.MANAGE_MENUS.ACTION) ){
-            String editPageUrl = UrlBuilder.getIndividualProfileUrl(pageUri, vreq);            
-            editPageUrl = UrlBuilder.addParams(editPageUrl, DisplayVocabulary.SWITCH_TO_DISPLAY_MODEL , "1");            
+            String editPageUrl = UrlBuilder.getIndividualProfileUrl(pageUri, vreq);
+            editPageUrl = UrlBuilder.addParams(editPageUrl, DisplayVocabulary.SWITCH_TO_DISPLAY_MODEL , "1");
             pageMap.put("URLToEditPage", editPageUrl);
-        }        
-            
+        }
+
         return map;
     }
-    
+
     private String getTemplate(Map<String, Object> mapForTemplate) {
         //first try to get the body template from the display model RDF
         if( mapForTemplate.containsKey("page") ){
@@ -181,25 +181,25 @@ public class PageController extends FreemarkerHttpServlet{
         }
         //next, try to get body template from the data getter values
         if( mapForTemplate.containsKey("bodyTemplate") ){
-            return (String) mapForTemplate.get("bodyTemplate");            
+            return (String) mapForTemplate.get("bodyTemplate");
         }
-        
+
         //Nothing? then use a default empty page
-        return DEFAULT_BODY_TEMPLATE;        
+        return DEFAULT_BODY_TEMPLATE;
     }
 
 
     private ResponseValues doError(VitroRequest vreq) {
         Map<String, Object> body = new HashMap<String, Object>();
         body.put("title", I18n.text(vreq, "page_not_created"));
-        body.put("errorMessage", I18n.text(vreq, "page_not_created_msg"));        
+        body.put("errorMessage", I18n.text(vreq, "page_not_created_msg"));
         return new TemplateResponseValues(Template.TITLED_ERROR_MESSAGE.toString(), body, HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
     }
 
     private ResponseValues doNotFound(VitroRequest vreq) {
         Map<String, Object> body = new HashMap<String, Object>();
         body.put("title", I18n.text(vreq, "page_not_found"));
-        body.put("errorMessage", I18n.text(vreq, "page_not_found_msg"));        
+        body.put("errorMessage", I18n.text(vreq, "page_not_found_msg"));
         return new TemplateResponseValues(Template.TITLED_ERROR_MESSAGE.toString(), body, HttpServletResponse.SC_NOT_FOUND);
     }
 
@@ -207,25 +207,25 @@ public class PageController extends FreemarkerHttpServlet{
     private ResponseValues doNoPageSpecified(VitroRequest vreq) {
         Map<String, Object> body = new HashMap<String, Object>();
         body.put("title",I18n.text(vreq, "page_uri_missing"));
-        body.put("errorMessage", I18n.text(vreq, "page_uri_missing_msg"));        
+        body.put("errorMessage", I18n.text(vreq, "page_uri_missing_msg"));
         return new TemplateResponseValues(Template.TITLED_ERROR_MESSAGE.toString(), body, HttpServletResponse.SC_NOT_FOUND);
     }
-    
+
     /**
-     * Gets the page URI from the request.  The page must be defined in the display model.  
-     * @throws Exception 
+     * Gets the page URI from the request.  The page must be defined in the display model.
+     * @throws Exception
      */
     private String getPageUri(VitroRequest vreq) throws Exception {
-        // Check if there is a page URI in the request.  
+        // Check if there is a page URI in the request.
         // This would have been added by a servlet Filter.
-        String pageURI = (String) vreq.getAttribute("pageURI");        
-        return pageURI;        
+        String pageURI = (String) vreq.getAttribute("pageURI");
+        return pageURI;
     }
-      
-    
+
+
     public static void putPageUri(HttpServletRequest req, String pageUri){
         req.setAttribute("pageURI", pageUri);
-    }  
-    
-    
+    }
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java
index a07e8c0b4..0a901b33c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java
@@ -21,20 +21,20 @@ import javax.servlet.annotation.WebServlet;
 public class RevisionInfoController extends FreemarkerHttpServlet {
 	private static final long serialVersionUID = 1L;
     private static final String TEMPLATE_DEFAULT = "revisionInfo.ftl";
-    
+
     public static final AuthorizationRequest REQUIRED_ACTIONS = SimplePermission.SEE_REVISION_INFO.ACTION;
-    
+
     @Override
     protected AuthorizationRequest requiredActions(VitroRequest vreq) {
     	return REQUIRED_ACTIONS;
     }
-    
+
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
         Map<String, Object> body = new HashMap<String, Object>();
 
         body.put("revisionInfoBean", RevisionInfoBean.getBean(getServletContext()));
-        
+
         return new TemplateResponseValues(TEMPLATE_DEFAULT, body);
     }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SamplesController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SamplesController.java
index af100c6ad..f230304ca 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SamplesController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SamplesController.java
@@ -30,14 +30,14 @@ public class SamplesController extends FreemarkerHttpServlet {
 
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
-        
+
         Map<String, Object> body = new HashMap<String, Object>();
         // Test of #list directive in template on undefined, null, and empty values.
         // Basic idea: empty list okay, null or undefined value not okay.
         List<String> apples = new ArrayList<String>();  // no error
         // List<String> apples = null; // error
-        body.put("apples", apples); // without this: error        
-        
+        body.put("apples", apples); // without this: error
+
         // You can add to a collection AFTER putting it in the template data model.
         // The data model contains a reference to the collection, not a copy.
         List<String> fruit = new ArrayList<String>();
@@ -45,13 +45,13 @@ public class SamplesController extends FreemarkerHttpServlet {
         fruit.add("bananas");
         body.put("fruit", fruit);
         fruit.add("oranges");
-        
+
         // But you cannot modify a scalar after putting it in the data model - the
         // template still gets the old value
         String animal = "elephant";
         body.put("animal", animal);
         animal = "camel";
-        
+
         // Because the data model contains a reference to the collection, changing
         // one also changes the other.
         List<String> animals = new ArrayList<String>();
@@ -61,39 +61,39 @@ public class SamplesController extends FreemarkerHttpServlet {
         Map<String, List> zoo2 = new HashMap<String, List>();
         zoo1.put("animals", animals);
         zoo2.put("animals", animals);
-        zoo1.get("animals").add("monkey");       
+        zoo1.get("animals").add("monkey");
         body.put("zoo1", zoo1);
         body.put("zoo2", zoo2);
-        
+
         // Test recursive dump - array of arrays
 //        String[] fruitArray = { "apples", "bananas", "strawberries" };
 //        String[] animalArray = { "cat", "dog", "mouse" };
 //        String[] dayArray = { "Monday", "Tuesday", "Wednesday" };
 //        String[][] arrays = { fruitArray, animalArray, dayArray };
 //        body.put("arrays", arrays);
-        
+
         body.put("trueStatement", true);
         body.put("falseStatement", false);
-        
+
         getBerries(body);
-        
+
         body.put("bookTitle", "Pride and Prejudice");
         body.put("bookTitle", "Persuasion");
-        
+
         body.put("year", "2001");
-        
+
         body.put("xsddatetime", "1983-12-07T17:15:28Z");
-        
+
         body.put("title", "Freemarker Samples");
-        
+
         return new TemplateResponseValues(TEMPLATE_DEFAULT, body);
     }
-    
+
     @Override
     protected String getTitle(String siteName, VitroRequest vreq) {
         return "Freemarker Samples";
     }
-    
+
     private void getBerries(Map<String, Object> body) {
         body.put("berries", "strawberries, raspberries, blueberries");
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java
index d18c0fbaa..bed22535c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyController.java
@@ -35,26 +35,26 @@ import javax.servlet.annotation.WebServlet;
 public class ShowClassHierarchyController extends FreemarkerHttpServlet {
 
     private static final Log log = LogFactory.getLog(ShowClassHierarchyController.class.getName());
-    
+
     private static final String TEMPLATE_NAME = "siteAdmin-classHierarchy.ftl";
 	private int MAXDEPTH = 7;
 
     private VClassDao vcDao = null;
-    
+
     private int previous_posn = 0;
-    
+
     @Override
 	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
 		return SimplePermission.EDIT_ONTOLOGY.ACTION;
 	}
-    
+
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
 
         Map<String, Object> body = new HashMap<String, Object>();
-        
+
         String displayOption = "";
-        
+
         if ( vreq.getParameter("displayOption") != null ) {
             displayOption = vreq.getParameter("displayOption");
         }
@@ -88,7 +88,7 @@ public class ShowClassHierarchyController extends FreemarkerHttpServlet {
         } else if (startClassUri != null) {
         	roots = new LinkedList<VClass>();
         	roots.add(vcDao.getVClassByURI(startClassUri));
-        } else {    	
+        } else {
        		roots = vcDao.getRootClasses();
         }
 
@@ -120,14 +120,14 @@ public class ShowClassHierarchyController extends FreemarkerHttpServlet {
             }
         }
         body.put("jsonTree", json.toString());
-        
+
         return new TemplateResponseValues(TEMPLATE_NAME, body);
     }
 
-    private String addChildren(WebappDaoFactory wadf, VClass parent, int position, 
+    private String addChildren(WebappDaoFactory wadf, VClass parent, int position,
             String ontologyUri, int counter, VitroRequest vreq) {
         String rowElts = addVClassDataToResultsList(wadf, parent, position, ontologyUri, counter);
-    	int childShift = (rowElts.length() > 0) ? 1 : 0;  // if addVClassDataToResultsList filtered out the result, don't shift the children over 
+    	int childShift = (rowElts.length() > 0) ? 1 : 0;  // if addVClassDataToResultsList filtered out the result, don't shift the children over
         int length = rowElts.length();
         StringBuilder leaves = new StringBuilder();
         leaves.append(rowElts);
@@ -190,7 +190,7 @@ public class ShowClassHierarchyController extends FreemarkerHttpServlet {
             }
             else if ( position == previous_posn ) {
                         tempString += "}, { \"name\": ";
-            } 
+            }
             else if ( position > previous_posn ) {
                 tempString += " { \"name\": ";
             }
@@ -198,11 +198,11 @@ public class ShowClassHierarchyController extends FreemarkerHttpServlet {
                 tempString += "}, { \"name\": ";
             }
             try {
-                tempString += JacksonUtils.quote("<a href='vclassEdit?uri=" + 
-                        URLEncoder.encode(vcw.getURI(),"UTF-8") + "'>" + 
+                tempString += JacksonUtils.quote("<a href='vclassEdit?uri=" +
+                        URLEncoder.encode(vcw.getURI(),"UTF-8") + "'>" +
                         vcw.getPickListName() + "</a>") +", ";
             } catch (Exception e) {
-                 tempString += JacksonUtils.quote(((vcw.getPickListName() == null) 
+                 tempString += JacksonUtils.quote(((vcw.getPickListName() == null)
                          ? "" : vcw.getPickListName())) + ", ";
             }
 
@@ -214,7 +214,7 @@ public class ShowClassHierarchyController extends FreemarkerHttpServlet {
             String groupURI = vcw.getGroupURI();
             String groupName = null;
             VClassGroup classGroup = null;
-            if(groupURI != null) { 
+            if(groupURI != null) {
             	classGroup = groupDao.getGroupByURI(groupURI);
             	if (classGroup != null) {
             		groupName = classGroup.getPublicName();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyController.java
index 0c4040193..c2f52a5c1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyController.java
@@ -34,7 +34,7 @@ import javax.servlet.annotation.WebServlet;
 public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
 
 	private static final Log log = LogFactory.getLog(ShowDataPropertyHierarchyController.class.getName());
-	
+
     private static final String TEMPLATE_NAME = "siteAdmin-objectPropHierarchy.ftl";
     private int MAXDEPTH = 5;
 
@@ -51,7 +51,7 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
 	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
 		return SimplePermission.EDIT_ONTOLOGY.ACTION;
 	}
-    
+
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
 
@@ -59,7 +59,7 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
         try {
 
             String displayOption = "";
-            
+
             if ( vreq.getParameter("displayOption") != null ) {
                 displayOption = vreq.getParameter("displayOption");
             }
@@ -67,16 +67,16 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
                 displayOption = "hierarchy";
             }
             body.put("displayOption", displayOption);
-            
+
             if ( displayOption.equals("all") ) {
                 body.put("pageTitle", "All Data Properties");
             }
             else {
                 body.put("pageTitle", "Data Property Hierarchy");
             }
-            
+
             body.put("propertyType", "data");
-            
+
             dpDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getDataPropertyDao();
             dpDaoLangNeut = vreq.getLanguageNeutralWebappDaoFactory().getDataPropertyDao();
             vcDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getVClassDao();
@@ -108,7 +108,7 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
                 if (!rootIt.hasNext()) {
                     DataProperty dp = new DataProperty();
                     dp.setURI(ontologyUri + "fake");
-                    String notFoundMessage = "<strong>No data properties found.</strong>"; 
+                    String notFoundMessage = "<strong>No data properties found.</strong>";
                     dp.setName(notFoundMessage);
                     dp.setName(notFoundMessage);
                     json.append(addDataPropertyDataToResultsList(dp, 0, ontologyUri, counter));
@@ -119,7 +119,7 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
                     	    json.append(addChildren(root, 0, ontologyUri, counter, vreq));
                     	    counter += 1;
                 	    }
-                    }	
+                    }
                     int length = json.length();
                     if ( length > 0 ) {
                         json.append(" }");
@@ -128,7 +128,7 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
             }
 
             body.put("jsonTree", json.toString());
-        
+
         } catch (Throwable t) {
             t.printStackTrace();
         }
@@ -200,7 +200,7 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
             }
             else if ( position == previous_posn ) {
                         tempString += "}, { \"name\": ";
-            } 
+            }
             else if ( position > previous_posn ) {
                 tempString += " { \"name\": ";
             }
@@ -208,14 +208,14 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
                 tempString += "}, { \"name\": ";
             }
 
-            String nameStr = dp.getPickListName() == null 
-                    ? dp.getName() == null 
-                            ? dp.getURI() == null 
+            String nameStr = dp.getPickListName() == null
+                    ? dp.getName() == null
+                            ? dp.getURI() == null
                                     ? "(no name)" : dp.getURI() : dp.getName() : dp.getPickListName();
-  
+
             tempString += JacksonUtils.quote(
                     "<a href='datapropEdit?uri=" + URLEncoder.encode(
-                            dp.getURI()) + "'>" + nameStr + "</a>") + ", ";                 
+                            dp.getURI()) + "'>" + nameStr + "</a>") + ", ";
 
             tempString += "\"data\": { \"internalName\": " + JacksonUtils.quote(
                     dp.getPickListName()) + ", ";
@@ -225,7 +225,7 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
                 dpLangNeut = dp;
             }
             String domainStr = getVClassNameFromURI(dpLangNeut.getDomainVClassURI(), vcDao, vcDaoLangNeut);
-            
+
             try {
             	tempString += "\"domainVClass\": " + JacksonUtils.quote(domainStr) + ", " ;
             } catch (NullPointerException e) {
@@ -234,18 +234,18 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
             try {
             	Datatype rangeDatatype = dDao.getDatatypeByURI(dp.getRangeDatatypeURI());
                 String rangeDatatypeStr = (rangeDatatype==null)?dp.getRangeDatatypeURI():rangeDatatype.getName();
-            	tempString += "\"rangeVClass\": " + JacksonUtils.quote((rangeDatatypeStr != null) ? rangeDatatypeStr : "") + ", " ; 
+            	tempString += "\"rangeVClass\": " + JacksonUtils.quote((rangeDatatypeStr != null) ? rangeDatatypeStr : "") + ", " ;
             } catch (NullPointerException e) {
             	tempString += "\"rangeVClass\": \"\",";
             }
             if (dp.getGroupURI() != null) {
                 PropertyGroup pGroup = pgDao.getGroupByURI(dp.getGroupURI());
-                tempString += "\"group\": " + JacksonUtils.quote((pGroup == null) ? "unknown group" : pGroup.getName()); 
+                tempString += "\"group\": " + JacksonUtils.quote((pGroup == null) ? "unknown group" : pGroup.getName());
             } else {
                 tempString += "\"group\": \"unspecified\"";
             }
             tempString += "}, \"children\": [";
-            
+
             previous_posn = position;
        }
         return tempString;
@@ -257,7 +257,7 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
         }
         VClass vclass = vcDaoLangNeut.getVClassByURI(vclassURI);
         if(vclass == null) {
-            return ""; 
+            return "";
         }
         if(vclass.isAnonymous()) {
             return vclass.getPickListName();
@@ -266,5 +266,5 @@ public class ShowDataPropertyHierarchyController extends FreemarkerHttpServlet {
             return (vclassWLang != null) ? vclassWLang.getPickListName() : vclass.getPickListName();
         }
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyController.java
index daea57404..a5260fe18 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyController.java
@@ -35,7 +35,7 @@ import javax.servlet.annotation.WebServlet;
 public class ShowObjectPropertyHierarchyController extends FreemarkerHttpServlet {
 
 	private static final Log log = LogFactory.getLog(ShowObjectPropertyHierarchyController.class.getName());
-	
+
     private static final String TEMPLATE_NAME = "siteAdmin-objectPropHierarchy.ftl";
 
     private int MAXDEPTH = 5;
@@ -45,14 +45,14 @@ public class ShowObjectPropertyHierarchyController extends FreemarkerHttpServlet
     private VClassDao vcDao = null;
     private VClassDao vcDaoLangNeut = null;
     private PropertyGroupDao pgDao = null;
-    
+
     private int previous_posn = 0;
 
     @Override
 	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
 		return SimplePermission.EDIT_ONTOLOGY.ACTION;
 	}
-    
+
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
 
@@ -60,7 +60,7 @@ public class ShowObjectPropertyHierarchyController extends FreemarkerHttpServlet
         try {
 
             String displayOption = "";
-            
+
             if ( vreq.getParameter("displayOption") != null ) {
                 displayOption = vreq.getParameter("displayOption");
             }
@@ -68,16 +68,16 @@ public class ShowObjectPropertyHierarchyController extends FreemarkerHttpServlet
                 displayOption = "hierarchy";
             }
             body.put("displayOption", displayOption);
-            
+
             if ( displayOption.equals("all") ) {
                 body.put("pageTitle", "All Object Properties");
             }
             else {
                 body.put("pageTitle", "Object Property Hierarchy");
             }
-            
+
             body.put("propertyType", "object");
-            
+
             opDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getObjectPropertyDao();
             opDaoLangNeut = vreq.getLanguageNeutralWebappDaoFactory().getObjectPropertyDao();
             vcDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getVClassDao();
@@ -107,26 +107,26 @@ public class ShowObjectPropertyHierarchyController extends FreemarkerHttpServlet
             }
 
             int counter = 0;
-            
+
             if (roots != null) {
                 Iterator<ObjectProperty> rootIt = roots.iterator();
                 if (!rootIt.hasNext()) {
                     ObjectProperty op = new ObjectProperty();
                     op.setURI(ontologyUri+"fake");
-                    String notFoundMessage = "<strong>No object properties found.</strong>"; 
+                    String notFoundMessage = "<strong>No object properties found.</strong>";
                     op.setDomainPublic(notFoundMessage);
                     json.append(addObjectPropertyDataToResultsList(op, 0, ontologyUri, counter));
                 } else {
                     while (rootIt.hasNext()) {
                         ObjectProperty root = rootIt.next();
-                        if ( (ontologyUri==null) || 
-                    		    ( (ontologyUri != null) 
-                    		    && (root.getNamespace() != null) 
+                        if ( (ontologyUri==null) ||
+                    		    ( (ontologyUri != null)
+                    		    && (root.getNamespace() != null)
                     		    && (ontologyUri.equals(root.getNamespace())) ) ) {
                     	            json.append(addChildren(root, 0, ontologyUri, counter));
                     	            counter += 1;
                 	    }
-                    }	
+                    }
                     int length = json.length();
                     if ( length > 0 ) {
                         json.append(" }");
@@ -135,7 +135,7 @@ public class ShowObjectPropertyHierarchyController extends FreemarkerHttpServlet
             }
 
             body.put("jsonTree", json.toString());
-                    
+
         } catch (Throwable t) {
             t.printStackTrace();
         }
@@ -202,30 +202,30 @@ public class ShowObjectPropertyHierarchyController extends FreemarkerHttpServlet
             }
             else if ( position == previous_posn ) {
                         tempString += "}, { \"name\": ";
-            } 
+            }
             else if ( position > previous_posn ) {
                 tempString += " { \"name\": ";
             }
             else if ( position < previous_posn ) {
                 tempString += "}, { \"name\": ";
             }
-            
+
             String nameStr = getDisplayLabel(op) == null ? "(no name)" : getDisplayLabel(op);
 
         	tempString += JacksonUtils.quote(
         	        "<a href='propertyEdit?uri=" + URLEncoder.encode(
         	                op.getURI()) + "'>" + nameStr + "</a>") + ", ";
-             
+
             tempString += "\"data\": { \"internalName\": " + JacksonUtils.quote(
                     op.getLocalNameWithPrefix()) + ", ";
-            
+
             ObjectProperty opLangNeut = opDaoLangNeut.getObjectPropertyByURI(op.getURI());
             if(opLangNeut == null) {
                 opLangNeut = op;
             }
             String domainStr = getVClassNameFromURI(opLangNeut.getDomainVClassURI(), vcDao, vcDaoLangNeut);
             String rangeStr = getVClassNameFromURI(opLangNeut.getRangeVClassURI(), vcDao, vcDaoLangNeut);
-            
+
             try {
             	tempString += "\"domainVClass\": " + JacksonUtils.quote(domainStr) + ", " ;
             } catch (NullPointerException e) {
@@ -244,19 +244,19 @@ public class ShowObjectPropertyHierarchyController extends FreemarkerHttpServlet
                 tempString += "\"group\": \"unspecified\"";
             }
             tempString += "}, \"children\": [";
-            
+
             previous_posn = position;
         }
         return tempString;
     }
-    
+
     private String getVClassNameFromURI(String vclassURI, VClassDao vcDao, VClassDao vcDaoLangNeut) {
         if(vclassURI == null) {
             return "";
         }
         VClass vclass = vcDaoLangNeut.getVClassByURI(vclassURI);
         if(vclass == null) {
-            return ""; 
+            return "";
         }
         if(vclass.isAnonymous()) {
             return vclass.getPickListName();
@@ -267,13 +267,13 @@ public class ShowObjectPropertyHierarchyController extends FreemarkerHttpServlet
     }
 
     public static class ObjectPropertyAlphaComparator implements Comparator<ObjectProperty> {
-        
+
         Collator collator;
-        
+
         public ObjectPropertyAlphaComparator(VitroRequest vreq) {
             this.collator = vreq.getCollator();
         }
-        
+
         public int compare(ObjectProperty op1, ObjectProperty op2) {
         	if (op1 == null) {
         		return 1;
@@ -291,16 +291,16 @@ public class ShowObjectPropertyHierarchyController extends FreemarkerHttpServlet
         	}
         }
     }
-    
+
     /*
      * should never be null
      */
     public static String getDisplayLabel(ObjectProperty op) {
         String displayLabel = op.getPickListName();
-    	displayLabel = (displayLabel != null && displayLabel.length() > 0)  
-			? displayLabel 
+    	displayLabel = (displayLabel != null && displayLabel.length() > 0)
+			? displayLabel
 			: op.getLocalName();
 		return (displayLabel != null) ? displayLabel : "[object property]" ;
     }
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SimpleReasonerRecomputeController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SimpleReasonerRecomputeController.java
index fb4158988..d79cb5ad9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SimpleReasonerRecomputeController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SimpleReasonerRecomputeController.java
@@ -25,31 +25,31 @@ public class SimpleReasonerRecomputeController extends FreemarkerHttpServlet {
 
     private static final Log log = LogFactory.getLog(
             SimpleReasonerRecomputeController.class);
-    
+
     private static final String RECOMPUTE_INFERENCES_FTL = "recomputeInferences.ftl";
-    
+
     @Override
 	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
     	return SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION;
 	}
 
-	protected ResponseValues processRequest(VitroRequest vreq) { 
+	protected ResponseValues processRequest(VitroRequest vreq) {
         Map<String, Object> body = new HashMap<String, Object>();
-        
+
         String messageStr = "";
         try {
-        	
+
         	Object sr = getServletContext().getAttribute(SimpleReasoner.class.getName());
-        	
+
             if (!(sr instanceof SimpleReasoner)) {
                 messageStr = "No SimpleReasoner has been set up.";
-                
+
             } else {
                 SimpleReasoner simpleReasoner = (SimpleReasoner) sr;
                 if (simpleReasoner.isABoxReasoningAsynchronous()) {
                     messageStr = "Reasoning is currently in asynchronous mode so a recompute cannot be started. Please try again later.";
                 } else if (simpleReasoner.isRecomputing()) {
-                        messageStr = 
+                        messageStr =
                             "The system is currently in the process of " +
                             "recomputing inferences.";
                 } else {
@@ -59,38 +59,38 @@ public class SimpleReasonerRecomputeController extends FreemarkerHttpServlet {
 								"SimpleReasonerRecomputController.Recomputer");
 						thread.setWorkLevel(WORKING);
 						thread.start();
-                        messageStr = "Recompute of inferences started. See log for further details.";                       
+                        messageStr = "Recompute of inferences started. See log for further details.";
                     } else {
                         body.put("formAction", UrlBuilder.getUrl("/RecomputeInferences"));
-                    } 
+                    }
                 }
             }
-            
+
         } catch (Exception e) {
             log.error("Error recomputing inferences with SimpleReasoner", e);
-            body.put("errorMessage", 
-                    "There was an error while recomputing inferences: " + 
+            body.put("errorMessage",
+                    "There was an error while recomputing inferences: " +
                     e.getMessage());
           return new ExceptionResponseValues(
-            RECOMPUTE_INFERENCES_FTL, body, e);  
+            RECOMPUTE_INFERENCES_FTL, body, e);
         }
-        
-        body.put("message", messageStr); 
+
+        body.put("message", messageStr);
         return new TemplateResponseValues(RECOMPUTE_INFERENCES_FTL, body);
     }
-    
+
     private class Recomputer implements Runnable {
-        
+
         private SimpleReasoner simpleReasoner;
-        
+
         public Recomputer(SimpleReasoner simpleReasoner) {
             this.simpleReasoner = simpleReasoner;
         }
-        
+
         public void run() {
             simpleReasoner.recompute();
         }
-        
+
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java
index 4827cd259..577778b57 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java
@@ -9,7 +9,7 @@ import javax.servlet.annotation.WebServlet;
 
 @WebServlet(name = "SiteAdminController", urlPatterns = {"/siteAdmin","/siteAdmin.jsp"} )
 public class SiteAdminController extends BaseSiteAdminController {
-	
+
     private static final long serialVersionUID = 1L;
     private static final Log log = LogFactory.getLog(SiteAdminController.class);
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/StaticPageController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/StaticPageController.java
index e7c9d7a63..f45b232bc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/StaticPageController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/StaticPageController.java
@@ -25,7 +25,7 @@ public class StaticPageController extends FreemarkerHttpServlet {
 
     private static final long serialVersionUID = 1L;
     private static final Log log = LogFactory.getLog(StaticPageController.class);
-    
+
     @SuppressWarnings("serial")
     private static final Map<String, String> urlsToTemplates = new HashMap<String, String>(){
         {
@@ -42,14 +42,14 @@ public class StaticPageController extends FreemarkerHttpServlet {
         }
         return title;
     }
-    
+
     protected ResponseValues processRequest(VitroRequest vreq) {
         String requestedUrl = vreq.getServletPath();
         String templateName = urlsToTemplates.get(requestedUrl);
-        
+
 		log.debug("requestedUrl='" + requestedUrl + "', templateName='"
 				+ templateName + "'");
-		
+
         return new TemplateResponseValues(templateName);
-    }    
+    }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java
index 7fac3f684..85d648f6b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java
@@ -20,46 +20,46 @@ import freemarker.template.Template;
 import freemarker.template.TemplateException;
 
 public class TemplateProcessingHelper {
-    
+
     private static final Log log = LogFactory.getLog(TemplateProcessingHelper.class);
-    
+
     private Configuration config = null;
-    
+
     public TemplateProcessingHelper(HttpServletRequest request) {
         this.config = FreemarkerConfiguration.getConfig(request);
     }
-    
-    public StringWriter processTemplate(String templateName, Map<String, Object> map) 
+
+    public StringWriter processTemplate(String templateName, Map<String, Object> map)
         throws TemplateProcessingException {
         Template template = getTemplate(templateName);
-        StringWriter sw = new StringWriter();        
+        StringWriter sw = new StringWriter();
         processTemplate(template, map, sw);
         return sw;
     }
-    
+
     private void processTemplate(Template template, Map<String, Object> map, Writer writer)
         throws TemplateProcessingException {
-        
+
         try {
             Environment env = template.createProcessingEnvironment(map, writer);
-            
+
             // Define a setup template to be included by every page template
             String templateType = (String) map.get("templateType");
             if (FreemarkerHttpServlet.PAGE_TEMPLATE_TYPE.equals(templateType)) {
                 env.include(getTemplate("pageSetup.ftl"));
             }
-            
+
             // Apply any data-getters that are associated with this template.
             // TODO clean this up VIVO-249
             FreemarkerConfigurationImpl.retrieveAndRunDataGetters(env, template.getName());
-            
+
             // Now process it.
             env.process();
         } catch (TemplateException e) {
             throw new TemplateProcessingException("TemplateException creating processing environment", e);
         } catch (IOException e) {
-            throw new TemplateProcessingException("IOException creating processing environment", e);            
-        }        
+            throw new TemplateProcessingException("IOException creating processing environment", e);
+        }
     }
 
     private Template getTemplate(String templateName) throws TemplateProcessingException {
@@ -71,12 +71,12 @@ public class TemplateProcessingHelper {
             if (e instanceof freemarker.core.ParseException) {
                 msg = "Syntax error in template " + templateName;
             } else if (e instanceof java.io.FileNotFoundException) {
-                msg = "Cannot find template " + templateName;                  
+                msg = "Cannot find template " + templateName;
             } else {
                 msg = "IOException getting template " + templateName;
             }
             throw new TemplateProcessingException(msg, e);
-        }  
+        }
         return template;
     }
 
@@ -85,8 +85,8 @@ public class TemplateProcessingHelper {
 
         public TemplateProcessingException(String message) {
             super(message);
-        } 
-        
+        }
+
         public TemplateProcessingException(String message, Throwable cause) {
             super(message, cause);
         }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java
index 7de7bec51..85d1aefd7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java
@@ -17,33 +17,33 @@ import javax.servlet.annotation.WebServlet;
 
 @WebServlet(name = "TermsOfUseController", urlPatterns = {"/termsOfUse"} )
 public class TermsOfUseController extends FreemarkerHttpServlet {
-    
+
     private static final long serialVersionUID = 1L;
     private static final Log log = LogFactory.getLog(TermsOfUseController.class);
     private static final String TEMPLATE_DEFAULT = "termsOfUse.ftl";
 
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
-        
+
         Map<String, Object> map = new HashMap<String, Object>();
         Map<String, String> termsOfUse = new HashMap<String, String>();
-         
+
         ApplicationBean appBean = vreq.getAppBean();
-        
+
         termsOfUse.put("siteName", appBean.getApplicationName());
-        
+
         String siteHost = appBean.getCopyrightAnchor();
         if (siteHost == null) {
             siteHost = "the hosting institution";
         }
         termsOfUse.put("siteHost", siteHost);
-        
+
         map.put("termsOfUse", termsOfUse);
         return new TemplateResponseValues(TEMPLATE_DEFAULT, map);
     }
-    
+
     @Override
     protected String getTitle(String siteName, VitroRequest vreq) {
         return siteName + " Terms of Use";
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java
index e8a39da48..2366321bf 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TestController.java
@@ -29,14 +29,14 @@ public class TestController extends FreemarkerHttpServlet {
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
         //Portal portal = vreq.getPortal();
-        
+
         Map<String, Object> body = new HashMap<String, Object>();
-        
+
         body.put("title", "Freemarker Test");
 
-        return new TemplateResponseValues(TEMPLATE_DEFAULT, body);       
+        return new TemplateResponseValues(TEMPLATE_DEFAULT, body);
     }
-    
+
     @Override
     protected String getTitle(String siteName, VitroRequest vreq) {
         return "Test";
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
index a0cea3a10..8e4d4ae25 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
@@ -22,8 +22,8 @@ public class UrlBuilder {
 
     private static final Log log = LogFactory.getLog(UrlBuilder.class.getName());
 
-    protected static String contextPath = null;   
-        
+    protected static String contextPath = null;
+
     public enum Route {
         ABOUT("/about"),
         AUTHENTICATE("/authenticate"),
@@ -34,7 +34,7 @@ public class UrlBuilder {
         INDIVIDUAL("/individual"),
         INDIVIDUAL_EDIT("/entityEdit"),
         INDIVIDUAL_LIST("/individuallist"),
-        LOGIN("/login"), 
+        LOGIN("/login"),
         LOGOUT("/logout"),
         OBJECT_PROPERTY_EDIT("/propertyEdit"),
         SEARCH("/search"),
@@ -47,11 +47,11 @@ public class UrlBuilder {
         EDIT_REQUEST_DISPATCH("/editRequestDispatch");
 
         private final String path;
-        
+
         Route(String path) {
             this.path = path;
         }
-        
+
         public String path() {
             return path;
         }
@@ -59,81 +59,81 @@ public class UrlBuilder {
         public String url() {
             return getUrl(path);
         }
-        
+
         public String url(ParamMap params) {
             return getUrl(path, params);
         }
-        
+
         public String toString() {
             return path();
-        }        
+        }
     }
-    
+
     public enum Css {
         CUSTOM_FORM("/edit/forms/css/customForm.css"),
         JQUERY_UI("/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css");
 
         private final String path;
-        
+
         Css(String path) {
-            this.path = path;           
+            this.path = path;
         }
-        
+
         public String path() {
             return path;
         }
-        
+
         public String toString() {
             return path;
         }
     }
-    
+
     public enum JavaScript {
         CUSTOM_FORM_UTILS("/js/customFormUtils.js"),
         JQUERY("/js/jquery-1.12.4.min.js"),
         JQUERY_MIGRATE("/js/jquery-migrate-1.4.1.js"),
         JQUERY_UI("/js/jquery-ui/js/jquery-ui-1.12.1.min.js"),
         UTILS("/js/utils.js");
-        
+
         private final String path;
-        
+
         JavaScript(String path) {
-            this.path = path;           
+            this.path = path;
         }
-        
+
         public String path() {
             return path;
         }
-        
+
         public String toString() {
             return path;
         }
     }
-    
+
     private UrlBuilder() { }
-  
+
     public static String getHomeUrl() {
     	return getUrl("");
     }
-    
+
     // Used by templates to build urls.
     public static String getBaseUrl() {
         return contextPath;
     }
-    
+
 	public static String getLoginUrl() {
 		return getUrl(Route.AUTHENTICATE, "return", "true");
 	}
-    
+
     public static String getLogoutUrl() {
         return getUrl(Route.LOGOUT);
     }
-    
-    public static class ParamMap extends LinkedHashMap<String, String> { 
+
+    public static class ParamMap extends LinkedHashMap<String, String> {
         private static final long serialVersionUID = 1L;
-        
+
         public ParamMap() { }
-        
+
         public ParamMap(String...strings) {
             int stringCount = strings.length;
             for (int i = 0; i < stringCount; i=i+2) {
@@ -143,70 +143,70 @@ public class UrlBuilder {
                 if (strings[i+1] == null) { continue; }
                 this.put(strings[i], strings[i+1]);
             }
-        } 
-        
+        }
+
         public ParamMap(List<String> strings) {
             this((String[]) strings.toArray());
         }
-        
+
         public ParamMap(Map<String, String> map) {
             putAll(map);
         }
-        
+
         public void put(String key, int value) {
             put(key, String.valueOf(value));
         }
-        
+
         public void put(String key, boolean value) {
             put(key, String.valueOf(value));
         }
-        
+
         public void put(ParamMap params) {
             for (String key: params.keySet()) {
                 put(key, params.get(key));
             }
         }
-        
+
     }
-    
+
     public static String getUrl(String path) {
-    	
+
         if ( !path.isEmpty() && !path.startsWith("/") ) {
             path = "/" + path;
         }
         path = contextPath + path;
         return path.isEmpty() ? "/" : path;
     }
-    
+
     public static String getUrl(Route route) {
         return getUrl(route.path());
     }
-    
+
     public static String getUrl(String path, String...params) {
         ParamMap urlParams = new ParamMap(params);
         return getUrl(path, urlParams);
     }
-    
+
     public static String getUrl(Route route, String...params) {
         return getUrl(route.path(), params);
     }
-    
+
     public static String getUrl(String path, ParamMap params) {
         path = getPath(path, params);
-        return getUrl(path);       
+        return getUrl(path);
     }
 
     //TODO: document this as it is used all over the app
-    //does this append the context?  What if params is null? 
+    //does this append the context?  What if params is null?
     //What if you want a route that isn't in Route?
     public static String getUrl(Route route, ParamMap params) {
         return getUrl(route.path(), params);
     }
-    
+
     public static String getPath(String path, ParamMap params) {
-        return addParams(path, params, "?");      
+        return addParams(path, params, "?");
     }
-    
+
     private static String addParams(String url, ParamMap params, String glue) {
         if (params.size() > 0) {
             StringBuilder sb = new StringBuilder(url);
@@ -227,32 +227,32 @@ public class UrlBuilder {
 
         return url;
     }
-    
+
     public static String addParams(String url, ParamMap params) {
         String glue = url.contains("?") ? "&" : "?";
         return addParams(url, params, glue);
     }
-    
+
     public static String addParams(String url, String...params) {
         return addParams(url, new ParamMap(params));
     }
-    
+
     public static String addParams(String url, List<String> params) {
         return addParams(url, new ParamMap(params));
     }
-    
+
     public static String getPath(Route route, ParamMap params) {
         return getPath(route.path(), params);
     }
-    
+
     public static String getIndividualProfileUrl(Individual individual, VitroRequest vreq) {
         WebappDaoFactory wadf = vreq.getWebappDaoFactory();
         String profileUrl = null;
         try {
             String localName = individual.getLocalName();
             String namespace = individual.getNamespace();
-            String defaultNamespace = wadf.getDefaultNamespace();                
-                    
+            String defaultNamespace = wadf.getDefaultNamespace();
+
             if (defaultNamespace.equals(namespace)) {
                 profileUrl = getUrl(Route.DISPLAY.path() + "/" + localName);
             } else {
@@ -267,7 +267,7 @@ public class UrlBuilder {
         } catch (Exception e) {
             log.warn(e);
             return null;
-        }        
+        }
 
         if (profileUrl != null) {
             LinkedHashMap<String, String> specialParams = getModelParams(vreq);
@@ -275,38 +275,38 @@ public class UrlBuilder {
                 profileUrl = addParams(profileUrl, new ParamMap(specialParams));
             }
         }
-        
+
         return profileUrl;
     }
 
     /**
-     * If you already have an Individual object around, 
-     * call getIndividualProfileUrl(Individual, VitroRequest) 
-     * instead of this method. 
+     * If you already have an Individual object around,
+     * call getIndividualProfileUrl(Individual, VitroRequest)
+     * instead of this method.
      */
-    public static String getIndividualProfileUrl(String individualUri, VitroRequest vreq) {        
+    public static String getIndividualProfileUrl(String individualUri, VitroRequest vreq) {
         return getIndividualProfileUrl(new IndividualImpl(individualUri),  vreq);
-    }    
-    
+    }
+
     public static boolean isUriInDefaultNamespace(String individualUri, VitroRequest vreq) {
         return isUriInDefaultNamespace(individualUri, vreq.getWebappDaoFactory());
     }
-    
+
     public static boolean isUriInDefaultNamespace(String individualUri, WebappDaoFactory wadf) {
         return isUriInDefaultNamespace( individualUri, wadf.getDefaultNamespace());
     }
-    
+
     public static boolean isUriInDefaultNamespace(String individualUri, String defaultNamespace){
         try {
-            Individual ind = new IndividualImpl(individualUri); 
-            String namespace = ind.getNamespace();          
+            Individual ind = new IndividualImpl(individualUri);
+            String namespace = ind.getNamespace();
             return defaultNamespace.equals(namespace);
         } catch (Exception e) {
             log.warn(e);
             return false;
         }
     }
-    
+
     public static String urlEncode(String str) {
         String encoding = "UTF-8";
         String encodedUrl = null;
@@ -328,11 +328,11 @@ public class UrlBuilder {
         }
         return decodedUrl;
     }
-    
+
     //To be used in different property templates so placing method for reuse here
     //Check if special params included, specifically for menu management and other models
     public static LinkedHashMap<String,String> getModelParams(VitroRequest vreq) {
-    	
+
     	LinkedHashMap<String,String> specialParams = new LinkedHashMap<String, String>();
     	if(vreq != null) {
     		//this parameter is sufficient to switch to menu model
@@ -346,7 +346,7 @@ public class UrlBuilder {
 	    	}
 	    	else if(useMainModelUri != null && !useMainModelUri.isEmpty()) {
 	    		specialParams.put(DisplayVocabulary.USE_MODEL_PARAM, useMainModelUri);
-	    		if(useTboxModelUri != null && !useTboxModelUri.isEmpty()){ 
+	    		if(useTboxModelUri != null && !useTboxModelUri.isEmpty()){
 	    			specialParams.put(DisplayVocabulary.USE_TBOX_MODEL_PARAM, useTboxModelUri);
 	    		}
 	    		if(useDisplayModelUri != null && !useDisplayModelUri.isEmpty()) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ViewLabelsServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ViewLabelsServlet.java
index 65516251b..1425b10f7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ViewLabelsServlet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ViewLabelsServlet.java
@@ -40,7 +40,7 @@ import edu.cornell.mannlib.vitro.webapp.i18n.selection.SelectedLocale;
 @WebServlet(name = "ViewLabelsServlet", urlPatterns = {"/viewLabels"} )
 public class ViewLabelsServlet extends FreemarkerHttpServlet{
     private static final Log log = LogFactory.getLog(ViewLabelsServlet.class.getName());
-    
+
     @Override
 	protected ResponseValues processRequest(VitroRequest vreq) {
 		Map<String, Object> body = new HashMap<String, Object>();
@@ -59,31 +59,31 @@ public class ViewLabelsServlet extends FreemarkerHttpServlet{
 			HashSet<String> existingLanguageNames = new HashSet<String>(existingLabelsByLanguageName.keySet());
 			body.put("labelsSortedByLanguageName", existingLabelsByLanguageName);
 		  Individual subject = vreq.getWebappDaoFactory().getIndividualDao().getIndividualByURI(subjectUri);
-	       
-		  
+
+
 		  if( subject != null && subject.getName() != null ){
 	            body.put("subjectName", subject.getName());
 	        }else{
 	            body.put("subjectName", null);
 	        }
-		
+
 		} catch (Throwable e) {
 			log.error(e, e);
 			return new ExceptionResponseValues(e);
 		}
-		
+
 		String template = "viewLabelsForIndividual.ftl";
-        
+
 		return new TemplateResponseValues(template, body);
     }
   //Languages sorted by language name
   	private HashMap<String, List<LabelInformation>> getLabelsSortedByLanguageName(List<Literal> labels, Map<String, String> localeCodeToNameMap,
   			VitroRequest vreq, String subjectUri) {
-  		
-  		
+
+
   		//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 = "";
@@ -95,7 +95,7 @@ public class ViewLabelsServlet extends FreemarkerHttpServlet{
   			} 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>());
@@ -104,13 +104,13 @@ public class ViewLabelsServlet extends FreemarkerHttpServlet{
   				//This should put the label in the list
   				//Create label information instance with the required information
   				//To generate link
-  				
-  				
+
+
   				labelsList.add(new LabelInformation(
   						l, languageTag, languageName));
   			}
   		}
-  		
+
   		//Sort each label list
   		LabelInformationComparator lic = new LabelInformationComparator();
   		for(String languageName: labelsHash.keySet()) {
@@ -118,25 +118,25 @@ public class ViewLabelsServlet extends FreemarkerHttpServlet{
   			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());
   		}
   	}
 
-    
-    
+
+
     @Override
 	public void doPost(HttpServletRequest request, HttpServletResponse response)
 			throws ServletException, IOException {
 		doGet(request, response);
 	}
-    
+
     //get locales
     public List<HashMap<String, String>> getLocales(VitroRequest vreq) {
     	List<Locale> selectables = SelectedLocale.getSelectableLocales(vreq);
@@ -153,10 +153,10 @@ public class ViewLabelsServlet extends FreemarkerHttpServlet{
 						+ "': " + e);
 			}
 		}
-		
+
 		return list;
     }
-    
+
     //copied from locale selection data getter but don't need all this information
     private HashMap<String, String> buildLocaleMap(Locale locale,
 			Locale currentLocale) throws FileNotFoundException {
@@ -166,22 +166,22 @@ public class ViewLabelsServlet extends FreemarkerHttpServlet{
 		map.put("label", locale.getDisplayName(currentLocale));
 		return map;
 	}
-    
+
     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;
     }
-    
+
     private ArrayList<Literal>  getExistingLabels(String subjectUri, VitroRequest vreq) {
         String queryStr = QueryUtils.subUriForQueryVar(LABEL_QUERY, "subject", subjectUri);
         log.debug("queryStr = " + queryStr);
@@ -193,52 +193,52 @@ public class ViewLabelsServlet extends FreemarkerHttpServlet{
             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;
     }
-    
+
     //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 languageCode; //languageCode
-    	private String languageName; 
+    	private String languageName;
     	public LabelInformation(Literal inputLiteral,  String inputLanguageCode, String inputLanguageName) {
     		this.labelLiteral = inputLiteral;
-    	
+
     		this.languageCode = inputLanguageCode;
     		this.languageName = inputLanguageName;
     	}
-    	
-    	
+
+
     	public Literal getLabelLiteral() {
     		return this.labelLiteral;
     	}
-    	
+
     	public String getLabelStringValue() {
     		return this.labelLiteral.getString();
     	}
-    	
-    	
+
+
     	public String getLanguageCode() {
     		return this.languageCode;
     	}
-    	
+
     	public String getLanguageName() {
     		return this.languageName;
     	}
     }
-    
+
     private static String LABEL_QUERY = ""
 	        + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
 	        + "SELECT DISTINCT ?label WHERE { \n"
 	        + "    ?subject rdfs:label ?label \n"
 	        + "} ORDER BY ?label";
-	    
-}
\ No newline at end of file
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/BaseResponseValues.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/BaseResponseValues.java
index abf0043d5..4e13304f2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/BaseResponseValues.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/BaseResponseValues.java
@@ -12,9 +12,9 @@ public abstract class BaseResponseValues implements ResponseValues {
 
     private int statusCode = 0;
     private ContentType contentType = null;
-    
+
     BaseResponseValues() { }
-    
+
     BaseResponseValues(int statusCode) {
         this.statusCode = statusCode;
     }
@@ -27,12 +27,12 @@ public abstract class BaseResponseValues implements ResponseValues {
         this.contentType = contentType;
         this.statusCode = statusCode;
     }
-    
+
     @Override
     public int getStatusCode() {
         return statusCode;
     }
-    
+
     @Override
     public void setStatusCode(int statusCode) {
         this.statusCode = statusCode;
@@ -65,19 +65,19 @@ public abstract class BaseResponseValues implements ResponseValues {
         throw new UnsupportedOperationException(
                 "This is not a redirect response.");
     }
-    
+
     @Override
     public Map<String, String> getHeader() {
         throw new UnsupportedOperationException(
                 "This is not a header response.");
     }
-    
+
     @Override
     public String getForwardUrl() {
         throw new UnsupportedOperationException(
                 "This is not a forwarding response.");
     }
-    
+
     @Override
     public Throwable getException() {
         throw new UnsupportedOperationException(
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/DirectRedirectResponseValues.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/DirectRedirectResponseValues.java
index a5f6d8844..489a586e4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/DirectRedirectResponseValues.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/DirectRedirectResponseValues.java
@@ -4,19 +4,19 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues;
 
 /**
  * This could be called the "Redirect to where I say, damm it" ResponseValue.
- * 
- * It redirects to the URL specified.  It does not attempt to add a 
+ *
+ * It redirects to the URL specified.  It does not attempt to add a
  * context node.  This is useful when you want to redirect to a URL
  * created by the UrlBuilder which uses statics to sneak a context
- * into the URL strings it creates.    
+ * into the URL strings it creates.
  */
 public class DirectRedirectResponseValues extends RedirectResponseValues {
 
     /** This will redirect to the url. It will not add the context to the url.*/
     public DirectRedirectResponseValues(String url, int statusCode) {
-        super(url, statusCode);        
+        super(url, statusCode);
     }
-    
+
     /** This will redirect to the url. It will not add the context to the url.*/
     public DirectRedirectResponseValues(String url){
         super(url);
@@ -28,5 +28,5 @@ public class DirectRedirectResponseValues extends RedirectResponseValues {
     @Override
     protected String getRedirectUrl(String url) {
         return url;
-    }        
+    }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ExceptionResponseValues.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ExceptionResponseValues.java
index fb42de6a7..57cd294b3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ExceptionResponseValues.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ExceptionResponseValues.java
@@ -17,7 +17,7 @@ public class ExceptionResponseValues extends TemplateResponseValues {
         super(DEFAULT_TEMPLATE_NAME, statusCode);
         this.cause = cause;
     }
-    
+
     public ExceptionResponseValues(String templateName, Throwable cause) {
         super(templateName);
         this.cause = cause;
@@ -27,7 +27,7 @@ public class ExceptionResponseValues extends TemplateResponseValues {
         super(templateName, statusCode);
         this.cause = cause;
     }
-    
+
     public ExceptionResponseValues(String templateName, Map<String, Object> map, Throwable cause) {
         super(templateName, map);
         this.cause = cause;
@@ -41,5 +41,5 @@ public class ExceptionResponseValues extends TemplateResponseValues {
     @Override
     public Throwable getException() {
         return cause;
-    }       
+    }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/RdfResponseValues.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/RdfResponseValues.java
index 37b2eb083..679861e06 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/RdfResponseValues.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/RdfResponseValues.java
@@ -8,7 +8,7 @@ import edu.cornell.mannlib.vitro.webapp.web.ContentType;
 
 public class RdfResponseValues extends BaseResponseValues {
     private final Model model;
-    
+
     public RdfResponseValues(ContentType contentType, Model model) {
         super(contentType);
         this.model = model;
@@ -18,7 +18,7 @@ public class RdfResponseValues extends BaseResponseValues {
         super(contentType, statusCode);
         this.model = model;
     }
-    
+
     @Override
     public Model getModel() {
        return model;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/RedirectResponseValues.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/RedirectResponseValues.java
index 7395616f6..15e9900ae 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/RedirectResponseValues.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/RedirectResponseValues.java
@@ -13,13 +13,13 @@ public class RedirectResponseValues extends BaseResponseValues {
 
     private final String redirectUrl;
 
-    /** 
-     * The string redirectUrl will get the context added.    
-       If you want a redirect for a URL that has the context already added, 
-       as is the case if a UrlBuilder was used. use the class DirectRedirectResponseValues. 
-       
+    /**
+     * The string redirectUrl will get the context added.
+       If you want a redirect for a URL that has the context already added,
+       as is the case if a UrlBuilder was used. use the class DirectRedirectResponseValues.
+
        This will attempt to handle an off site redirect by checking for
-        "://" in the URL. 
+        "://" in the URL.
      */
     public RedirectResponseValues(String redirectUrl) {
         this.redirectUrl = getRedirectUrl(redirectUrl);
@@ -29,16 +29,16 @@ public class RedirectResponseValues extends BaseResponseValues {
         super(statusCode);
         this.redirectUrl = getRedirectUrl(redirectUrl);
     }
-    
+
     public RedirectResponseValues(Route redirectUrl) {
         this.redirectUrl = UrlBuilder.getUrl(redirectUrl);
     }
-    
+
     @Override
     public String getRedirectUrl() {
         return this.redirectUrl;
     }
-    
+
     protected String getRedirectUrl(String redirectUrl) {
         return redirectUrl.contains("://") ? redirectUrl : UrlBuilder.getUrl(redirectUrl);
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ResponseValues.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ResponseValues.java
index 4b5fee0a8..c8d8e632b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ResponseValues.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/ResponseValues.java
@@ -17,19 +17,19 @@ public interface ResponseValues {
     public void setStatusCode(int statusCode);
 
     public Map<String, Object> getMap();
-    
+
     public String getRedirectUrl();
 
     public Map<String, String> getHeader();
-    
+
     public String getForwardUrl();
 
     public Throwable getException();
-    
+
     public ContentType getContentType();
-    
+
     public void setContentType(ContentType contentType);
-    
+
     public Model getModel();
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/TemplateResponseValues.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/TemplateResponseValues.java
index c398fc84f..04f9e4139 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/TemplateResponseValues.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/responsevalues/TemplateResponseValues.java
@@ -10,7 +10,7 @@ public class TemplateResponseValues extends BaseResponseValues {
 
     private final String templateName;
     private final Map<String, Object> map;
-    
+
     public TemplateResponseValues(String templateName) {
         this.templateName = templateName;
         this.map = new HashMap<String, Object>();
@@ -21,7 +21,7 @@ public class TemplateResponseValues extends BaseResponseValues {
         this.templateName = templateName;
         this.map = new HashMap<String, Object>();
     }
-    
+
     public TemplateResponseValues(String templateName, Map<String, Object> map) {
         this.templateName = templateName;
         this.map = map;
@@ -32,7 +32,7 @@ public class TemplateResponseValues extends BaseResponseValues {
         this.templateName = templateName;
         this.map = map;
     }
-    
+
     public TemplateResponseValues put(String key, Object value) {
         this.map.put(key, value);
         return this;
@@ -46,7 +46,7 @@ public class TemplateResponseValues extends BaseResponseValues {
     @Override
     public String getTemplateName() {
         return this.templateName;
-    }   
+    }
 
 }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefineMqlreadServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefineMqlreadServlet.java
index 7f7f0daf9..16f8fb026 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefineMqlreadServlet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefineMqlreadServlet.java
@@ -32,16 +32,16 @@ import org.apache.jena.rdf.model.Literal;
  * This servlet is for servicing Google Refine's
  * "Add columns from VIVO"'s search for individual properties.
  * e.g. search for Joe Smith's email in VIVO and download to Google Refine under a new email column.
- * 
+ *
  * @author Eliza Chan (elc2013@med.cornell.edu)
- * 
+ *
  */
 @WebServlet(name = "Google Refine Mqlread Service", urlPatterns = {"/grefineMqlread"} )
 public class GrefineMqlreadServlet extends VitroHttpServlet {
-	
+
 	private static final long serialVersionUID = 1L;
 	private static final Log log = LogFactory.getLog(GrefineMqlreadServlet.class.getName());
-	
+
 	@Override
 	protected void doPost(HttpServletRequest req, HttpServletResponse resp)
 			throws ServletException, IOException {
@@ -57,7 +57,7 @@ public class GrefineMqlreadServlet extends VitroHttpServlet {
 		VitroRequest vreq = new VitroRequest(req);
 		try {
 			if (vreq.getParameter("query") != null) {
-				
+
 				ObjectNode qJson = getResult(vreq, req, resp);
 				log.debug("result: " + qJson.toString());
 				String responseStr = (vreq.getParameter("callback") == null) ? qJson
@@ -75,7 +75,7 @@ public class GrefineMqlreadServlet extends VitroHttpServlet {
 
 	private ObjectNode getResult(VitroRequest vreq, HttpServletRequest req,
 								 HttpServletResponse resp) throws ServletException {
-		
+
 		ObjectNode resultAllJson = JsonNodeFactory.instance.objectNode();
 
 		// parse query
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java
index 82bdcd0e5..893bcbfe9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java
@@ -37,9 +37,9 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 /**
  * This servlet is for servicing Google Refine's
  * "Add columns from VIVO" requests.
- * 
+ *
  * @author Eliza Chan (elc2013@med.cornell.edu)
- * 
+ *
  */
 @WebServlet(name = "Google Refine Property List Service", urlPatterns = {"/get_properties_of_type"} )
 public class GrefinePropertyListServlet extends VitroHttpServlet {
@@ -48,7 +48,7 @@ public class GrefinePropertyListServlet extends VitroHttpServlet {
 	public static final int MAX_QUERY_LENGTH = 500;
 	private static final long serialVersionUID = 1L;
 	private static final Log log = LogFactory.getLog(GrefinePropertyListServlet.class.getName());
-	
+
 
 	@Override
 	protected void doPost(HttpServletRequest req, HttpServletResponse resp)
@@ -63,22 +63,22 @@ public class GrefinePropertyListServlet extends VitroHttpServlet {
 		super.doGet(req, resp);
 		resp.setContentType("application/json");
 		VitroRequest vreq = new VitroRequest(req);
-  
+
 		try {
 
 				String callbackStr = (vreq.getParameter("callback") == null) ? ""
 						: vreq.getParameter("callback");
 				ServletOutputStream out = resp.getOutputStream();
 
-		
+
 				VClassDao vcDao = vreq.getUnfilteredWebappDaoFactory().getVClassDao();
 				DataPropertyDao dao = vreq.getUnfilteredWebappDaoFactory().getDataPropertyDao();
 				String topUri = vreq.getParameter("type");
 				VClass topClass = vcDao.getVClassByURI(topUri);
 				HashSet<String> propURIs = new HashSet<String>();
-				HashMap<VClass, List<DataProperty>> classPropertiesMap = 
+				HashMap<VClass, List<DataProperty>> classPropertiesMap =
 					populateClassPropertiesMap(vcDao, dao, topUri, propURIs);
-				
+
 
 				// Construct json String
 				ObjectNode completeJson = JsonNodeFactory.instance.objectNode();
@@ -86,7 +86,7 @@ public class GrefinePropertyListServlet extends VitroHttpServlet {
 				if (classPropertiesMap.size() > 0) {
 					for (VClass vc : classPropertiesMap.keySet()) { // add results to schema
 						//System.out.println("vc uri: " + vc.getURI());
-						//System.out.println("vc name: " + vc.getName());	
+						//System.out.println("vc name: " + vc.getName());
 
 						ArrayList<DataProperty> vcProps = (ArrayList<DataProperty>) classPropertiesMap.get(vc);
 						for (DataProperty prop : vcProps) {
@@ -115,7 +115,7 @@ public class GrefinePropertyListServlet extends VitroHttpServlet {
 						}
 					}
 				}
-	            
+
 
 				// get data properties from subclasses
 				List<VClass> lvl2Classes = new ArrayList<VClass>();
@@ -141,11 +141,11 @@ public class GrefinePropertyListServlet extends VitroHttpServlet {
 			            }
 			        }
 				}
-				
+
 
 				for (VClass lvl2Class: lvl2Classes) {
-					HashMap<VClass, List<DataProperty>> lvl2ClassPropertiesMap = 
-						populateClassPropertiesMap(vcDao, dao, lvl2Class.getURI(), propURIs);	
+					HashMap<VClass, List<DataProperty>> lvl2ClassPropertiesMap =
+						populateClassPropertiesMap(vcDao, dao, lvl2Class.getURI(), propURIs);
 					if (lvl2ClassPropertiesMap.size() > 0) {
 						for (VClass vc : lvl2ClassPropertiesMap.keySet()) { // add results to schema
 							ArrayList<DataProperty> vcProps = (ArrayList<DataProperty>) lvl2ClassPropertiesMap.get(vc);
@@ -178,25 +178,25 @@ public class GrefinePropertyListServlet extends VitroHttpServlet {
 								propertiesJsonArr.add(propertiesItemJson);
 							}
 						}
-						
+
 					}
 				}
 
 				completeJson.put("properties", propertiesJsonArr);
 				out.print(callbackStr + "(" + completeJson.toString() + ")");
-				
+
 
 
 		} catch (Exception ex) {
 			log.warn(ex, ex);
 		}
 	}
-	
+
 
 	private HashMap<VClass, List<DataProperty>> populateClassPropertiesMap (
-			VClassDao vcDao, 
-			DataPropertyDao dao, 
-			String uri, 
+			VClassDao vcDao,
+			DataPropertyDao dao,
+			String uri,
 			HashSet<String> propURIs) {
 
 		HashMap<VClass, List<DataProperty>> classPropertiesMap = new HashMap<VClass, List<DataProperty>>();
@@ -212,8 +212,8 @@ public class GrefinePropertyListServlet extends VitroHttpServlet {
 				}
 			}
 		}
-        
-    	
+
+
         if (props.size() > 0) {
 
         	Collections.sort(props);
@@ -240,7 +240,7 @@ public class GrefinePropertyListServlet extends VitroHttpServlet {
             				newList.add(prop);
             				classPropertiesMap.put(topVc, newList);
             			}
-            		}							
+            		}
 				}
         	}
         }
@@ -249,7 +249,7 @@ public class GrefinePropertyListServlet extends VitroHttpServlet {
 
 	    private void addChildren(VClassDao vcDao, WebappDaoFactory wadf, VClass parent, List<VClass> list, int position, String ontologyUri) {
 	    	List<VClass> rowElts = addVClassDataToResultsList(wadf, parent, position, ontologyUri);
-	    	int childShift = (rowElts.size() > 0) ? 1 : 0;  // if addVClassDataToResultsList filtered out the result, don't shift the children over 
+	    	int childShift = (rowElts.size() > 0) ? 1 : 0;  // if addVClassDataToResultsList filtered out the result, don't shift the children over
 	    	list.addAll(rowElts);
 	        List childURIstrs = vcDao.getSubClassURIs(parent.getURI());
 	        if ((childURIstrs.size()>0) && position<MAXDEPTH) {
@@ -294,20 +294,20 @@ public class GrefinePropertyListServlet extends VitroHttpServlet {
 	            }
 	            numCols = addColToResults(((vcw.getShortDef() == null) ? "" : vcw.getShortDef()), results, numCols); // column 3
 	            numCols = addColToResults(((vcw.getExample() == null) ? "" : vcw.getExample()), results, numCols); // column 4
-	            
+
 	            // Get group name if it exists
 	            VClassGroupDao groupDao= wadf.getVClassGroupDao();
 	            String groupURI = vcw.getGroupURI();
 	            String groupName = null;
 	            VClassGroup classGroup = null;
-	            if(groupURI != null) { 
+	            if(groupURI != null) {
 	            	classGroup = groupDao.getGroupByURI(groupURI);
 	            	if (classGroup != null) {
 	            		groupName = classGroup.getPublicName();
 	            	}
 	            }
 	            numCols = addColToResults(((groupName == null) ? "" : groupName), results, numCols); // column 5
-	      
+
 	            // Get ontology name
 				String ontName = null;
 				try {
@@ -316,7 +316,7 @@ public class GrefinePropertyListServlet extends VitroHttpServlet {
 	            	ontName = ont.getName();
 				} catch (Exception e) {}
 	            numCols = addColToResults(((ontName == null) ? "" : ontName), results, numCols); // column 6
-	            
+
 	            numCols = addColToResults(vcw.getHiddenFromDisplayBelowRoleLevel()  == null ? "unspecified" : vcw.getHiddenFromDisplayBelowRoleLevel().getShorthand(), results, numCols); // column 7
 	            numCols = addColToResults(vcw.getProhibitedFromUpdateBelowRoleLevel() == null ? "unspecified" : vcw.getProhibitedFromUpdateBelowRoleLevel().getShorthand(), results, numCols); // column 8
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java
index ac602682b..179c4750d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java
@@ -41,9 +41,9 @@ import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames;
 /**
  * This servlet is for servicing JSON requests from Google Refine's
  * Reconciliation Service.
- * 
+ *
  * @author Eliza Chan (elc2013@med.cornell.edu)
- * 
+ *
  */
 @WebServlet(name = "JSON Reconcile Service", urlPatterns = {"/reconcile"} )
 public class JSONReconcileServlet extends VitroHttpServlet {
@@ -90,7 +90,7 @@ public class JSONReconcileServlet extends VitroHttpServlet {
 				int serverPort = req.getServerPort();
 
 				if (vreq.getWebappDaoFactory() != null) {
-					defaultNamespace = vreq.getWebappDaoFactory().getDefaultNamespace();	
+					defaultNamespace = vreq.getWebappDaoFactory().getDefaultNamespace();
 				}
 				defaultTypeList = ConfigurationProperties.getBean(req).getProperty("Vitro.reconcile.defaultTypeList");
 				serverName = req.getServerName();
@@ -182,7 +182,7 @@ public class JSONReconcileServlet extends VitroHttpServlet {
 
 	/**
 	 * Returns a default JSON response.
-	 * 
+	 *
 	 * @param req Servlet Request
 	 * @param resp Servlet Response
 	 */
@@ -231,7 +231,7 @@ public class JSONReconcileServlet extends VitroHttpServlet {
 
 	private ObjectNode runSearch(HashMap<String, JsonNode> currMap) throws ServletException {
 		ObjectNode qJson = JsonNodeFactory.instance.objectNode();
-		
+
 		try {
 
 			for (Map.Entry<String, JsonNode> entry : currMap.entrySet()) {
@@ -241,7 +241,7 @@ public class JSONReconcileServlet extends VitroHttpServlet {
 				String queryVal = json.get("query").asText();
 
 				// System.out.println("query: " + json.toString());
-				
+
 				// continue with properties list
 				String searchType = null;
 				int limit = 10; // default
@@ -285,26 +285,26 @@ public class JSONReconcileServlet extends VitroHttpServlet {
 	                SearchEngine search = ApplicationUtils.instance().getSearchEngine();
 	            	queryResponse = search.query(query);
 	            } else {
-	            	log.error("Query for a search was null");                
+	            	log.error("Query for a search was null");
 	            }
 
 	            SearchResultDocumentList docs = null;
 	            if (queryResponse != null) {
 	            	docs = queryResponse.getResults();
 	            } else {
-	            	log.error("Query response for a search was null");                
+	            	log.error("Query response for a search was null");
 	            }
 
 	            if (docs != null) {
-	            	
+
 	                List<SearchResult> results = new ArrayList<SearchResult>();
 	                for (SearchResultDocument doc : docs) {
-	                    try {                         
+	                    try {
 	                        String uri = doc.getStringValue(VitroSearchTermNames.URI);
 	                        String name = doc.getStringValue(VitroSearchTermNames.NAME_RAW);
-	                        
+
 	                        SearchResult result = new SearchResult(name, uri);
-	                        
+
 	                        // populate result for Google Refine
 							ObjectNode resultJson = JsonNodeFactory.instance.objectNode();
 							Object score = doc.getFirstValue("score");
@@ -316,7 +316,7 @@ public class JSONReconcileServlet extends VitroHttpServlet {
 							String modUri = result.getUri().replace("#", "%23");
 							resultJson.put("id", modUri);
 							resultJson.put("name", result.getLabel());
-							
+
 							Collection<Object> rdfTypes = doc.getFieldValues(VitroSearchTermNames.RDFTYPE);
 							ArrayNode typesJsonArr = JsonNodeFactory.instance.arrayNode();
 							if (rdfTypes != null) {
@@ -347,7 +347,7 @@ public class JSONReconcileServlet extends VitroHttpServlet {
 						}
 					}
 	            } else {
-	            	log.error("Docs for a search was null");                
+	            	log.error("Docs for a search was null");
 	            }
 				resultAllJson.put("result", resultJsonArr);
 				qJson.put(key, resultAllJson);
@@ -368,91 +368,91 @@ public class JSONReconcileServlet extends VitroHttpServlet {
 	}
 
     protected SearchQuery getQuery(String queryStr, String searchType, int limit, ArrayList<String[]> propertiesList) {
-        
+
         if ( queryStr == null) {
-            log.error("There was no parameter '"+ PARAM_QUERY            
-                +"' in the request.");                
+            log.error("There was no parameter '"+ PARAM_QUERY
+                +"' in the request.");
             return null;
         } else if( queryStr.length() > MAX_QUERY_LENGTH ) {
             log.debug("The search was too long. The maximum " +
                     "query length is " + MAX_QUERY_LENGTH );
             return null;
         }
-                   
+
         /// original
         ///SearchQuery query = new SearchQuery();
-        
+
         /// test
         SearchQuery query = ApplicationUtils.instance().getSearchEngine().createQuery(queryStr.toLowerCase());
 
         // original code:
-        // query.setStart(0).setRows(DEFAULT_MAX_HIT_COUNT);  
+        // query.setStart(0).setRows(DEFAULT_MAX_HIT_COUNT);
         // Google Refine specific:
         query.setStart(0).setRows(limit);
-        
+
         // TODO: works better without using tokenizeNameQuery(), need to investigate a bit more
         /// comment out original: query.setQuery(queryStr);
-        
+
         // Filter by type
         // e.g. http://xmlns.com/foaf/0.1/Person
         if (searchType != null) {
         	query.addFilterQuery(VitroSearchTermNames.RDFTYPE + ":\"" + searchType + "\"");
-        }        
-        
+        }
+
         // Added score to original code:
         query.addFields(VitroSearchTermNames.NAME_RAW, VitroSearchTermNames.URI, "*", "score"); // fields to retrieve
- 
+
 		// if propertiesList has elements, add extra queries to query
 		for (String[] pvPair : propertiesList) {
 			query.addFilterQueries(tokenizeNameQuery(pvPair[1]), VitroSearchTermNames.RDFTYPE + ":\"" + pvPair[0] + "\"");
-		}       
+		}
 
         // Can't sort on multivalued field, so we sort the results in Java when we get them.
         // query.addSortField(VitroSearchTermNames.NAME_LOWERCASE, Order.ASC);
-        
+
         return query;
     }
- 
 
-    
+
+
     private String tokenizeNameQuery(String queryStr) {
         /* We currently have no use case for a tokenized, unstemmed autocomplete search field, so the option
          * has been disabled. If needed in the future, will need to add a new field and field type which
          * is like AC_NAME_STEMMED but doesn't include the stemmer.
-        String stemParam = (String) request.getParameter("stem"); 
+        String stemParam = (String) request.getParameter("stem");
         boolean stem = "true".equals(stemParam);
         if (stem) {
             String acTermName = VitroSearchTermNames.AC_NAME_STEMMED;
             String nonAcTermName = VitroSearchTermNames.NAME_STEMMED;
         } else {
             String acTermName = VitroSearchTermNames.AC_NAME_UNSTEMMED;
-            String nonAcTermName = VitroSearchTermNames.NAME_UNSTEMMED;        
+            String nonAcTermName = VitroSearchTermNames.NAME_UNSTEMMED;
         }
         */
-        
+
         String acTermName = VitroSearchTermNames.AC_NAME_STEMMED;
         String nonAcTermName = VitroSearchTermNames.NAME_STEMMED;
         String acQueryStr;
-        
+
         if (queryStr.endsWith(" ")) {
-            acQueryStr = makeTermQuery(nonAcTermName, queryStr, true);    
+            acQueryStr = makeTermQuery(nonAcTermName, queryStr, true);
         } else {
             int indexOfLastWord = queryStr.lastIndexOf(" ") + 1;
             List<String> terms = new ArrayList<String>(2);
-            
+
             String allButLastWord = queryStr.substring(0, indexOfLastWord);
             if (StringUtils.isNotBlank(allButLastWord)) {
                 terms.add(makeTermQuery(nonAcTermName, allButLastWord, true));
             }
-            
+
             String lastWord = queryStr.substring(indexOfLastWord);
             if (StringUtils.isNotBlank(lastWord)) {
                 terms.add(makeTermQuery(acTermName, lastWord, false));
             }
-            
+
             acQueryStr = StringUtils.join(terms, " AND ");
         }
-        
+
         log.debug("Tokenized name query string = " + acQueryStr);
         return acQueryStr;
     }
@@ -472,20 +472,20 @@ public class JSONReconcileServlet extends VitroHttpServlet {
     public class SearchResult implements Comparable<Object> {
         private String label;
         private String uri;
-        
+
         SearchResult(String label, String uri) {
             this.label = label;
             this.uri = uri;
         }
-        
+
         public String getLabel() {
             return label;
         }
-        
+
         public String getUri() {
             return uri;
         }
-        
+
         Map<String, String> toMap() {
             Map<String, String> map = new HashMap<String, String>();
             map.put("label", label);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/ExtendedRdfAssembler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/ExtendedRdfAssembler.java
index 11bb087d2..18b8a0bc3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/ExtendedRdfAssembler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/ExtendedRdfAssembler.java
@@ -49,7 +49,7 @@ import edu.cornell.mannlib.vitro.webapp.web.ContentType;
 public class ExtendedRdfAssembler {
 	private static final Log log = LogFactory
 			.getLog(ExtendedRdfAssembler.class);
-	
+
     private static final String RICH_EXPORT_ROOT = "/WEB-INF/rich-export/";
     private static final String PERSON_CLASS_URI = "http://xmlns.com/foaf/0.1/Person";
     private static final String INCLUDE_ALL = "all";
@@ -60,10 +60,10 @@ public class ExtendedRdfAssembler {
     	put("vitro", VitroVocabulary.vitroURI);
     	put("vitroPublic", VitroVocabulary.VITRO_PUBLIC);
     }};
-    
+
 	private static final Property extendedLinkedDataProperty = ResourceFactory.createProperty(namespaces.get("vitro") + "extendedLinkedData");
 	private static final Literal xsdTrue = ResourceFactory.createTypedLiteral("true", XSDDatatype.XSDboolean);
-	
+
 	private final VitroRequest vreq;
 	private final ServletContext ctx;
 	private final Individual individual;
@@ -89,9 +89,9 @@ public class ExtendedRdfAssembler {
 	}
 
     private Model getRDF(Individual entity, OntModel contextModel, Model newModel, int recurseDepth, String[] includes) {
-    	
+
     	Resource subj = newModel.getResource(entity.getURI());
-    	
+
     	List<DataPropertyStatement> dstates = entity.getDataPropertyStatements();
     	TypeMapper typeMapper = TypeMapper.getInstance();
     	for (DataPropertyStatement ds: dstates) {
@@ -103,13 +103,13 @@ public class ExtendedRdfAssembler {
 	        	lit = newModel.createTypedLiteral(ds.getData(),typeMapper.getSafeTypeByName(ds.getDatatypeURI()));
 	        } else {
 	        	lit = newModel.createLiteral(ds.getData());
-	        } 
+	        }
     		newModel.add(newModel.createStatement(subj, dp, lit));
     	}
-    	
+
     	if (recurseDepth < 5) {
 	    	List<ObjectPropertyStatement> ostates = entity.getObjectPropertyStatements();
-	    	
+
 	    	for (ObjectPropertyStatement os: ostates) {
 	    		Property prop = newModel.getProperty(os.getPropertyURI());
 	    		Resource obj = newModel.getResource(os.getObjectURI());
@@ -122,16 +122,16 @@ public class ExtendedRdfAssembler {
 	    				newModel.add(contextModel.listStatements(obj, RDFS.label, (RDFNode)null));
 	    			} finally {
 	    				contextModel.leaveCriticalSection();
-	    			} 
+	    			}
 	    	    }
 	    	}
     	}
-    	
+
     	newModel = getLabelAndTypes(entity, contextModel, newModel );
 		newModel = getStatementsWithUntypedProperties(subj, contextModel,
 				ModelAccess.on(vreq).getOntModel(FULL_ASSERTIONS), newModel);
-    	
-    	//bdc34: The following code adds all triples where entity is the Subject. 
+
+    	//bdc34: The following code adds all triples where entity is the Subject.
 //    	contextModel.enterCriticalSection(Lock.READ);
 //		try {
 //			StmtIterator iter = contextModel.listStatements(subj, (Property) null, (RDFNode) null);
@@ -140,99 +140,99 @@ public class ExtendedRdfAssembler {
 //				if (!newModel.contains(stmt)) {
 //				   newModel.add(stmt);
 //				}
-//			}  
+//			}
 //		} finally {
 //			contextModel.leaveCriticalSection();
-//		} 
-			
+//		}
+
 		if (recurseDepth == 0 && includes != null && entity.isVClass(PERSON_CLASS_URI)) {
-			
+
 	        for (String include : includes) {
-	       
+
 	        	String rootDir = null;
 	        	if (INCLUDE_ALL.equals(include)) {
 	        		rootDir = RICH_EXPORT_ROOT;
 	        	} else {
 	        		rootDir = RICH_EXPORT_ROOT +  include + "/";
 	        	}
-	        	
+
 	        	long start = System.currentTimeMillis();
 				Model extendedModel = ExtendedLinkedDataUtils.createModelFromQueries(ctx, rootDir, contextModel, entity.getURI());
 	        	long elapsedTimeMillis = System.currentTimeMillis()-start;
 	        	log.info("Time to create rich export model: msecs = " + elapsedTimeMillis);
-	        	
+
 				newModel.add(extendedModel);
 	        }
 		}
-		
+
     	return newModel;
     }
 
     public static boolean includeInLinkedData(Resource object, Model contextModel) {
-    	 
+
        	boolean retval = false;
-       	
+
        	contextModel.enterCriticalSection(Lock.READ);
-       	
+
        	try {
 	    	StmtIterator iter = contextModel.listStatements(object, RDF.type, (RDFNode)null);
-	    	    	
+
 	    	while (iter.hasNext()) {
 	    		Statement stmt = iter.next();
-	    		
+
 	    		if (stmt.getObject().isResource() && contextModel.contains(stmt.getObject().asResource(), extendedLinkedDataProperty, xsdTrue)) {
 	    			retval = true;
 	    		    break;
-	    		}	
+	    		}
 	    	}
        	} finally {
        		contextModel.leaveCriticalSection();
        	}
-    	   	
+
     	return retval;
-    }    
+    }
 
     /* Get the properties that are difficult to get via a filtered WebappDaoFactory. */
     private Model getLabelAndTypes(Individual entity, Model ontModel, Model newModel){
     	for( VClass vclass : entity.getVClasses()){
     		newModel.add(newModel.getResource(entity.getURI()), RDF.type, newModel.getResource(vclass.getURI()));
     	}
-    	
+
     	ontModel.enterCriticalSection(Lock.READ);
 		try {
 			newModel.add(ontModel.listStatements(ontModel.getResource(entity.getURI()), RDFS.label, (RDFNode)null));
 		} finally {
 			ontModel.leaveCriticalSection();
 		}
-		
+
     	return newModel;
     }
-    
-    /* This method adds in statements in which the property does not 
-     * have an rdf type in the asserted model. 
-     * This was added for release 1.5 to handle cases such as the 
+
+    /* This method adds in statements in which the property does not
+     * have an rdf type in the asserted model.
+     * This was added for release 1.5 to handle cases such as the
      * reasoning-plugin inferred dcterms:creator assertion
      */
     private Model getStatementsWithUntypedProperties(Resource subject, OntModel contextModel, OntModel assertionsModel, Model newModel) {
     	contextModel.enterCriticalSection(Lock.READ);
-		try { 	    	
+		try {
 			StmtIterator iter = contextModel.listStatements(subject, (Property) null, (RDFNode) null);
 			while (iter.hasNext()) {
 				Statement stmt = iter.next();
 				Property property = stmt.getPredicate();
 		    	assertionsModel.enterCriticalSection(Lock.READ);
 				try {
-				    if (!assertionsModel.contains(property, RDF.type) && !newModel.contains(stmt)) {	
+				    if (!assertionsModel.contains(property, RDF.type) && !newModel.contains(stmt)) {
 					   newModel.add(stmt);
 				    }
 				} finally {
 					assertionsModel.leaveCriticalSection();
-				} 
-			}  
+				}
+			}
 		} finally {
 			contextModel.leaveCriticalSection();
-		} 
-	
+		}
+
     	return newModel;
     }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualController.java
index 35a8ed89b..b8d9745b9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualController.java
@@ -33,7 +33,7 @@ public class IndividualController extends FreemarkerHttpServlet {
 			.getLog(IndividualController.class);
 
 	private static final String TEMPLATE_HELP = "individual-help.ftl";
-	
+
 	@Deprecated
 	private static final String PROPERTY_EXTENDED_LOD = "serveExtendedLinkedData";
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssembler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssembler.java
index b9074945d..90e5608c2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssembler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssembler.java
@@ -48,23 +48,23 @@ import edu.cornell.mannlib.vitro.webapp.web.ContentType;
 
 /**
  * Write a smaller set of Linked Data. It consists of:
- * 
+ *
  * 1) The data properties of the entity
- * 
+ *
  * 2) The object properties in which the entity is either subject or object
- * 
+ *
  * 3) The labels and types of the objects that are linked by those properties.
- * 
+ *
  * If the request comes with an Accept-language header, use an appropriately
  * language-aware data source to filter the data properties and labels.
  * Otherwise, show all triples, regardless of language.
- * 
+ *
  * Filter the result based on the policy, removing any triples that should not
  * be published to the public (or to the user, if logged in). Also remove any
  * objects which can only be reached by excluded triples.
- * 
+ *
  * ----------------
- * 
+ *
  * This still permits the use of rich export, by "include" options on the
  * request. The only difference from earlier implementations is that the result
  * may be made language-aware.
@@ -300,9 +300,9 @@ public class IndividualRdfAssembler {
 
 	/**
 	 * Add info about the RDF itself.
-	 * 
+	 *
 	 * It will look something like this:
-	 * 
+	 *
 	 * <pre>
 	 * <http://vivo.cornell.edu/individual/n6628/n6628.rdf>
 	 *     rdfs:label "RDF description of Baker, Able - http://vivo.cornell.edu/individual/n6628" ;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRequestAnalysisContext.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRequestAnalysisContext.java
index 0073e5315..af589b67d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRequestAnalysisContext.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRequestAnalysisContext.java
@@ -17,7 +17,7 @@ public interface IndividualRequestAnalysisContext {
 
 	/**
 	 * Use the IndividualDao to get this individual.
-	 * 
+	 *
 	 * If the URI is null, or if no such Individual exists, return null.
 	 */
 	Individual getIndividualByURI(String individualUri);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRequestAnalysisContextImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRequestAnalysisContextImpl.java
index 24a073a0a..41aaadc3f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRequestAnalysisContextImpl.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRequestAnalysisContextImpl.java
@@ -17,13 +17,13 @@ import edu.cornell.mannlib.vitro.webapp.filestorage.model.FileInfo;
  */
 public class IndividualRequestAnalysisContextImpl implements
 		IndividualRequestAnalysisContext {
-		
-	private final VitroRequest vreq;	
+
+	private final VitroRequest vreq;
 	private final WebappDaoFactory wadf;
 	private final IndividualDao iDao;
 
 	public IndividualRequestAnalysisContextImpl(VitroRequest vreq) {
-		this.vreq = vreq;	
+		this.vreq = vreq;
 		this.wadf = vreq.getWebappDaoFactory();
 		this.iDao = wadf.getIndividualDao();
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRequestAnalyzer.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRequestAnalyzer.java
index a6e5c71b4..2ac6831f6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRequestAnalyzer.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRequestAnalyzer.java
@@ -27,12 +27,12 @@ import edu.cornell.mannlib.vitro.webapp.web.ContentType;
 public class IndividualRequestAnalyzer {
 	private static final Log log = LogFactory
 			.getLog(IndividualRequestAnalyzer.class);
-	
-	
+
+
 	private static Pattern RDF_REQUEST = Pattern.compile("^/individual/([^/]+)/\\1\\.(rdf|n3|ttl|jsonld)$");
     private static Pattern HTML_REQUEST = Pattern.compile("^/display/([^/]+)$");
-	private static Pattern LINKED_DATA_URL = Pattern.compile("^/individual/([^/]+)$");		
-	
+	private static Pattern LINKED_DATA_URL = Pattern.compile("^/individual/([^/]+)$");
+
 	private final VitroRequest vreq;
 	private final IndividualRequestAnalysisContext analysisContext;
 	private final String url;
@@ -55,27 +55,27 @@ public class IndividualRequestAnalyzer {
 		if (redirectUrl != null) {
 			return IndividualRequestInfo.buildRdfRedirectInfo(redirectUrl);
 		}
-	
+
 		// Figure out what individual we are talking about. If we can't figure
 		// it out, complain.
 		Individual individual = getIndividualFromRequest();
 		if (individual == null) {
 			return IndividualRequestInfo.buildNoIndividualInfo();
 		}
-	
+
 		// If the requested individual is a FileBytestream, redirect to its
 		// "alias URL".
 		redirectUrl = getAliasUrlForBytestreamIndividual(individual);
 		if (redirectUrl != null) {
 			return IndividualRequestInfo.buildBytestreamRedirectInfo(redirectUrl);
 		}
-	
+
 		// Check to see whether Linked Data was requested.
 		ContentType rdfFormat = checkUrlForLinkedDataRequest();
 		if (rdfFormat != null) {
 			return IndividualRequestInfo.buildLinkedDataInfo(individual, rdfFormat);
 		}
-	
+
 		// No redirect, no Linked Data; no problem.
 		return IndividualRequestInfo.buildDefaultInfo(individual);
 	}
@@ -95,7 +95,7 @@ public class IndividualRequestAnalyzer {
 	 */
 	private static Pattern URI_PATTERN = Pattern
 			.compile("^/individual/([^/]*)$");
-	
+
 	private String checkForRedirect() {
 		// A "format" parameter is special, and is dealt with elsewhere.
 		String formatParam = getRequestParameter("format", "");
@@ -126,7 +126,7 @@ public class IndividualRequestAnalyzer {
 		// or redirect to the canonical URL for HTML representation.
 		return "/display/" + m.group(1);
 	}
-	
+
 	/**
 	 * Check the accept header. This request will trigger a redirect with a 303
 	 * ("see also"), because the request is for an individual but the server can
@@ -134,17 +134,17 @@ public class IndividualRequestAnalyzer {
 	 */
 	protected ContentType checkAcceptHeaderForLinkedDataRequest() {
 		String acceptHeader = vreq.getHeader("Accept");
-		if (acceptHeader == null) 
-		    acceptHeader = vreq.getHeader("accept");		   
 		if (acceptHeader == null)
-			return null;		
-	
+		    acceptHeader = vreq.getHeader("accept");
+		if (acceptHeader == null)
+			return null;
+
 		try {
 			Map<String, Float> typesAndQ = ContentType
 					.getTypesAndQ(acceptHeader);
 			String ctStr = ContentType.getBestContentType(typesAndQ,
 					IndividualController.ACCEPTED_CONTENT_TYPES);
-	
+
 			if (RDFXML_MIMETYPE.equals(ctStr) || N3_MIMETYPE.equals(ctStr)
 					|| TTL_MIMETYPE.equals(ctStr) || JSON_MIMETYPE.equals(ctStr)
 					|| JSON_LD_MIMETYPE.equals(ctStr)) {
@@ -155,23 +155,23 @@ public class IndividualRequestAnalyzer {
 		}
 		return null;
 	}
-	
+
 	/**
 	 * Gets the entity id from the request. Works for the following styles of
 	 * URLs:
-	 * 
+	 *
 	 * <pre>
 	 *     /individual?uri=urlencodedURI
 	 *     /individual?netId=bdc34
 	 *     /individual?netid=bdc34
-	 *     /individual/localname         
+	 *     /individual/localname
 	 *     /display/localname
 	 *     /individual/localname/localname.rdf
 	 *     /individual/localname/localname.n3
 	 *     /individual/localname/localname.ttl
 	 *     /individual/localname/localname.jsonld
 	 * </pre>
-	 * 
+	 *
 	 * @return null on failure.
 	 */
 	public Individual getIndividualFromRequest() {
@@ -181,32 +181,32 @@ public class IndividualRequestAnalyzer {
 			if (!uri.isEmpty()) {
 				return getIndividualByUri(uri);
 			}
-	
+
 			// Check for "netId" or "netid" parameter
 			String netId = getRequestParameter("netId",
 					getRequestParameter("netid", ""));
 			if (!netId.isEmpty()) {
 				return getIndividualByNetId(netId);
 			}
-	
+
 			// Check for just a local name
 			Matcher linkedDataMatch = LINKED_DATA_URL.matcher(url);
 			if (linkedDataMatch.matches() && linkedDataMatch.groupCount() == 1) {
 				return getIndividualByLocalname(linkedDataMatch.group(1));
 			}
-	
+
 			// Check for the canonical HTML request.
 			Matcher htmlMatch = HTML_REQUEST.matcher(url);
 			if (htmlMatch.matches() && htmlMatch.groupCount() == 1) {
 				return getIndividualByLocalname(htmlMatch.group(1));
 			}
-	
+
 			// Check for a request for RDF.
 			Matcher rdfMatch = RDF_REQUEST.matcher(url);
 			if (rdfMatch.matches() && rdfMatch.groupCount() == 2) {
 				return getIndividualByLocalname(rdfMatch.group(1));
 			}
-	
+
 			// Couldn't match it to anything.
 			return null;
 		} catch (Throwable e) {
@@ -214,10 +214,10 @@ public class IndividualRequestAnalyzer {
 			return null;
 		}
 	}
-	
+
 	private String getAliasUrlForBytestreamIndividual(Individual individual) {
 		String aliasUrl =  analysisContext.getAliasUrlForBytestreamIndividual(individual);
-		
+
 		if (individual.getURI().equals(aliasUrl)) {
 			// Avoid a tight loop; if the alias URL is equal to the URI,
 			// then don't recognize it as a FileBytestream.
@@ -230,7 +230,7 @@ public class IndividualRequestAnalyzer {
 	/**
 	 * @return null if this is not a linked data request, returns content type
 	 *         if it is a linked data request.
-	 * 
+	 *
 	 *         These are Vitro-specific ways of requesting rdf, unrelated to
 	 *         semantic web standards. They do not trigger a redirect with a
 	 *         303, because the request is for a set of bytes rather than an
@@ -254,7 +254,7 @@ public class IndividualRequestAnalyzer {
         if (formatParam.contains("jsonld") || formatParam.contains("json")){
             return ContentType.JSON;
         }
-                
+
 		/*
 		 * Check for parts of URL that indicate request for RDF. Examples:
 		 * http://vivo.cornell.edu/individual/n23/n23.rdf
@@ -281,7 +281,7 @@ public class IndividualRequestAnalyzer {
 
 		return null;
 	}
-	
+
 
 
 	private String getRequestParameter(String key, String defaultValue) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualResponseBuilder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualResponseBuilder.java
index 652740a02..e0a5613e2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualResponseBuilder.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualResponseBuilder.java
@@ -42,13 +42,13 @@ import freemarker.template.TemplateModelException;
 /**
  * We have determined that the request is for a normal Individual, and needs an
  * HTML response. Assemble the information for that response.
- * 
+ *
  * TODO clean this up.
  */
 class IndividualResponseBuilder {
 	private static final Log log = LogFactory
 			.getLog(IndividualResponseBuilder.class);
-	
+
     private static final Map<String, String> namespaces = new HashMap<String, String>() {{
         put("display", VitroVocabulary.DISPLAY);
         put("vitro", VitroVocabulary.vitroURI);
@@ -70,15 +70,15 @@ class IndividualResponseBuilder {
 		this.opDao = wadf.getObjectPropertyDao();
 
 		this.individual = individual;
-		//initializing execute data retrieval 
+		//initializing execute data retrieval
 		this.eDataRetrieval = new ExecuteDataRetrieval(this.vreq, this.vreq.getDisplayModel(), this.individual);
 	}
 
 
 	ResponseValues assembleResponse() throws TemplateModelException {
 		Map<String, Object> body = new HashMap<String, Object>();
-		
-		body.put("title", individual.getName());            
+
+		body.put("title", individual.getName());
 		body.put("relatedSubject", getRelatedSubject());
 		body.put("namespaces", namespaces);
 		body.put("temporalVisualizationEnabled", getTemporalVisualizationFlag());
@@ -94,8 +94,8 @@ class IndividualResponseBuilder {
 		} catch(Exception ex) {
 			log.error("Data retrieval for individual lead to error", ex);
 		}
-		
-		// for quick profile view - users can toggle between the quick and the full views, 
+
+		// for quick profile view - users can toggle between the quick and the full views,
 		// so the "destination" let's us know which view they are targeting. On normal
 		// page request, this string is empty and the default template is loaded.
         String targetedView = "";
@@ -104,10 +104,10 @@ class IndividualResponseBuilder {
 
 		//Individual template model
 		IndividualTemplateModel itm = getIndividualTemplateModel(individual);
-		/* We need to expose non-getters in displaying the individual's property list, 
+		/* We need to expose non-getters in displaying the individual's property list,
 		 * since it requires calls to methods with parameters.
 		 * This is still safe, because we are only putting BaseTemplateModel objects
-		 * into the data model: no real data can be modified. 
+		 * into the data model: no real data can be modified.
 		 */
 		// body.put("individual", wrap(itm, BeansWrapper.EXPOSE_SAFE));
 	    body.put("labelCount", getLabelCount(itm.getUri(), vreq));
@@ -116,17 +116,17 @@ class IndividualResponseBuilder {
 	    body.put("localesCount", SelectedLocale.getSelectableLocales(vreq).size());
 	    body.put("profileType", getProfileType(itm.getUri(), vreq));
 		body.put("individual", wrap(itm, new ReadOnlyBeansWrapper()));
-		
-		body.put("headContent", getRdfLinkTag(itm));	       
-		
+
+		body.put("headContent", getRdfLinkTag(itm));
+
 		//If special values required for individuals like menu, include values in template values
 		body.putAll(getSpecialEditingValues());
-		
+
         // VIVO OpenSocial Extension by UCSF
         try {
-	        OpenSocialManager openSocialManager = new OpenSocialManager(vreq, 
+	        OpenSocialManager openSocialManager = new OpenSocialManager(vreq,
 	        		itm.isEditable() ? "individual-EDIT-MODE" : "individual", itm.isEditable());
-	        openSocialManager.setPubsubData(OpenSocialManager.JSON_PERSONID_CHANNEL, 
+	        openSocialManager.setPubsubData(OpenSocialManager.JSON_PERSONID_CHANNEL,
 	        		OpenSocialManager.buildJSONPersonIds(individual, "1 person found"));
 	        body.put(OpenSocialManager.TAG_NAME, openSocialManager);
 	        if (openSocialManager.isVisible()) {
@@ -136,24 +136,24 @@ class IndividualResponseBuilder {
         	log.error("IOException in doTemplate()", e);
         } catch (SQLException e) {
             log.error("SQLException in doTemplate()", e);
-        }	               
-        
+        }
+
 		String template = new IndividualTemplateLocator(vreq, individual).findTemplate();
-		        
+
 		return new TemplateResponseValues(template, body);
 	}
 
 	/**
 	 * Check if a "relatedSubjectUri" parameter has been supplied, and, if so,
 	 * retrieve the related individual.
-	 * 
+	 *
 	 * Some individuals make little sense standing alone and should be displayed
 	 * in the context of their relationship to another.
 	 */
     private Map<String, Object> getRelatedSubject() {
         Map<String, Object> map = null;
-        
-        String relatedSubjectUri = vreq.getParameter("relatedSubjectUri"); 
+
+        String relatedSubjectUri = vreq.getParameter("relatedSubjectUri");
         if (relatedSubjectUri != null) {
             Individual relatedSubjectInd = iDao.getIndividualByURI(relatedSubjectUri);
             if (relatedSubjectInd != null) {
@@ -161,7 +161,7 @@ class IndividualResponseBuilder {
                 map.put("name", relatedSubjectInd.getName());
 
                 map.put("url", UrlBuilder.getIndividualProfileUrl(relatedSubjectInd, vreq));
-                
+
                 String relatingPredicateUri = vreq.getParameter("relatingPredicateUri");
                 if (relatingPredicateUri != null) {
                     ObjectProperty relatingPredicateProp = opDao.getObjectPropertyByURI(relatingPredicateUri);
@@ -234,7 +234,7 @@ class IndividualResponseBuilder {
 
     private Map<String, Object> getVerbosePropertyValues() {
         Map<String, Object> map = null;
-        
+
         if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.SEE_VERBOSE_PROPERTY_INFORMATION.ACTION)) {
             // Get current verbose property display value
             String verbose = vreq.getParameter("verbose");
@@ -244,12 +244,12 @@ class IndividualResponseBuilder {
                 verboseValue = "true".equals(verbose);
             // If form not submitted, get the session value
             } else {
-                Boolean verbosePropertyDisplayValueInSession = (Boolean) vreq.getSession().getAttribute("verbosePropertyDisplay"); 
+                Boolean verbosePropertyDisplayValueInSession = (Boolean) vreq.getSession().getAttribute("verbosePropertyDisplay");
                 // True if session value is true, otherwise (session value is false or null) false
-                verboseValue = Boolean.TRUE.equals(verbosePropertyDisplayValueInSession);           
+                verboseValue = Boolean.TRUE.equals(verbosePropertyDisplayValueInSession);
             }
             vreq.getSession().setAttribute("verbosePropertyDisplay", verboseValue);
-            
+
             map = new HashMap<String, Object>();
             map.put("currentValue", verboseValue);
 
@@ -258,10 +258,10 @@ class IndividualResponseBuilder {
                  the form data is appended to the action with a "?", so there can't already be a query string
                  on it.
                - The browser (at least Firefox) does not submit a form that has no form data.
-               - Some browsers might strip the query string off the form action of a POST - though 
+               - Some browsers might strip the query string off the form action of a POST - though
                  probably they shouldn't, because the HTML spec allows a full URI as a form action.
                - Given these three, the only reliable solution is to dynamically create hidden inputs
-                 for the query parameters. 
+                 for the query parameters.
                - Much simpler is to just create an anchor element. This has the added advantage that the
                  browser doesn't ask to resend the form data when reloading the page.
              */
@@ -280,16 +280,16 @@ class IndividualResponseBuilder {
         } else {
             vreq.getSession().setAttribute("verbosePropertyDisplay", false);
         }
-        
+
         return map;
     }
-    
+
 	private IndividualTemplateModel getIndividualTemplateModel(
 			Individual individual) {
 		//individual.sortForDisplay();
 		return IndividualTemplateModelBuilder.build(individual, vreq);
 	}
-		
+
     private TemplateModel wrap(Object obj, BeansWrapper wrapper) throws TemplateModelException {
         return wrapper.wrap(obj);
     }
@@ -303,15 +303,15 @@ class IndividualResponseBuilder {
         }
         return linkTag;
     }
-    
+
     //Get special values for cases such as Menu Management editing
     private Map<String, Object> getSpecialEditingValues() {
         Map<String, Object> map = new HashMap<String, Object>();
-        
+
     	if(vreq.getAttribute(VitroRequest.SPECIAL_WRITE_MODEL) != null) {
     		map.put("reorderUrl", UrlBuilder.getUrl(DisplayVocabulary.REORDER_MENU_URL));
     	}
-    	
+
     	return map;
     }
 
@@ -321,14 +321,14 @@ class IndividualResponseBuilder {
         + "    ?subject rdfs:label ?label \n"
         + "    FILTER isLiteral(?label) \n"
         + "}" ;
-           
+
     private static String DISTINCT_LANGUAGE_QUERY = ""
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
             + "SELECT ( str(COUNT(DISTINCT lang(?label))) AS ?languageCount ) WHERE { \n"
             + "    ?subject rdfs:label ?label \n"
             + "    FILTER isLiteral(?label) \n"
             + "}" ;
-    
+
     private static Integer getLabelCount(String subjectUri, VitroRequest vreq) {
         String queryStr = QueryUtils.subUriForQueryVar(LABEL_COUNT_QUERY, "subject", subjectUri);
         log.debug("queryStr = " + queryStr);
@@ -346,17 +346,17 @@ class IndividualResponseBuilder {
             }
         } catch (Exception e) {
             log.error(e, e);
-        }    
+        }
         return theCount;
     }
-    
+
     //what is the number of languages represented across the labels
     private static Integer getLanguagesRepresentedCount(String subjectUri, VitroRequest vreq) {
     	   String queryStr = QueryUtils.subUriForQueryVar(DISTINCT_LANGUAGE_QUERY, "subject", subjectUri);
            log.debug("queryStr = " + queryStr);
            int theCount = 0;
            try {
-              
+
                ResultSet results = QueryUtils.getLanguageNeutralQueryResults(queryStr, vreq);
                if (results.hasNext()) {
                    QuerySolution soln = results.nextSolution();
@@ -367,7 +367,7 @@ class IndividualResponseBuilder {
                }
            } catch (Exception e) {
                log.error(e, e);
-           }    
+           }
            return theCount;
     }
 
@@ -376,7 +376,7 @@ class IndividualResponseBuilder {
         + "SELECT ?profile WHERE { \n"
         + "    ?subject display:hasDefaultProfilePageType ?profile \n"
         + "}" ;
-           
+
     private static String getProfileType(String subjectUri, VitroRequest vreq) {
         String queryStr = QueryUtils.subUriForQueryVar(PROFILE_TYPE_QUERY, "subject", subjectUri);
         log.debug("queryStr = " + queryStr);
@@ -392,7 +392,7 @@ class IndividualResponseBuilder {
             }
         } catch (Exception e) {
             log.error(e, e);
-        }    
+        }
         return profileType;
     }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualTemplateLocator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualTemplateLocator.java
index 283766378..484f4adb5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualTemplateLocator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualTemplateLocator.java
@@ -17,41 +17,41 @@ import edu.cornell.mannlib.vitro.webapp.reasoner.SimpleReasoner;
 
 /**
  * Figure out which Freemarker template to use when displaying this individual.
- * 
+ *
  * If one of the classes of the individual (or one of the superclasses) has a
  * custom template associated with it, use the first one that we find.
  * Otherwise, use the default template.
- * 
+ *
  * TODO examine the logic in this class. Is there anything we can get rid of?
  */
 class IndividualTemplateLocator {
 	private static final Log log = LogFactory
 			.getLog(IndividualTemplateLocator.class);
-	
+
     private static final String TEMPLATE_INDIVIDUAL_DEFAULT = "individual.ftl";
-    
+
     private final VitroRequest vreq;
     private final ServletContext ctx;
-    
+
     private final Individual individual;
-	
+
 	public IndividualTemplateLocator(VitroRequest vreq, Individual individual) {
 		this.vreq = vreq;
 		this.ctx = vreq.getSession().getServletContext();
-		
+
 		this.individual = individual;
 	}
 
 	// Determine whether the individual has a custom display template based on its class membership.
 	// If not, return the default individual template.
 	String findTemplate() {
-	    
+
         @SuppressWarnings("unused")
-        String vclassName = "unknown"; 
+        String vclassName = "unknown";
         String customTemplate = null;
 
         // First check vclass
-        if( individual.getVClass() != null ){ 
+        if( individual.getVClass() != null ){
             vclassName = individual.getVClass().getName();
             List<VClass> directClasses = individual.getVClasses(true);
             for (VClass vclass : directClasses) {
@@ -83,9 +83,9 @@ class IndividualTemplateLocator {
                 }
             }
             // If still no custom template defined and inferencing is asynchronous, check
-            // the superclasses of the vclass for a custom template specification. 
+            // the superclasses of the vclass for a custom template specification.
             SimpleReasoner simpleReasoner = (SimpleReasoner) ctx.getAttribute(SimpleReasoner.class.getName());
-            if (customTemplate == null && simpleReasoner != null && simpleReasoner.isABoxReasoningAsynchronous()) { 
+            if (customTemplate == null && simpleReasoner != null && simpleReasoner.isABoxReasoningAsynchronous()) {
                 log.debug("Checking superclasses for custom template specification because ABox reasoning is asynchronous");
                 for (VClass directVClass : directClasses) {
                     VClassDao vcDao = vreq.getWebappDaoFactory().getVClassDao();
@@ -100,8 +100,8 @@ class IndividualTemplateLocator {
                                 break;
                             } else {
                                 customTemplate = null;
-                            }                            
-                        }                        
+                            }
+                        }
                     }
                 }
             }
@@ -109,9 +109,9 @@ class IndividualTemplateLocator {
             log.debug("Individual " + individual.getURI() + " with class URI " +
                     individual.getVClassURI() + ": no class found with that URI");
         }
-        
+
         return customTemplate != null ? customTemplate : TEMPLATE_INDIVIDUAL_DEFAULT;
-        
+
 	}
 
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualJsonWrapper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualJsonWrapper.java
index 2b3d6eaec..89d61caa0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualJsonWrapper.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualJsonWrapper.java
@@ -16,7 +16,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 
 /**
  * Wrap an Individual in a JSON object for display by the script.
- * 
+ *
  * This will be overridden in VIVO so we can have more info in the display.
  */
 public class IndividualJsonWrapper {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualListResults.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualListResults.java
index d56f3a599..2c19e47b2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualListResults.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualListResults.java
@@ -15,11 +15,11 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListCont
 
 /**
  * These are the paged results of a query for Individuals.
- * 
+ *
  * The criteria for the search are the index of the desired page, the number of
  * results displayed on each page, and an optional initial letter to search
  * against.
- * 
+ *
  * By the time this is built, the results have already been partially processed.
  * A list of PageRecord object is included, with values that the GUI can use to
  * create Alphabetical links. Maybe this processing should have been done later.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualListResultsUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualListResultsUtils.java
index 35f52f35b..c15e8fe04 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualListResultsUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/individuallist/IndividualListResultsUtils.java
@@ -23,7 +23,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListCont
 
 /**
  * Utility methods for procesing the paged results of a query for a list of Individuals.
- * 
+ *
  * Right now, there is only a method to wrap the results in Json.
  */
 public class IndividualListResultsUtils {
@@ -47,7 +47,7 @@ public class IndividualListResultsUtils {
 			List<VClass> vclasses = buildListOfRequestedVClasses(vreq);
 
 			VClass vclass = null;
-			// if single vclass expected, then include vclass. 
+			// if single vclass expected, then include vclass.
 			// This relates to what the expected behavior is, not size of list
 			if (!multipleVclasses) {
 				vclass = vclasses.get(0);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java
index 59e31ed1c..fe77766d3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java
@@ -54,7 +54,7 @@ import edu.cornell.mannlib.vitro.webapp.modules.tboxreasoner.TBoxReasonerModule;
 
 @WebServlet(name = "JenaAdminServlet", urlPatterns = {"/jenaAdmin"} )
 public class JenaAdminActions extends BaseEditController {
-	
+
 	private static final Log log = LogFactory.getLog(JenaAdminActions.class.getName());
 
     private boolean checkURI( String uri ) {
@@ -69,11 +69,11 @@ public class JenaAdminActions extends BaseEditController {
         	return false;
         }
     }
-    
+
 	private static final String VITRO = "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#";
     private static final String AKT_SUPPORT = "http://www.aktors.org/ontology/support#";
     private static final String AKT_PORTAL = "http://www.aktors.org/ontology/portal#";
-    
+
     private void copyStatements(Model src, Model dest, Resource subj, Property pred, RDFNode obj) {
     	for (Statement stmt : src.listStatements(subj,pred,obj).toList()) {
     		String subjNs = stmt.getSubject().getNameSpace();
@@ -89,8 +89,8 @@ public class JenaAdminActions extends BaseEditController {
     		}
     	}
     }
-    
-    
+
+
     /**
      * This doesn't really print just the TBox.  It takes a copy of the model, removes all the individuals, and writes the result.
      */
@@ -122,7 +122,7 @@ public class JenaAdminActions extends BaseEditController {
             e.printStackTrace();
         }
     }
-    
+
     private Model extractTaxonomy(OntModel ontModel) {
     	ontModel.enterCriticalSection(Lock.READ);
     	Model taxonomyModel = ModelFactory.createDefaultModel();
@@ -159,7 +159,7 @@ public class JenaAdminActions extends BaseEditController {
     	}
     	return cleanModel;
     }
-    
+
 	private String testWriteXML() {
 		StringBuilder output = new StringBuilder();
 		output.append("<html><head><title>Test Write XML</title></head><body><pre>\n");
@@ -213,10 +213,10 @@ public class JenaAdminActions extends BaseEditController {
     		for (Resource inst : rest.listInstances().toList() ) {
     			log.trace("     "+inst.getURI());
     		}
-    		
+
     	}
     }
-    
+
     private void removeLongLiterals() {
 		OntModel memoryModel = ModelAccess.on(getServletContext()).getOntModel();
     	memoryModel.enterCriticalSection(Lock.WRITE);
@@ -237,7 +237,7 @@ public class JenaAdminActions extends BaseEditController {
     		memoryModel.leaveCriticalSection();
     	}
     }
-    
+
     @Override
 	public void doGet(HttpServletRequest req, HttpServletResponse response) {
         if (!isAuthorizedToDisplayPage(req, response, SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTION)) {
@@ -262,8 +262,8 @@ public class JenaAdminActions extends BaseEditController {
 				}
 				break;
 		}
-        
-        if (actionStr.equals("checkURIs")) { 
+
+        if (actionStr.equals("checkURIs")) {
     		OntModel memoryModel = ModelAccess.on(getServletContext()).getOntModel();
         	StmtIterator stmtIt = memoryModel.listStatements();
         	try {
@@ -282,7 +282,7 @@ public class JenaAdminActions extends BaseEditController {
 	        		}
 	        		if (stmt.getObject().isResource() && ((Resource)stmt.getObject()).getURI() != null) {
 	        			oFailed = checkURI(oURI = ((Resource)stmt.getObject()).getURI());
-	        		}        		
+	        		}
 	        		if (sFailed || pFailed || oFailed) {
 	        			log.debug(sURI+" | "+pURI+" | "+oURI);
 	        		}
@@ -291,7 +291,7 @@ public class JenaAdminActions extends BaseEditController {
         		stmtIt.close();
         	}
         }
-        
+
         if (actionStr.equals("output")) {
             OntModel memoryModel = null;
 	    if (request.getParameter("assertionsOnly") != null) {
@@ -303,7 +303,7 @@ public class JenaAdminActions extends BaseEditController {
 	    } else {
 			memoryModel = ModelAccess.on(getServletContext()).getOntModel();
 	    	System.out.println("jenaOntModel");
-	    }  
+	    }
 	    int subModelCount = memoryModel.listSubModels().toList().size();
 	    System.out.println("Submodels: "+subModelCount);
 	        try {
@@ -317,11 +317,11 @@ public class JenaAdminActions extends BaseEditController {
 	            e.printStackTrace();
 	        }
         }
-        
+
         if (actionStr.equals("removeLongLiterals")) {
         	removeLongLiterals();
         }
-        
+
         if (actionStr.equals("outputTaxonomy")) {
             OntModel ontModel = ModelAccess.on(getServletContext()).getOntModel(FULL_ASSERTIONS);
         	Model taxonomyModel = extractTaxonomy(ontModel);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java
index 2b7a8b6d3..8ccb1fd0d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaCsv2RdfController.java
@@ -32,12 +32,12 @@ import edu.cornell.mannlib.vitro.webapp.utils.jena.JenaIngestUtils;
 @WebServlet(name = "JenaCsv2RdfController", urlPatterns = {"/csv2rdf"} )
 public class JenaCsv2RdfController extends JenaIngestController {
 	Log log = LogFactory.getLog( JenaCsv2RdfController.class );
-    
+
     private static final String CSV2RDF_JSP = "/jenaIngest/csv2rdf.jsp";
 	private static final String CSV2RDF_SELECT_URI_JSP = "/jenaIngest/csv2rdfSelectUri.jsp";
-	private static int maxFileSizeInBytes = 1024 * 1024 * 2000; //2000mb 
-	
-	
+	private static int maxFileSizeInBytes = 1024 * 1024 * 2000; //2000mb
+
+
 	@Override
 	public long maximumMultipartFileSize() {
 		return maxFileSizeInBytes;
@@ -56,7 +56,7 @@ public class JenaCsv2RdfController extends JenaIngestController {
         	return;
         }
 
-		VitroRequest request = new VitroRequest(rawRequest);		
+		VitroRequest request = new VitroRequest(rawRequest);
 		if (request.hasFileSizeException()) {
 			forwardToFileUploadError(request.getFileSizeException().getLocalizedMessage(), request, response);
 			return;
@@ -65,7 +65,7 @@ public class JenaCsv2RdfController extends JenaIngestController {
 		Map<String, List<FileItem>> fileStreams = request.getFiles();
 		FileItem fileStream = fileStreams.get("filePath").get(0);
 		String filePath = fileStreams.get("filePath").get(0).getName();
-		
+
 		String actionStr = request.getParameter("action");
 		actionStr = (actionStr != null) ? actionStr : "";
 
@@ -88,7 +88,7 @@ public class JenaCsv2RdfController extends JenaIngestController {
 				JenaIngestUtils utils = new JenaIngestUtils();
 				List<Model> resultList = new ArrayList<Model>();
 				resultList.add(csv2rdfResult);
-				Map<String,LinkedList<String>> propertyMap = 
+				Map<String,LinkedList<String>> propertyMap =
 					    utils.generatePropertyMap(resultList, maker);
 				request.setAttribute("propertyMap",propertyMap);
 				request.setAttribute("csv2rdf", csv2rdf);
@@ -100,7 +100,7 @@ public class JenaCsv2RdfController extends JenaIngestController {
 				bodyJsp = CSV2RDF_JSP;
 			}
 		}
-		
+
 
         request.setAttribute("css", "<link rel=\"stylesheet\" type=\"text/css\" href=\""+request.getAppBean().getThemeDir()+"css/edit.css\"/>");
 
@@ -108,18 +108,18 @@ public class JenaCsv2RdfController extends JenaIngestController {
 			JSPPageHandler.renderBasicPage(request, response, bodyJsp);
         } catch (Exception e) {
         	throw new RuntimeException(e);
-        }		
-		
+        }
+
     }
-	
+
 //	 private void forwardToFileUploadError( String errrorMsg , HttpServletRequest req, HttpServletResponse response) throws ServletException{
 //         req.setAttribute("errors", errrorMsg);
-//         RequestDispatcher rd = req.getRequestDispatcher("/jsp/fileUploadError.jsp");            
+//         RequestDispatcher rd = req.getRequestDispatcher("/jsp/fileUploadError.jsp");
 //         try {
 //             rd.forward(req, response);
 //         } catch (IOException e1) {
 //             throw new ServletException(e1);
-//         }            
+//         }
 //         return;
 //     }
 
@@ -157,28 +157,28 @@ public class JenaCsv2RdfController extends JenaIngestController {
 			if (tboxDestinationModelNameStr != null && tboxDestinationModelNameStr.length()>0) {
 				tboxDestination = getModel(tboxDestinationModelNameStr, vreq);
 			}
-			
+
 			char separatorChar = ',';
 			if ("tab".equalsIgnoreCase(vreq.getParameter("separatorChar"))) {
 				separatorChar = '\t';
 			}
-			
+
 			Csv2Rdf c2r = new Csv2Rdf(separatorChar, quoteChar,namespace,tboxNamespace,typeName);
-			
+
 			InputStream is = null;
-			
+
 			try {
 				if(!csvUrl.isEmpty())
 					is = new URL(csvUrl).openStream();
 				else if(!filePath.isEmpty())
 					is = fileStream.getInputStream();
-					
+
 			} catch (IOException e) {
 				throw new Exception("Unable to access URL " + csvUrl);
 			}
-			
+
 			Model[] models = null;
-			
+
 			try {
 				 models = c2r.convertToRdf(
 						 is, vreq.getWebappDaoFactory(), destination);
@@ -186,13 +186,13 @@ public class JenaCsv2RdfController extends JenaIngestController {
 				throw new Exception(
 						"Unable to convert " + csvUrl + " to RDF");
 			}
-			
+
 			// TODO: rework this
 			vreq.getSession().setAttribute("csv2rdfResult", models[0]);
 			if (tboxDestination != null) {
 				tboxDestination.add(models[1]);
-			}	
-			
+			}
+
 			return models[0];
 		}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java
index f7a4ce851..b6cfe8711 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java
@@ -47,9 +47,9 @@ public class JenaExportController extends BaseEditController {
 	private static final AuthorizationRequest REQUIRED_ACTIONS = SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION
 			.or(SimplePermission.EDIT_ONTOLOGY.ACTION);
 
-	
+
 	private static final Log log = LogFactory.getLog(JenaExportController.class);
-	
+
 	@Override
 	public void doGet( HttpServletRequest request, HttpServletResponse response ) {
 		if (!isAuthorizedToDisplayPage(request, response, REQUIRED_ACTIONS)) {
@@ -57,22 +57,22 @@ public class JenaExportController extends BaseEditController {
 		}
 
 		VitroRequest vreq = new VitroRequest(request);
-		
-		if ( vreq.getRequestURL().indexOf("/download/") > -1 ) { 
+
+		if ( vreq.getRequestURL().indexOf("/download/") > -1 ) {
 			outputRDF( vreq, response );
 			return;
 		}
-		
+
 		String formatParam = vreq.getParameter("format");
-		
+
 		if (formatParam != null) {
 			redirectToDownload( vreq, response );
 		} else {
 			prepareExportSelectionPage( vreq, response );
 		}
-		
+
 	}
-	
+
 	private void redirectToDownload( VitroRequest vreq, HttpServletResponse response ) {
 		String formatStr = vreq.getParameter("format");
 		String subgraphParam = vreq.getParameter("subgraph");
@@ -85,7 +85,7 @@ public class JenaExportController extends BaseEditController {
 			filename = "export";
 		}
 		String extension =
-			( (formatStr != null) && formatStr.startsWith("RDF/XML") && "tbox".equals(subgraphParam) ) 
+			( (formatStr != null) && formatStr.startsWith("RDF/XML") && "tbox".equals(subgraphParam) )
 			? ".owl"
 			: formatToExtension.get(formatStr);
 		if (extension == null) {
@@ -99,7 +99,7 @@ public class JenaExportController extends BaseEditController {
 			throw new RuntimeException(ioe);
 		}
 	}
-	
+
 	private void outputRDF( VitroRequest vreq, HttpServletResponse response ) {
 		Dataset dataset = vreq.getDataset();
 		JenaModelUtils xutil = new JenaModelUtils();
@@ -110,12 +110,12 @@ public class JenaExportController extends BaseEditController {
 		if (vreq.getParameter("ontologyURI") != null) {
 			ontologyURI.append(vreq.getParameter("ontologyURI"));
 		}
-		
+
 		Model model = null;
 		OntModel ontModel = ModelFactory.createOntologyModel();
-		
-		if(!subgraphParam.equalsIgnoreCase("tbox") 
-				&& !subgraphParam.equalsIgnoreCase("abox") 
+
+		if(!subgraphParam.equalsIgnoreCase("tbox")
+				&& !subgraphParam.equalsIgnoreCase("abox")
 				&& !subgraphParam.equalsIgnoreCase("full")){
 			ontologyURI = new StringBuilder(subgraphParam);
 			subgraphParam = "tbox";
@@ -125,7 +125,7 @@ public class JenaExportController extends BaseEditController {
 				ontologyURI.append(uri[i]);
 			}
 		}
-	
+
 		if( "abox".equals(subgraphParam)){
 			model = ModelFactory.createDefaultModel();
 			if("inferred".equals(assertedOrInferredParam)){
@@ -161,7 +161,7 @@ public class JenaExportController extends BaseEditController {
                 model = xutil.extractTBox(
                         ModelAccess.on(getServletContext()).getOntModel(TBOX_ASSERTIONS), ontologyURI.toString());
 		    }
-			
+
 		}
 		else if("full".equals(subgraphParam)){
 			if("inferred".equals(assertedOrInferredParam)){
@@ -176,9 +176,9 @@ public class JenaExportController extends BaseEditController {
 			else{
 			    outputSparqlConstruct(FULL_ASSERTED_CONSTRUCT, formatParam, response);
 			}
-			
+
 		}
-		
+
 		JenaOutputUtils.setNameSpacePrefixes(model,vreq.getWebappDaoFactory());
 		setHeaders(response, formatParam);
 
@@ -187,7 +187,7 @@ public class JenaExportController extends BaseEditController {
 			if ( formatParam.startsWith("RDF/XML") ) {
 				outStream.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>".getBytes());
 			}
-			// 2010-11-02 workaround for the fact that ARP now always seems to 
+			// 2010-11-02 workaround for the fact that ARP now always seems to
 			// try to parse N3 using strict Turtle rules.  Avoiding headaches
 			// by always serializing out as Turtle instead of using N3 sugar.
 			try {
@@ -205,7 +205,7 @@ public class JenaExportController extends BaseEditController {
 				} else {
 					ontModel.writeAll(outStream, "N-TRIPLE", null );
 				}
-				
+
 				log.info("exported model in N-TRIPLE format instead of N3 because there was a problem exporting in N3 format");
 			}
 
@@ -214,9 +214,9 @@ public class JenaExportController extends BaseEditController {
 		} catch (IOException ioe) {
 			throw new RuntimeException(ioe);
 		}
-		
+
 	}
-	
+
 	private void setHeaders(HttpServletResponse response, String formatParam) {
 		if ( formatParam == null ) {
 			formatParam = "RDF/XML-ABBREV";  // default
@@ -244,8 +244,8 @@ public class JenaExportController extends BaseEditController {
 				break;
 		}
 	}
-	
-	private void outputSparqlConstruct(String queryStr, String formatParam, 
+
+	private void outputSparqlConstruct(String queryStr, String formatParam,
 	        HttpServletResponse response) {
 	    RDFService rdfService = ModelAccess.on(getServletContext()).getRDFService();
 	    try {
@@ -264,9 +264,9 @@ public class JenaExportController extends BaseEditController {
 	        throw new RuntimeException(e);
 	    } finally {
 	        rdfService.close();
-	    }	    
+	    }
 	}
-	
+
 	private void prepareExportSelectionPage( VitroRequest vreq, HttpServletResponse response ) {
 		try {
 			JSPPageHandler.renderBasicPage(vreq, response, Controllers.EXPORT_SELECTION_JSP );
@@ -274,44 +274,44 @@ public class JenaExportController extends BaseEditController {
 			throw new RuntimeException(e);
 		}
 	}
-	
+
 	static final String FULL_GRAPH = "?g";
 	static Map<String,String> formatToExtension;
 	static Map<String,String> formatToMimetype;
-	
+
 	static {
-		
+
 		formatToExtension = new HashMap<String,String>();
 		formatToExtension.put("RDF/XML",".rdf");
 		formatToExtension.put("RDF/XML-ABBREV",".rdf");
 		formatToExtension.put("N3",".n3");
 		formatToExtension.put("N-TRIPLE",".nt");
 		formatToExtension.put("TURTLE",".ttl");
-		
+
 		formatToMimetype = new HashMap<String,String>();
 		formatToMimetype.put("RDF/XML","application/rdf+xml");
 		formatToMimetype.put("RDF/XML-ABBREV","application/rdf+xml");
 		formatToMimetype.put("N3","text/n3");
 		formatToMimetype.put("N-TRIPLE", "text/plain");
 		formatToMimetype.put("TURTLE", "application/x-turtle");
-		
+
 	}
-	
+
 	private static final String ABOX_FULL_CONSTRUCT = "CONSTRUCT { ?s ?p ?o } " +
 	        "WHERE { GRAPH ?g { ?s ?p ?o } FILTER (!regex(str(?g), \"tbox\")) " +
             "FILTER (?g != <" + APPLICATION_METADATA + ">) }";
-	
+
 	private static final String ABOX_ASSERTED_CONSTRUCT = "CONSTRUCT { ?s ?p ?o } " +
-            "WHERE { GRAPH ?g { ?s ?p ?o } FILTER (!regex(str(?g), \"tbox\")) " + 
+            "WHERE { GRAPH ?g { ?s ?p ?o } FILTER (!regex(str(?g), \"tbox\")) " +
 	        "FILTER (?g != <" + ABOX_INFERENCES + ">) " +
 	        "FILTER (?g != <" + APPLICATION_METADATA + ">) }";
-	
+
 	private static final String FULL_FULL_CONSTRUCT = "CONSTRUCT { ?s ?p ?o } " +
             "WHERE { ?s ?p ?o }";
 
     private static final String FULL_ASSERTED_CONSTRUCT = "CONSTRUCT { ?s ?p ?o } " +
-            "WHERE { GRAPH ?g { ?s ?p ?o } " + 
+            "WHERE { GRAPH ?g { ?s ?p ?o } " +
             "FILTER (?g != <" + ABOX_INFERENCES + ">) " +
             "FILTER (?g != <" + TBOX_INFERENCES + ">) }";
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
index 21e1d4820..fbeef28c8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
@@ -84,7 +84,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.sparql.SparqlQueryUtils;
 @WebServlet(name = "JenaIngestController", urlPatterns = {"/ingest"} )
 public class JenaIngestController extends BaseEditController {
 	private static final Log log = LogFactory.getLog(JenaIngestController.class);
-    
+
     private static final String INGEST_MENU_JSP = "/jenaIngest/ingestMenu.jsp";
     private static final String LIST_MODELS_JSP = "/jenaIngest/listModels.jsp";
     private static final String CREATE_MODEL_JSP = "/jenaIngest/createModel.jsp";
@@ -111,24 +111,24 @@ public class JenaIngestController extends BaseEditController {
     private static final String WHICH_MODEL_MAKER = "jenaIngestModelMakerID";
 
     private static final Map<String, Model> attachedModels = new HashMap<String, Model>();
-    
+
     @Override
-    public void doGet(HttpServletRequest request, HttpServletResponse response) 
+    public void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
 		if (!isAuthorizedToDisplayPage(request, response,
 				SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION)) {
             return;
         }
-        
-        VitroRequest vreq = new VitroRequest(request);   
+
+        VitroRequest vreq = new VitroRequest(request);
         ModelMaker maker = getModelMaker(vreq);
         WhichService modelType = getModelType(vreq);
-        
+
         String actionStr = vreq.getParameter("action");
         actionStr = (actionStr != null) ? actionStr : "";
 
         String bodyJsp;
-        
+
         if("listModels".equals(actionStr)) {
             bodyJsp = processListModelsRequest(vreq, maker, modelType);
         } else if("configModels".equals(actionStr)){
@@ -185,12 +185,12 @@ public class JenaIngestController extends BaseEditController {
         	processDumpRestore(vreq, response);
         	return;
         }
-        
+
         else {
             request.setAttribute("title","Ingest Menu");
             bodyJsp = INGEST_MENU_JSP;
         }
-        
+
         maker = getModelMaker(vreq);
         List<String> modelNames = maker.listModels().toList();
         for (int mnIdx = modelNames.size() - 1; mnIdx > -1; mnIdx--) {
@@ -200,49 +200,49 @@ public class JenaIngestController extends BaseEditController {
         }
 
         request.setAttribute("modelNames", modelNames);
-   
+
         try {
             JSPPageHandler.renderBasicPage(request, response, bodyJsp);
         } catch (Exception e) {
             log.error(e,e);
             throw new ServletException(e);
         }
-        
+
     }
-    
+
     private String processListModelsRequest(VitroRequest vreq, ModelMaker maker, WhichService modelType) {
         return showModelList(vreq, maker, modelType);
     }
-    
+
     protected static boolean isUsingMainStoreForIngest(HttpServletRequest req) {
-    	return CONFIGURATION != req.getSession().getAttribute(WHICH_MODEL_MAKER); 
+    	return CONFIGURATION != req.getSession().getAttribute(WHICH_MODEL_MAKER);
     }
-    
+
     private String processConfigModelsRequest(VitroRequest vreq) {
         ModelMaker vjmm = ModelAccess.on(getServletContext()).getModelMaker(CONFIGURATION);
         vreq.getSession().setAttribute(WHICH_MODEL_MAKER, CONFIGURATION);
         return showModelList(vreq, vjmm, CONFIGURATION);
     }
-    
+
     private String processContentModelsRequest(VitroRequest vreq) {
         ModelMaker vsmm = ModelAccess.on(getServletContext()).getModelMaker(CONTENT);
         vreq.getSession().setAttribute(WHICH_MODEL_MAKER, CONTENT);
         return showModelList(vreq, vsmm, CONTENT);
     }
-    
+
     private String processCreateModelRequest(VitroRequest vreq, ModelMaker maker, WhichService modelType) {
         String modelName = vreq.getParameter("modelName");
-    	
+
         if (modelName != null) {
         	try {
             	URI graphURI = new URI(modelName);
-            	
+
             	if (graphURI.getScheme() == null) {
-            	   String origName = modelName;	
+            	   String origName = modelName;
             	   modelName =CREATED_GRAPH_BASE_URI + modelName;
                    log.info("The model name has been changed from " + origName + " to " + modelName);
             	}
-            	           	
+
                 doCreateModel(modelName, maker);
                 return showModelList(vreq, maker, modelType);
         	} catch (URISyntaxException e) {
@@ -254,7 +254,7 @@ public class JenaIngestController extends BaseEditController {
             return CREATE_MODEL_JSP;
         }
     }
-    
+
     private String processRemoveModelRequest(VitroRequest vreq, ModelMaker maker, WhichService modelType) {
         String modelName = vreq.getParameter("modelName");
         if (modelName!=null) {
@@ -262,7 +262,7 @@ public class JenaIngestController extends BaseEditController {
         }
         return showModelList(vreq, maker, modelType);
     }
-    
+
     private String processClearModelRequest(VitroRequest vreq, ModelMaker maker, WhichService modelType) {
         String modelName = vreq.getParameter("modelName");
         if (modelName != null) {
@@ -270,7 +270,7 @@ public class JenaIngestController extends BaseEditController {
         }
         return showModelList(vreq, maker, modelType);
     }
-    
+
     private String processLoadRDFDataRequest(VitroRequest vreq, ModelMaker maker) {
         String docLoc = vreq.getParameter("docLoc");
         String filePath = vreq.getParameter("filePath");
@@ -286,8 +286,8 @@ public class JenaIngestController extends BaseEditController {
             return LOAD_RDF_DATA_JSP;
         }
     }
-    
-    private void processOutputModelRequest(VitroRequest vreq, 
+
+    private void processOutputModelRequest(VitroRequest vreq,
                                            HttpServletResponse response) {
         String modelNameStr = vreq.getParameter("modelName");
         Model model = getModel(modelNameStr,vreq);
@@ -314,7 +314,7 @@ public class JenaIngestController extends BaseEditController {
             model.leaveCriticalSection();
         }
     }
-    
+
     private String processCleanLiteralsRequest(VitroRequest vreq) {
         String modelNameStr = vreq.getParameter("modelName");
         Model model = getModel(modelNameStr,vreq);
@@ -322,7 +322,7 @@ public class JenaIngestController extends BaseEditController {
         vreq.setAttribute("title","Ingest Menu");
         return INGEST_MENU_JSP;
     }
-    
+
     private String processAttachModelRequest(VitroRequest vreq, ModelMaker maker, WhichService modelType) {
         String modelName = vreq.getParameter("modelName");
         if (modelName != null) {
@@ -330,7 +330,7 @@ public class JenaIngestController extends BaseEditController {
         }
         return showModelList(vreq, maker, modelType);
     }
-    
+
     private String processDetachModelRequest(VitroRequest vreq, ModelMaker maker, WhichService modelType) {
         String modelName = vreq.getParameter("modelName");
         if (modelName != null) {
@@ -338,7 +338,7 @@ public class JenaIngestController extends BaseEditController {
         }
         return showModelList(vreq, maker, modelType);
     }
-    
+
     private String processRenameBNodesRequest(VitroRequest vreq, ModelMaker maker) {
         String[] sourceModel = vreq.getParameterValues("sourceModelName");
         JenaIngestUtils utils = new JenaIngestUtils();
@@ -350,7 +350,7 @@ public class JenaIngestController extends BaseEditController {
                     sourceModelList.add(m);
                 }
             }
-            Map<String,LinkedList<String>> propertyMap = 
+            Map<String,LinkedList<String>> propertyMap =
                     utils.generatePropertyMap(sourceModelList, maker);
             List<String> sourceModelNameList = Arrays.asList(sourceModel);
             vreq.setAttribute("sourceModel",sourceModelNameList);
@@ -363,7 +363,7 @@ public class JenaIngestController extends BaseEditController {
             return RENAME_BNODES_JSP;
         }
     }
-    
+
     private String processRenameBNodesURISelectRequest(VitroRequest vreq, ModelMaker maker) {
         String namespaceEtcStr = vreq.getParameter("namespaceEtcStr");
         String pattern = vreq.getParameter("pattern");
@@ -392,7 +392,7 @@ public class JenaIngestController extends BaseEditController {
             return RENAME_BNODES_URI_SELECT_JSP;
         }
     }
-    
+
     private String processSmushSingleModelRequest(VitroRequest vreq) {
         String propertyURIStr = vreq.getParameter("propertyURI");
         if (propertyURIStr != null) {
@@ -404,7 +404,7 @@ public class JenaIngestController extends BaseEditController {
             return SMUSH_JSP;
         }
     }
-    
+
     private String processCsv2rdfRequest(VitroRequest vreq) {
         String csvUrl = vreq.getParameter("csvUrl");
         if (csvUrl != null) {
@@ -416,7 +416,7 @@ public class JenaIngestController extends BaseEditController {
             return CSV2RDF_JSP;
         }
     }
-    
+
     private String processProcessStringsRequest(VitroRequest vreq) {
         String className = vreq.getParameter("className");
         if (className != null) {
@@ -428,7 +428,7 @@ public class JenaIngestController extends BaseEditController {
             return PROCESS_STRINGS_JSP;
         }
     }
-    
+
     private String processSplitPropertyValuesRequest(VitroRequest vreq) {
         String splitRegex = vreq.getParameter("splitRegex");
         if (splitRegex != null) {
@@ -440,7 +440,7 @@ public class JenaIngestController extends BaseEditController {
             return SPLIT_PROPERTY_VALUES_JSP;
         }
     }
-    
+
     private String processSubtractModelRequest(VitroRequest vreq) {
         String modela = vreq.getParameter("modela");
         if (modela != null) {
@@ -452,7 +452,7 @@ public class JenaIngestController extends BaseEditController {
             return SUBTRACT_MODELS_JSP;
         }
     }
-    
+
     private String processExecuteWorkflowRequest(VitroRequest vreq) {
         String workflowURIStr = vreq.getParameter("workflowURI");
         String workflowStepURIStr = vreq.getParameter("workflowStepURI");
@@ -483,7 +483,7 @@ public class JenaIngestController extends BaseEditController {
             return EXECUTE_WORKFLOW_JSP;
         }
     }
-    
+
     private String processExecuteSparqlRequest(VitroRequest vreq) {
         String sparqlQueryStr = vreq.getParameter("sparqlQueryStr");
 		OntModel jenaOntModel = ModelAccess.on(getServletContext()).getOntModel();
@@ -498,7 +498,7 @@ public class JenaIngestController extends BaseEditController {
         /*ass92*/
         OntologyDao daoObj = vreq.getUnfilteredWebappDaoFactory().getOntologyDao();
         List<Ontology> ontologiesObj = daoObj.getAllOntologies();
-        List<String> prefixList = new ArrayList<>();       
+        List<String> prefixList = new ArrayList<>();
         if(ontologiesObj !=null && ontologiesObj.size()>0){
             for (Ontology ont : ontologiesObj) {
                 prefixList.add(ont.getPrefix() == null ? "(not yet specified)" : ont.getPrefix());
@@ -508,7 +508,7 @@ public class JenaIngestController extends BaseEditController {
         else{
             prefixList.add("<strong>" + "No Ontologies added" + "</strong>");
             prefixList.add("<strong>" + "Load Ontologies" + "</strong>");
-        }     
+        }
         vreq.setAttribute("prefixList", prefixList);
         /*complete*/
         if (sparqlQueryStr != null) {
@@ -528,7 +528,7 @@ public class JenaIngestController extends BaseEditController {
                 } catch (QueryParseException qpe) {
                     String errorMsg = "<p>Unable to parse query:</p>";
                     if (qpe.getMessage() != null) {
-                        errorMsg += "<p>" + qpe.getMessage() + "</p>"; 
+                        errorMsg += "<p>" + qpe.getMessage() + "</p>";
                     }
                     vreq.setAttribute("errorMsg", errorMsg);
                 } catch (InconsistentOntologyException ioe) {
@@ -543,13 +543,13 @@ public class JenaIngestController extends BaseEditController {
             vreq.setAttribute("savedQueries",savedQueryList);
             vreq.setAttribute("title","SPARQL CONSTRUCT result");
             return EXECUTE_SPARQL_JSP;
-        } else {    
+        } else {
             vreq.setAttribute("savedQueries",savedQueryList);
             vreq.setAttribute("title","Execute SPARQL Construct");
             return EXECUTE_SPARQL_JSP;
         }
     }
-    
+
     private String processGenerateTBoxRequest(VitroRequest vreq) {
         String testParam = vreq.getParameter("sourceModelName");
         if (testParam != null) {
@@ -559,9 +559,9 @@ public class JenaIngestController extends BaseEditController {
         } else {
             vreq.setAttribute("title","Generate TBox from Assertions Data");
             return GENERATE_TBOX_JSP;
-        }    
+        }
     }
-    
+
     private String processPermanentURIRequest(VitroRequest vreq, ModelMaker maker) {
         String modelName = vreq.getParameter("modelName");
         String oldModel = vreq.getParameter("oldModel");
@@ -580,7 +580,7 @@ public class JenaIngestController extends BaseEditController {
                     String namespace = resItr.nextResource().getNameSpace();
                     if(!namespaceList.contains(namespace)){
                         namespaceList.add(namespace);
-                    }        
+                    }
                 }
             } else {
                 namespaceList.add("no resources present");
@@ -601,13 +601,13 @@ public class JenaIngestController extends BaseEditController {
         vreq.setAttribute("title","Ingest Menu");
         return INGEST_MENU_JSP;
     }
-    
+
     private String processMergeResourceRequest(VitroRequest vreq) {
           String uri1 = vreq.getParameter("uri1"); // get primary uri
           String uri2 = vreq.getParameter("uri2"); // get secondary uri
           String usePrimaryLabelOnlyStr = vreq.getParameter("usePrimaryLabelOnly");;
           boolean usePrimaryLabelOnly = usePrimaryLabelOnlyStr != null && !usePrimaryLabelOnlyStr.isEmpty();
-          
+
           if(uri1!=null){
               JenaIngestUtils utils = new JenaIngestUtils();
               /*
@@ -615,13 +615,13 @@ public class JenaIngestController extends BaseEditController {
                */
               OntModel baseOntModel = ModelAccess.on(getServletContext()).getOntModel(FULL_ASSERTIONS);
               OntModel tboxOntModel = ModelAccess.on(getServletContext()).getOntModel(TBOX_UNION);
-              
+
               /*
                * calling method that does the merge operation.
                */
               MergeResult result = utils.doMerge(
                       uri1, uri2, baseOntModel, tboxOntModel, usePrimaryLabelOnly);
-              
+
               vreq.getSession().setAttribute(
                       "leftoverModel", result.getLeftoverModel());
               vreq.setAttribute("result", result);
@@ -632,7 +632,7 @@ public class JenaIngestController extends BaseEditController {
               return MERGE_RESOURCES;
           }
     }
-    
+
     private String processRenameResourceRequest(VitroRequest vreq) {
           String oldNamespace = vreq.getParameter("oldNamespace");
           String newNamespace = vreq.getParameter("newNamespace");
@@ -641,7 +641,7 @@ public class JenaIngestController extends BaseEditController {
               if (oldNamespace.isEmpty() && !newNamespace.isEmpty()) {
                   errorMsg = "Please enter the old namespace to be changed.";
               } else if (!oldNamespace.isEmpty() && newNamespace.isEmpty()) {
-                  errorMsg = "Please enter the new namespace."; 
+                  errorMsg = "Please enter the new namespace.";
               } else if (oldNamespace.isEmpty() && newNamespace.isEmpty()) {
                   errorMsg = "Please enter the namespaces.";
               } else if (oldNamespace.equals(newNamespace)) {
@@ -664,8 +664,8 @@ public class JenaIngestController extends BaseEditController {
               return RENAME_RESOURCE;
           }
     }
-    
-    private void processMergeResultRequest(VitroRequest vreq, 
+
+    private void processMergeResultRequest(VitroRequest vreq,
                                            HttpServletResponse response) {
 
         Model lmodel = (Model) vreq.getSession().getAttribute("leftoverModel");
@@ -700,18 +700,18 @@ public class JenaIngestController extends BaseEditController {
 			return CONTENT;
 		}
     }
-    
+
     private void doCreateModel(String modelName, ModelMaker modelMaker) {
         modelMaker.createModel(modelName);
     }
-    
+
     private void doRemoveModel(String modelName, ModelMaker modelMaker) {
-        //Try to detach first since it cause problems to remove an attached model.        
+        //Try to detach first since it cause problems to remove an attached model.
         doDetachModel(modelName);
         log.debug("Removing " + modelName + " from webapp");
-        modelMaker.removeModel(modelName);        
+        modelMaker.removeModel(modelName);
     }
-    
+
     private void doClearModel(String modelName, ModelMaker modelMaker) {
         Model m = modelMaker.getModel(modelName);
         OntModel o = VitroModelFactory.createOntologyModel(m);
@@ -722,7 +722,7 @@ public class JenaIngestController extends BaseEditController {
             o.leaveCriticalSection();
         }
     }
-    
+
     private void doLoadRDFData(String modelName, String docLoc, String filePath, String language, ModelMaker modelMaker) {
         Model m = modelMaker.getModel(modelName);
         m.enterCriticalSection(Lock.WRITE);
@@ -750,22 +750,22 @@ public class JenaIngestController extends BaseEditController {
                     }
                 }
             }
-        } finally { 
+        } finally {
             m.leaveCriticalSection();
         }
     }
-    
+
     private void doAttachModel(String modelName, ModelMaker modelMaker) {
         if (attachedModels.containsKey(modelName)) {
             doDetachModel(modelName);
         }
         Model m = ModelFactory.createDefaultModel();
-        m.add(modelMaker.getModel(modelName));        
+        m.add(modelMaker.getModel(modelName));
         ModelAccess.on(getServletContext()).getOntModel(TBOX_ASSERTIONS).addSubModel(m);
         attachedModels.put(modelName, m);
         log.info("Attached " + modelName + " (" + m.hashCode() + ") to webapp");
     }
-    
+
     private void doDetachModel(String modelName) {
         Model m = attachedModels.get(modelName);
         if (m == null) {
@@ -775,32 +775,32 @@ public class JenaIngestController extends BaseEditController {
         attachedModels.remove(modelName);
         log.info("Detached " + modelName + " (" + m.hashCode() + ") from webapp");
     }
-    
+
     private void doRenameBNodes(VitroRequest vreq, String namespaceEtc, boolean patternBoolean, String pattern, String[] sourceModel) {
         OntModel source = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM);
         String property = vreq.getParameter("property");
-        
+
         Boolean csv2rdf = false;
         try {
             csv2rdf = Boolean.parseBoolean(vreq.getParameter("csv2rdf"));
         } catch (Exception e) {
             log.error(e, e);
         }
-        
+
         if (csv2rdf) {
             source.addSubModel(
-                    (Model) vreq.getSession().getAttribute("csv2rdfResult")); 
+                    (Model) vreq.getSession().getAttribute("csv2rdfResult"));
         } else {
             for (String aSourceModel : sourceModel) {
                 Model m = getModel(aSourceModel, vreq);
                 source.addSubModel(m);
             }
         }
-        
-        Model destination = (csv2rdf) 
+
+        Model destination = (csv2rdf)
                ? ModelFactory.createDefaultModel()
                : getModel(vreq.getParameter("destinationModelName"),vreq);
-               
+
         JenaIngestUtils utils = new JenaIngestUtils();
         destination.enterCriticalSection(Lock.WRITE);
         try {
@@ -818,7 +818,7 @@ public class JenaIngestController extends BaseEditController {
             destination.leaveCriticalSection();
         }
     }
-    
+
     private void doSmushSingleModel(VitroRequest vreq) {
         OntModel source = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM);
         String[] sourceModel = vreq.getParameterValues("sourceModelName");
@@ -837,7 +837,7 @@ public class JenaIngestController extends BaseEditController {
             destination.leaveCriticalSection();
         }
     }
-    
+
     private long doExecuteSparql(VitroRequest vreq) {
 		OntModel jenaOntModel = ModelAccess.on(getServletContext()).getOntModel();
         OntModel source = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM);
@@ -846,7 +846,7 @@ public class JenaIngestController extends BaseEditController {
             Model m = getModel(aSourceModel, vreq);
             source.addSubModel(m);
         }
-        Model destination = getModel(vreq.getParameter("destinationModelName"),vreq); 
+        Model destination = getModel(vreq.getParameter("destinationModelName"),vreq);
         String sparqlQueryStr = vreq.getParameter("sparqlQueryStr");
         String savedQueryURIStr = vreq.getParameter("savedQuery");
         String queryStr;
@@ -880,7 +880,7 @@ public class JenaIngestController extends BaseEditController {
             } else {
                 destination.notifyEvent(new EditEvent(null, true));
             }
-            destination.add(tempModel);      
+            destination.add(tempModel);
         } finally {
             if (destination instanceof OntModel) {
                 ((OntModel) destination).getBaseModel().notifyEvent(new EditEvent(null, false));
@@ -889,9 +889,9 @@ public class JenaIngestController extends BaseEditController {
             }
             destination.leaveCriticalSection();
         }
-        return tempModel.size();     
+        return tempModel.size();
     }
-    
+
     public void doSubtractModels(VitroRequest vreq) {
             String modela = vreq.getParameter("modela");
             String modelb = vreq.getParameter("modelb");
@@ -904,7 +904,7 @@ public class JenaIngestController extends BaseEditController {
             else
                 ma.remove(mb);
     }
-    
+
     public void doSplitPropertyValues(VitroRequest vreq) {
         String sourceModelStr = vreq.getParameter("sourceModelName");
         String destinationModelStr = vreq.getParameter("destinationModelName");
@@ -917,7 +917,7 @@ public class JenaIngestController extends BaseEditController {
         boolean trim = ( "TRUE".equalsIgnoreCase(trimStr) );
         destinationModel.add( (new JenaIngestUtils()).splitPropertyValues(sourceModel, propertyURI, splitRegex, newPropertyURI, trim));
     }
-    
+
     public void doGenerateTBox(VitroRequest vreq) {
         OntModel source = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM);
         String[] sourceModel = vreq.getParameterValues("sourceModelName");
@@ -929,7 +929,7 @@ public class JenaIngestController extends BaseEditController {
         Model destination = getModel(destinationModelStr,vreq);
         destination.add( (new JenaIngestUtils()).generateTBox(source));
     }
-        
+
     public void doProcessStrings(VitroRequest vreq) {
         try {
             String className = vreq.getParameter("className");
@@ -948,7 +948,7 @@ public class JenaIngestController extends BaseEditController {
             String retractionsModelStr = vreq.getParameter("retractionsModel");
             if ( (retractionsModelStr != null) && ( retractionsModelStr.length() > 0 ) ) {
                 savedRetractionsModel = getModel(retractionsModelStr, vreq);
-            } 
+            }
             Model additionsModel = ModelFactory.createDefaultModel();
             Model retractionsModel = ModelFactory.createDefaultModel();
             Class<?> stringProcessorClass = Class.forName(className);
@@ -974,7 +974,7 @@ public class JenaIngestController extends BaseEditController {
                         }
                         if (!newLex.equals(lex)) {
                             retractionsModel.add(stmt);
-                            if (newLex.length()>0) {    
+                            if (newLex.length()>0) {
                                     Literal newLit = null;
                                     if (lit.getLanguage()!=null && lit.getLanguage().length()>0) {
                                         newLit = additionsModel.createLiteral(newLex,lit.getLanguage());
@@ -1000,7 +1000,7 @@ public class JenaIngestController extends BaseEditController {
                 }
             } finally {
                 destination.leaveCriticalSection();
-            } 
+            }
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -1046,7 +1046,7 @@ public class JenaIngestController extends BaseEditController {
                             additionsModel.add(stmt.getSubject(),stmt.getPredicate(),newLit);
                         }
                     }
-                }    
+                }
             } finally {
                 closeIt.close();
             }
@@ -1057,7 +1057,7 @@ public class JenaIngestController extends BaseEditController {
             model.leaveCriticalSection();
         }
     }
-    
+
     private void doExecuteWorkflow(VitroRequest vreq) {
         String workflowURI = vreq.getParameter("workflowURI");
         String workflowStepURI = vreq.getParameter("workflowStepURI");
@@ -1066,8 +1066,8 @@ public class JenaIngestController extends BaseEditController {
                 jenaOntModel.getIndividual(workflowURI),getModelMaker(
                         vreq)).run(jenaOntModel.getIndividual(workflowStepURI));
     }
-    
-    private String doRename(String oldNamespace,String newNamespace){    
+
+    private String doRename(String oldNamespace,String newNamespace){
         String uri = null;
         String result = null;
         Integer counter = 0;
@@ -1079,7 +1079,7 @@ public class JenaIngestController extends BaseEditController {
                     (new RDFServiceGraph(
                             rdfService, ABOX_ASSERTIONS));
     		OntModel ontModel = ModelAccess.on(getServletContext()).getOntModel();
-            List<String> urisToChange = new LinkedList<String>();        
+            List<String> urisToChange = new LinkedList<String>();
             ontModel.enterCriticalSection(Lock.READ);
             try {
                 Iterator<Individual> indIter = ontModel.listIndividuals();
@@ -1088,7 +1088,7 @@ public class JenaIngestController extends BaseEditController {
                     String namespace = ind.getNameSpace();
                     if( namespace != null ){
                         if( oldNamespace.equals(namespace) ){
-                            uri = ind.getURI();    
+                            uri = ind.getURI();
                             urisToChange.add(uri);
                             namespacePresent = true;
                         }
@@ -1100,7 +1100,7 @@ public class JenaIngestController extends BaseEditController {
             if(!namespacePresent){
                 result = "no resources renamed";
                 return result;
-            }    
+            }
             for( String oldURIStr : urisToChange){
                 long time1 = System.currentTimeMillis();
                 Resource res = baseOntModel.getResource(oldURIStr);
@@ -1111,50 +1111,50 @@ public class JenaIngestController extends BaseEditController {
                 Matcher matcher = p.matcher(candidateString);
                 newURIStr = matcher.replaceFirst(newNamespace);
                 long time3 = System.currentTimeMillis();
-                log.debug("time to get new uri: " + 
+                log.debug("time to get new uri: " +
                         Long.toString(time3 - time2));
                 log.debug("Renaming "+ oldURIStr + " to " + newURIStr);
-         
+
                 String whereClause = "} WHERE { \n" +
-                        "  GRAPH <" + ABOX_ASSERTIONS + "> { \n" +  
+                        "  GRAPH <" + ABOX_ASSERTIONS + "> { \n" +
                         "   { <" + oldURIStr + "> ?p <" + oldURIStr + "> } \n " +
-                        "     UNION \n" +  
+                        "     UNION \n" +
                         "   { <" + oldURIStr + "> ?q ?o } \n " +
                         "     UNION \n" +
                         "   { ?s ?r <" + oldURIStr + "> } \n" +
                         "  } \n" +
                         "}";
-                
-                String removeQuery = "CONSTRUCT { \n" + 
+
+                String removeQuery = "CONSTRUCT { \n" +
                                    "   <" + oldURIStr + "> ?p <" + oldURIStr + "> . \n " +
                                    "   <" + oldURIStr + "> ?q ?o . \n " +
                                    "   ?s ?r <" + oldURIStr + "> \n" + whereClause;
 
-                String addQuery = "CONSTRUCT { \n" + 
+                String addQuery = "CONSTRUCT { \n" +
                         "   <" + newURIStr + "> ?p <" + newURIStr + "> . \n " +
                         "   <" + newURIStr + "> ?q ?o . \n " +
-                        "   ?s ?r <" + newURIStr + "> \n" + whereClause;                   
-                try {                   
+                        "   ?s ?r <" + newURIStr + "> \n" + whereClause;
+                try {
                     ChangeSet cs = rdfService.manufactureChangeSet();
                     cs.addAddition(rdfService.sparqlConstructQuery(
-                            addQuery, RDFService.ModelSerializationFormat.N3), 
-                                    RDFService.ModelSerializationFormat.N3, 
+                            addQuery, RDFService.ModelSerializationFormat.N3),
+                                    RDFService.ModelSerializationFormat.N3,
                                             ABOX_ASSERTIONS);
                     cs.addRemoval(rdfService.sparqlConstructQuery(
-                            removeQuery, RDFService.ModelSerializationFormat.N3), 
-                                    RDFService.ModelSerializationFormat.N3, 
-                                            ABOX_ASSERTIONS); 
+                            removeQuery, RDFService.ModelSerializationFormat.N3),
+                                    RDFService.ModelSerializationFormat.N3,
+                                            ABOX_ASSERTIONS);
                     rdfService.changeSetUpdate(cs);
                 } catch (RDFServiceException e) {
                     throw new RuntimeException(e);
                 }
-                 
+
                 long time4 = System.currentTimeMillis();
                 log.debug(" time to rename : " + Long.toString( time4 - time3));
-                log.debug(" time for one resource: " + 
-                        Long.toString( time4 -time1));          
+                log.debug(" time for one resource: " +
+                        Long.toString( time4 -time1));
                 counter++;
-            }        
+            }
             result = counter.toString() + " resources renamed";
             return result;
         } finally {
@@ -1163,11 +1163,11 @@ public class JenaIngestController extends BaseEditController {
             }
         }
     }
-    
+
     protected String showModelList(VitroRequest vreq, ModelMaker maker, WhichService modelType) {
     	vreq.setAttribute("modelType", modelType.toString());
         if(modelType == CONTENT){
-        	vreq.setAttribute("infoLine", "Main Store models");            
+        	vreq.setAttribute("infoLine", "Main Store models");
         } else {
         	vreq.setAttribute("infoLine", "Configuration models");
         }
@@ -1181,11 +1181,11 @@ public class JenaIngestController extends BaseEditController {
 			HttpServletResponse response) throws ServletException, IOException {
         JSPPageHandler.renderPlainPage(vreq, response, "/dumpRestore");
 	}
-	
+
 	public static Model getModel(String name, HttpServletRequest request) {
 		return getModelMaker(request).getModel(name);
 	}
-    
+
     protected static ModelMaker getModelMaker(HttpServletRequest req){
         ServletContext ctx = req.getSession().getServletContext();
 		if (isUsingMainStoreForIngest(req)) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java
index 3c5ef21dd..194b69428 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaXMLFileUpload.java
@@ -42,14 +42,14 @@ public class JenaXMLFileUpload  extends JenaIngestController  {
 	Log log = LogFactory.getLog(JenaXMLFileUpload.class);
 	private String baseDirectoryForFiles;
 	private int maxFileSize = 1024 * 1024 * 500;
-	
+
 	private XsltExecutable xsltExec;
 	private Processor processor;
-	
+
 	public void init() throws ServletException {
 		super.init();
 		File baseDir = new File( getServletContext().getRealPath("/xmlFileUpload"));
-		
+
 		if( baseDir.exists() && baseDir.isDirectory() ){
 			System.out.println("JenaXMLFileUpload, found upload directory of " + baseDir.getAbsolutePath());
 		}else{
@@ -62,9 +62,9 @@ public class JenaXMLFileUpload  extends JenaIngestController  {
 			}
 		}
 		baseDirectoryForFiles = baseDir.getAbsolutePath();
-				
+
 		File xslt = new File(getServletContext().getRealPath("/xslt/xml2rdf.xsl"));
-		System.out.println("JenaXMLFileUpload, attempting to load xslt " + xslt.getAbsolutePath()); 				
+		System.out.println("JenaXMLFileUpload, attempting to load xslt " + xslt.getAbsolutePath());
 		processor = new Processor(false);
 		XsltCompiler compiler  = processor.newXsltCompiler();
 		try {
@@ -73,7 +73,7 @@ public class JenaXMLFileUpload  extends JenaIngestController  {
 		} catch (SaxonApiException e) {
 			System.out.println("could not compile xslt/xml2rdf.xsl" );
 			System.out.println(e.getMessage());
-		}		
+		}
 	}
 
 	@Override
@@ -89,16 +89,16 @@ public class JenaXMLFileUpload  extends JenaIngestController  {
 	/**
 	 * Each file will be converted to RDF/XML and loaded to the target model.
 	 * If any of the files fail, no data will be loaded.
-	 * 
+	 *
 	 * parameters:
 	 * targetModel - model to save to
 	 * defaultNamespace - namespace to use for elements in xml that lack a namespace
-	 * 
+	 *
 	 */
 	@Override
 	public void doPost(HttpServletRequest request, HttpServletResponse resp)
 	throws ServletException, IOException {
-		VitroRequest vreq = new VitroRequest(request);        
+		VitroRequest vreq = new VitroRequest(request);
 		if (vreq.hasFileSizeException()) {
 			throw new ServletException("Size limit exceeded: "
 					+ vreq.getFileSizeException().getLocalizedMessage());
@@ -116,35 +116,35 @@ public class JenaXMLFileUpload  extends JenaIngestController  {
         }
 
         ModelMaker modelMaker = getModelMaker(vreq);
-        String targetModel = request.getParameter("targetModel");               
+        String targetModel = request.getParameter("targetModel");
 		if (targetModel == null) {
 			throw new ServletException("targetModel not specified.");
 		}
-        
+
         Model m = modelMaker.getModel(targetModel);
         if( m == null )
         	throw new ServletException("targetModel '" + targetModel + "' was not found.");
         request.setAttribute("targetModel", targetModel);
-        
-        List<File> filesToLoad = saveFiles( vreq.getFiles() );    
+
+        List<File> filesToLoad = saveFiles( vreq.getFiles() );
         List<File> rdfxmlToLoad = convertFiles( filesToLoad);
         List<Model> modelsToLoad = loadRdfXml( rdfxmlToLoad );
-    
-        try{        
+
+        try{
         	m.enterCriticalSection(Lock.WRITE);
 			for(Model model : modelsToLoad ){
 				m.add(model);
 			}
-        } finally { 
+        } finally {
         	m.leaveCriticalSection();
         }
-        
+
         long count = countOfStatements(modelsToLoad);
-        request.setAttribute("statementCount", count);        	
-		
+        request.setAttribute("statementCount", count);
+
 		request.setAttribute("title","Uploaded files and converted to RDF");
 
-		request.setAttribute("fileItems",vreq.getFiles());				
+		request.setAttribute("fileItems",vreq.getFiles());
 
         request.setAttribute("css", "<link rel=\"stylesheet\" type=\"text/css\" href=\""+vreq.getAppBean().getThemeDir()+"css/edit.css\"/>");
 
@@ -156,22 +156,22 @@ public class JenaXMLFileUpload  extends JenaIngestController  {
             e.printStackTrace(System.out);
         }
 	}
-	
-	@Override	
+
+	@Override
 	public void doGet(HttpServletRequest request,
-			HttpServletResponse response) throws ServletException, IOException {		
+			HttpServletResponse response) throws ServletException, IOException {
 		if (!isAuthorizedToDisplayPage(request, response,
 				SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION)) {
         	return;
         }
 
 		VitroRequest vreq = new VitroRequest(request);
-		
+
 		//make a form for uploading a file
 		request.setAttribute("title","Upload file and convert to RDF");
 
 		request.setAttribute("modelNames", getModelMaker(vreq).listModels().toList());
-		request.setAttribute("models", null);				
+		request.setAttribute("models", null);
 
         request.setAttribute("css", "<link rel=\"stylesheet\" type=\"text/css\" href=\""+vreq.getAppBean().getThemeDir()+"css/edit.css\"/>");
 
@@ -182,13 +182,13 @@ public class JenaXMLFileUpload  extends JenaIngestController  {
             System.out.println(e.getMessage());
 			e.printStackTrace(System.out);
         }
-		
+
 	}
 
 	private List<Model> loadRdfXml(List<File> rdfxmlToLoad) throws ServletException {
 		List<Model> models = new ArrayList<Model>(rdfxmlToLoad.size());
 		for( File file: rdfxmlToLoad){
-			Model tempModel = ModelFactory.createDefaultModel();		
+			Model tempModel = ModelFactory.createDefaultModel();
 			try {
 				tempModel.read(new FileInputStream(file), null);
 				models.add(tempModel);
@@ -203,10 +203,10 @@ public class JenaXMLFileUpload  extends JenaIngestController  {
 		List<File> rdfxmlFiles = new ArrayList<File>(filesToLoad.size());
 		for( File file: filesToLoad){
 			try {
-				//look for an example of this in S9APIExamples.java from saxon he 9 
+				//look for an example of this in S9APIExamples.java from saxon he 9
 				XsltTransformer t = xsltExec.load();
 				//this is how to set parameters:
-				//t.setParameter(new QName("someparametername"), new XdmAtomicValue(10));				
+				//t.setParameter(new QName("someparametername"), new XdmAtomicValue(10));
 				Serializer out = new Processor(false).newSerializer();
 				out.setOutputProperty(Serializer.Property.METHOD, "xml");
 				out.setOutputProperty(Serializer.Property.INDENT, "yes");
@@ -219,7 +219,7 @@ public class JenaXMLFileUpload  extends JenaIngestController  {
 			} catch (SaxonApiException e) {
 				log.error("could not convert " + file.getAbsolutePath() + " to RDF/XML: " + e.getMessage());
 				throw new ServletException("could not convert " + file.getAbsolutePath() + " to RDF/XML: " + e.getMessage());
-			}			
+			}
 		}
 		return rdfxmlFiles;
 	}
@@ -231,8 +231,8 @@ public class JenaXMLFileUpload  extends JenaIngestController  {
 	 */
 	private List<File> saveFiles( Map<String, List<FileItem>> fileStreams ) throws ServletException{
 	    // save files to disk
-        List<File> filesToLoad = new ArrayList<File>();                
-        for(String fileItemKey : fileStreams.keySet()){        	
+        List<File> filesToLoad = new ArrayList<File>();
+        for(String fileItemKey : fileStreams.keySet()){
         	for( FileItem fileItem : fileStreams.get(fileItemKey)){
         		String originalName = fileItem.getName();
         		String name = originalName.replaceAll("[,+\\\\/$%^&*#@!<>'\"~;]", "_");
@@ -267,16 +267,16 @@ public class JenaXMLFileUpload  extends JenaIngestController  {
         			throw new ServletException("No file was uploaded or file was empty.");
         		}else{
         			filesToLoad.add( uploadedFile );
-        		}        		
+        		}
         	}
         }
         return filesToLoad;
 	}
 
 	private long countOfStatements( List<Model> models){
-		
+
 		long count =0;
-		for( Model m : models){			
+		for( Model m : models){
 			StmtIterator it = m.listStatements();
 			while( it.hasNext()){
 				it.next();
@@ -285,7 +285,7 @@ public class JenaXMLFileUpload  extends JenaIngestController  {
 			it.close();
 		}
 		return count;
-		
+
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java
index 8a507cb79..5e1bc25b8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java
@@ -53,11 +53,11 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.model.RDFServiceMod
 
 @WebServlet(name = "RDFUploadController", urlPatterns = {"/uploadRDF"} )
 public class RDFUploadController extends JenaIngestController {
-    
+
     private static int maxFileSizeInBytes = 1024 * 1024 * 2000; //2000mb
-    private static FileItem fileStream = null; 
+    private static FileItem fileStream = null;
     private static final String LOAD_RDF_DATA_JSP="/jenaIngest/loadRDFData.jsp";
-    
+
 	@Override
 	public long maximumMultipartFileSize() {
 		return maxFileSizeInBytes;
@@ -67,7 +67,7 @@ public class RDFUploadController extends JenaIngestController {
 	public boolean stashFileSizeException() {
 		return true;
 	}
-	
+
     @Override
 	public void doPost(HttpServletRequest req,
             HttpServletResponse response) throws ServletException, IOException {
@@ -76,72 +76,72 @@ public class RDFUploadController extends JenaIngestController {
             return;
         }
 
-		VitroRequest request = new VitroRequest(req);        
+		VitroRequest request = new VitroRequest(req);
         if (request.hasFileSizeException()) {
             forwardToFileUploadError(
-                    request.getFileSizeException().getLocalizedMessage(), 
+                    request.getFileSizeException().getLocalizedMessage(),
                             req, response);
             return;
         }
 
         Map<String, List<FileItem>> fileStreams = request.getFiles();
-        
+
         LoginStatusBean loginBean = LoginStatusBean.getBean(request);
-        
+
         try {
             String modelName = req.getParameter("modelName");
             if(modelName!=null){
                 loadRDF(request,response);
                 return;
-            }    
+            }
         } catch (Exception e) {
             log.error(e,e);
             throw new RuntimeException(e);
         }
-                       
+
         boolean remove = "remove".equals(request.getParameter("mode"));
         String verb = remove?"Removed":"Added";
-        
+
         String languageStr = request.getParameter("language");
-        
+
         boolean makeClassgroups = ("true".equals(request.getParameter(
                 "makeClassgroups")));
-        
-        // add directly to the ABox model without reading first into 
+
+        // add directly to the ABox model without reading first into
         // a temporary in-memory model
         boolean directRead = ("directAddABox".equals(request.getParameter(
                 "mode")));
-          
-        String uploadDesc ="";        
-                
-        OntModel uploadModel = (directRead) 
+
+        String uploadDesc ="";
+
+        OntModel uploadModel = (directRead)
             ? getABoxModel(getServletContext())
             : ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
-            
+
         /* ********************* GET RDF by URL ********************** */
         String RDFUrlStr =  request.getParameter("rdfUrl");
         if (RDFUrlStr != null && RDFUrlStr.length() > 0) {
             try {
                 uploadModel.enterCriticalSection(Lock.WRITE);
                 try {
-                    uploadModel.read(RDFUrlStr, languageStr); 
+                    uploadModel.read(RDFUrlStr, languageStr);
                     // languageStr may be null and default would be RDF/XML
                 } finally {
                     uploadModel.leaveCriticalSection();
                 }
-                uploadDesc = verb + " RDF from " + RDFUrlStr;                
+                uploadDesc = verb + " RDF from " + RDFUrlStr;
             } catch (JenaException ex){
-                    forwardToFileUploadError("Could not parse file to " + 
+                    forwardToFileUploadError("Could not parse file to " +
                            languageStr + ": " + ex.getMessage(), req, response);
                     return;
-            }catch (Exception e) {                               
-                forwardToFileUploadError("Could not load from URL: " + 
-                        e.getMessage(), req, response);                  
+            }catch (Exception e) {
+                forwardToFileUploadError("Could not load from URL: " +
+                        e.getMessage(), req, response);
                 return;
-            }            
+            }
         } else {
             /* **************** upload RDF from POST ********************* */
-            if( fileStreams.get("rdfStream") != null 
+            if( fileStreams.get("rdfStream") != null
                     && fileStreams.get("rdfStream").size() > 0 ) {
                 FileItem rdfStream = fileStreams.get("rdfStream").get(0);
                 try {
@@ -157,47 +157,47 @@ public class RDFUploadController extends JenaIngestController {
                             uploadModel.leaveCriticalSection();
                         }
                     }
-                    uploadDesc = verb + " RDF from file " + rdfStream.getName();                
+                    uploadDesc = verb + " RDF from file " + rdfStream.getName();
                 } catch (IOException e) {
-                    forwardToFileUploadError("Could not read file: " + 
+                    forwardToFileUploadError("Could not read file: " +
                             e.getLocalizedMessage(), req, response);
                     return;
                 }catch (JenaException ex){
-                    forwardToFileUploadError("Could not parse file to " + 
-                            languageStr + ": " + ex.getMessage(), 
+                    forwardToFileUploadError("Could not parse file to " +
+                            languageStr + ": " + ex.getMessage(),
                                     req, response);
                     return;
-                }catch (Exception e) {                               
-                    forwardToFileUploadError("Could not load from file: " + 
-                            e.getMessage(), req, response);                  
+                }catch (Exception e) {
+                    forwardToFileUploadError("Could not load from file: " +
+                            e.getMessage(), req, response);
                     return;
-                }finally{            
+                }finally{
                     rdfStream.delete();
                 }
             }
         }
-        
+
         /* ********** Do the model changes *********** */
         if( !directRead && uploadModel != null ){
-            
+
             uploadModel.loadImports();
-            
+
             long tboxstmtCount = 0L;
             long aboxstmtCount = 0L;
 
             JenaModelUtils xutil = new JenaModelUtils();
-            
+
             OntModel tboxModel = getTBoxModel();
             OntModel aboxModel = getABoxModel(
                     getServletContext());
             OntModel tboxChangeModel = null;
             Model aboxChangeModel = null;
             OntModelSelector ontModelSelector = ModelAccess.on(getServletContext()).getOntModelSelector();
-            
+
             if (tboxModel != null) {
                 boolean AGGRESSIVE = true;
                 tboxChangeModel = xutil.extractTBox(uploadModel, AGGRESSIVE);
-                // aggressively seek all statements that are part of the TBox  
+                // aggressively seek all statements that are part of the TBox
                 tboxstmtCount = operateOnModel(request.getUnfilteredWebappDaoFactory(),
                         tboxModel, tboxChangeModel, ontModelSelector,
                                 remove, makeClassgroups, loginBean.getUserURI());
@@ -209,17 +209,17 @@ public class RDFUploadController extends JenaIngestController {
                 aboxChangeModel.write(os, "N3");
                 ByteArrayInputStream in = new ByteArrayInputStream(os.toByteArray());
                 if(!remove) {
-                    readIntoModel(in, "N3", request.getRDFService(), 
+                    readIntoModel(in, "N3", request.getRDFService(),
                             ModelNames.ABOX_ASSERTIONS);
                 } else {
-                    removeFromModel(in, "N3", request.getRDFService(), 
+                    removeFromModel(in, "N3", request.getRDFService(),
                             ModelNames.ABOX_ASSERTIONS);
                 }
 //                operateOnModel(request.getUnfilteredWebappDaoFactory(),
-//                        aboxModel, aboxChangeModel, ontModelSelector, 
+//                        aboxModel, aboxChangeModel, ontModelSelector,
 //                                remove, makeClassgroups, loginBean.getUserURI());
             }
-            request.setAttribute("uploadDesc", uploadDesc + ". " + verb + " " + 
+            request.setAttribute("uploadDesc", uploadDesc + ". " + verb + " " +
                     (tboxstmtCount + aboxstmtCount) + "  statements.");
         } else {
             request.setAttribute("uploadDesc", "RDF upload successful.");
@@ -230,29 +230,29 @@ public class RDFUploadController extends JenaIngestController {
         try {
             JSPPageHandler.renderBasicPage(request, response, "/templates/edit/specific/upload_rdf_result.jsp");
         } catch (Exception e) {
-            log.error("Could not forward to view: " + e.getLocalizedMessage());            
+            log.error("Could not forward to view: " + e.getLocalizedMessage());
         }
     }
 
     private static final boolean BEGIN = true;
     private static final boolean END = !BEGIN;
-    
+
     private ChangeSet makeChangeSet(RDFService rdfService) {
         ChangeSet cs = rdfService.manufactureChangeSet();
         cs.addPreChangeEvent(new BulkUpdateEvent(null, BEGIN));
         cs.addPostChangeEvent(new BulkUpdateEvent(null, END));
         return cs;
     }
-    
-    private void addUsingRDFService(InputStream in, String languageStr, 
+
+    private void addUsingRDFService(InputStream in, String languageStr,
             RDFService rdfService) {
         ChangeSet changeSet = makeChangeSet(rdfService);
-        RDFService.ModelSerializationFormat format = 
-                ("RDF/XML".equals(languageStr) 
+        RDFService.ModelSerializationFormat format =
+                ("RDF/XML".equals(languageStr)
                         || "RDF/XML-ABBREV".equals(languageStr))
                                 ? RDFService.ModelSerializationFormat.RDFXML
                                 : RDFService.ModelSerializationFormat.N3;
-        changeSet.addAddition(in, format, 
+        changeSet.addAddition(in, format,
                 ABOX_ASSERTIONS);
         try {
             rdfService.changeSetUpdate(changeSet);
@@ -261,8 +261,8 @@ public class RDFUploadController extends JenaIngestController {
             throw new RuntimeException(rdfse);
         }
     }
-    
-    public void loadRDF(VitroRequest request, HttpServletResponse response) 
+
+    public void loadRDF(VitroRequest request, HttpServletResponse response)
                                 throws ServletException {
         Map<String, List<FileItem>> fileStreams = request.getFiles();
         String filePath = fileStreams.get("filePath").get(0).getName();
@@ -276,7 +276,7 @@ public class RDFUploadController extends JenaIngestController {
         if (modelName == null) {
             request.setAttribute("title","Load RDF Data");
             bodyJsp = LOAD_RDF_DATA_JSP;
-        } else {          
+        } else {
             RDFService rdfService = getRDFService(request, maker, modelName);
             try {
                 doLoadRDFData(modelName, docLoc, filePath, languageStr, rdfService);
@@ -285,8 +285,8 @@ public class RDFUploadController extends JenaIngestController {
             }
             WhichService modelType = getModelType(request);
             bodyJsp = showModelList(request, maker, modelType);
-        } 
-        
+        }
+
         try {
             JSPPageHandler.renderBasicPage(request, response, bodyJsp);
         } catch (Exception e) {
@@ -294,9 +294,9 @@ public class RDFUploadController extends JenaIngestController {
             log.error(errMsg, e);
             throw new ServletException(errMsg, e);
         }
-        
+
     }
-    
+
     private RDFService getRDFService(VitroRequest vreq, ModelMaker maker, String modelName) {
         if (isUsingMainStoreForIngest(vreq)) {
             log.debug("Using main RDFService");
@@ -304,20 +304,20 @@ public class RDFUploadController extends JenaIngestController {
         } else {
             log.debug("Making RDFService for single model from ModelMaker");
             Model m = maker.getModel(modelName);
-            return new RDFServiceModel(m);   
+            return new RDFServiceModel(m);
         }
     }
-    
-    private long operateOnModel(WebappDaoFactory webappDaoFactory, 
-                                OntModel mainModel, 
-                                Model changesModel, 
+
+    private long operateOnModel(WebappDaoFactory webappDaoFactory,
+                                OntModel mainModel,
+                                Model changesModel,
                                 OntModelSelector ontModelSelector,
-                                boolean remove, 
-                                boolean makeClassgroups,  
+                                boolean remove,
+                                boolean makeClassgroups,
                                 String userURI) {
-            
+
         EditEvent startEvent = null, endEvent = null;
-        
+
         if (remove) {
             startEvent = new BulkUpdateEvent(userURI, true);
             endEvent = new BulkUpdateEvent(userURI, false);
@@ -325,14 +325,14 @@ public class RDFUploadController extends JenaIngestController {
             startEvent = new EditEvent(userURI, true);
             endEvent = new EditEvent(userURI, false);
         }
-         
+
         Model[] classgroupModel = null;
-        
+
         if (makeClassgroups) {
             classgroupModel = JenaModelUtils.makeClassGroupsFromRootClasses(
                         webappDaoFactory, changesModel);
             OntModel appMetadataModel = ontModelSelector
-                    .getApplicationMetadataModel(); 
+                    .getApplicationMetadataModel();
             appMetadataModel.enterCriticalSection(Lock.WRITE);
             try {
                 appMetadataModel.add(classgroupModel[0]);
@@ -340,12 +340,12 @@ public class RDFUploadController extends JenaIngestController {
                 appMetadataModel.leaveCriticalSection();
             }
         }
-            
+
         mainModel.enterCriticalSection(Lock.WRITE);
         try {
-            
+
             mainModel.getBaseModel().notifyEvent(startEvent);
-            try {                                                 
+            try {
                 if (remove) {
                     RDFService rdfService = new RDFServiceModel(mainModel);
                     ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -364,20 +364,20 @@ public class RDFUploadController extends JenaIngestController {
                     if (classgroupModel != null) {
                         mainModel.add(classgroupModel[1]);
                     }
-                } 
+                }
             } finally {
                 mainModel.getBaseModel().notifyEvent(endEvent);
             }
         } finally {
             mainModel.leaveCriticalSection();
         }
-        return changesModel.size();        
+        return changesModel.size();
     }
-    
-    private void doLoadRDFData(String modelName, 
-                               String docLoc, 
-                               String filePath, 
-                               String language, 
+
+    private void doLoadRDFData(String modelName,
+                               String docLoc,
+                               String filePath,
+                               String language,
                                RDFService rdfService) {
         try {
             if ( (docLoc != null) && (docLoc.length()>0) ) {
@@ -411,8 +411,8 @@ public class RDFUploadController extends JenaIngestController {
             throw new RuntimeException(e);
         }
     }
-    
-    private void readIntoModel(InputStream in, String language, 
+
+    private void readIntoModel(InputStream in, String language,
             RDFService rdfService, String modelName) {
         ChangeSet cs = makeChangeSet(rdfService);
         cs.addAddition(in, RDFServiceUtils.getSerializationFormatFromJenaString(
@@ -423,8 +423,8 @@ public class RDFUploadController extends JenaIngestController {
             throw new RuntimeException(e);
         }
     }
-    
-    private void removeFromModel(InputStream in, String language, 
+
+    private void removeFromModel(InputStream in, String language,
             RDFService rdfService, String modelName) {
         ChangeSet cs = makeChangeSet(rdfService);
         cs.addRemoval(in, RDFServiceUtils.getSerializationFormatFromJenaString(
@@ -435,17 +435,17 @@ public class RDFUploadController extends JenaIngestController {
             throw new RuntimeException(e);
         }
     }
-    
-     private void forwardToFileUploadError( String errrorMsg , 
-                                            HttpServletRequest req, 
-                                            HttpServletResponse response) 
+
+     private void forwardToFileUploadError( String errrorMsg ,
+                                            HttpServletRequest req,
+                                            HttpServletResponse response)
                                                     throws ServletException{
          VitroRequest vreq = new VitroRequest(req);
          req.setAttribute("title","RDF Upload Error ");
          req.setAttribute("errors", errrorMsg);
-         
+
          req.setAttribute("css",
-                 "<link rel=\"stylesheet\" type=\"text/css\" href=\"" + 
+                 "<link rel=\"stylesheet\" type=\"text/css\" href=\"" +
                  vreq.getAppBean().getThemeDir() + "css/edit.css\"/>");
          try {
              JSPPageHandler.renderBasicPage(req, response, "/jsp/fileUploadError.jsp");
@@ -454,18 +454,18 @@ public class RDFUploadController extends JenaIngestController {
              throw new ServletException(e1);
          }
      }
-     
-     private OntModel getABoxModel(ServletContext ctx) {   
+
+     private OntModel getABoxModel(ServletContext ctx) {
          RDFService rdfService = ModelAccess.on(ctx).getRDFService();
          Model abox = RDFServiceGraph.createRDFServiceModel(
                  new RDFServiceGraph(rdfService, ABOX_ASSERTIONS));
          return ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, abox);
-     }    
+     }
 
-     private OntModel getTBoxModel() { 
+     private OntModel getTBoxModel() {
     	 return ModelAccess.on(getServletContext()).getOntModel(TBOX_ASSERTIONS);
-     }    
-     
+     }
+
     private static final Log log = LogFactory.getLog(
             RDFUploadController.class.getName());
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadFormController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadFormController.java
index 39f9d1230..3189307e2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadFormController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadFormController.java
@@ -16,7 +16,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 
 @WebServlet(name = "RDFUploadFormController", urlPatterns = {"/uploadRDFForm"} )
 public class RDFUploadFormController extends BaseEditController {
-	
+
 	private static final Log log = LogFactory.getLog(RDFUploadFormController.class.getName());
 
     @Override
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetAllVClasses.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetAllVClasses.java
index 64a9ef869..1346ce961 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetAllVClasses.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetAllVClasses.java
@@ -33,14 +33,14 @@ public class GetAllVClasses extends JsonObjectProducer {
 	protected ObjectNode process() throws Exception {
         ObjectNode map = JsonNodeFactory.instance.objectNode();
         //Get all VClassGroups
-        List<VClass> vclasses = new ArrayList<VClass>();     
+        List<VClass> vclasses = new ArrayList<VClass>();
         VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
         List<VClassGroup> groups = vcgc.getGroups();
         for(VClassGroup vcg: groups) {
             vclasses.addAll(vcg);
-            
+
         }
-       
+
         //Sort vclass by name
         Collections.sort(vclasses);
         ArrayNode classes = JsonNodeFactory.instance.arrayNode();
@@ -49,10 +49,10 @@ public class GetAllVClasses extends JsonObjectProducer {
         	ObjectNode vcObj = JsonNodeFactory.instance.objectNode();
         	vcObj.put("name", vc.getName());
         	vcObj.put("URI", vc.getURI());
-        	classes.add(vcObj);            
+        	classes.add(vcObj);
         }
-        map.put("classes", classes);                
-       
+        map.put("classes", classes);
+
         return map;
     }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetEntitiesByVClass.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetEntitiesByVClass.java
index b64e87b94..e2294ff78 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetEntitiesByVClass.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetEntitiesByVClass.java
@@ -54,12 +54,12 @@ public class GetEntitiesByVClass extends JsonArrayProducer {
         log.debug("in getEntitiesByVClass()");
         String vclassURI = vreq.getParameter("vclassURI");
         WebappDaoFactory daos = vreq.getUnfilteredWebappDaoFactory();
-        
+
         if( vclassURI == null ){
             throw new ServletException("getEntitiesByVClass(): no value for 'vclassURI' found in the HTTP request");
         }
 
-        VClass vclass = daos.getVClassDao().getVClassByURI( vclassURI );                       
+        VClass vclass = daos.getVClassDao().getVClassByURI( vclassURI );
         if( vclass == null ){
             throw new ServletException("getEntitiesByVClass(): could not find vclass for uri '"+  vclassURI + "'");
         }
@@ -87,17 +87,17 @@ public class GetEntitiesByVClass extends JsonArrayProducer {
                 entsFromVclass.remove();
                 count++;
             }
-            if( log.isDebugEnabled() ){ log.debug("getEntitiesByVClass(): Creating reply with continue token, found " + numberOfEntsInVClass + " Individuals"); } 
+            if( log.isDebugEnabled() ){ log.debug("getEntitiesByVClass(): Creating reply with continue token, found " + numberOfEntsInVClass + " Individuals"); }
         }else{
             if( log.isDebugEnabled() ) log.debug("getEntitiesByVClass(): sending " + numberOfEntsInVClass +" Individuals without continue token");
             entsToReturn = entsInVClass;
             count = entsToReturn.size();
         }
 
-        
+
         //put all the entities on the JSON array
         ArrayNode ja =  individualsToJson( entsToReturn );
-        
+
         //put the responseGroup number on the end of the JSON array
         if( more ){
             ObjectNode obj = JsonNodeFactory.instance.objectNode();
@@ -113,10 +113,10 @@ public class GetEntitiesByVClass extends JsonArrayProducer {
 
             ja.add(obj);
         }
-        
+
         log.debug("done with getEntitiesByVClass()");
         return ja;
     }
-    
+
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetEntitiesByVClassContinuation.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetEntitiesByVClassContinuation.java
index 3fa8470bb..fbb1c1b7a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetEntitiesByVClassContinuation.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetEntitiesByVClassContinuation.java
@@ -21,7 +21,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 
 /**
- * 
+ *
  */
 public class GetEntitiesByVClassContinuation extends JsonArrayProducer {
 	private static final Log log = LogFactory
@@ -58,7 +58,7 @@ public class GetEntitiesByVClassContinuation extends JsonArrayProducer {
                 count++;
             }
             if( log.isDebugEnabled() ) log.debug("getEntitiesByVClassContinuation(): Creating reply with continue token," +
-            		" sending in this reply: " + count +", remaing to send: " + entsInVClass.size() );  
+            		" sending in this reply: " + count +", remaing to send: " + entsInVClass.size() );
         } else {
             //send out reply with no continuation
             entsToReturn = entsInVClass;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java
index 80c98910f..8f3aaa311 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java
@@ -32,25 +32,25 @@ public class GetRandomSearchIndividualsByVClass extends GetSearchIndividualsByVC
 	}
 
 	/**
-	 * Search for individuals by VClass. 
+	 * Search for individuals by VClass.
 	 */
 	@Override
 	protected ObjectNode process() throws Exception {
 		ObjectNode rObj = null;
-		
+
 		//This gets the first vclass value and sets that as display type.
 		List<String> vclassIds = super.getVclassIds(vreq);
 		String vclassId = vclassIds.get(0);
 		vreq.setAttribute("queryType", "random");
 //		vreq.setAttribute("displayType", vclassId);
-		
+
 		//This will get all the solr individuals by VClass (if one value) or the intersection
 		//i.e. individuals that have all the types for the different vclasses entered
 		rObj = super.process();
 		addShortViewRenderings(rObj);
 		return rObj;
 	}
-	
+
 	/**
 	 * Look through the return object. For each individual, render the short
 	 * view and insert the resulting HTML into the object.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRenderedSearchIndividualsByVClass.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRenderedSearchIndividualsByVClass.java
index 60ac4b7b7..c5f42e812 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRenderedSearchIndividualsByVClass.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRenderedSearchIndividualsByVClass.java
@@ -38,12 +38,12 @@ public class GetRenderedSearchIndividualsByVClass extends GetSearchIndividualsBy
 	@Override
 	protected ObjectNode process() throws Exception {
 		ObjectNode rObj = null;
-		
+
 		//This gets the first vclass value and sets that as display type
 		List<String> vclassIds = super.getVclassIds(vreq);
 		String vclassId = null;
 		if(vclassIds.size() > 1) {
-			//This ensures the second class instead of the first 
+			//This ensures the second class instead of the first
 			//This is a temporary fix in cases where institutional internal classes are being sent in
 			//and thus the second class is the actual class with display information associated
 			vclassId = vclassIds.get(1);
@@ -51,14 +51,14 @@ public class GetRenderedSearchIndividualsByVClass extends GetSearchIndividualsBy
 			vclassId = vclassIds.get(0);
 		}
 		vreq.setAttribute("displayType", vclassId);
-		
+
 		//This will get all the solr individuals by VClass (if one value) or the intersection
 		//i.e. individuals that have all the types for the different vclasses entered
 		rObj = super.process();
 		addShortViewRenderings(rObj);
 		return rObj;
 	}
-	
+
 	/**
 	 * Look through the return object. For each individual, render the short
 	 * view and insert the resulting HTML into the object.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetSearchIndividualsByVClass.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetSearchIndividualsByVClass.java
index ec37344c6..9da803fdc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetSearchIndividualsByVClass.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetSearchIndividualsByVClass.java
@@ -10,12 +10,12 @@ import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 
 /**
- * 
+ *
  */
 public class GetSearchIndividualsByVClass extends JsonObjectProducer {
 	private static final Log log = LogFactory
 			.getLog(GetSearchIndividualsByVClass.class);
-	
+
 	protected GetSearchIndividualsByVClass(VitroRequest vreq) {
 		super(vreq);
 	}
@@ -23,23 +23,23 @@ public class GetSearchIndividualsByVClass extends JsonObjectProducer {
 	@Override
 	protected ObjectNode process() throws Exception {
         VClass vclass = null;
-        
+
         String queryType = (String) vreq.getAttribute("queryType");
-        String vitroClassIdStr = vreq.getParameter("vclassId");            
-        if ( vitroClassIdStr != null && !vitroClassIdStr.isEmpty()){                             
+        String vitroClassIdStr = vreq.getParameter("vclassId");
+        if ( vitroClassIdStr != null && !vitroClassIdStr.isEmpty()){
             vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(vitroClassIdStr);
             if (vclass == null) {
-                log.debug("Couldn't retrieve vclass ");   
+                log.debug("Couldn't retrieve vclass ");
                 throw new Exception ("Class " + vitroClassIdStr + " not found");
-            }                           
+            }
         }else{
             log.debug("parameter vclassId URI parameter expected ");
             throw new Exception("parameter vclassId URI parameter expected ");
         }
-        
+
         vreq.setAttribute("displayType", vitroClassIdStr);
         if ( queryType != null && queryType.equals("random")){
-            return JsonServlet.getRandomSearchIndividualsByVClass(vclass.getURI(), vreq);             
+            return JsonServlet.getRandomSearchIndividualsByVClass(vclass.getURI(), vreq);
         } else {
             return JsonServlet.getSearchIndividualsByVClass(vclass.getURI(), vreq);
         }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetSearchIndividualsByVClasses.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetSearchIndividualsByVClasses.java
index f973d12f0..9f3e43c7e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetSearchIndividualsByVClasses.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetSearchIndividualsByVClasses.java
@@ -30,15 +30,15 @@ public class GetSearchIndividualsByVClasses extends JsonObjectProducer {
         VClass vclass=null;
         log.debug("Retrieving search individuals by vclasses");
         // Could have multiple vclass ids sent in
-        String[] vitroClassIdStr = vreq.getParameterValues("vclassId");  
-        if ( vitroClassIdStr != null && vitroClassIdStr.length > 0){    
+        String[] vitroClassIdStr = vreq.getParameterValues("vclassId");
+        if ( vitroClassIdStr != null && vitroClassIdStr.length > 0){
         	for(String vclassId: vitroClassIdStr) {
         		log.debug("Iterating throug vclasses, using VClass " + vclassId);
                 vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(vclassId);
                 if (vclass == null) {
-                    log.error("Couldn't retrieve vclass ");   
+                    log.error("Couldn't retrieve vclass ");
                     throw new Exception ("Class " + vclassId + " not found");
-                }   
+                }
         	}
         }else{
             log.error("parameter vclassId URI parameter expected but not found");
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetVClassesForVClassGroup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetVClassesForVClassGroup.java
index ef9e58760..8d871b604 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetVClassesForVClassGroup.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetVClassesForVClassGroup.java
@@ -32,12 +32,12 @@ public class GetVClassesForVClassGroup extends JsonObjectProducer {
         if( vcgUri == null ){
             throw new Exception("no URI passed for classgroupUri");
         }
-        
+
         VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
         VClassGroup vcg = vcgc.getGroup(vcgUri);
         if( vcg == null ){
             throw new Exception("Could not find vclassgroup: " + vcgUri);
-        }        
+        }
 
         ArrayNode classes = JsonNodeFactory.instance.arrayNode();
         for( VClass vc : vcg){
@@ -47,7 +47,7 @@ public class GetVClassesForVClassGroup extends JsonObjectProducer {
             vcObj.put("entityCount", vc.getEntityCount());
             classes.add(vcObj);
         }
-        map.put("classes", classes);                
+        map.put("classes", classes);
         map.put("classGroupName", vcg.getPublicName());
         map.put("classGroupUri", vcg.getURI());
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonArrayProducer.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonArrayProducer.java
index f16961e7b..1b4c12f50 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonArrayProducer.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonArrayProducer.java
@@ -18,7 +18,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 /**
  * A base for classes that produce a JSON array based on the parameters in the
  * VitroRequest.
- * 
+ *
  * Catches any exceptions. Logs the error and returns an empty JSON array.
  */
 public abstract class JsonArrayProducer extends JsonProducer {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonObjectProducer.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonObjectProducer.java
index efe3b4dac..cc8b567c4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonObjectProducer.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonObjectProducer.java
@@ -18,10 +18,10 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 /**
  * A base for classes that produce a JSON object, based on the parameters in the
  * request.
- * 
+ *
  * The result is never empty. At worst, it is an object that contains only an
  * "errorMessage" field.
- * 
+ *
  * If an exception occurrs during processing, The "errorMessage" field will
  * contain the exception message and the response status will be set to 500
  * (server error). Normally, "errorMessage" will be empty, and the status will
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonProducer.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonProducer.java
index 3db4d85d5..189549d6e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonProducer.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonProducer.java
@@ -23,7 +23,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
  */
 public abstract class JsonProducer {
 	private static final Log log = LogFactory.getLog(JsonProducer.class);
-	
+
 	/**
 	 * Process a list of Individuals into a JSON array that holds the Names and URIs.
 	 */
@@ -40,7 +40,7 @@ public abstract class JsonProducer {
 
 	/**
 	 * Get the "vclassId" parameter from the request and instantiate the VClass.
-	 * 
+	 *
 	 * There must be one, and it must be valid.
 	 */
 	protected VClass getVclassParameter(VitroRequest vreq) {
@@ -55,7 +55,7 @@ public abstract class JsonProducer {
 	/**
 	 * Get one or more "vclassId" parameters from the request. Confirm that
 	 * there is at least one, and that all are valid.
-	 * 
+	 *
 	 * Return value is never null and never empty.
 	 */
 	protected List<String> getVclassIds(VitroRequest vreq) {
@@ -71,7 +71,7 @@ public abstract class JsonProducer {
 
 		return Arrays.asList(vclassIds);
 	}
-	
+
 	private VClass instantiateVclass(String uri, VitroRequest vreq) {
 		VClass vclass = vreq.getWebappDaoFactory().getVClassDao()
 				.getVClassByURI(uri);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServlet.java
index 9f7c46afd..cdaa4191b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServlet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServlet.java
@@ -70,7 +70,7 @@ public class JsonServlet extends VitroHttpServlet {
         } else if( vreq.getParameter("getDataForPage") != null ){
             throw new IllegalArgumentException("The call invoked deprecated classes " +
                     "and the parameter for this call appeared nowhere in the code base, " +
-                    "so it was removed in Aug 5th 2013.");                        
+                    "so it was removed in Aug 5th 2013.");
         }else if( vreq.getParameter("getRenderedSearchIndividualsByVClass") != null ){
             new GetRenderedSearchIndividualsByVClass(vreq).process(resp);
         }else if( vreq.getParameter("getRandomSearchIndividualsByVClass") != null ){
@@ -78,28 +78,28 @@ public class JsonServlet extends VitroHttpServlet {
         } else if( vreq.getParameter("getAllVClasses") != null ){
             new GetAllVClasses(vreq).process(resp);
         }
-        
+
     }
-    
+
 
     public static ObjectNode getSearchIndividualsByVClass(String vclassURI, HttpServletRequest req) throws Exception {
         List<String> vclassURIs = Collections.singletonList(vclassURI);
-        VitroRequest vreq = new VitroRequest(req);        
-        
+        VitroRequest vreq = new VitroRequest(req);
+
         IndividualListResults vcResults = getSearchVClassIntersectionResults(vclassURIs, vreq);
         //last parameter indicates single vclass instead of multiple vclasses
-        return IndividualListResultsUtils.wrapIndividualListResultsInJson(vcResults, vreq, false);                    
+        return IndividualListResultsUtils.wrapIndividualListResultsInJson(vcResults, vreq, false);
     }
 
     public static ObjectNode getSearchIndividualsByVClasses(List<String> vclassURIs, HttpServletRequest req) throws Exception {
-   	 	VitroRequest vreq = new VitroRequest(req);   
+   	 	VitroRequest vreq = new VitroRequest(req);
    	 	log.debug("Retrieve search results for vclasses" + vclassURIs.toString());
         IndividualListResults vcResults = getSearchVClassIntersectionResults(vclassURIs, vreq);
         log.debug("Results returned from search engine for " + vclassURIs.toString() + " are of size " + vcResults.getTotalCount());
-        
-        return IndividualListResultsUtils.wrapIndividualListResultsInJson(vcResults, vreq, true);        
+
+        return IndividualListResultsUtils.wrapIndividualListResultsInJson(vcResults, vreq, true);
    }
-    
+
     //Including version for search query for Vclass Intersections
     private static IndividualListResults getSearchVClassIntersectionResults(List<String> vclassURIs, VitroRequest vreq){
         log.debug("Retrieving search intersection results for " + vclassURIs.toString());
@@ -108,30 +108,30 @@ public class JsonServlet extends VitroHttpServlet {
         log.debug("Alpha and page parameters are " + alpha + " and " + page);
         try {
 	         return IndividualListController.getResultsForVClassIntersections(
-	                 vclassURIs, 
+	                 vclassURIs,
 	                 page, INDIVIDUALS_PER_PAGE,
-	                 alpha, 
-	                 vreq);  
+	                 alpha,
+	                 vreq);
         } catch(Exception ex) {
         	log.error("Error in retrieval of search results for VClass " + vclassURIs.toString(), ex);
         	return IndividualListResults.EMPTY;
         }
    }
- 
+
     public static String getDataPropertyValue(Individual ind, DataProperty dp, WebappDaoFactory wdf){
         String value = ind.getDataValue(dp.getURI());
         if( value == null || value.isEmpty() )
             return "";
         else
-            return value;            
+            return value;
     }
-    
+
     public static ObjectNode getRandomSearchIndividualsByVClass(String vclassURI, HttpServletRequest req) throws Exception {
-        VitroRequest vreq = new VitroRequest(req);        
-        
+        VitroRequest vreq = new VitroRequest(req);
+
         IndividualListResults vcResults = getRandomSearchVClassResults(vclassURI, vreq);
         //last parameter indicates single vclass instead of multiple vclasses
-        return IndividualListResultsUtils.wrapIndividualListResultsInJson(vcResults, vreq, false);                            
+        return IndividualListResultsUtils.wrapIndividualListResultsInJson(vcResults, vreq, false);
     }
 
      //Including version for Random search query for Vclass Intersections
@@ -143,10 +143,10 @@ public class JsonServlet extends VitroHttpServlet {
          log.debug("page and pageSize parameters = " + page + " and " + pageSize);
          try {
  	         return IndividualListController.getRandomResultsForVClass(
- 	                 vclassURI, 
- 	                 page, 
- 	                 pageSize, 
- 	                 vreq);  
+ 	                 vclassURI,
+ 	                 page,
+ 	                 pageSize,
+ 	                 vreq);
          } catch(Exception ex) {
          	log.error("Error in retrieval of search results for VClass " + vclassURI, ex);
          	return IndividualListResults.EMPTY;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/login/LoginProcessBean.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/login/LoginProcessBean.java
index 55b8687e7..2f7c3d1a5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/login/LoginProcessBean.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/login/LoginProcessBean.java
@@ -15,13 +15,13 @@ import edu.cornell.mannlib.vitro.webapp.i18n.I18n;
 /**
  * Where are we in the process of logging on? What message should we show to the
  * user?
- * 
+ *
  * TODO: the contents loginPageUrl is not explicitly defined, but it is assumed
  * to be either null, absolute, or relative to the host. It would be better if
  * it were explicitly defined, and either null, absolute or relative to the
  * context path. Then, the context path could be applied when the URL is used.
  * Later for that.
- * 
+ *
  * TODO: similar for afterLoginUrl, I presume.
  */
 public class LoginProcessBean {
@@ -120,12 +120,12 @@ public class LoginProcessBean {
 			this.messageLevel = MLevel.NONE;
 			this.text = "";
 		}
-		
+
 		public Message(HttpServletRequest req, MLevel messageLevel, String textKey, Object... parameters) {
 			this.messageLevel = messageLevel;
 			this.text = I18n.bundle(req).text(textKey, parameters);
 		}
-		
+
 		public MLevel getMessageLevel() {
 			return this.messageLevel;
 		}
@@ -188,7 +188,7 @@ public class LoginProcessBean {
 			this.message = message;
 		}
 	}
-	
+
 	public void setMessage(HttpServletRequest req, MLevel level, String textKey, Object... parameters) {
 		synchronized (messageSynchronizer) {
 			this.message = new Message(req, level, textKey, parameters);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/ApplicationDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/ApplicationDao.java
index 54a0d351e..e4b90b242 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/ApplicationDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/ApplicationDao.java
@@ -9,11 +9,11 @@ import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
 public interface ApplicationDao {
 
     public ApplicationBean getApplicationBean();
-    
+
     public void updateApplicationBean(ApplicationBean appBean);
-	
+
 	public List<String> getExternallyLinkedNamespaces();
-	
+
 	public boolean isExternallyLinkedNamespace(String namespace);
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyDao.java
index e29abe278..4cecdf2ee 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyDao.java
@@ -17,11 +17,11 @@ public interface DataPropertyDao extends PropertyDao {
     void fillDataPropertiesForIndividual(Individual individual);
 
     List<DataProperty> getDataPropertiesForVClass(String vClassURI);
-    
+
     Collection<DataProperty> getAllPossibleDatapropsForIndividual(String individualURI);
 
     String getRequiredDatatypeURI(Individual individual, DataProperty dataProperty);
-    
+
     DataProperty getDataPropertyByURI(String dataPropertyURI);
 
     String insertDataProperty(DataProperty dataProperty) throws InsertException;
@@ -33,12 +33,12 @@ public interface DataPropertyDao extends PropertyDao {
     void deleteDataProperty(String dataPropertyURI);
 
     List<DataProperty> getRootDataProperties();
-    
+
     boolean annotateDataPropertyAsExternalIdentifier(String dataPropertyURI);
-    
+
     public List<DataProperty> getDataPropertyList(Individual subject);
-    
+
     public List<DataProperty> getDataPropertyList(String subjectUri);
-    
+
     public String getCustomListViewConfigFileName(DataProperty dataProperty);
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyStatementDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyStatementDao.java
index 75fdd35a0..7b57f2e2e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyStatementDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyStatementDao.java
@@ -25,9 +25,9 @@ public interface DataPropertyStatementDao {
 
     @Deprecated
     List getExistingQualifiers(String dataPropertyURI);
-    
+
     List<DataPropertyStatement> getDataPropertyStatements(DataProperty dataProperty);
-    
+
     List<DataPropertyStatement> getDataPropertyStatements(DataProperty dataProperty, int startIndex, int endIndex);
 
     @SuppressWarnings("unchecked")
@@ -42,7 +42,7 @@ public interface DataPropertyStatementDao {
     int insertNewDataPropertyStatement(DataPropertyStatement dataPropertyStatement );
 
     List<Literal> getDataPropertyValuesForIndividualByProperty(Individual subject, DataProperty property);
-    
+
     List<Literal> getDataPropertyValuesForIndividualByProperty(String subjectUri, String propertyUri);
 
     List<Literal> getDataPropertyValuesForIndividualByProperty(Individual subject, DataProperty property, String queryString, Set<String> constructQueryStrings);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DatatypeDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DatatypeDao.java
index cfce4e1fe..e0ce2fa39 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DatatypeDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DatatypeDao.java
@@ -24,4 +24,4 @@ public interface DatatypeDao {
 
     public abstract List<Datatype> getAllDatatypes();
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DisplayModelDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DisplayModelDao.java
index 84e948630..794d95aa5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DisplayModelDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DisplayModelDao.java
@@ -5,14 +5,14 @@ package edu.cornell.mannlib.vitro.webapp.dao;
 import javax.servlet.ServletContext;
 
 public interface DisplayModelDao {
-    
+
     /**
      * ServletContext should only be used for getRealPath()
      */
     public void replaceDisplayModel(String n3, ServletContext sc) throws Exception;
-    
+
     /**
      * ServletContext should only be used for getRealPath()
      */
     public String getDisplayModel(ServletContext sc) throws Exception;
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DisplayVocabulary.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DisplayVocabulary.java
index f70cacd44..5fb4e3073 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DisplayVocabulary.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/DisplayVocabulary.java
@@ -18,25 +18,25 @@ public class DisplayVocabulary {
     /* Namespace for display vocabulary */
     public static final String DISPLAY_NS = "http://vitro.mannlib.cornell.edu/ontologies/display/1.1#";
     private static final String NS = DISPLAY_NS;
-    
+
     /* Individuals */
     public static final String DEFAULT_MENU = NS + "DefaultMenu";
     public static final String HOME_PAGE_URI = NS + "Home";
     public static final String SEARCH_INDEX_URI = NS + "SearchIndex";
-    
+
     //bk392 for extracting properties beyond context nodes.
     public static final String CONTEXT_NODES_URI = NS + "QueryForContextNodes";
-    
+
     /* Page types */
     //Corresponding to statements in menu management that define class of data getter to be used
     public static final String PAGE_TYPE = NS + "Page";
     public static final String HOME_PAGE_TYPE = NS + "HomePage";
-   
-    
+
+
     public static final String CLASSGROUP_PAGE_TYPE = NS + "ClassGroupPage";
     public static final String CLASSINDIVIDUALS_PAGE_TYPE = NS + "IndividualsForClassesPage";
     public static final String CLASSINDIVIDUALS_INTERNAL_TYPE = NS + "InternalClassesPage";
-   
+
     /* Object Properties */
     public static final String FOR_CLASSGROUP = NS + "forClassGroup";
     public static final String CLASS_INTERSECTION = NS + "intersectsWithClass";
@@ -63,55 +63,55 @@ public class DisplayVocabulary {
     public static final DatatypeProperty LINK_TEXT = m_model.createDatatypeProperty(NS + "linkText");
 
     /* URIs for storing menu.n3 */
-    public static final String MENU_TEXT_RES = NS + "MenuText";    
+    public static final String MENU_TEXT_RES = NS + "MenuText";
     public static final String HAS_TEXT_REPRESENTATION = NS + "hasMenuText";
-    
-    
-    
+
+
+
     /** <p>The namespace of the vocabulary as a string</p>
      *  @see #NS */
     public static String getURI() {return NS;}
-    
+
     /** <p>The namespace of the vocabulary as a resource</p> */
     public static final Resource NAMESPACE = m_model.createResource( NS );
-    
+
     public static final ObjectProperty REQUIRES_VALUES = m_model.createObjectProperty( NS + "requiresValues" );
-    
+
     public static final ObjectProperty TO_PAGE = m_model.createObjectProperty( NS + "toPage" );
-    
+
     public static final ObjectProperty EXCLUDE_CLASS = m_model.createObjectProperty( NS + "excludeClass" );
-    
+
     public static final ObjectProperty INCLUDE_CLASS = m_model.createObjectProperty( NS + "includeClass" );
-    
+
     /** <p>Java package and class name. ex edu.cornell.mannlib.vitro.webapps.functions.ExampleFunction</p> */
     public static final DatatypeProperty JAVA_CLASS_NAME = m_model.createDatatypeProperty( NS + "javaClassName" );
-    
+
     public static final DatatypeProperty MENU_POSITION = m_model.createDatatypeProperty( NS + "menuPosition" );
-    
+
     public static final DatatypeProperty PARAMETER_NAME = m_model.createDatatypeProperty( NS + "parameterName" );
-    
+
     public static final DatatypeProperty PARAMETER_VALUE = m_model.createDatatypeProperty( NS + "parameterValue" );
-    
+
     //public static final DatatypeProperty REQUIRES_BODY_TEMPLATE = m_model.createDatatypeProperty( NS + "requiresBodyTemplate" );
-    
+
     /** <p>Values from HttpRequest.getPathInfo() will be mapped to values from urlMapping.</p> */
     //public static final DatatypeProperty URL_MAPPING = m_model.createDatatypeProperty( NS + "urlMapping" );
-        
-    
-    
+
+
+
     /** <p>This represents a menu item or other general navigation item.</p> */
     public static final OntClass NAVIGATION_ELEMENT = m_model.createClass( NS + "NavigationElement" );
-    
+
     /** <p>Class of pages.</p> */
     public static final OntClass PAGE = m_model.createClass( NS + "Page" );
-    
-    
+
+
     //Parameters to switch to menu editing - or to switch models
     public static final String SWITCH_TO_DISPLAY_MODEL = "switchToDisplayModel";
     public static final String USE_MODEL_PARAM = "useThisModel";
     public static final String USE_TBOX_MODEL_PARAM = "useThisTboxModel";
     public static final String USE_DISPLAY_MODEL_PARAM = "useThisDisplayModel";
-    
+
     //URL for menu management
     public static final String PROCESS_MENU_MANAGEMENT_URL = "/menuManagementEdit";
     public static final String REORDER_MENU_URL = PROCESS_MENU_MANAGEMENT_URL + "?cmd=Reorder&" + SWITCH_TO_DISPLAY_MODEL + "=true";
@@ -119,38 +119,38 @@ public class DisplayVocabulary {
     /* URIs for some individuals in the dispaly ontology */
 
 	public static final String HOME_MENU_ITEM = DISPLAY_NS + "HomeMenuItem";
-        
+
 	/* some URIs of properties used with the SPARQL DataGetter, and save to var is saved for fixedHtml */
     public static final String SAVE_TO_VAR = DISPLAY_NS + "saveToVar" ;
-    public static final String QUERY_MODEL = DISPLAY_NS + "queryModel";    
+    public static final String QUERY_MODEL = DISPLAY_NS + "queryModel";
     public static final String QUERY = DISPLAY_NS + "query";
-    
+
     /* URI of property for Fixed HTML Generator */
     public static final String FIXED_HTML_VALUE = DISPLAY_NS + "htmlValue";
-    
-    
+
+
     /* URI of property for Search Query Generator */
     public static final String VCLASSID = DISPLAY_NS + "hasVClassId";
 
-    
+
     //public static final Individual EVENTS = m_model.createIndividual( NS + "Events", PAGE );
-    
+
     //public static final Individual EVENTS_MENU_ITEM = m_model.createIndividual( NS + "EventsMenuItem", NAVIGATION_ELEMENT );
-    
+
     //public static final Individual HOME = m_model.createIndividual( NS + "Home", PAGE );
-    
+
     //public static final Individual HOME_MENU_ITEM = m_model.createIndividual( NS + "HomeMenuItem", NAVIGATION_ELEMENT );
-    
+
     //public static final Individual ORGANIZATIONS = m_model.createIndividual( NS + "Organizations", PAGE );
-    
+
     //public static final Individual ORGANIZATIONS_MENU_ITEM = m_model.createIndividual( NS + "OrganizationsMenuItem", NAVIGATION_ELEMENT );
-    
+
     //public static final Individual PEOPLE = m_model.createIndividual( NS + "People", PAGE );
-    
+
     //public static final Individual PEOPLE_MENU_ITEM = m_model.createIndividual( NS + "PeopleMenuItem", NAVIGATION_ELEMENT );
-    
+
     //public static final Individual PUBLICATIONS = m_model.createIndividual( NS + "Publications", PAGE );
-    
+
     //public static final Individual PUBLICATIONS_MENU_ITEM = m_model.createIndividual( NS + "PublicationsMenuItem", NAVIGATION_ELEMENT );
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDao.java
index 5e873f53d..0d6d096d4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/FauxPropertyDao.java
@@ -13,7 +13,7 @@ public interface FauxPropertyDao {
 
 	/**
 	 * Get all of the FauxProperties that are based on this URI.
-	 * 
+	 *
 	 * @return May return an empty list. Never returns null.
 	 */
 	List<FauxProperty> getFauxPropertiesForBaseUri(String uri);
@@ -21,7 +21,7 @@ public interface FauxPropertyDao {
 	/**
 	 * If the display model contains a ConfigContext with this URI, get the
 	 * FauxProperty that it describes.
-	 * 
+	 *
 	 * @return May return null.
 	 */
 	FauxProperty getFauxPropertyFromContextUri(String contextUri);
@@ -29,7 +29,7 @@ public interface FauxPropertyDao {
 	/**
 	 * If the display model contains a ConfigContext based on these URIs, get
 	 * the FauxProperty that it describes. May return null.
-	 * 
+	 *
 	 * @param domainUri
 	 *            May be null, but then this will only match a ConfigContext
 	 *            that has no qualifiedByDomain property.
@@ -44,10 +44,10 @@ public interface FauxPropertyDao {
 
 	/**
 	 * Creates a new FauxProperty in the display model.
-	 * 
+	 *
 	 * By "a new FauxProperty", we mean a new ConfigContext and a new
 	 * ObjectPropertyDisplayConfig linked to it.
-	 * 
+	 *
 	 * @throws IllegalStateException
 	 *             if fp does not have null values for contextUri and configUri,
 	 *             or if a FauxProperty already exists with this combination of
@@ -59,10 +59,10 @@ public interface FauxPropertyDao {
 
 	/**
 	 * Updates the properties of this FauxProperty in the display model.
-	 * 
+	 *
 	 * By "this FauxProperty", we mean the ConfigContext and
 	 * ObjectPropertyDisplayConfig whose URIs are stored in this FauxProperty.
-	 * 
+	 *
 	 * @throws IllegalStateException
 	 *             if the display model contains no such individuals. If you
 	 *             want to create a new FauxProperty instance, you should be
@@ -74,13 +74,13 @@ public interface FauxPropertyDao {
 
 	/**
 	 * Delete this FauxProperty from the display model.
-	 * 
+	 *
 	 * Delete any ConfigContext that is based on the constraints in this
 	 * FauxProperty, and any ObjectPropertyDisplayConfigs that depend on that
 	 * ConfigContext.
-	 * 
+	 *
 	 * If no such ConfigContext is found, no error is raised.
-	 * 
+	 *
 	 * No check is made to see whether the ObjectPropertyDisplayConfig matches
 	 * the settings on this FauxProperty.
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/IndividualDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/IndividualDao.java
index bdfd6ef2d..8363b8cdf 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/IndividualDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/IndividualDao.java
@@ -26,14 +26,14 @@ public interface IndividualDao {
      * @param vclassURI URI for VClass
      */
     public abstract void addVClass(String individualURI, String vclassURI);
-    
+
     /**
      * Removes the specified Individual from the specificed VClass (i.e. retracts rdf:type)
      * @param individualURI Individual URI
      * @param vclassURI URI for VCLass
      */
     public abstract void removeVClass(String individualURI, String vclassURI);
-    
+
     /**
      * Returns a list of all the Individuals in the specified VClass.
      * @param vclass VClass
@@ -44,7 +44,7 @@ public interface IndividualDao {
      * Returns a list of Individuals in a given VClass.
      */
     public abstract List <Individual> getIndividualsByVClassURI(String vclassURI);
-    
+
     /**
      * Returns a list of Individuals in a given VClass.
      */
@@ -93,7 +93,7 @@ public interface IndividualDao {
     public abstract Iterator<String> getUpdatedSinceIterator(long updatedSince);
 
     public boolean isIndividualOfClass(String vclassURI, String indURI);
-    
+
     /**
      * Returns a list of individuals with the given value for the given dataProperty.  If
      * there are no Indiviuals that fit the criteria then an empty list is returned.
@@ -101,7 +101,7 @@ public interface IndividualDao {
     public List<Individual> getIndividualsByDataProperty(String dataPropertyUri, String value);
 
     public List<Individual> getIndividualsByDataProperty(String dataPropertyUri, String value, String datatypeUri, String lang);
-    
+
 	void fillVClassForIndividual(Individual individual);
 
 	/**
@@ -111,7 +111,7 @@ public interface IndividualDao {
 	 * @throws InsertException Could not create a URI
 	 */
 	String getUnusedURI(Individual individual) throws InsertException;
-	
+
 	EditLiteral getLabelEditLiteral(String individualUri);
-	
-}
\ No newline at end of file
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/InsertException.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/InsertException.java
index 718e8511e..1b9d9efa8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/InsertException.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/InsertException.java
@@ -7,15 +7,15 @@ public class InsertException extends Exception {
 	public InsertException() {
 		super();
 	}
-	
+
 	public InsertException(String message) {
 		super(message);
 	}
-	
+
 	public InsertException(Throwable cause) {
 		super(cause);
 	}
-	
+
 	public InsertException(String message, Throwable cause) {
 		super(message,cause);
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/MenuDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/MenuDao.java
index 34d75c310..84f71effa 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/MenuDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/MenuDao.java
@@ -8,7 +8,7 @@ import javax.servlet.ServletRequest;
 public interface MenuDao {
     /**
      * @param url - url of request for setting active menu items. This should start with a / and not have the context path.
-     * These values will be checked against urlMapping. ex. /people or /home 
+     * These values will be checked against urlMapping. ex. /people or /home
      */
     public MainMenu getMainMenu( String url);
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitro.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitro.java
index 977f83bab..44ec38278 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitro.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitro.java
@@ -19,24 +19,24 @@ public class NewURIMakerVitro implements NewURIMaker {
     WebappDaoFactory wdf;
     Set<String> madeURIs = new HashSet<String>();
     static Random random = new Random();
-    
+
     public NewURIMakerVitro( WebappDaoFactory wdf){
         this.wdf = wdf;
     }
-    
+
     @Override
-    public String getUnusedNewURI(String prefixURI) throws InsertException {        
-        
+    public String getUnusedNewURI(String prefixURI) throws InsertException {
+
         Individual ind = new IndividualImpl();
         String newURI = null;
         int attempts = 0;
         boolean goodNewURI = false;
         log.debug("Before starting : Made URIs contains " + madeURIs.toString());
-       
+
         while( ! goodNewURI && attempts < MAX_ATTEMPTS ){
             attempts++;
-            
-            if( attempts > 2 && prefixURI != null && !prefixURI.isEmpty() ) 
+
+            if( attempts > 2 && prefixURI != null && !prefixURI.isEmpty() )
             {
             	log.debug("Attempts: " + attempts  + " and prefix not null and prefix not empty " + prefixURI);
                 ind.setURI(prefixURI + random.nextInt() );
@@ -49,14 +49,14 @@ public class NewURIMakerVitro implements NewURIMaker {
             log.debug("Created new uri " + newURI + " and does madeURIs contain it?" + madeURIs.contains(newURI));
             if( newURI != null && ! newURI.isEmpty() && ! madeURIs.contains( newURI) ){
             	log.debug("new URI is not null and new URI is empty and madeURIs does not containt new URI");
-                goodNewURI = true;                
-                madeURIs.add( newURI );                
-            } 
+                goodNewURI = true;
+                madeURIs.add( newURI );
+            }
             log.debug("Made URIs contains " + madeURIs.toString());
         }
         if(goodNewURI && newURI != null && !newURI.isEmpty()) {
         	log.debug("Decided on this URI " + newURI);
-        
+
             return newURI;
         }
         else {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDao.java
index 0939225eb..88983ac70 100755
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDao.java
@@ -13,13 +13,13 @@ public interface ObjectPropertyDao extends PropertyDao {
     public abstract List<ObjectProperty> getAllObjectProperties();
 
     public ObjectProperty getObjectPropertyByURI(String objectPropertyURI);
-    
+
     public ObjectProperty getObjectPropertyByURIs(String objectPropertyURI, String domainURI, String rangeURI);
-    
+
     /**
      * Use this method to supply a base ObjectProperty whose fields will be updated
      * as necessary to correspond to the configuration for the specified Domain
-     * and Range.  
+     * and Range.
      * @param objectPropertyURI Object Property URI
      * @param domainURI Domain URI
      * @param rangeURI Range URI
@@ -43,9 +43,9 @@ public interface ObjectPropertyDao extends PropertyDao {
     public void deleteObjectProperty(String objectPropertyURI);
 
     public void deleteObjectProperty(ObjectProperty objectProperty);
-    
+
     public boolean skipEditForm(String predicateURI);
-    
+
 
 //    List /*of ObjectProperty */ getObjectPropertiesForObjectPropertyStatements(List /*of ObjectPropertyStatement */ objectPropertyStatements);
 //
@@ -62,7 +62,7 @@ public interface ObjectPropertyDao extends PropertyDao {
 //    List /* of ObjectProperty */ getAllObjectProperties();
 
     List <ObjectProperty> getRootObjectProperties();
-    
+
     /**
      * Returns a list of ObjectProperty objects for which statements exist about
      * the individual.  Note that this method now returns multiple copies of
@@ -71,7 +71,7 @@ public interface ObjectPropertyDao extends PropertyDao {
      * views for the "faux" qualified properties.
      */
     public List<ObjectProperty> getObjectPropertyList(Individual subject);
-    
+
     /**
      * Returns a list of ObjectProperty objects for which statements exist about
      * the individual.  Note that this method now returns multiple copies of
@@ -79,7 +79,7 @@ public interface ObjectPropertyDao extends PropertyDao {
      * types of the related objects.  This supports finding the approriate list
      * views for the "faux" qualified properties.
      */
-    public List<ObjectProperty> getObjectPropertyList(String subjectUri); 
-    
+    public List<ObjectProperty> getObjectPropertyList(String subjectUri);
+
     public String getCustomListViewConfigFileName(ObjectProperty objectProperty);
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyStatementDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyStatementDao.java
index 77db7ce67..2a2ab45e6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyStatementDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyStatementDao.java
@@ -18,37 +18,37 @@ import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
  * To change this template use File | Settings | File Templates.
  */
 public interface ObjectPropertyStatementDao {
-	
+
     void deleteObjectPropertyStatement(ObjectPropertyStatement objPropertyStmt);
-    
+
     List<ObjectPropertyStatement> getObjectPropertyStatements(ObjectProperty objectProperty);
-    
+
     List<ObjectPropertyStatement> getObjectPropertyStatements(ObjectProperty objectProperty, int startIndex, int endIndex);
 
     List<ObjectPropertyStatement> getObjectPropertyStatements(ObjectPropertyStatement objPropertyStmt);
-    
+
     Individual fillExistingObjectPropertyStatements( Individual entity );
 
-    int insertNewObjectPropertyStatement(ObjectPropertyStatement objPropertyStmt );        
+    int insertNewObjectPropertyStatement(ObjectPropertyStatement objPropertyStmt );
 
 //    public List<Map<String, String>> getObjectPropertyStatementsForIndividualByProperty(
-//			String subjectUri, 
-//			String propertyUri, 
-//			String objectKey, 
+//			String subjectUri,
+//			String propertyUri,
+//			String objectKey,
 //			String queryString,
 //			Set<String> constructQueryStrings);
-    
+
     public Map<String, String> getMostSpecificTypesInClassgroupsForIndividual(String subjectUri);
 
 	List<Map<String, String>> getObjectPropertyStatementsForIndividualByProperty(
-			String subjectUri, String propertyUri, String objectKey, String domainUri, 
+			String subjectUri, String propertyUri, String objectKey, String domainUri,
 			String rangeUri, String queryString, Set<String> constructQueryStrings,
 			String sortDirection);
 
 	/**
 	 * Inspect the elements of the statement to see whether it qualifies as a
 	 * faux property.
-	 * 
+	 *
 	 * That is, is there a faux property definition, such that
 	 * <ul>
 	 * <li>The property URI of this statement is the base URI of the faux
@@ -58,10 +58,10 @@ public interface ObjectPropertyStatementDao {
 	 * <li>One of the VClasses of the object of this statement is the range of
 	 * the faux property</li>
 	 * </ul>
-	 * 
+	 *
 	 * If that is so, then set the domain and range (and the domainURI and
 	 * rangeURI) of the property of this statement to match the faux property.
 	 */
 	void resolveAsFauxPropertyStatements(List<ObjectPropertyStatement> list);
-  
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/OntologyDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/OntologyDao.java
index d6e28ad79..3b0d24a98 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/OntologyDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/OntologyDao.java
@@ -18,4 +18,4 @@ public interface OntologyDao {
 
     void deleteOntology(Ontology ontology);
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PageDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PageDao.java
index 8983e75a1..d1651ee61 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PageDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PageDao.java
@@ -7,23 +7,23 @@ import java.util.List;
 public interface PageDao {
 
     Map<String, Object> getPage(String pageUri);
-    
+
     /**
      * Returns a list of urlMappings to URIs.
      */
     Map<String, String> getPageMappings();
-    
+
     /**
      * Returns URI of home page.
      */
     String getHomePageUri();
-   
+
     String getClassGroupPage(String pageUri);
-        
+
     Map<String, Object> getClassesAndRestrictionsForPage(String pageUri);
 
     Map<String, Object> getClassesAndCheckInternal(String pageUri);
-    
+
     List<String> getDataGetterClass(String pageUri);
 
     /**
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyDao.java
index 5bfd76548..f4cd92b5f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyDao.java
@@ -52,10 +52,10 @@ public interface PropertyDao {
 
 	/**
 	 * An immutable key class for making maps of properties and faux properties.
-	 * 
+	 *
 	 * The property URI is a significant part of the key, of course, but the
 	 * range and domain URIs are significant also.
-	 * 
+	 *
 	 * If the range or domain URI is not provided, it is assumed to be
 	 * OWL:Thing.
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyGroupDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyGroupDao.java
index da03eeadb..33aaae07a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyGroupDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyGroupDao.java
@@ -9,17 +9,17 @@ import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
 public interface PropertyGroupDao {
 
 	public abstract PropertyGroup getGroupByURI(String uri);
-	
+
 	public abstract List<PropertyGroup> getPublicGroups(boolean withProperties);
-	
+
 	public abstract int removeUnpopulatedGroups(List<PropertyGroup> groups);
-	
+
 	public PropertyGroup createDummyPropertyGroup(String name, int rank);
-	
+
 	public String insertNewPropertyGroup(PropertyGroup group);
-	
+
 	public void updatePropertyGroup(PropertyGroup group);
-	
+
 	public void deletePropertyGroup(PropertyGroup group);
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyInstanceDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyInstanceDao.java
index 0a3aff295..080ec9790 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyInstanceDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/PropertyInstanceDao.java
@@ -12,7 +12,7 @@ public interface PropertyInstanceDao {
     void deleteObjectPropertyStatement(String subjectURI, String propertyURI, String objectURI);
 
     Collection<PropertyInstance> getAllPossiblePropInstForIndividual(String individualURI);
-    
+
     Collection<PropertyInstance> getAllPropInstByVClass(String classURI);
 
     Collection<PropertyInstance> getExistingProperties(String entityURI, String propertyURI);
@@ -25,4 +25,4 @@ public interface PropertyInstanceDao {
 
     void deletePropertyInstance(PropertyInstance prop);
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/UserAccountsDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/UserAccountsDao.java
index 0f84f5914..0e0f3944c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/UserAccountsDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/UserAccountsDao.java
@@ -20,14 +20,14 @@ public interface UserAccountsDao {
 
 	/**
 	 * Get the UserAccount for this URI.
-	 * 
+	 *
 	 * @return null if the URI is null, or if there is no such UserAccount
 	 */
 	UserAccount getUserAccountByUri(String uri);
 
 	/**
 	 * Get the UserAccount for this Email address.
-	 * 
+	 *
 	 * @return null if the Email address is null, or if there is no such
 	 *         UserAccount
 	 */
@@ -35,11 +35,11 @@ public interface UserAccountsDao {
 
 	/**
 	 * Get the UserAccount for this External Authentication ID
-	 * 
+	 *
 	 * @return null if the ID is null, or if there is no such UserAccount
 	 */
 	UserAccount getUserAccountByExternalAuthId(String externalAuthId);
-	
+
 	/**
 	 * Get any UserAccounts who act as proxy editors for this profile page.
 	 */
@@ -47,14 +47,14 @@ public interface UserAccountsDao {
 
 	/**
 	 * Create a new UserAccount in the model.
-	 * 
+	 *
 	 * On entry, the URI of the UserAccount should be empty. On exit, the URI
 	 * which was created for this UserAccount will be stored in the UserAccount,
 	 * as well as being returned by the method.
-	 * 
+	 *
 	 * Does not confirm that PermissionSet objects already exist for the
 	 * PermissionSet URIs referenced by the UserAcocunt.
-	 * 
+	 *
 	 * @throws NullPointerException
 	 *             if the UserAccount is null.
 	 * @throws IllegalArgumentException
@@ -64,10 +64,10 @@ public interface UserAccountsDao {
 
 	/**
 	 * Update the values on a UserAccount that already exists in the model.
-	 * 
+	 *
 	 * Does not confirm that PermissionSet objects already exist for the
 	 * PermissionSet URIs referenced by the UserAcocunt.
-	 * 
+	 *
 	 * @throws NullPointerException
 	 *             if the UserAccount is null.
 	 * @throws IllegalArgumentException
@@ -78,7 +78,7 @@ public interface UserAccountsDao {
 
 	/**
 	 * Remove the UserAccount with this URI from the model.
-	 * 
+	 *
 	 * If the URI is null, or if no UserAccount with this URI is found in the
 	 * model, no action is taken.
 	 */
@@ -89,17 +89,17 @@ public interface UserAccountsDao {
 	 * profile page.
 	 */
 	void setProxyAccountsOnProfile(String profilePageUri, Collection<String> userAccountUris);
-	
+
 	/**
 	 * Get the PermissionSet for this URI.
-	 * 
+	 *
 	 * @return null if the URI is null, or if there is no such PermissionSet.
 	 */
 	PermissionSet getPermissionSetByUri(String uri);
 
 	/**
 	 * Get all of the PermissionSets in the model, sorted by URI.
-	 * 
+	 *
 	 * @return a collection which might be empty, but is never null.
 	 */
 	Collection<PermissionSet> getAllPermissionSets();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/VClassDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/VClassDao.java
index 7a408e9d0..ab78fa880 100755
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/VClassDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/VClassDao.java
@@ -17,33 +17,33 @@ public interface VClassDao {
     List<VClass> getAllVclasses();
 
     List<String> getDisjointWithClassURIs(String vclassURI);
-    
+
     void addSuperclass(VClass subclass, VClass superclass);
-    
+
     void addSuperclass(String classURI, String superclassURI);
-    
+
     void removeSuperclass(VClass vclass, VClass superclass);
-    
+
     void removeSuperclass(String classURI, String superclassURI);
-    
+
     void addSubclass(VClass vclass, VClass subclass);
-    
+
     void addSubclass(String classURI, String subclassURI);
-    
+
     void removeSubclass(VClass vclass, VClass subclass);
-    
+
     void removeSubclass(String classURI, String subclassURI);
-    
+
     void addDisjointWithClass(String classURI, String disjointCLassURI);
-    
+
     void removeDisjointWithClass(String classURI, String disjointClassURI);
-    
+
     List<String> getEquivalentClassURIs(String classURI);
-    
+
     void addEquivalentClass(String classURI, String equivalentClassURI);
-    
+
     void removeEquivalentClass(String classURI, String equivalentClassURI);
-    
+
     List <String> getSubClassURIs(String classURI);
 
     List <String> getAllSubClassURIs(String classURI);
@@ -63,13 +63,13 @@ public interface VClassDao {
     void deleteVClass(VClass cls);
 
     List <VClass> getVClassesForProperty(String propertyURI, boolean domainSide);
-    
+
     List <VClass> getVClassesForProperty(String vclassURI, String propertyURI);
 
     void addVClassesToGroup(VClassGroup group);
-    
+
     void insertNewClasses2Classes(Classes2Classes c2c);
-    
+
     void deleteClasses2Classes(Classes2Classes c2c);
 
     @SuppressWarnings("unchecked")
@@ -80,36 +80,36 @@ public interface VClassDao {
     void addVClassesToGroup(VClassGroup group, boolean includeUninstantiatedClasses, boolean getIndividualCount); /*
     * @see edu.cornell.mannlib.vitro.webapp.dao.db.VClassDao#addVClassesToGroups(java.util.List)
     */
-    
+
     /*
     void addVClassesToGroup(VClassGroup group, boolean includeUninstantiatedClasses, boolean getIndividualCount, RoleLevel userVisibilityRoleLevel, RoleLevel userUpdateRoleLevel ); /*
     * @see edu.cornell.mannlib.vitro.webapp.dao.db.VClassDao#addVClassesToGroups(java.util.List)
     */
-    
+
     void addVClassesToGroups(List <VClassGroup> groups );
-    
+
     /**
      * @param vc1 VCLass
      * @param vc2 VClass
      * @return true if vc1 subClassOf vc2
      */
     boolean isSubClassOf(VClass vc1, VClass vc2);
-    
+
     /**
      * @param vclassURI1 VClass URI
      * @param vclassURI2 VClass URI
      * @return true if vc1 subClassOf vc2
      */
     boolean isSubClassOf(String vclassURI1, String vclassURI2);
-    
-    
+
+
     /**
      * Returns the top concept for the current modeling language (e.g. owl:Thing)
      */
     VClass getTopConcept();
-    
+
     /**
      * Returns the bottom concept for the current modeling language (e.g. owl:Nothing)
      */
     VClass getBottomConcept();
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/VClassGroupDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/VClassGroupDao.java
index 1d1c10cb3..11af28ff2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/VClassGroupDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/VClassGroupDao.java
@@ -59,4 +59,4 @@ public interface VClassGroupDao {
     void deleteVClassGroup(VClassGroup vcg);
 
     VClassGroup getGroupByName(String vcgName);
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/VClassGroupsForRequest.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/VClassGroupsForRequest.java
index 45e7ff3ba..3f3e7df6e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/VClassGroupsForRequest.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/VClassGroupsForRequest.java
@@ -36,7 +36,7 @@ public class VClassGroupsForRequest {
 		for (VClassGroup vcGroup : cache.getGroups()) {
 			loadGroup(vcGroup);
 		}
-		
+
 		if (log.isDebugEnabled()) {
 			log.debug("groups: " + groupMap.values());
 			log.debug("classes: " + classMap.values());
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/VitroVocabulary.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/VitroVocabulary.java
index 2ecd39e04..fdd9387c0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/VitroVocabulary.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/VitroVocabulary.java
@@ -5,53 +5,53 @@ package edu.cornell.mannlib.vitro.webapp.dao;
 
 public class VitroVocabulary {
 
-	
+
     public static final String vitroURI = "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#";
     public static final String configURI= "http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration#";
-    
+
     public static final String VITRO_AUTH = "http://vitro.mannlib.cornell.edu/ns/vitro/authorization#";
     public static final String VITRO_PUBLIC = "http://vitro.mannlib.cornell.edu/ns/vitro/public#";
     public static final String VITRO_PUBLIC_ONTOLOGY = "http://vitro.mannlib.cornell.edu/ns/vitro/public";
     // TODO change the following before 1.6 release
     public static final String PROPERTY_CONFIG_DATA = "http://vitro.mannlib.cornell.edu/ns/vitro/siteConfig/";
-    
-    
+
+
     /** BJL23 2008-02-25:
      * This is a hack.  The classic Vitro code is heavily reliant on simple identifiers, and it will take some doing to completely
      * eliminate this.  Prior to version 0.7, identifiers were all integers; now they're URIs.
      * There are a lot of places we'd like to be able to use a bnode ID instead of a URI.  The following special string
      * indicates that the local name of a 'URI' should actually be treated as a bnode ID.
      */
-    public static final String PSEUDO_BNODE_NS = "http://vitro.mannlib.cornell.edu/ns/bnode#"; 
-    
+    public static final String PSEUDO_BNODE_NS = "http://vitro.mannlib.cornell.edu/ns/bnode#";
+
     public static final String RDF = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
     public static final String RDFS = "http://www.w3.org/2000/01/rdf-schema#";
     public static final String RDF_TYPE = RDF+"type";
-    public static final String LABEL = RDFS + "label";   
+    public static final String LABEL = RDFS + "label";
 
     public static final String OWL = "http://www.w3.org/2002/07/owl#";
     public static final String OWL_ONTOLOGY = OWL+"Ontology";
     public static final String OWL_THING = OWL+"Thing";
 
     public static final String label = vitroURI + "label";
-    
+
     // an OWL DL-compatible surrogate for rdf:value for use with boxing idiom
     public static final String value = vitroURI + "value";
-    
+
     public static final String DISPLAY = DisplayVocabulary.DISPLAY_NS;
 
     // properties found on the beans
-    
+
     public static final String DESCRIPTION_ANNOT = vitroURI + "descriptionAnnot";
     public static final String PUBLIC_DESCRIPTION_ANNOT = vitroURI + "publicDescriptionAnnot";
     public static final String EDITING = vitroURI + "editing";
     public static final String SHORTDEF = "http://purl.obolibrary.org/obo/IAO_0000115";
     public static final String EXAMPLE_ANNOT = "http://purl.obolibrary.org/obo/IAO_0000112";
 
-    
+
     public static final String EXTERNALID = vitroURI+"externalId";
     public static final String DATAPROPERTY_ISEXTERNALID = vitroURI+"isExternalId";
-        
+
     public static final String HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT = vitroURI+"hiddenFromDisplayBelowRoleLevelAnnot";
     public static final String PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT = vitroURI+"prohibitedFromUpdateBelowRoleLevelAnnot";
 	public static final String HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT = vitroURI+"hiddenFromPublishBelowRoleLevelAnnot";
@@ -65,11 +65,11 @@ public class VitroVocabulary {
     public static final String CURATOR = "http://vitro.mannlib.cornell.edu/ns/vitro/role#curator";
     public static final String DB_ADMIN = "http://vitro.mannlib.cornell.edu/ns/vitro/role#dbAdmin";
     public static final String NOBODY = "http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody";
-    
+
     public static final String SEARCH_BOOST_ANNOT = vitroURI + "searchBoostAnnot";
 
     public static final String DEPENDENT_RESORUCE = "http://vivoweb.org/ontology/core#DependentResource";
-    
+
     //////////////////////////////////////////
 
     public static final String MONIKER = vitroURI+"moniker";
@@ -82,7 +82,7 @@ public class VitroVocabulary {
     public static final String DISPLAY_RANK = vitroURI+"displayRank";
     public static final String DISPLAY_RANK_ANNOT = vitroURI+"displayRankAnnot";
     public static final String DISPLAY_LIMIT = vitroURI+"displayLimitAnnot";
-    
+
     // ================== property related =================================
 
     public static final String PROPERTY_ENTITYSORTDIRECTION = vitroURI+"individualSortDirectionAnnot";
@@ -121,18 +121,18 @@ public class VitroVocabulary {
     public static final String APPLICATION = vitroURI + "Application";
     public static final String APPLICATION_KEYWORDHEADING = vitroURI+"keywordHeading";
     public static final String APPLICATION_ROOTLOGOTYPEIMAGE = vitroURI+"rootLogotypeImage";
-    
+
     // ================== Vitro Portal vocabulary ===========================
 
     public static final String PORTAL = vitroURI+"Portal";
-    public static final String PORTAL_THEMEDIR = vitroURI+"themeDir";   
+    public static final String PORTAL_THEMEDIR = vitroURI+"themeDir";
     public static final String PORTAL_CONTACTMAIL = vitroURI+"contactMail";
-    public static final String PORTAL_CORRECTIONMAIL = vitroURI+"correctionMail";    
+    public static final String PORTAL_CORRECTIONMAIL = vitroURI+"correctionMail";
     public static final String PORTAL_ABOUTTEXT = vitroURI+"aboutText";
-    public static final String PORTAL_ACKNOWLEGETEXT = vitroURI+"acknowledgeText";       
+    public static final String PORTAL_ACKNOWLEGETEXT = vitroURI+"acknowledgeText";
     public static final String PORTAL_COPYRIGHTURL = vitroURI+"copyrightURL";
     public static final String PORTAL_COPYRIGHTANCHOR = vitroURI+"copyrightAnchor";
-    
+
     // reusing displayRank property above
     public static final String PORTAL_URLPREFIX = vitroURI + "urlPrefix";
 
@@ -142,7 +142,7 @@ public class VitroVocabulary {
     public static final String MAY_EDIT_AS = vitroURI+"mayEditAs";
 
     // =============== Vitro UserAccount and PermissionSet vocabulary ===========
-    
+
     public static final String USERACCOUNT = VITRO_AUTH + "UserAccount";
     public static final String USERACCOUNT_ROOT_USER = VITRO_AUTH + "RootUserAccount";
     public static final String USERACCOUNT_EMAIL_ADDRESS = VITRO_AUTH + "emailAddress";
@@ -192,37 +192,37 @@ public class VitroVocabulary {
     public static final String LOGIN_EVENT = vitroURI + "LoginEvent";
     public static final String LOGIN_DATETIME = vitroURI + "loggedInAt";
     public static final String LOGIN_AGENT = vitroURI + "loggedInAgent";
-    
+
     // =============== file vocabulary ========================================
-    
+
     public static final String VITRO_FEDORA = "http://vitro.mannlib.cornell.edu/ns/fedora/0.1#";
     public static final String FILE_CLASS = VITRO_FEDORA + "File";
     public static final String FILE_NAME = VITRO_FEDORA + "fileName";
     public static final String FEDORA_PID = VITRO_FEDORA + "fedoraPid";
     public static final String CONTENT_TYPE = VITRO_FEDORA + "contentType";
-    public static final String FILE_SIZE = VITRO_FEDORA + "fileSize";    
+    public static final String FILE_SIZE = VITRO_FEDORA + "fileSize";
     public static final String HAS_FILE = VITRO_FEDORA + "hasFile";
     public static final String MD5_CHECKSUM = VITRO_FEDORA + "md5checksum";
-    
+
     public static final String FILE_LOCATION = vitroURI  + "fileLocation";
     public static final String FILE_SAVED_NAME = vitroURI + "FileSavedName";
-    
+
     // =============== namespace vocabulary ===================================
-    
+
     public static final String NAMESPACE = vitroURI + "Namespace";
     public static final String NAMESPACE_PREFIX_MAPPING = vitroURI + "NamespacePrefixMapping";
     public static final String NAMESPACE_HASPREFIXMAPPING = vitroURI + "hasPrefixMapping";
     public static final String NAMESPACE_NAMESPACEURI = vitroURI + "namespaceURI";
     public static final String NAMESPACE_PREFIX = vitroURI + "namespacePrefix";
     public static final String NAMESPACE_ISCURRENTPREFIXMAPPING = vitroURI + "isCurrentPrefixMapping";
-    
+
     public static final String ONTOLOGY_PREFIX_ANNOT = vitroURI + "ontologyPrefixAnnot";
-  
+
     // =============== file storage vocabulary ================================
-    
+
     public static final String FS_FILE_CLASS = VITRO_PUBLIC + "File";
     public static final String FS_BYTESTREAM_CLASS = VITRO_PUBLIC + "FileByteStream";
-    
+
     public static final String FS_FILENAME = VITRO_PUBLIC + "filename";
     public static final String FS_MIME_TYPE = VITRO_PUBLIC + "mimeType";
     public static final String FS_ATTRIBUTION = VITRO_PUBLIC + "attribution";
@@ -235,7 +235,7 @@ public class VitroVocabulary {
 
     // =============== Date Time with Precision vocabulary ===============
     private static final String DATETIME_NS = "http://vivoweb.org/ontology/core#";
-    
+
     protected  static final String[] PRECISIONS = {
         DATETIME_NS+"noPrecision", // this individual doesn't actually exist in the ontology
         DATETIME_NS+"yearPrecision",
@@ -245,7 +245,7 @@ public class VitroVocabulary {
         DATETIME_NS+"yearMonthDayHourMinutePrecision",
         DATETIME_NS+"yearMonthDayTimePrecision"};
 
-    //The Precision.ordinal method is used so do 
+    //The Precision.ordinal method is used so do
     //not change the order of these enums.
     public enum Precision {
         NONE(PRECISIONS[0]),
@@ -254,8 +254,8 @@ public class VitroVocabulary {
         DAY(PRECISIONS[3]),
         HOUR(PRECISIONS[4]),
         MINUTE(PRECISIONS[5]),
-        SECOND(PRECISIONS[6]);        
-        
+        SECOND(PRECISIONS[6]);
+
         private final String URI;
         Precision(String uri){
             URI=uri;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactory.java
index fccf1701d..622367e23 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactory.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactory.java
@@ -8,57 +8,57 @@ import java.util.Set;
 public interface WebappDaoFactory {
 
     /**
-     * Free any resources associated with this WebappDaoFactory  
+     * Free any resources associated with this WebappDaoFactory
      */
     public void close();
 
 	/**
 	 * Checks a URI String for two things: well-formedness and uniqueness in the
-	 * model.  Ill-formed strings or those matching URIs already in use will 
+	 * model.  Ill-formed strings or those matching URIs already in use will
 	 * cause an error message to be returned.
 	 * @return error message String if invalid; otherwise null
 	 */
 	public String checkURI(String uriStr);
-	
+
 	/**
 	 * Checks a URI String to see whether it is suitable for use on a new editable entity.
-	 * It must be well-formed, and it must not be declared in the model as a Thing, Class, 
-	 * ObjectProperty or DataProperty. Ill-formed strings or those so declared will 
+	 * It must be well-formed, and it must not be declared in the model as a Thing, Class,
+	 * ObjectProperty or DataProperty. Ill-formed strings or those so declared will
 	 * cause an error message to be returned.
 	 * @return error message String if invalid; otherwise null
 	 */
 	public String checkURIForEditableEntity(String uriStr);
-	
+
 	/**
 	 * Check if a given URI string exists in the system:
 	 * checks for the following conditions: URI found as subject in a statement or an object or as a property
 	 * @param uriStr URI String
 	 */
 	public boolean hasExistingURI(String uriStr);
-	
+
     public String getDefaultNamespace();
-    
+
     public Set<String> getNonuserNamespaces();
-    
+
     public List<String> getPreferredLanguages();
-    
+
     /**
-     * BJL23 2008-05-20: Putting this here for lack of a more logical place.  
+     * BJL23 2008-05-20: Putting this here for lack of a more logical place.
      * We need to build better support for the RDFS vocabulary into our API.
-     * Returns a list of the simple lexical form strings of the rdfs:comment 
+     * Returns a list of the simple lexical form strings of the rdfs:comment
      * values for a resource; empty list if none found.
      */
     public List<String> getCommentsForResource(String resourceURI);
 
     /**
-     * Copy this DAO factory to a new object associated with the specified user 
+     * Copy this DAO factory to a new object associated with the specified user
      * URI, or return the same factory if a user-aware version cannot be used.
      * @param userURI User URI
      */
     public WebappDaoFactory getUserAwareDaoFactory(String userURI);
 
     /**
-     * Return URI of user associated with this WebappDaoFactory, 
+     * Return URI of user associated with this WebappDaoFactory,
      * or null if not applicable.
      */
     public String getUserURI();
@@ -86,10 +86,10 @@ public interface WebappDaoFactory {
     public OntologyDao getOntologyDao();
 
     /**
-     * returns a Data Access Object for working with ontology class objects 
+     * returns a Data Access Object for working with ontology class objects
      */
     public VClassDao getVClassDao();
-    
+
     /**
      * returns a Data Access Object for working with "faux" ObjectProperties.
      */
@@ -99,23 +99,23 @@ public interface WebappDaoFactory {
     /* ==================== DAOs for ABox manipulation ===================== */
 
     /**
-     * returns a Data Access Object for working with DatatypePropertyStatements 
+     * returns a Data Access Object for working with DatatypePropertyStatements
      */
     public DataPropertyStatementDao getDataPropertyStatementDao();
 
     /**
-     * returns a Data Access Object for working with Individuals 
+     * returns a Data Access Object for working with Individuals
      */
     public IndividualDao getIndividualDao();
 
     /**
-     * returns a Data Access Object for working with ObjectPropertyStatements 
+     * returns a Data Access Object for working with ObjectPropertyStatements
      */
     public ObjectPropertyStatementDao getObjectPropertyStatementDao();
 
 
     public DisplayModelDao getDisplayModelDao();
-    
+
     /* ====================== DAOs for other objects ======================= */
 
     public ApplicationDao getApplicationDao();
@@ -125,11 +125,11 @@ public interface WebappDaoFactory {
     public VClassGroupDao getVClassGroupDao();
 
     public PropertyGroupDao getPropertyGroupDao();
-    
+
     public PropertyInstanceDao getPropertyInstanceDao();
 
-    public PageDao getPageDao();    
-    
-    public MenuDao getMenuDao();    
-    
+    public PageDao getPageDao();
+
+    public MenuDao getMenuDao();
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryConfig.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryConfig.java
index e751d0fbb..3d3dc4afd 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryConfig.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryConfig.java
@@ -11,59 +11,59 @@ import java.util.Set;
 import edu.cornell.mannlib.vitro.webapp.dao.PropertyDao.FullPropertyKey;
 
 public class WebappDaoFactoryConfig {
-	
+
 	private List<String> preferredLanguages;
 	private String defaultNamespace;
 	private Set<String> nonUserNamespaces;
 	private boolean isUnderlyingStoreReasoned = false;
 	public Map<FullPropertyKey, String> customListViewConfigFileMap;
-	
+
 	public WebappDaoFactoryConfig() {
 	    preferredLanguages = Arrays.asList("en-US", "en", "EN");
 		defaultNamespace = "http://vitro.mannlib.cornell.edu/ns/default#";
 		nonUserNamespaces = new HashSet<String>();
 		nonUserNamespaces.add(VitroVocabulary.vitroURI);
 	}
-	
+
 	public List<String> getPreferredLanguages() {
 		return this.preferredLanguages;
 	}
-	
+
 	public void setPreferredLanguages(List<String> pl) {
 		this.preferredLanguages = pl;
 	}
-	
+
 	public String getDefaultNamespace() {
 		return defaultNamespace;
 	}
-	
+
 	public void setDefaultNamespace(String defaultNamespace) {
 		this.defaultNamespace = defaultNamespace;
 	}
-	
+
 	public Set<String> getNonUserNamespaces() {
 		return this.nonUserNamespaces;
 	}
-	
+
 	public void setNonUserNamespaces(Set<String> nonUserNamespaces) {
 		this.nonUserNamespaces = nonUserNamespaces;
 	}
-	
+
 	public void setUnderlyingStoreReasoned(boolean isReasoned) {
 	    this.isUnderlyingStoreReasoned = isReasoned;
 	}
-	
+
 	public boolean isUnderlyingStoreReasoned() {
 	    return this.isUnderlyingStoreReasoned;
 	}
-	
+
 	public Map<FullPropertyKey, String> getCustomListViewConfigFileMap() {
 	    return customListViewConfigFileMap;
 	}
-	
+
     public void setCustomListViewConfigFileMap(
             Map<FullPropertyKey, String> map) {
-        this.customListViewConfigFileMap = map;    
+        this.customListViewConfigFileMap = map;
     }
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyDaoFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyDaoFiltering.java
index debd70f7e..85d21a14f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyDaoFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyDaoFiltering.java
@@ -68,11 +68,11 @@ class DataPropertyDaoFiltering extends BaseFiltering implements DataPropertyDao{
         }
         return filteredProps;
     }
-    
+
 	// ----------------------------------------------------------------------
 	// Unfiltered operations
 	// ----------------------------------------------------------------------
-	
+
     @Override
     public void deleteDataProperty(DataProperty dataProperty) {
         innerDataPropertyDao.deleteDataProperty(dataProperty);
@@ -92,7 +92,7 @@ class DataPropertyDaoFiltering extends BaseFiltering implements DataPropertyDao{
     public String getRequiredDatatypeURI(Individual individual, DataProperty dataProperty) {
     	return innerDataPropertyDao.getRequiredDatatypeURI(individual, dataProperty);
     }
-    
+
     @Override
     public DataProperty getDataPropertyByURI(String dataPropertyURI) {
         return innerDataPropertyDao.getDataPropertyByURI(dataPropertyURI);
@@ -107,27 +107,27 @@ class DataPropertyDaoFiltering extends BaseFiltering implements DataPropertyDao{
     public void updateDataProperty(DataProperty dataProperty) {
         innerDataPropertyDao.updateDataProperty(dataProperty);
     }
-    
+
     @Override
     public void addSuperproperty(String propertyURI, String superpropertyURI) {
     	innerDataPropertyDao.addSuperproperty(propertyURI, superpropertyURI);
     }
-    
+
     @Override
     public void removeSuperproperty(String propertyURI, String superpropertyURI) {
     	innerDataPropertyDao.removeSuperproperty(propertyURI, superpropertyURI);
     }
-    
+
     @Override
     public void addSubproperty(String propertyURI, String subpropertyURI) {
     	innerDataPropertyDao.addSubproperty(propertyURI, subpropertyURI);
     }
-    
+
     @Override
     public void removeSubproperty(String propertyURI, String subpropertyURI) {
     	innerDataPropertyDao.removeSubproperty(propertyURI, subpropertyURI);
     }
-    
+
     @Override
     public List <String> getSubPropertyURIs(String propertyURI) {
     	return innerDataPropertyDao.getSubPropertyURIs(propertyURI);
@@ -147,7 +147,7 @@ class DataPropertyDaoFiltering extends BaseFiltering implements DataPropertyDao{
     public List <String> getAllSuperPropertyURIs(String propertyURI) {
     	return innerDataPropertyDao.getAllSuperPropertyURIs(propertyURI);
     }
-    
+
     @Override
     public List<DataProperty> getRootDataProperties() {
     	return innerDataPropertyDao.getRootDataProperties();
@@ -160,7 +160,7 @@ class DataPropertyDaoFiltering extends BaseFiltering implements DataPropertyDao{
 
     @Override
 	public void addSuperproperty(Property property, Property superproperty) {
-		innerDataPropertyDao.addSuperproperty(property, superproperty);	
+		innerDataPropertyDao.addSuperproperty(property, superproperty);
 	}
 
     @Override
@@ -197,18 +197,18 @@ class DataPropertyDaoFiltering extends BaseFiltering implements DataPropertyDao{
 	public void removeEquivalentProperty(Property property, Property equivalentProperty) {
 		innerDataPropertyDao.removeEquivalentProperty(property, equivalentProperty);
 	}
-	
+
     @Override
    public List <VClass> getClassesWithRestrictionOnProperty(String propertyURI) {
     	return innerDataPropertyDao.getClassesWithRestrictionOnProperty(propertyURI);
     }
-    
+
     @Override
     // This may need to be filtered at some point.
     public List<DataProperty> getDataPropertyList(Individual subject) {
         return innerDataPropertyDao.getDataPropertyList(subject);
     }
-    
+
     @Override
     // This may need to be filtered at some point.
     public List<DataProperty> getDataPropertyList(String subjectUri) {
@@ -220,4 +220,4 @@ class DataPropertyDaoFiltering extends BaseFiltering implements DataPropertyDao{
         return innerDataPropertyDao.getCustomListViewConfigFileName(dataProperty);
     }
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyFiltering.java
index e714665fe..74163e45f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyFiltering.java
@@ -14,32 +14,32 @@ import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
 public class DataPropertyFiltering extends DataProperty {
     private VitroFilters filters;
     private DataProperty innerDataProperty;
-    
+
     public DataPropertyFiltering(DataProperty innerDataProperty, VitroFilters filters){
         this.innerDataProperty = innerDataProperty;
         this.filters = filters;
     }
-    
+
     /**
      * Need to filter DataPropertyStatements and return DataPropertyStatements
-     * wrapped in DataPropertyStatementsFiltering. 
+     * wrapped in DataPropertyStatementsFiltering.
      */
     @Override
-    public List<DataPropertyStatement> getDataPropertyStatements() {        
+    public List<DataPropertyStatement> getDataPropertyStatements() {
         List<DataPropertyStatement> propStmts =  innerDataProperty.getDataPropertyStatements();
         if( propStmts == null ) return null;
-        
+
         List<DataPropertyStatement> filteredStmts = new LinkedList<DataPropertyStatement>();
         Filter.filter(propStmts, filters.getDataPropertyStatementFilter(), filteredStmts);
-        
+
         List<DataPropertyStatement> wrappedStmts = new LinkedList<DataPropertyStatement>();
         for( DataPropertyStatement stmt : filteredStmts){
             wrappedStmts.add( new DataPropertyStatementFiltering(stmt, filters) );
         }
-        return wrappedStmts;        
+        return wrappedStmts;
     }
-    
-           
+
+
     /* the rest of the methods are delegated with no filtering */
     @Override
     public int compareTo(DataProperty op) {
@@ -95,7 +95,7 @@ public class DataPropertyFiltering extends DataProperty {
     public RoleLevel getHiddenFromDisplayBelowRoleLevel() {
         return innerDataProperty.getHiddenFromDisplayBelowRoleLevel();
     }
-    
+
     @Override
     public RoleLevel getProhibitedFromUpdateBelowRoleLevel() {
         return innerDataProperty.getProhibitedFromUpdateBelowRoleLevel();
@@ -105,17 +105,17 @@ public class DataPropertyFiltering extends DataProperty {
     public RoleLevel getHiddenFromPublishBelowRoleLevel() {
         return innerDataProperty.getHiddenFromPublishBelowRoleLevel();
     }
-    
+
     @Override
     public String getLocalName() {
         return innerDataProperty.getLocalName();
     }
-    
+
     @Override
     public String getLocalNameWithPrefix() {
         return innerDataProperty.getLocalNameWithPrefix();
     }
-    
+
     @Override
     public String getPickListName() {
         return innerDataProperty.getPickListName();
@@ -185,7 +185,7 @@ public class DataPropertyFiltering extends DataProperty {
     public void setHiddenFromDisplayBelowRoleLevel(RoleLevel eR) {
         innerDataProperty.setHiddenFromDisplayBelowRoleLevel(eR);
     }
-    
+
     @Override
     public void setHiddenFromDisplayBelowRoleLevelUsingRoleUri(String roleUri) {
         innerDataProperty.setHiddenFromDisplayBelowRoleLevel(BaseResourceBean.RoleLevel.getRoleByUri(roleUri));
@@ -195,7 +195,7 @@ public class DataPropertyFiltering extends DataProperty {
     public void setProhibitedFromUpdateBelowRoleLevel(RoleLevel eR) {
         innerDataProperty.setProhibitedFromUpdateBelowRoleLevel(eR);
     }
-    
+
     @Override
     public void setProhibitedFromUpdateBelowRoleLevelUsingRoleUri(String roleUri) {
         innerDataProperty.setProhibitedFromUpdateBelowRoleLevel(BaseResourceBean.RoleLevel.getRoleByUri(roleUri));
@@ -205,7 +205,7 @@ public class DataPropertyFiltering extends DataProperty {
     public void setHiddenFromPublishBelowRoleLevel(RoleLevel eR) {
         innerDataProperty.setHiddenFromPublishBelowRoleLevel(eR);
     }
-    
+
     @Override
     public void setHiddenFromPublishBelowRoleLevelUsingRoleUri(String roleUri) {
         innerDataProperty.setHiddenFromPublishBelowRoleLevel(BaseResourceBean.RoleLevel.getRoleByUri(roleUri));
@@ -220,7 +220,7 @@ public class DataPropertyFiltering extends DataProperty {
     public void setLocalNameWithPrefix(String localNameWithPrefix) {
         innerDataProperty.setLocalNameWithPrefix(localNameWithPrefix);
     }
-    
+
     @Override
     public void setPickListName(String pickListName) {
         innerDataProperty.setPickListName(pickListName);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementDaoFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementDaoFiltering.java
index 532fa4900..5bcc78830 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementDaoFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementDaoFiltering.java
@@ -19,8 +19,8 @@ import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao;
 import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
 
 class DataPropertyStatementDaoFiltering extends BaseFiltering implements DataPropertyStatementDao{
-    
-    final DataPropertyStatementDao innerDataPropertyStatementDao;    
+
+    final DataPropertyStatementDao innerDataPropertyStatementDao;
     final VitroFilters filters;
 
     public DataPropertyStatementDaoFiltering(
@@ -75,7 +75,7 @@ class DataPropertyStatementDaoFiltering extends BaseFiltering implements DataPro
     public List getExistingQualifiers(String dataPropertyURI) {
         return innerDataPropertyStatementDao.getExistingQualifiers(dataPropertyURI);
     }
-    
+
     public List<DataPropertyStatement> getDataPropertyStatements(DataProperty dataProperty) {
     	List<DataPropertyStatement> dps = innerDataPropertyStatementDao.getDataPropertyStatements(dataProperty);
     	if (dps != null) {
@@ -84,7 +84,7 @@ class DataPropertyStatementDaoFiltering extends BaseFiltering implements DataPro
     		return dps;
     	}
     }
-    
+
     public List<DataPropertyStatement> getDataPropertyStatements(DataProperty dataProperty, int startIndex, int endIndex) {
     	List<DataPropertyStatement> dps = innerDataPropertyStatementDao.getDataPropertyStatements(dataProperty, startIndex, endIndex);
     	if (dps != null) {
@@ -98,7 +98,7 @@ class DataPropertyStatementDaoFiltering extends BaseFiltering implements DataPro
             DataPropertyStatement dataPropertyStatement) {
         return innerDataPropertyStatementDao.insertNewDataPropertyStatement(dataPropertyStatement);
     }
-    
+
     @Override
     public List<Literal> getDataPropertyValuesForIndividualByProperty(Individual subject, DataProperty property) {
         return getDataPropertyValuesForIndividualByProperty(subject.getURI(), property.getURI());
@@ -106,14 +106,14 @@ class DataPropertyStatementDaoFiltering extends BaseFiltering implements DataPro
 
     @Override
     public List<Literal> getDataPropertyValuesForIndividualByProperty(String subjectUri, String propertyUri) {
-        List<Literal> literals = innerDataPropertyStatementDao.getDataPropertyValuesForIndividualByProperty(subjectUri, propertyUri);        
+        List<Literal> literals = innerDataPropertyStatementDao.getDataPropertyValuesForIndividualByProperty(subjectUri, propertyUri);
         /* Filter the data
-         * 
+         *
          * Filtering is applied to a list of DataPropertyStatement. Create these statements, mapped
          * to the literal that they are built from, apply filtering to the statements, then get
          * the associated literals out of the original list. Use a LinkedHashMap to preserve the ordering.
          */
-        Map<DataPropertyStatement, Literal> stmtsToLiterals = 
+        Map<DataPropertyStatement, Literal> stmtsToLiterals =
             new LinkedHashMap<DataPropertyStatement, Literal>(literals.size());
 
         for (Literal literal : literals) {
@@ -123,12 +123,12 @@ class DataPropertyStatementDaoFiltering extends BaseFiltering implements DataPro
             statement.setLanguage(literal.getLanguage());
             stmtsToLiterals.put(statement, literal);
         }
-        
+
         List<DataPropertyStatement> stmtList = new ArrayList<DataPropertyStatement>(stmtsToLiterals.keySet());
-        
+
         // Apply the filters to the list of statements
         List<DataPropertyStatement> filteredStatements = filter(stmtList, filters.getDataPropertyStatementFilter());
-        
+
         // Get the literals associated with the filtered statements out of the original list
         List<Literal> filteredLiterals = new ArrayList<Literal>(filteredStatements.size());
         for (DataPropertyStatement dps : filteredStatements) {
@@ -136,28 +136,28 @@ class DataPropertyStatementDaoFiltering extends BaseFiltering implements DataPro
                 dps = ((DataPropertyStatementFiltering)dps).innerStmt;
             }
             filteredLiterals.add(stmtsToLiterals.get(dps));
-        }       
-        
+        }
+
         // Return the filtered list of literals
         return filteredLiterals;
-        
+
     }
-    
+
     @Override
     public List<Literal> getDataPropertyValuesForIndividualByProperty(Individual subject, DataProperty property, String queryString, Set<String> constructQueryStrings) {
         return getDataPropertyValuesForIndividualByProperty(subject.getURI(), property.getURI(), queryString, constructQueryStrings);
     }
 
     @Override
-    public List<Literal> getDataPropertyValuesForIndividualByProperty(String subjectUri, String propertyUri, String queryString, Set<String> constructQueryStrings) {        
+    public List<Literal> getDataPropertyValuesForIndividualByProperty(String subjectUri, String propertyUri, String queryString, Set<String> constructQueryStrings) {
         List<Literal> literals = innerDataPropertyStatementDao.getDataPropertyValuesForIndividualByProperty(subjectUri, propertyUri,   queryString, constructQueryStrings);
         /* Filter the data
-         * 
+         *
          * Filtering is applied to a list of DataPropertyStatement. Create these statements, mapped
          * to the literal that they are built from, apply filtering to the statements, then get
          * the associated literals out of the original list. Use a LinkedHashMap to preserve the ordering.
          */
-        Map<DataPropertyStatement, Literal> stmtsToLiterals = 
+        Map<DataPropertyStatement, Literal> stmtsToLiterals =
             new LinkedHashMap<DataPropertyStatement, Literal>(literals.size());
 
         for (Literal literal : literals) {
@@ -167,12 +167,12 @@ class DataPropertyStatementDaoFiltering extends BaseFiltering implements DataPro
             statement.setLanguage(literal.getLanguage());
             stmtsToLiterals.put(statement, literal);
         }
-        
+
         List<DataPropertyStatement> stmtList = new ArrayList<DataPropertyStatement>(stmtsToLiterals.keySet());
-        
+
         // Apply the filters to the list of statements
         List<DataPropertyStatement> filteredStatements = filter(stmtList, filters.getDataPropertyStatementFilter());
-        
+
         // Get the literals associated with the filtered statements out of the original list
         List<Literal> filteredLiterals = new ArrayList<Literal>(filteredStatements.size());
         for (DataPropertyStatement dps : filteredStatements) {
@@ -180,11 +180,11 @@ class DataPropertyStatementDaoFiltering extends BaseFiltering implements DataPro
                 dps = ((DataPropertyStatementFiltering)dps).innerStmt;
             }
             filteredLiterals.add(stmtsToLiterals.get(dps));
-        }       
-        
+        }
+
         // Return the filtered list of literals
         return filteredLiterals;
-        
+
     }
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementFiltering.java
index 27500d74c..01910dacb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/DataPropertyStatementFiltering.java
@@ -9,12 +9,12 @@ import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
 public class DataPropertyStatementFiltering implements DataPropertyStatement {
     final DataPropertyStatement innerStmt;
     final VitroFilters filters;
-    
+
     public DataPropertyStatementFiltering( DataPropertyStatement stmt, VitroFilters filters){
         this.innerStmt = stmt;
         this.filters = filters;
     }
-    
+
     /***** methods that return wrapped objects *****/
     /*
     public String getIndividual() {
@@ -30,7 +30,7 @@ public class DataPropertyStatementFiltering implements DataPropertyStatement {
     public Individual getIndividual() {
         return innerStmt.getIndividual();
     }
-    
+
     public String getIndividualURI() {
         return innerStmt.getIndividualURI();
     }
@@ -42,7 +42,7 @@ public class DataPropertyStatementFiltering implements DataPropertyStatement {
     public String getData() {
         return innerStmt.getData();
     }
-    
+
     public String getDatatypeURI() {
         return innerStmt.getDatatypeURI();
     }
@@ -50,19 +50,19 @@ public class DataPropertyStatementFiltering implements DataPropertyStatement {
     public String getDatapropURI() {
         return innerStmt.getDatapropURI();
     }
-    
+
     public String getString() {
         return innerStmt.getString();
     }
-    
+
     public void setIndividual(Individual individual) {
         innerStmt.setIndividual(individual);
     }
-    
+
     public void setIndividualURI(String individualURI) {
         innerStmt.setIndividualURI(individualURI);
     }
-    
+
     public void setData(String data) {
         innerStmt.setData(data);
     }
@@ -78,5 +78,5 @@ public class DataPropertyStatementFiltering implements DataPropertyStatement {
     public void setDatapropURI(String datapropURI) {
         innerStmt.setDatapropURI(datapropURI);
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/FauxPropertyDaoFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/FauxPropertyDaoFiltering.java
index 6916ef1f3..bc79e1443 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/FauxPropertyDaoFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/FauxPropertyDaoFiltering.java
@@ -52,21 +52,21 @@ public class FauxPropertyDaoFiltering extends BaseFiltering implements FauxPrope
 	public void updateFauxProperty(FauxProperty fp) {
 		// TODO Auto-generated method stub
 		throw new RuntimeException("FauxPropertyDaoFiltering.updateFauxProperty() not implemented.");
-		
+
 	}
 
 	@Override
 	public void deleteFauxProperty(FauxProperty fp) {
 		// TODO Auto-generated method stub
 		throw new RuntimeException("FauxPropertyDao.deleteFauxProperty() not implemented.");
-		
+
 	}
 
 	@Override
 	public void insertFauxProperty(FauxProperty fp) {
 		// TODO Auto-generated method stub
 		throw new RuntimeException("FauxPropertyDao.insertFauxProperty() not implemented.");
-		
+
 	}
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/FilteringPropertyInstanceDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/FilteringPropertyInstanceDao.java
index 7a7b5b2ce..069831262 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/FilteringPropertyInstanceDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/FilteringPropertyInstanceDao.java
@@ -22,36 +22,36 @@ public class FilteringPropertyInstanceDao implements PropertyInstanceDao {
     private final UnaryFunctor<PropertyInstance,Boolean> propertyInstanceFilter;
     private final IndividualDao individualDao;
     private final ObjectPropertyDao objectPropDao;
-    
-    
+
+
     public FilteringPropertyInstanceDao(
-            final PropertyInstanceDao propertyInstanceDao, 
+            final PropertyInstanceDao propertyInstanceDao,
             final ObjectPropertyDao objectPropDao,
             final IndividualDao individualDao,
             final VitroFilters filters) {
-        if( propertyInstanceDao == null ) 
+        if( propertyInstanceDao == null )
             throw new IllegalArgumentException("Must pass a non null PropertyInstanceDao to constructor");
         if( filters == null )
             throw new IllegalArgumentException("Must pass a non-null VitroFilters to constructor");
-        
+
         this.innerPropertyInstanceDao = propertyInstanceDao;
         this.filters = filters;
         this.individualDao = individualDao;
         this.objectPropDao = objectPropDao;
-        
+
         this.propertyInstanceFilter = new UnaryFunctor<PropertyInstance,Boolean>(){
             @Override
             public Boolean fn(PropertyInstance inst) {
                 if( inst == null ) return false;
-                
+
                 //this shouldn't happen
                 if( inst.getSubjectEntURI()== null && inst.getPropertyURI() == null &&
                         inst.getRangeClassURI() == null )
                     return false;
-                
+
                 //in some classes, like PropertyDWR.java, a PropertyInstance with nulls
                 //in the subjectUri and objectUri represent an ObjectProperty, not
-                //an ObjectPropertyStatement.                
+                //an ObjectPropertyStatement.
                 if( inst.getSubjectEntURI() == null && inst.getObjectEntURI() == null
                         && inst.getPropertyURI() != null ){
                     //is it a property we can show?
@@ -59,10 +59,10 @@ public class FilteringPropertyInstanceDao implements PropertyInstanceDao {
                     if( op == null )
                         return false;
                     else
-                        return filters.getObjectPropertyFilter().fn(op);                    
+                        return filters.getObjectPropertyFilter().fn(op);
                 }
-                
-                
+
+
                 //Filter based on subject, property and object.  This could be changed
                 //to filter on the subject's and object's class.
                 Individual sub = individualDao.getIndividualByURI(inst.getSubjectEntURI());
@@ -73,23 +73,23 @@ public class FilteringPropertyInstanceDao implements PropertyInstanceDao {
                     return false;
                 ObjectProperty prop = objectPropDao.getObjectPropertyByURI(inst.getPropertyURI());
                 return filters.getObjectPropertyFilter().fn(prop);
-            }            
+            }
         };
     }
-     
-    /* ******************** filtered methods ********************* */    
+
+    /* ******************** filtered methods ********************* */
     public Collection<PropertyInstance> getAllPossiblePropInstForIndividual(
             String individualURI) {
         Collection<PropertyInstance> innerInst = innerPropertyInstanceDao.getAllPossiblePropInstForIndividual(individualURI);
         Collection<PropertyInstance> out = new LinkedList<PropertyInstance>();
-        Filter.filter(innerInst, propertyInstanceFilter , out);                
-        return out;        
+        Filter.filter(innerInst, propertyInstanceFilter , out);
+        return out;
     }
 
     public Collection<PropertyInstance> getAllPropInstByVClass(String classURI) {
         Collection<PropertyInstance> innerInst = innerPropertyInstanceDao.getAllPropInstByVClass(classURI);
         Collection<PropertyInstance> out = new LinkedList<PropertyInstance>();
-        Filter.filter(innerInst, propertyInstanceFilter , out);                
+        Filter.filter(innerInst, propertyInstanceFilter , out);
         return out;
     }
 
@@ -97,7 +97,7 @@ public class FilteringPropertyInstanceDao implements PropertyInstanceDao {
             String propertyURI) {
         Collection<PropertyInstance> innerInst = innerPropertyInstanceDao.getExistingProperties(entityURI, propertyURI);
         Collection<PropertyInstance> out = new LinkedList<PropertyInstance>();
-        Filter.filter(innerInst, propertyInstanceFilter , out);                
+        Filter.filter(innerInst, propertyInstanceFilter , out);
         return out;
     }
 
@@ -110,7 +110,7 @@ public class FilteringPropertyInstanceDao implements PropertyInstanceDao {
             return null;
     }
 
-    /* **************** unfiltered methods ***************** */    
+    /* **************** unfiltered methods ***************** */
     public void deleteObjectPropertyStatement(String subjectURI,
             String propertyURI, String objectURI) {
         innerPropertyInstanceDao.deleteObjectPropertyStatement(subjectURI, propertyURI, objectURI);
@@ -129,5 +129,5 @@ public class FilteringPropertyInstanceDao implements PropertyInstanceDao {
 
     }
 
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualDaoFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualDaoFiltering.java
index 7b3063bae..74a275f8b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualDaoFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualDaoFiltering.java
@@ -36,31 +36,31 @@ class IndividualDaoFiltering extends BaseFiltering implements IndividualDao{
 
         ArrayList<Individual>  filteredList = new ArrayList<Individual>();
         Filter.filter(cin,filters.getIndividualFilter(),filteredList);
-        
+
         ArrayList<Individual> cout  = new ArrayList<Individual>();
         for(Individual ind : filteredList){
             cout.add( new IndividualFiltering(ind,filters));
-        }        
+        }
         return cout;
     }
 
     protected Iterator<Individual> filterAndWrap(Iterator<Individual> it, VitroFilters filters){
         if( it == null ) return null;
         if( filters == null ) return it;
-        return Transform.transform(    
+        return Transform.transform(
                 Filter.filter(it,filters.getIndividualFilter()),
-                new ToFilteredIndividual(filters));        
+                new ToFilteredIndividual(filters));
     }
-    
+
     /* **************** methods that filter ****************** */
     public Individual getIndividualByURI(String individualURI) {
         Individual ind = innerIndividualDao.getIndividualByURI(individualURI);
-        if( ind != null && filters.getIndividualFilter().fn(ind))           
+        if( ind != null && filters.getIndividualFilter().fn(ind))
             return new IndividualFiltering(ind, filters);
         else
-            return null;        
+            return null;
     }
-    
+
     public void fillVClassForIndividual(Individual individual) {
         innerIndividualDao.fillVClassForIndividual(individual);
     }
@@ -76,7 +76,7 @@ class IndividualDaoFiltering extends BaseFiltering implements IndividualDao{
         return filterAndWrap(innerIndividualDao.getIndividualsByDataProperty(dataPropertyUri,value,datatypeUri,lang),
                 filters);
     }
-        
+
     public List getIndividualsByVClass(VClass vclass) {
         List<Individual> list = innerIndividualDao.getIndividualsByVClass(vclass);
         if( list == null )
@@ -84,28 +84,28 @@ class IndividualDaoFiltering extends BaseFiltering implements IndividualDao{
         else
             return filterAndWrap(list, filters);
     }
-    
-    public List getIndividualsByVClassURI(String vclassURI) {    
+
+    public List getIndividualsByVClassURI(String vclassURI) {
         List<Individual> list = innerIndividualDao.getIndividualsByVClassURI(vclassURI);
-        if( list == null ) 
+        if( list == null )
             return Collections.EMPTY_LIST;
         else
             return filterAndWrap(list,filters);
     }
-    
-    public List getIndividualsByVClassURI(String vclassURI, int offset, int quantity) {    
+
+    public List getIndividualsByVClassURI(String vclassURI, int offset, int quantity) {
         List<Individual> list = innerIndividualDao.getIndividualsByVClassURI(vclassURI,offset,quantity);
-        if( list == null ) 
+        if( list == null )
             return Collections.EMPTY_LIST;
         else
             return filterAndWrap(list,filters);
-    }  
-    
+    }
+
     /* All of the methods that return iterator don't wrap the Individual in
      * a IndividualFiltering so they might cause problems */
-    
 
-    
+
+
     private class ToFilteredIndividual extends UnaryFunctor<Individual, Individual>{
         private final VitroFilters filters;
         public ToFilteredIndividual(VitroFilters vf){
@@ -114,22 +114,22 @@ class IndividualDaoFiltering extends BaseFiltering implements IndividualDao{
         @Override
         public Individual fn(Individual arg) {
             return new IndividualFiltering(arg,filters);
-        }        
-    }              
-
-    
-    /* ******************* unfiltered methods ****************** */
-    
-    public Collection<String> getAllIndividualUris() {        
-        return innerIndividualDao.getAllIndividualUris(); 
-                       
+        }
     }
-    
+
+
+    /* ******************* unfiltered methods ****************** */
+
+    public Collection<String> getAllIndividualUris() {
+        return innerIndividualDao.getAllIndividualUris();
+
+    }
+
     public Iterator<String> getUpdatedSinceIterator(long updatedSince) {
         return  innerIndividualDao.getUpdatedSinceIterator(updatedSince);
-                       
+
     }
-    
+
     public Collection<DataPropertyStatement> getExternalIds(String individualURI) {
         return innerIndividualDao.getExternalIds(individualURI);
     }
@@ -150,11 +150,11 @@ class IndividualDaoFiltering extends BaseFiltering implements IndividualDao{
     public int getCountOfIndividualsInVClass(int vclassId) {
         throw new Error("IndividualDaoFiltering.getCountOfIndividualsInVClass is not supported");
     }
-    
+
     public void addVClass(String individualURI, String vclassURI) {
         innerIndividualDao.addVClass(individualURI, vclassURI);
     }
-    
+
     public void removeVClass(String individualURI, String vclassURI) {
         innerIndividualDao.removeVClass(individualURI, vclassURI);
     }
@@ -189,4 +189,4 @@ class IndividualDaoFiltering extends BaseFiltering implements IndividualDao{
         return innerIndividualDao.getLabelEditLiteral(individualUri);
     }
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFiltering.java
index 09d2398d9..474814878 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFiltering.java
@@ -42,7 +42,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
 public class IndividualFiltering implements Individual {
     private final Individual _innerIndividual;
     private final VitroFilters _filters;
-    
+
     private static final Log log = LogFactory.getLog(IndividualFiltering.class);
 
     public IndividualFiltering(Individual individual, VitroFilters filters) {
@@ -57,14 +57,14 @@ public class IndividualFiltering implements Individual {
 	public List<DataProperty> getDataPropertyList() {
         List<DataProperty> dprops =  _innerIndividual.getDataPropertyList();
         LinkedList<DataProperty> outdProps = new LinkedList<DataProperty>();
-        if( dprops == null ) 
+        if( dprops == null )
             return outdProps;
         Filter.filter(dprops,_filters.getDataPropertyFilter(), outdProps);
-        
+
         ListIterator<DataProperty> it = outdProps.listIterator();
         while(it.hasNext()){
             DataProperty dp = it.next();
-            List<DataPropertyStatement> filteredStmts = 
+            List<DataPropertyStatement> filteredStmts =
                 new LinkedList<DataPropertyStatement>();
             Filter.filter(dp.getDataPropertyStatements(),
                     _filters.getDataPropertyStatementFilter(),filteredStmts);
@@ -84,7 +84,7 @@ public class IndividualFiltering implements Individual {
 		// the DataProperty with statements. - jblake
         List<DataProperty> outdProps = new ArrayList<DataProperty>();
         List<DataProperty> dprops = _innerIndividual.getPopulatedDataPropertyList();
-        if( dprops == null ) 
+        if( dprops == null )
             return outdProps;
 		for (DataProperty dp: dprops) {
 			if (_filters.getDataPropertyStatementFilter().fn(
@@ -93,39 +93,39 @@ public class IndividualFiltering implements Individual {
 			}
         }
         return outdProps;
-    }    
-    
+    }
+
     @Override
     public List<DataPropertyStatement> getDataPropertyStatements() {
         List<DataPropertyStatement> dstmts = _innerIndividual.getDataPropertyStatements();
-        return filterDataPropertyStatements(dstmts);      
+        return filterDataPropertyStatements(dstmts);
     }
-    
+
     @Override
     public List<DataPropertyStatement> getDataPropertyStatements(String propertyUri) {
         List<DataPropertyStatement> dstmts = _innerIndividual.getDataPropertyStatements(propertyUri);
-        return filterDataPropertyStatements(dstmts);        
+        return filterDataPropertyStatements(dstmts);
     }
-    
+
     private List<DataPropertyStatement> filterDataPropertyStatements(List<DataPropertyStatement> dStmts) {
         List<DataPropertyStatement> outDstmts = new LinkedList<DataPropertyStatement>();
-        if( dStmts == null ) 
+        if( dStmts == null )
             return outDstmts;
         Filter.filter(dStmts,_filters.getDataPropertyStatementFilter(), outDstmts);
-        return outDstmts;          
-    }    
-      
+        return outDstmts;
+    }
+
     @Override
     public Map<String, DataProperty> getDataPropertyMap() {
         Map<String,DataProperty> innerMap = _innerIndividual.getDataPropertyMap();
         if( innerMap == null )
             return Collections.emptyMap();
-                
+
         Map<String,DataProperty> returnMap = new HashMap<String,DataProperty>();
         for( String key : innerMap.keySet() ){
             DataProperty dp = innerMap.get(key);
-            if( _filters.getDataPropertyFilter().fn(dp) ){                
-                List<DataPropertyStatement> filteredStmts = 
+            if( _filters.getDataPropertyFilter().fn(dp) ){
+                List<DataPropertyStatement> filteredStmts =
                     new LinkedList<DataPropertyStatement>();
                 Filter.filter(dp.getDataPropertyStatements(),
                         _filters.getDataPropertyStatementFilter(),filteredStmts);
@@ -134,27 +134,27 @@ public class IndividualFiltering implements Individual {
                     returnMap.put(key,dp);
                 }
             }
-        }            
-        return returnMap;        
+        }
+        return returnMap;
     }
-    
+
     @Override
     public List<ObjectProperty> getObjectPropertyList() {
         List <ObjectProperty> oprops = _innerIndividual.getObjectPropertyList();
         return ObjectPropertyDaoFiltering.filterAndWrap(oprops, _filters);
     }
-    
+
     @Override
     public List<ObjectProperty> getPopulatedObjectPropertyList() {
 		// I'd rather filter on the actual ObjectPropertyStatements here, but
 		// Individual.getPopulatedObjectPropertyList doesn't actually populate
 		// the ObjectProperty with statements. - jblake
-        
+
         // bjl23:  disabling this filtering because the individual statements are
         // filtered later, and we need to allow for the possibility that a particular
         // predicate + range class combination is allowed even if the predicate is
         // hidden on its own.
-        
+
         return _innerIndividual.getPopulatedObjectPropertyList();
 
         // Will revisit filtering at this level if it turns out to be truly necessary.
@@ -174,14 +174,14 @@ public class IndividualFiltering implements Individual {
     /* ********************* methods that need delegated filtering *************** */
     @Override
     public List<ObjectPropertyStatement> getObjectPropertyStatements() {
-        return filterObjectPropertyStatements(_innerIndividual.getObjectPropertyStatements()); 
+        return filterObjectPropertyStatements(_innerIndividual.getObjectPropertyStatements());
     }
 
     @Override
     public List<ObjectPropertyStatement> getObjectPropertyStatements(String propertyUri) {
-        return filterObjectPropertyStatements(_innerIndividual.getObjectPropertyStatements(propertyUri));       
+        return filterObjectPropertyStatements(_innerIndividual.getObjectPropertyStatements(propertyUri));
     }
-    
+
 	private List<ObjectPropertyStatement> filterObjectPropertyStatements(List<ObjectPropertyStatement> opStmts) {
 		if (opStmts == null) {
 			return Collections.emptyList();
@@ -192,31 +192,31 @@ public class IndividualFiltering implements Individual {
 		return filtered;
 	}
 
-    
+
     //TODO: may cause problems since one can get ObjectPropertyStatement list from
     // the ObjectProperty, and that won't be filtered.
-    //might need to make a ObjectPropertyFiltering and a ObjectPropertyStatementFiltering    
+    //might need to make a ObjectPropertyFiltering and a ObjectPropertyStatementFiltering
     @Override
     public Map<String, ObjectProperty> getObjectPropertyMap() {
         Map<String,ObjectProperty> innerMap = _innerIndividual.getObjectPropertyMap();
         if( innerMap == null )
             return null;
-        
-        
-        Map<String,ObjectProperty> returnMap = new HashMap<String,ObjectProperty>();        
+
+
+        Map<String,ObjectProperty> returnMap = new HashMap<String,ObjectProperty>();
         for( String key : innerMap.keySet() ){
             ObjectProperty innerProp = innerMap.get(key);
             if( innerProp != null && _filters.getObjectPropertyFilter().fn( innerProp ) )
-                returnMap.put(key, new ObjectPropertyFiltering(innerProp,_filters));                
-        }        
-        
+                returnMap.put(key, new ObjectPropertyFiltering(innerProp,_filters));
+        }
+
 //        Map<String,ObjectProperty> returnMap = new HashMap<String,ObjectProperty>(innerMap);
 //        for( String key : returnMap.keySet() ){
 //            ObjectProperty op = returnMap.get(key);
 //            if( ! _filters.getObjectPropertyFilter().fn(op) )
 //                returnMap.remove(key);
 //        }
-            
+
         return returnMap;
     }
     /* ************** methods that don't need filtering *********** */
@@ -261,13 +261,13 @@ public class IndividualFiltering implements Individual {
     public String getName() {
         return _innerIndividual.getName();
     }
-    
+
     @Override
     public String getLabel() {
         return _innerIndividual.getLabel();
     }
-    
-    @Override 
+
+    @Override
     public String getPickListName() {
         return getName();
     }
@@ -331,7 +331,7 @@ public class IndividualFiltering implements Individual {
 	public void setMainImageUri(String mainImageUri) {
     	_innerIndividual.setMainImageUri(mainImageUri);
 	}
-    
+
     @Override
     public void setLocalName(String localName) {
         _innerIndividual.setLocalName(localName);
@@ -401,12 +401,12 @@ public class IndividualFiltering implements Individual {
 	public boolean isVClass(String uri) {
     	return _innerIndividual.isVClass(uri);
 	}
-    
+
     @Override
     public List<String> getMostSpecificTypeURIs() {
         return _innerIndividual.getMostSpecificTypeURIs();
     }
-    
+
     @Override
 	public void setDataPropertyMap(Map<String, DataProperty> propertyMap) {
         _innerIndividual.setDataPropertyMap(propertyMap);
@@ -431,12 +431,12 @@ public class IndividualFiltering implements Individual {
     public RoleLevel getHiddenFromDisplayBelowRoleLevel() {
         return _innerIndividual.getHiddenFromDisplayBelowRoleLevel();
     }
-    
+
     @Override
     public void setHiddenFromDisplayBelowRoleLevel(RoleLevel eR) {
         _innerIndividual.setHiddenFromDisplayBelowRoleLevel(eR);
     }
-    
+
     @Override
     public void setHiddenFromDisplayBelowRoleLevelUsingRoleUri(String roleUri) {
         _innerIndividual.setHiddenFromDisplayBelowRoleLevel(BaseResourceBean.RoleLevel.getRoleByUri(roleUri));
@@ -446,12 +446,12 @@ public class IndividualFiltering implements Individual {
     public RoleLevel getProhibitedFromUpdateBelowRoleLevel() {
         return _innerIndividual.getProhibitedFromUpdateBelowRoleLevel();
     }
-    
+
     @Override
     public void setProhibitedFromUpdateBelowRoleLevel(RoleLevel eR) {
         _innerIndividual.setProhibitedFromUpdateBelowRoleLevel(eR);
     }
-    
+
     @Override
     public void setProhibitedFromUpdateBelowRoleLevelUsingRoleUri(String roleUri) {
         _innerIndividual.setProhibitedFromUpdateBelowRoleLevel(BaseResourceBean.RoleLevel.getRoleByUri(roleUri));
@@ -461,12 +461,12 @@ public class IndividualFiltering implements Individual {
     public RoleLevel getHiddenFromPublishBelowRoleLevel() {
         return _innerIndividual.getHiddenFromPublishBelowRoleLevel();
     }
-    
+
     @Override
     public void setHiddenFromPublishBelowRoleLevel(RoleLevel eR) {
         _innerIndividual.setHiddenFromPublishBelowRoleLevel(eR);
     }
-    
+
     @Override
     public void setHiddenFromPublishBelowRoleLevelUsingRoleUri(String roleUri) {
         _innerIndividual.setHiddenFromPublishBelowRoleLevel(BaseResourceBean.RoleLevel.getRoleByUri(roleUri));
@@ -476,7 +476,7 @@ public class IndividualFiltering implements Individual {
     public boolean isAnonymous() {
         return _innerIndividual.isAnonymous();
     }
-    
+
     @Override
     public int compareTo( Individual ind2 ) {
     	return _innerIndividual.compareTo( ind2 );
@@ -484,14 +484,14 @@ public class IndividualFiltering implements Individual {
 
     @Override
     public String toString() {
-        return _innerIndividual.toString();  
+        return _innerIndividual.toString();
     }
 
     @Override
     public void setSearchBoost(Float boost) { _innerIndividual.setSearchBoost( boost ); }
     @Override
     public Float getSearchBoost() {return _innerIndividual.getSearchBoost(); }
-    
+
     @Override
     public void setSearchSnippet(String snippet) { _innerIndividual.setSearchSnippet( snippet ); }
     @Override
@@ -508,9 +508,9 @@ public class IndividualFiltering implements Individual {
         for (DataPropertyStatement stmt : stmts) {
             dataValues.add(stmt.getData());
         }
-        return dataValues;      
+        return dataValues;
     }
-    
+
     @Override
     public String getDataValue(String propertyUri) {
         List<DataPropertyStatement> stmts = getDataPropertyStatements(propertyUri);
@@ -520,7 +520,7 @@ public class IndividualFiltering implements Individual {
         // Since the statements have been filtered, we can just take the first data value without filtering.
         return stmts.isEmpty() ? null : stmts.get(0).getData();
     }
-    
+
     @Override
     public DataPropertyStatement getDataPropertyStatement(String propertyUri) {
         List<DataPropertyStatement> stmts = getDataPropertyStatements(propertyUri);
@@ -528,9 +528,9 @@ public class IndividualFiltering implements Individual {
             return null;
 
         // Since the statements have been filtered, we can just take the first data value without filtering.
-        return stmts.isEmpty() ? null : stmts.get(0);       
+        return stmts.isEmpty() ? null : stmts.get(0);
     }
-    
+
     @Override
     public List<Individual> getRelatedIndividuals(String propertyUri) {
         List<ObjectPropertyStatement> stmts = getObjectPropertyStatements(propertyUri);
@@ -542,12 +542,12 @@ public class IndividualFiltering implements Individual {
         for (ObjectPropertyStatement stmt : stmts) {
             relatedIndividuals.add(stmt.getObject());
         }
-        return relatedIndividuals; 
+        return relatedIndividuals;
     }
-    
+
     @Override
     public Individual getRelatedIndividual(String propertyUri) {
-        List<ObjectPropertyStatement> stmts = getObjectPropertyStatements(propertyUri); 
+        List<ObjectPropertyStatement> stmts = getObjectPropertyStatements(propertyUri);
         if( stmts == null )
             return null;
 
@@ -565,5 +565,5 @@ public class IndividualFiltering implements Individual {
 	public void resolveAsFauxPropertyStatements(List<ObjectPropertyStatement> list) {
 		_innerIndividual.resolveAsFauxPropertyStatements(list);
 	}
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyDaoFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyDaoFiltering.java
index 23723883a..c85ca36a5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyDaoFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyDaoFiltering.java
@@ -18,19 +18,19 @@ import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
 
 class ObjectPropertyDaoFiltering extends BaseFiltering implements ObjectPropertyDao{
-    final ObjectPropertyDao innerObjectPropertyDao;    
-    final VitroFilters filters;   
+    final ObjectPropertyDao innerObjectPropertyDao;
+    final VitroFilters filters;
 
     public ObjectPropertyDaoFiltering(ObjectPropertyDao objectPropertyDao,
             VitroFilters filters) {
         super();
         this.innerObjectPropertyDao = objectPropertyDao;
-        this.filters = filters;              
-    }  
-    
+        this.filters = filters;
+    }
+
     /* filtered methods */
     public List getAllObjectProperties() {
-        return filterAndWrap(innerObjectPropertyDao.getAllObjectProperties(), filters);        
+        return filterAndWrap(innerObjectPropertyDao.getAllObjectProperties(), filters);
     }
 
     public List getObjectPropertiesForObjectPropertyStatements(List<ObjectPropertyStatement> objectPropertyStatements) {
@@ -46,7 +46,7 @@ class ObjectPropertyDaoFiltering extends BaseFiltering implements ObjectProperty
         ObjectProperty newOprop=innerObjectPropertyDao.getObjectPropertyByURI(objectPropertyURI);
         return (newOprop == null) ? null : new ObjectPropertyFiltering(newOprop, filters);
     }
-    
+
     public ObjectProperty getObjectPropertyByURIs(String objectPropertyURI, String domainURI, String rangeURI) {
         ObjectProperty newOprop=innerObjectPropertyDao.getObjectPropertyByURIs(objectPropertyURI, domainURI, rangeURI);
         return (newOprop == null) ? null : new ObjectPropertyFiltering(newOprop, filters);
@@ -56,12 +56,12 @@ class ObjectPropertyDaoFiltering extends BaseFiltering implements ObjectProperty
         ObjectProperty newOprop=innerObjectPropertyDao.getObjectPropertyByURIs(objectPropertyURI, domainURI, rangeURI, base);
         return (newOprop == null) ? null : new ObjectPropertyFiltering(newOprop, filters);
     }
-    
+
     public List getRootObjectProperties() {
         return filterAndWrap(innerObjectPropertyDao.getRootObjectProperties(),filters);
     }
- 
-    
+
+
     /* other methods */
     public void deleteObjectProperty(String objectPropertyURI) {
         innerObjectPropertyDao.deleteObjectProperty(objectPropertyURI);
@@ -88,35 +88,35 @@ class ObjectPropertyDaoFiltering extends BaseFiltering implements ObjectProperty
     public void addSuperproperty(ObjectProperty property, ObjectProperty superproperty) {
     	innerObjectPropertyDao.addSuperproperty(property, superproperty);
     }
-    
+
     public void addSuperproperty(String propertyURI, String superpropertyURI) {
     	innerObjectPropertyDao.addSuperproperty(propertyURI, superpropertyURI);
     }
-    
+
     public void removeSuperproperty(ObjectProperty property, ObjectProperty superproperty) {
     	innerObjectPropertyDao.removeSuperproperty(property, superproperty);
     }
-    
+
     public void removeSuperproperty(String propertyURI, String superpropertyURI) {
     	innerObjectPropertyDao.removeSuperproperty(propertyURI, superpropertyURI);
     }
-    
+
     public void addSubproperty(ObjectProperty property, ObjectProperty subproperty) {
     	innerObjectPropertyDao.addSubproperty(property, subproperty);
     }
-    
+
     public void addSubproperty(String propertyURI, String subpropertyURI) {
     	innerObjectPropertyDao.addSubproperty(propertyURI, subpropertyURI);
     }
-    
+
     public void removeSubproperty(ObjectProperty property, ObjectProperty subproperty) {
     	innerObjectPropertyDao.removeSubproperty(property, subproperty);
     }
-    
+
     public void removeSubproperty(String propertyURI, String subpropertyURI) {
     	innerObjectPropertyDao.removeSubproperty(propertyURI, subpropertyURI);
     }
-    
+
     public List <String> getSubPropertyURIs(String propertyURI) {
     	return innerObjectPropertyDao.getSubPropertyURIs(propertyURI);
     }
@@ -131,26 +131,26 @@ class ObjectPropertyDaoFiltering extends BaseFiltering implements ObjectProperty
 
     public List <String> getAllSuperPropertyURIs(String propertyURI) {
     	return innerObjectPropertyDao.getAllSuperPropertyURIs(propertyURI);
-    }    
-                                             
+    }
+
     public static List<ObjectProperty> filterAndWrap(List<ObjectProperty> list, VitroFilters filters){
         if( list == null ) return null;
         if( list.size() ==0 ) return list;
-        
-        List<ObjectProperty> filtered = new LinkedList<ObjectProperty>();         
-        Filter.filter(list, 
-                new AndUnary<ObjectProperty>(notNull,filters.getObjectPropertyFilter()), 
+
+        List<ObjectProperty> filtered = new LinkedList<ObjectProperty>();
+        Filter.filter(list,
+                new AndUnary<ObjectProperty>(notNull,filters.getObjectPropertyFilter()),
                 filtered);
-                                
-        List<ObjectProperty> wrapped = new LinkedList<ObjectProperty>();        
+
+        List<ObjectProperty> wrapped = new LinkedList<ObjectProperty>();
         for( ObjectProperty prop : filtered){
             if( prop != null){
                 wrapped.add( new ObjectPropertyFiltering(prop, filters));
             }
-        }        
-        return wrapped;   
+        }
+        return wrapped;
     }
-    
+
     private static final UnaryFunctor<ObjectProperty,Boolean> notNull =
         new UnaryFunctor<ObjectProperty,Boolean>(){
             @Override
@@ -160,7 +160,7 @@ class ObjectPropertyDaoFiltering extends BaseFiltering implements ObjectProperty
     };
 
 	public void addSubproperty(Property property, Property subproperty) {
-		innerObjectPropertyDao.addSubproperty(property, subproperty);	
+		innerObjectPropertyDao.addSubproperty(property, subproperty);
 	}
 
 	public void addSuperproperty(Property property, Property superproperty) {
@@ -198,11 +198,11 @@ class ObjectPropertyDaoFiltering extends BaseFiltering implements ObjectProperty
 			Property equivalentProperty) {
 		innerObjectPropertyDao.removeEquivalentProperty(property, equivalentProperty);
 	}
-    
+
 	public boolean skipEditForm(String predicateURI) {
 		return innerObjectPropertyDao.skipEditForm(predicateURI);
 	}
-	
+
     public List <VClass> getClassesWithRestrictionOnProperty(String propertyURI) {
     	return innerObjectPropertyDao.getClassesWithRestrictionOnProperty(propertyURI);
     }
@@ -212,7 +212,7 @@ class ObjectPropertyDaoFiltering extends BaseFiltering implements ObjectProperty
     public List<ObjectProperty> getObjectPropertyList(Individual subject) {
         return innerObjectPropertyDao.getObjectPropertyList(subject);
     }
-    
+
     @Override
     // This may need to be filtered at some point.
     public List<ObjectProperty> getObjectPropertyList(String subjectUri) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyFiltering.java
index 3ea409aac..3f8f4c1cf 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyFiltering.java
@@ -16,34 +16,34 @@ public class ObjectPropertyFiltering extends ObjectProperty {
 
     private VitroFilters filters;
     private ObjectProperty innerObjectProperty;
-    
+
     public ObjectPropertyFiltering(ObjectProperty innerObjectProperty, VitroFilters filters){
         this.innerObjectProperty = innerObjectProperty;
         this.filters = filters;
     }
-    
+
     /**
      * Need to filter ObjectPropertyStatements and return ObjectPropertyStatements
-     * wrapped in ObjectPropertyStatementsFiltering. 
+     * wrapped in ObjectPropertyStatementsFiltering.
      */
     @Override
-    public List<ObjectPropertyStatement> getObjectPropertyStatements() {        
+    public List<ObjectPropertyStatement> getObjectPropertyStatements() {
         List<ObjectPropertyStatement> propStmts =  innerObjectProperty.getObjectPropertyStatements();
         if( propStmts == null ) return null;
-        
+
         List<ObjectPropertyStatement> fileredStmts = new LinkedList<ObjectPropertyStatement>();
         Filter.filter(propStmts, filters.getObjectPropertyStatementFilter(), fileredStmts);
-        
+
         List<ObjectPropertyStatement> filteredOnSubjStmts = new LinkedList<ObjectPropertyStatement>();
         for( ObjectPropertyStatement stmt : fileredStmts){
             //uncomment condition to get hard edge portals:
             //if( filters.getIndividualFilter().fn( stmt.getObject()) )
                 filteredOnSubjStmts.add( new ObjectPropertyStatementFiltering(stmt, filters) );
         }
-        
-        return filteredOnSubjStmts;        
+
+        return filteredOnSubjStmts;
     }
-               
+
     /* the rest of the methods are delegated with no filtering */
     @Override
     public int compareTo(ObjectProperty op) {
@@ -74,7 +74,7 @@ public class ObjectPropertyFiltering extends ObjectProperty {
     public Integer getDomainDisplayLimitInteger() {
         return innerObjectProperty.getDomainDisplayLimitInteger();
     }
-    
+
     @Override
     public int getDomainDisplayTier() {
         return innerObjectProperty.getDomainDisplayTier();
@@ -84,7 +84,7 @@ public class ObjectPropertyFiltering extends ObjectProperty {
     public Integer getDomainDisplayTierInteger() {
         return innerObjectProperty.getDomainDisplayTierInteger();
     }
-    
+
     @Override
     public String getDomainEntitySortDirection() {
         return innerObjectProperty.getDomainEntitySortDirection();
@@ -93,13 +93,13 @@ public class ObjectPropertyFiltering extends ObjectProperty {
     @Override
     public String getDomainEntityURI() {
         return innerObjectProperty.getDomainEntityURI();
-    }    
+    }
 
     @Override
     public String getDomainPublic() {
         return innerObjectProperty.getDomainPublic();
     }
-    
+
     @Override
     public VClass getDomainVClass() {
         return innerObjectProperty.getDomainVClass();
@@ -134,7 +134,7 @@ public class ObjectPropertyFiltering extends ObjectProperty {
     public RoleLevel getHiddenFromDisplayBelowRoleLevel() {
         return innerObjectProperty.getHiddenFromDisplayBelowRoleLevel();
     }
-    
+
     @Override
     public RoleLevel getProhibitedFromUpdateBelowRoleLevel() {
         return innerObjectProperty.getProhibitedFromUpdateBelowRoleLevel();
@@ -144,7 +144,7 @@ public class ObjectPropertyFiltering extends ObjectProperty {
     public RoleLevel getHiddenFromPublishBelowRoleLevel() {
         return innerObjectProperty.getHiddenFromPublishBelowRoleLevel();
     }
-    
+
     @Override
     public boolean getInverseFunctional() {
         return innerObjectProperty.getInverseFunctional();
@@ -164,7 +164,7 @@ public class ObjectPropertyFiltering extends ObjectProperty {
     public String getLocalNameWithPrefix() {
         return innerObjectProperty.getLocalNameWithPrefix();
     }
-    
+
     @Override
     public String getPickListName() {
         return innerObjectProperty.getPickListName();
@@ -211,7 +211,7 @@ public class ObjectPropertyFiltering extends ObjectProperty {
     public Integer getRangeDisplayLimitInteger() {
         return innerObjectProperty.getRangeDisplayLimitInteger();
     }
-    
+
     @Override
     public int getRangeDisplayTier() {
         return innerObjectProperty.getRangeDisplayTier();
@@ -221,7 +221,7 @@ public class ObjectPropertyFiltering extends ObjectProperty {
     public Integer getRangeDisplayTierInteger() {
         return innerObjectProperty.getRangeDisplayTierInteger();
     }
-    
+
     @Override
     public String getRangeEntitySortDirection() {
         return innerObjectProperty.getRangeEntitySortDirection();
@@ -357,7 +357,7 @@ public class ObjectPropertyFiltering extends ObjectProperty {
     public void setHiddenFromDisplayBelowRoleLevel(RoleLevel eR) {
         innerObjectProperty.setHiddenFromDisplayBelowRoleLevel(eR);
     }
-    
+
     @Override
     public void setHiddenFromDisplayBelowRoleLevelUsingRoleUri(String roleUri) {
         innerObjectProperty.setHiddenFromDisplayBelowRoleLevel(BaseResourceBean.RoleLevel.getRoleByUri(roleUri));
@@ -367,7 +367,7 @@ public class ObjectPropertyFiltering extends ObjectProperty {
     public void setProhibitedFromUpdateBelowRoleLevel(RoleLevel eR) {
         innerObjectProperty.setProhibitedFromUpdateBelowRoleLevel(eR);
     }
-    
+
     @Override
     public void setProhibitedFromUpdateBelowRoleLevelUsingRoleUri(String roleUri) {
         innerObjectProperty.setProhibitedFromUpdateBelowRoleLevel(BaseResourceBean.RoleLevel.getRoleByUri(roleUri));
@@ -377,7 +377,7 @@ public class ObjectPropertyFiltering extends ObjectProperty {
     public void setHiddenFromPublishBelowRoleLevel(RoleLevel eR) {
         innerObjectProperty.setHiddenFromPublishBelowRoleLevel(eR);
     }
-    
+
     @Override
     public void setHiddenFromPublishBelowRoleLevelUsingRoleUri(String roleUri) {
         innerObjectProperty.setHiddenFromPublishBelowRoleLevel(BaseResourceBean.RoleLevel.getRoleByUri(roleUri));
@@ -392,7 +392,7 @@ public class ObjectPropertyFiltering extends ObjectProperty {
     public void setLocalName(String localName) {
         innerObjectProperty.setLocalName(localName);
     }
-    
+
     @Override
     public void setLocalNameInverse(String localNameInverse) {
         innerObjectProperty.setLocalNameInverse(localNameInverse);
@@ -402,7 +402,7 @@ public class ObjectPropertyFiltering extends ObjectProperty {
     public void setLocalNameWithPrefix(String localNameWithPrefix) {
         innerObjectProperty.setLocalNameWithPrefix(localNameWithPrefix);
     }
-    
+
     @Override
     public void setPickListName(String pickListName) {
         innerObjectProperty.setPickListName(pickListName);
@@ -530,44 +530,44 @@ public class ObjectPropertyFiltering extends ObjectProperty {
     }
 
 	@Override
-	public boolean getCollateBySubclass() {		
+	public boolean getCollateBySubclass() {
 		return innerObjectProperty.getCollateBySubclass();
 	}
 
 	@Override
-	public void setCollateBySubclass(boolean collate) {		
+	public void setCollateBySubclass(boolean collate) {
 		innerObjectProperty.setCollateBySubclass(collate);
 	}
-	
+
 	@Override
 	public boolean isEditLinkSuppressed() {
 	    return innerObjectProperty.isEditLinkSuppressed();
 	}
-	
-	@Override 
+
+	@Override
 	public boolean isAddLinkSuppressed() {
 	    return innerObjectProperty.isAddLinkSuppressed();
 	}
-	
-	@Override 
+
+	@Override
 	public boolean isDeleteLinkSuppressed() {
 	    return innerObjectProperty.isDeleteLinkSuppressed();
 	}
-	
+
 	@Override
     public void setEditLinkSuppressed(boolean editLinkSuppressed) {
         innerObjectProperty.setEditLinkSuppressed(editLinkSuppressed);
     }
-    
-    @Override 
+
+    @Override
     public void setAddLinkSuppressed(boolean addLinkSuppressed) {
         innerObjectProperty.setAddLinkSuppressed(addLinkSuppressed);
     }
-    
-    @Override 
+
+    @Override
     public void setDeleteLinkSuppressed(boolean deleteLinkSuppressed) {
         innerObjectProperty.setDeleteLinkSuppressed(deleteLinkSuppressed);
     }
 
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementDaoFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementDaoFiltering.java
index 511e9c066..3aa4ea3ab 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementDaoFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementDaoFiltering.java
@@ -28,20 +28,20 @@ class ObjectPropertyStatementDaoFiltering extends BaseFiltering implements Objec
         this.filters = filters;
     }
 
-    
+
     @Override
     public void deleteObjectPropertyStatement(ObjectPropertyStatement objPropertyStmt) {
         innerObjectPropertyStatementDao.deleteObjectPropertyStatement(objPropertyStmt);
     }
 
 
-    private List<ObjectPropertyStatement> filterAndWrapList(List<ObjectPropertyStatement> list){        
+    private List<ObjectPropertyStatement> filterAndWrapList(List<ObjectPropertyStatement> list){
         if( ( list ) != null ){
             innerObjectPropertyStatementDao.resolveAsFauxPropertyStatements(list);
 
             ArrayList<ObjectPropertyStatement> ctemp = new ArrayList<ObjectPropertyStatement>();
             Filter.filter(list,filters.getObjectPropertyStatementFilter(),ctemp);
-                        
+
             List<ObjectPropertyStatement> cout= new ArrayList<ObjectPropertyStatement>(list.size());
             for( ObjectPropertyStatement stmt: ctemp){
                 cout.add( new ObjectPropertyStatementFiltering(stmt,filters) );
@@ -51,14 +51,14 @@ class ObjectPropertyStatementDaoFiltering extends BaseFiltering implements Objec
             return null;
         }
     }
-    
+
     @Override
     public Individual fillExistingObjectPropertyStatements(Individual entity) {
         Individual ind = innerObjectPropertyStatementDao.fillExistingObjectPropertyStatements(entity);
-        if( ind == null ) 
+        if( ind == null )
             return null;
-        else{    
-            ind.setObjectPropertyStatements( filterAndWrapList( ind.getObjectPropertyStatements()) );       
+        else{
+            ind.setObjectPropertyStatements( filterAndWrapList( ind.getObjectPropertyStatements()) );
             return ind;
         }
     }
@@ -67,12 +67,12 @@ class ObjectPropertyStatementDaoFiltering extends BaseFiltering implements Objec
     public List<ObjectPropertyStatement> getObjectPropertyStatements(ObjectProperty objectProperty) {
     	return filterAndWrapList( innerObjectPropertyStatementDao.getObjectPropertyStatements(objectProperty) );
     }
-    
+
     @Override
     public List<ObjectPropertyStatement> getObjectPropertyStatements(ObjectProperty objectProperty, int startIndex, int endIndex) {
-    	return filterAndWrapList( innerObjectPropertyStatementDao.getObjectPropertyStatements(objectProperty, startIndex, endIndex));    	
+    	return filterAndWrapList( innerObjectPropertyStatementDao.getObjectPropertyStatements(objectProperty, startIndex, endIndex));
     }
-    
+
     @Override
 	public List<ObjectPropertyStatement> getObjectPropertyStatements(
 			ObjectPropertyStatement objPropertyStmt) {
@@ -82,25 +82,25 @@ class ObjectPropertyStatementDaoFiltering extends BaseFiltering implements Objec
     @Override
 	public int insertNewObjectPropertyStatement(ObjectPropertyStatement objPropertyStmt) {
         return innerObjectPropertyStatementDao.insertNewObjectPropertyStatement(objPropertyStmt);
-    }    	
-	
+    }
+
     @Override
     public List<Map<String, String>> getObjectPropertyStatementsForIndividualByProperty(
-            String subjectUri, String propertyUri, String objectKey, String domainUri, 
+            String subjectUri, String propertyUri, String objectKey, String domainUri,
             String rangeUri, String query, Set<String> queryStrings, String sortDirection) {
-        
-        List<Map<String, String>> data = 
+
+        List<Map<String, String>> data =
         	innerObjectPropertyStatementDao.getObjectPropertyStatementsForIndividualByProperty(
-        			subjectUri, propertyUri, objectKey, domainUri, rangeUri, query, 
+        			subjectUri, propertyUri, objectKey, domainUri, rangeUri, query,
         			        queryStrings,sortDirection);
-        
+
         /* Filter the data
-         * 
+         *
          * Filtering is applied to a list of ObjectPropertyStatements. Create these statements, mapped
          * to the item in data that they are built from, apply filtering to the statements, then get
          * the associated data out of the original list. Use a LinkedHashMap to preserve the ordering.
          */
-        Map<ObjectPropertyStatement, Map<String, String>> stmtsToData = 
+        Map<ObjectPropertyStatement, Map<String, String>> stmtsToData =
             new LinkedHashMap<ObjectPropertyStatement, Map<String, String>>(data.size());
 
         for (Map<String, String> map : data) {
@@ -113,27 +113,27 @@ class ObjectPropertyStatementDaoFiltering extends BaseFiltering implements Objec
             statement.setProperty(op);
             stmtsToData.put(statement, map);
         }
-        
+
         List<ObjectPropertyStatement> stmtList = new ArrayList<ObjectPropertyStatement>(stmtsToData.keySet());
-        
+
         // Apply the filters to the list of statements
-        List<ObjectPropertyStatement> filteredStatements = filterAndWrapList(stmtList);     
-        
+        List<ObjectPropertyStatement> filteredStatements = filterAndWrapList(stmtList);
+
         // Get the data associated with the filtered statements out of the map
         List<Map<String, String>> filteredData = new ArrayList<Map<String, String>>(filteredStatements.size());
-        for (ObjectPropertyStatement ops : filteredStatements) {        
+        for (ObjectPropertyStatement ops : filteredStatements) {
             if (ops instanceof ObjectPropertyStatementFiltering) {
                 ops = ((ObjectPropertyStatementFiltering)ops).innerStmt;
-            } 
+            }
             filteredData.add(stmtsToData.get(ops));
-        }       
-        
+        }
+
         // Return the filtered list of data
         return filteredData;
 
-    }    
+    }
 
-    @Override 
+    @Override
     public Map<String, String> getMostSpecificTypesInClassgroupsForIndividual(String subjectUri) {
         return innerObjectPropertyStatementDao.getMostSpecificTypesInClassgroupsForIndividual(subjectUri);
     }
@@ -144,4 +144,4 @@ class ObjectPropertyStatementDaoFiltering extends BaseFiltering implements Objec
 		innerObjectPropertyStatementDao.resolveAsFauxPropertyStatements(list);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementFiltering.java
index c1ddeb680..9e8f18505 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementFiltering.java
@@ -11,12 +11,12 @@ import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
 public class ObjectPropertyStatementFiltering implements ObjectPropertyStatement {
     final ObjectPropertyStatement innerStmt;
     final VitroFilters filters;
-    
+
     public ObjectPropertyStatementFiltering( ObjectPropertyStatement stmt, VitroFilters filters){
         this.innerStmt = stmt;
         this.filters = filters;
     }
-    
+
      /* methods that return wrapped objects */
 
     public Individual getObject() {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/PropertyGroupDaoFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/PropertyGroupDaoFiltering.java
index c01b1847a..00bf02494 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/PropertyGroupDaoFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/PropertyGroupDaoFiltering.java
@@ -22,29 +22,29 @@ public class PropertyGroupDaoFiltering implements PropertyGroupDao {
 
 	public PropertyGroupDaoFiltering(PropertyGroupDao propertyGroupDao,
             WebappDaoFactoryFiltering webappDaoFactoryFiltering,
-            VitroFilters filters) {	    
+            VitroFilters filters) {
 	    this.innerDao = propertyGroupDao;
         this.filteredDaos = webappDaoFactoryFiltering;
-        this.filters = filters;	    
+        this.filters = filters;
     }
 
     public void deletePropertyGroup(PropertyGroup group) {
 		innerDao.deletePropertyGroup(group);
 	}
 
-	
+
     public PropertyGroup getGroupByURI(String uri) {
         PropertyGroup grp  = innerDao.getGroupByURI(uri);
          wrapPropertyGroup( grp );
          return grp;
     }
-   
+
 	private void  wrapPropertyGroup( PropertyGroup grp ){
-	    if( grp == null ) return ;        
+	    if( grp == null ) return ;
         List<Property> props =  grp.getPropertyList();
-        if( props == null ||  props.size() == 0 ) 
+        if( props == null ||  props.size() == 0 )
             return ;
-        
+
         List<Property> filteredProps = new LinkedList<Property>();
         for( Property prop : props ){
     	    if( prop != null ){
@@ -52,7 +52,7 @@ public class PropertyGroupDaoFiltering implements PropertyGroupDao {
                 	if( filters.getObjectPropertyFilter().fn( (ObjectProperty)prop ) ){
         	           	filteredProps.add( new ObjectPropertyFiltering((ObjectProperty)prop,filters));
             	    }
-	            }else if( prop instanceof ObjectPropertyFiltering ){                
+	            }else if( prop instanceof ObjectPropertyFiltering ){
                 	//log.debug("property instanceof ObjectPropertyFiltering == true but property instanceof ObjectProperty == false");
 	                if( filters.getObjectPropertyFilter().fn( (ObjectProperty)prop ) ){
     	                filteredProps.add( new ObjectPropertyFiltering((ObjectProperty)prop,filters));
@@ -64,10 +64,10 @@ public class PropertyGroupDaoFiltering implements PropertyGroupDao {
     	        }
             }
         }
-        
-        grp.setPropertyList(filteredProps); //side effect 
+
+        grp.setPropertyList(filteredProps); //side effect
     }
-	
+
 	public List<PropertyGroup> getPublicGroups(boolean withProperties) {
 		List<PropertyGroup> groups =  innerDao.getPublicGroups(withProperties);
 		for( PropertyGroup grp : groups ){
@@ -75,16 +75,16 @@ public class PropertyGroupDaoFiltering implements PropertyGroupDao {
 		}
 		return groups;
 	}
-	
+
 	public PropertyGroup createDummyPropertyGroup(String name, int rank) {
 	    return innerDao.createDummyPropertyGroup(name, rank);
 	}
-	
+
 	public String insertNewPropertyGroup(PropertyGroup group) {
 		return innerDao.insertNewPropertyGroup(group);
 	}
 
-	
+
 	public int removeUnpopulatedGroups(List<PropertyGroup> groups) {
 		return innerDao.removeUnpopulatedGroups(groups);
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/UserAccountsDaoFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/UserAccountsDaoFiltering.java
index 6a225c2d5..498ee088d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/UserAccountsDaoFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/UserAccountsDaoFiltering.java
@@ -84,4 +84,4 @@ public class UserAccountsDaoFiltering extends BaseFiltering implements
 		return innerDao.getAllPermissionSets();
 	}
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassDaoFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassDaoFiltering.java
index ca84be242..f3f360519 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassDaoFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassDaoFiltering.java
@@ -22,7 +22,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
 
 public class VClassDaoFiltering extends BaseFiltering implements VClassDao{
     final VClassDao innerVClassDao;
-    final IndividualDao innerIndividualDao;    
+    final IndividualDao innerIndividualDao;
     final VitroFilters filters;
 
     static UnaryFunctor<VClass,String> getURI =
@@ -34,7 +34,7 @@ public class VClassDaoFiltering extends BaseFiltering implements VClassDao{
         super();
         this.innerVClassDao = classDao;
         this.innerIndividualDao = individualDao;
-        this.filters = filters;        
+        this.filters = filters;
     }
 
     public void deleteVClass(String URI) {
@@ -48,59 +48,59 @@ public class VClassDaoFiltering extends BaseFiltering implements VClassDao{
     public List<String> getDisjointWithClassURIs(String classURI) {
     	return innerVClassDao.getDisjointWithClassURIs(classURI);
     }
-    
+
     public void addDisjointWithClass(String classURI, String disjointClassURI) {
     	innerVClassDao.addDisjointWithClass(classURI, disjointClassURI);
     }
-    
+
     public void removeDisjointWithClass(String classURI, String disjointClassURI) {
     	innerVClassDao.removeDisjointWithClass(classURI, disjointClassURI);
     }
-    
+
     public List<String> getEquivalentClassURIs(String classURI) {
     	return innerVClassDao.getEquivalentClassURIs(classURI);
     }
-    
+
     public void addEquivalentClass(String classURI, String equivalentClassURI) {
     	innerVClassDao.addEquivalentClass(classURI, equivalentClassURI);
     }
-    
+
     public void removeEquivalentClass(String classURI, String equivalentClassURI) {
     	innerVClassDao.removeEquivalentClass(classURI, equivalentClassURI);
     }
-    
+
     public void addSuperclass(VClass subclass, VClass superclass) {
     	innerVClassDao.addSuperclass(subclass, superclass);
     }
-    
+
     public void addSuperclass(String classURI, String superclassURI) {
     	innerVClassDao.addSuperclass(classURI, superclassURI);
     }
-    
+
     public void removeSuperclass(VClass vclass, VClass superclass) {
     	innerVClassDao.removeSuperclass(vclass, superclass);
     }
-    
+
     public void removeSuperclass(String classURI, String superclassURI) {
     	innerVClassDao.removeSuperclass(classURI, superclassURI);
     }
-    
+
     public void addSubclass(VClass vclass, VClass subclass) {
     	innerVClassDao.addSubclass(vclass, subclass);
     }
-    
+
     public void addSubclass(String classURI, String subclassURI) {
     	innerVClassDao.addSubclass(classURI, subclassURI);
     }
-    
+
     public void removeSubclass(VClass vclass, VClass subclass) {
     	innerVClassDao.removeSubclass(vclass, subclass);
     }
-    
+
     public void removeSubclass(String classURI, String subclassURI) {
     	innerVClassDao.removeSubclass(classURI, subclassURI);
     }
-    
+
     public List <String>getAllSubClassURIs(String classURI) {
         return innerVClassDao.getAllSubClassURIs(classURI);
     }
@@ -146,7 +146,7 @@ public class VClassDaoFiltering extends BaseFiltering implements VClassDao{
         return innerVClassDao.getVClassesForProperty(propertyURI, domainSide);
         //return correctVClassCounts(filter(list,filters.getClassFilter()));
     }
-    
+
     public List<VClass> getVClassesForProperty(String vclassURI, String propertyURI) {
     	return innerVClassDao.getVClassesForProperty(vclassURI, propertyURI);
     	//return correctVClassCounts(filter(list,filters.getClassFilter()));
@@ -174,13 +174,13 @@ public class VClassDaoFiltering extends BaseFiltering implements VClassDao{
     public void addVClassesToGroup(VClassGroup group,
             boolean includeUninstantiatedClasses, boolean setIndividualCount) {
         innerVClassDao.addVClassesToGroup(group, includeUninstantiatedClasses, false);
-        
+
         List<VClass> classes = group.getVitroClassList();
-        List<VClass> out = new LinkedList<VClass>();        
+        List<VClass> out = new LinkedList<VClass>();
         Filter.filter(classes,filters.getClassFilter(), out);
         group.clear();
         group.addAll(out);
-        
+
         if (setIndividualCount) {
             for(VClass vc : group){
                 if( vc instanceof VClass ){
@@ -229,23 +229,23 @@ public class VClassDaoFiltering extends BaseFiltering implements VClassDao{
         }
         return vclasses;
     }
-    
+
     public VClass getTopConcept() {
     	return innerVClassDao.getTopConcept();
     }
-    
+
     public VClass getBottomConcept() {
     	return innerVClassDao.getBottomConcept();
     }
-    
+
     public void insertNewClasses2Classes(Classes2Classes c2c) {
         innerVClassDao.insertNewClasses2Classes(c2c);
     }
-    
+
     public void deleteClasses2Classes(Classes2Classes c2c) {
         innerVClassDao.deleteClasses2Classes(c2c);
     }
-    
+
     public boolean isSubClassOf(VClass vc1, VClass vc2) {
 		return innerVClassDao.isSubClassOf(vc1, vc2);
 	}
@@ -253,5 +253,5 @@ public class VClassDaoFiltering extends BaseFiltering implements VClassDao{
 	public boolean isSubClassOf(String vclassURI1, String vclassURI2) {
 		return innerVClassDao.isSubClassOf(vclassURI1, vclassURI2);
 	}
-    
-}
\ No newline at end of file
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassGroupDaoFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassGroupDaoFiltering.java
index b263e8930..a3b58df91 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassGroupDaoFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassGroupDaoFiltering.java
@@ -22,7 +22,7 @@ public class VClassGroupDaoFiltering extends BaseFiltering implements VClassGrou
     public VClassGroupDaoFiltering(VClassGroupDao classGroupDao,
             WebappDaoFactoryFiltering webappDaoFactoryFiltering,
             VitroFilters filters) {
-        
+
         this.innerDao = classGroupDao;
         this.filteredDaos = webappDaoFactoryFiltering;
         this.filters =  filters;
@@ -112,4 +112,4 @@ public class VClassGroupDaoFiltering extends BaseFiltering implements VClassGrou
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/WebappDaoFactoryFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/WebappDaoFactoryFiltering.java
index 48333c3aa..84e2823d7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/WebappDaoFactoryFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/WebappDaoFactoryFiltering.java
@@ -67,7 +67,7 @@ public class WebappDaoFactoryFiltering implements WebappDaoFactory {
     transient private PropertyGroupDao filteringPropertyGroupDao=null;
     transient private PropertyInstanceDao filteringPropertyInstanceDao=null;
 
-    public WebappDaoFactoryFiltering( WebappDaoFactory innerDao, VitroFilters filters){                
+    public WebappDaoFactoryFiltering( WebappDaoFactory innerDao, VitroFilters filters){
         if( innerDao == null )
             throw new Error("innerWebappDaoFactory must be non-null");
         this.filters = filters;
@@ -80,14 +80,14 @@ public class WebappDaoFactoryFiltering implements WebappDaoFactory {
 				+ ", filters=" + filters + "]";
 	}
 
-    
+
     /* ******************* filtering *********************** */
 
 
 	public String checkURI(String uriStr) {
     	return innerWebappDaoFactory.checkURI(uriStr);
     }
-    
+
     @Override
 	public String checkURIForEditableEntity(String uriStr) {
     	return innerWebappDaoFactory.checkURIForEditableEntity(uriStr);
@@ -96,28 +96,28 @@ public class WebappDaoFactoryFiltering implements WebappDaoFactory {
 	public boolean hasExistingURI(String uriStr) {
     	return innerWebappDaoFactory.hasExistingURI(uriStr);
     }
-    
+
     public WebappDaoFactory getUserAwareDaoFactory(String userURI) {
         //TODO: need to clone the filtering factory
         return innerWebappDaoFactory.getUserAwareDaoFactory(userURI);
     }
-    
+
     public String getDefaultNamespace() {
         return innerWebappDaoFactory.getDefaultNamespace();
     }
-    
+
     public Set<String> getNonuserNamespaces() {
     	return innerWebappDaoFactory.getNonuserNamespaces();
     }
-    
+
     public List<String> getPreferredLanguages() {
     	return innerWebappDaoFactory.getPreferredLanguages();
     }
-    
+
     public List<String> getCommentsForResource(String resourceURI) {
     	return innerWebappDaoFactory.getCommentsForResource(resourceURI);
     }
-    
+
     public IndividualDao getIndividualDao(){
         if( filteringIndividualDao == null)
             filteringIndividualDao =
@@ -128,19 +128,19 @@ public class WebappDaoFactoryFiltering implements WebappDaoFactory {
     public UserAccountsDao getUserAccountsDao() {
     	if( filteringUserAccountsDao == null)
     		filteringUserAccountsDao =
-    			new UserAccountsDaoFiltering(innerWebappDaoFactory.getUserAccountsDao(),filters);                                     
+    			new UserAccountsDaoFiltering(innerWebappDaoFactory.getUserAccountsDao(),filters);
     	return filteringUserAccountsDao;
     }
-    
+
     public VClassGroupDao getVClassGroupDao() {
         if( filteringVClassGroupDao == null)
             filteringVClassGroupDao =
                 new VClassGroupDaoFiltering(innerWebappDaoFactory.getVClassGroupDao(),
                                             this,filters);
-                                            
+
         return filteringVClassGroupDao;
     }
-    
+
     public PropertyGroupDao getPropertyGroupDao() {
         if( filteringPropertyGroupDao == null)
             filteringPropertyGroupDao =
@@ -148,7 +148,7 @@ public class WebappDaoFactoryFiltering implements WebappDaoFactory {
                                             this, filters);
         return filteringPropertyGroupDao;
     }
-    
+
 
 //    public VClassWebappDao getVClassWebappDao() {
 //        if( filteringVClassWebappDao == null)
@@ -184,21 +184,21 @@ public class WebappDaoFactoryFiltering implements WebappDaoFactory {
     public OntologyDao getOntologyDao() {
         return innerWebappDaoFactory.getOntologyDao();
     }
-  
+
     /* ******************* filtering DAOs *************************** */
 
     public PropertyInstanceDao getPropertyInstanceDao() {
         if( filteringPropertyInstanceDao == null ){
-            filteringPropertyInstanceDao = 
+            filteringPropertyInstanceDao =
                 new FilteringPropertyInstanceDao(
-                        innerWebappDaoFactory.getPropertyInstanceDao(),                        
+                        innerWebappDaoFactory.getPropertyInstanceDao(),
                         innerWebappDaoFactory.getObjectPropertyDao(),
                         innerWebappDaoFactory.getIndividualDao(),
                         filters);
-        }           
+        }
         return filteringPropertyInstanceDao;
     }
-    
+
     public DataPropertyDao getDataPropertyDao() {
         if (filteringDataPropertyDao == null ){
             filteringDataPropertyDao =
@@ -211,7 +211,7 @@ public class WebappDaoFactoryFiltering implements WebappDaoFactory {
 
     public DataPropertyStatementDao getDataPropertyStatementDao() {
         if (filteringDataPropertyStatementDao == null ){
-            filteringDataPropertyStatementDao = 
+            filteringDataPropertyStatementDao =
                 new DataPropertyStatementDaoFiltering(innerWebappDaoFactory.getDataPropertyStatementDao(),
                         filters);
         }
@@ -221,7 +221,7 @@ public class WebappDaoFactoryFiltering implements WebappDaoFactory {
 
     public ObjectPropertyStatementDao getObjectPropertyStatementDao() {
         if (filteringObjectPropertyStatementDao == null ){
-            filteringObjectPropertyStatementDao = 
+            filteringObjectPropertyStatementDao =
                 new ObjectPropertyStatementDaoFiltering(innerWebappDaoFactory.getObjectPropertyStatementDao(),
                         filters);
         }
@@ -244,7 +244,7 @@ public class WebappDaoFactoryFiltering implements WebappDaoFactory {
     	}
     	return filteringFauxPropertyDao;
     }
-    
+
 
     public VClassDao getVClassDao() {
         if (filteringVClassDao == null ){
@@ -265,14 +265,14 @@ public class WebappDaoFactoryFiltering implements WebappDaoFactory {
     @Override
     public MenuDao getMenuDao(){
         return innerWebappDaoFactory.getMenuDao();
-    }    
-    
+    }
+
     @Override
     public DisplayModelDao getDisplayModelDao(){
         return innerWebappDaoFactory.getDisplayModelDao();
     }
-    
-    @Override 
+
+    @Override
     public void close() {
         innerWebappDaoFactory.close();
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/EntityPropertyListFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/EntityPropertyListFilter.java
index 5c2193cc4..ee6b43de8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/EntityPropertyListFilter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/EntityPropertyListFilter.java
@@ -30,7 +30,7 @@ public class EntityPropertyListFilter extends UnaryFunctor<List<Property>, List<
 
 	private static final org.apache.jena.rdf.model.Property MASKS_PROPERTY = ResourceFactory.createProperty(VitroVocabulary.MASKS_PROPERTY);
 	private Map<String,Collection<String>> propertyMaskMap;
-	
+
 	public EntityPropertyListFilter(OntModel ontModel) {
 		propertyMaskMap = new HashMap<String,Collection<String>>();
 		ontModel.enterCriticalSection(Lock.READ);
@@ -55,7 +55,7 @@ public class EntityPropertyListFilter extends UnaryFunctor<List<Property>, List<
 			ontModel.leaveCriticalSection();
 		}
 	}
-		
+
 	@Override
 	public List<Property> fn(List<Property> propertyList) {
 		List<Property> filteredList = new ArrayList<Property>();
@@ -83,14 +83,14 @@ public class EntityPropertyListFilter extends UnaryFunctor<List<Property>, List<
 						List<ObjectPropertyStatement> stmtList = ((ObjectProperty) p).getObjectPropertyStatements();
 						propHasStatements = (stmtList != null) && (stmtList.size() > 0);
 					} else if (p instanceof DataProperty) {
-						List<DataPropertyStatement> stmtList = ((DataProperty) p).getDataPropertyStatements(); 
+						List<DataPropertyStatement> stmtList = ((DataProperty) p).getDataPropertyStatements();
 						propHasStatements = (stmtList != null) && (stmtList.size() > 0);
 					}
 					if (maskingProp instanceof ObjectProperty) {
 						List<ObjectPropertyStatement> stmtList = ((ObjectProperty) maskingProp).getObjectPropertyStatements();
 						maskerHasStatements = (stmtList != null) && (stmtList.size() > 0);
 					} else if (maskingProp instanceof DataProperty) {
-						List<DataPropertyStatement> stmtList = ((DataProperty) maskingProp).getDataPropertyStatements(); 
+						List<DataPropertyStatement> stmtList = ((DataProperty) maskingProp).getDataPropertyStatements();
 						maskerHasStatements = (stmtList != null) && (stmtList.size() > 0);
 					}
 				}
@@ -101,5 +101,5 @@ public class EntityPropertyListFilter extends UnaryFunctor<List<Property>, List<
 		}
 		return filteredList;
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/HideFromDisplayByPolicyFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/HideFromDisplayByPolicyFilter.java
index 35531798b..ce12702fd 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/HideFromDisplayByPolicyFilter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/HideFromDisplayByPolicyFilter.java
@@ -28,7 +28,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
 public class HideFromDisplayByPolicyFilter extends VitroFiltersImpl {
 	private static final Log log = LogFactory
 			.getLog(HideFromDisplayByPolicyFilter.class);
-	
+
 	private final IdentifierBundle idBundle;
 	private final PolicyIface policy;
 
@@ -53,7 +53,7 @@ public class HideFromDisplayByPolicyFilter extends VitroFiltersImpl {
 	boolean checkAuthorization(RequestedAction whatToAuth) {
 		PolicyDecision decision = policy.isAuthorized(idBundle, whatToAuth);
 		log.debug("decision is " + decision);
-		
+
 		if (decision != null) {
 			if (decision.getAuthorized() == Authorization.AUTHORIZED) {
 				return true;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFilterUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFilterUtils.java
index af7a5590f..cd5b0d109 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFilterUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFilterUtils.java
@@ -38,7 +38,7 @@ public class VitroFilterUtils {
         UnaryFunctor<Individual,Boolean> onlyNamesThatStartWithG =
                 new ChainUnary<Individual,String,Boolean>(startsWithG,getName);
         return getNoOpFilter().setIndividualFilter(onlyNamesThatStartWithG);
-    }  
+    }
 
     public static UnaryFunctor<Individual,String> FirstLetterOfIndividuals(){
         return new UnaryFunctor<Individual,String>(){
@@ -109,6 +109,6 @@ public class VitroFilterUtils {
 					public String toString(){ return "nameCompDesc"; }
                 };
 
-    }   
+    }
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFilters.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFilters.java
index 035c11b16..08f7dff48 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFilters.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFilters.java
@@ -29,7 +29,7 @@ public interface VitroFilters {
     public UnaryFunctor<VClass, Boolean> getClassFilter();
 
     public UnaryFunctor<VClassGroup, Boolean> getVClassGroupFilter();
-    
+
     public UnaryFunctor<PropertyGroup, Boolean> getPropertyGroupFilter();
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ApplicationDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ApplicationDaoJena.java
index 8708dd3d6..884c5f964 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ApplicationDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ApplicationDaoJena.java
@@ -20,22 +20,22 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 
 public class ApplicationDaoJena extends JenaBaseDao implements ApplicationDao {
 
-    private static final Property LINKED_NAMESPACE_PROP = 
+    private static final Property LINKED_NAMESPACE_PROP =
             ResourceFactory.createProperty(
                     VitroVocabulary.DISPLAY + "linkedNamespace");
-    
+
 	Integer portalCount = null;
 	List<String> externallyLinkedNamespaces = null;
-	
+
     public ApplicationDaoJena(WebappDaoFactoryJena wadf) {
         super(wadf);
     }
-    
+
     private String getApplicationResourceURI() {
     	// TODO migrate to "application" in the resource URI
     	return super.DEFAULT_NAMESPACE + "portal" + 1;
     }
-    
+
     public ApplicationBean getApplicationBean() {
     	ApplicationBean application = new ApplicationBean();
     	OntModel ontModel = getOntModelSelector().getApplicationMetadataModel();
@@ -61,7 +61,7 @@ public class ApplicationDaoJena extends JenaBaseDao implements ApplicationDao {
 	        application.setCopyrightAnchor(getPropertyStringValue(
 	        		appInd, APPLICATION_COPYRIGHTANCHOR));
             application.setCopyrightURL(getPropertyStringValue(
-            		appInd, APPLICATION_COPYRIGHTURL)); 
+            		appInd, APPLICATION_COPYRIGHTURL));
             application.setThemeDir(getPropertyStringValue(
             		appInd, APPLICATION_THEMEDIR));
         } catch (Exception e) {
@@ -71,7 +71,7 @@ public class ApplicationDaoJena extends JenaBaseDao implements ApplicationDao {
     	}
         return application;
     }
-    
+
     public void updateApplicationBean(ApplicationBean application) {
     	// TODO migrate to "application" in the resource URI
     	OntModel ontModel = getOntModelSelector().getApplicationMetadataModel();
@@ -85,25 +85,25 @@ public class ApplicationDaoJena extends JenaBaseDao implements ApplicationDao {
     	try {
     		appInd.setLabel(application.getApplicationName(), null);
 	        updatePropertyStringValue(
-	        		appInd, APPLICATION_ABOUTTEXT, application.getAboutText(), 
+	        		appInd, APPLICATION_ABOUTTEXT, application.getAboutText(),
 	        		    ontModel);
 	        updatePropertyStringValue(
-	        		appInd, APPLICATION_ACKNOWLEGETEXT, 
+	        		appInd, APPLICATION_ACKNOWLEGETEXT,
 	        		    application.getAcknowledgeText(), ontModel);
 	        updatePropertyStringValue(
-	        		appInd, APPLICATION_CONTACTMAIL, 
-	        		    application.getContactMail(), ontModel); 
+	        		appInd, APPLICATION_CONTACTMAIL,
+	        		    application.getContactMail(), ontModel);
 	        updatePropertyStringValue(
-	        		appInd, APPLICATION_CORRECTIONMAIL, 
+	        		appInd, APPLICATION_CORRECTIONMAIL,
 	        		    application.getCorrectionMail(), ontModel);
 	        updatePropertyStringValue(
-	        		appInd, APPLICATION_COPYRIGHTANCHOR, 
+	        		appInd, APPLICATION_COPYRIGHTANCHOR,
 	        		    application.getCopyrightAnchor(), ontModel);
             updatePropertyStringValue(
-            		appInd, APPLICATION_COPYRIGHTURL, 
-            		    application.getCopyrightURL(), ontModel); 
+            		appInd, APPLICATION_COPYRIGHTURL,
+            		    application.getCopyrightURL(), ontModel);
             updatePropertyStringValue(
-            		appInd, APPLICATION_THEMEDIR, 
+            		appInd, APPLICATION_THEMEDIR,
             		    application.getThemeDir(), ontModel);
         } catch (Exception e) {
     		log.error(e, e);
@@ -111,20 +111,20 @@ public class ApplicationDaoJena extends JenaBaseDao implements ApplicationDao {
     		ontModel.leaveCriticalSection();
     	}
     }
-    
+
     public void close() {
             // nothing to do right now
     }
 
 	private static final boolean CLEAR_CACHE = true;
-	
+
 	@Override
 	public synchronized List<String> getExternallyLinkedNamespaces() {
 	    return getExternallyLinkedNamespaces(!CLEAR_CACHE);
 	}
 
     private synchronized List<String> getExternallyLinkedNamespaces(boolean clearCache) {
-        if (clearCache || externallyLinkedNamespaces == null) {            
+        if (clearCache || externallyLinkedNamespaces == null) {
             externallyLinkedNamespaces = new ArrayList<String>();
             OntModel ontModel = getOntModelSelector().getDisplayModel();
             NodeIterator nodes = ontModel.listObjectsOfProperty(LINKED_NAMESPACE_PROP);
@@ -132,7 +132,7 @@ public class ApplicationDaoJena extends JenaBaseDao implements ApplicationDao {
                 RDFNode node = nodes.next();
                 if (node.isLiteral()) {
                     String namespace = ((Literal)node).getLexicalForm();
-                    // org.openrdf.model.impl.URIImpl.URIImpl.getNamespace() returns a 
+                    // org.openrdf.model.impl.URIImpl.URIImpl.getNamespace() returns a
                     // namespace with a final slash, so this makes matching easier.
                     // It also accords with the way the default namespace is defined.
                     if (!namespace.endsWith("/")) {
@@ -144,10 +144,10 @@ public class ApplicationDaoJena extends JenaBaseDao implements ApplicationDao {
         }
         return externallyLinkedNamespaces;
     }
-    
+
     public boolean isExternallyLinkedNamespace(String namespace) {
         List<String> namespaces = getExternallyLinkedNamespaces();
         return namespaces.contains(namespace);
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeFilteringGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeFilteringGraph.java
index d054d05b4..f5a68d348 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeFilteringGraph.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeFilteringGraph.java
@@ -21,9 +21,9 @@ import org.apache.jena.util.iterator.WrappedIterator;
 import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
 
 public class BlankNodeFilteringGraph implements Graph {
-	
+
     private Graph graph;
-    
+
 	public BlankNodeFilteringGraph(Graph graph) {
         this.graph = graph;
     }
@@ -65,18 +65,18 @@ public class BlankNodeFilteringGraph implements Graph {
 
 	@Override
 	public ExtendedIterator<Triple> find(Node subject, Node predicate, Node object) {
-		
+
         List<Triple> nbTripList = new ArrayList<Triple>();
 		ExtendedIterator<Triple> triples = graph.find(subject, predicate, object);
-		
+
 		while (triples.hasNext()) {
 			Triple triple = triples.next();
-			
+
 			if (!triple.getSubject().isBlank() && !triple.getObject().isBlank()) {
 				nbTripList.add(triple);
 			}
 		}
-		
+
         return WrappedIterator.create(nbTripList.iterator());
 	}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeFilteringModelMaker.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeFilteringModelMaker.java
index c57c925cc..0b01e7807 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeFilteringModelMaker.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeFilteringModelMaker.java
@@ -19,20 +19,20 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.adapters.VitroModelFactory;
 
 /**
  * Still not sure why this is needed, but...
- * 
+ *
  * Let's assume that there are some model operations that are implemented by
  * multiple SPARQL queries against the RDFService. Those multiple queries might
  * return different values for the same blank node, so when the results of the
  * queries were combined, the relationships would be lost.
- * 
+ *
  * To avoid this, we assume that all of the statements involving blank nodes
  * will fit nicely into memory, and we fetch them all at once. After that, all
  * of our operations are against the union of the actual model minus blank nodes
  * and the memory model.
- * 
+ *
  * The models do retain the same ID for each blank node on successive
  * operations, so we can execute repeated queries and it will work fine.
- * 
+ *
  * Writing blank nodes is probably a different matter, unless unrelated to
  * existing blank nodes.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeStatementListener.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeStatementListener.java
index bc21829ff..a602233de 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeStatementListener.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/BlankNodeStatementListener.java
@@ -12,25 +12,25 @@ import org.apache.jena.rdf.model.Statement;
 public class BlankNodeStatementListener extends StatementListener {
 
 	private static final Log log = LogFactory.getLog(BlankNodeStatementListener.class);
-	private Model bnodeModel;          
-	
-	public BlankNodeStatementListener(Model bnodeModel) { 
+	private Model bnodeModel;
+
+	public BlankNodeStatementListener(Model bnodeModel) {
 		this.bnodeModel = bnodeModel;
 	}
-		
+
 	@Override
 	public void addedStatement(Statement stmt) {
-        
+
 		if (stmt.getSubject().isAnon() || stmt.getObject().isAnon()) {
 			bnodeModel.add(stmt);
-        } 
+        }
 	}
-	
+
 	@Override
 	public void removedStatement(Statement stmt) {
 
 		if (stmt.getSubject().isAnon() || stmt.getObject().isAnon()) {
 			bnodeModel.remove(stmt);
-        } 
+        }
 	}
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/CumulativeDeltaModeler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/CumulativeDeltaModeler.java
index 8e1840772..48635cbec 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/CumulativeDeltaModeler.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/CumulativeDeltaModeler.java
@@ -10,7 +10,7 @@ import org.apache.jena.rdf.model.Statement;
 
 /**
  * This ModelChangedListener will accumulate all statements added to
- * or removed from the audited model in an additions model and a 
+ * or removed from the audited model in an additions model and a
  * retractions model.  Note that this class attempts to be clever.
  * If a statement is retracted that is already in the additions model,
  * the statement will be removed from the additions model and not added
@@ -23,22 +23,22 @@ public class CumulativeDeltaModeler extends StatementListener {
 
 	private Model additionsModel;
 	private Model retractionsModel;
-	
+
 	public CumulativeDeltaModeler() {
 		this.additionsModel = ModelFactory.createDefaultModel();
 		this.retractionsModel = ModelFactory.createDefaultModel();
 	}
-	
+
 	public CumulativeDeltaModeler(Model model) {
 		this();
 		model.register(this);
 	}
-	
+
 	public CumulativeDeltaModeler(OntModel ontModel) {
 		this();
 		ontModel.getBaseModel().register(this);
 	}
-	
+
 	/**
 	 * Return a model containing all statements added to the attached model
 	 * @return additionsModel
@@ -46,7 +46,7 @@ public class CumulativeDeltaModeler extends StatementListener {
 	public Model getAdditions() {
 		return additionsModel;
 	}
-	
+
 	/**
 	 * Return a model containing all statements retracted from the attached model
 	 * @return retractionsModel
@@ -54,7 +54,7 @@ public class CumulativeDeltaModeler extends StatementListener {
 	public Model getRetractions() {
 		return retractionsModel;
 	}
-	
+
 	@Override
 	public void addedStatement(Statement s) {
 		if (retractionsModel.contains(s)) {
@@ -63,7 +63,7 @@ public class CumulativeDeltaModeler extends StatementListener {
 			additionsModel.add(s);
 		}
 	}
-	
+
 	@Override
 	public void removedStatement(Statement s) {
 		if (additionsModel.contains(s)) {
@@ -72,5 +72,5 @@ public class CumulativeDeltaModeler extends StatementListener {
 			retractionsModel.add(s);
 		}
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java
index 183862db9..e7ca153dc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java
@@ -58,9 +58,9 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 
 public class DataPropertyDaoJena extends PropertyDaoJena implements
         DataPropertyDao {
-    
+
     protected static final Log log = LogFactory.getLog(DataPropertyDaoJena.class.getName());
-    
+
     private class DataPropertyRanker implements Comparator<DataProperty> {
         @Override
 		public int compare (DataProperty dp1, DataProperty dp2) {
@@ -73,7 +73,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
     }
 
     public DataPropertyDaoJena(RDFService rdfService,
-                               DatasetWrapperFactory dwf, 
+                               DatasetWrapperFactory dwf,
                                WebappDaoFactoryJena wadf) {
         super(rdfService, dwf, wadf);
     }
@@ -200,7 +200,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
             dp.setEditing(getPropertyStringValue(op,EDITING));
             dp.setDisplayTier((getWebappDaoFactory()).getJenaBaseDao().getPropertyNonNegativeIntValue(op, DISPLAY_RANK_ANNOT));
             dp.setDisplayLimit((getWebappDaoFactory()).getJenaBaseDao().getPropertyNonNegativeIntValue(op, DISPLAY_LIMIT));
-            
+
             //There might be multiple HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT properties, only use the highest
             StmtIterator it = op.listProperties(HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT);
             BaseResourceBean.RoleLevel hiddenRoleLevel = null;
@@ -211,13 +211,13 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
                     Resource res = obj.as(Resource.class);
                     if( res != null && res.getURI() != null ){
                         BaseResourceBean.RoleLevel roleFromModel =  BaseResourceBean.RoleLevel.getRoleByUri(res.getURI());
-                        if( roleFromModel != null && 
+                        if( roleFromModel != null &&
                             (hiddenRoleLevel == null || roleFromModel.compareTo(hiddenRoleLevel) > 0 )){
-                            hiddenRoleLevel = roleFromModel;                            
+                            hiddenRoleLevel = roleFromModel;
                         }
                     }
                 }
-            }            
+            }
             dp.setHiddenFromDisplayBelowRoleLevel(hiddenRoleLevel);//this might get set to null
 
             //There might be multiple PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT properties, only use the highest
@@ -230,13 +230,13 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
                     Resource res = obj.as(Resource.class);
                     if( res != null && res.getURI() != null ){
                         BaseResourceBean.RoleLevel roleFromModel =  BaseResourceBean.RoleLevel.getRoleByUri(res.getURI());
-                        if( roleFromModel != null && 
+                        if( roleFromModel != null &&
                             (prohibitedRoleLevel == null || roleFromModel.compareTo(prohibitedRoleLevel) > 0 )){
-                            prohibitedRoleLevel = roleFromModel;                            
+                            prohibitedRoleLevel = roleFromModel;
                         }
                     }
                 }
-            }            
+            }
             dp.setProhibitedFromUpdateBelowRoleLevel(prohibitedRoleLevel);//this might get set to null
 
             //There might be multiple HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT properties, only use the highest
@@ -249,17 +249,17 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
                     Resource res = obj.as(Resource.class);
                     if( res != null && res.getURI() != null ){
                         BaseResourceBean.RoleLevel roleFromModel =  BaseResourceBean.RoleLevel.getRoleByUri(res.getURI());
-                        if( roleFromModel != null && 
+                        if( roleFromModel != null &&
                             (publishRoleLevel == null || roleFromModel.compareTo(publishRoleLevel) > 0 )){
-                            publishRoleLevel = roleFromModel;                            
+                            publishRoleLevel = roleFromModel;
                         }
                     }
                 }
-            }            
+            }
             dp.setHiddenFromPublishBelowRoleLevel(publishRoleLevel);//this might get set to null
 
             dp.setCustomEntryForm(getPropertyStringValue(op,PROPERTY_CUSTOMENTRYFORMANNOT));
-            
+
             dp.setExternalId( getOntModelSelector().getTBoxModel().contains(op, DATAPROPERTY_ISEXTERNALID, "TRUE") );
             Resource groupRes = (Resource) op.getPropertyValue(PROPERTY_INPROPERTYGROUPANNOT);
             if (groupRes != null) {
@@ -328,11 +328,11 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
     public List<DataProperty> getDatapropsForClass(String vclassURI) {
         return filterAndConvertToDataProperties(getAllPropInstByVClass(vclassURI));
     }
-    
+
     public Collection<DataProperty> getAllPossibleDatapropsForIndividual(String individualURI) {
     	return filterAndConvertToDataProperties(getAllPossiblePropInstForIndividual(individualURI));
     }
-    
+
     private List<DataProperty> filterAndConvertToDataProperties(
     		                                List<PropertyInstance> propInsts) {
     	List<DataProperty> dataprops = new ArrayList<DataProperty>();
@@ -340,12 +340,12 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
        		OntModel tboxModel = getOntModel();
     		tboxModel.enterCriticalSection(Lock.READ);
     		boolean add = false;
-    		try { 
-    			add = (propInst.getPropertyURI() != null 
+    		try {
+    			add = (propInst.getPropertyURI() != null
     					&& tboxModel.contains(
     							tboxModel.getResource(
-    									propInst.getPropertyURI()), 
-    									RDF.type, 
+    									propInst.getPropertyURI()),
+    									RDF.type,
     									OWL.DatatypeProperty));
 	    	} finally {
 	    		tboxModel.leaveCriticalSection();
@@ -354,7 +354,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
 	    		DataProperty dataprop = getDataPropertyByURI(propInst.getPropertyURI());
 	    		dataprop.setRangeDatatypeURI(propInst.getRangeClassURI());
 	    		dataprops.add(dataprop);
-	    	}	    	
+	    	}
     	}
         return dataprops;
     }
@@ -363,11 +363,11 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
     	TBoxReasonerStatus status = ApplicationUtils.instance().getTBoxReasonerModule().getStatus();
     	return status.isConsistent() && !status.isInErrorState();
     }
-    
+
     private String getRequiredDatatypeURI(Individual individual, DataProperty dataprop, List<String> vclassURIs) {
         OntModel ontModel = getOntModelSelector().getTBoxModel();
-        String datatypeURI = dataprop.getRangeDatatypeURI();    
-    
+        String datatypeURI = dataprop.getRangeDatatypeURI();
+
         ontModel.enterCriticalSection(Lock.READ);
         try {
             // get universal restrictions applicable to data property
@@ -387,7 +387,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
                                 ) {
                                         datatypeURI = convertRequiredDatatypeURI(
                                                 avfrest.getAllValuesFrom().getURI());
-                                        break; 
+                                        break;
                             } else {
                                 // check if the restriction applies to one of the individual's types
                                 List<Resource> equivOrSubResources = new ArrayList<Resource>();
@@ -401,7 +401,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
                                     }
                                 }
                             }
-                        } 
+                        }
                     }
                 }
             }
@@ -410,7 +410,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
         }
         return datatypeURI;
     }
-    
+
     /**
      * Converts datatypes used in allValuesFromRestrictions to actual
      * requirements for editing.  Initially, this means we filter out
@@ -418,15 +418,15 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
      * as a datatype.
      */
     private String convertRequiredDatatypeURI(String datatypeURI) {
-        return (RDFS.Literal.getURI().equals(datatypeURI)) 
-                ? null 
+        return (RDFS.Literal.getURI().equals(datatypeURI))
+                ? null
                 : datatypeURI;
     }
-    
-    public String getRequiredDatatypeURI(Individual individual, DataProperty dataprop) {    	    		    	
+
+    public String getRequiredDatatypeURI(Individual individual, DataProperty dataprop) {
     	return getRequiredDatatypeURI(individual,dataprop,getVClassURIs(individual));
     }
-    
+
     private List<String> getVClassURIs(Individual individual){
         List<String> vclassURIs = null;
         if (reasoningAvailable()) {
@@ -441,10 +441,10 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
         }
         return vclassURIs;
     }
-    
+
     private boolean DIRECT = true;
     private boolean INDIRECT = !DIRECT;
-    
+
     /**
      * This method will iterate through each of an individual's direct types
      * and get the URIs of all supertypes.
@@ -460,9 +460,9 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
 	    				getWebappDaoFactory().getVClassDao().getAllSuperClassURIs(vcURI)
 	    			);
 	    		}
-	    		
+
 	    	}
-    	} else if (ind.getVClassURI() != null) { 
+    	} else if (ind.getVClassURI() != null) {
     		supertypeURIs.add(ind.getVClassURI());
     		supertypeURIs.addAll(
     		    getWebappDaoFactory().getVClassDao().getAllSuperClassURIs(ind.getVClassURI())
@@ -470,7 +470,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
     	}
     	return supertypeURIs;
     }
-    
+
     public DataProperty getDataPropertyByURI(String dataPropertyURI) {
         OntModel tboxModel = getOntModelSelector().getTBoxModel();
         tboxModel.enterCriticalSection(Lock.READ);
@@ -565,12 +565,12 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
         try {
         	getOntModel().getBaseModel().notifyEvent(new EditEvent(getWebappDaoFactory().getUserURI(),true));
             org.apache.jena.ontology.DatatypeProperty jDataprop = ontModel.getDatatypeProperty(dtp.getURI());
-            
+
             updateRDFSLabel(jDataprop, dtp.getPublicName());
-            
+
             updatePropertyResourceURIValue(jDataprop, RDFS.domain,dtp.getDomainClassURI(),ontModel);
             updatePropertyResourceURIValue(jDataprop, RDFS.range,dtp.getRangeDatatypeURI(),ontModel);
-            
+
             if (dtp.getFunctional()) {
                	if (!ontModel.contains(jDataprop,RDF.type,OWL.FunctionalProperty)) {
             		ontModel.add(jDataprop,RDF.type,OWL.FunctionalProperty);
@@ -580,36 +580,36 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
             		ontModel.remove(jDataprop,RDF.type,OWL.FunctionalProperty);
             	}
             }
-            
+
             updatePropertyStringValue(jDataprop, EXAMPLE, dtp.getExample(), ontModel);
             updatePropertyStringValue(jDataprop, DESCRIPTION_ANNOT, dtp.getDescription(), ontModel);
             updatePropertyStringValue(jDataprop, PUBLIC_DESCRIPTION_ANNOT, dtp.getPublicDescription(), ontModel);
             updatePropertyNonNegativeIntValue(jDataprop, DISPLAY_RANK_ANNOT, dtp.getDisplayTier(), ontModel);
             updatePropertyNonNegativeIntValue(jDataprop, DISPLAY_LIMIT, dtp.getDisplayLimit(), ontModel);
-           
+
             if (dtp.getHiddenFromDisplayBelowRoleLevel() != null) {
-              updatePropertyResourceURIValue(jDataprop,HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT,dtp.getHiddenFromDisplayBelowRoleLevel().getURI(),ontModel);                    
-            }            
-            
+              updatePropertyResourceURIValue(jDataprop,HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT,dtp.getHiddenFromDisplayBelowRoleLevel().getURI(),ontModel);
+            }
+
             if (dtp.getProhibitedFromUpdateBelowRoleLevel() != null) {
-                updatePropertyResourceURIValue(jDataprop,PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT,dtp.getProhibitedFromUpdateBelowRoleLevel().getURI(),ontModel);                    
-            }            
+                updatePropertyResourceURIValue(jDataprop,PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT,dtp.getProhibitedFromUpdateBelowRoleLevel().getURI(),ontModel);
+            }
 
             if (dtp.getHiddenFromPublishBelowRoleLevel() != null) {
-            	updatePropertyResourceURIValue(jDataprop,HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT,dtp.getHiddenFromPublishBelowRoleLevel().getURI(),ontModel);                    
-            }            
-            
+            	updatePropertyResourceURIValue(jDataprop,HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT,dtp.getHiddenFromPublishBelowRoleLevel().getURI(),ontModel);
+            }
+
             if (dtp.getGroupURI() != null) {
-                updatePropertyResourceURIValue(jDataprop,PROPERTY_INPROPERTYGROUPANNOT,dtp.getGroupURI(),ontModel);                    
-            }                        
-                        
+                updatePropertyResourceURIValue(jDataprop,PROPERTY_INPROPERTYGROUPANNOT,dtp.getGroupURI(),ontModel);
+            }
+
             updatePropertyStringValue(jDataprop,PROPERTY_CUSTOMENTRYFORMANNOT,dtp.getCustomEntryForm(),ontModel);
             getOntModel().getBaseModel().notifyEvent(new EditEvent(getWebappDaoFactory().getUserURI(),false));
         } finally {
             ontModel.leaveCriticalSection();
         }
     }
-    
+
     public List<DataProperty> getRootDataProperties() {
         List rootProperties = new ArrayList();
         OntModel ontModel = getOntModelSelector().getTBoxModel();
@@ -639,11 +639,11 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
                                     isRoot = false;
                                 }
                             }
-                    	} 
+                    	}
                     } else {
                     	isRoot = true;
                     }
-                    
+
                     if (isRoot) {
                         if (!NONUSER_NAMESPACES.contains(op.getNameSpace())) {
                             rootProperties.add(datapropFromOntProperty(op));
@@ -669,7 +669,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
      * so we are implementing a new method now and will merge the old approach
      * into the new one in a future release.
      */
-    
+
     /* This may be the intent behind JenaBaseDao.NONUSER_NAMESPACES, but that
      * value does not contain all of these namespaces.
      */
@@ -680,7 +680,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
             "http://www.w3.org/2002/07/owl#",
             //"http://vitro.mannlib.cornell.edu/ns/vitro/0.7#",
             "http://vitro.mannlib.cornell.edu/ns/vitro/public#"
-        ); 
+        );
 
     /*
      * This is a hack to throw out properties in the vitro, rdf, rdfs, and owl namespaces.
@@ -693,28 +693,28 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
             namespaceFilters.add("( !regex(str(?property), \"^" + namespace + "\" ))");
         }
         PROPERTY_FILTERS = StringUtils.join(namespaceFilters, " && ");
-    } 
-    
-    protected static final String DATA_PROPERTY_QUERY_STRING = 
+    }
+
+    protected static final String DATA_PROPERTY_QUERY_STRING =
         PREFIXES + "\n" +
         "SELECT DISTINCT ?property WHERE { \n" +
-        "   ?subject ?property ?object . \n" + 
+        "   ?subject ?property ?object . \n" +
         //"   ?property a owl:DatatypeProperty . \n" +
         "   FILTER ( \n" +
         "       isLiteral(?object) && \n" +
         "       ( !regex(str(?property), \"^" + VitroVocabulary.PUBLIC + "\" )) && \n" +
-        "       ( !regex(str(?property), \"^" + VitroVocabulary.OWL + "\" )) && \n" + 
+        "       ( !regex(str(?property), \"^" + VitroVocabulary.OWL + "\" )) && \n" +
         // NIHVIVO-2790 vitro:moniker has been deprecated, but display existing values for editorial management (deletion is encouraged).
         // This property will be hidden from public display by default.
-        "       ( ?property = <" + VitroVocabulary.MONIKER + "> || !regex(str(?property), \"^" + VitroVocabulary.vitroURI + "\" )) \n" +           
+        "       ( ?property = <" + VitroVocabulary.MONIKER + "> || !regex(str(?property), \"^" + VitroVocabulary.vitroURI + "\" )) \n" +
         "   ) \n" +
         "}";
-    
+
     @Override
     public List<DataProperty> getDataPropertyList(Individual subject) {
         return getDataPropertyList(subject.getURI());
     }
-    
+
     @Override
     public List<DataProperty> getDataPropertyList(String subjectUri) {
 
@@ -724,7 +724,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
         // initialBindings.add("subject", ResourceFactory.createResource(subjectUri));
         String queryString = QueryUtils.subUriForQueryVar(DATA_PROPERTY_QUERY_STRING, "subject", subjectUri);
         log.debug(queryString);
-        
+
         Query query = null;
         try {
             query = QueryFactory.create(queryString);
@@ -732,7 +732,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
             log.error("could not create SPARQL query for query string " + th.getMessage());
             log.error(queryString);
             return null;
-        }                     
+        }
         log.debug("Data property query string:\n" + query);
 
         final List<DataProperty> properties = new ArrayList<DataProperty>();
@@ -754,7 +754,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
         "SELECT ?property ?filename WHERE { \n" +
         "    ?property display:listViewConfigFile ?filename . \n" +
         "}";
-    
+
     protected static Query listViewConfigFileQuery = null;
     static {
         try {
@@ -762,19 +762,19 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
         } catch(Throwable th){
             log.error("could not create SPARQL query for LIST_VIEW_CONFIG_FILE_QUERY_STRING " + th.getMessage());
             log.error(LIST_VIEW_CONFIG_FILE_QUERY_STRING);
-        }           
+        }
     }
-    
+
     Map<DataProperty, String> customListViewConfigFileMap = null;
-    
+
     @Override
     public String getCustomListViewConfigFileName(DataProperty dp) {
         if (customListViewConfigFileMap == null) {
             customListViewConfigFileMap = new HashMap<DataProperty, String>();
             OntModel displayModel = getOntModelSelector().getDisplayModel();
             //Get all property to list view config file mappings in the system
-            QueryExecution qexec = QueryExecutionFactory.create(listViewConfigFileQuery, displayModel); 
-            ResultSet results = qexec.execSelect();  
+            QueryExecution qexec = QueryExecutionFactory.create(listViewConfigFileQuery, displayModel);
+            ResultSet results = qexec.execSelect();
             //Iterate through mappings looking for the current property and setting up a hashmap for subsequent retrieval
             while (results.hasNext()) {
                 QuerySolution soln = results.next();
@@ -789,12 +789,12 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
                 	}
                 } else {
                     String filename = soln.getLiteral("filename").getLexicalForm();
-                    customListViewConfigFileMap.put(prop, filename);     
+                    customListViewConfigFileMap.put(prop, filename);
                 }
-            }       
+            }
             qexec.close();
-        }        
+        }
         return customListViewConfigFileMap.get(dp);
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java
index cabaef2cf..fbebef2c2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java
@@ -52,8 +52,8 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
 
 
     private DatasetWrapperFactory dwf;
-    
-    public DataPropertyStatementDaoJena(DatasetWrapperFactory dwf, 
+
+    public DataPropertyStatementDaoJena(DatasetWrapperFactory dwf,
                                         WebappDaoFactoryJena wadf) {
         super(wadf);
         this.dwf = dwf;
@@ -91,7 +91,7 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
                             getWebappDaoFactory().getUserURI(),
                             false,
                             dataPropertyStatement.getIndividualURI()));
-            ontModel.leaveCriticalSection();       
+            ontModel.leaveCriticalSection();
         }
     }
 
@@ -112,9 +112,9 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
                 while( stmtIt.hasNext() )
                 {
                     Statement st = stmtIt.next();
-                    boolean addToList = /*allowAnyNameSpace ? st.getObject().canAs(Literal.class) :*/ st.getObject().isLiteral() && 
+                    boolean addToList = /*allowAnyNameSpace ? st.getObject().canAs(Literal.class) :*/ st.getObject().isLiteral() &&
                           (
-                              (RDF.value.equals(st.getPredicate()) || VitroVocabulary.value.equals(st.getPredicate().getURI())) 
+                              (RDF.value.equals(st.getPredicate()) || VitroVocabulary.value.equals(st.getPredicate().getURI()))
                               || !(NONUSER_NAMESPACES.contains(st.getPredicate().getNameSpace()))
                           );
                     if( addToList )
@@ -152,10 +152,10 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
     }
 
     public void deleteDataPropertyStatementsForIndividualByDataProperty(
-            String individualURI, 
-            String dataPropertyURI, 
+            String individualURI,
+            String dataPropertyURI,
             OntModel ontModel) {
-        
+
         ontModel.enterCriticalSection(Lock.WRITE);
         getOntModel().getBaseModel().notifyEvent(new IndividualUpdateEvent(
                 getWebappDaoFactory().getUserURI(),
@@ -170,14 +170,14 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
         	log.error("Error occurred in removal of data property " + dataPropertyURI + " for " + individualURI);
         }
         finally {
-        
+
         	getOntModel().getBaseModel().notifyEvent(new IndividualUpdateEvent(
         	        getWebappDaoFactory().getUserURI(),
         	        false,
         	        individualURI));
             ontModel.leaveCriticalSection();
         }
-        
+
     }
 
     public void deleteDataPropertyStatementsForIndividualByDataProperty(Individual individual, DataProperty dataProperty) {
@@ -205,7 +205,7 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
     		return edList;
     	}
         // do something annoying if we are dealing with a blank node
-    	try {	
+    	try {
 	    	getOntModel().enterCriticalSection(Lock.READ);
 	        OntResource ontRes = getOntModel().createResource(
 	        		new AnonId(entity.getLocalName())).as(OntResource.class);
@@ -241,13 +241,13 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
         // TODO Auto-generated method stub
         return null;
     }
-    
+
     private int NO_LIMIT = -1;
-    
+
     public List<DataPropertyStatement> getDataPropertyStatements(DataProperty dp) {
     	return getDataPropertyStatements(dp, NO_LIMIT, NO_LIMIT);
     }
-    
+
     public List<DataPropertyStatement> getDataPropertyStatements(DataProperty dp, int startIndex, int endIndex) {
     	getOntModel().enterCriticalSection(Lock.READ);
     	List<DataPropertyStatement> dpss = new ArrayList<DataPropertyStatement>();
@@ -303,14 +303,14 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
         }
         return 0;
     }
-    
+
     protected DataPropertyStatement fillDataPropertyStatementWithJenaLiteral(DataPropertyStatement dataPropertyStatement, Literal l) {
     	dataPropertyStatement.setData(l.getLexicalForm());
         dataPropertyStatement.setDatatypeURI(l.getDatatypeURI());
         dataPropertyStatement.setLanguage(l.getLanguage());
         return dataPropertyStatement;
     }
-    
+
     protected Literal jenaLiteralFromDataPropertyStatement(DataPropertyStatement dataPropertyStatement, OntModel ontModel) {
     	Literal l = null;
         if ((dataPropertyStatement.getLanguage()) != null && (dataPropertyStatement.getLanguage().length()>0)) {
@@ -319,21 +319,21 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
         	l = ontModel.createTypedLiteral(dataPropertyStatement.getData(),TypeMapper.getInstance().getSafeTypeByName(dataPropertyStatement.getDatatypeURI()));
         } else {
         	l = ontModel.createLiteral(dataPropertyStatement.getData());
-        } 
+        }
         return l;
     }
 
     /*
      * SPARQL-based methods for getting the individual's values for a single data property.
      */
-    
-    protected static final String DATA_PROPERTY_VALUE_QUERY_STRING = 
+
+    protected static final String DATA_PROPERTY_VALUE_QUERY_STRING =
         "SELECT ?value WHERE { \n" +
         "    ?subject ?property ?value . \n" +
         // ignore statements with uri values
         " FILTER ( isLiteral(?value) ) " +
         "} ORDER BY ?value";
-    
+
     protected static Query dataPropertyValueQuery;
     static {
         try {
@@ -341,18 +341,18 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
         } catch(Throwable th) {
             log.error("could not create SPARQL query for DATA_PROPERTY_VALUE_QUERY_STRING " + th.getMessage());
             log.error(DATA_PROPERTY_VALUE_QUERY_STRING);
-        }             
+        }
     }
-    
+
     @Override
     public List<Literal> getDataPropertyValuesForIndividualByProperty(Individual subject, DataProperty property) {
         return getDataPropertyValuesForIndividualByProperty(subject.getURI(), property.getURI());
     }
-    
+
     @Override
-    public List<Literal> getDataPropertyValuesForIndividualByProperty(String subjectUri, String propertyUri) {    
-        log.debug("Data property value query string:\n" + DATA_PROPERTY_VALUE_QUERY_STRING);         
-        log.debug("Data property value:\n" + dataPropertyValueQuery); 
+    public List<Literal> getDataPropertyValuesForIndividualByProperty(String subjectUri, String propertyUri) {
+        log.debug("Data property value query string:\n" + DATA_PROPERTY_VALUE_QUERY_STRING);
+        log.debug("Data property value:\n" + dataPropertyValueQuery);
 
         // Due to a Jena bug, prebinding on ?subject combined with the isLiteral()
         // filter causes the query to fail. Insert the subjectUri manually instead.
@@ -365,7 +365,7 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
         String queryString = QueryUtils.subUrisForQueryVars(DATA_PROPERTY_VALUE_QUERY_STRING, bindings);
 
         // Run the SPARQL query to get the properties
-        List<Literal> values = new ArrayList<Literal>();                
+        List<Literal> values = new ArrayList<Literal>();
         DatasetWrapper w = dwf.getDatasetWrapper();
         Dataset dataset = w.getDataset();
         dataset.getLock().enterCriticalSection(Lock.READ);
@@ -373,19 +373,19 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
         try {
             qexec = QueryExecutionFactory.create(
                     queryString, dataset);
-            ResultSet results = qexec.execSelect(); 
-    
+            ResultSet results = qexec.execSelect();
+
             while (results.hasNext()) {
                 QuerySolution sol = results.next();
                 Literal value = sol.getLiteral("value");
                 values.add(value);
             }
-            return values;  
-            
+            return values;
+
         } catch (Exception e) {
             log.error("Error getting data property values for individual " + subjectUri + " and property " + propertyUri);
             return Collections.emptyList();
-            
+
         } finally {
             dataset.getLock().leaveCriticalSection();
             w.close();
@@ -393,28 +393,28 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
                 qexec.close();
             }
         }
-               
+
     }
 
     @Override
     public List<Literal> getDataPropertyValuesForIndividualByProperty(
-            Individual subject, 
+            Individual subject,
             DataProperty property,
             String queryString, Set<String> constructQueryStrings ) {
         return getDataPropertyValuesForIndividualByProperty(subject.getURI(), property.getURI(), queryString, constructQueryStrings );
     }
-    
+
     @Override
     public List<Literal> getDataPropertyValuesForIndividualByProperty(
-            String subjectUri, 
-            String propertyUri, 
-            String queryString, Set<String> constructQueryStrings ) {  
-        
+            String subjectUri,
+            String propertyUri,
+            String queryString, Set<String> constructQueryStrings ) {
+
         Model constructedModel = constructModelForSelectQueries(
                 subjectUri, propertyUri, constructQueryStrings);
-        
+
         log.debug("Query string for data property " + propertyUri + ": " + queryString);
-        
+
         Query query = null;
         try {
             query = QueryFactory.create(queryString, Syntax.syntaxARQ);
@@ -422,26 +422,26 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
             log.error("Could not create SPARQL query for query string. " + th.getMessage());
             log.error(queryString);
             return Collections.emptyList();
-        } 
-        
+        }
+
         QuerySolutionMap initialBindings = new QuerySolutionMap();
         initialBindings.add("subject", ResourceFactory.createResource(subjectUri));
         initialBindings.add("property", ResourceFactory.createResource(propertyUri));
 
         // Run the SPARQL query to get the properties
-        List<Literal> values = new ArrayList<Literal>();                
+        List<Literal> values = new ArrayList<Literal>();
         DatasetWrapper w = dwf.getDatasetWrapper();
         Dataset dataset = w.getDataset();
         dataset.getLock().enterCriticalSection(Lock.READ);
         QueryExecution qexec = null;
         try {
 
-            qexec = (constructedModel == null) 
+            qexec = (constructedModel == null)
                     ? QueryExecutionFactory.create(
                             query, dataset, initialBindings)
                     : QueryExecutionFactory.create(
                             query, constructedModel, initialBindings);
-            
+
             ResultSet results = qexec.execSelect();
 
             while (results.hasNext()) {
@@ -452,7 +452,7 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
                 }
             }
             log.debug("values = " + values);
-            return values;  
+            return values;
 
         } catch (Exception e) {
             log.error("Error getting data property values for subject " + subjectUri + " and property " + propertyUri);
@@ -464,23 +464,23 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
                 qexec.close();
             }
         }
-       
+
     }
     private Model constructModelForSelectQueries(String subjectUri,
                                                  String propertyUri,
                                                  Set<String> constructQueries) {
-        
+
         if (constructQueries == null || constructQueries.isEmpty() ) {
             return null;
         }
-        
+
         Model constructedModel = ModelFactory.createDefaultModel();
-        
+
         for (String queryString : constructQueries) {
-         
-            log.debug("CONSTRUCT query string for object property " + 
+
+            log.debug("CONSTRUCT query string for object property " +
                     propertyUri + ": " + queryString);
-            
+
             Query query = null;
             try {
                 query = QueryFactory.create(queryString, Syntax.syntaxARQ);
@@ -489,19 +489,19 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
                           "string. " + th.getMessage());
                 log.error(queryString);
                 return constructedModel;
-            } 
-        
+            }
+
             QuerySolutionMap initialBindings = new QuerySolutionMap();
             initialBindings.add(
                     "subject", ResourceFactory.createResource(subjectUri));
             initialBindings.add(
                     "property", ResourceFactory.createResource(propertyUri));
-        
+
             DatasetWrapper w = dwf.getDatasetWrapper();
             Dataset dataset = w.getDataset();
             dataset.getLock().enterCriticalSection(Lock.READ);
             QueryExecution qe = null;
-            try {                           
+            try {
                 qe = QueryExecutionFactory.create(
                         query, dataset, initialBindings);
                 qe.execConstruct(constructedModel);
@@ -515,8 +515,8 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
                 w.close();
             }
         }
-        
+
         return constructedModel;
-        
+
     }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoSDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoSDB.java
index 97e5666cf..4921b5ea8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoSDB.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoSDB.java
@@ -32,16 +32,16 @@ public class DataPropertyStatementDaoSDB extends DataPropertyStatementDaoJena
 
 	private DatasetWrapperFactory dwf;
 	private SDBDatasetMode datasetMode;
-	
+
 	public DataPropertyStatementDaoSDB(
-	        DatasetWrapperFactory datasetWrapperFactory, 
-	        SDBDatasetMode datasetMode, 
+	        DatasetWrapperFactory datasetWrapperFactory,
+	        SDBDatasetMode datasetMode,
 	        WebappDaoFactoryJena wadf) {
 		super (datasetWrapperFactory, wadf);
 		this.dwf = datasetWrapperFactory;
 		this.datasetMode = datasetMode;
 	}
-	
+
 	@Override
 	public Individual fillExistingDataPropertyStatementsForIndividual( Individual entity/*, boolean allowAnyNameSpace*/)
     {
@@ -51,7 +51,7 @@ public class DataPropertyStatementDaoSDB extends DataPropertyStatementDaoJena
         }
         else
         {
-        	String query = 
+        	String query =
 	        	"CONSTRUCT { \n" +
 			       "   <" + entity.getURI() + "> ?p ?o . \n" +
 			       "} WHERE { \n" +
@@ -63,15 +63,15 @@ public class DataPropertyStatementDaoSDB extends DataPropertyStatementDaoJena
             Dataset dataset = w.getDataset();
             dataset.getLock().enterCriticalSection(Lock.READ);
             QueryExecution qexec = null;
-            try { 
-                qexec = QueryExecutionFactory.create(QueryFactory.create(query), dataset);                
+            try {
+                qexec = QueryExecutionFactory.create(QueryFactory.create(query), dataset);
         	    results = qexec.execConstruct();
             } finally {
                 if(qexec!=null) qexec.close();
                 dataset.getLock().leaveCriticalSection();
                 w.close();
             }
-        	OntModel ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, results); 
+        	OntModel ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, results);
             ontModel.enterCriticalSection(Lock.READ);
             try {
                 Resource ind = ontModel.getResource(entity.getURI());
@@ -80,9 +80,9 @@ public class DataPropertyStatementDaoSDB extends DataPropertyStatementDaoJena
                 while( stmtIt.hasNext() )
                 {
                     Statement st = stmtIt.next();
-                    boolean addToList = /*allowAnyNameSpace ? st.getObject().canAs(Literal.class) :*/ st.getObject().isLiteral() && 
+                    boolean addToList = /*allowAnyNameSpace ? st.getObject().canAs(Literal.class) :*/ st.getObject().isLiteral() &&
                           (
-                              (RDF.value.equals(st.getPredicate()) || VitroVocabulary.value.equals(st.getPredicate().getURI())) 
+                              (RDF.value.equals(st.getPredicate()) || VitroVocabulary.value.equals(st.getPredicate().getURI()))
                               || this.MONIKER.equals(st.getPredicate())
                               || !(NONUSER_NAMESPACES.contains(st.getPredicate().getNameSpace()))
                           );
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DatasetWrapper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DatasetWrapper.java
index 897409ad0..42457cd56 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DatasetWrapper.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DatasetWrapper.java
@@ -10,22 +10,22 @@ public class DatasetWrapper {
     private SDBConnection conn;
     private Dataset dataset;
     private boolean closed = false;
-    
+
     public DatasetWrapper(Dataset dataset) {
         this.dataset = dataset;
     }
-    
+
     public DatasetWrapper(Dataset dataset, SDBConnection conn) {
         this.dataset = dataset;
         this.conn = conn;
     }
-    
+
     public Dataset getDataset() {
         if (!closed) {
             return dataset;
         } else throw new RuntimeException("No operations on a closed dataset");
     }
-    
+
     public void close() {
         if (!closed) {
             closed = true;
@@ -35,5 +35,5 @@ public class DatasetWrapper {
             }
         }
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DatasetWrapperFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DatasetWrapperFactory.java
index 54e66b8a8..a569b1758 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DatasetWrapperFactory.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DatasetWrapperFactory.java
@@ -5,5 +5,5 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena;
 public interface DatasetWrapperFactory {
 
     public DatasetWrapper getDatasetWrapper();
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DatatypeDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DatatypeDaoJena.java
index 2800c9382..240628a61 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DatatypeDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DatatypeDaoJena.java
@@ -13,11 +13,11 @@ public class DatatypeDaoJena extends JenaBaseDao implements DatatypeDao {
 
     private List<Datatype> allDatatypes;
     private HashMap<String,Datatype> allDatatypesMap;
-    
+
     public DatatypeDaoJena(WebappDaoFactoryJena wadf) {
         super(wadf);
     }
-    
+
     public void deleteDatatype(Datatype dtp) {
     	throw new UnsupportedOperationException();
     }
@@ -70,101 +70,101 @@ public class DatatypeDaoJena extends JenaBaseDao implements DatatypeDao {
     public void updateDatatype(Datatype dtp) {
         throw new UnsupportedOperationException();
     }
-    
+
     private synchronized void init() {
-    	
+
        List<Datatype> allDatatypes = new ArrayList<Datatype>();
        HashMap<String,Datatype> allDatatypesMap = new HashMap<String,Datatype>();
-    	
+
        int index = 0;
-           
+
        Datatype stringD = new Datatype();
        stringD.setUri(XSD+"string");
        stringD.setName("string");
        stringD.setId(index++);
        allDatatypes.add(stringD);
        allDatatypesMap.put(stringD.getUri(), stringD);
-       
+
        Datatype intD = new Datatype();
        intD.setUri(XSD+"int");
        intD.setName("integer between -2147483648 and 2147483647 (int)");
        intD.setId(index++);
        allDatatypes.add(intD);
        allDatatypesMap.put(XSD+"int", intD);
-       
+
        Datatype integerD = new Datatype();
        integerD.setUri(XSD+"integer");
        integerD.setName("integer");
        integerD.setId(index++);
        allDatatypes.add(integerD);
        allDatatypesMap.put(integerD.getUri(), integerD);
-       
+
        Datatype floatD = new Datatype();
        floatD.setUri(XSD+"float");
        floatD.setName("float");
        floatD.setId(index++);
        allDatatypes.add(floatD);
        allDatatypesMap.put(floatD.getUri(), floatD);
-       
+
        Datatype dateTimeD = new Datatype();
        dateTimeD.setUri(XSD+"dateTime");
        dateTimeD.setName("date and time (YYYY-MM-DDThh:mm:ss)");
        dateTimeD.setId(index++);
        allDatatypes.add(dateTimeD);
        allDatatypesMap.put(XSD+"dateTime", dateTimeD);
-       
+
        Datatype dateD = new Datatype();
        dateD.setUri(XSD+"date");
        dateD.setName("date (YYYY-MM-DD)");
        dateD.setId(index++);
        allDatatypes.add(dateD);
        allDatatypesMap.put(dateD.getUri(), dateD);
-       
+
        Datatype timeD = new Datatype();
        timeD.setUri(XSD+"time");
        timeD.setName("time (hh:mm:ss)");
        timeD.setId(index++);
        allDatatypes.add(timeD);
        allDatatypesMap.put(timeD.getUri(), timeD);
-       
+
        Datatype gYearD = new Datatype();
        gYearD.setUri(XSD+"gYear");
        gYearD.setName("year (YYYY)");
        gYearD.setId(index++);
        allDatatypes.add(gYearD);
        allDatatypesMap.put(gYearD.getUri(), gYearD);
-       
+
        Datatype gMonthD = new Datatype();
        gMonthD.setUri(XSD+"gMonth");
        gMonthD.setName("month (MM)");
        gMonthD.setId(index++);
        allDatatypes.add(gMonthD);
        allDatatypesMap.put(gMonthD.getUri(), gYearD);
-       
+
        Datatype gYearMonthD = new Datatype();
        gYearMonthD.setUri(XSD+"gYearMonth");
        gYearMonthD.setName("year and month (YYYY-MM)");
        gYearMonthD.setId(index++);
        allDatatypes.add(gYearMonthD);
        allDatatypesMap.put(gYearMonthD.getUri(), gYearMonthD);
-                
+
        Datatype anyURID = new Datatype();
        anyURID.setUri(XSD+"anyURI");
        anyURID.setName("URI/URL");
        anyURID.setId(index++);
        allDatatypes.add(anyURID);
        allDatatypesMap.put(XSD+"anyURI", anyURID);
-       
+
        Datatype booleanD = new Datatype();
        booleanD.setUri(XSD+"boolean");
        booleanD.setName("boolean (true/false)");
        booleanD.setId(index++);
        allDatatypes.add(booleanD);
        allDatatypesMap.put(booleanD.getUri(), booleanD);
-       
+
        this.allDatatypes = allDatatypes;
        this.allDatatypesMap = allDatatypesMap;
-           
+
    }
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJena.java
index 62d3ff74a..abda5a6e6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJena.java
@@ -21,41 +21,41 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 
 /**
  * This class handles deletion of resources based on the annotation vitro:dependentResourceAnnot.
- * 
+ *
  * For example, take a graph like:
- * 
+ *
  *   ex:bob  ex:hasPositionHistory ex:positionHistory23 .
  *   ex:positionHistory23 ex:hasTitle "position 23 was great" .
  *   ex:hasPositionHistory vitro.dependentResourceAnnot "true"^^xsd:boolean .
- *   
+ *
  * When the statement ex:bob ex:hasPositionHistory ex:positioinHisroty23 is
- * deleted, then everything about ex:positionHistory23 should be deleted because  
- * ex:hasPositionHistory is a dependent resource property.  This will be done 
- * recursively. 
- *  
+ * deleted, then everything about ex:positionHistory23 should be deleted because
+ * ex:hasPositionHistory is a dependent resource property.  This will be done
+ * recursively.
+ *
  * @author bdc34
  *
  */
 public class DependentResourceDeleteJena {
-    
+
 	public static List<Statement> getDependentResourceDeleteList ( Statement stmt, Model model){
 		if( model == null ) throw new IllegalArgumentException("model must not be null.");
-		return getDependentResourceDeleteList(stmt, model, new HashSet<String>(), false);		
+		return getDependentResourceDeleteList(stmt, model, new HashSet<String>(), false);
 	}
-	
+
 	public static List<Statement> getDependentResourceDeleteList(Resource deleteMe, Model sourceModel) {
-		List<Statement> deletes = new LinkedList<Statement>();				 
+		List<Statement> deletes = new LinkedList<Statement>();
 		for( Statement stmt : getAllStatements(deleteMe, sourceModel)){
 			deletes.add(stmt);
 			deletes.addAll(getDependentResourceDeleteList(stmt, sourceModel, new HashSet<String>(), false));
 		}
-		return deletes;		
+		return deletes;
 	}
-	
+
 	public static Model getDependentResourceDeleteForChange( Model assertions, Model retractions, Model sourceModel){
 		if( sourceModel == null || retractions == null || assertions == null)
 			 throw new IllegalArgumentException("model must not be null.");
-				
+
 		List<Statement> removedStmts = getRemovedStmts( assertions, retractions);
 
 		/* Get ride of any statements that seem to be a change */
@@ -72,35 +72,35 @@ public class DependentResourceDeleteJena {
 				}
 			}
 		}
-		
+
 		List<Statement> dependentStmts = new LinkedList<Statement>();
 		for(Statement stmt: removedStmts){
 			dependentStmts.addAll( getDependentResourceDeleteList(stmt, sourceModel));
-		}		
+		}
 		Model outModel = ModelFactory.createDefaultModel();
 		outModel.add(dependentStmts);
 		return outModel;
 	}
 
 	/**
-	 * Find all statements where for a given statement in the assertions, 
-	 * there is at least one statement in the retractions that has 
-	 * the same predicate and object. */	 
+	 * Find all statements where for a given statement in the assertions,
+	 * there is at least one statement in the retractions that has
+	 * the same predicate and object. */
 	private static List<Statement> getChangedStmts(Model assertions, Model retractions){
-		List<Statement> changedStmts = new LinkedList<Statement>();		
+		List<Statement> changedStmts = new LinkedList<Statement>();
 		StmtIterator it = assertions.listStatements();
 		while(it.hasNext()){
 			Statement assertionStmtStatement = it.nextStatement();
 			if( assertionStmtStatement.getObject().canAs( Resource.class )){
-				Resource asserObj = assertionStmtStatement.getObject().as(Resource.class);			
-				StmtIterator retractionStmts = 
+				Resource asserObj = assertionStmtStatement.getObject().as(Resource.class);
+				StmtIterator retractionStmts =
 					retractions.listStatements(
-							(Resource)null, 
+							(Resource)null,
 							retractions.createProperty(assertionStmtStatement.getPredicate().getURI()),
 							retractions.createResource(asserObj.getURI()));
-				if( retractionStmts != null ){						
+				if( retractionStmts != null ){
 					if( retractionStmts.hasNext())
-						changedStmts.add( assertionStmtStatement);				
+						changedStmts.add( assertionStmtStatement);
 					while(retractionStmts.hasNext()){
 						changedStmts.add( retractionStmts.nextStatement() );
 					}
@@ -108,72 +108,72 @@ public class DependentResourceDeleteJena {
 				retractionStmts.close();
 			}
 			it.close();
-		}		
+		}
 		return changedStmts;
 	}
-	
+
     private static List<Statement> getRemovedStmts(Model assertions, Model retractions) {
     	List<Statement> toRemove = new LinkedList<Statement>();
     	StmtIterator iter = retractions.listStatements();
     	while(iter.hasNext()){
     		Statement stmt = iter.nextStatement();
     		if( stmt.getObject() != null && ! stmt.getObject().isLiteral() && ! assertions.contains(stmt))
-    			toRemove.add( stmt );    				
+    			toRemove.add( stmt );
     	}
     	iter.close();
 		return toRemove;
 	}
 
-	private static List<Statement> getDependentResourceDeleteList ( Statement stmt, Model model, Set<String> visitedUris, boolean perviousWasDependentResource ){                        
-        if( stmt == null ) 
-            return Collections.emptyList();        
-        
+	private static List<Statement> getDependentResourceDeleteList ( Statement stmt, Model model, Set<String> visitedUris, boolean perviousWasDependentResource ){
+        if( stmt == null )
+            return Collections.emptyList();
+
         List<Statement> toDelete = new LinkedList<Statement>();
-        toDelete.add(stmt);        
+        toDelete.add(stmt);
         RDFNode obj = stmt.getObject();
 
         if( ( obj.canAs(Resource.class) && isPredicateDependencyRelation(stmt.getPredicate(), model) )
-        	|| ( obj.isAnon() && perviousWasDependentResource ) ){                	
+        	|| ( obj.isAnon() && perviousWasDependentResource ) ){
     		Resource res = obj.as(Resource.class);
     		String id = res.isAnon()?res.getId().toString():res.getURI();
-                                
+
     		if( !visitedUris.contains(id) ){
     			visitedUris.add(id);
-    			for( Statement stubStmt : getAllStatements(res, model)){                        	
-    				toDelete.addAll( getDependentResourceDeleteList(stubStmt, model,visitedUris,true));                        	
-    			}                         
-    		}                        	  
+    			for( Statement stubStmt : getAllStatements(res, model)){
+    				toDelete.addAll( getDependentResourceDeleteList(stubStmt, model,visitedUris,true));
+    			}
+    		}
         }
         return toDelete;
     }
-    
+
     private static List<Statement> getAllStatements(Resource res, Model model){
     	List<Statement> deleteUs = new LinkedList<Statement>();
     	StmtIterator it = model.listStatements(null, null, res);
     	while( it.hasNext()){
     		deleteUs.add( it.nextStatement() );
     	}
-    	
+
     	it = model.listStatements(res, null,(RDFNode) null);
     	while(it.hasNext()){
     		deleteUs.add( it.nextStatement());
     	}
-    	
+
     	it = model.listStatements(res, null, null, null);
     	while(it.hasNext()){
     		deleteUs.add( it.nextStatement());
     	}
-    
+
     	return deleteUs;
     }
 
     private static boolean isPredicateDependencyRelation( Property predicate , Model model){
     	return model.containsLiteral(
-    			model.getResource(predicate.getURI()), 
-    			model.createProperty(VitroVocabulary.PROPERTY_STUBOBJECTPROPERTYANNOT), 
+    			model.getResource(predicate.getURI()),
+    			model.createProperty(VitroVocabulary.PROPERTY_STUBOBJECTPROPERTYANNOT),
     			true);
     }
 
 
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DifferenceGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DifferenceGraph.java
index 83aacc69c..10b206bc5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DifferenceGraph.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DifferenceGraph.java
@@ -23,12 +23,12 @@ public class DifferenceGraph implements Graph {
 
     private Graph g;
     private Graph subtract;
-    
-    public DifferenceGraph(Graph g, Graph subtract) {    
+
+    public DifferenceGraph(Graph g, Graph subtract) {
         this.g = g;
         this.subtract = subtract;
     }
-    
+
     @Override
     public void close() {
         // not clear what the best behavior here is
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DisplayModelDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DisplayModelDaoJena.java
index d9ecce8a1..2c9cfa27e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DisplayModelDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DisplayModelDaoJena.java
@@ -26,22 +26,22 @@ import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
 
 public class DisplayModelDaoJena implements DisplayModelDao {
     WebappDaoFactoryJena wdf;
-    
+
     protected static final String MENU_N3_FILE = "/WEB-INF/ontologies/app/menu.n3";
     protected static final String MENU_N3_FILE_BACKUP = "/WEB-INF/ontologies/app/menu.backup";
-    
-    protected static Resource MENU_TEXT_RES = 
-        ResourceFactory.createResource(DisplayVocabulary.MENU_TEXT_RES);    
+
+    protected static Resource MENU_TEXT_RES =
+        ResourceFactory.createResource(DisplayVocabulary.MENU_TEXT_RES);
     protected static Property HAS_TEXT_REPRESENTATION =
         ResourceFactory.createProperty(DisplayVocabulary.HAS_TEXT_REPRESENTATION);
-    
+
     public DisplayModelDaoJena(WebappDaoFactoryJena wdfj){
         this.wdf = wdfj;
-    }    
-    
+    }
+
     public void replaceDisplayModel(String n3, ServletContext context) throws Exception{
         OntModel displayModel = wdf.getOntModelSelector().getDisplayModel();
-                
+
         //get old menu file and turn into model
         Model oldMenuStmts = ModelFactory.createDefaultModel();
 //        InputStream oldIn = FileManager.get().open( context.getRealPath(MENU_N3_FILE ) );
@@ -53,8 +53,8 @@ public class DisplayModelDaoJena implements DisplayModelDao {
         }catch(Throwable th){
             throw new Exception("Cannot read in existing menu. " + th.getMessage());
         }
-        
-        //turn the N3 text for the new menu into a model        
+
+        //turn the N3 text for the new menu into a model
         Model newMenuStmts = ModelFactory.createDefaultModel();
         StringReader newIn = new StringReader( n3 );
         try{
@@ -62,34 +62,34 @@ public class DisplayModelDaoJena implements DisplayModelDao {
         }catch(Throwable th){
             throw new Exception("There was an error in the menu N3: "+ th.getMessage());
         }
-        
+
         displayModel.enterCriticalSection(true);
         try{
             //copy old menu file to backup
 //            File oldMenuFile = new File(context.getRealPath(MENU_N3_FILE));
 //            File oldMenuFileBackup = new File(context.getRealPath(MENU_N3_FILE_BACKUP));
 //            copyFile(oldMenuFile , oldMenuFileBackup);
-            
+
             //save new menu file to old menu file
             displayModel.removeAll(MENU_TEXT_RES, HAS_TEXT_REPRESENTATION, null);
             displayModel.add(MENU_TEXT_RES, HAS_TEXT_REPRESENTATION, n3);
-            
+
 //            File newMenuFile = new File(context.getRealPath(MENU_N3_FILE));
 //            FileWriter mfWriter = new FileWriter(newMenuFile);
 //            mfWriter.write(n3);
 //            mfWriter.close();
-            
+
             //remove old menu statements from display model
             displayModel.remove(oldMenuStmts);
-            
+
             //add new menu statements to display model
             displayModel.add(newMenuStmts);
         }finally{
             displayModel.leaveCriticalSection();
-        }        
+        }
     }
-    
-    
+
+
     public String getDisplayModel(ServletContext context) throws IOException{
         OntModel displayModel = wdf.getOntModelSelector().getDisplayModel();
         String text = null;
@@ -101,7 +101,7 @@ public class DisplayModelDaoJena implements DisplayModelDao {
         }finally{
             displayModel.leaveCriticalSection();
         }
-        if( text == null ){       
+        if( text == null ){
             //text of file is not yet in model
             File oldMenuFile = new File(context.getRealPath(MENU_N3_FILE));
             StringBuilder str = new StringBuilder(2000);
@@ -113,9 +113,9 @@ public class DisplayModelDaoJena implements DisplayModelDao {
                 str.append(readData);
             }
             reader.close();
-            
+
             //Now write the file contents into the display model so that on
-            //future edits, the user can be presented with their last input.        
+            //future edits, the user can be presented with their last input.
             String menuN3Content = str.toString();
             displayModel.enterCriticalSection(true);
             try{
@@ -124,11 +124,11 @@ public class DisplayModelDaoJena implements DisplayModelDao {
                 displayModel.leaveCriticalSection();
             }
             return menuN3Content;
-        }else{            
+        }else{
             return text;
-        }        
+        }
     }
-    
+
     public static void copyFile(File sourceFile, File destFile) throws IOException {
         if(!destFile.exists()) {
          destFile.createNewFile();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/GraphGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/GraphGenerator.java
index 92c7d85c2..da20bb8f2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/GraphGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/GraphGenerator.java
@@ -7,7 +7,7 @@ import org.apache.jena.graph.Graph;
 public interface GraphGenerator {
 
 	public Graph generateGraph();
-	
+
 	public boolean isGraphClosed();
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java
index c8ca354bd..79e80c8b8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java
@@ -124,7 +124,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
     public List<Individual> getIndividualsByVClass(VClass vclass ) {
         return getIndividualsByVClassURI(vclass.getURI(),-1,-1);
     }
-    
+
     public List<Individual> getIndividualsByVClassURI(String vclassURI) {
         return getIndividualsByVClassURI(vclassURI,-1,-1);
     }
@@ -134,15 +134,15 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
     	if (vclassURI==null) {
             return null;
         }
-        
+
         List<Individual> ents = new ArrayList<Individual>();
-        
-        Resource theClass = (vclassURI.indexOf(PSEUDO_BNODE_NS) == 0) 
+
+        Resource theClass = (vclassURI.indexOf(PSEUDO_BNODE_NS) == 0)
             ? getOntModel().createResource(new AnonId(vclassURI.split("#")[1]))
             : ResourceFactory.createResource(vclassURI);
-    
-        
-        
+
+
+
         if (theClass.isAnon() && theClass.canAs(UnionClass.class)) {
         	UnionClass u = theClass.as(UnionClass.class);
         	for (OntClass operand : u.listOperands().toList()) {
@@ -167,7 +167,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
         		ontModel.leaveCriticalSection();
         	}
         }
-        
+
 
         java.util.Collections.sort(ents);
 
@@ -204,19 +204,19 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
      * Note that a number of magic things happen in here.
      */
     public String insertNewIndividual(Individual ent, OntModel ontModel) throws InsertException {
-    	
-        String preferredURI = getUnusedURI(ent);          
-           
+
+        String preferredURI = getUnusedURI(ent);
+
         String entURI = null;
-        
-    	Resource cls = (ent.getVClassURI() != null) 
+
+    	Resource cls = (ent.getVClassURI() != null)
             ? ontModel.getResource(ent.getVClassURI())
             : OWL.Thing; // This assumes we want OWL-DL compatibility.
                          // Individuals cannot be untyped.
-        
+
         ontModel.enterCriticalSection(Lock.WRITE);
         try {
-         
+
             entURI = preferredURI;
             org.apache.jena.ontology.Individual test = ontModel.getIndividual(entURI);
             int count = 0;
@@ -225,7 +225,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
                 entURI = preferredURI + count;
                 test = ontModel.getIndividual(entURI);
             }
-            
+
             try {
                 ontModel.getBaseModel().notifyEvent(new IndividualCreationEvent(getWebappDaoFactory().getUserURI(),true,entURI));
                 org.apache.jena.ontology.Individual ind = ontModel.createIndividual(entURI,cls);
@@ -241,7 +241,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
                 addPropertyDateTimeValue(ind,MODTIME,Calendar.getInstance().getTime(),ontModel);
                 if (ent.getMainImageUri() != null) {
                 	addPropertyResourceURIValue(ind, IND_MAIN_IMAGE, ent.getMainImageUri());
-                }                
+                }
                 if( ent.getSearchBoost() != null ) {
                     addPropertyFloatValue(ind,SEARCH_BOOST_ANNOT, ent.getSearchBoost(), ontModel);
                 }
@@ -287,7 +287,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
             org.apache.jena.ontology.Individual ind = ontModel.getIndividual(ent.getURI());
             if (ind != null) {
                 if (ent.getName() != null && ( (ind.getLabel(getDefaultLanguage())==null) || (ind.getLabel(getDefaultLanguage())!=null && ent.getName()!=null && !ent.getName().equals(ind.getLabel(getDefaultLanguage())) ) ) ) {
-                	
+
                 	// removal of existing values done this odd way to trigger
                 	// the change listeners
                 	Model temp = ModelFactory.createDefaultModel();
@@ -408,10 +408,10 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
             return null;
 
         OntModel ontModel = getOntModelSelector().getABoxModel();
-        
+
         ontModel.enterCriticalSection(Lock.READ);
         try {
-        	OntResource ontRes = (entityURI.startsWith(VitroVocabulary.PSEUDO_BNODE_NS)) 
+        	OntResource ontRes = (entityURI.startsWith(VitroVocabulary.PSEUDO_BNODE_NS))
         		? (OntResource) ontModel.createResource(new AnonId(entityURI.substring(VitroVocabulary.PSEUDO_BNODE_NS.length()))).as(OntResource.class)
         		: ontModel.getOntResource(entityURI);
             Individual ent = new IndividualJena(ontRes, getWebappDaoFactory());
@@ -430,12 +430,12 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
     /**
      * In Jena it can be difficult to get an object with a given dataproperty if
      * you do not care about the datatype or lang of the literal.  Use this
-     * method if you would like to ignore the lang and datatype.  
-     * 
-     * Note: this method doesn't require that a property be declared in the 
+     * method if you would like to ignore the lang and datatype.
+     *
+     * Note: this method doesn't require that a property be declared in the
      * ontology as a data property -- only that it behaves as one.
      */
-    public List<Individual> getIndividualsByDataProperty(String dataPropertyUri, String value){        
+    public List<Individual> getIndividualsByDataProperty(String dataPropertyUri, String value){
         Property prop = null;
         if( RDFS.label.getURI().equals( dataPropertyUri )){
             prop = RDFS.label;
@@ -443,7 +443,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
             prop = getOntModel().getProperty(dataPropertyUri);
         }
 
-        if( prop == null ) {            
+        if( prop == null ) {
             log.debug("Could not getIndividualsByDataProperty() " +
                     "because " + dataPropertyUri + "was not found in model.");
             return Collections.emptyList();
@@ -454,114 +454,114 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
                     "because value was null");
             return Collections.emptyList();
         }
-        
-        Literal litv1 = getOntModel().createLiteral(value);        
-        Literal litv2 = getOntModel().createTypedLiteral(value);   
-        
+
+        Literal litv1 = getOntModel().createLiteral(value);
+        Literal litv2 = getOntModel().createTypedLiteral(value);
+
         //warning: this assumes that any language tags will be EN
-        Literal litv3 = getOntModel().createLiteral(value,"EN");        
-        
+        Literal litv3 = getOntModel().createLiteral(value,"EN");
+
         HashMap<String,Individual> individualsMap = new HashMap<String, Individual>();
-                
+
         getOntModel().enterCriticalSection(Lock.READ);
         int count = 0;
         try{
             StmtIterator stmts
-                = getOntModel().listStatements((Resource)null, prop, litv1);                                           
+                = getOntModel().listStatements((Resource)null, prop, litv1);
             while(stmts.hasNext()){
                 count++;
                 Statement stmt = stmts.nextStatement();
-                
+
                 RDFNode sub = stmt.getSubject();
-                if( sub == null || sub.isAnon() || sub.isLiteral() )                    
-                    continue;                
-                
+                if( sub == null || sub.isAnon() || sub.isLiteral() )
+                    continue;
+
                 RDFNode obj = stmt.getObject();
                 if( obj == null || !obj.isLiteral() )
                     continue;
-                
+
                 Literal literal = (Literal)obj;
                 Object v = literal.getValue();
-                if( v == null )                     
-                    continue;                
-                
+                if( v == null )
+                    continue;
+
                 String subUri = ((Resource)sub).getURI();
                 if( ! individualsMap.containsKey(subUri)){
                     org.apache.jena.ontology.Individual ind = getOntModel().getIndividual(subUri);
                     individualsMap.put(subUri,new IndividualJena(ind, getWebappDaoFactory()));
                 }
             }
-            
-            stmts = getOntModel().listStatements((Resource)null, prop, litv2);                                           
+
+            stmts = getOntModel().listStatements((Resource)null, prop, litv2);
             while(stmts.hasNext()){
                 count++;
                 Statement stmt = stmts.nextStatement();
-                
+
                 RDFNode sub = stmt.getSubject();
-                if( sub == null || sub.isAnon() || sub.isLiteral() )                    
-                    continue;                
-                
+                if( sub == null || sub.isAnon() || sub.isLiteral() )
+                    continue;
+
                 RDFNode obj = stmt.getObject();
                 if( obj == null || !obj.isLiteral() )
                     continue;
-                
+
                 Literal literal = (Literal)obj;
                 Object v = literal.getValue();
-                if( v == null )                     
-                    continue;                
-                
+                if( v == null )
+                    continue;
+
                 String subUri = ((Resource)sub).getURI();
                 if( ! individualsMap.containsKey(subUri)){
                     org.apache.jena.ontology.Individual ind = getOntModel().getIndividual(subUri);
                     individualsMap.put(subUri,new IndividualJena(ind, getWebappDaoFactory()));
-                }                
+                }
             }
-            
-            stmts = getOntModel().listStatements((Resource)null, prop, litv3);                                           
+
+            stmts = getOntModel().listStatements((Resource)null, prop, litv3);
             while(stmts.hasNext()){
                 count++;
                 Statement stmt = stmts.nextStatement();
-                
+
                 RDFNode sub = stmt.getSubject();
-                if( sub == null || sub.isAnon() || sub.isLiteral() )                    
-                    continue;                
-                
+                if( sub == null || sub.isAnon() || sub.isLiteral() )
+                    continue;
+
                 RDFNode obj = stmt.getObject();
                 if( obj == null || !obj.isLiteral() )
                     continue;
-                
+
                 Literal literal = (Literal)obj;
                 Object v = literal.getValue();
-                if( v == null )                     
-                    continue;                
-                
+                if( v == null )
+                    continue;
+
                 String subUri = ((Resource)sub).getURI();
                 if( ! individualsMap.containsKey(subUri)){
                     org.apache.jena.ontology.Individual ind = getOntModel().getIndividual(subUri);
                     individualsMap.put(subUri,new IndividualJena(ind, getWebappDaoFactory()));
-                }                
+                }
             }
         } finally {
             getOntModel().leaveCriticalSection();
         }
-        
+
         List<Individual> rv = new ArrayList<Individual>(individualsMap.size());
         rv.addAll(individualsMap.values());
         return rv;
     }
 
-    public List<Individual> getIndividualsByDataProperty(String dataPropertyUri, String value, String datatypeUri, String lang){        
+    public List<Individual> getIndividualsByDataProperty(String dataPropertyUri, String value, String datatypeUri, String lang){
         if( datatypeUri == null && lang == null )
             return getIndividualsByDataProperty(dataPropertyUri,value);
-        
+
         Property prop = null;
-        
+
         if( RDFS.label.getURI().equals( dataPropertyUri )){
             prop = RDFS.label;
         }else{
             prop = getOntModel().getDatatypeProperty(dataPropertyUri);
         }
-        
+
         if( prop == null || value == null){
             log.debug("Could not getIndividualsByDataProperty() " +
                     "because " + dataPropertyUri + "was not found in model.");
@@ -595,12 +595,12 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
             getOntModel().leaveCriticalSection();
         }
         return inds;
-    }    
+    }
 
     public Collection<String> getAllIndividualUris() {
         //this is implemented in IndivdiualSDB
         throw new NotImplementedException("");
-    }  
+    }
 
     public Iterator<String> getUpdatedSinceIterator(long updatedSince){
         //this is implemented in IndivdiualSDB
@@ -608,30 +608,30 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
     }
 
     public boolean isIndividualOfClass(String vclassURI, String indURI) {
-        if( vclassURI == null || indURI == null 
-            || "".equals(vclassURI) || "".equals(indURI)) 
+        if( vclassURI == null || indURI == null
+            || "".equals(vclassURI) || "".equals(indURI))
             return false;
-        return getOntModel().contains(getOntModel().getResource(indURI), 
+        return getOntModel().contains(getOntModel().getResource(indURI),
                     RDF.type ,
-                    getOntModel().getResource(vclassURI));        
+                    getOntModel().getResource(vclassURI));
     }
-    
+
 	public String getUnusedURI(Individual individual) throws InsertException {
-		String errMsg = null;		
+		String errMsg = null;
 		String namespace = null;
 		String uri = null;
 		boolean uriIsGood = false;
-		
-		if ( individual == null || 
-			(individual.getURI() != null && individual.getURI().startsWith( DEFAULT_NAMESPACE ) ) 
-			|| individual.getNamespace() == null 
-			|| individual.getNamespace().length() == 0 
+
+		if ( individual == null ||
+			(individual.getURI() != null && individual.getURI().startsWith( DEFAULT_NAMESPACE ) )
+			|| individual.getNamespace() == null
+			|| individual.getNamespace().length() == 0
 		    || DEFAULT_NAMESPACE.equals(individual.getNamespace()) ){
 			//we always want local names like n23423 for the default namespace
 			namespace = DEFAULT_NAMESPACE;
-			uri = null;			
+			uri = null;
 			log.debug("Setting namespace to default namespace " + DEFAULT_NAMESPACE + " and uri is null");
-			log.debug("Individual : " + individual + " - URI: " + individual.getURI() + " - namespace -" + 
+			log.debug("Individual : " + individual + " - URI: " + individual.getURI() + " - namespace -" +
 			individual.getNamespace() + "- ");
 		}else if( individual.getURI() != null ){
 			errMsg = getWebappDaoFactory().checkURI(individual.getURI());
@@ -662,15 +662,15 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
 					if( errMsg == null)
 						uriIsGood = true;
 					else
-						throw new InsertException(errMsg);		
+						throw new InsertException(errMsg);
 					log.debug("uriIsGood is true and uri is " + uri);
 				}
 			}
-			/* else try namespace + n2343 */ 			
+			/* else try namespace + n2343 */
 		}
-		
+
 		int attempts = 0;
-		
+
 		while(!uriIsGood && attempts < 30 ){
 			log.debug("While loop: Uri is good false, attempt=" + attempts);
 			String localName = "n" + random.nextInt( Math.min(Integer.MAX_VALUE,(int)Math.pow(2,attempts + 13)) );
@@ -680,19 +680,19 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
 			if(  errMsg != null)
 				uri = null;
 			else
-				uriIsGood = true;		
+				uriIsGood = true;
 			attempts++;
 		}
-		
+
 		if( uri == null )
 			throw new InsertException("Could not create URI for individual: " + errMsg);
-		log.debug("Using URI" + uri);						
+		log.debug("Using URI" + uri);
 		return uri;
 	}
 
     @Override
     // This method returns an EditLiteral rather than a Jena Literal, since IndividualDao
-    // should not reference Jena objects. (However, the problem isn't really solved 
+    // should not reference Jena objects. (However, the problem isn't really solved
     // because EditLiteral currently references the Jena API.)
     public EditLiteral getLabelEditLiteral(String individualUri) {
         Literal literal = getLabelLiteral(individualUri);
@@ -702,7 +702,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
         String value = literal.getLexicalForm();
         String datatype = literal.getDatatypeURI();
         String lang = literal.getLanguage();
-        return new EditLiteral(value, datatype, lang);       
+        return new EditLiteral(value, datatype, lang);
     }
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java
index e26661533..bfc57e80e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java
@@ -54,25 +54,25 @@ public class IndividualDaoSDB extends IndividualDaoJena {
 	private DatasetWrapperFactory dwf;
     private SDBDatasetMode datasetMode;
     private WebappDaoFactorySDB wadf;
-	
-    public IndividualDaoSDB(DatasetWrapperFactory dwf, 
-                            SDBDatasetMode datasetMode, 
+
+    public IndividualDaoSDB(DatasetWrapperFactory dwf,
+                            SDBDatasetMode datasetMode,
                             WebappDaoFactorySDB wadf) {
         super(wadf);
         this.dwf = dwf;
         this.datasetMode = datasetMode;
         this.wadf = wadf;
     }
-    
+
     protected DatasetWrapper getDatasetWrapper() {
     	return dwf.getDatasetWrapper();
     }
-    
+
     protected Individual makeIndividual(String individualURI) {
         try {
-            return new IndividualSDB(individualURI, 
+            return new IndividualSDB(individualURI,
             	                     this.dwf,
-            	                     datasetMode, 
+            	                     datasetMode,
             	                     wadf);
         } catch (IndividualNotFoundException e) {
             // If the individual does not exist, return null.
@@ -96,24 +96,24 @@ public class IndividualDaoSDB extends IndividualDaoJena {
     protected OntModel getOntModel() {
     	return getOntModelSelector().getABoxModel();
     }
-    
+
     private static final boolean SKIP_INITIALIZATION = true;
-    
+
     @Override
-    public List getIndividualsByVClassURI(String vclassURI, 
-    		                              int offset, 
+    public List getIndividualsByVClassURI(String vclassURI,
+    		                              int offset,
     		                              int quantity ) {
 
     	if (vclassURI==null) {
             return null;
         }
-        
+
         List<Individual> ents = new ArrayList<Individual>();
-        
-        Resource theClass = (vclassURI.indexOf(PSEUDO_BNODE_NS) == 0) 
+
+        Resource theClass = (vclassURI.indexOf(PSEUDO_BNODE_NS) == 0)
             ? getOntModel().createResource(new AnonId(vclassURI.split("#")[1]))
             : ResourceFactory.createResource(vclassURI);
-    
+
         if (theClass.isAnon() && theClass.canAs(UnionClass.class)) {
         	UnionClass u = theClass.as(UnionClass.class);
         	for (OntClass operand : u.listOperands().toList()) {
@@ -121,13 +121,13 @@ public class IndividualDaoSDB extends IndividualDaoJena {
         		ents.addAll(getIndividualsByVClass(vc));
         	}
         } else {
-        	
+
         	List<Individual> individualList;
-        	
+
         	// Check if there is a graph filter.
         	// If so, we will use it in a slightly strange way.  Unfortunately,
-        	// performance is quite bad if we add several graph variables in 
-        	// order to account for the fact that an individual's type 
+        	// performance is quite bad if we add several graph variables in
+        	// order to account for the fact that an individual's type
         	// declaration may be in a different graph from its label.
         	// Thus, we will run two queries: one with a single
         	// graph variable to get the list of URIs, and a second against
@@ -135,32 +135,32 @@ public class IndividualDaoSDB extends IndividualDaoJena {
         	// We will then toss out any individual in the second
         	// list that is not also in the first list.
         	// Annoying, yes, but better than the alternative.
-        	// Note that both queries need to sort identically or 
+        	// Note that both queries need to sort identically or
         	// the results may be very strange.
         	String[] graphVars = {"?g"};
         	String filterStr = WebappDaoFactorySDB.getFilterBlock(
         			graphVars, datasetMode);
         	if (!StringUtils.isEmpty(filterStr)) {
-        		List<Individual> graphFilteredIndividualList = 
+        		List<Individual> graphFilteredIndividualList =
         			    getGraphFilteredIndividualList(theClass, filterStr);
         		List<Individual> unfilteredIndividualList = getIndividualList(
         				theClass);
         		Iterator<Individual> unfilteredIt  = unfilteredIndividualList
-        													.iterator(); 
+        													.iterator();
         		for (Individual filt : graphFilteredIndividualList) {
         			Individual unfilt = unfilteredIt.next();
         			while (!unfilt.getURI().equals(filt.getURI())) {
         				unfilt = unfilteredIt.next();
         			}
         			ents.add(unfilt);
-        		}	
+        		}
         	} else {
         		ents = getIndividualList(theClass);
         	}
         }
-        
+
         java.util.Collections.sort(ents);
-        
+
         if (quantity > 0 && offset > 0) {
             List<Individual> sublist = new ArrayList<Individual>();
             for (int i = offset - 1; i < ((offset - 1) + quantity); i++) {
@@ -168,11 +168,11 @@ public class IndividualDaoSDB extends IndividualDaoJena {
             }
             return sublist;
         }
-        
+
         return ents;
 
     }
-        
+
     private List<Individual> getIndividualList(Resource theClass) {
     	final List<Individual> ents = new ArrayList<Individual>();
    	    DatasetWrapper w = getDatasetWrapper();
@@ -239,18 +239,18 @@ public class IndividualDaoSDB extends IndividualDaoJena {
     	} finally {
     		dataset.getLock().leaveCriticalSection();
     		w.close();
-    	} 
+    	}
         return ents;
     }
-    
-    private List<Individual> getGraphFilteredIndividualList(Resource theClass, 
+
+    private List<Individual> getGraphFilteredIndividualList(Resource theClass,
     		                                                String filterStr) {
 		final List<Individual> filteredIndividualList = new ArrayList<Individual>();
 		DatasetWrapper w = getDatasetWrapper();
    	    Dataset dataset = w.getDataset();
        	dataset.getLock().enterCriticalSection(Lock.READ);
        	try {
-    		String query = 
+    		String query =
     			"SELECT DISTINCT ?ind " +
     			"WHERE " +
     			"{ GRAPH ?g { \n" +
@@ -284,16 +284,16 @@ public class IndividualDaoSDB extends IndividualDaoJena {
 		}
        	return filteredIndividualList;
     }
-    
+
     private Individual makeIndividual(String uri, String label) throws IndividualNotFoundException {
-        Individual ent = new IndividualSDB(uri, 
-                this.dwf, datasetMode, wadf, 
+        Individual ent = new IndividualSDB(uri,
+                this.dwf, datasetMode, wadf,
                 SKIP_INITIALIZATION);
         ent.setName(label);
 		ent.setRdfsLabel(label);
         return ent;
     }
-	
+
     @Override
     public Individual getIndividualByURI(String entityURI) {
         if( entityURI == null || entityURI.length() == 0 ) {
@@ -301,10 +301,10 @@ public class IndividualDaoSDB extends IndividualDaoJena {
         } else {
         	return makeIndividual(entityURI);
         }
-    }  
-    
+    }
+
     /**
-     * fills in the Individual objects needed for any ObjectPropertyStatements 
+     * fills in the Individual objects needed for any ObjectPropertyStatements
      * attached to the specified individual.
      * @param entity An individual
      */
@@ -319,20 +319,20 @@ public class IndividualDaoSDB extends IndividualDaoJena {
             getOntModel().leaveCriticalSection();
         }
     }
-    
+
     /**
      * In Jena it can be difficult to get an object with a given dataproperty if
      * you do not care about the datatype or lang of the literal.  Use this
-     * method if you would like to ignore the lang and datatype.  
-     * 
-     * Note: this method doesn't require that a property be declared in the 
+     * method if you would like to ignore the lang and datatype.
+     *
+     * Note: this method doesn't require that a property be declared in the
      * ontology as a data property -- only that it behaves as one.
      */
     @Override
-    public List<Individual> getIndividualsByDataProperty(String dataPropertyUri, 
-    	                                                 String value){  
+    public List<Individual> getIndividualsByDataProperty(String dataPropertyUri,
+    	                                                 String value){
     	OntModel fullModel = getOntModelSelector().getFullModel();
-    	
+
         Property prop = null;
         if( RDFS.label.getURI().equals( dataPropertyUri )){
             prop = RDFS.label;
@@ -340,7 +340,7 @@ public class IndividualDaoSDB extends IndividualDaoJena {
             prop = fullModel.getProperty(dataPropertyUri);
         }
 
-        if( prop == null ) {            
+        if( prop == null ) {
             log.debug("Could not getIndividualsByDataProperty() " +
                     "because " + dataPropertyUri + "was not found in model.");
             return Collections.emptyList();
@@ -351,116 +351,116 @@ public class IndividualDaoSDB extends IndividualDaoJena {
                     "because value was null");
             return Collections.emptyList();
         }
-        
-        Literal litv1 = fullModel.createLiteral(value);        
-        Literal litv2 = fullModel.createTypedLiteral(value);   
-        
+
+        Literal litv1 = fullModel.createLiteral(value);
+        Literal litv2 = fullModel.createTypedLiteral(value);
+
         //warning: this assumes that any language tags will be EN
-        Literal litv3 = fullModel.createLiteral(value,"EN");        
-        
-        HashMap<String,Individual> individualsMap = 
+        Literal litv3 = fullModel.createLiteral(value,"EN");
+
+        HashMap<String,Individual> individualsMap =
         		new HashMap<String, Individual>();
-                
+
         fullModel.enterCriticalSection(Lock.READ);
         int count = 0;
         try{
             StmtIterator stmts
-                = fullModel.listStatements((Resource)null, prop, litv1);                                           
+                = fullModel.listStatements((Resource)null, prop, litv1);
             while(stmts.hasNext()){
                 count++;
                 Statement stmt = stmts.nextStatement();
-                
+
                 RDFNode sub = stmt.getSubject();
-                if( sub == null || sub.isAnon() || sub.isLiteral() )                    
-                    continue;                
-                
+                if( sub == null || sub.isAnon() || sub.isLiteral() )
+                    continue;
+
                 RDFNode obj = stmt.getObject();
                 if( obj == null || !obj.isLiteral() )
                     continue;
-                
+
                 Literal literal = (Literal)obj;
                 Object v = literal.getValue();
-                if( v == null )                     
-                    continue;                
-                
+                if( v == null )
+                    continue;
+
                 String subUri = ((Resource)sub).getURI();
                 if( ! individualsMap.containsKey(subUri)){
                     individualsMap.put(subUri,makeIndividual(subUri));
                 }
             }
-            
-            stmts = fullModel.listStatements((Resource)null, prop, litv2);                                           
+
+            stmts = fullModel.listStatements((Resource)null, prop, litv2);
             while(stmts.hasNext()){
                 count++;
                 Statement stmt = stmts.nextStatement();
-                
+
                 RDFNode sub = stmt.getSubject();
-                if( sub == null || sub.isAnon() || sub.isLiteral() )                    
-                    continue;                
-                
+                if( sub == null || sub.isAnon() || sub.isLiteral() )
+                    continue;
+
                 RDFNode obj = stmt.getObject();
                 if( obj == null || !obj.isLiteral() )
                     continue;
-                
+
                 Literal literal = (Literal)obj;
                 Object v = literal.getValue();
-                if( v == null )                     
-                    continue;                
-                
+                if( v == null )
+                    continue;
+
                 String subUri = ((Resource)sub).getURI();
                 if( ! individualsMap.containsKey(subUri)){
                     individualsMap.put(subUri, makeIndividual(subUri));
-                }                
+                }
             }
-            
-            stmts = fullModel.listStatements((Resource)null, prop, litv3);                                           
+
+            stmts = fullModel.listStatements((Resource)null, prop, litv3);
             while(stmts.hasNext()){
                 count++;
                 Statement stmt = stmts.nextStatement();
-                
+
                 RDFNode sub = stmt.getSubject();
-                if( sub == null || sub.isAnon() || sub.isLiteral() )                    
-                    continue;                
-                
+                if( sub == null || sub.isAnon() || sub.isLiteral() )
+                    continue;
+
                 RDFNode obj = stmt.getObject();
                 if( obj == null || !obj.isLiteral() )
                     continue;
-                
+
                 Literal literal = (Literal)obj;
                 Object v = literal.getValue();
-                if( v == null )                     
-                    continue;                
-                
+                if( v == null )
+                    continue;
+
                 String subUri = ((Resource)sub).getURI();
                 if( ! individualsMap.containsKey(subUri)){
                     individualsMap.put(subUri, makeIndividual(subUri));
-                }                
+                }
             }
         } finally {
             fullModel.leaveCriticalSection();
         }
-        
+
         List<Individual> rv = new ArrayList(individualsMap.size());
         rv.addAll(individualsMap.values());
         return rv;
     }
-    
+
     @Override
     public Collection<String> getAllIndividualUris() {
         final List<String> list = new LinkedList<String>();
-        
+
         // get all labeled resources from any non-tbox and non-metadata graphs,
         // as well as the unnamed graph (first pattern below)
         String query = "SELECT DISTINCT ?ind WHERE { \n" +
                        " { ?ind <" + RDFS.label.getURI() + "> ?label } " +
-                       " UNION { " + 
+                       " UNION { " +
                        "  GRAPH ?g { ?ind <" + RDFS.label.getURI() +
                                           "> ?label } \n" +
                        "  FILTER (?g != <" + ModelNames.APPLICATION_METADATA + "> " +
                        "          && !regex(str(?g),\"tbox\")) \n " +
                        " } " +
                        "}";
-              
+
 	    Query q = QueryFactory.create(query);
 	    DatasetWrapper w = getDatasetWrapper();
 	    Dataset dataset = w.getDataset();
@@ -481,17 +481,17 @@ public class IndividualDaoSDB extends IndividualDaoJena {
         }
 
         return list;
-    }  
+    }
 
     private Iterator<Individual> getIndividualIterator(
     									final List<String> individualURIs) {
         if (individualURIs.size() >0){
-            log.info("Number of individuals from source: " 
+            log.info("Number of individuals from source: "
             		+ individualURIs.size());
             return new Iterator<Individual>(){
                 Iterator<String> innerIt = individualURIs.iterator();
-                public boolean hasNext() { 
-                    return innerIt.hasNext();                    
+                public boolean hasNext() {
+                    return innerIt.hasNext();
                 }
                 public Individual next() {
                     String indURI = innerIt.next();
@@ -504,12 +504,12 @@ public class IndividualDaoSDB extends IndividualDaoJena {
                 }
                 public void remove() {
                     //not used
-                }            
+                }
             };
         }
         else
             return null;
-    }       
+    }
 
     @Override
     public Iterator<String> getUpdatedSinceIterator(long updatedSince){
@@ -546,5 +546,5 @@ public class IndividualDaoSDB extends IndividualDaoJena {
         }
         return individualURIs.iterator();
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java
index 1273bbe94..c3ec8bb75 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java
@@ -48,7 +48,7 @@ public class IndividualJena extends IndividualImpl implements Individual {
     private WebappDaoFactoryJena webappDaoFactory = null;
     private Float _searchBoostJena = null;
     private boolean retrievedNullRdfsLabel = false;
-    
+
     public IndividualJena(OntResource ind, WebappDaoFactoryJena wadf) {
         this.ind = ind;
         if (ind.isAnon()) {
@@ -78,7 +78,7 @@ public class IndividualJena extends IndividualImpl implements Individual {
             }
         }
     }
-    
+
     public String getLabel() {
         return getRdfsLabel();
     }
@@ -88,7 +88,7 @@ public class IndividualJena extends IndividualImpl implements Individual {
             return rdfsLabel;
         } else if( this.rdfsLabel == null && retrievedNullRdfsLabel ){
         	return null;
-        } else { 
+        } else {
             ind.getOntModel().enterCriticalSection(Lock.READ);
             try {
                 this.rdfsLabel = webappDaoFactory.getJenaBaseDao().getLabel(ind);
@@ -99,7 +99,7 @@ public class IndividualJena extends IndividualImpl implements Individual {
             }
         }
     }
-    
+
     public String getVClassURI() {
         if (this.vClassURI != null) {
             return vClassURI;
@@ -175,17 +175,17 @@ public class IndividualJena extends IndividualImpl implements Individual {
             ind.getOntModel().enterCriticalSection(Lock.READ);
             try{
                 try {
-                    searchBoost = 
+                    searchBoost =
                         ((Literal)ind.getPropertyValue(webappDaoFactory.getJenaBaseDao().SEARCH_BOOST_ANNOT)).getFloat();
                 } catch (Exception e) {
                     searchBoost = null;
-                }                
+                }
                 return searchBoost;
             }finally{
                 ind.getOntModel().leaveCriticalSection();
             }
         }
-    }    
+    }
 
 	@Override
 	public String getMainImageUri() {
@@ -243,7 +243,7 @@ public class IndividualJena extends IndividualImpl implements Individual {
             return this.objectPropertyStatements;
         }
     }
-    
+
     @Override
     public List<ObjectPropertyStatement> getObjectPropertyStatements(String propertyURI) {
     	if (propertyURI == null) {
@@ -256,7 +256,7 @@ public class IndividualJena extends IndividualImpl implements Individual {
     		while (sit.hasNext()) {
     			Statement s = sit.nextStatement();
     			if (!s.getSubject().canAs(OntResource.class) || !s.getObject().canAs(OntResource.class)) {
-    			    continue;	
+    			    continue;
     			}
     			Individual subj = new IndividualJena(s.getSubject().as(OntResource.class), webappDaoFactory);
     			Individual obj = new IndividualJena(s.getObject().as(OntResource.class), webappDaoFactory);
@@ -291,15 +291,15 @@ public class IndividualJena extends IndividualImpl implements Individual {
     	    	RDFNode value = values.nextNode();
     	    	if (value.canAs(OntResource.class)) {
         	    	relatedIndividuals.add(
-        	    		new IndividualJena(value.as(OntResource.class), webappDaoFactory) );  
-        	    } 
+        	    		new IndividualJena(value.as(OntResource.class), webappDaoFactory) );
+        	    }
     	    }
     	} finally {
     		ind.getOntModel().leaveCriticalSection();
     	}
     	return relatedIndividuals;
     }
-    
+
     @Override
     public Individual getRelatedIndividual(String propertyURI) {
     	if (propertyURI == null) {
@@ -309,7 +309,7 @@ public class IndividualJena extends IndividualImpl implements Individual {
     	try {
     	    RDFNode value = ind.getPropertyValue(ind.getModel().getProperty(propertyURI));
     	    if (value != null && value.canAs(OntResource.class)) {
-    	    	return new IndividualJena(value.as(OntResource.class), webappDaoFactory);  
+    	    	return new IndividualJena(value.as(OntResource.class), webappDaoFactory);
     	    } else {
     	    	return null;
     	    }
@@ -317,7 +317,7 @@ public class IndividualJena extends IndividualImpl implements Individual {
     		ind.getOntModel().leaveCriticalSection();
     	}
     }
-    
+
     public List<ObjectProperty> getObjectPropertyList() {
         if (this.propertyList != null) {
             return this.propertyList;
@@ -331,14 +331,14 @@ public class IndividualJena extends IndividualImpl implements Individual {
         }
     }
 
-    @Override 
+    @Override
     public List<ObjectProperty> getPopulatedObjectPropertyList() {
         if (populatedObjectPropertyList == null) {
             populatedObjectPropertyList = webappDaoFactory.getObjectPropertyDao().getObjectPropertyList(this);
         }
-        return populatedObjectPropertyList;       
+        return populatedObjectPropertyList;
     }
-    
+
     @Override
     public Map<String,ObjectProperty> getObjectPropertyMap() {
     	if (this.objectPropertyMap != null) {
@@ -354,7 +354,7 @@ public class IndividualJena extends IndividualImpl implements Individual {
 				}
 			}
     		this.objectPropertyMap = map;
-    		return map;    		
+    		return map;
     	}
     }
 
@@ -383,15 +383,15 @@ public class IndividualJena extends IndividualImpl implements Individual {
             return this.datatypePropertyList;
         }
     }
-    
-    @Override 
+
+    @Override
     public List<DataProperty> getPopulatedDataPropertyList() {
         if (populatedDataPropertyList == null) {
             populatedDataPropertyList = webappDaoFactory.getDataPropertyDao().getDataPropertyList(this);
         }
-        return populatedDataPropertyList;       
+        return populatedDataPropertyList;
     }
-    
+
     @Override
     public Map<String,DataProperty> getDataPropertyMap() {
     	if (this.dataPropertyMap != null) {
@@ -407,7 +407,7 @@ public class IndividualJena extends IndividualImpl implements Individual {
 				}
 			}
     		this.dataPropertyMap = map;
-    		return map;    		
+    		return map;
     	}
     }
 
@@ -426,12 +426,12 @@ public class IndividualJena extends IndividualImpl implements Individual {
             return this.externalIds;
         }
     }
-    
+
     @Override
     public List<VClass> getVClasses() {
     	return getVClasses(false);
     }
-    
+
     @Override
     public List<VClass> getVClasses(boolean direct) {
     	if (direct) {
@@ -450,13 +450,13 @@ public class IndividualJena extends IndividualImpl implements Individual {
     		}
     	}
     }
-    
+
     private List<VClass> getMyVClasses(boolean direct) {
-		List<VClass> vClassList = new ArrayList<VClass>(); 
+		List<VClass> vClassList = new ArrayList<VClass>();
 		OntModel ontModel = ind.getOntModel();
 		ontModel.enterCriticalSection(Lock.READ);
 		try {
-			ClosableIterator typeIt = ind.listRDFTypes(direct); 
+			ClosableIterator typeIt = ind.listRDFTypes(direct);
 			try {
 				for (Iterator it = typeIt; it.hasNext();) {
 					Resource type = (Resource) typeIt.next();
@@ -467,7 +467,7 @@ public class IndividualJena extends IndividualImpl implements Individual {
 							vClassList.add(vc);
 						}
 					}
-					
+
 				}
 			} finally {
 				typeIt.close();
@@ -480,11 +480,11 @@ public class IndividualJena extends IndividualImpl implements Individual {
 		} catch (Exception e) {}
 		return vClassList;
 	}
-    
+
 	/**
 	 * The base method in {@link IndividualImpl} is adequate if the reasoner is
-	 * up to date. 
-	 * 
+	 * up to date.
+	 *
 	 * If the base method returns false, check directly to see if
 	 * any of the super classes of the direct classes will satisfy this request.
 	 */
@@ -525,9 +525,9 @@ public class IndividualJena extends IndividualImpl implements Individual {
         /*  }*/
 		}
     }
-    
+
     private Collator collator = Collator.getInstance();
-    
+
     private void sortObjectPropertyStatementsForDisplay(ObjectProperty prop) {
     	try {
     		log.info("Doing special sort for "+prop.getDomainPublic());
@@ -607,7 +607,7 @@ public class IndividualJena extends IndividualImpl implements Individual {
                 log.error("Exception sorting object property statements for object property "+this.getURI());
             }
 
-    		
+
     	} catch (Exception e) {
     		log.error(e, e);
     	}
@@ -617,5 +617,5 @@ public class IndividualJena extends IndividualImpl implements Individual {
 	public void resolveAsFauxPropertyStatements(List<ObjectPropertyStatement> list) {
 		webappDaoFactory.getObjectPropertyStatementDao().resolveAsFauxPropertyStatements(list);
 	}
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java
index 18fc66d96..6e560d653 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java
@@ -67,13 +67,13 @@ public class IndividualSDB extends IndividualImpl implements Individual {
     private Float _searchBoostJena = null;
     private boolean retreivedNullRdfsLabel = false;
     private DatasetWrapperFactory dwf = null;
-    private SDBDatasetMode datasetMode = 
+    private SDBDatasetMode datasetMode =
                 SDBDatasetMode.ASSERTIONS_AND_INFERENCES;
-    private String individualURI = null; 
+    private String individualURI = null;
     private Model model = null;
-    private Boolean _hasThumb = null; 
-    
-    public IndividualSDB(String individualURI, 
+    private Boolean _hasThumb = null;
+
+    public IndividualSDB(String individualURI,
                          DatasetWrapperFactory datasetWrapperFactory,
                          SDBDatasetMode datasetMode,
                          WebappDaoFactorySDB wadf,
@@ -81,37 +81,37 @@ public class IndividualSDB extends IndividualImpl implements Individual {
     	this.individualURI = individualURI;
 		this.webappDaoFactory = wadf;
     	this.dwf = datasetWrapperFactory;
-      
+
     	try {
 	    	initModel.getLock().enterCriticalSection(Lock.READ);
-	    	String getStatements = 
+	    	String getStatements =
 	    		"CONSTRUCT \n" +
-	    		"{ <"+individualURI+">  <" + RDFS.label.getURI() + 
+	    		"{ <"+individualURI+">  <" + RDFS.label.getURI() +
 	    		        "> ?ooo. \n" +
 	    		   "<"+individualURI+">  a ?type . \n" +
 	    		 "} \n" +
 	    		 "WHERE { \n" +
-	    		 	"{ <"+individualURI+">  <" + RDFS.label.getURI() + 
+	    		 	"{ <"+individualURI+">  <" + RDFS.label.getURI() +
 	    		 	        "> ?ooo }  \n" +
 	    		 	" UNION { <"+individualURI+"> a ?type } \n" +
-	    		 "} "; 
+	    		 "} ";
     		this.model = QueryExecutionFactory.create(
     		        QueryFactory.create(getStatements), initModel)
     		                .execConstruct();
     	} finally {
     		initModel.getLock().leaveCriticalSection();
     	}
-    	
+
     	OntModel ontModel = ModelFactory.createOntologyModel(
     	        OntModelSpec.OWL_MEM, model);
-    	this.ind = ontModel.createOntResource(individualURI);  
+    	this.ind = ontModel.createOntResource(individualURI);
     	setUpURIParts(ind);
     }
-    
-    public IndividualSDB(String individualURI, 
-            DatasetWrapperFactory datasetWrapperFactory, 
+
+    public IndividualSDB(String individualURI,
+            DatasetWrapperFactory datasetWrapperFactory,
             SDBDatasetMode datasetMode,
-            WebappDaoFactorySDB wadf, 
+            WebappDaoFactorySDB wadf,
             boolean skipInitialization) throws IndividualNotFoundException {
     	this.individualURI = individualURI;
     	this.datasetMode = datasetMode;
@@ -121,15 +121,15 @@ public class IndividualSDB extends IndividualImpl implements Individual {
     	if (skipInitialization) {
             OntModel ontModel = ModelFactory.createOntologyModel(
                     OntModelSpec.OWL_MEM);
-            this.ind = ontModel.createOntResource(individualURI);  
+            this.ind = ontModel.createOntResource(individualURI);
     	} else {
         	try {
     	    	String getStatements =
     	    		"CONSTRUCT " +
-    	    		"{ <"+individualURI+">  <" + RDFS.label.getURI() + 
+    	    		"{ <"+individualURI+">  <" + RDFS.label.getURI() +
     	    		        "> ?ooo \n" +
     	    		 "} WHERE {" +
-    	    		 	"{ <"+individualURI+">  <" + RDFS.label.getURI() + 
+    	    		 	"{ <"+individualURI+">  <" + RDFS.label.getURI() +
     	    		 	        "> ?ooo } \n" +
     	    		 "}";
 
@@ -137,19 +137,19 @@ public class IndividualSDB extends IndividualImpl implements Individual {
 				webappDaoFactory.getRDFService().sparqlConstructQuery(getStatements, model);
         	} catch (RDFServiceException e) {
         	}
-        	
+
         	OntModel ontModel = ModelFactory.createOntologyModel(
         	        OntModelSpec.OWL_MEM, model);
-        	
+
         	if (model.isEmpty() && noTriplesFor(individualURI)) {
         	    throw new IndividualNotFoundException();
         	}
-        	
-        	this.ind = ontModel.createOntResource(individualURI);  
+
+        	this.ind = ontModel.createOntResource(individualURI);
     	}
     	setUpURIParts(ind);
     }
-    
+
     private boolean noTriplesFor(String individualURI) {
 		try {
 			return !webappDaoFactory.getRDFService().sparqlAskQuery("ASK { <" + individualURI + "> ?p ?o }");
@@ -158,22 +158,22 @@ public class IndividualSDB extends IndividualImpl implements Individual {
 
 		return true;
     }
-    
+
     static final boolean SKIP_INITIALIZATION = true;
 
     public IndividualSDB(String individualURI,
             DatasetWrapperFactory datasetWrapperFactory,
             SDBDatasetMode datasetMode,
             WebappDaoFactorySDB wadf) throws IndividualNotFoundException {
-        this(individualURI, 
-             datasetWrapperFactory, 
-             datasetMode, 
-             wadf, 
+        this(individualURI,
+             datasetWrapperFactory,
+             datasetMode,
+             wadf,
              !SKIP_INITIALIZATION);
     }
-    
+
     public class IndividualNotFoundException extends Exception {}
-    
+
     private void setUpURIParts(OntResource ind) {
         if (ind != null) {
             if (ind.isAnon()) {
@@ -192,52 +192,52 @@ public class IndividualSDB extends IndividualImpl implements Individual {
     private DatasetWrapper getDatasetWrapper() {
         return this.dwf.getDatasetWrapper();
     }
-    
-    public String getName() { 
+
+    public String getName() {
         if (this.name != null) {
             return name;
         } else {
         	ind.getOntModel().enterCriticalSection(Lock.READ);
-        	
+
             try {
                 this.name = webappDaoFactory.getJenaBaseDao().getLabelOrId(ind);
                 if (this.name == null) {
                     this.name = "[null]";
                 }
                 return this.name;
-          
+
             } finally {
-              
+
             	ind.getOntModel().leaveCriticalSection();
             }
         }
     }
 
-    public String getRdfsLabel() { 
+    public String getRdfsLabel() {
         if (this.rdfsLabel != null) {
             return rdfsLabel;
         } else if( this.rdfsLabel == null && retreivedNullRdfsLabel ){
         	return null;
-        } else { 
-           
+        } else {
+
         	ind.getOntModel().enterCriticalSection(Lock.READ);
             try {
                 this.rdfsLabel = webappDaoFactory.getJenaBaseDao().getLabel(ind);
                 retreivedNullRdfsLabel = this.rdfsLabel == null;
                 return this.rdfsLabel;
             } finally {
-               
+
             	ind.getOntModel().leaveCriticalSection();
             }
         }
     }
-    
-	public String getVClassURI() { 
+
+	public String getVClassURI() {
         if (this.vClassURI != null) {
             return vClassURI;
         } else {
         	List<VClass> clist = getVClasses(true);
-        	return (clist.size() > 0) ? clist.get(0).getURI() : null; 
+        	return (clist.size() > 0) ? clist.get(0).getURI() : null;
         }
     }
 
@@ -246,17 +246,17 @@ public class IndividualSDB extends IndividualImpl implements Individual {
             return this.vClass;
         } else {
         	List<VClass> clist = getVClasses(true);
-            return (clist.size() > 0) ? clist.get(0) : null ; 
-        } 
+            return (clist.size() > 0) ? clist.get(0) : null ;
+        }
     }
-    
+
     @Override
     public List<String> getMostSpecificTypeURIs() {
         final List<String> typeURIs = new ArrayList<String>();
         if (this.getURI() == null) {
             return typeURIs;
         } else {
-            String queryStr = "SELECT ?type WHERE { <" + this.getURI() + "> <" + 
+            String queryStr = "SELECT ?type WHERE { <" + this.getURI() + "> <" +
                     VitroVocabulary.MOST_SPECIFIC_TYPE + "> ?type }";
             try {
 				webappDaoFactory.getRDFService().sparqlSelectQuery(queryStr, new ResultSetConsumer() {
@@ -280,7 +280,7 @@ public class IndividualSDB extends IndividualImpl implements Individual {
         if (modTime != null) {
             return modTime;
         } else {
-           
+
         	ind.getOntModel().enterCriticalSection(Lock.READ);
             try {
                 Date modDate = webappDaoFactory.getJenaBaseDao()
@@ -291,20 +291,20 @@ public class IndividualSDB extends IndividualImpl implements Individual {
                 }
                 return modTime;
             } finally {
-               
+
             	ind.getOntModel().leaveCriticalSection();
             }
         }
     }
 
-    public Float getSearchBoost(){ 
+    public Float getSearchBoost(){
         if( this._searchBoostJena != null ){
             return this._searchBoostJena;
         }else{
-            String getPropertyValue = 
+            String getPropertyValue =
             	"SELECT ?value \n" +
             	"WHERE { \n" +
-            	"<" +individualURI+ "> <" +webappDaoFactory.getJenaBaseDao().SEARCH_BOOST_ANNOT+ "> ?value \n" + 
+            	"<" +individualURI+ "> <" +webappDaoFactory.getJenaBaseDao().SEARCH_BOOST_ANNOT+ "> ?value \n" +
             	"}";
             DatasetWrapper w = getDatasetWrapper();
             Dataset dataset = w.getDataset();
@@ -312,7 +312,7 @@ public class IndividualSDB extends IndividualImpl implements Individual {
         	QueryExecution qe = QueryExecutionFactory.create(
                     QueryFactory.create(getPropertyValue), dataset);
             try{
-                ResultSet rs = qe.execSelect();       
+                ResultSet rs = qe.execSelect();
                 if(rs.hasNext()){
                 	QuerySolution qs = rs.nextSolution();
                 	if(qs.get("value") !=null){
@@ -324,8 +324,8 @@ public class IndividualSDB extends IndividualImpl implements Individual {
                    return null;
                 }
             } catch (Exception e){
-            	log.error(e,e); 
-                return null;            	
+            	log.error(e,e);
+                return null;
             } finally{
                 qe.close();
             	dataset.getLock().leaveCriticalSection();
@@ -333,26 +333,26 @@ public class IndividualSDB extends IndividualImpl implements Individual {
             }
         }
         return null;
-    }    
+    }
 
 	@Override
-	public String getMainImageUri() {  
+	public String getMainImageUri() {
 		if (this.mainImageUri != NOT_INITIALIZED) {
 			return mainImageUri;
 		} else {
-			List<ObjectPropertyStatement> mainImgStmts = 
+			List<ObjectPropertyStatement> mainImgStmts =
 					getObjectPropertyStatements(VitroVocabulary.IND_MAIN_IMAGE);
 			if (mainImgStmts != null && mainImgStmts.size() > 0) {
 				// arbitrarily return the first value in the list
 				mainImageUri = mainImgStmts.get(0).getObjectURI();
-				return mainImageUri;				
-			} 
+				return mainImageUri;
+			}
 			return null;
 		}
 	}
 
 	@Override
-	public String getImageUrl() { 
+	public String getImageUrl() {
 		if (this.imageInfo == null) {
 			this.imageInfo = ImageInfo.instanceFromEntityUri(
 			        webappDaoFactory, this);
@@ -367,7 +367,7 @@ public class IndividualSDB extends IndividualImpl implements Individual {
 	}
 
 	@Override
-	public String getThumbUrl() { 
+	public String getThumbUrl() {
 		if (this.imageInfo == null) {
 			this.imageInfo = ImageInfo.instanceFromEntityUri(
 			        webappDaoFactory, this);
@@ -384,12 +384,12 @@ public class IndividualSDB extends IndividualImpl implements Individual {
 	@Override
 	public boolean hasThumb(){
 	    if( _hasThumb != null ){
-	        return _hasThumb;	    
-        }else{            
-            String ask = 
+	        return _hasThumb;
+        }else{
+            String ask =
                 "ASK { " +
                 "    <" + individualURI + "> <http://vitro.mannlib.cornell.edu/ns/vitro/public#mainImage> ?mainImage . \n" +
-                "    ?mainImage <http://vitro.mannlib.cornell.edu/ns/vitro/public#thumbnailImage> ?thumbImage . }\n"  ;                     
+                "    ?mainImage <http://vitro.mannlib.cornell.edu/ns/vitro/public#thumbnailImage> ?thumbImage . }\n"  ;
             try{
 				_hasThumb = webappDaoFactory.getRDFService().sparqlAskQuery(ask);
             }catch(Exception ex){
@@ -399,8 +399,8 @@ public class IndividualSDB extends IndividualImpl implements Individual {
             return _hasThumb;
         }
 	}
-	
-    public List<ObjectPropertyStatement> getObjectPropertyStatements() { 
+
+    public List<ObjectPropertyStatement> getObjectPropertyStatements() {
         if (this.objectPropertyStatements != null) {
             return this.objectPropertyStatements;
         } else {
@@ -414,7 +414,7 @@ public class IndividualSDB extends IndividualImpl implements Individual {
             return this.objectPropertyStatements;
         }
     }
-    
+
     @Override
     public List<ObjectPropertyStatement> getObjectPropertyStatements(String propertyURI) {
     	if (propertyURI == null) {
@@ -430,7 +430,7 @@ public class IndividualSDB extends IndividualImpl implements Individual {
     	dataset.getLock().enterCriticalSection(Lock.READ);
         QueryExecution qexec = null;
     	try {
-    		String valuesOfProperty = 
+    		String valuesOfProperty =
     			"CONSTRUCT{ <" + this.individualURI + "> <" + propertyURI + "> ?object }" +
     			"WHERE{ <" + this.individualURI + "> <" + propertyURI + "> ?object } \n";
             qexec = QueryExecutionFactory.create(QueryFactory.create(valuesOfProperty), dataset);
@@ -441,12 +441,12 @@ public class IndividualSDB extends IndividualImpl implements Individual {
     	    while (sit.hasNext()) {
     			Statement s = sit.nextStatement();
     			if (!s.getSubject().canAs(OntResource.class) || !s.getObject().canAs(OntResource.class)) {
-    			    continue;	
+    			    continue;
     			}
     			Individual subj = null;
     			try {
     			    subj = new IndividualSDB(
-    			            s.getSubject().as(OntResource.class).getURI(), 
+    			            s.getSubject().as(OntResource.class).getURI(),
     			                            this.dwf, datasetMode, webappDaoFactory);
     			} catch (IndividualNotFoundException e) {
     			    // leave null subject
@@ -454,14 +454,14 @@ public class IndividualSDB extends IndividualImpl implements Individual {
     			Individual obj = null;
     			try {
     			    obj = new IndividualSDB(
-    			            s.getObject().as(OntResource.class).getURI(), 
+    			            s.getObject().as(OntResource.class).getURI(),
     			                            this.dwf, datasetMode, webappDaoFactory);
     			} catch (IndividualNotFoundException e) {
     			    // leave null object
     			}
     			ObjectProperty op = webappDaoFactory.getObjectPropertyDao().getObjectPropertyByURI(s.getPredicate().getURI());
-    			// We don't want to filter out statements simply because we 
-    			// can't find a type for the property, so we'll just make a 
+    			// We don't want to filter out statements simply because we
+    			// can't find a type for the property, so we'll just make a
     			// new ObjectProperty bean if we can't get one from the DAO.
     			if (op == null) {
     				op = new ObjectProperty();
@@ -489,19 +489,19 @@ public class IndividualSDB extends IndividualImpl implements Individual {
     }
 
     @Override
-    public List<Individual> getRelatedIndividuals(String propertyURI) { 
+    public List<Individual> getRelatedIndividuals(String propertyURI) {
     	if (propertyURI == null) {
     		return null;
     	}
     	List<Individual> relatedIndividuals = new ArrayList<Individual>();
-    	
+
     	DatasetWrapper w = getDatasetWrapper();
     	Dataset dataset = w.getDataset();
     	dataset.getLock().enterCriticalSection(Lock.READ);
     	try {
-    		String valuesOfProperty = 
+    		String valuesOfProperty =
     			"SELECT ?object " +
-    			"WHERE{ <" + this.individualURI + "> <" + 
+    			"WHERE{ <" + this.individualURI + "> <" +
     			        propertyURI + "> ?object } \n";
     		ResultSet values = QueryExecutionFactory.create(
     		        QueryFactory.create(valuesOfProperty), dataset)
@@ -514,11 +514,11 @@ public class IndividualSDB extends IndividualImpl implements Individual {
         	    	if (value.canAs(OntResource.class)) {
             	    	relatedIndividuals.add(
             	    		new IndividualSDB(
-            	    		        value.as(OntResource.class).getURI(), 
-            	    		                this.dwf, 
-            	    		                datasetMode, 
-            	    		                webappDaoFactory) );  
-            	    } 
+            	    		        value.as(OntResource.class).getURI(),
+            	    		                this.dwf,
+            	    		                datasetMode,
+            	    		                webappDaoFactory) );
+            	    }
     	    	} catch (IndividualNotFoundException e) {
     	    	    // don't add to the list
     	    	}
@@ -529,9 +529,9 @@ public class IndividualSDB extends IndividualImpl implements Individual {
     	}
     	return relatedIndividuals;
     }
-    
+
     @Override
-    public Individual getRelatedIndividual(String propertyURI) { 
+    public Individual getRelatedIndividual(String propertyURI) {
     	if (propertyURI == null) {
     		return null;
     	}
@@ -539,9 +539,9 @@ public class IndividualSDB extends IndividualImpl implements Individual {
     	Dataset dataset = w.getDataset();
     	dataset.getLock().enterCriticalSection(Lock.READ);
     	try {
-    		String valueOfProperty = 
+    		String valueOfProperty =
     			"SELECT ?object " +
-    			"WHERE{ <" + this.individualURI + "> <" + 
+    			"WHERE{ <" + this.individualURI + "> <" +
     			        propertyURI + "> ?object } \n";
     		QueryExecution qe = QueryExecutionFactory.create(
                     QueryFactory.create(valueOfProperty), dataset);
@@ -553,12 +553,12 @@ public class IndividualSDB extends IndividualImpl implements Individual {
             	    if (value != null && value.canAs(OntResource.class)) {
             	        try {
                 	    	return new IndividualSDB(
-                	    	        value.as(OntResource.class).getURI(), 
+                	    	        value.as(OntResource.class).getURI(),
                 	    	                dwf, datasetMode, webappDaoFactory);
             	        } catch (IndividualNotFoundException e) {
             	            return null;
             	        }
-            	    } 
+            	    }
         	    }
         		return null;
     		} finally {
@@ -569,8 +569,8 @@ public class IndividualSDB extends IndividualImpl implements Individual {
     		w.close();
     	}
     }
-    
-    public List<ObjectProperty> getObjectPropertyList() { 
+
+    public List<ObjectProperty> getObjectPropertyList() {
         if (this.propertyList != null) {
             return this.propertyList;
         } else {
@@ -584,17 +584,17 @@ public class IndividualSDB extends IndividualImpl implements Individual {
         }
     }
 
-    @Override 
+    @Override
     public List<ObjectProperty> getPopulatedObjectPropertyList() {
         if (populatedObjectPropertyList == null) {
             populatedObjectPropertyList = webappDaoFactory
                     .getObjectPropertyDao().getObjectPropertyList(this);
         }
-        return populatedObjectPropertyList;       
+        return populatedObjectPropertyList;
     }
-    
+
     @Override
-    public Map<String,ObjectProperty> getObjectPropertyMap() { 
+    public Map<String,ObjectProperty> getObjectPropertyMap() {
     	if (this.objectPropertyMap != null) {
     		return objectPropertyMap;
     	} else {
@@ -608,11 +608,11 @@ public class IndividualSDB extends IndividualImpl implements Individual {
 				}
 			}
     		this.objectPropertyMap = map;
-    		return map;    		
+    		return map;
     	}
     }
 
-    public List<DataPropertyStatement> getDataPropertyStatements() { 
+    public List<DataPropertyStatement> getDataPropertyStatements() {
         if (this.dataPropertyStatements != null) {
             return this.dataPropertyStatements;
         } else {
@@ -628,7 +628,7 @@ public class IndividualSDB extends IndividualImpl implements Individual {
     }
 
     public List getDataPropertyList() {
-        if (this.datatypePropertyList != null) { 
+        if (this.datatypePropertyList != null) {
             return this.datatypePropertyList;
         } else {
             try {
@@ -641,17 +641,17 @@ public class IndividualSDB extends IndividualImpl implements Individual {
         }
     }
 
-    @Override 
+    @Override
     public List<DataProperty> getPopulatedDataPropertyList() {
         if (populatedDataPropertyList == null) {
             populatedDataPropertyList = webappDaoFactory.getDataPropertyDao()
                     .getDataPropertyList(this);
         }
-        return populatedDataPropertyList;       
+        return populatedDataPropertyList;
     }
-    
+
     @Override
-    public Map<String,DataProperty> getDataPropertyMap() { 
+    public Map<String,DataProperty> getDataPropertyMap() {
     	if (this.dataPropertyMap != null) {
     		return dataPropertyMap;
     	} else {
@@ -665,11 +665,11 @@ public class IndividualSDB extends IndividualImpl implements Individual {
 				}
 			}
     		this.dataPropertyMap = map;
-    		return map;    		
+    		return map;
     	}
     }
-    
-    @Override 
+
+    @Override
     public List<DataPropertyStatement> getDataPropertyStatements(String propertyUri) {
         List<DataPropertyStatement> stmts = this.dataPropertyStatements;
         if (stmts == null) {
@@ -684,14 +684,14 @@ public class IndividualSDB extends IndividualImpl implements Individual {
             return stmtsForProp;
         }
     }
-    
+
     @Override
     public String getDataValue(String propertyUri) {
         if (propertyUri == null) {
             log.error("Cannot retrieve value for null property");
             return null;
         } else if (this.getURI() == null) {
-            log.error("Cannot retrieve value of property " + propertyUri + 
+            log.error("Cannot retrieve value of property " + propertyUri +
                     " for anonymous individual");
             return null;
         } else {
@@ -703,15 +703,15 @@ public class IndividualSDB extends IndividualImpl implements Individual {
         }
         return null; // not found
     }
-    
-    @Override 
+
+    @Override
     public List<String> getDataValues(String propertyUri) {
         List<String> values = new ArrayList<String>();
         if (propertyUri == null) {
             log.error("Cannot retrieve value for null property");
             return null;
         } else if (this.getURI() == null) {
-            log.error("Cannot retrieve value of property " + propertyUri + 
+            log.error("Cannot retrieve value of property " + propertyUri +
                     " for anonymous individual");
             return null;
         } else {
@@ -730,8 +730,8 @@ public class IndividualSDB extends IndividualImpl implements Individual {
         final List<DataPropertyStatement> stmts = new ArrayList<DataPropertyStatement>();
 		final IndividualSDB individualSDB = this;
 
-        String queryStr = "SELECT (str(?value) as ?valueString) WHERE { <" 
-                + this.getURI() + "> <" + propertyUri + "> ?value }"; 
+        String queryStr = "SELECT (str(?value) as ?valueString) WHERE { <"
+                + this.getURI() + "> <" + propertyUri + "> ?value }";
         try {
 			webappDaoFactory.getRDFService().sparqlSelectQuery(
 					queryStr, new ResultSetConsumer() {
@@ -761,13 +761,13 @@ public class IndividualSDB extends IndividualImpl implements Individual {
         }
         return stmts;
     }
-    
-    public List<DataPropertyStatement> getExternalIds() { 
+
+    public List<DataPropertyStatement> getExternalIds() {
         if (this.externalIds != null) {
             return this.externalIds;
         } else {
             try {
-                List<DataPropertyStatement> dpsList = 
+                List<DataPropertyStatement> dpsList =
                         new ArrayList<DataPropertyStatement>();
                 dpsList.addAll(webappDaoFactory.getIndividualDao()
                         .getExternalIds(this.getURI(), null));
@@ -778,12 +778,12 @@ public class IndividualSDB extends IndividualImpl implements Individual {
             return this.externalIds;
         }
     }
-    
+
     @Override
-    public List<VClass> getVClasses() { 
+    public List<VClass> getVClasses() {
     	return getVClasses(false);
     }
-    
+
     @Override
     public List<VClass> getVClasses(boolean assertedOnly) {
     	if (assertedOnly) {
@@ -802,9 +802,9 @@ public class IndividualSDB extends IndividualImpl implements Individual {
     		}
     	}
     }
-    
+
     private List<VClass> getMyVClasses(boolean assertedOnly) {
-		List<VClass> vClassList = new ArrayList<VClass>(); 
+		List<VClass> vClassList = new ArrayList<VClass>();
 		Model tempModel = null;
 		if (ind.getModel().contains((Resource) null, RDF.type, (RDFNode) null)){
 		    tempModel = ind.getModel();
@@ -812,7 +812,7 @@ public class IndividualSDB extends IndividualImpl implements Individual {
 			tempModel = ModelFactory.createDefaultModel();
 			String getTypesQuery = buildMyVClassesQuery(assertedOnly);
 
-    		RDFService service = webappDaoFactory.getRDFService();	
+    		RDFService service = webappDaoFactory.getRDFService();
         	try {
 				service.sparqlConstructQuery(getTypesQuery, tempModel);
         	} catch (RDFServiceException e) {
@@ -833,12 +833,12 @@ public class IndividualSDB extends IndividualImpl implements Individual {
     	boolean directTypes = false;
     	String currentType = null;
 	    ArrayList<String> done = new ArrayList<String>();
-	    
+
 	    /* Loop for comparing starts here */
 	    if(assertedOnly){
         	while(!directTypes){
         		 itr = list.listIterator();
-        		 
+
         		do{
         			if(itr.hasNext()){
         		 currentType = itr.next();}
@@ -846,36 +846,36 @@ public class IndividualSDB extends IndividualImpl implements Individual {
         				directTypes = true; // get next element for comparison
         			 break;}
         		}while(done.contains(currentType));
-        		
+
         		if(directTypes)
-        			break; 
+        			break;
         		    // check to see if it's all over otherwise start comparing
         		else
-        	    itr = list.listIterator();	
-        		
+        	    itr = list.listIterator();
+
             	while(itr.hasNext()){
             		String nextType = itr.next();
-            	    if(checkSubClass.isSubClassOf(currentType, nextType) 
+            	    if(checkSubClass.isSubClassOf(currentType, nextType)
             	            && !currentType.equalsIgnoreCase(nextType)){
             	    	itr.remove();
             	    }
             	}
-            	
-            	done.add(currentType);  // add the uri to done list. 
+
+            	done.add(currentType);  // add the uri to done list.
         	}
 	    }
-    	
+
     	/* Loop for comparing ends here */
 	    Iterator<String> typeIt = list.iterator();
-		
+
 		for (Iterator it = typeIt; it.hasNext();) {
 			Resource type = ResourceFactory
 			        .createResource(it.next().toString());
-			String typeURI = (!type.isAnon()) 
-			        ? type.getURI() 
-			        : VitroVocabulary.PSEUDO_BNODE_NS 
+			String typeURI = (!type.isAnon())
+			        ? type.getURI()
+			        : VitroVocabulary.PSEUDO_BNODE_NS
 			                + type.getId().toString();
-			if (type.getNameSpace() == null || 
+			if (type.getNameSpace() == null ||
 			        (!webappDaoFactory.getNonuserNamespaces()
 			                .contains(type.getNameSpace())) ) {
 				VClass vc = webappDaoFactory.getVClassDao()
@@ -891,7 +891,7 @@ public class IndividualSDB extends IndividualImpl implements Individual {
 		} catch (Exception e) {
 		    log.error("Unable to sort VClass list", e);
 		}
-		
+
 		return vClassList;
 	}
 
@@ -903,32 +903,32 @@ public class IndividualSDB extends IndividualImpl implements Individual {
 	 */
 	private String buildMyVClassesQuery(boolean assertedOnly) {
 		SDBDatasetMode queryMode = assertedOnly ? ASSERTIONS_ONLY : datasetMode;
-		
+
 		String filterBlock = WebappDaoFactorySDB.getFilterBlock(new String[] { "?g" }, queryMode);
-		
+
 		if (filterBlock.isEmpty()) {
-			return 
+			return
 				"CONSTRUCT { <" + this.individualURI + "> " + "<" + RDF.type + "> ?types }\n" +
-				"WHERE { <" + this.individualURI +"> <" +RDF.type+ "> ?types } \n"; 
+				"WHERE { <" + this.individualURI +"> <" +RDF.type+ "> ?types } \n";
 		} else {
-			String unionBlock = (queryMode.equals(ASSERTIONS_ONLY)) ? 
-				"" : 
+			String unionBlock = (queryMode.equals(ASSERTIONS_ONLY)) ?
+				"" :
 				"UNION { <" + this.individualURI +"> <" +RDF.type+ "> ?types }";
-			return 
+			return
 				"CONSTRUCT{ <" + this.individualURI + "> " + "<" + RDF.type + "> ?types }\n" +
-				"WHERE{ { GRAPH ?g"   
-				+ " { <" + this.individualURI +"> <" +RDF.type+ "> ?types } \n" 
-			    + filterBlock 
-				+ "} \n" 
-			    + unionBlock 
+				"WHERE{ { GRAPH ?g"
+				+ " { <" + this.individualURI +"> <" +RDF.type+ "> ?types } \n"
+			    + filterBlock
+				+ "} \n"
+			    + unionBlock
 			    + "} \n";
 		}
 	}
-    
+
 	/**
 	 * The base method in {@link IndividualImpl} is adequate if the reasoner is
-	 * up to date. 
-	 * 
+	 * up to date.
+	 *
 	 * If the base method returns false, check directly to see if
 	 * any of the super classes of the direct classes will satisfy this request.
 	 */
@@ -944,13 +944,13 @@ public class IndividualSDB extends IndividualImpl implements Individual {
             throw new RuntimeException(e);
         }
 	}
-	
+
     /**
      * Overriding the base method so that we can do the sorting by arbitrary property here.  An
      * IndividualSDB has a reference back to the model; everything else is just a dumb bean (for now).
      */
     @Override
-    protected void sortEnts2EntsForDisplay(){ 
+    protected void sortEnts2EntsForDisplay(){
         if( getObjectPropertyList() == null ) return;
 
 		for (ObjectProperty prop : getObjectPropertyList()) {
@@ -961,10 +961,10 @@ public class IndividualSDB extends IndividualImpl implements Individual {
         /*  }*/
 		}
     }
-    
+
     private Collator collator = Collator.getInstance();
-    
-    private void sortObjectPropertyStatementsForDisplay(ObjectProperty prop) { 
+
+    private void sortObjectPropertyStatementsForDisplay(ObjectProperty prop) {
     	try {
     		log.info("Doing special sort for "+prop.getDomainPublic());
     		final String sortPropertyURI = prop.getObjectIndividualSortPropertyURI();
@@ -1043,15 +1043,15 @@ public class IndividualSDB extends IndividualImpl implements Individual {
                 log.error("Exception sorting object property statements for object property "+this.getURI());
             }
 
-    		
+
     	} catch (Exception e) {
     		log.error(e, e);
     	}
     }
-    
+
 	@Override
 	public void resolveAsFauxPropertyStatements(List<ObjectPropertyStatement> list) {
 		webappDaoFactory.getObjectPropertyStatementDao().resolveAsFauxPropertyStatements(list);
 	}
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java
index b71b0f097..f96349bcf 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java
@@ -53,15 +53,15 @@ public class JenaBaseDao extends JenaBaseDaoCon {
 
 	public static final boolean KEEP_ONLY_IF_TRUE = true; //used for updatePropertyBooleanValue()
     public static final boolean KEEP_ONLY_IF_FALSE = false; //used for updatePropertyBooleanValue()
-    
+
     private static final String SWRL_IMP = "http://www.w3.org/2003/11/swrl#Imp";
-    
+
     protected static final Log log = LogFactory.getLog(JenaBaseDao.class.getName());
-    
+
     /* ******************* static constants ****************** */
-    
+
     protected String PSEUDO_BNODE_NS = VitroVocabulary.PSEUDO_BNODE_NS;
-    
+
     protected String XSD = "http://www.w3.org/2001/XMLSchema#";
     protected DateFormat xsdDateFormat = new SimpleDateFormat("yyyy-MM-dd");
     protected DateFormat xsdDateTimeFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
@@ -79,14 +79,14 @@ public class JenaBaseDao extends JenaBaseDaoCon {
     protected List<String> PREFERRED_LANGUAGES;
 
     /* ******************* constructor ************************* */
-    
+
     public JenaBaseDao(WebappDaoFactoryJena wadf) {
     	this.ontModelSelector = wadf.getOntModelSelector();
     	this.DEFAULT_NAMESPACE = wadf.getDefaultNamespace();
     	this.NONUSER_NAMESPACES = wadf.getNonuserNamespaces();
     	this.PREFERRED_LANGUAGES = wadf.getPreferredLanguages();
     	this.webappDaoFactory = wadf;
-    	
+
     }
 
     /* ******************** accessors ************************** */
@@ -94,7 +94,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
     protected OntModel getOntModel() {
         return ontModelSelector.getFullModel();
     }
-    
+
     protected OntModelSelector getOntModelSelector() {
     	return ontModelSelector;
     }
@@ -140,7 +140,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
             model.add(res, dataprop, value, XSDDatatype.XSDstring);
         }
     }
-    
+
     /**
      * convenience method
      */
@@ -163,7 +163,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
             return null;
         }
     }
-    
+
     /**
      * convenience method
      */
@@ -172,7 +172,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
             model.add(res, prop, model.createTypedLiteral(value));
         }
     }
-    
+
     /**
      * convenience method for use with functional datatype properties
      */
@@ -186,22 +186,22 @@ public class JenaBaseDao extends JenaBaseDaoCon {
                     existingValue = ((Literal)object).getString();
                 }
             }
-            
+
             if (value == null  || value.length() == 0) {
                  model.removeAll(res, dataprop, null);
             } else if (existingValue == null ) {
-                 model.add(res, dataprop, value, XSDDatatype.XSDstring);	
+                 model.add(res, dataprop, value, XSDDatatype.XSDstring);
             } else if (!existingValue.equals(value)) {
          		 model.removeAll(res, dataprop, null);
            		 model.add(res, dataprop, value, XSDDatatype.XSDstring);
             }
         }
     }
-    
+
     /**
      * Convenience method for use with functional datatype properties.
-     * 
-     * Pass keepOnlyIfTrue if a lack of a value in the model indicates false.  
+     *
+     * Pass keepOnlyIfTrue if a lack of a value in the model indicates false.
      * See ObjectPropertyDaoJena and PROPERTY_OFFERCREATENEWOPTIONANNOT for an
      * example.
      */
@@ -261,7 +261,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
             return null;
         }
     }
-    
+
     /**
      * convenience method
      */
@@ -280,13 +280,13 @@ public class JenaBaseDao extends JenaBaseDaoCon {
 			model.add(res, dataprop, Long.toString(value), XSDDatatype.XSDlong);
 		}
 	}
-	
+
     /**
      * convenience method for use with functional datatype properties
      */
     protected void updatePropertyIntValue(Resource res, Property dataprop, int value, Model model) {
-        
-    	if (dataprop != null) {	
+
+    	if (dataprop != null) {
             Integer existingValue = null;
             Statement stmt = res.getProperty(dataprop);
             if (stmt != null) {
@@ -295,13 +295,13 @@ public class JenaBaseDao extends JenaBaseDaoCon {
                     existingValue = ((Literal)object).getInt();
                 }
             }
-        	
+
             if (existingValue == null ) {
-                  model.add(res, dataprop, Integer.toString(value), XSDDatatype.XSDint);	
+                  model.add(res, dataprop, Integer.toString(value), XSDDatatype.XSDint);
             } else if (existingValue.intValue() != value) {
         		  model.removeAll(res, dataprop, null);
         		  model.add(res, dataprop, Integer.toString(value), XSDDatatype.XSDint);
-            }            
+            }
         }
     }
 
@@ -342,7 +342,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
     		updatePropertyIntValue(res,dataprop,value,model);
     	}
     }
-    
+
     /**
      * convenience method for use with functional datatype properties
      */
@@ -360,7 +360,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
 	 */
 	protected void updatePropertyLongValue(Resource res, Property dataprop,
 			Long value, Model model) {
-		
+
 		if (dataprop != null) {
 			Long existingValue = null;
 			Statement stmt = res.getProperty(dataprop);
@@ -370,7 +370,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
 					existingValue = ((Literal) object).getLong();
 				}
 			}
-			
+
 			if (existingValue == null) {
 				model.add(res, dataprop, value.toString(),
 						XSDDatatype.XSDlong);
@@ -381,7 +381,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
 			}
 		}
 	}
-	
+
     /**
      * convenience method
      */
@@ -405,13 +405,13 @@ public class JenaBaseDao extends JenaBaseDaoCon {
             model.add(res, dataprop, Float.toString(value), XSDDatatype.XSDfloat);
         }
     }
-    
+
     /**
      * convenience method for use with functional properties
      */
     protected void updatePropertyFloatValue(Resource res, Property dataprop, Float value, Model model) {
 
-    	if (dataprop != null) {	
+    	if (dataprop != null) {
             Float existingValue = null;
             Statement stmt = res.getProperty(dataprop);
             if (stmt != null) {
@@ -424,14 +424,14 @@ public class JenaBaseDao extends JenaBaseDaoCon {
             if (value == null) {
                  model.removeAll(res, dataprop, null);
             } else if (existingValue == null ) {
-                 model.add(res, dataprop, Float.toString(value), XSDDatatype.XSDfloat);	
+                 model.add(res, dataprop, Float.toString(value), XSDDatatype.XSDfloat);
             } else if (existingValue.compareTo(value) != 0) {
          		 model.removeAll(res, dataprop, null);
           		 model.add(res, dataprop, Float.toString(value), XSDDatatype.XSDfloat);
             }
         }
     }
-    
+
     protected Float getPropertyFloatValue(OntResource res, Property prop){
         if( prop != null ){
             try{
@@ -442,7 +442,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
         }else
             return null;
     }
-    
+
     /**
      * convenience method
      */
@@ -488,9 +488,9 @@ public class JenaBaseDao extends JenaBaseDaoCon {
 	                        existingValue = (Date)((Literal)object).getValue();
 	                    }
 	                }
-		                
+
 	                if (existingValue == null ) {
-	                     model.add(res, dataprop, xsdDateFormat.format(value), XSDDatatype.XSDdate);	
+	                     model.add(res, dataprop, xsdDateFormat.format(value), XSDDatatype.XSDdate);
 	                } else if (existingValue != value) {
 	             		 model.removeAll(res, dataprop, null);
 	              		 model.add(res, dataprop, xsdDateFormat.format(value), XSDDatatype.XSDdate);
@@ -501,7 +501,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
             log.error("Error in updatePropertyDateValue", e);
         }
     }
-    
+
     /**
      * convenience method
      */
@@ -574,7 +574,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
     	}
     	return list;
     }
-    
+
 	protected RoleLevel getMostRestrictiveRoleLevel(Resource res, Property prop) {
 		RoleLevel level = RoleLevel.getRoleByUri(null);
 		for (Statement stmt : res.listProperties(prop).toList()) {
@@ -588,7 +588,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
 		}
 		return level;
 	}
-    
+
     /**
      * convenience method for use with functional object properties
      */
@@ -605,10 +605,10 @@ public class JenaBaseDao extends JenaBaseDaoCon {
     protected void updatePropertyResourceURIValue(Resource res, Property prop, String objectURI) {
 
     	Model model = res.getModel();
-    	
+
     	if (model != null) {
     		updatePropertyResourceURIValue(res, prop, objectURI, model);
-    	}    	           
+    	}
     }
 
     /**
@@ -620,7 +620,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
 				+ (prop == null ? "null" : prop.getURI()) + ", uri=" + uri);
 
         if (prop != null) {
-            if (uri == null || uri.length() == 0) { 
+            if (uri == null || uri.length() == 0) {
             	// the empty string test is due to a deficiency in the
             	// backend editing where empty strings are treated as nulls
                 model.removeAll(res, prop, null);
@@ -639,9 +639,9 @@ public class JenaBaseDao extends JenaBaseDaoCon {
                         existingValue = (Resource)object;
                     }
                 }
-	                
+
                 if (existingValue == null ) {
-                     model.add(res, prop, model.createResource(uri));	
+                     model.add(res, prop, model.createResource(uri));
                 } else if (!(existingValue.getURI()).equals(uri)) {
              		 model.removeAll(res, prop, null);
               		 model.add(res, prop, model.createResource(uri));
@@ -663,20 +663,20 @@ public class JenaBaseDao extends JenaBaseDaoCon {
      * convenience method for use with functional properties
      */
     protected void updatePropertyResourceValue(Resource res, Property prop, Resource objectRes) {
-        
+
     	Model model = res.getModel();
-    	
+
     	if (model != null) {
     		updatePropertyResourceValue(res, prop, objectRes, model);
         }
-    	
+
     }
 
     /**
      * convenience method for use with functional properties
      */
     protected void updatePropertyResourceValue(Resource res, Property prop, Resource objectRes, Model model) {
-    	
+
         if (prop != null) {
             if (objectRes == null) {
                 model.removeAll(res, prop, null);
@@ -689,9 +689,9 @@ public class JenaBaseDao extends JenaBaseDaoCon {
                         existingValue = (Resource)object;
                     }
                 }
-	                
+
                 if (existingValue == null ) {
-                     model.add(res, prop, objectRes);	
+                     model.add(res, prop, objectRes);
                 } else if (!existingValue.equals(objectRes)) {
              		 model.removeAll(res, prop, null);
               		 model.add(res, prop, objectRes);
@@ -699,11 +699,11 @@ public class JenaBaseDao extends JenaBaseDaoCon {
             }
         }
     }
-    
+
 	/**
 	 * convenience method to update the value(s) of a one-to-many object
 	 * property
-	 * 
+	 *
 	 * NOTE: this should be run from within a CriticalSection(WRITE)
 	 */
 	protected void updatePropertyResourceURIValues(Resource res, Property prop,
@@ -757,19 +757,19 @@ public class JenaBaseDao extends JenaBaseDaoCon {
      * convenience method for updating the RDFS label
      */
     protected void updateRDFSLabel(OntResource ontRes, String label) {
-    	
+
     	if (label != null && label.length() > 0) {
-    		
+
     		String existingValue = ontRes.getLabel(getDefaultLanguage());
-    	    
+
     		if (existingValue == null || !existingValue.equals(label)) {
-    			ontRes.setLabel(label, getDefaultLanguage());	
+    			ontRes.setLabel(label, getDefaultLanguage());
     	    }
     	} else {
     		ontRes.removeAll(RDFS.label);
     	}
     }
-    
+
     private Literal getLabel(String lang, List<RDFNode>labelList) {
         for (RDFNode label : labelList) {
             if (label.isLiteral()) {
@@ -785,9 +785,9 @@ public class JenaBaseDao extends JenaBaseDaoCon {
         }
     	return null;
     }
-    
+
     private final boolean ALSO_TRY_NO_LANG = true;
-    
+
     /**
      * Get the rdfs:label or vitro:label, working through PERFERED_LANGUAGES,
      * or get local name, bnode Id, or full URI if no labels found.
@@ -804,7 +804,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
     	}
         return label;
     }
-    
+
     protected String getLabel(OntResource r){
         String label = null;
         Literal labelLiteral = getLabelLiteral(r);
@@ -813,40 +813,40 @@ public class JenaBaseDao extends JenaBaseDaoCon {
         }
         return label;
     }
-    
+
     protected Literal getLabelLiteral(String individualUri) {
         OntResource resource = webappDaoFactory.getOntModel().createOntResource(individualUri);
         return getLabelLiteral(resource);
     }
 
     /**
-     * works through list of PREFERRED_LANGUAGES to find an appropriate 
-     * label, or NULL if not found.  
+     * works through list of PREFERRED_LANGUAGES to find an appropriate
+     * label, or NULL if not found.
      */
     protected Literal getLabelLiteral(OntResource r) {
         Literal labelLiteral = null;
         r.getOntModel().enterCriticalSection(Lock.READ);
-        try {            
+        try {
             // try rdfs:label with preferred languages
             labelLiteral = tryPropertyForPreferredLanguages( r, RDFS.label, ALSO_TRY_NO_LANG );
             // try vitro:label with preferred languages
             // Commenting out for NIHVIVO-1962
            /* if ( label == null ) {
                 labelLiteral = tryPropertyForPreferredLanguages( r, r.getModel().getProperty(VitroVocabulary.label), ALSO_TRY_NO_LANG );
-            }   */          
+            }   */
         } finally {
             r.getOntModel().leaveCriticalSection();
         }
-        return labelLiteral;        
+        return labelLiteral;
     }
-    
+
     /**
-     * Get the local name, bnode or URI of the resource. 
+     * Get the local name, bnode or URI of the resource.
      */
     protected String getLocalNameOrId(OntResource r){
         String label = null;
         r.getOntModel().enterCriticalSection(Lock.READ);
-        try {                       
+        try {
             String localName = r.getLocalName();
             if (localName != null) {
                 if(localName.trim().length() > 0) {
@@ -857,23 +857,23 @@ public class JenaBaseDao extends JenaBaseDaoCon {
             } else if (r.isAnon()) {
                 label = r.getId().toString();
             } else {
-                label = r.getURI();                
-            }                       
+                label = r.getURI();
+            }
         } finally {
             r.getOntModel().leaveCriticalSection();
         }
         return label;
     }
-    
+
     /**
      * Searches for literal in preferred language.
      * @param labels
      * 				the literals to search; must not be null
-     * @return the literal in preferred language if its containing in given list; 
-     * otherwise the first entry will returned; returns null if an empty list was given 
+     * @return the literal in preferred language if its containing in given list;
+     * otherwise the first entry will returned; returns null if an empty list was given
      */
     protected Literal tryLiteralForPreferredLanguages(List<Literal> labels) {
-    	
+
     	// search for literal of preferred language
     	for (Literal literal : labels) {
 	    	for (String lang : PREFERRED_LANGUAGES) {
@@ -886,11 +886,11 @@ public class JenaBaseDao extends JenaBaseDaoCon {
     	// return first literal as last resort
     	return 0 == labels.size() ? null : labels.get(0);
     }
-    
+
     private Literal tryPropertyForPreferredLanguages( OntResource r, Property p, boolean alsoTryNoLang ) {
     	Literal label = null;
 	    List<RDFNode> labels = r.listPropertyValues(p).toList();
-	    
+
 	    if (labels.size() == 0) {
 	        return null;
 	    }
@@ -908,7 +908,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
                 return 0;
             }
         });
-	    
+
 	    for (String lang : PREFERRED_LANGUAGES) {
 	    	label = getLabel(lang,labels);
 	    	if (label != null) {
@@ -933,7 +933,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
     protected String getDefaultLanguage() {
         return PREFERRED_LANGUAGES.get(0);
     }
-    
+
     /**
      * Checks a URI for validity.  Jena models can store invalid URIs, but this causes RDF/XML output serialization to fail.
      * @param uri URI
@@ -951,13 +951,13 @@ public class JenaBaseDao extends JenaBaseDaoCon {
         	return null;
         }
     }
-    
+
     /* *********************************************************** */
-    
+
     public synchronized boolean isBooleanClassExpression(OntClass cls) {
     	return (cls.isComplementClass() || cls.isIntersectionClass() || cls.isUnionClass());
     }
-    
+
     protected OntClass getOntClass(OntModel ontModel, String vitroURIStr) {
     	ontModel.enterCriticalSection(Lock.READ);
     	try {
@@ -984,7 +984,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
     		ontModel.leaveCriticalSection();
     	}
     }
-    
+
     protected String getClassURIStr(Resource cls) {
     	if (cls.isAnon()) {
     		return PSEUDO_BNODE_NS+cls.getId().toString();
@@ -1000,7 +1000,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
     		return NodeFactory.createURI(vitroURIStr);
     	}
     }
-    
+
     protected List<Resource> listDirectObjectPropertyValues(Resource subj, Property prop) {
     	// This is a quick and dirty algorithm for getting direct property values.
     	// It will only work properly if the full transitive closure is present in the graph;
@@ -1033,7 +1033,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
         }
     	return directValueList;
     }
-    
+
     // the same thing as the previous method but going the other direction
     protected List<Resource> listDirectObjectPropertySubjects(Resource value, Property prop) {
     	Set<Resource> possibleSubjectSet = new HashSet<Resource>();
@@ -1042,7 +1042,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
     	while (stmtIt.hasNext()) {
     		Statement stmt = stmtIt.nextStatement();
     		possibleSubjectSet.add(stmt.getSubject());
-    		
+
     	}
         for (Resource possibleRes : possibleSubjectSet) {
             StmtIterator pStmtIt = getOntModel().listStatements(possibleRes, prop, (RDFNode) null);
@@ -1060,7 +1060,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
         }
     	return directSubjectList;
     }
-    
+
     /**
      * Returns additions and retractions to perform
      * @param ontRes Ontology resource
@@ -1074,14 +1074,14 @@ public class JenaBaseDao extends JenaBaseDaoCon {
         changeSet[0].add(stmtForDependentRes);
         return changeSet;
     }
-    
+
     protected void smartRemove(OntResource ontRes, OntModel ontModel) {
         Model[] changes = getSmartRemoval(ontRes, ontModel);
     	ontModel.remove(changes[0]);
     	ontModel.add(changes[1]);
-    	
+
     }
- 
+
     /**
      * Removes a resource from any rdf:Lists in which it is a member
      */
@@ -1120,7 +1120,7 @@ public class JenaBaseDao extends JenaBaseDaoCon {
     	}
     	return changeSet;
     }
-    
+
     public void removeRulesMentioningResource(Resource res, OntModel ontModel) {
     	Iterator<Resource> impIt = ontModel.listSubjectsWithProperty(RDF.type, SWRL_IMP);
     	while (impIt.hasNext()) {
@@ -1140,34 +1140,34 @@ public class JenaBaseDao extends JenaBaseDaoCon {
     		}
     		if (removeMe) {
     			ontModel.remove(description);
-    		}	
+    		}
     	}
     }
-    
-    // removes a resource and its bnode closure using ARQ's DESCRIBE semantics 
+
+    // removes a resource and its bnode closure using ARQ's DESCRIBE semantics
     // plus any incoming properties
     private Model removeUsingDescribe(OntResource ontRes, OntModel ontModel) {
     	Model temp = describeResource(ontRes, ontModel);
 		temp.add(ontModel.listStatements((Resource) null, (Property) null, ontRes));
 		return temp;
     }
-    
-    private Model describeResource(Resource res, OntModel ontModel) {    	
+
+    private Model describeResource(Resource res, OntModel ontModel) {
     	Model temp = ModelFactory.createDefaultModel();
-    	
+
     	// For now, not using DESCRIBE on blank nodes unless I can figure out
     	// how to keep it from doing a full kb scan.
     	if (res.isAnon()) {
     		temp.add(ontModel.listStatements(res, (Property) null, (RDFNode) null));
     		return temp;
     	}
-    	
+
     	String describeQueryStr =    "DESCRIBE <" + res.getURI() + ">" ;
-    	
+
 	    Query describeQuery = QueryFactory.create(describeQueryStr, Syntax.syntaxARQ);
 		QueryExecution qe = QueryExecutionFactory.create(describeQuery, ontModel);
 		qe.execDescribe(temp);
-		
+
 		return temp;
     }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoCon.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoCon.java
index bd8425946..d618ac804 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoCon.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoCon.java
@@ -14,7 +14,7 @@ import org.apache.jena.rdf.model.ModelFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 
 public class JenaBaseDaoCon {
-    
+
     public JenaBaseDaoCon() {
         LINK.addProperty(PROPERTY_CUSTOMSHORTVIEWANNOT, _constModel.createTypedLiteral("linkShortView.jsp"));
         PRIMARY_LINK.setLabel("Primary Link", "en-US");
@@ -23,35 +23,35 @@ public class JenaBaseDaoCon {
         PRIMARY_LINK.setRange(LINK);
         PRIMARY_LINK.addProperty(PROPERTY_OFFERCREATENEWOPTIONANNOT, _constModel.createTypedLiteral(true));
         PRIMARY_LINK.addProperty(PROPERTY_SELECTFROMEXISTINGANNOT, _constModel.createTypedLiteral(false));
-        
-        ADDITIONAL_LINK.setLabel("Additional Link", "en-US");        
+
+        ADDITIONAL_LINK.setLabel("Additional Link", "en-US");
         ADDITIONAL_LINK.setRange(LINK); //apparently does not work to have prop.getRangeVClass() return a non-null VClass
         ADDITIONAL_LINK.addProperty(PROPERTY_STUBOBJECTPROPERTYANNOT,_constModel.createTypedLiteral(true));
         ADDITIONAL_LINK.addProperty(PROPERTY_CUSTOMENTRYFORMANNOT, _constModel.createTypedLiteral("defaultLinkForm.jsp"));
         ADDITIONAL_LINK.addProperty(PROPERTY_OFFERCREATENEWOPTIONANNOT, _constModel.createTypedLiteral(true));
         ADDITIONAL_LINK.addProperty(PROPERTY_SELECTFROMEXISTINGANNOT, _constModel.createTypedLiteral(false));
-        
+
         VITRO_PUBLIC_ONTOLOGY.setLabel("Vitro Public Ontology", null);
     }
 
-    
+
     private OntModel _constModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM);
-    
+
     /* ***************** Vitro ontology constants ***************** */
 
     protected AnnotationProperty DATAPROPERTY_ISEXTERNALID = _constModel.createAnnotationProperty(VitroVocabulary.DATAPROPERTY_ISEXTERNALID);
-        
-    protected AnnotationProperty HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT = _constModel.createAnnotationProperty(VitroVocabulary.HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT);    
-    protected AnnotationProperty PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT = _constModel.createAnnotationProperty(VitroVocabulary.PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT);    
-    protected AnnotationProperty HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT = _constModel.createAnnotationProperty(VitroVocabulary.HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT);    
-    
+
+    protected AnnotationProperty HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT = _constModel.createAnnotationProperty(VitroVocabulary.HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT);
+    protected AnnotationProperty PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT = _constModel.createAnnotationProperty(VitroVocabulary.PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT);
+    protected AnnotationProperty HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT = _constModel.createAnnotationProperty(VitroVocabulary.HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT);
+
     protected AnnotationProperty SEARCH_BOOST_ANNOT = _constModel.createAnnotationProperty(VitroVocabulary.SEARCH_BOOST_ANNOT);
-    
+
     protected AnnotationProperty EXAMPLE = _constModel.createAnnotationProperty(VitroVocabulary.EXAMPLE_ANNOT);
     protected AnnotationProperty DESCRIPTION_ANNOT = _constModel.createAnnotationProperty(VitroVocabulary.DESCRIPTION_ANNOT);
     protected AnnotationProperty PUBLIC_DESCRIPTION_ANNOT = _constModel.createAnnotationProperty(VitroVocabulary.PUBLIC_DESCRIPTION_ANNOT);
     protected AnnotationProperty SHORTDEF = _constModel.createAnnotationProperty(VitroVocabulary.SHORTDEF);
-    
+
     protected AnnotationProperty EDITING = _constModel.createAnnotationProperty(VitroVocabulary.EDITING);
 
     protected DatatypeProperty   MONIKER = _constModel.createDatatypeProperty(VitroVocabulary.MONIKER);
@@ -81,7 +81,7 @@ public class JenaBaseDaoCon {
     protected AnnotationProperty PROPERTY_EDITLINKSUPPRESSED = _constModel.createAnnotationProperty(VitroVocabulary.PROPERTY_EDITLINKSUPPRESSED);
     protected AnnotationProperty PROPERTY_ADDLINKSUPPRESSED = _constModel.createAnnotationProperty(VitroVocabulary.PROPERTY_ADDLINKSUPPRESSED);
     protected AnnotationProperty PROPERTY_DELETELINKSUPPRESSED = _constModel.createAnnotationProperty(VitroVocabulary.PROPERTY_DELETELINKSUPPRESSED);
-    
+
     protected OntClass 		     PROPERTYGROUP = _constModel.createClass(VitroVocabulary.PROPERTYGROUP);
 
     protected OntClass           LINK = _constModel.createClass(VitroVocabulary.LINK);
@@ -95,14 +95,14 @@ public class JenaBaseDaoCon {
     protected  OntClass           PORTAL = _constModel.createClass(VitroVocabulary.PORTAL);
     protected  DatatypeProperty   APPLICATION_THEMEDIR = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_THEMEDIR);
     protected  DatatypeProperty   APPLICATION_CONTACTMAIL = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_CONTACTMAIL);
-    protected  DatatypeProperty   APPLICATION_CORRECTIONMAIL = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_CORRECTIONMAIL);   
+    protected  DatatypeProperty   APPLICATION_CORRECTIONMAIL = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_CORRECTIONMAIL);
     protected  DatatypeProperty   APPLICATION_ABOUTTEXT = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_ABOUTTEXT);
-    protected  DatatypeProperty   APPLICATION_ACKNOWLEGETEXT = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_ACKNOWLEGETEXT);    
+    protected  DatatypeProperty   APPLICATION_ACKNOWLEGETEXT = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_ACKNOWLEGETEXT);
     protected  DatatypeProperty   APPLICATION_COPYRIGHTURL = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_COPYRIGHTURL);
     protected  DatatypeProperty   APPLICATION_COPYRIGHTANCHOR = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_COPYRIGHTANCHOR);
-    
+
     protected AnnotationProperty  ONTOLOGY_PREFIX_ANNOT = _constModel.createAnnotationProperty(VitroVocabulary.ONTOLOGY_PREFIX_ANNOT);
-    
+
     protected  Ontology           VITRO_PUBLIC_ONTOLOGY = _constModel.createOntology(VitroVocabulary.VITRO_PUBLIC_ONTOLOGY);
 
     protected  ObjectProperty     IND_MAIN_IMAGE = _constModel.createObjectProperty(VitroVocabulary.IND_MAIN_IMAGE);
@@ -133,7 +133,7 @@ public class JenaBaseDaoCon {
     protected  ObjectProperty     PERMISSIONSET_HAS_PERMISSION = _constModel.createObjectProperty(VitroVocabulary.PERMISSIONSET_HAS_PERMISSION);
 
     protected  OntClass           PERMISSION = _constModel.createClass(VitroVocabulary.PERMISSION);
-    
+
 
     public OntModel getConstModel() {
         return _constModel;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java
index be7ff7441..78dfc104f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java
@@ -38,11 +38,11 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryConfig;
 
 public class JenaModelUtils {
-    
+
     private static final Log log = LogFactory.getLog(JenaModelUtils.class.getName());
 
     private static final Set<String>  nonIndividualTypeURIs ;
-    
+
     static {
         nonIndividualTypeURIs = new HashSet<String>();
         nonIndividualTypeURIs.add(OWL.Class.getURI());
@@ -54,11 +54,11 @@ public class JenaModelUtils {
         nonIndividualTypeURIs.add(RDFS.Class.getURI());
         nonIndividualTypeURIs.add(RDF.Property.getURI());
     }
-    
+
     /**
      * Creates a set of vitro:ClassGroup resources for each root class in
-     * an ontology.  Also creates annotations to place each root class and all 
-     * of its children in the appropriate groups.  In the case of multiple 
+     * an ontology.  Also creates annotations to place each root class and all
+     * of its children in the appropriate groups.  In the case of multiple
      * inheritance, classgroup assignment will be arbitrary.
      * @param wadf DAO Factory
      * @param tboxModel containing ontology classes
@@ -68,7 +68,7 @@ public class JenaModelUtils {
      */
     public synchronized static OntModel[] makeClassGroupsFromRootClasses(
             WebappDaoFactory wadf, Model tboxModel) {
-        
+
         OntModel ontModel = ModelFactory.createOntologyModel(
                 OntModelSpec.OWL_DL_MEM, tboxModel);
         OntModel modelForClassgroups = ModelFactory.createOntologyModel(
@@ -82,15 +82,15 @@ public class JenaModelUtils {
         config.setDefaultNamespace(wadf.getDefaultNamespace());
         WebappDaoFactory myWebappDaoFactory = new WebappDaoFactoryJena(
                 new SimpleOntModelSelector(ontModel), config, null);
-        
+
         Resource classGroupClass = ResourceFactory.createResource(
                 VitroVocabulary.CLASSGROUP);
         Property inClassGroupProperty = ResourceFactory.createProperty(
                 VitroVocabulary.IN_CLASSGROUP);
-        
+
         ontModel.enterCriticalSection(Lock.READ);
-        try { 
-            try {                    
+        try {
+            try {
                 List<VClass> rootClasses = myWebappDaoFactory.getVClassDao()
                         .getRootClasses();
                 for (VClass rootClass : rootClasses) {
@@ -127,37 +127,37 @@ public class JenaModelUtils {
         resultArray[1] = modelForClassgroupAnnotations;
         return resultArray;
     }
-    
+
     private final OntModelSpec DEFAULT_ONT_MODEL_SPEC = OntModelSpec.OWL_MEM;
     private final boolean NORMAL = false;
     private final boolean AGGRESSIVE = true;
 
 
     public OntModel extractTBox( Model inputModel ) {
-        return extractTBox(inputModel, null);    
+        return extractTBox(inputModel, null);
     }
-    
+
     public OntModel extractTBox( Model inputModel, boolean MODE ) {
         Dataset dataset = DatasetFactory.create(inputModel);
-        return extractTBox(dataset, null, null, MODE);   
+        return extractTBox(dataset, null, null, MODE);
     }
-    
+
     public OntModel extractTBox( Model inputModel, String namespace ) {
         Dataset dataset = DatasetFactory.create(inputModel);
         return extractTBox( dataset, namespace, null, NORMAL );
     }
-    
+
     public OntModel extractTBox( Dataset dataset, String namespace, String graphURI) {
         return extractTBox( dataset, namespace, graphURI, NORMAL);
     }
-    
+
     public OntModel extractTBox( Dataset dataset, String namespace, String graphURI, boolean mode ) {
         OntModel tboxModel = ModelFactory.createOntologyModel(DEFAULT_ONT_MODEL_SPEC);
-        
+
         List<String> queryStrList = new LinkedList<String>();
-        
+
         // Use SPARQL DESCRIBE queries to extract the RDF for named ontology entities
-        
+
         queryStrList.add( makeDescribeQueryStr( OWL.Class.getURI(), namespace, graphURI ) );
         queryStrList.add( makeDescribeQueryStr( OWL.Restriction.getURI(), namespace, graphURI ) );
         queryStrList.add( makeDescribeQueryStr( OWL.ObjectProperty.getURI(), namespace, graphURI ) );
@@ -166,11 +166,11 @@ public class JenaModelUtils {
         // if we're using to a hash namespace, the URI of the Ontology resource will be
         // that namespace minus the final hash mark.
         if ( namespace != null && namespace.endsWith("#") ) {
-            queryStrList.add( makeDescribeQueryStr( OWL.Ontology.getURI(), namespace.substring(0,namespace.length()-1), graphURI ) );    
+            queryStrList.add( makeDescribeQueryStr( OWL.Ontology.getURI(), namespace.substring(0,namespace.length()-1), graphURI ) );
         } else {
             queryStrList.add( makeDescribeQueryStr( OWL.Ontology.getURI(), namespace, graphURI ) );
         }
-        
+
         // Perform the SPARQL DESCRIBEs
         for ( String queryStr : queryStrList ) {
             Query tboxSparqlQuery = QueryFactory.create(queryStr);
@@ -182,8 +182,8 @@ public class JenaModelUtils {
                 dataset.getLock().leaveCriticalSection();
             }
         }
-        
-        // Perform possibly-redundant extraction to try ensure we don't miss 
+
+        // Perform possibly-redundant extraction to try ensure we don't miss
         // individual axioms floating around.  We still might miss things;
         // this approach isn't perfect.
         if (mode == AGGRESSIVE) {
@@ -250,10 +250,10 @@ public class JenaModelUtils {
         }
         return tboxModel;
     }
-    
-    private Model construct(Dataset dataset, 
-                            String namespace, 
-                            String graphURI, 
+
+    private Model construct(Dataset dataset,
+                            String namespace,
+                            String graphURI,
                             Resource property) {
         dataset.getLock().enterCriticalSection(Lock.READ);
         try {
@@ -279,13 +279,13 @@ public class JenaModelUtils {
             dataset.getLock().leaveCriticalSection();
         }
     }
-    
+
     private String makeDescribeQueryStr( String typeURI, String namespace ) {
         return makeDescribeQueryStr( typeURI, namespace, null );
-    }     
-        
+    }
+
     private String makeDescribeQueryStr( String typeURI, String namespace, String graphURI ) {
-        
+
         StringBuilder describeQueryStrBuff = new StringBuilder()
             .append("PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n")
             .append("DESCRIBE ?res WHERE { \n");
@@ -294,27 +294,27 @@ public class JenaModelUtils {
             }
             describeQueryStrBuff
             .append("    ?res rdf:type <").append(typeURI).append("> . \n");
-            
+
             describeQueryStrBuff
             .append("    FILTER (!isBlank(?res)) \n")
-    
+
             .append(getNamespaceFilter(namespace));
-    
+
         if (graphURI != null) {
             describeQueryStrBuff
             .append("} \n");
         }
-            
+
         describeQueryStrBuff.append("} \n");
-        
+
         return describeQueryStrBuff.toString();
-        
+
     }
-    
+
     private String getNamespaceFilter(String namespace) {
         StringBuilder buff = new StringBuilder();
         if (namespace == null) {
-            // exclude resources in the Vitro internal namespace or in the 
+            // exclude resources in the Vitro internal namespace or in the
             // OWL namespace, but allow all others
             buff
             .append("    FILTER (REPLACE(STR(?res),\"^(.*)(#)(.*)$\", \"$1$2\") != \"")
@@ -328,43 +328,43 @@ public class JenaModelUtils {
             buff
             .append("    FILTER (regex(str(?res), \"^")
             .append(namespace)
-            .append("\")) \n");  
+            .append("\")) \n");
         }
         return buff.toString();
     }
-    
+
     public Model extractABox(Model inputModel){
         Dataset dataset = DatasetFactory.create(inputModel);
         return extractABox(dataset, null, null);
     }
-    
+
     public Model extractABox( Dataset unionDataset, Dataset baseOrInfDataset, String graphURI ) {
-        
+
         Model aboxModel = ModelFactory.createDefaultModel();
 
         // iterate through all classes and DESCRIBE each of their instances
         // Note that this could be simplified if we knew that the model was a
-        // reasoning model: we could then simply describe all instances of 
+        // reasoning model: we could then simply describe all instances of
         // owl:Thing.
 
-        //OntModel ontModel = ( inputModel instanceof OntModel ) 
+        //OntModel ontModel = ( inputModel instanceof OntModel )
         //? (OntModel)inputModel
         //: ModelFactory.createOntologyModel( DEFAULT_ONT_MODEL_SPEC, inputModel );
-        OntModel ontModel = extractTBox(unionDataset, null, graphURI);    
-    
+        OntModel ontModel = extractTBox(unionDataset, null, graphURI);
+
         try {
             ontModel.enterCriticalSection(Lock.READ);
             Iterator classIt = ontModel.listNamedClasses();
             QueryExecution qe = null;
             while ( classIt.hasNext() ) {
-                
+
                 OntClass ontClass = (OntClass) classIt.next();
-                //if ( !(ontClass.getNameSpace().startsWith(OWL.getURI()) )  
+                //if ( !(ontClass.getNameSpace().startsWith(OWL.getURI()) )
                 // && !(ontClass.getNameSpace().startsWith(VitroVocabulary.vitroURI))    ) {
              if(!(ontClass.getNameSpace().startsWith(OWL.getURI()))){
-                    
+
                     String queryStr = makeDescribeQueryStr( ontClass.getURI(), null, graphURI );
-                    
+
                     Query aboxSparqlQuery = QueryFactory.create(queryStr);
                     if(baseOrInfDataset != null){
                         qe = QueryExecutionFactory.create(aboxSparqlQuery,baseOrInfDataset);
@@ -388,15 +388,15 @@ public class JenaModelUtils {
                             unionDataset.getLock().leaveCriticalSection();
                         }
                     }
-                    
+
                 }
             }
         } finally {
             ontModel.leaveCriticalSection();
         }
-        
+
         return aboxModel;
-        
+
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/LoginEvent.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/LoginEvent.java
index 5945d2892..4e0372b5f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/LoginEvent.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/LoginEvent.java
@@ -4,8 +4,8 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena;
 
 public class LoginEvent extends LoginLogoutEvent {
 
-    public LoginEvent( String loginUri ){        
-        this.loginUri = loginUri;       
+    public LoginEvent( String loginUri ){
+        this.loginUri = loginUri;
     }
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/LoginLogoutEvent.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/LoginLogoutEvent.java
index 11d229dd4..5753c639f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/LoginLogoutEvent.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/LoginLogoutEvent.java
@@ -5,7 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena;
 public abstract class LoginLogoutEvent {
 
 	protected String loginUri = null;
-    
+
     public String getLoginUri() {
         return loginUri;
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/LogoutEvent.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/LogoutEvent.java
index 9f5116fe7..7f3fa3171 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/LogoutEvent.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/LogoutEvent.java
@@ -3,9 +3,9 @@
 package edu.cornell.mannlib.vitro.webapp.dao.jena;
 
 public class LogoutEvent extends LoginLogoutEvent {
-	     
-    public LogoutEvent( String loginUri ){        
-        this.loginUri = loginUri;       
+
+    public LogoutEvent( String loginUri ){
+        this.loginUri = loginUri;
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJena.java
index ef3745dc9..73da8f76b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJena.java
@@ -30,43 +30,43 @@ import javax.servlet.ServletRequest;
 public class MenuDaoJena extends JenaBaseDao implements MenuDao {
 
     private static final Log log = LogFactory.getLog(MenuDaoJena.class);
-        
-    static final String prefixes = 
+
+    static final String prefixes =
         "PREFIX rdf:   <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n" +
         "PREFIX rdfs:  <http://www.w3.org/2000/01/rdf-schema#> \n" +
         "PREFIX xsd:  <http://www.w3.org/2001/XMLSchema#> \n" +
         "PREFIX display: <" + VitroVocabulary.DISPLAY +"> \n";
-    
-    
-    static final protected String menuQueryString = 
+
+
+    static final protected String menuQueryString =
         prefixes + "\n" +
         "SELECT ?menuItem ?linkText ?urlMapping  WHERE {\n" +
 //        "  GRAPH ?g{\n"+
         "    ?menu rdf:type display:MainMenu .\n"+
-        "    ?menu display:hasElement ?menuItem .  \n"+       
+        "    ?menu display:hasElement ?menuItem .  \n"+
         "    ?menuItem display:linkText ?linkText .\n"+
         "    OPTIONAL { ?menuItem display:menuPosition ?menuPosition }.\n"+
-        "    OPTIONAL { ?menuItem display:toPage ?page . }\n"+        
-        "    OPTIONAL { ?page display:urlMapping ?urlMapping . }\n"+        
+        "    OPTIONAL { ?menuItem display:toPage ?page . }\n"+
+        "    OPTIONAL { ?page display:urlMapping ?urlMapping . }\n"+
 //        "  }\n"+
         "} \n" +
-        "ORDER BY ?menuPosition ?menuItemText \n";        
-    
+        "ORDER BY ?menuPosition ?menuItemText \n";
+
     static{
-        try{    
+        try{
             menuQuery=QueryFactory.create(menuQueryString);
         }catch(Throwable th){
             log.error("could not create SPARQL query for menuQueryString " + th.getMessage());
             log.error(menuQueryString);
-        }                 
+        }
     }
-    
-    static protected Query menuQuery;     
-    
+
+    static protected Query menuQuery;
+
     public MenuDaoJena(WebappDaoFactoryJena wadf) {
         super(wadf);
     }
-    
+
     @Override
     public MainMenu getMainMenu( String url ) {
         return getMenu( getOntModelSelector().getDisplayModel(), url );
@@ -79,29 +79,29 @@ public class MenuDaoJena extends JenaBaseDao implements MenuDao {
 
     protected MainMenu getMenu(Model displayModel, String url){
         //setup query parameters
-        QuerySolutionMap initialBindings = new QuerySolutionMap();        
-        
-        //run SPARQL query to get menu and menu items        
+        QuerySolutionMap initialBindings = new QuerySolutionMap();
+
+        //run SPARQL query to get menu and menu items
         QueryExecution qexec = QueryExecutionFactory.create(menuQuery, displayModel, initialBindings );
         try{
             // ryounes Seems suspicious that a dao is creating a template model object. What's this all about?
             MainMenu menu = new MainMenu();
-            
+
             /* bdc34: currently there is no good way to decide which url to show
              * on the menu when a page has multiple urls. */
-            Set <String>seenMenuItems = new HashSet<String>();    
-            
+            Set <String>seenMenuItems = new HashSet<String>();
+
             ResultSet results =qexec.execSelect();
             for( ; results.hasNext();){
                 QuerySolution soln = results.nextSolution();
                 Literal itemText = soln.getLiteral("linkText");
-                Literal itemLink = soln.getLiteral("urlMapping");                
+                Literal itemLink = soln.getLiteral("urlMapping");
                 RDFNode menuItem = soln.getResource("menuItem");
-                
+
                 String text = itemText != null ? itemText.getLexicalForm():"(undefined text)";
-                String link = itemLink != null ? itemLink.getLexicalForm():"undefinedLink";                
+                String link = itemLink != null ? itemLink.getLexicalForm():"undefinedLink";
                 String menuItemUri = PageDaoJena.nodeToString(menuItem);
-                
+
                 if( !seenMenuItems.contains(menuItemUri) ){
                     menu.addItem(text,link, isActive( url, link ));
                     seenMenuItems.add( menuItemUri );
@@ -114,9 +114,9 @@ public class MenuDaoJena extends JenaBaseDao implements MenuDao {
         }
     }
 
- 
+
     protected boolean isActive(String url, String link){
-        if( "/".equals(link) )                    
+        if( "/".equals(link) )
             return "/".equals(url);
         else
             return url.startsWith(link);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ModelContext.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ModelContext.java
index a294824b1..173a4996d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ModelContext.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ModelContext.java
@@ -14,7 +14,7 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
 
 public class ModelContext {
     private static final Log log = LogFactory.getLog(ModelContext.class);
-	
+
 	/**
 	 * Register a listener to the models needed to get changes to:
 	 *   Basic abox statemetns:
@@ -23,23 +23,23 @@ public class ModelContext {
 	 *      abox rdf:type statements
 	 *      inferred types of individuals in abox
 	 *      class group membership of individuals in abox
-	 *      rdfs:labe annotations of things in abox.            
-	 *   
+	 *      rdfs:labe annotations of things in abox.
+	 *
 	 *   Basic application annotations:
 	 *       changes to annotations on classes
 	 *       changes to annotations on class gorups
 	 *       changes to annotations on properties
-	 *       
+	 *
 	 *   Changes to application model
 	 */
 	public static void registerListenerForChanges(ServletContext ctx, ModelChangedListener ml){
-	    
+
         try {
             RDFServiceUtils.getRDFServiceFactory(ctx).registerJenaModelChangedListener(ml);
         } catch (RDFServiceException e) {
             log.error(e,e);
         }
-        
+
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
index 91c81f5cb..ea4d5f041 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
@@ -56,7 +56,7 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 
 public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectPropertyDao {
     private static final Log log = LogFactory.getLog(ObjectPropertyDaoJena.class.getName());
-        
+
     public ObjectPropertyDaoJena(RDFService rdfService,
                                  DatasetWrapperFactory dwf,
                                  Map<FullPropertyKey, String> customListViewConfigFileMap,
@@ -69,7 +69,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
     protected OntModel getOntModel() {
     	return getOntModelSelector().getTBoxModel();
     }
-    
+
     public void deleteObjectProperty(String propertyURI) {
         ObjectProperty op = getObjectPropertyByURI(propertyURI);
         deleteObjectProperty(op);
@@ -113,7 +113,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
             try {
             if (op.getSuperProperty() != null)
                 p.setParentURI(op.getSuperProperty().getURI());
-            } catch (ConversionException ce) { 
+            } catch (ConversionException ce) {
             	StmtIterator parentStmtIt = op.listProperties(RDFS.subPropertyOf);
             	if (parentStmtIt.hasNext()) {
             		Statement parentStmt = parentStmtIt.nextStatement();
@@ -149,21 +149,21 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
 	            	p.setInverseFunctional(true);
 	            }
         	} catch (ProfileException pe) {}
-            p.setExample(getPropertyStringValue(op,EXAMPLE_ANNOT));            
+            p.setExample(getPropertyStringValue(op,EXAMPLE_ANNOT));
             p.setDescription(getPropertyStringValue(op,DESCRIPTION_ANNOT));
             p.setPublicDescription(getPropertyStringValue(op,PUBLIC_DESCRIPTION_ANNOT));
-           
+
            	p.setDomainDisplayTier(getPropertyNonNegativeIntegerValue(op,DISPLAY_RANK_ANNOT));
            	p.setRangeDisplayTier(getPropertyNonNegativeIntegerValue(invOp,DISPLAY_RANK_ANNOT));
             p.setDomainDisplayLimit(getPropertyNonNegativeIntValue(op,DISPLAY_LIMIT));
             p.setRangeDisplayLimit(getPropertyNonNegativeIntValue(invOp,DISPLAY_LIMIT));
             RDFNode objectIndividualSortPropertyNode = op.getPropertyValue(PROPERTY_OBJECTINDIVIDUALSORTPROPERTY);
-            if (objectIndividualSortPropertyNode instanceof Resource) {  
-            	p.setObjectIndividualSortPropertyURI( ((Resource)objectIndividualSortPropertyNode).getURI() ); 
+            if (objectIndividualSortPropertyNode instanceof Resource) {
+            	p.setObjectIndividualSortPropertyURI( ((Resource)objectIndividualSortPropertyNode).getURI() );
             }
             p.setDomainEntitySortDirection(getPropertyStringValue(op,PROPERTY_ENTITYSORTDIRECTION));
             p.setRangeEntitySortDirection(getPropertyStringValue(invOp,PROPERTY_ENTITYSORTDIRECTION));
-            
+
             //There might be multiple HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT properties, only use the highest
             StmtIterator it = op.listProperties(HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT);
             BaseResourceBean.RoleLevel hiddenRoleLevel = null;
@@ -174,13 +174,13 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
                     Resource res = obj.as(Resource.class);
                     if( res != null && res.getURI() != null ){
                         BaseResourceBean.RoleLevel roleFromModel =  BaseResourceBean.RoleLevel.getRoleByUri(res.getURI());
-                        if( roleFromModel != null && 
+                        if( roleFromModel != null &&
                             (hiddenRoleLevel == null || roleFromModel.compareTo(hiddenRoleLevel) > 0 )){
-                            hiddenRoleLevel = roleFromModel;                            
+                            hiddenRoleLevel = roleFromModel;
                         }
                     }
                 }
-            }            
+            }
             p.setHiddenFromDisplayBelowRoleLevel(hiddenRoleLevel); //this might get set to null
 
             //There might be multiple PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT properties, only use the highest
@@ -193,13 +193,13 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
                     Resource res = obj.as(Resource.class);
                     if( res != null && res.getURI() != null ){
                         BaseResourceBean.RoleLevel roleFromModel =  BaseResourceBean.RoleLevel.getRoleByUri(res.getURI());
-                        if( roleFromModel != null && 
+                        if( roleFromModel != null &&
                             (prohibitedRoleLevel == null || roleFromModel.compareTo(prohibitedRoleLevel) > 0 )){
-                            prohibitedRoleLevel = roleFromModel;                            
+                            prohibitedRoleLevel = roleFromModel;
                         }
                     }
                 }
-            }            
+            }
             p.setProhibitedFromUpdateBelowRoleLevel(prohibitedRoleLevel); //this might get set to null
 
             //There might be multiple HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT properties, only use the highest
@@ -212,13 +212,13 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
                     Resource res = obj.as(Resource.class);
                     if( res != null && res.getURI() != null ){
                         BaseResourceBean.RoleLevel roleFromModel =  BaseResourceBean.RoleLevel.getRoleByUri(res.getURI());
-                        if( roleFromModel != null && 
+                        if( roleFromModel != null &&
                             (publishRoleLevel == null || roleFromModel.compareTo(publishRoleLevel) > 0 )){
-                            publishRoleLevel = roleFromModel;                            
+                            publishRoleLevel = roleFromModel;
                         }
                     }
                 }
-            }            
+            }
             p.setHiddenFromPublishBelowRoleLevel(publishRoleLevel); //this might get set to null
 
             p.setCustomEntryForm(getPropertyStringValue(op,PROPERTY_CUSTOMENTRYFORMANNOT));
@@ -231,14 +231,14 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
 
             Boolean collateBySubclass = getPropertyBooleanValue(op,PROPERTY_COLLATEBYSUBCLASSANNOT);
             p.setCollateBySubclass(collateBySubclass==null ? false : collateBySubclass);
-            
+
             Boolean editLinkSuppressed = getPropertyBooleanValue(op, PROPERTY_EDITLINKSUPPRESSED);
             p.setEditLinkSuppressed(editLinkSuppressed == null ? false : editLinkSuppressed);
             Boolean addLinkSuppressed = getPropertyBooleanValue(op, PROPERTY_ADDLINKSUPPRESSED);
             p.setAddLinkSuppressed(addLinkSuppressed == null ? false : addLinkSuppressed);
             Boolean deleteLinkSuppressed = getPropertyBooleanValue(op, PROPERTY_DELETELINKSUPPRESSED);
             p.setDeleteLinkSuppressed(deleteLinkSuppressed == null ? false : deleteLinkSuppressed);
-            
+
             Resource groupRes = (Resource) op.getPropertyValue(PROPERTY_INPROPERTYGROUPANNOT);
             if (groupRes != null) {
                 p.setGroupURI(groupRes.getURI());
@@ -288,12 +288,12 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
     }
 
     public ObjectProperty getObjectPropertyByURI(String propertyURI) {
-        
+
         if( propertyURI == null ) return null;
-        
+
         OntModel ontModel = getOntModel();
         OntModel localModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
-        
+
         ontModel.enterCriticalSection(Lock.READ);
         try {
             Resource prop = ontModel.getResource(propertyURI);
@@ -312,13 +312,13 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
             ontModel.leaveCriticalSection();
         }
     }
-    
+
     public ObjectProperty getObjectPropertyByURIs(String propertyURI,
             String domainURI, String rangeURI) {
-        return getObjectPropertyByURIs(propertyURI, domainURI, rangeURI, null); 
+        return getObjectPropertyByURIs(propertyURI, domainURI, rangeURI, null);
     }
-    
-    public ObjectProperty getObjectPropertyByURIs(String propertyURI, 
+
+    public ObjectProperty getObjectPropertyByURIs(String propertyURI,
             String domainURI, String rangeURI, ObjectProperty base) {
         if(log.isDebugEnabled()) {
             log.debug("Getting " + propertyURI + " with domain " + domainURI + " and range " + rangeURI);
@@ -337,7 +337,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
                 "    ?updateLevel ?publishLevel ?editLinkSuppressed ?addLinkSuppressed ?deleteLinkSuppressed \n" +
                 "    ?collateBySubclass ?displayLimit ?individualSortProperty \n" +
                 "    ?entitySortDirection ?selectFromExisting ?offerCreateNew \n" +
-                "    ?publicDescription ?stubDeletion \n" + 
+                "    ?publicDescription ?stubDeletion \n" +
                 " WHERE { \n" +
                 "    ?context config:configContextFor <" + propertyURI + "> . \n";
         if (domainURI != null && !domainURI.equals(OWL.Thing.getURI())) {
@@ -369,15 +369,15 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
                 "    OPTIONAL { ?configuration <" + PROPERTY_OFFERCREATENEWOPTIONANNOT.getURI() + "> ?offerCreateNew } \n" +
                 "    OPTIONAL { ?configuration <" + PUBLIC_DESCRIPTION_ANNOT.getURI() + "> ?publicDescription } \n" +
                 "    OPTIONAL { ?configuration <" + PROPERTY_STUBOBJECTPROPERTYANNOT.getURI() + "> ?stubDeletion } \n" +
-                "}"; 
-      
+                "}";
+
         Query q = QueryFactory.create(propQuery);
         QueryExecution qe = QueryExecutionFactory.create(q, getOntModelSelector().getDisplayModel());
         try {
             ResultSet rs = qe.execSelect();
             if (rs.hasNext()) {
                 QuerySolution qsoln = rs.nextSolution();
-                // This is a bit of hack, used for things where the type of the 
+                // This is a bit of hack, used for things where the type of the
                 // immediately-related object ("root," for lack of a better term)
                 // is important to record but not the type directly associated with
                 // a configuration
@@ -385,21 +385,21 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
                 if (rangeRootRes != null) {
                     // reusing this obsolete field for now
                     op.setRangeEntityURI(rangeRootRes.getURI());
-                } 
+                }
                 Resource groupRes = qsoln.getResource("group");
                 if (groupRes != null) {
                     op.setGroupURI(groupRes.getURI());
-                } 
+                }
                 Literal displayRankLit = qsoln.getLiteral("displayRank");
                 if(displayRankLit != null) {
                     op.setDomainDisplayTier(
                             Integer.parseInt(displayRankLit.getLexicalForm()));
-                } 
+                }
                 Literal displayLimitLit = qsoln.getLiteral("displayLimit");
                 if(displayLimitLit != null) {
                     op.setDomainDisplayLimit(
                             Integer.parseInt(displayLimitLit.getLexicalForm()));
-                } 
+                }
                 Resource displayLevelRes = qsoln.getResource("displayLevel");
                 if (displayLevelRes != null) {
                     op.setHiddenFromDisplayBelowRoleLevel(
@@ -421,11 +421,11 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
                 Literal labelLit = qsoln.getLiteral("label");
                 if (labelLit != null) {
                     op.setDomainPublic(labelLit.getLexicalForm());
-                } 
+                }
                 Literal customFormLit = qsoln.getLiteral("customForm");
                 if (customFormLit != null) {
                     op.setCustomEntryForm(customFormLit.getLexicalForm());
-                } 
+                }
                 Literal editLinkSuppressedLit = qsoln.getLiteral("editLinkSuppressed");
                 if (editLinkSuppressedLit != null ) {
                     op.setEditLinkSuppressed(editLinkSuppressedLit.getBoolean());
@@ -445,7 +445,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
                 Resource individualSortPropertyRes = qsoln.getResource("individualSortProperty");
                 if (individualSortPropertyRes != null) {
                     op.setObjectIndividualSortPropertyURI(individualSortPropertyRes.getURI());
-                } 
+                }
                 Literal entitySortDirectionLit = qsoln.getLiteral("entitySortDirection");
                 if (entitySortDirectionLit != null) {
                     op.setDomainEntitySortDirection(entitySortDirectionLit.getLexicalForm());
@@ -465,14 +465,14 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
                 Literal publicDescriptionLit = qsoln.getLiteral("publicDescription");
                 if (publicDescriptionLit != null) {
                     op.setPublicDescription(publicDescriptionLit.getLexicalForm());
-                }        
-             }  
+                }
+             }
         } finally {
             qe.close();
-        }    
+        }
         return op;
     }
-    
+
 
     public List<ObjectProperty> getObjectPropertiesForObjectPropertyStatements(List<ObjectPropertyStatement> objPropertyStmts) {
         if( objPropertyStmts == null || objPropertyStmts.size() < 1) return new ArrayList();
@@ -512,7 +512,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
 		boolean hasInverse = false;
 		if ( (prop.getURIInverse() != null) && (!("".equals(prop.getURIInverse()))) ) {
 			hasInverse = true;
-		} 
+		}
 		if ( (prop.getNamespaceInverse() != null) && (!(prop.getNamespaceInverse().equals(""))) &&
 			 ( (prop.getLocalNameInverse()==null) || ("".equals(prop.getLocalNameInverse()) ) ) ) {
 			hasInverse = false;
@@ -538,7 +538,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
 	        org.apache.jena.ontology.ObjectProperty p = ontModel.createObjectProperty(prop.getURI());
 	        org.apache.jena.ontology.ObjectProperty inv = null;
 	        if (hasInverse(prop)) {
-	        	log.debug("non-null inverse URI: " +prop.getURIInverse());	        	
+	        	log.debug("non-null inverse URI: " +prop.getURIInverse());
 	        	errMsgStr = getWebappDaoFactory().checkURIForEditableEntity(prop.getURIInverse());
 	        	if (errMsgStr != null) {
 	        		throw new InsertException("Unusable URI for inverse property: "+errMsgStr);
@@ -559,14 +559,14 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
     	updateProperty(prop,getOntModel());
     }
 
-    
+
     public void updateProperty(ObjectProperty prop, OntModel ontModel) {
         if (prop.getURI()==null || prop.getURI().length()<3) {
             return;
         }
         ontModel.enterCriticalSection(Lock.WRITE);
         try {
-	        getOntModel().getBaseModel().notifyEvent(new EditEvent(getWebappDaoFactory().getUserURI(),true));     
+	        getOntModel().getBaseModel().notifyEvent(new EditEvent(getWebappDaoFactory().getUserURI(),true));
 	        org.apache.jena.ontology.ObjectProperty p = ontModel.getObjectProperty(prop.getURI());
 	        if (p == null) {
 	            return;
@@ -575,7 +575,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
 	        if (hasInverse(prop)) {
 			    try {
 		            	inv = ontModel.getObjectProperty(prop.getURIInverse());
-		            	
+
 		            	if  (!inv.isInverseOf(p)) {
 		            	  inv.setInverseOf(p);
 		            	  p.setInverseOf(inv);
@@ -583,9 +583,9 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
 	            } catch (Exception e) {
 	                   log.debug("Couldn't set "+prop.getURIInverse()+" as inverse");
 				       // BJL: What we really want to do here is create a new property as inverse
-			    }      
+			    }
 	        }
-	        
+
             try {
 	             doUpdate(prop,p,inv,ontModel);
             } catch (Exception e) {
@@ -596,10 +596,10 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
         	ontModel.leaveCriticalSection();
         }
     }
-    
+
     /* This method assumes that the caller is locking and unlocking the model */
     private void doUpdate(ObjectProperty prop, OntProperty p, OntProperty inv, OntModel ontModel) {
-        
+
         updateRDFSLabel(p,prop.getDomainPublic());
 
         if (inv != null) {
@@ -611,19 +611,19 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
 	        if (parentURI != null) {
 		        org.apache.jena.ontology.ObjectProperty parent = ontModel.getObjectProperty(prop.getParentURI());
 		        if (parent != null) {
-		        	
+
 		        	if (!p.hasSuperProperty(parent, true)) {
 		               p.addSuperProperty(parent);
 		        	}
-		        	
+
 		            if (inv != null) {
 		                OntProperty parentInv = parent.getInverse();
-		                
+
 		                if (parentInv != null) {
 		                	if (!inv.hasSuperProperty(parentInv,true)) {
 		                	   inv.setSuperProperty(parentInv);
 		                	}
-		                }		                
+		                }
 		            }
 		        }
 	        }
@@ -632,12 +632,12 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
     		// plus, this whole section needs reworking
     		log.error("Unable to update parent property for "+prop.getURI(), e);
     	}
-    	
+
         if (prop.getTransitive()) {
         	if (!getOntModel().contains(p,RDF.type,OWL.TransitiveProperty)) {
         		getOntModel().add(p,RDF.type,OWL.TransitiveProperty);
         	}
-        	
+
         	if ( (inv != null) && (!getOntModel().contains(inv,RDF.type,OWL.TransitiveProperty))) {
         		getOntModel().add(inv,RDF.type,OWL.TransitiveProperty);
         	}
@@ -649,7 +649,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
         		getOntModel().remove(inv,RDF.type,OWL.TransitiveProperty);
         	}
         }
-        
+
         if (prop.getSymmetric()) {
         	if (!getOntModel().contains(p,RDF.type,OWL.SymmetricProperty)) {
         		getOntModel().add(p,RDF.type,OWL.SymmetricProperty);
@@ -665,7 +665,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
         		getOntModel().remove(inv,RDF.type,OWL.SymmetricProperty);
         	}
         }
-        
+
         if (prop.getFunctional()) {
         	if (!getOntModel().contains(p,RDF.type,OWL.FunctionalProperty)) {
         		getOntModel().add(p,RDF.type,OWL.FunctionalProperty);
@@ -675,7 +675,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
         		getOntModel().remove(p,RDF.type,OWL.FunctionalProperty);
         	}
         }
-        
+
         if (prop.getInverseFunctional()) {
         	if (!getOntModel().contains(p,RDF.type,OWL.InverseFunctionalProperty)) {
         		getOntModel().add(p,RDF.type,OWL.InverseFunctionalProperty);
@@ -685,7 +685,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
         		getOntModel().remove(p,RDF.type,OWL.InverseFunctionalProperty);
         	}
         }
-     	
+
         if ( (prop.getDomainVClassURI() != null) && (prop.getDomainVClassURI().length()>0) ) {
             if (!p.hasDomain(ontModel.getResource(prop.getDomainVClassURI()))) {
         	    p.setDomain(ontModel.getResource(prop.getDomainVClassURI()));
@@ -697,9 +697,9 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
             p.removeAll(RDFS.domain);
             if (inv != null) {
             	inv.removeAll(RDFS.range);
-            }        	
+            }
         }
-                
+
         if ( (prop.getRangeVClassURI() != null) && (prop.getRangeVClassURI().length()>0) ) {
             if (!p.hasRange(ontModel.getResource(prop.getRangeVClassURI()))) {
                p.setRange(ontModel.getResource(prop.getRangeVClassURI()));
@@ -711,9 +711,9 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
             p.removeAll(RDFS.range);
             if (inv != null) {
             	inv.removeAll(RDFS.domain);
-            }        	
+            }
         }
-        
+
         updatePropertyStringValue(p,EXAMPLE_ANNOT,prop.getExample(),getOntModel());
         updatePropertyStringValue(p,DESCRIPTION_ANNOT,prop.getDescription(),getOntModel());
         updatePropertyStringValue(p,PUBLIC_DESCRIPTION_ANNOT,prop.getPublicDescription(),getOntModel());
@@ -725,12 +725,12 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
             updatePropertyNonNegativeIntegerValue(inv,DISPLAY_LIMIT,prop.getRangeDisplayLimitInteger(),getOntModel());
             updatePropertyStringValue(inv,PROPERTY_ENTITYSORTDIRECTION,prop.getRangeEntitySortDirection(),getOntModel());
         }
-                
+
     	updatePropertyNonNegativeIntegerValue(p, DISPLAY_RANK_ANNOT, prop.getDomainDisplayTierInteger(), getOntModel());
     	if (inv != null) {
         	updatePropertyNonNegativeIntegerValue(inv, DISPLAY_RANK_ANNOT, prop.getRangeDisplayTierInteger(), getOntModel());
 		}
-    	
+
         String oldObjectIndividualSortPropertyURI = null;
     	RDFNode sortPropertyNode = p.getPropertyValue(PROPERTY_OBJECTINDIVIDUALSORTPROPERTY);
     	if (sortPropertyNode != null && sortPropertyNode instanceof Resource) {
@@ -739,7 +739,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
         if ( ( oldObjectIndividualSortPropertyURI != null && prop.getObjectIndividualSortPropertyURI() == null ) ||
         	 ( oldObjectIndividualSortPropertyURI != null && prop.getObjectIndividualSortPropertyURI() != null && !(oldObjectIndividualSortPropertyURI.equals(prop.getObjectIndividualSortPropertyURI()))))	{
         	p.removeAll(PROPERTY_OBJECTINDIVIDUALSORTPROPERTY);
-        } 
+        }
         if ( ( oldObjectIndividualSortPropertyURI == null && prop.getObjectIndividualSortPropertyURI() != null ) ||
            	 ( oldObjectIndividualSortPropertyURI != null && prop.getObjectIndividualSortPropertyURI() != null && !(oldObjectIndividualSortPropertyURI.equals(prop.getObjectIndividualSortPropertyURI()))))	{
         	Resource newObjectIndividualSortProperty = null;
@@ -770,7 +770,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
         updatePropertyBooleanValue(p,PROPERTY_OFFERCREATENEWOPTIONANNOT,prop.getOfferCreateNewOption(),ontModel,JenaBaseDao.KEEP_ONLY_IF_TRUE);
         updatePropertyBooleanValue(p,PROPERTY_STUBOBJECTPROPERTYANNOT,prop.getStubObjectRelation(),ontModel,JenaBaseDao.KEEP_ONLY_IF_TRUE);
         updatePropertyBooleanValue(p,PROPERTY_COLLATEBYSUBCLASSANNOT,prop.getCollateBySubclass(),ontModel,JenaBaseDao.KEEP_ONLY_IF_TRUE);
-        
+
         updatePropertyResourceURIValue(p, PROPERTY_INPROPERTYGROUPANNOT, prop.getGroupURI());
     }
 
@@ -783,7 +783,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
         getOntModel().getBaseModel().notifyEvent(new EditEvent(getWebappDaoFactory().getUserURI(),true));
         try {
             OntProperty op = ontModel.getOntProperty(prop.getURI());
-            if (op != null) {            	
+            if (op != null) {
             	//Remove restriction class.
             	Iterator<Resource> restIt = ontModel.listSubjectsWithProperty(OWL.onProperty, op);
             	while(restIt.hasNext()) {
@@ -792,9 +792,9 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
             			OntResource restOntRes = restRes.as(OntResource.class);
             			smartRemove(restOntRes, ontModel);
             		}
-            	}            	
+            	}
             	removeRulesMentioningResource(op, ontModel);
-            	
+
             	//Remove vitro:DependentResource
             	List<Statement> depResStmts = new LinkedList<Statement>();
             	StmtIterator depResIt = ontModel.listStatements(null, op, (RDFNode)null);
@@ -804,8 +804,8 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
             	}
             	ontModel.remove(depResStmts);
                 op.remove();
-            }                    	
-        	
+            }
+
             if ( (prop.getURIInverse() != null) && (prop.getURIInverse().length()>0) ) {
             	OntProperty invOp = ontModel.getOntProperty(prop.getURIInverse());
 	            if (invOp != null) {
@@ -818,7 +818,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
 	            		}
 	            	}
 	            	removeRulesMentioningResource(invOp, ontModel);
-	            	
+
 	            	//bdc34: I'm not sure if we want to remove DependentResources on a ObjectProperty delete.
 	                invOp.remove();
 	            }
@@ -876,11 +876,11 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
                                         isRoot = false;
                                     }
                                 }
-	                    	} 
+	                    	}
 	                    } else {
 	                    	isRoot = true;
 	                    }
-	                    
+
 	                    if (isRoot) {
 	                        if (!NONUSER_NAMESPACES.contains(op.getNameSpace())) {
 	                            rootProperties.add(propertyFromOntProperty(op));
@@ -937,7 +937,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
     	try {
     		ontModel.enterCriticalSection(Lock.READ);
     		if (getOntModel().contains(
-    				ontModel.getResource(predicateURI), 
+    				ontModel.getResource(predicateURI),
     				ontModel.getProperty(VitroVocabulary.SKIP_EDIT_FORM),
     				ontModel.createTypedLiteral("true", XSDDatatype.XSDboolean) ) ) {
     			return true;
@@ -955,10 +955,10 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
      * so we are implementing a new method now and will merge the old approach
      * into the new one in a future release.
      */
-    
+
     protected static final List<String> EXCLUDED_NAMESPACES = Arrays.asList(
-                                                                            //"http://www.w3.org/2002/07/owl#"            
-        ); 
+                                                                            //"http://www.w3.org/2002/07/owl#"
+        );
     /*
      * This is a hack to throw out properties in the vitro, rdf, rdfs, and owl namespaces.
      * It will be implemented in a better way in v1.3 (Editing and Display Configuration).
@@ -974,20 +974,20 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
                                "?property = vitro:additionalLink ||" +
                                "!regex(str(?property), \"^http://vitro.mannlib.cornell.edu/ns/vitro/0.7#\" ))");
         PROPERTY_FILTERS = StringUtils.join(namespaceFilters, " && ");
-    }   
-    
-    protected static final String OBJECT_PROPERTY_QUERY_STRING = 
+    }
+
+    protected static final String OBJECT_PROPERTY_QUERY_STRING =
         PREFIXES + "\n" +
         "SELECT DISTINCT ?property ?objType WHERE { \n" +
         "   ?subject ?property ?object . \n" +
-        "   ?object a ?objType . \n" + 
+        "   ?object a ?objType . \n" +
 //        "   ?property a owl:ObjectProperty . \n" +
         "   FILTER ( \n" +
         "       isURI(?object) && \n" +
                 PROPERTY_FILTERS + "\n" +
         "   ) \n" +
-        "} ORDER BY ?property ?objType";    
-    
+        "} ORDER BY ?property ?objType";
+
     @Override
     public List<ObjectProperty> getObjectPropertyList(Individual subject) {
         return getObjectPropertyList(subject.getURI());
@@ -1004,7 +1004,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
         // Due to a Jena bug, prebinding on ?subject combined with the isURI()
         // filter causes the query to fail. Using string concatenation to insert the
         // subject uri instead.
-        String queryString = QueryUtils.subUriForQueryVar(OBJECT_PROPERTY_QUERY_STRING, "subject", subjectUri); 
+        String queryString = QueryUtils.subUriForQueryVar(OBJECT_PROPERTY_QUERY_STRING, "subject", subjectUri);
 
         Query query = null;
         try {
@@ -1013,9 +1013,9 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
             log.error("could not create SPARQL query for query string " + th.getMessage());
             log.error(queryString);
             return null;
-        } 
+        }
         log.debug("Object property query:\n" + query);
-        
+
 
         final List<ObjectProperty> properties = new ArrayList<ObjectProperty>();
         getPropertyQueryResults(queryString, new ResultSetConsumer() {
@@ -1068,7 +1068,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
         "        OPTIONAL { ?context config:qualifiedByDomain ?domain } \n" +
         "    } \n" +
         "}";
-        
+
     protected static Query listViewConfigFileQuery = null;
     static {
         try {
@@ -1076,16 +1076,16 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
         } catch(Throwable th){
             log.error("could not create SPARQL query for LIST_VIEW_CONFIG_FILE_QUERY_STRING " + th.getMessage());
             log.error(LIST_VIEW_CONFIG_FILE_QUERY_STRING);
-        }           
+        }
     }
-    
-    //TODO private void addPropertyClassCombinationsToListViewMap(HashMap)    
-    
+
+    //TODO private void addPropertyClassCombinationsToListViewMap(HashMap)
+
     // Map key is inner pair of object property and range class URI,
     // with first member of outer pair being a domain class URI.
     // If domain or range is unspecified, OWL.Thing.getURI() is used in the key.
     Map<FullPropertyKey, String> customListViewConfigFileMap;
-    
+
     @Override
     public String getCustomListViewConfigFileName(ObjectProperty op) {
         if (customListViewConfigFileMap == null) {
@@ -1095,8 +1095,8 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
             long start = System.currentTimeMillis();
             OntModel displayModel = getOntModelSelector().getDisplayModel();
             //Get all property to list view config file mappings in the system
-            QueryExecution qexec = QueryExecutionFactory.create(listViewConfigFileQuery, displayModel); 
-            ResultSet results = qexec.execSelect();  
+            QueryExecution qexec = QueryExecutionFactory.create(listViewConfigFileQuery, displayModel);
+            ResultSet results = qexec.execSelect();
             //Iterate through mappings looking for the current property and setting up a hashmap for subsequent retrieval
             while (results.hasNext()) {
                 QuerySolution soln = results.next();
@@ -1121,14 +1121,14 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
                     String filename = soln.getLiteral("filename").getLexicalForm();
                     FullPropertyKey key = new FullPropertyKey(domainUri, prop.getURI(), rangeUri);
                     log.debug("putting " + key + " " + filename + " into list view map");
-					customListViewConfigFileMap.put(key, filename);     
+					customListViewConfigFileMap.put(key, filename);
                 }
             }
             // If there are no custom list views, put a bogus entry in the map
             // to avoid further recomputation
             if (customListViewConfigFileMap.isEmpty()) {
                 customListViewConfigFileMap.put(
-                        new FullPropertyKey(null, OWL.NS + "bottomObjectProperty", null), 
+                        new FullPropertyKey(null, OWL.NS + "bottomObjectProperty", null),
                         "nothing");
             }
             qexec.close();
@@ -1145,7 +1145,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
             key = new FullPropertyKey(null, op.getURI(), null);
 			customListViewConfigFileName = customListViewConfigFileMap.get(key);
         }
-        
+
         return customListViewConfigFileName;
     }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java
index b9d06d028..e54ec61a3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java
@@ -54,10 +54,10 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
 public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements ObjectPropertyStatementDao {
 
     private static final Log log = LogFactory.getLog(ObjectPropertyStatementDaoJena.class);
-    
+
     protected DatasetWrapperFactory dwf;
     protected RDFService rdfService;
-    
+
     public ObjectPropertyStatementDaoJena(RDFService rdfService,
                                           DatasetWrapperFactory dwf,
                                           WebappDaoFactoryJena wadf) {
@@ -95,10 +95,10 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
             return entity;
         else {
         	Map<String, ObjectProperty> uriToObjectProperty = new HashMap<String,ObjectProperty>();
-        	
+
         	ObjectPropertyDaoJena opDaoJena = (ObjectPropertyDaoJena) getWebappDaoFactory().getObjectPropertyDao();
         	//new ObjectPropertyDaoJena(rdfService, dwf, getWebappDaoFactory());
-        	
+
         	OntModel ontModel = getOntModelSelector().getABoxModel();
         	ontModel.enterCriticalSection(Lock.READ);
         	try {
@@ -108,7 +108,7 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
 	            try {
 	                while (propIt.hasNext()) {
 	                    Statement st = propIt.next();
-	                    
+
 	                    if (st.getObject().isResource() && !(NONUSER_NAMESPACES.contains(st.getPredicate().getNameSpace()))) {
 	                        try {
 	                            ObjectPropertyStatement objPropertyStmt = new ObjectPropertyStatementImpl();
@@ -133,21 +133,21 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
 	                                		//if ObjectProperty not found in ontology, skip it
 	                                		continue;
 	                                	}
-	                                }                                
+	                                }
 	                            } catch (Throwable g) {
 	                                //do not add statement to list
 	                            	log.debug("exception while trying to get object property for statement list, statement skipped.", g);
-	                            	continue;                                                                
+	                            	continue;
 	                            }
 	                            if (objPropertyStmt.getObjectURI() != null) {
 	                                Individual objInd = getWebappDaoFactory().getIndividualDao().getIndividualByURI(objPropertyStmt.getObjectURI());
 	                                objPropertyStmt.setObject(objInd);
 	                            }
-	
+
 	                            //add object property statement to list for Individual
 	                            if ((objPropertyStmt.getSubjectURI() != null) && (objPropertyStmt.getPropertyURI() != null) && (objPropertyStmt.getObject() != null)){
-	                                objPropertyStmtList.add(objPropertyStmt);                           
-	                            } 
+	                                objPropertyStmtList.add(objPropertyStmt);
+	                            }
 	                        } catch (Throwable t) {
 	                            log.error(t, t);
 	                        }
@@ -163,14 +163,14 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
             return entity;
         }
     }
-    
+
     private int NO_LIMIT = -1;
-    
+
     @Override
     public List<ObjectPropertyStatement> getObjectPropertyStatements (ObjectProperty objectProperty) {
     	return getObjectPropertyStatements(objectProperty, NO_LIMIT, NO_LIMIT);
     }
-    
+
     @Override
     public List<ObjectPropertyStatement> getObjectPropertyStatements (ObjectProperty objectProperty, int startIndex, int endIndex) {
     	getOntModel().enterCriticalSection(Lock.READ);
@@ -189,7 +189,7 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
 	    					if (!objRes.isAnon()) {
 			    				ObjectPropertyStatement ops = new ObjectPropertyStatementImpl();
 			    				ops.setSubjectURI(stmt.getSubject().getURI());
-			    				ops.setPropertyURI(objectProperty.getURI());		
+			    				ops.setPropertyURI(objectProperty.getURI());
 			    				ops.setObjectURI(objRes.getURI());
 			    				opss.add(ops);
 	    					}
@@ -272,19 +272,19 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
      * DataPropertyStatementDaoJena returns a List<DataPropertyStatement>. We need to accomodate
      * custom queries that could request any data in addition to just the object of the statement.
      * However, we do need to get the object of the statement so that we have it to create editing links.
-     */             
-    
+     */
+
     @Override
     public List<Map<String, String>> getObjectPropertyStatementsForIndividualByProperty(
-            String subjectUri, 
-            String propertyUri,             
+            String subjectUri,
+            String propertyUri,
             final String objectKey, String domainUri, String rangeUri,
-            String queryString, 
+            String queryString,
             Set<String> constructQueryStrings,
-            String sortDirection) {    	        
-    	
+            String sortDirection) {
+
         final List<Map<String, String>> list = new ArrayList<Map<String, String>>();
-        
+
         long start = System.currentTimeMillis();
 
         Model constructedModel = null;
@@ -396,10 +396,10 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
     }
 
     private Model constructModelForSelectQueries(String subjectUri,
-                                                 String propertyUri,    
+                                                 String propertyUri,
                                                  String rangeUri,
                                                  Set<String> constructQueries) {
-        
+
         if (constructQueries.size() == 0 || constructQueries == null) {
             return null;
         }
@@ -407,23 +407,23 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
         Model constructedModel = ModelFactory.createDefaultModel();
 
         for (String queryString : constructQueries) {
-                     
+
             queryString = queryString.replace("?subject", "<" + subjectUri + ">");
             queryString = queryString.replace("?property", "<" + propertyUri + ">");
             if (rangeUri != null) {
                 queryString = queryString.replace("?objectType", "<" + rangeUri + ">");
             }
-         
+
             if (log.isDebugEnabled()) {
-                log.debug("CONSTRUCT query string for object property " + 
+                log.debug("CONSTRUCT query string for object property " +
                         propertyUri + ": " + queryString);
             }
-            
+
             try {
-            	//If RDFService is null, will do what code used to do before, 
+            	//If RDFService is null, will do what code used to do before,
                 //otherwise employ rdfservice
             	if(rdfService == null) {
-                    log.debug("RDF Service null, Using CONSTRUCT query string for object property " + 
+                    log.debug("RDF Service null, Using CONSTRUCT query string for object property " +
                             propertyUri + ": " + queryString);
                     Query query = null;
                     try {
@@ -433,18 +433,18 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
                                   "string. " + th.getMessage());
                         log.error(queryString);
                         return constructedModel;
-                    } 
-                
+                    }
+
                     DatasetWrapper w = dwf.getDatasetWrapper();
                     Dataset dataset = w.getDataset();
                     dataset.getLock().enterCriticalSection(Lock.READ);
                     QueryExecution qe = null;
-                    try {                           
+                    try {
                         qe = QueryExecutionFactory.create(
                                 query, dataset);
                         qe.execConstruct(constructedModel);
                     } catch (Exception e) {
-                        log.error("Error getting constructed model for subject " 
+                        log.error("Error getting constructed model for subject "
                             + subjectUri + " and property " + propertyUri);
                     } finally {
                         if (qe != null) {
@@ -452,18 +452,18 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
                         }
                         dataset.getLock().leaveCriticalSection();
                         w.close();
-                    }	
+                    }
             	} else {
             	    rdfService.sparqlConstructQuery(queryString, constructedModel);
             	}
-            } catch (Exception e) {                
-                log.error("Error getting constructed model for subject " 
+            } catch (Exception e) {
+                log.error("Error getting constructed model for subject "
                     + subjectUri + " and property " + propertyUri, e);
-            } 
+            }
         }
-        return constructedModel;        
+        return constructedModel;
     }
-    
+
     protected static final String MOST_SPECIFIC_TYPE_QUERY = ""
         + "PREFIX rdfs: <" + VitroVocabulary.RDFS + "> \n"
         + "PREFIX vitro: <" + VitroVocabulary.vitroURI + "> \n"
@@ -475,27 +475,27 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
         + "} ORDER BY ?label ";
 
     @Override
-    /** 
+    /**
      * Finds all mostSpecificTypes of an individual that are members of a classgroup.
-     * Returns a list of type labels. 
-     * 
-     * Note that the Map returned is a LinkedHashMap, which means that an iterator 
+     * Returns a list of type labels.
+     *
+     * Note that the Map returned is a LinkedHashMap, which means that an iterator
      * will return the entries in the order in which the keys were inserted in the map.
-     * Since the SPARQL query included an "ORDER BY ?label" clause, and since an 
+     * Since the SPARQL query included an "ORDER BY ?label" clause, and since an
      * iterator through that ResultSet was used to add entries to the map, an iterator
      * on the map will return entries that are sorted by label (value, not key).
-     * 
+     *
      * While this sorting order is not specified as a requirement (maybe it should be?),
      * it is certainly useful that the types are returned in some order that is
      * replicable, so an individual with multiple mostSpecificTypes, will always see
      * the same list in the same order. (See https://issues.library.cornell.edu/browse/NIHVIVO-568)
      * **/
     public Map<String, String> getMostSpecificTypesInClassgroupsForIndividual(String subjectUri) {
-        
+
         String queryString = QueryUtils.subUriForQueryVar(MOST_SPECIFIC_TYPE_QUERY, "subject", subjectUri);
-        
+
         log.debug("Query string for vitro:mostSpecificType : " + queryString);
-        
+
         Query query = null;
         try {
             query = QueryFactory.create(queryString, Syntax.syntaxARQ);
@@ -503,8 +503,8 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
             log.error("Could not create SPARQL query for query string. " + th.getMessage());
             log.error(queryString);
             return Collections.emptyMap();
-        }        
-        
+        }
+
         Map<String, String> result = new LinkedHashMap<String, String>();
         Map<String, List<Literal>> types = new LinkedHashMap<String, List<Literal>>();
         DatasetWrapper w = dwf.getDatasetWrapper();
@@ -515,38 +515,38 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
             qexec = QueryExecutionFactory.create(query, dataset);
             ResultSet results = qexec.execSelect();
             while (results.hasNext()) {
-                QuerySolution soln = results.nextSolution();       
+                QuerySolution soln = results.nextSolution();
 
                 RDFNode typeNode = soln.get("type");
                 String type = null;
                 if (typeNode.isURIResource()) {
                      type = typeNode.asResource().getURI();
                 }
-                
+
                 RDFNode labelNode = soln.get("label");
                 if (StringUtils.isNotBlank(type) && labelNode.isLiteral()) {
-                	
+
                 	List<Literal> langLabels = types.get(type);
                 	if (null == langLabels) {
                 		types.put(type, langLabels = new ArrayList<Literal>());
                 	}
                 	langLabels.add(labelNode.asLiteral());
-                    
+
                 }
             }
-            
+
             // choose labels corresponding to preferred languages
             Set<Entry<String, List<Literal>>> typeEntries = types.entrySet();
             for (Entry<String, List<Literal>> current : typeEntries) {
             	result.put(current.getKey(), tryLiteralForPreferredLanguages(current.getValue()).getLexicalForm());
             }
-            
+
             return result;
-            
+
         } catch (Exception e) {
             log.error("Error getting most specific types for subject " + subjectUri);
             return Collections.emptyMap();
-            
+
         } finally {
             dataset.getLock().leaveCriticalSection();
             if (qexec != null) {
@@ -554,9 +554,9 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
             }
             w.close();
         }
-           
+
     }
-    
+
 	/**
 	 * If this statement qualifies as a faux property, set the range and domain
 	 * accordingly.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelector.java
index 72749a27b..59fb42c28 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelector.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelector.java
@@ -15,27 +15,27 @@ public interface OntModelSelector {
 	 * @return OntModel containing all RDF statements available to the application
 	 */
 	public OntModel getFullModel();
-		
+
 	/**
 	 * @return OntModel containing Portals, Tabs, etc. but not Users
 	 */
 	public OntModel getApplicationMetadataModel();
-	
+
 	/**
 	 * @return OntModel containing Users
 	 */
 	public OntModel getUserAccountsModel();
-	
+
 	/**
 	 * @return OntModel containing all ABox assertions
 	 */
 	public OntModel getABoxModel();
-	
+
 	/**
 	 * @return OntModel containing all TBox axioms
 	 */
 	public OntModel getTBoxModel();
-	
+
 	/**
 	 * @return OntModel containing all RDF statements in the Display model.
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntologyDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntologyDaoJena.java
index 80b88dbda..29d79f323 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntologyDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntologyDaoJena.java
@@ -22,34 +22,34 @@ public class OntologyDaoJena extends JenaBaseDao implements OntologyDao {
     public OntologyDaoJena(WebappDaoFactoryJena wadf) {
         super(wadf);
     }
-    
+
     // TODO: add model-per-ontology support
     @Override
     protected OntModel getOntModel() {
     	return getOntModelSelector().getTBoxModel();
     }
-    
-    public static synchronized String adjustOntologyURI(String ontologyURI) { 
+
+    public static synchronized String adjustOntologyURI(String ontologyURI) {
     	String uri = ontologyURI.trim();
     	int length = uri.length();
-		if ( (length>1) && (uri.charAt(length-1)=='#') ) { 
+		if ( (length>1) && (uri.charAt(length-1)=='#') ) {
     		return uri.substring(0,length-1);
     	} else {
     		return uri;
     	}
     }
-    
+
     private org.apache.jena.ontology.Ontology getOntology(String ontologyURI,
                                                           OntModel ontModel) {
-    	
+
     	// Something non-ideal happens here.  There are places in the code that
-    	// call getOntology() but don't pass the URI of the ontology resource 
+    	// call getOntology() but don't pass the URI of the ontology resource
     	// itself.  Instead, they pass the namespace that would appear
     	// in a PREFIX declaration.  For example, we might have an ontology with
     	// the namespace http://example.org/ontology# .
-    	// A class in this namespace might have the URI 
-    	// http://example.org/ontology#SomeClass .  The ontology resource 
-    	// itself, however, may have the URI http://example.org/ontology 
+    	// A class in this namespace might have the URI
+    	// http://example.org/ontology#SomeClass .  The ontology resource
+    	// itself, however, may have the URI http://example.org/ontology
     	// (no final hash mark).  To support assumptions in the code,
     	// this method calls adjustOntologyURI to remove a trailing hash
     	// mark if an ontology resource is not found at the specified URI.
@@ -109,11 +109,11 @@ public class OntologyDaoJena extends JenaBaseDao implements OntologyDao {
         Collections.sort(ontologies);
         return (ontologies.size()>0) ? ontologies : null;
     }
-    
+
     public Ontology getOntologyByURI(String ontologyURI) {
     	Ontology o = null;
     	try {
-    		o = ontologyFromOntologyResource(getOntology(ontologyURI,getOntModel()));	
+    		o = ontologyFromOntologyResource(getOntology(ontologyURI,getOntModel()));
     	} catch (Exception e) {}
     	if (o == null) {
 	        try {
@@ -130,7 +130,7 @@ public class OntologyDaoJena extends JenaBaseDao implements OntologyDao {
     public String insertNewOntology(Ontology ontology, OntModel ontModel) {
     	if (ontology == null) {
     		return null;
-    	} 
+    	}
     	try {
     		String ontologyURI = adjustAndValidateOntologyURI(ontology.getURI());
             ontModel.enterCriticalSection(Lock.WRITE);
@@ -163,7 +163,7 @@ public class OntologyDaoJena extends JenaBaseDao implements OntologyDao {
 	public void updateOntology(Ontology ontology) {
     	updateOntology(ontology,getOntModel());
     }
-    
+
     public void updateOntology(Ontology ontology, OntModel ontModel) {
         ontModel.enterCriticalSection(Lock.WRITE);
         if (ontology != null && ontology.getURI() != null && ontology.getURI().length()>0) {
@@ -173,7 +173,7 @@ public class OntologyDaoJena extends JenaBaseDao implements OntologyDao {
                     log.error("OntologyDaoJena.updateOntology() could not find ontology "+ontology.getURI()+" in Jena model");
                 } else {
                     updateRDFSLabel(o, ontology.getName());
-                    updatePropertyStringValue(o, ONTOLOGY_PREFIX_ANNOT, 
+                    updatePropertyStringValue(o, ONTOLOGY_PREFIX_ANNOT,
                             ontology.getPrefix(), ontModel);
                 }
             } finally {
@@ -189,7 +189,7 @@ public class OntologyDaoJena extends JenaBaseDao implements OntologyDao {
         ontology.setName(getLabelOrId(ontRes));
         ontology.setURI(ontRes.getURI());
         ontology.setPrefix(getPropertyStringValue(ontRes,ONTOLOGY_PREFIX_ANNOT));
-        
+
         // we need this for the time being because other things are expecting getAllOntologies() to return objects with trailing fragment separators
         // TODO: improve this so '#' is only appended if the last character is not an XML name character
         if (!(ontology.getURI().substring(ontology.getURI().length()-1,ontology.getURI().length()).equals("#") ||
@@ -197,7 +197,7 @@ public class OntologyDaoJena extends JenaBaseDao implements OntologyDao {
             )) {
             ontology.setURI(ontology.getURI()+"#");
         }
-        
+
         return ontology;
     }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java
index 2b5eb3876..8585b5c9d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PageDaoJena.java
@@ -34,7 +34,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 public class PageDaoJena extends JenaBaseDao implements PageDao {
 
     final static Log log = LogFactory.getLog(PageDaoJena.class);
-    
+
     static protected Query pageQuery;
     static protected Query pageTypeQuery;
     static protected Query pageDataGetterTypeQuery;
@@ -47,35 +47,35 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
     static protected Query individualsForClassesRestrictedQuery;
     static protected Query institutionalInternalClassQuery;
     static protected Query individualsForClassesInternalQuery;
-    static protected Query dataGetterClassQuery;    
+    static protected Query dataGetterClassQuery;
 
-    static final String prefixes = 
+    static final String prefixes =
         "PREFIX rdf:   <" + VitroVocabulary.RDF +"> \n" +
-        "PREFIX rdfs:  <" + VitroVocabulary.RDFS +"> \n" + 
+        "PREFIX rdfs:  <" + VitroVocabulary.RDFS +"> \n" +
         "PREFIX xsd:  <http://www.w3.org/2001/XMLSchema#> \n" +
         "PREFIX display: <" + DisplayVocabulary.DISPLAY_NS +"> \n";
-    
-    
-    static final protected String pageQueryString = 
+
+
+    static final protected String pageQueryString =
         prefixes + "\n" +
         "SELECT ?pageUri ?bodyTemplate ?urlMapping ?title WHERE {\n" +
-        "    ?pageUri rdf:type <" + DisplayVocabulary.PAGE_TYPE + ">.\n"+               
+        "    ?pageUri rdf:type <" + DisplayVocabulary.PAGE_TYPE + ">.\n"+
         "    OPTIONAL { ?pageUri <" + DisplayVocabulary.REQUIRES_BODY_TEMPLATE + "> ?bodyTemplate }.\n"+
         "    OPTIONAL { ?pageUri <" + DisplayVocabulary.TITLE + "> ?title }.\n"+
-        "    OPTIONAL { ?pageUri <" + DisplayVocabulary.URL_MAPPING + "> ?urlMapping . }\n"+                
+        "    OPTIONAL { ?pageUri <" + DisplayVocabulary.URL_MAPPING + "> ?urlMapping . }\n"+
         "} \n" ;
-    
-    static final protected String pageTypeQueryString = 
+
+    static final protected String pageTypeQueryString =
         prefixes + "\n" +
         "SELECT ?type WHERE {\n" +
-        "    ?pageUri rdf:type ?type .\n"+                              
+        "    ?pageUri rdf:type ?type .\n"+
         "} \n" ;
-    
+
     //Get data getter types
-    static final protected String pageDataGetterTypesQueryString = 
+    static final protected String pageDataGetterTypesQueryString =
         prefixes + "\n" +
         "SELECT ?dataGetterType WHERE {\n" +
-        "    ?pageUri display:hasDataGetter ?dg .\n"+    
+        "    ?pageUri display:hasDataGetter ?dg .\n"+
         " 	 ?dg rdf:type ?dataGetterType . \n" +
         "} \n" ;
 
@@ -87,78 +87,78 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
         "}";
 
     //Get data getter URIs
-    static final protected String dataGetterURIsQueryString = 
+    static final protected String dataGetterURIsQueryString =
         prefixes + "\n" +
         "SELECT ?dg WHERE {\n" +
-        "    ?pageUri display:hasDataGetter ?dg .\n"+            
+        "    ?pageUri display:hasDataGetter ?dg .\n"+
         "}" ;
-    
-    static final protected String pageMappingsQueryString = 
+
+    static final protected String pageMappingsQueryString =
         prefixes + "\n" +
         "SELECT ?pageUri ?urlMapping WHERE {\n" +
-        "    ?pageUri rdf:type <" + DisplayVocabulary.PAGE_TYPE + "> .\n"+                       
-        "    ?pageUri <" + DisplayVocabulary.URL_MAPPING + "> ?urlMapping . \n"+                
-        "} \n" ;
-                          
-    static final protected String homePageUriQueryString = 
-        prefixes + "\n" +
-        "SELECT ?pageUri WHERE {\n" +
-        "    ?pageUri rdf:type <" + DisplayVocabulary.HOME_PAGE_TYPE + "> .\n"+                
+        "    ?pageUri rdf:type <" + DisplayVocabulary.PAGE_TYPE + "> .\n"+
+        "    ?pageUri <" + DisplayVocabulary.URL_MAPPING + "> ?urlMapping . \n"+
         "} \n" ;
 
-   
+    static final protected String homePageUriQueryString =
+        prefixes + "\n" +
+        "SELECT ?pageUri WHERE {\n" +
+        "    ?pageUri rdf:type <" + DisplayVocabulary.HOME_PAGE_TYPE + "> .\n"+
+        "} \n" ;
+
+
     //Updated class group page query string so no longer check for type, as types have changed
-   
-    static final protected String classGroupPageQueryString = 
-    	prefixes + "\n" + 
+
+    static final protected String classGroupPageQueryString =
+    	prefixes + "\n" +
     	 "SELECT ?classGroup WHERE {\n" +
-         " ?pageUri display:hasDataGetter ?dg .\n"+    
+         " ?pageUri display:hasDataGetter ?dg .\n"+
          " ?dg <" + DisplayVocabulary.FOR_CLASSGROUP + "> ?classGroup . \n" +
          "} \n" ;
-   
-    //Query to get what classes are to be employed on the page 
+
+    //Query to get what classes are to be employed on the page
     //TODO: Commented out type but check if should include correct type
-    static final protected String individualsForClassesDataGetterQueryString = 
-    	prefixes + "\n" + 
+    static final protected String individualsForClassesDataGetterQueryString =
+    	prefixes + "\n" +
     	 "SELECT ?dg ?class ?restrictClass WHERE {\n" +
-         "    ?pageUri display:hasDataGetter ?dg .\n"+    //" 	 ?dg rdf:type <" + DisplayVocabulary.CLASSINDIVIDUALS_PAGE_TYPE + ">. \n" + 
+         "    ?pageUri display:hasDataGetter ?dg .\n"+    //" 	 ?dg rdf:type <" + DisplayVocabulary.CLASSINDIVIDUALS_PAGE_TYPE + ">. \n" +
          " ?dg <" + DisplayVocabulary.GETINDIVIDUALS_FOR_CLASS + "> ?class . \n" +
-         "    OPTIONAL {?dg <"+ DisplayVocabulary.RESTRICT_RESULTS_BY + "> ?restrictClass } .\n" +    
+         "    OPTIONAL {?dg <"+ DisplayVocabulary.RESTRICT_RESULTS_BY + "> ?restrictClass } .\n" +
          "} \n" ;
-        
+
     //Given a data getter, check if results are to be restricted by class
-    static final protected String individualsForClassesRestrictedQueryString =     
-    	prefixes + "\n" +    
+    static final protected String individualsForClassesRestrictedQueryString =
+    	prefixes + "\n" +
     	 "SELECT ?restrictClass WHERE {\n" +
-         "    ?dg <"+ DisplayVocabulary.RESTRICT_RESULTS_BY + "> ?restrictClass .\n" +    
+         "    ?dg <"+ DisplayVocabulary.RESTRICT_RESULTS_BY + "> ?restrictClass .\n" +
          "} \n" ;
-   
+
     //Is this data getter using internal class
-    static final protected String institutionalInternalClassQueryString  =     
-    	prefixes + "\n" +    
+    static final protected String institutionalInternalClassQueryString  =
+    	prefixes + "\n" +
    	 "SELECT ?restrictByInternalClass WHERE {\n" +
-        "    ?dg <"+ DisplayVocabulary.RESTRICT_RESULTS_BY_INTERNAL + "> ?restrictsByInternalClass .\n" +    
+        "    ?dg <"+ DisplayVocabulary.RESTRICT_RESULTS_BY_INTERNAL + "> ?restrictsByInternalClass .\n" +
         "} \n" ;
-    
+
     //Query to get classes employed on internal class page
     //and restriction classes if they exist
     //TODO: Check if need to substitute class name type instead
-    static final protected String individualsForClassesInternalQueryString = 
-    	prefixes + "\n" + 
+    static final protected String individualsForClassesInternalQueryString =
+    	prefixes + "\n" +
     	 "SELECT ?dg ?class ?isInternal WHERE {\n" +
-         "    ?pageUri display:hasDataGetter ?dg .\n"+   // " 	 ?dg rdf:type <" + DisplayVocabulary.CLASSINDIVIDUALS_INTERNAL_TYPE + ">. \n" + 
+         "    ?pageUri display:hasDataGetter ?dg .\n"+   // " 	 ?dg rdf:type <" + DisplayVocabulary.CLASSINDIVIDUALS_INTERNAL_TYPE + ">. \n" +
          " ?dg <" + DisplayVocabulary.GETINDIVIDUALS_FOR_CLASS + "> ?class . \n" +
-         " OPTIONAL {  ?dg <"+ DisplayVocabulary.RESTRICT_RESULTS_BY_INTERNAL + "> ?isInternal } .\n" +    
+         " OPTIONAL {  ?dg <"+ DisplayVocabulary.RESTRICT_RESULTS_BY_INTERNAL + "> ?isInternal } .\n" +
          "} \n" ;
-    
-    static final protected String usesDataGetterClassQueryString = 
-    	prefixes + "\n" + 
+
+    static final protected String usesDataGetterClassQueryString =
+    	prefixes + "\n" +
     	 "SELECT ?dgClass WHERE {\n" +
-         " ?pageUri display:hasDataGetter ?dg .\n"+    
-         " ?dg <" + RDF.type.getURI() +  "> ?dgClass . \n" +   
+         " ?pageUri display:hasDataGetter ?dg .\n"+
+         " ?dg <" + RDF.type.getURI() +  "> ?dgClass . \n" +
          "} \n" ;
     static{
-        try{    
+        try{
             pageQuery=QueryFactory.create(pageQueryString);
         }catch(Throwable th){
             log.error("could not create SPARQL query for pageQuery " + th.getMessage());
@@ -181,76 +181,76 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
         }catch(Throwable th){
             log.error("could not create SPARQL query for dataGetterURIsQuery " + th.getMessage());
             log.error(dataGetterURIsQueryString);
-        }                
-        try{    
+        }
+        try{
             pageMappingsQuery=QueryFactory.create(pageMappingsQueryString);
         }catch(Throwable th){
             log.error("could not create SPARQL query for pageMappingsQuery " + th.getMessage());
             log.error(pageMappingsQueryString);
-        }   
-        try{    
+        }
+        try{
             homePageUriQuery=QueryFactory.create(homePageUriQueryString);
         }catch(Throwable th){
             log.error("could not create SPARQL query for homePageUriQuery " + th.getMessage());
             log.error(homePageUriQueryString);
         }
-        try{    
+        try{
             classGroupPageQuery=QueryFactory.create(classGroupPageQueryString);
         }catch(Throwable th){
             log.error("could not create SPARQL query for classGroupPageQuery " + th.getMessage());
             log.error(classGroupPageQueryString);
-        } 
-        try{    
+        }
+        try{
             individualsForClassesQuery=QueryFactory.create(individualsForClassesDataGetterQueryString);
         }catch(Throwable th){
             log.error("could not create SPARQL query for individualsForClassesQuery " + th.getMessage());
             log.error(individualsForClassesDataGetterQueryString);
-        }  
-        
-        try{    
+        }
+
+        try{
             individualsForClassesRestrictedQuery=QueryFactory.create(individualsForClassesRestrictedQueryString);
         }catch(Throwable th){
             log.error("could not create SPARQL query for individualsForClassesRestrictedQuery " + th.getMessage());
             log.error(individualsForClassesDataGetterQueryString);
-        }  
+        }
         //Check if data getter uses internal class
-        try{    
+        try{
             institutionalInternalClassQuery=QueryFactory.create(institutionalInternalClassQueryString);
         }catch(Throwable th){
             log.error("could not create SPARQL query for institutionalInternalClassQuery " + th.getMessage());
             log.error(institutionalInternalClassQueryString);
-        } 
+        }
         //Check which classes set for page and whether or not page should only have internal classes
-        try{    
+        try{
             individualsForClassesInternalQuery = QueryFactory.create(individualsForClassesInternalQueryString);
         }catch(Throwable th){
             log.error("could not create SPARQL query for individualsForClassesInternalQuery " + th.getMessage());
             log.error(individualsForClassesInternalQueryString);
-        } 
+        }
         //Check what class to use for data getter - returns java class name
-        try{    
+        try{
             dataGetterClassQuery = QueryFactory.create(usesDataGetterClassQueryString);
         }catch(Throwable th){
             log.error("could not create SPARQL query for dataGetterClassQuery " + th.getMessage());
             log.error(usesDataGetterClassQueryString);
-        } 
-        
-        
-        
-    }        
-    
+        }
+
+
+
+    }
+
     public PageDaoJena(WebappDaoFactoryJena wadf) {
         super(wadf);
     }
-   
+
     @Override
     public Map<String, String> getPageMappings() {
         Model displayModel = getOntModelSelector().getDisplayModel();
         Map<String,String> rv = new HashMap<String,String>();
         displayModel.enterCriticalSection(false);
         try{
-        QueryExecution qexec = QueryExecutionFactory.create( pageQuery, displayModel );        
-            try{            
+        QueryExecution qexec = QueryExecutionFactory.create( pageQuery, displayModel );
+            try{
                 ResultSet resultSet = qexec.execSelect();
                 while(resultSet.hasNext()){
                     QuerySolution soln = resultSet.next();
@@ -262,19 +262,19 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
         }finally{
             displayModel.leaveCriticalSection();
         }
-        return rv; 
+        return rv;
     }
-    
+
     /**
-     * Gets information about a page identified by a URI.   
+     * Gets information about a page identified by a URI.
      */
     @Override
-    public Map<String, Object> getPage(String pageUri) {     
+    public Map<String, Object> getPage(String pageUri) {
       //setup query parameters
       QuerySolutionMap initialBindings = new QuerySolutionMap();
       initialBindings.add("pageUri", ResourceFactory.createResource(pageUri));
-      
-      List<Map<String, Object>> list; 
+
+      List<Map<String, Object>> list;
       Model displayModel = getOntModelSelector().getDisplayModel();
       displayModel.enterCriticalSection(false);
       try{
@@ -287,20 +287,20 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
       }finally{
           displayModel.leaveCriticalSection();
       }
-      
+
       if( list == null ){
           log.error("executeQueryToCollection returned null.");
           return Collections.emptyMap();
       }
       if( list.size() == 0 ){
           log.debug("no page found for " + pageUri);
-          return Collections.emptyMap();          
+          return Collections.emptyMap();
       }
-      
+
       if( list.size() > 1 )
           log.debug("multiple results found for " + pageUri + " using only the first.");
       Map<String,Object> pageData = list.get(0);
-      
+
       //now get the rdf:types for the data getters for the page
       List<String> dataGetterTypes = new ArrayList<String>();
       displayModel.enterCriticalSection(false);
@@ -313,9 +313,9 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
                   dataGetterTypes.add( nodeToString( soln.get("dataGetterType" ) ));
               }
           }finally{ qexec.close(); }
-      }finally{ displayModel.leaveCriticalSection(); }            
+      }finally{ displayModel.leaveCriticalSection(); }
       pageData.put("dataGetterTypes", dataGetterTypes);
-      
+
       //now get URIs of DataGetters for page.
       List<String> dataGetterURIs = new ArrayList<String>();
       displayModel.enterCriticalSection(false);
@@ -329,11 +329,11 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
               }
           }finally{ qexec.close(); }
       }finally{ displayModel.leaveCriticalSection(); }
-      
+
       pageData.put("dataGetterURIs", dataGetterURIs);
       return pageData;
     }
-    
+
     @Override
     public String getHomePageUri(){
         Model displayModel = getOntModelSelector().getDisplayModel();
@@ -341,11 +341,11 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
         displayModel.enterCriticalSection(false);
         try{
             QueryExecution qexec = QueryExecutionFactory.create( homePageUriQuery, displayModel );
-            try{                
-                ResultSet resultSet = qexec.execSelect();        
+            try{
+                ResultSet resultSet = qexec.execSelect();
                 while(resultSet.hasNext()){
                     QuerySolution soln = resultSet.next();
-                    rv.add( nodeToString(soln.get("pageUri")) );        
+                    rv.add( nodeToString(soln.get("pageUri")) );
                 }
                 if( rv.size() == 0 ){
                     log.error("No display:HomePage defined in display model.");
@@ -358,55 +358,55 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
                     }
                 }
             }finally{
-                qexec.close();            
+                qexec.close();
             }
         }finally{
             displayModel.leaveCriticalSection();
         }
         return rv.get(0);
     }
-    
+
     /**
      * Gets a URI for display:forClassGroup for the specified page.
      * Only one value is expected in the model.
-     * This may return null if there is no ClassGroup associated with the page. 
+     * This may return null if there is no ClassGroup associated with the page.
      * @param pageUri Page URI
      */
     @Override
-    public String getClassGroupPage(String pageUri) {        
+    public String getClassGroupPage(String pageUri) {
         QuerySolutionMap initialBindings = new QuerySolutionMap();
         initialBindings.add("pageUri", ResourceFactory.createResource(pageUri));
-        
+
         Model displayModel = getOntModelSelector().getDisplayModel();
         displayModel.enterCriticalSection(false);
-        try{                    
+        try{
             QueryExecution qexec = QueryExecutionFactory.create( classGroupPageQuery, displayModel , initialBindings);
             try{
                 List<String> classGroupsForPage = new ArrayList<String>();
-                ResultSet resultSet = qexec.execSelect();        
+                ResultSet resultSet = qexec.execSelect();
                 while(resultSet.hasNext()){
                     QuerySolution soln = resultSet.next();
-                    classGroupsForPage.add( nodeToString(soln.get("classGroup")) );        
+                    classGroupsForPage.add( nodeToString(soln.get("classGroup")) );
                 }
                 if( classGroupsForPage.size() == 0 ){
                     log.debug("No classgroup info defined in display model for "+ pageUri);
                     return null;
                 }
                 if( classGroupsForPage.size() > 1 ){
-                    log.error("More than one display:forClassGroup defined in display model for page " + pageUri);            
-                }        
+                    log.error("More than one display:forClassGroup defined in display model for page " + pageUri);
+                }
                 return classGroupsForPage.get(0);
             }finally{
                 qexec.close();
-            }            
+            }
         }finally{
             displayModel.leaveCriticalSection();
         }
     }
-    
-    
+
+
     /*
-     * Get the classes for which to get individuals returned. This should return a list of class uris. 
+     * Get the classes for which to get individuals returned. This should return a list of class uris.
      * Return a list of classes to be returned along with any restrictions to be applied.
      * Assumption: The page has a single data getter for classes and restrictions - all classes and restrictions
      * for any data getters for the page will be lumped together. For multiple data getters, will need to return
@@ -420,7 +420,7 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
     	QuerySolutionMap initialBindings = new QuerySolutionMap();
         initialBindings.add("pageUri", ResourceFactory.createResource(pageUri));
         List<String> classes = new ArrayList<String>();
-        
+
         Model displayModel = getOntModelSelector().getDisplayModel();
         displayModel.enterCriticalSection(false);
         try{
@@ -428,8 +428,8 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
             try{
                 HashMap<String, String> restrictClassesPresentMap = new HashMap<String, String>();
                 List<String>  restrictClasses = new ArrayList<String>();
-               
-                ResultSet resultSet = qexec.execSelect();        
+
+                ResultSet resultSet = qexec.execSelect();
                 while(resultSet.hasNext()){
                     QuerySolution soln = resultSet.next();
                     String dg = nodeToString(soln.get("dg"));
@@ -440,12 +440,12 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
                     	restrictClassesPresentMap.put(restrictClass, "true");
                     }
                 }
-                
+
                 if( classes.size() == 0 ){
                     log.debug("No classes  defined in display model for "+ pageUri);
                     return null;
                 }
-                classesAndRestrictions.put("classes", classes);  
+                classesAndRestrictions.put("classes", classes);
                 classesAndRestrictions.put("restrictClasses", restrictClasses);
                 return classesAndRestrictions;
             }finally{
@@ -455,20 +455,20 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
             displayModel.leaveCriticalSection();
         }
     }
-    
+
     //Get classes for page along with whether or not internal class
     public Map<String, Object> getClassesAndCheckInternal(String pageUri) {
    	 	Map<String, Object> classesAndRestrictions = new HashMap<String, Object>();
     	QuerySolutionMap initialBindings = new QuerySolutionMap();
         initialBindings.add("pageUri", ResourceFactory.createResource(pageUri));
         List<String> classes = new ArrayList<String>();
-        
+
         Model displayModel = getOntModelSelector().getDisplayModel();
         displayModel.enterCriticalSection(false);
         try{
             QueryExecution qexec = QueryExecutionFactory.create( individualsForClassesInternalQuery, displayModel , initialBindings);
             try{
-                ResultSet resultSet = qexec.execSelect();        
+                ResultSet resultSet = qexec.execSelect();
                 while(resultSet.hasNext()){
                     QuerySolution soln = resultSet.next();
                     String dg = nodeToString(soln.get("dg"));
@@ -481,12 +481,12 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
                     	classesAndRestrictions.put("isInternal", isInternal);
                     }
                 }
-                
+
                 if( classes.size() == 0 ){
                     log.debug("No classes  defined in display model for "+ pageUri);
                     return null;
                 }
-                classesAndRestrictions.put("classes", classes);  
+                classesAndRestrictions.put("classes", classes);
                 return classesAndRestrictions;
             }finally{
                 qexec.close();
@@ -495,7 +495,7 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
             displayModel.leaveCriticalSection();
         }
     }
-    
+
     public List<String> getDataGetterClass(String pageUri) {
     	 QuerySolutionMap initialBindings = new QuerySolutionMap();
          initialBindings.add("pageUri", ResourceFactory.createResource(pageUri));
@@ -503,23 +503,23 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
 
          Model displayModel = getOntModelSelector().getDisplayModel();
          displayModel.enterCriticalSection(false);
-         try{                    
+         try{
              QueryExecution qexec = QueryExecutionFactory.create( dataGetterClassQuery, displayModel , initialBindings);
              try{
-                 ResultSet resultSet = qexec.execSelect();        
+                 ResultSet resultSet = qexec.execSelect();
                  while(resultSet.hasNext()){
                      QuerySolution soln = resultSet.next();
-                     dataGetterClasses.add( nodeToString(soln.get("dgClass")) );        
+                     dataGetterClasses.add( nodeToString(soln.get("dgClass")) );
                  }
                  if( dataGetterClasses.size() == 0 ){
                      log.debug("No data getter classes defined for  "+ pageUri);
                      return null;
                  }
-                    
-                 
+
+
              }finally{
                  qexec.close();
-             }            
+             }
          }finally{
              displayModel.leaveCriticalSection();
          }
@@ -527,27 +527,27 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
     }
 
 
-    /** 
+    /**
      * Gets the requiredActions directly associated with page.
      */
     public List<String> getRequiredActions(String pageUri){
         QuerySolutionMap initialBindings = new QuerySolutionMap();
         initialBindings.add("pageUri", ResourceFactory.createResource(pageUri));
         List<String> actions = new ArrayList<String>();
-        
+
         Model dModel = getOntModelSelector().getDisplayModel();
         dModel.enterCriticalSection(false);
         try{
-            QueryExecution qe = 
+            QueryExecution qe =
                 QueryExecutionFactory.create( requiredActionsQuery, dModel, initialBindings);
             actions = executeQueryToList( qe );
             qe.close();
         }finally{
             dModel.leaveCriticalSection();
         }
-        return actions;            
+        return actions;
     }
-    
+
     /* *************************** Utility methods ********************************* */
 
     /**
@@ -574,7 +574,7 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
             return "";
         }
     }
-                                                  
+
     /**
      * Converts a sparql query that returns a multiple rows to a list of maps.
      * The maps will have column names as keys to the values.
@@ -590,7 +590,7 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
         }
         return rv;
     }
-    
+
     protected Map<String,Object> querySolutionToMap( QuerySolution soln ){
         Map<String,Object> map = new HashMap<String,Object>();
         Iterator<String> varNames = soln.varNames();
@@ -612,7 +612,7 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
         }else if( node.isURIResource() ){
             Resource resource = node.asResource();
             return resource.getURI();
-        }else if( node.isAnon() ){  
+        }else if( node.isAnon() ){
             Resource resource = node.asResource();
             return resource.getId().getLabelString(); //get b-node id
         }else{
@@ -629,13 +629,13 @@ public class PageDaoJena extends JenaBaseDao implements PageDao {
         }else if( node.isURIResource() ){
             Resource resource = node.asResource();
             return resource.getURI();
-        }else if( node.isAnon() ){  
+        }else if( node.isAnon() ){
             Resource resource = node.asResource();
             return resource.getId().getLabelString(); //get b-node id
         }else{
             return "";
         }
     }
-    
+
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java
index f10935720..bc3630082 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java
@@ -50,10 +50,10 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
 
 public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
-	
+
 	protected static final Log log = LogFactory.getLog(PropertyDaoJena.class.getName());
 	protected static final String FAUX_PROPERTY_FLAG = "FAUX";
-	
+
     private static final Map<String, String> NAMESPACES = new HashMap<String, String>() {{
         put("owl", VitroVocabulary.OWL);
         put("rdf", VitroVocabulary.RDF);
@@ -61,7 +61,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
         put("vitro", VitroVocabulary.vitroURI);
         put("vitroPublic", VitroVocabulary.VITRO_PUBLIC);
     }};
-    
+
     protected static final String PREFIXES;
     static {
         StringBuilder prefixes = new StringBuilder();
@@ -71,23 +71,23 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
         PREFIXES = prefixes.toString();
         log.debug("Query prefixes: " + PREFIXES);
     }
-    
+
     protected RDFService rdfService;
     protected DatasetWrapperFactory dwf;
-    
+
     public PropertyDaoJena(RDFService rdfService,
-                           DatasetWrapperFactory dwf, 
+                           DatasetWrapperFactory dwf,
                            WebappDaoFactoryJena wadf) {
         super(wadf);
         this.rdfService = rdfService;
         this.dwf = dwf;
     }
-    
+
     @Override
     protected OntModel getOntModel() {
     	return getOntModelSelector().getTBoxModel();
     }
-    
+
     protected RDFService getRDFService() {
         return this.rdfService;
     }
@@ -95,7 +95,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
 	public void addSuperproperty(ObjectProperty property, ObjectProperty superproperty) {
     	addSuperproperty(property.getURI(),superproperty.getURI());
     }
-    
+
     @Override
 	public void addSuperproperty(String propertyURI, String superpropertyURI) {
 		getOntModel().enterCriticalSection(Lock.WRITE);
@@ -105,11 +105,11 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
 			getOntModel().leaveCriticalSection();
 		}
 	}
-    
+
     public void removeSuperproperty(ObjectProperty property, ObjectProperty superproperty) {
     	removeSuperproperty(property.getURI(),superproperty.getURI());
     }
-    
+
     @Override
     public void removeSuperproperty(String propertyURI, String superpropertyURI) {
     	getOntModel().enterCriticalSection(Lock.WRITE);
@@ -121,25 +121,25 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
     		getOntModel().leaveCriticalSection();
     	}
     }
-    
+
     public void addSubproperty(ObjectProperty property, ObjectProperty subproperty) {
     	addSuperproperty(subproperty, property);
     }
-    
+
     @Override
     public void addSubproperty(String propertyURI, String subpropertyURI) {
     	addSuperproperty(subpropertyURI, propertyURI);
     }
-    
+
     public void removeSubproperty(ObjectProperty property, ObjectProperty subproperty) {
     	removeSuperproperty(subproperty, property);
     }
-    
+
     @Override
     public void removeSubproperty(String propertyURI, String subpropertyURI) {
     	removeSuperproperty(subpropertyURI,propertyURI);
     }
-    
+
     @Override
     public List <String> getSubPropertyURIs(String propertyURI) {
     	List<String> subURIs = new LinkedList<String>();
@@ -153,7 +153,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
                 } catch (Exception cce) {}
             }
 	    } catch (Exception e) {
-	    	log.error(e, e); 
+	    	log.error(e, e);
     	} finally {
     		getOntModel().leaveCriticalSection();
     	}
@@ -180,7 +180,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
     	outputList.addAll(nodeSet);
     	return outputList;
     }
-    
+
     @Override
     public List <String> getSuperPropertyURIs(String propertyURI, boolean direct) {
        	List<String> supURIs = new LinkedList<String>();
@@ -194,7 +194,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
                 } catch (Exception cce) {}
             }
 	    } catch (Exception e) {
-	    	log.error("Failed to get super-properties for " + propertyURI, e); 
+	    	log.error("Failed to get super-properties for " + propertyURI, e);
     	} finally {
     		getOntModel().leaveCriticalSection();
     	}
@@ -234,7 +234,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
 
     @Override
 	public void removeSubproperty(Property property, Property subproperty) {
-		removeSubproperty(property.getURI(), subproperty.getURI());	
+		removeSubproperty(property.getURI(), subproperty.getURI());
 	}
 
     @Override
@@ -248,7 +248,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
 		if (propertyURI == null || equivalentPropertyURI == null) {
 			throw new RuntimeException("cannot assert equivalence of anonymous properties");
 		}
-		OntModel ontModel = getOntModel();	
+		OntModel ontModel = getOntModel();
 		ontModel.enterCriticalSection(Lock.WRITE);
 		try {
 			Resource property = ontModel.getResource(propertyURI);
@@ -280,7 +280,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
                 }
             }
 	    } catch (Exception e) {
-	    	log.error(e, e); 
+	    	log.error(e, e);
     	} finally {
     		getOntModel().leaveCriticalSection();
     	}
@@ -292,7 +292,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
 		if (propertyURI == null || equivalentPropertyURI == null) {
 			throw new RuntimeException("cannot remove equivalence axiom about anonymous properties");
 		}
-		OntModel ontModel = getOntModel();	
+		OntModel ontModel = getOntModel();
 		ontModel.enterCriticalSection(Lock.WRITE);
 		try {
 			Resource property = ontModel.getResource(propertyURI);
@@ -308,7 +308,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
 	public void removeEquivalentProperty(Property property, Property equivalentProperty) {
 		removeEquivalentProperty(property.getURI(), equivalentProperty.getURI());
 	}
-	
+
 	protected void removeABoxStatementsWithPredicate(Property predicate) {
 		// DO NOT issue a removeAll() with a null (wildcard) in predicate position!
 		if (predicate == null) {
@@ -317,7 +317,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
 			removeABoxStatementsWithPredicate(predicate.getURI());
 		}
 	}
-	
+
 	protected void removeABoxStatementsWithPredicate(String predicateURI) {
 		if (predicateURI == null) {
 			log.debug("Cannot remove ABox statements with null predicate URI.");
@@ -332,12 +332,12 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
         	aboxModel.getBaseModel().notifyEvent(new EditEvent(getWebappDaoFactory().getUserURI(),false));
         	aboxModel.leaveCriticalSection();
         }
-    		
+
 	}
-	
+
 	/**
 	 * Finds the classes that have a definition involving a restriction
-	 * on the given property. 
+	 * on the given property.
 	 *
 	 * @param   propertyURI  identifier of a property
 	 * @return  a list of VClass objects representing the classes that have
@@ -346,27 +346,27 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
 
     @Override
     public List<VClass> getClassesWithRestrictionOnProperty(String propertyURI) {
-    	
+
     	if (propertyURI == null) {
     		log.warn("getClassesWithRestrictionOnProperty: called with null propertyURI");
     		return null;
     	}
-    	    	
-		OntModel ontModel = getOntModel();	
+
+		OntModel ontModel = getOntModel();
 		ontModel.enterCriticalSection(Lock.READ);
-		
+
 		HashSet<String> classURISet = new HashSet<String>();
-		
+
 		try {
 			Resource targetProp = ontModel.getResource(propertyURI);
-			   
+
 			if (targetProp != null) {
-			
+
 			    StmtIterator stmtIter = ontModel.listStatements((Resource) null, OWL.onProperty, targetProp);
-	
+
 			    while (stmtIter.hasNext()) {
 				   Statement statement = stmtIter.next();
-				   
+
 				   if ( statement.getSubject().canAs(OntClass.class) ) {
 					   classURISet.addAll(getRestrictedClasses(statement.getSubject().as(OntClass.class)));
 				   } else {
@@ -374,7 +374,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
 				   }
 			    }
 			} else {
-	    		log.error("getClassesWithRestrictionOnProperty: Error: didn't find a Property in the ontology model for the URI: " +  propertyURI);				
+	    		log.error("getClassesWithRestrictionOnProperty: Error: didn't find a Property in the ontology model for the URI: " +  propertyURI);
 			}
 		} finally {
 			ontModel.leaveCriticalSection();
@@ -382,21 +382,21 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
 
 		List<VClass> classes = new ArrayList<VClass>();
 		Iterator<String> iter = classURISet.iterator();
-		
+
 		VClassDao vcd = getWebappDaoFactory().getVClassDao();
-		
+
 		while (iter.hasNext()) {
-		
+
 		   String curi = iter.next();
 		   VClass vc = vcd.getVClassByURI(curi);
-		  
+
 		   if (vc != null) {
-		       classes.add(vc);	  
+		       classes.add(vc);
 		   } else {
 			   log.error("getClassesWithRestrictionOnProperty: Error: no VClass found for URI: " + curi);
-		   }	
+		   }
 		}
-       
+
         return (classes.size()>0) ? classes : null;
     }
 
@@ -404,15 +404,15 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
 	 * Find named classes to which a restriction "applies"
 	 * @param   ontClass Ontology class
 	 * @return  set of class URIs
-	 * 
+	 *
 	 * Note: this method assumes that the caller holds a read lock on
 	 * the ontology model.
 	 */
 
     public HashSet<String> getRestrictedClasses(OntClass ontClass) {
-    	
+
         HashSet<String> classSet = new HashSet<String>();
-  
+
         List<OntClass> classList = ontClass.listEquivalentClasses().toList();
         classList.addAll(ontClass.listSubClasses().toList());
 
@@ -423,10 +423,10 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
 				classSet.addAll(getRestrictedClasses(oc));
 			}
 		}
-        		
+
         return classSet;
     }
-     
+
 	protected void getPropertyQueryResults(String queryString, ResultSetConsumer consumer) {
 		log.debug("SPARQL query:\n" + queryString);
 
@@ -452,7 +452,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
      */
     protected List<Resource> getPropertiesWithAppropriateDomainFor(String vclassURI) {
         List<Resource> propertyResList = new ArrayList<Resource>();
-    	String queryStr = 
+    	String queryStr =
     		      "PREFIX rdf:   <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n" +
                   "PREFIX rdfs:  <http://www.w3.org/2000/01/rdf-schema#> \n" +
                   "PREFIX owl:   <http://www.w3.org/2002/07/owl#> \n\n " +
@@ -461,7 +461,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
                   "    ?p rdfs:domain <" + vclassURI + "> . \n" +
                   "  } UNION { \n" +
                   "    ?parent rdfs:domain <" + vclassURI + "> . \n" +
-                  "    ?p rdfs:subPropertyOf* ?parent. \n" + 
+                  "    ?p rdfs:subPropertyOf* ?parent. \n" +
                   "    OPTIONAL { \n" +
                   "      ?p rdfs:domain ?childDomain \n" +
                   "    } \n" +
@@ -476,7 +476,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
                   "    ?u rdf:rest* ?f . \n" +
                   "    ?d owl:unionOf ?u . \n" +
                   "    ?parent rdfs:domain ?d . \n" +
-                  "    ?p rdfs:subPropertyOf* ?parent. \n" + 
+                  "    ?p rdfs:subPropertyOf* ?parent. \n" +
                   "    OPTIONAL { \n" +
                   "      ?p rdfs:domain ?childDomain \n" +
                   "    } \n" +
@@ -499,15 +499,15 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
     	}
     	return propertyResList;
     }
-    
+
     public List<PropertyInstance> getAllPossiblePropInstForIndividual(String individualURI) {
     	Individual ind = getWebappDaoFactory().getIndividualDao().getIndividualByURI(individualURI);
     	VClassDao vcDao = getWebappDaoFactory().getVClassDao();
-    	
+
     	List<VClass> allTypes = ind.getVClasses(false); // include indirect types
-        
+
         Set<String> allSuperclassURIs = new HashSet<String>();
-        
+
         for (VClass type : allTypes) {
             String classURI = type.getURI();
             if (classURI != null) {
@@ -519,7 +519,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
             }
             allSuperclassURIs.addAll(vcDao.getAllSuperClassURIs(classURI));
         }
-        
+
         List<VClass> vclasses = new ArrayList<VClass>();
         for(String vclassURI : allSuperclassURIs) {
             VClass vclass = vcDao.getVClassByURI(vclassURI);
@@ -528,20 +528,20 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
             }
         }
     	return getAllPropInstByVClasses(vclasses);
-    	
+
     }
-    
+
     /* Removed: see VIVO-766.
      * sorts VClasses so that subclasses come before superclasses
-     * 
-     * Because subclass/superclass is only a partial ordering, this breaks the 
+     *
+     * Because subclass/superclass is only a partial ordering, this breaks the
      * contract for Comparator, and throws an IllegalArgumentException under Java 8.
-     * In particular, for classes sub, super and other, we have sub=other, sub<super, 
+     * In particular, for classes sub, super and other, we have sub=other, sub<super,
      * which should imply other<super, but that is not true.
-     * 
-     * As far as I can determine, this sort is never relied on anyway, so there 
+     *
+     * As far as I can determine, this sort is never relied on anyway, so there
      * should be no impact in removing it. Note that PropertyInstanceDaoJena re-sorts
-     * thes results before using them, so this sort was irrelevant for any calls 
+     * thes results before using them, so this sort was irrelevant for any calls
      * through that path.
      */
 //    private class VClassHierarchyRanker implements Comparator<VClass> {
@@ -560,24 +560,24 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
 //    		}
 //    	}
 //    }
-//    
-    
+//
+
     public List<PropertyInstance> getAllPropInstByVClass(String classURI) {
         if (classURI==null || classURI.length()<1) {
             return null;
         }
-        
+
         VClassDao vcDao = getWebappDaoFactory().getVClassDao();
-        
+
         Set<String> allSuperclassURIs = new HashSet<String>();
-       
+
         allSuperclassURIs.add(classURI);
         for (String equivURI : vcDao.getEquivalentClassURIs(classURI)) {
             allSuperclassURIs.add(equivURI);
             allSuperclassURIs.addAll(vcDao.getAllSuperClassURIs(equivURI));
         }
         allSuperclassURIs.addAll(vcDao.getAllSuperClassURIs(classURI));
-        
+
         List<VClass> vclasses = new ArrayList<VClass>();
         for(String vclassURI : allSuperclassURIs) {
             VClass vclass = vcDao.getVClassByURI(vclassURI);
@@ -587,10 +587,10 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
         }
         return getAllPropInstByVClasses(vclasses);
     }
-    
-    private void updatePropertyRangeMap(Map<String, Resource[]> map, 
-                                        String propURI, 
-                                        Resource[] ranges, 
+
+    private void updatePropertyRangeMap(Map<String, Resource[]> map,
+                                        String propURI,
+                                        Resource[] ranges,
                                         boolean replaceIfMoreSpecific) {
         Resource[] existingRanges = map.get(propURI);
         if (existingRanges == null) {
@@ -605,10 +605,10 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
             if (ranges[0] != null && moreSpecificThan(ranges[0], existingRanges[0])) {
                 existingRanges[0] = ranges[0];
             }
-            map.put(propURI, existingRanges);            
-        } 
+            map.put(propURI, existingRanges);
+        }
     }
-    
+
     private boolean moreSpecificThan(Resource r1, Resource r2) {
         if(r1.getURI() == null) {
             return false;
@@ -617,15 +617,15 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
         }
         return getWebappDaoFactory().getVClassDao().isSubClassOf(r1.getURI(), r2.getURI());
     }
-    
+
     private List<OntClass> listSuperClasses(OntClass ontClass) {
         return relatedClasses(ontClass, RDFS.subClassOf);
     }
-    
+
     private List<OntClass> listEquivalentClasses(OntClass ontClass) {
         return relatedClasses(ontClass, OWL.equivalentClass);
     }
-     
+
     private List<OntClass> relatedClasses(OntClass ontClass,
             org.apache.jena.rdf.model.Property property) {
         List<OntClass> classes = new ArrayList<OntClass>();
@@ -642,16 +642,16 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
         }
         return classes;
     }
-    
+
     private static final int DEPTH_LIMIT = 20;
-    
+
     private List<Restriction> getRelatedRestrictions(OntClass ontClass) {
         List<Restriction> restList = new ArrayList<Restriction>();
         addRelatedRestrictions(ontClass, restList, DEPTH_LIMIT);
         return restList;
     }
-    
-    private void addRelatedRestrictions(OntClass ontClass, 
+
+    private void addRelatedRestrictions(OntClass ontClass,
             List<Restriction> relatedRestrictions, int limit) {
         limit--;
         if (ontClass.isRestriction()) {
@@ -664,52 +664,52 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
                 if (!relatedRestrictions.contains(operand) && limit > 0) {
                     addRelatedRestrictions(operand, relatedRestrictions, limit);
                 }
-            }   
+            }
         } else {
             List<OntClass> superClasses = listSuperClasses(ontClass);
             superClasses.addAll(listEquivalentClasses(ontClass));
             for (OntClass sup : superClasses) {
-                if (sup.isAnon() && !sup.equals(ontClass) 
+                if (sup.isAnon() && !sup.equals(ontClass)
                         && !relatedRestrictions.contains(ontClass) && limit > 0) {
                     addRelatedRestrictions(sup, relatedRestrictions, limit);
                 }
             }
         }
     }
-    
+
     public List<PropertyInstance> getAllPropInstByVClasses(List<VClass> vclasses) {
-        
+
         List<PropertyInstance> propInsts = new ArrayList<PropertyInstance>();
-        
+
         if(vclasses == null || vclasses.isEmpty()) {
             return propInsts;
         }
-        
+
         // Removed: see VIVO-766.
         // Collections.sort(vclasses, new VClassHierarchyRanker(this.getWebappDaoFactory().getVClassDao()));
-        
+
         OntModel ontModel = getOntModelSelector().getTBoxModel();
-        
+
         try {
-        
+
         	ontModel.enterCriticalSection(Lock.READ);
-        	
+
         	// map object property URI to an array of two resources:
         	// the first is the "allValuesFrom" resource and the second is
         	// "someValuesFrom"
-        	Map<String, Resource[]> applicableProperties = 
+        	Map<String, Resource[]> applicableProperties =
         	        new HashMap<String, Resource[]>();
-        	
+
         	try {
 		        for (VClass vclass : vclasses) {
 		            if (vclass.isAnonymous()) {
-		                continue; 
+		                continue;
 		            }
 		            String VClassURI = vclass.getURI();
-		            
+
 		        	OntClass ontClass = getOntClass(ontModel,VClassURI);
 		        	if (ontClass == null) {
-		        	    continue;  
+		        	    continue;
 		        	}
 	        	    List<Restriction> relatedRestrictions = getRelatedRestrictions(ontClass);
 	        	    for (Restriction rest : relatedRestrictions) {
@@ -729,17 +729,17 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
                             }
 		        		}
 	        	    }
-	        		
-	        	    List<Resource> propertyList = 
+
+	        	    List<Resource> propertyList =
 	        	    	    getPropertiesWithAppropriateDomainFor(VClassURI);
 	        		for (Resource prop : propertyList) {
-	        		    if (prop.getNameSpace() != null 
+	        		    if (prop.getNameSpace() != null
 	        		            && !NONUSER_NAMESPACES.contains(
 	        		                    prop.getNameSpace()) ) {
 	        		        StmtIterator rangeSit = prop.listProperties(
 	        		                RDFS.range);
 	        		        Resource rangeRes = null;
-	        		        while (rangeSit.hasNext()) {    
+	        		        while (rangeSit.hasNext()) {
 	        		            Statement s = rangeSit.nextStatement();
 	        		            if (s.getObject().isURIResource()) {
 	        		                rangeRes = (Resource) s.getObject();
@@ -749,39 +749,39 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
 	        		        ranges[0] = rangeRes;
 	        		        updatePropertyRangeMap(
 	        		                applicableProperties, prop.getURI(), ranges, false);
-	        		        
+
 	        		    }
 	        		}
-	        		
+
 	        	}
-		             
+
         	} catch (Exception e) {
         		log.error("Unable to get applicable properties " +
         		          "by examining property restrictions and domains", e);
         	}
-        	
+
         	// make the PropertyInstance objects
 	        for (String propertyURI : applicableProperties.keySet()) {
 	            OntProperty op = ontModel
 	                    .getOntProperty(propertyURI);
 	            if (op == null) {
 	                continue;
-	            } 
+	            }
 	            Resource[] foundRanges = applicableProperties.get(propertyURI);
-	            Resource rangeRes = (foundRanges[0] != null) 
+	            Resource rangeRes = (foundRanges[0] != null)
 	                    ? foundRanges[0]
 	                            : (op.getRange() == null && foundRanges[1] != null)
 	                            ? foundRanges[1]
 	                                    : op.getRange();
 	            Resource domainRes = op.getDomain();
 	                            propInsts.add(getPropInst(op, domainRes, rangeRes));
-	            List<FullPropertyKey> additionalFauxSubpropertyKeys = 
+	            List<FullPropertyKey> additionalFauxSubpropertyKeys =
 	            		getAdditionalFauxSubpropertyKeysForPropertyURI(propertyURI);
 	            for (FullPropertyKey fauxSubpropertyKey : additionalFauxSubpropertyKeys) {
 	                boolean applicablePropInst = false;
-	                if (rangeRes == null ||  
+	                if (rangeRes == null ||
 	                        !getWebappDaoFactory().getVClassDao().isSubClassOf(
-	                            rangeRes.getURI(), fauxSubpropertyKey.getRangeUri())) { 
+	                            rangeRes.getURI(), fauxSubpropertyKey.getRangeUri())) {
 	                    if (fauxSubpropertyKey.getDomainUri() == null) {
 	                        applicablePropInst = true;
 	                    } else {
@@ -797,17 +797,17 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
     	                    propInsts.add(getPropInst(
                                     op,
                                     ResourceFactory.createResource(fauxSubpropertyKey.getDomainUri()),
-                                    ResourceFactory.createResource(fauxSubpropertyKey.getRangeUri()) 
+                                    ResourceFactory.createResource(fauxSubpropertyKey.getRangeUri())
                                     ));
 	                    }
 	                }
 	            }
 	        }
-	        
+
         } finally {
         	ontModel.leaveCriticalSection();
         }
-        
+
         // add any faux properties with applicable domain where the predicate URI
         // is not already on the list
         List<ObjectProperty> stragglers = getAdditionalFauxSubpropertiesForVClasses(
@@ -815,11 +815,11 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
         for (ObjectProperty op : stragglers) {
             propInsts.add(makePropInst(op));
         }
-        
+
         return propInsts;
-        
+
     }
-    
+
     private PropertyInstance makePropInst(ObjectProperty op) {
         PropertyInstance pi = new PropertyInstance();
         pi.setDomainClassURI(op.getDomainVClassURI());
@@ -830,15 +830,15 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
         pi.setDomainPublic(op.getDomainPublic());
         return pi;
     }
-    
-    private PropertyInstance getPropInst(OntProperty op, Resource domainRes, 
-            Resource rangeRes) {  
+
+    private PropertyInstance getPropInst(OntProperty op, Resource domainRes,
+            Resource rangeRes) {
         if (log.isDebugEnabled() && domainRes != null && rangeRes != null) {
-            log.debug("getPropInst() op: " + op.getURI() + " domain: " + 
+            log.debug("getPropInst() op: " + op.getURI() + " domain: " +
                 domainRes.getURI() + " range: " + rangeRes.getURI());
         }
         PropertyInstance pi = new PropertyInstance();
-        String domainURIStr = (domainRes != null && !domainRes.isAnon()) ? 
+        String domainURIStr = (domainRes != null && !domainRes.isAnon()) ?
                 domainURIStr = domainRes.getURI()
                 : null;
 //        if (rangeRes == null) {
@@ -879,10 +879,10 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
         pi.setDomainPublic(getLabelOrId(op));
         return pi;
     }
-    
+
     private List<ObjectProperty> getAdditionalFauxSubpropertiesForVClasses(
             List<VClass> vclasses, List<PropertyInstance> propInsts) {
-        
+
         List<ObjectProperty> opList = new ArrayList<ObjectProperty>();
         if (vclasses.size() == 0) {
             return opList;
@@ -925,13 +925,13 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
                 String rangeURI = qsoln.getResource("range").getURI();
                 opList.add(opDao.getObjectPropertyByURIs(
                         propertyURI, domainURI, rangeURI, null));
-            }  
+            }
         } finally {
             qe.close();
-        } 
+        }
         return opList;
     }
-    
+
     private List<FullPropertyKey> getAdditionalFauxSubpropertyKeysForPropertyURI(String propertyURI) {
         List<FullPropertyKey> keys = new ArrayList<>();
         String propQuery = "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" +
@@ -941,7 +941,7 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
                 "    ?context config:configContextFor <" + propertyURI + "> . \n" +
                 "    ?context config:qualifiedBy ?range . \n" +
                 "    OPTIONAL { ?context config:qualifiedByDomain ?domain } \n" +
-                "}"; 
+                "}";
 
         Query q = QueryFactory.create(propQuery);
         QueryExecution qe = QueryExecutionFactory.create(q, getOntModelSelector().getDisplayModel());
@@ -955,14 +955,14 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
                 String domainURI = null;
                 if (domainRes != null && !domainRes.isAnon()) {
                     domainURI = domainRes.getURI();
-                } 
+                }
                 keys.add(new FullPropertyKey(domainURI, propertyURI, rangeURI));
-            }  
+            }
         } finally {
             qe.close();
         }
         return keys;
     }
-    
-    
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyGroupDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyGroupDaoJena.java
index 7e07428b3..f3acc8322 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyGroupDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyGroupDaoJena.java
@@ -39,12 +39,12 @@ public class PropertyGroupDaoJena extends JenaBaseDao implements PropertyGroupDa
     public PropertyGroupDaoJena(WebappDaoFactoryJena wadf) {
         super(wadf);
     }
-	
+
     @Override
     protected OntModel getOntModel() {
     	return getOntModelSelector().getApplicationMetadataModel();
     }
-    
+
 	public void deletePropertyGroup(PropertyGroup group) {
         getOntModel().enterCriticalSection(Lock.WRITE);
         try {
@@ -58,14 +58,14 @@ public class PropertyGroupDaoJena extends JenaBaseDao implements PropertyGroupDa
         OntModel tboxModel = getOntModelSelector().getTBoxModel();
         tboxModel.enterCriticalSection(Lock.WRITE);
         try {
-            Resource groupRes = ResourceFactory.createResource(group.getURI());            
+            Resource groupRes = ResourceFactory.createResource(group.getURI());
             tboxModel.removeAll(groupRes, null, null);
             tboxModel.removeAll(null, null, groupRes);
         } finally {
             tboxModel.leaveCriticalSection();
         }
 	}
-	
+
 	public PropertyGroup getGroupByURI(String uri) {
 	    if (uri == null) {
 	        return null;
@@ -81,7 +81,7 @@ public class PropertyGroupDaoJena extends JenaBaseDao implements PropertyGroupDa
         }
 	}
 
-	
+
 	public List<PropertyGroup> getPublicGroups(boolean withProperties) {
         ObjectPropertyDao opDao = getWebappDaoFactory().getObjectPropertyDao();
         DataPropertyDao dpDao = getWebappDaoFactory().getDataPropertyDao();
@@ -107,8 +107,8 @@ public class PropertyGroupDaoJena extends JenaBaseDao implements PropertyGroupDa
         	Model tboxModel = getOntModelSelector().getTBoxModel();
         	tboxModel.enterCriticalSection(Lock.READ);
         	try {
-	        	for (PropertyGroup pgrp : groups) {	
-		            List<Property> properties = new ArrayList<Property>();            
+	        	for (PropertyGroup pgrp : groups) {
+		            List<Property> properties = new ArrayList<Property>();
 		            ClosableIterator closeIt = tboxModel.listStatements(
 		            		null, PROPERTY_INPROPERTYGROUPANNOT, tboxModel.getResource(pgrp.getURI()));
 		            try {
@@ -133,27 +133,27 @@ public class PropertyGroupDaoJena extends JenaBaseDao implements PropertyGroupDa
         Collections.sort(groups);
         return groups;
 	}
-	
+
 	public String insertNewPropertyGroup(PropertyGroup group) {
-		
+
 	 	// VitroPropertyGroups should really inherit from Individual objects now,
     	// but they don't (yet).
     	// I'm going to make an Individual so I can avoid duplicating URI code.
-    	
-    	edu.cornell.mannlib.vitro.webapp.beans.Individual groupInd = 
+
+    	edu.cornell.mannlib.vitro.webapp.beans.Individual groupInd =
     		new IndividualImpl(); // We should make a factory for these
     	groupInd.setNamespace(DEFAULT_NAMESPACE+"vitroPropertyGroup");
     	groupInd.setName(group.getName());
     	groupInd.setVClassURI(PROPERTYGROUP.getURI());
     	groupInd.setURI(group.getURI());
-    	
+
     	String groupURI = null;
-    	
+
         OntModel unionForURIGeneration = ModelFactory.createOntologyModel(
                 OntModelSpec.OWL_MEM, ModelFactory.createUnion(
-                        getOntModelSelector().getApplicationMetadataModel(), 
+                        getOntModelSelector().getApplicationMetadataModel(),
                         getOntModelSelector().getFullModel()));
-        
+
         WebappDaoFactory wadfForURIGeneration = null;
         try {
             wadfForURIGeneration = new WebappDaoFactoryJena(
@@ -161,12 +161,12 @@ public class PropertyGroupDaoJena extends JenaBaseDao implements PropertyGroupDa
             groupURI = wadfForURIGeneration
                     .getIndividualDao().insertNewIndividual(groupInd);
     	} catch (InsertException ie) {
-    		throw new RuntimeException(InsertException.class.getName() + 
+    		throw new RuntimeException(InsertException.class.getName() +
     		        "Unable to insert property group " + groupURI, ie);
     	} finally {
     	    wadfForURIGeneration.close();
     	}
-    	
+
     	if (groupURI != null) {
 	        getOntModel().enterCriticalSection(Lock.WRITE);
 	        try {
@@ -177,15 +177,15 @@ public class PropertyGroupDaoJena extends JenaBaseDao implements PropertyGroupDa
 	                        group.getDisplayRank()), XSDDatatype.XSDint);
 	            } catch (Exception e) {
 	                log.error(
-	                        "error setting displayRank for " 
+	                        "error setting displayRank for "
 	                                + groupInd.getURI());
 	            }
-	            if (group.getPublicDescription() != null 
+	            if (group.getPublicDescription() != null
 	                    && group.getPublicDescription().length()>0) {
-		            try {   
+		            try {
 		                groupJenaInd.addProperty(
-		                        PUBLIC_DESCRIPTION_ANNOT, 
-		                        group.getPublicDescription(), 
+		                        PUBLIC_DESCRIPTION_ANNOT,
+		                        group.getPublicDescription(),
 		                        XSDDatatype.XSDstring);
 		            } catch (Exception ex) {
 		                log.error(
@@ -199,10 +199,10 @@ public class PropertyGroupDaoJena extends JenaBaseDao implements PropertyGroupDa
     	} else {
     		log.error("Unable to insert property group " + group.getName());
     	}
-    
+
 	    return groupURI;
 	}
-	
+
 	public int removeUnpopulatedGroups(List<PropertyGroup> groups) {
         if (groups==null || groups.size()==0)
             return 0;
@@ -247,7 +247,7 @@ public class PropertyGroupDaoJena extends JenaBaseDao implements PropertyGroupDa
 	        ontModel.leaveCriticalSection();
 	    }
 	}
-	
+
 	public PropertyGroup createDummyPropertyGroup(String name, int rank) {
 	    PropertyGroup newGroup = new PropertyGroup();
 	    newGroup.setName(name);
@@ -269,8 +269,8 @@ public class PropertyGroupDaoJena extends JenaBaseDao implements PropertyGroupDa
         group.setLocalName(groupInd.getLocalName());
         group.setPublicDescription(getPropertyStringValue(
                 groupInd, PUBLIC_DESCRIPTION_ANNOT));
-        group.setDisplayRank(getPropertyNonNegativeIntValue(groupInd, DISPLAY_RANK));    
+        group.setDisplayRank(getPropertyNonNegativeIntValue(groupInd, DISPLAY_RANK));
         return group;
     }
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java
index 9000223bd..4d10b9aad 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJena.java
@@ -32,8 +32,8 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 public class PropertyInstanceDaoJena extends PropertyDaoJena implements
         PropertyInstanceDao {
 
-    public PropertyInstanceDaoJena(RDFService rdfService, 
-                                   DatasetWrapperFactory dwf, 
+    public PropertyInstanceDaoJena(RDFService rdfService,
+                                   DatasetWrapperFactory dwf,
                                    WebappDaoFactoryJena wadf) {
         super(rdfService, dwf, wadf);
     }
@@ -42,7 +42,7 @@ public class PropertyInstanceDaoJena extends PropertyDaoJena implements
     	deleteObjectPropertyStatement(subjectURI, propertyURI, objectURI, getOntModelSelector());
     }
 
-    public void deleteObjectPropertyStatement(String subjectURI, String propertyURI, String objectURI, 
+    public void deleteObjectPropertyStatement(String subjectURI, String propertyURI, String objectURI,
                                               OntModelSelector ontModelSelector) {
         OntModel ontModel = ontModelSelector.getABoxModel();
         OntModel tboxModel = ontModelSelector.getTBoxModel();
@@ -50,22 +50,22 @@ public class PropertyInstanceDaoJena extends PropertyDaoJena implements
         try {
             Resource subjRes = ontModel.getResource(subjectURI);
             Property pred = tboxModel.getProperty(propertyURI);
-            OntProperty invPred = null;                        
+            OntProperty invPred = null;
             if (pred.canAs(OntProperty.class)) {
             	invPred = pred.as(OntProperty.class).getInverse();
             }
             Resource objRes = ontModel.getResource(objectURI);
             Model baseModel = getOntModel().getBaseModel();
             String userUri = getWebappDaoFactory().getUserURI();
-            if ( (subjRes != null) && (pred != null) && (objRes != null) ) {            	
+            if ( (subjRes != null) && (pred != null) && (objRes != null) ) {
             	baseModel.notifyEvent(new IndividualUpdateEvent(userUri,true,subjectURI));
             	try {
-            		ontModel.remove(subjRes,pred,objRes);            		
+            		ontModel.remove(subjRes,pred,objRes);
             	} finally {
             		baseModel.notifyEvent(new IndividualUpdateEvent(userUri,false,subjectURI));
             	}
-            	try{            		
-            		baseModel.notifyEvent(new IndividualDeletionEvent(userUri,true,objectURI));            		
+            	try{
+            		baseModel.notifyEvent(new IndividualDeletionEvent(userUri,true,objectURI));
             		List<Statement> depResStmts = DependentResourceDeleteJena
                         .getDependentResourceDeleteList(ResourceFactory.createStatement(subjRes, pred, objRes),ontModel);
             		ontModel.remove(depResStmts);
@@ -85,34 +85,34 @@ public class PropertyInstanceDaoJena extends PropertyDaoJena implements
             ontModel.leaveCriticalSection();
         }
     }
-    
-    @Override 
+
+    @Override
     public List<PropertyInstance> getAllPossiblePropInstForIndividual(String individualURI) {
-    	return filterAndSort(super.getAllPossiblePropInstForIndividual(individualURI));	
+    	return filterAndSort(super.getAllPossiblePropInstForIndividual(individualURI));
     }
-    
-    @Override 
+
+    @Override
     public List<PropertyInstance> getAllPropInstByVClass(String vclassURI) {
     	return filterAndSort(super.getAllPropInstByVClass(vclassURI));
     }
-    
+
     @Override
     public List<PropertyInstance> getAllPropInstByVClasses(List<VClass> vclasses) {
     	return filterAndSort(super.getAllPropInstByVClasses(vclasses));
     }
-    
+
     private List<PropertyInstance>filterAndSort(List<PropertyInstance> propList) {
     	ArrayList<PropertyInstance> propInsts = new ArrayList<PropertyInstance>();
     	for (PropertyInstance propInst : propList) {
     		OntModel tboxModel = getOntModel();
     		tboxModel.enterCriticalSection(Lock.READ);
     		boolean add = false;
-    		try { 
-    			add = (propInst.getPropertyURI() != null 
+    		try {
+    			add = (propInst.getPropertyURI() != null
     					&& tboxModel.contains(
     							tboxModel.getResource(
-    									propInst.getPropertyURI()), 
-    									RDF.type, 
+    									propInst.getPropertyURI()),
+    									RDF.type,
     									OWL.ObjectProperty));
 	    	} finally {
 	    		tboxModel.leaveCriticalSection();
@@ -202,7 +202,7 @@ public class PropertyInstanceDaoJena extends PropertyDaoJena implements
             tboxModel.enterCriticalSection(Lock.READ);
             try {
                 Resource subjRes = ontModel.getResource(prop.getSubjectEntURI());
-                OntProperty pred = tboxModel.getOntProperty(prop.getPropertyURI());            
+                OntProperty pred = tboxModel.getOntProperty(prop.getPropertyURI());
                 Resource objRes = ontModel.getResource(prop.getObjectEntURI());
                 if ( (subjRes != null) && (pred != null) && (objRes != null) ) {
                 	getOntModel().getBaseModel().notifyEvent(new IndividualUpdateEvent(getWebappDaoFactory().getUserURI(),true,prop.getSubjectEntURI()));
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtils.java
index 1c964ad4a..2c5b35984 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/QueryUtils.java
@@ -26,29 +26,29 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
 import org.apache.jena.riot.out.NodeFormatter;
 import org.apache.jena.riot.out.NodeFormatterTTL;
 
-/** 
- * Utilities for executing queries and working with query results. 
- * 
+/**
+ * Utilities for executing queries and working with query results.
+ *
  */
 
 public class QueryUtils {
-    
+
     private static final Log log = LogFactory.getLog(QueryUtils.class);
-    
+
     private QueryUtils() { }
-    
+
     public static Map<String,Object> querySolutionToObjectValueMap( QuerySolution soln){
         Map<String,Object> map = new HashMap<String,Object>();
         Iterator<String> varNames = soln.varNames();
         while(varNames.hasNext()){
             String varName = varNames.next();
             Object value = nodeToObject( soln.get(varName));
-            log.debug("Adding " + varName + " : " + value + " to query solution data.");            
+            log.debug("Adding " + varName + " : " + value + " to query solution data.");
             map.put(varName, value);
         }
         return map;
     }
- 
+
     public static Map<String,String> querySolutionToStringValueMap( QuerySolution soln ){
         Map<String,String> map = new HashMap<String,String>();
         Iterator<String> varNames = soln.varNames();
@@ -56,11 +56,11 @@ public class QueryUtils {
             String varName = varNames.next();
             String value = nodeToString( soln.get(varName));
             log.debug("Adding " + varName + " : " + value + " to query solution data.");
-            map.put(varName, value);           
+            map.put(varName, value);
         }
         return map;
     }
-    
+
 	/**
 	 * If any pair of maps in the list has the same (non-null) value for any of
 	 * these keys, call the maps duplicates and keep only the first of them.
@@ -93,7 +93,7 @@ public class QueryUtils {
 				+ Arrays.toString(keys) + ". Keeping " + filteredMap
 				+ ". Discarding " + rawMap + ".");
 	}
-    
+
     public static Object nodeToObject( RDFNode node ){
         if( node == null ){
             return "";
@@ -103,7 +103,7 @@ public class QueryUtils {
         }else if( node.isURIResource() ){
             Resource resource = node.asResource();
             return resource.getURI();
-        }else if( node.isAnon() ){  
+        }else if( node.isAnon() ){
             Resource resource = node.asResource();
             return resource.getId().getLabelString(); //get b-node id
         }else{
@@ -120,19 +120,19 @@ public class QueryUtils {
         }else if( node.isURIResource() ){
             Resource resource = node.asResource();
             return resource.getURI();
-        }else if( node.isAnon() ){  
+        }else if( node.isAnon() ){
             Resource resource = node.asResource();
             return resource.getId().getLabelString(); //get b-node id
         }else{
             return "";
         }
     }
-    
+
     /** Manually replace query variables with uris when prebinding causes the query to fail, probably
      * due to a Jena bug.
      */
     public static String subUrisForQueryVars(String queryString, Map<String, String> varsToUris) {
-        
+
         for (String var : varsToUris.keySet()) {
            queryString = subUriForQueryVar(queryString, var, varsToUris.get(var));
         }
@@ -145,12 +145,12 @@ public class QueryUtils {
     public static String subUriForQueryVar(String queryString, String varName, String uri) {
         return queryString.replaceAll("\\?" + varName + "\\b", "<" + uri + ">");
     }
-    
+
     /**Replace one variable name with another**/
     public static String replaceQueryVar(String queryString, String varName, String newVarName) {
         return queryString.replaceAll("\\?" + varName + "\\b", "?" + newVarName);
     }
-    
+
     public static ResultSet getQueryResults(String queryStr, VitroRequest vreq) {
         return getQueryResults(queryStr, vreq.getRDFService());
     }
@@ -158,7 +158,7 @@ public class QueryUtils {
     public static ResultSet getQueryResults(String queryStr, QuerySolution initialBindings, RDFService rdfService) {
     	return getQueryResults(bindVariables(queryStr, initialBindings), rdfService);
     }
-    
+
 	public static ResultSet getLanguageNeutralQueryResults(String queryStr, VitroRequest vreq) {
     	return getQueryResults(queryStr, vreq.getUnfilteredRDFService());
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDataset.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDataset.java
index 3cfc6188e..644dfc3bc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDataset.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDataset.java
@@ -26,15 +26,15 @@ public class RDFServiceDataset implements Dataset {
 
     private RDFServiceDatasetGraph g;
     private ReadWrite transactionMode;
-    
+
     public RDFServiceDataset(RDFServiceDatasetGraph g) {
         this.g = g;
     }
-    
+
     public RDFServiceDataset(RDFService rdfService) {
         this.g = new RDFServiceDatasetGraph(rdfService);
     }
-    
+
     @Override
     public DatasetGraph asDatasetGraph() {
         return g;
@@ -66,7 +66,7 @@ public class RDFServiceDataset implements Dataset {
     }
 
     private final static Log log = LogFactory.getLog(RDFServiceDataset.class);
-    
+
     @Override
     public Model getNamedModel(String arg0) {
         Model model = RDFServiceGraph.createRDFServiceModel(
@@ -134,9 +134,9 @@ public class RDFServiceDataset implements Dataset {
 	public boolean isInTransaction() {
 		return (transactionMode != null);
 	}
-	
+
     private boolean supportsTransactions(Graph graph) {
-        return (graph.getTransactionHandler() != null 
+        return (graph.getTransactionHandler() != null
                 && graph.getTransactionHandler().transactionsSupported());
     }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDatasetGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDatasetGraph.java
index 39008e572..bbd96d7b1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDatasetGraph.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceDatasetGraph.java
@@ -36,7 +36,7 @@ public class RDFServiceDatasetGraph implements DatasetGraph {
     private Context context = new Context() ;
     private Map<String, RDFServiceGraph> graphCache = new ConcurrentHashMap<String, RDFServiceGraph>();
     private ReadWrite transactionMode;
-    
+
     public RDFServiceDatasetGraph(RDFService rdfService) {
         this.rdfService = rdfService;
         this.defaultGraph = new RDFServiceGraph(rdfService);
@@ -94,17 +94,17 @@ public class RDFServiceDatasetGraph implements DatasetGraph {
     public void end() {
         this.transactionMode = null;
     }
-    
+
     private Graph getGraphFor(Quad q) {
         return getGraphFor(q.getGraph());
     }
-    
+
     private Graph getGraphFor(Node g) {
-        return (g == Node.ANY) 
+        return (g == Node.ANY)
                 ? defaultGraph
                 : getGraph(g);
     }
-    
+
     @Override
     public void add(Quad arg0) {
         getGraphFor(arg0).add(new Triple(arg0.getSubject(), arg0.getPredicate(), arg0.getObject()));
@@ -164,7 +164,7 @@ public class RDFServiceDatasetGraph implements DatasetGraph {
 	public void delete(Node g, Node s, Node p, Node o) {
 		delete(new Quad(g, s, p, o));
 	}
-    
+
     @Override
     public void deleteAny(Node arg0, Node arg1, Node arg2, Node arg3) {
         // TODO check this
@@ -206,9 +206,9 @@ public class RDFServiceDatasetGraph implements DatasetGraph {
         .append(SparqlGraph.sparqlNode(object, "?o"));
         findQuery.append("  } ");
         findQuery.append("\n}");
-        
+
         //log.info(findQuery.toString());
-        
+
         final List<Quad> quadlist = new ArrayList<Quad>();
         try {
             rdfService.sparqlSelectQuery(findQuery.toString(), new ResultSetConsumer() {
@@ -244,7 +244,7 @@ public class RDFServiceDatasetGraph implements DatasetGraph {
     public RDFServiceGraph getDefaultGraph() {
         return defaultGraph;
     }
-    
+
     @Override
     public RDFServiceGraph getGraph(Node arg0) {
         String graphURI = arg0.getURI();
@@ -266,7 +266,7 @@ public class RDFServiceDatasetGraph implements DatasetGraph {
     }
 
     private boolean supportsTransactions(Graph graph) {
-        return (graph.getTransactionHandler() != null 
+        return (graph.getTransactionHandler() != null
                 && graph.getTransactionHandler().transactionsSupported());
     }
 
@@ -286,7 +286,7 @@ public class RDFServiceDatasetGraph implements DatasetGraph {
         List<Node> graphNodeList = new ArrayList<Node>();
         try {
             for (String graphURI : rdfService.getGraphURIs()) {
-                graphNodeList.add(NodeFactory.createURI(graphURI));   
+                graphNodeList.add(NodeFactory.createURI(graphURI));
             }
         } catch (RDFServiceException rdfse) {
             throw new RuntimeException(rdfse);
@@ -309,7 +309,7 @@ public class RDFServiceDatasetGraph implements DatasetGraph {
         // TODO Auto-generated method stub
         return 0;
     }
-    
+
     private boolean isVar(Node node) {
         return (node == null || node.isVariable() || node == Node.ANY);
     }
@@ -319,5 +319,5 @@ public class RDFServiceDatasetGraph implements DatasetGraph {
 		return "RDFServiceDatasetGraph[" + ToString.hashHex(this)
 				+ ", " + rdfService + "]";
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java
index 9f1044919..491858453 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java
@@ -45,28 +45,28 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
 import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
 
 public class RDFServiceGraph implements GraphWithPerform {
-    
+
     private RDFService rdfService;
     private String graphURI;
     private static final Log log = LogFactory.getLog(RDFServiceGraph.class);
-    
+
     private PrefixMapping prefixMapping = new PrefixMappingImpl();
     private GraphEventManager eventManager;
-    
+
     private boolean inTransaction = false;
     private Graph additionsGraph = ModelFactory.createDefaultModel().getGraph();
     private Graph removalsGraph = ModelFactory.createDefaultModel().getGraph();
 
     /**
-     * Returns a SparqlGraph for the union of named graphs in a remote repository 
+     * Returns a SparqlGraph for the union of named graphs in a remote repository
      * @param rdfService RDF Service
      */
     public RDFServiceGraph(RDFService rdfService) {
         this(rdfService, null);
     }
-    
+
     /**
-     * Returns a SparqlGraph for a particular named graph in a remote repository 
+     * Returns a SparqlGraph for a particular named graph in a remote repository
      * @param rdfService RDFService
      * @param graphURI Graph URI
      */
@@ -74,11 +74,11 @@ public class RDFServiceGraph implements GraphWithPerform {
        this.rdfService = rdfService;
        this.graphURI = graphURI;
     }
-    
+
     public RDFService getRDFService() {
         return this.rdfService;
     }
-    
+
     public String getGraphURI() {
         return graphURI;
     }
@@ -87,26 +87,26 @@ public class RDFServiceGraph implements GraphWithPerform {
     public void add(Triple arg0) throws AddDeniedException {
         performAdd(arg0);
     }
-    
+
     private StringBuilder serialize(StringBuilder sb, Triple t) {
         sb.append(sparqlNodeUpdate(t.getSubject(), "")).append(" ")
-               .append(sparqlNodeUpdate(t.getPredicate(), "")).append(" ") 
+               .append(sparqlNodeUpdate(t.getPredicate(), "")).append(" ")
                .append(sparqlNodeUpdate(t.getObject(), "")).append(" .");
         return sb;
     }
-        
-    private synchronized void flush() {                                
+
+    private synchronized void flush() {
         ChangeSet changeSet = rdfService.manufactureChangeSet();
         try {
             if(!removalsGraph.isEmpty()) {
                 String removals = serializeGraph(removalsGraph);
-                changeSet.addRemoval(RDFServiceUtils.toInputStream(removals), 
+                changeSet.addRemoval(RDFServiceUtils.toInputStream(removals),
                         RDFService.ModelSerializationFormat.N3, graphURI);
                 removalsGraph.clear();
             }
             if(!additionsGraph.isEmpty()) {
                 String additions = serializeGraph(additionsGraph);
-                changeSet.addAddition(RDFServiceUtils.toInputStream(additions), 
+                changeSet.addAddition(RDFServiceUtils.toInputStream(additions),
                         RDFService.ModelSerializationFormat.N3, graphURI);
                 additionsGraph.clear();
             }
@@ -115,7 +115,7 @@ public class RDFServiceGraph implements GraphWithPerform {
             throw new RuntimeException(rdfse);
         }
     }
-    
+
     private synchronized String serializeGraph(Graph graph) {
         StringBuilder sb = new StringBuilder();
         Iterator<Triple> tripIt = graph.find(null, null, null);
@@ -124,7 +124,7 @@ public class RDFServiceGraph implements GraphWithPerform {
         }
         return sb.toString();
     }
-    
+
     @Override
     public void performAdd(Triple t) {
         if(inTransaction) {
@@ -140,7 +140,7 @@ public class RDFServiceGraph implements GraphWithPerform {
             }
         }
     }
-    
+
     private void stageAddition(Triple t) {
         if(removalsGraph.contains(t)) {
             removalsGraph.remove(t.getSubject(), t.getPredicate(), t.getObject());
@@ -148,7 +148,7 @@ public class RDFServiceGraph implements GraphWithPerform {
             additionsGraph.add(t);
         }
     }
-    
+
     @Override
     public void performDelete(Triple t) {
         if(inTransaction) {
@@ -164,7 +164,7 @@ public class RDFServiceGraph implements GraphWithPerform {
             }
         }
     }
-    
+
     private synchronized void stageDeletion(Triple t) {
         if(additionsGraph.contains(t)) {
             additionsGraph.remove(t.getSubject(), t.getPredicate(), t.getObject());
@@ -172,7 +172,7 @@ public class RDFServiceGraph implements GraphWithPerform {
             removalsGraph.add(t);
         }
     }
-    
+
     public void removeAll() {
         // only to be used with a single graph
         if (graphURI == null) {
@@ -195,7 +195,7 @@ public class RDFServiceGraph implements GraphWithPerform {
             throw new RuntimeException(rdfse);
         }
     }
-    
+
     private void stageRemoveAll(Model removals) {
         StmtIterator sit = removals.listStatements();
         while (sit.hasNext()) {
@@ -203,7 +203,7 @@ public class RDFServiceGraph implements GraphWithPerform {
             stageDeletion(t);
         }
     }
-    
+
     @Override
     public void close() {
         // can't close a remote endpoint
@@ -242,15 +242,15 @@ public class RDFServiceGraph implements GraphWithPerform {
             return initialResult;
         } else {
             Triple t = Triple.create(subject, predicate, object);
-            return (initialResult || additionsGraphContains(t)) 
+            return (initialResult || additionsGraphContains(t))
                     && !removalsGraphContains(t);
-        } 
+        }
     }
-    
+
     private synchronized boolean additionsGraphContains(Triple t) {
         return additionsGraph.contains(t);
     }
-    
+
     private synchronized boolean removalsGraphContains(Triple t) {
         return removalsGraph.contains(t);
     }
@@ -300,7 +300,7 @@ public class RDFServiceGraph implements GraphWithPerform {
             return varName;
         }
     }
-    
+
     public static String sparqlNodeUpdate(Node node, String varName) {
         if (node.isBlank()) {
             return "_:" + node.getBlankNodeLabel().replaceAll("\\W", "");
@@ -308,7 +308,7 @@ public class RDFServiceGraph implements GraphWithPerform {
             return sparqlNode(node, varName);
         }
     }
-    
+
     public static String sparqlNodeDelete(Node node, String varName) {
         if (node.isBlank()) {
             return "?" + node.getBlankNodeLabel().replaceAll("\\W", "");
@@ -316,7 +316,7 @@ public class RDFServiceGraph implements GraphWithPerform {
             return sparqlNode(node, varName);
         }
     }
-    
+
     @Override
     public ExtendedIterator<Triple> find(final Node subject, final Node predicate, final Node object) {
         if (!isVar(subject) && !isVar(predicate)  && !isVar(object)) {
@@ -339,7 +339,7 @@ public class RDFServiceGraph implements GraphWithPerform {
             findQuery.append("  } ");
         }
         findQuery.append("\n}");
-        
+
         String queryString = findQuery.toString();
 
         final List<Triple> triplist = new ArrayList<Triple>();
@@ -347,7 +347,7 @@ public class RDFServiceGraph implements GraphWithPerform {
             addAdditions(triplist, additionsGraph.find(subject, predicate, object));
             subtractRemovals(triplist, removalsGraph.find(subject, predicate, object));
         }
-        
+
         execSelect(queryString, new ResultSetConsumer() {
             @Override
             protected void processQuerySolution(QuerySolution qs) {
@@ -382,7 +382,7 @@ public class RDFServiceGraph implements GraphWithPerform {
             }
          }
     }
-    
+
     private void subtractRemovals(List<Triple> tripList, ExtendedIterator<Triple> tripIt) {
         while(tripIt.hasNext()) {
             Triple t = tripIt.next();
@@ -391,11 +391,11 @@ public class RDFServiceGraph implements GraphWithPerform {
             }
          }
     }
-    
+
     private boolean isVar(Node node) {
         return (node == null || node.isVariable() || node == Node.ANY);
     }
-    
+
     @Override
     public Capabilities getCapabilities() {
         return capabilities;
@@ -417,8 +417,8 @@ public class RDFServiceGraph implements GraphWithPerform {
     @Override
     public GraphStatisticsHandler getStatisticsHandler() {
         return null;
-    }  
-      
+    }
+
     @Override
     public TransactionHandler getTransactionHandler() {
         return transactionHandler;
@@ -446,49 +446,49 @@ public class RDFServiceGraph implements GraphWithPerform {
         int size = find(null, null, null).toList().size();
         return size;
     }
-    
+
     @Override
 	public void clear() {
     	removeAll();
 	}
 
 	private final static Capabilities capabilities = new Capabilities() {
-        
+
         @Override
 		public boolean addAllowed() {
             return false;
         }
-        
+
         @Override
         public boolean addAllowed(boolean everyTriple) {
             return false;
         }
-        
+
         @Override
         public boolean canBeEmpty() {
             return true;
         }
-        
+
         @Override
         public boolean deleteAllowed() {
             return false;
         }
-        
+
         @Override
         public boolean deleteAllowed(boolean everyTriple) {
             return false;
         }
-        
+
         @Override
         public boolean findContractSafe() {
             return true;
         }
-        
+
         @Override
         public boolean handlesLiteralTyping() {
             return true;
         }
-        
+
         @Override
         public boolean iteratorRemoveAllowed() {
             return false;
@@ -538,22 +538,22 @@ public class RDFServiceGraph implements GraphWithPerform {
         @Override
         public boolean transactionsSupported() {
             return true;
-        }  
+        }
     };
-    
+
     private void execSelect(String queryStr, ResultSetConsumer consumer) {
-        try { 
+        try {
             rdfService.sparqlSelectQuery(queryStr, consumer);
         } catch (RDFServiceException rdfse) {
             throw new RuntimeException(rdfse);
         }
     }
-    
+
     /*
-     * 
+     *
      * see http://www.python.org/doc/2.5.2/ref/strings.html
      * or see jena's n3 grammar jena/src/org.apache/jena/n3/n3.g
-     */ 
+     */
     protected static void pyString(StringBuffer sbuff, String s)
     {
         for (int i = 0; i < s.length(); i++) {
@@ -565,19 +565,19 @@ public class RDFServiceGraph implements GraphWithPerform {
                 sbuff.append('\\') ;
                 sbuff.append(c) ;
                 continue ;
-            }            
+            }
 
-            // Whitespace                        
+            // Whitespace
             if (c == '\n'){ sbuff.append("\\n");continue; }
             if (c == '\t'){ sbuff.append("\\t");continue; }
             if (c == '\r'){ sbuff.append("\\r");continue; }
-            if (c == '\f'){ sbuff.append("\\f");continue; }                            
+            if (c == '\f'){ sbuff.append("\\f");continue; }
             if (c == '\b'){ sbuff.append("\\b");continue; }
             if( c == 7 )  { sbuff.append("\\a");continue; }
-            
+
             // Output as is (subject to UTF-8 encoding on output that is)
             sbuff.append(c) ;
-            
+
 //            // Unicode escapes
 //            // c < 32, c >= 127, not whitespace or other specials
 //            String hexstr = Integer.toHexString(c).toUpperCase();
@@ -588,11 +588,11 @@ public class RDFServiceGraph implements GraphWithPerform {
 //            sbuff.append(hexstr);
         }
     }
-    
+
     public static Model createRDFServiceModel(final RDFServiceGraph g) {
         Model m = VitroModelFactory.createModelForGraph(g);
         m.register(new StatementListener() {
-            @Override 
+            @Override
             public void notifyEvent(Model m, Object event) {
                 ChangeSet changeSet = g.getRDFService().manufactureChangeSet();
                 changeSet.addPreChangeEvent(event);
@@ -602,7 +602,7 @@ public class RDFServiceGraph implements GraphWithPerform {
                     throw new RuntimeException(e);
                 }
             }
-            
+
         });
         return m;
     }
@@ -612,5 +612,5 @@ public class RDFServiceGraph implements GraphWithPerform {
 		return "RDFServiceGraph[" + ToString.hashHex(this) + ", " + rdfService
 				+ ", graphURI=" + ToString.modelName(graphURI) + "]";
 	}
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/Regenerable.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/Regenerable.java
index fdcbee079..d38e5225d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/Regenerable.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/Regenerable.java
@@ -5,5 +5,5 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena;
 public interface Regenerable {
 
 	public void regenerate();
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RegeneratingGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RegeneratingGraph.java
index 668b9b546..d525a6d26 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RegeneratingGraph.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RegeneratingGraph.java
@@ -24,25 +24,25 @@ import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
 public class RegeneratingGraph implements Graph, Regenerable {
 
 	private final static Log log = LogFactory.getLog(RegeneratingGraph.class);
-	
+
 	private GraphGenerator generator;
 	private Graph g;
-	
+
 	public RegeneratingGraph(GraphGenerator graphGenerator) {
 		this.generator = graphGenerator;
 		regenerate();
 	}
-	
+
 	public RegeneratingGraph(Graph initGraph, GraphGenerator graphGenerator) {
 		this.g = initGraph;
 		this.generator = graphGenerator;
 	}
-	
+
 	@Override
 	public void regenerate() {
 		this.g = generator.generateGraph();
-	}	
-	
+	}
+
 	/*
 	 * a nonsense query that should never send back actual result data
 	 */
@@ -55,7 +55,7 @@ public class RegeneratingGraph implements Graph, Regenerable {
 	protected void finalize() {
 		close();
 	}
-	
+
 	@Override
 	public void close() {
         try {
@@ -65,7 +65,7 @@ public class RegeneratingGraph implements Graph, Regenerable {
             g.close();
         }
 	}
-	
+
 	@Override
 	public boolean contains(Triple arg0) {
 		try {
@@ -76,7 +76,7 @@ public class RegeneratingGraph implements Graph, Regenerable {
             return g.contains(arg0);
         }
 	}
-	
+
 	@Override
 	public boolean contains(Node arg0, Node arg1, Node arg2) {
 		try {
@@ -87,11 +87,11 @@ public class RegeneratingGraph implements Graph, Regenerable {
             return g.contains(arg0, arg1, arg2);
         }
 	}
-	
+
 	@Override
 	public void delete(Triple arg0) throws DeleteDeniedException {
 		try {
-			regenerateIfClosed();			
+			regenerateIfClosed();
             g.delete(arg0);
         } catch (Exception e) {
             regenerate();
@@ -113,7 +113,7 @@ public class RegeneratingGraph implements Graph, Regenerable {
 	@Override
 	public boolean dependsOn(Graph arg0) {
 		try {
-			regenerateIfClosed();			
+			regenerateIfClosed();
             return g.dependsOn(arg0);
         } catch (Exception e) {
             regenerate();
@@ -144,7 +144,7 @@ public class RegeneratingGraph implements Graph, Regenerable {
         }
 	}
 
-	
+
 	@Override
 	public GraphEventManager getEventManager() {
 		try {
@@ -157,7 +157,7 @@ public class RegeneratingGraph implements Graph, Regenerable {
         }
 	}
 
-	
+
 	@Override
 	public PrefixMapping getPrefixMapping() {
 		try {
@@ -170,7 +170,7 @@ public class RegeneratingGraph implements Graph, Regenerable {
         }
 	}
 
-	
+
 	@Override
 	public GraphStatisticsHandler getStatisticsHandler() {
 		try {
@@ -183,7 +183,7 @@ public class RegeneratingGraph implements Graph, Regenerable {
         }
 	}
 
-	
+
 	@Override
 	public TransactionHandler getTransactionHandler() {
 		try {
@@ -196,7 +196,7 @@ public class RegeneratingGraph implements Graph, Regenerable {
         }
 	}
 
-	
+
 	@Override
 	public boolean isClosed() {
 		try {
@@ -208,7 +208,7 @@ public class RegeneratingGraph implements Graph, Regenerable {
         }
 	}
 
-	
+
 	@Override
 	public boolean isEmpty() {
 		try {
@@ -220,7 +220,7 @@ public class RegeneratingGraph implements Graph, Regenerable {
         }
 	}
 
-	
+
 	@Override
 	public boolean isIsomorphicWith(Graph arg0) {
 		try {
@@ -231,7 +231,7 @@ public class RegeneratingGraph implements Graph, Regenerable {
             return g.isIsomorphicWith(arg0);
         }
 	}
-	
+
 	@Override
 	public int size() {
 		try {
@@ -243,7 +243,7 @@ public class RegeneratingGraph implements Graph, Regenerable {
         }
 	}
 
-	
+
 	@Override
 	public void add(Triple arg0) throws AddDeniedException {
 		try {
@@ -254,7 +254,7 @@ public class RegeneratingGraph implements Graph, Regenerable {
             g.add(arg0);
         }
 	}
-	
+
 	@Override
 	public void clear() {
 		try {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SDBGraphConnectionGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SDBGraphConnectionGenerator.java
index 464f72830..0e2b010ee 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SDBGraphConnectionGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SDBGraphConnectionGenerator.java
@@ -14,23 +14,23 @@ public class SDBGraphConnectionGenerator {
 
 	private final static Log log = LogFactory.getLog(
 			SDBGraphConnectionGenerator.class);
-	
+
 	private DataSource ds = null;
 	private Connection connection = null;
-	
+
 	public SDBGraphConnectionGenerator(DataSource dataSource) {
 		this.ds = dataSource;
 	}
-	
+
 	public Connection generateConnection() throws SQLException {
         if ( this.connection == null ) {
             this.connection = ds.getConnection();
         } else if ( this.connection.isClosed() ) {
             try {
                 this.connection.close();
-            } catch (SQLException e) {                  
+            } catch (SQLException e) {
                 // The connection will throw an "Already closed"
-                // SQLException that we need to catch.  We need to 
+                // SQLException that we need to catch.  We need to
                 // make this extra call to .close() in order to make
                 // sure that the connection is returned to the pool.
                 // This depends on the particular behavior of version
@@ -43,5 +43,5 @@ public class SDBGraphConnectionGenerator {
         }
         return connection;
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SDBGraphGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SDBGraphGenerator.java
index 0bc19bfa3..23042ccf3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SDBGraphGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SDBGraphGenerator.java
@@ -18,26 +18,26 @@ import org.apache.jena.sdb.StoreDesc;
 public class SDBGraphGenerator implements SQLGraphGenerator {
 
 	private static final Log log = LogFactory.getLog(SDBGraphGenerator.class.getName());
-	
+
 	private SDBGraphConnectionGenerator connGen;
     private Connection connection;
     private StoreDesc storeDesc;
     private String graphID;
-    
+
     public SDBGraphGenerator(DataSource dataSource, StoreDesc storeDesc,
     							String graphID) {
     	this.connGen = new SDBGraphConnectionGenerator(dataSource);
     	this.storeDesc = storeDesc;
     	this.graphID = graphID;
     }
-    
-    public SDBGraphGenerator(SDBGraphConnectionGenerator connectionGenerator, 
+
+    public SDBGraphGenerator(SDBGraphConnectionGenerator connectionGenerator,
             StoreDesc storeDesc, String graphID) {
     	this.connGen = connectionGenerator;
     	this.storeDesc = storeDesc;
     	this.graphID = graphID;
     }
-    
+
     public boolean isGraphClosed() {
     	try {
     		return (connection == null || connection.isClosed());
@@ -50,14 +50,14 @@ public class SDBGraphGenerator implements SQLGraphGenerator {
         try {
         	this.connection = connGen.generateConnection();
             Store store = SDBFactory.connectStore(connection, storeDesc);
-            return SDBFactory.connectNamedGraph(store, graphID); 
+            return SDBFactory.connectNamedGraph(store, graphID);
         } catch (SQLException e) {
-            String errMsg = "Unable to generate SDB graph"; 
+            String errMsg = "Unable to generate SDB graph";
             log.error(errMsg, e);
             throw new RuntimeException(errMsg, e);
         }
     }
-    	
+
 	public Connection getConnection() {
 		return connection;
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SQLGraphGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SQLGraphGenerator.java
index 2a9c42d3c..773e0823a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SQLGraphGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SQLGraphGenerator.java
@@ -7,5 +7,5 @@ import java.sql.Connection;
 public interface SQLGraphGenerator extends GraphGenerator {
 
 	public Connection getConnection();
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SimpleOntModelSelector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SimpleOntModelSelector.java
index 7a0bdcf22..2402a0a07 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SimpleOntModelSelector.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SimpleOntModelSelector.java
@@ -19,10 +19,10 @@ public class SimpleOntModelSelector implements OntModelSelector {
 	protected OntModel applicationMetadataModel;
 	protected OntModel tboxModel;
 	protected OntModel userAccountsModel;
-	
+
 	protected OntModelSpec DEFAULT_ONT_MODEL_SPEC = OntModelSpec.OWL_MEM;
 	protected OntModel displayModel;
-	
+
 	/**
 	 * Construct an OntModelSelector with a bunch of empty models
 	 */
@@ -36,12 +36,12 @@ public class SimpleOntModelSelector implements OntModelSelector {
 		fullModel.addSubModel(tboxModel);
 		fullModel.addSubModel(applicationMetadataModel);
 	}
-	
+
 	/**
 	 * Construct An OntModel selector that works with a single union OntModel
 	 * Only for temporary backwards compatibility.
-	 */	
-	public SimpleOntModelSelector(OntModel ontModel) { 
+	 */
+	public SimpleOntModelSelector(OntModel ontModel) {
 		this.fullModel = ontModel;
 		this.aboxModel = ontModel;
 		this.applicationMetadataModel = ontModel;
@@ -49,7 +49,7 @@ public class SimpleOntModelSelector implements OntModelSelector {
 		this.userAccountsModel = ontModel;
 		this.displayModel = ontModel;
 	}
-	
+
 	public void setABoxModel(OntModel m) {
 		fullModel.enterCriticalSection(Lock.WRITE);
 		try {
@@ -60,7 +60,7 @@ public class SimpleOntModelSelector implements OntModelSelector {
 			fullModel.leaveCriticalSection();
 		}
 	}
-	
+
 	public void setApplicationMetadataModel(OntModel m) {
 		fullModel.enterCriticalSection(Lock.WRITE);
 		try {
@@ -71,7 +71,7 @@ public class SimpleOntModelSelector implements OntModelSelector {
 			fullModel.leaveCriticalSection();
 		}
 	}
-	
+
 	public void setTBoxModel(OntModel m) {
 		fullModel.enterCriticalSection(Lock.WRITE);
 		try {
@@ -82,19 +82,19 @@ public class SimpleOntModelSelector implements OntModelSelector {
 			fullModel.leaveCriticalSection();
 		}
 	}
-	
+
 	public void setFullModel(OntModel m) {
 		m.addSubModel(tboxModel);
 		m.addSubModel(aboxModel);
 		m.addSubModel(applicationMetadataModel);
 		this.fullModel = m;
 	}
-	
+
 	@Override
 	public OntModel getABoxModel() {
 		return aboxModel;
 	}
-	
+
 	@Override
 	public OntModel getApplicationMetadataModel() {
 		return applicationMetadataModel;
@@ -114,13 +114,13 @@ public class SimpleOntModelSelector implements OntModelSelector {
 	public OntModel getUserAccountsModel() {
 		return userAccountsModel;
 	}
-	
+
 	public void setUserAccountsModel(OntModel userAccountsModel) {
 		this.userAccountsModel = userAccountsModel;
 	}
 
 	public void setDisplayModel(OntModel displayModel) {
-		this.displayModel = displayModel;		
+		this.displayModel = displayModel;
 	}
 	@Override
 	public OntModel getDisplayModel(){
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SingleContentOntModelSelector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SingleContentOntModelSelector.java
index 49c7cd9f1..b16011c27 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SingleContentOntModelSelector.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SingleContentOntModelSelector.java
@@ -6,12 +6,12 @@ import org.apache.jena.ontology.OntModel;
 
 public class SingleContentOntModelSelector extends SimpleOntModelSelector {
 
-    public SingleContentOntModelSelector(OntModel contentModel, 
-                                         OntModel displayModel, 
+    public SingleContentOntModelSelector(OntModel contentModel,
+                                         OntModel displayModel,
                                          OntModel userAccountsModel) {
         super(contentModel);
         super.displayModel = displayModel;
         super.userAccountsModel = userAccountsModel;
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java
index f25586771..8b2ed8668 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java
@@ -46,39 +46,39 @@ import org.apache.http.protocol.BasicHttpContext;
 import org.apache.http.util.EntityUtils;
 
 public class SparqlGraph implements GraphWithPerform {
-    
+
     private String endpointURI;
     private String graphURI;
     private HttpClient httpClient;
     private static final Log log = LogFactory.getLog(SparqlGraph.class);
-    
+
     private PrefixMapping prefixMapping = new PrefixMappingImpl();
     private GraphEventManager eventManager;
-    
+
     /**
-     * Returns a SparqlGraph for the union of named graphs in a remote repository 
+     * Returns a SparqlGraph for the union of named graphs in a remote repository
      * @param endpointURI Endpoint URI
      */
     public SparqlGraph(String endpointURI) {
         this(endpointURI, null);
     }
-    
+
     /**
-     * Returns a SparqlGraph for a particular named graph in a remote repository 
+     * Returns a SparqlGraph for a particular named graph in a remote repository
      * @param endpointURI Endpoint URI
      * @param graphURI Graph URI
      */
     public SparqlGraph(String endpointURI, String graphURI) {
        this.endpointURI = endpointURI;
        this.graphURI = graphURI;
-       
+
        this.httpClient = HttpClientFactory.getHttpClient();
     }
-    
+
     public String getEndpointURI() {
         return endpointURI;
     }
-    
+
     public String getGraphURI() {
         return graphURI;
     }
@@ -111,42 +111,42 @@ public class SparqlGraph implements GraphWithPerform {
             meth.abort();
         }
     }
-    
+
     @Override
     public void performAdd(Triple t) {
-        
+
         //log.info("adding " + t);
-        
-        String updateString = "INSERT DATA { " + ((graphURI != null) ? "GRAPH <" + graphURI + "> { " : "" )  
-                + sparqlNodeUpdate(t.getSubject(), "") + " " 
-                + sparqlNodeUpdate(t.getPredicate(), "") + " " 
-                + sparqlNodeUpdate(t.getObject(), "") + " } " 
+
+        String updateString = "INSERT DATA { " + ((graphURI != null) ? "GRAPH <" + graphURI + "> { " : "" )
+                + sparqlNodeUpdate(t.getSubject(), "") + " "
+                + sparqlNodeUpdate(t.getPredicate(), "") + " "
+                + sparqlNodeUpdate(t.getObject(), "") + " } "
                 + ((graphURI != null) ? " } " : "");
-        
-        
+
+
         if (graphURI != null) {
             log.info("=====> update to graph " + graphURI);
         }
         log.info(updateString);
-        
+
         executeUpdate(updateString);
-                
+
     }
-    
+
     @Override
     public void performDelete(Triple t) {
-                
-        String updateString = "DELETE DATA { " + ((graphURI != null) ? "GRAPH <" + graphURI + "> { " : "" )  
-                + sparqlNodeUpdate(t.getSubject(), "") + " " 
-                + sparqlNodeUpdate(t.getPredicate(), "") + " " 
-                + sparqlNodeUpdate(t.getObject(), "") + " } " 
+
+        String updateString = "DELETE DATA { " + ((graphURI != null) ? "GRAPH <" + graphURI + "> { " : "" )
+                + sparqlNodeUpdate(t.getSubject(), "") + " "
+                + sparqlNodeUpdate(t.getPredicate(), "") + " "
+                + sparqlNodeUpdate(t.getObject(), "") + " } "
                 + ((graphURI != null) ? " } " : "");
-        
+
         //log.info(updateString);
-        
+
         executeUpdate(updateString);
     }
-    
+
     public void removeAll() {
         // now we flush out any remaining blank nodes
         String updateString = "DELETE { ?s ?p ?o } WHERE { \n" +
@@ -156,7 +156,7 @@ public class SparqlGraph implements GraphWithPerform {
                               "}";
         executeUpdate(updateString);
     }
-    
+
     @Override
     public void close() {
         // can't close a remote endpoint
@@ -242,7 +242,7 @@ public class SparqlGraph implements GraphWithPerform {
             return varName;
         }
     }
-    
+
     public static String sparqlNodeUpdate(Node node, String varName) {
         if (node.isBlank()) {
             return "_:" + node.getBlankNodeLabel().replaceAll("\\W", "");
@@ -250,7 +250,7 @@ public class SparqlGraph implements GraphWithPerform {
             return sparqlNode(node, varName);
         }
     }
-    
+
     public static String sparqlNodeDelete(Node node, String varName) {
         if (node.isBlank()) {
             return "?" + node.getBlankNodeLabel().replaceAll("\\W", "");
@@ -258,7 +258,7 @@ public class SparqlGraph implements GraphWithPerform {
             return sparqlNode(node, varName);
         }
     }
-    
+
     @Override
     public ExtendedIterator<Triple> find(Node subject, Node predicate, Node object) {
         if (!isVar(subject) && !isVar(predicate)  && !isVar(object)) {
@@ -281,24 +281,24 @@ public class SparqlGraph implements GraphWithPerform {
             findQuery.append("  } ");
         }
         findQuery.append("\n}");
-        
+
         String queryString = findQuery.toString();
         //log.info(queryString);
-        
+
 //        //TODO remove me
 //        if (queryString.contains("individual/AI") && queryString.contains("label")) {
 //            throw new RuntimeException("break!");
 //        }
-        
+
         ResultSet rs = execSelect(queryString);
         //rs = execSelect(findQuery.toString());
         //rs = execSelect(findQuery.toString());
-        
+
         List<Triple> triplist = new ArrayList<Triple>();
         while (rs.hasNext()) {
             QuerySolution soln = rs.nextSolution();
-            Triple t = new Triple(isVar(subject) ? soln.get("?s").asNode() : subject, 
-                                  isVar(predicate) ? soln.get("?p").asNode() : predicate, 
+            Triple t = new Triple(isVar(subject) ? soln.get("?s").asNode() : subject,
+                                  isVar(predicate) ? soln.get("?p").asNode() : predicate,
                                   isVar(object) ? soln.get("?o").asNode() : object);
             //log.info(t);
             triplist.add(t);
@@ -310,7 +310,7 @@ public class SparqlGraph implements GraphWithPerform {
     private boolean isVar(Node node) {
         return (node == null || node.isVariable() || node == Node.ANY);
     }
-    
+
     @Override
     public Capabilities getCapabilities() {
         return capabilities;
@@ -363,67 +363,67 @@ public class SparqlGraph implements GraphWithPerform {
         int size = find(null, null, null).toList().size();
         return size;
     }
-    
+
     private final static Capabilities capabilities = new Capabilities() {
-        
+
         @Override
 		public boolean addAllowed() {
             return false;
         }
-        
+
         @Override
         public boolean addAllowed(boolean everyTriple) {
             return false;
         }
-        
+
         @Override
         public boolean canBeEmpty() {
             return true;
         }
-        
+
         @Override
         public boolean deleteAllowed() {
             return false;
         }
-        
+
         @Override
         public boolean deleteAllowed(boolean everyTriple) {
             return false;
         }
-        
+
         @Override
         public boolean findContractSafe() {
             return true;
         }
-        
+
         @Override
         public boolean handlesLiteralTyping() {
             return true;
         }
-        
+
         @Override
         public boolean iteratorRemoveAllowed() {
             return false;
         }
-        
+
         @Override
         public boolean sizeAccurate() {
             return true;
         }
     };
-    
+
     private boolean execAsk(String queryStr) {
         Query askQuery = QueryFactory.create(queryStr);
         try (QueryExecution qe = QueryExecutionFactory.sparqlService(endpointURI, askQuery)) {
             return qe.execAsk();
         }
     }
-    
+
     private ResultSet execSelect(String queryStr) {
-        
+
 //        long startTime1 = System.currentTimeMillis();
 //        try {
-//            
+//
 //            RepositoryConnection conn = getConnection();
 //            try {
 //                GraphQuery q = conn.prepareGraphQuery(QueryLanguage.SPARQL, queryStr);
@@ -436,20 +436,20 @@ public class SparqlGraph implements GraphWithPerform {
 //        } catch (Exception re) {
 //            //log.info(re,re);
 //        }
-        
+
 //        log.info((System.currentTimeMillis() - startTime1) + " to execute via sesame");
-        
+
         Query askQuery = QueryFactory.create(queryStr);
         try (QueryExecution qe = QueryExecutionFactory.sparqlService(endpointURI, askQuery)) {
             return new ResultSetMem(qe.execSelect());
         }
     }
-    
+
     /*
-     * 
+     *
      * see http://www.python.org/doc/2.5.2/ref/strings.html
      * or see jena's n3 grammar jena/src/org.apache/jena/n3/n3.g
-     */ 
+     */
     protected static void pyString(StringBuffer sbuff, String s)
     {
         for (int i = 0; i < s.length(); i++) {
@@ -461,19 +461,19 @@ public class SparqlGraph implements GraphWithPerform {
                 sbuff.append('\\') ;
                 sbuff.append(c) ;
                 continue ;
-            }            
+            }
 
-            // Whitespace                        
+            // Whitespace
             if (c == '\n'){ sbuff.append("\\n");continue; }
             if (c == '\t'){ sbuff.append("\\t");continue; }
             if (c == '\r'){ sbuff.append("\\r");continue; }
-            if (c == '\f'){ sbuff.append("\\f");continue; }                            
+            if (c == '\f'){ sbuff.append("\\f");continue; }
             if (c == '\b'){ sbuff.append("\\b");continue; }
             if( c == 7 )  { sbuff.append("\\a");continue; }
-            
+
             // Output as is (subject to UTF-8 encoding on output that is)
             sbuff.append(c) ;
-            
+
 //            // Unicode escapes
 //            // c < 32, c >= 127, not whitespace or other specials
 //            String hexstr = Integer.toHexString(c).toUpperCase();
@@ -490,5 +490,5 @@ public class SparqlGraph implements GraphWithPerform {
 		return "SparqlGraph[" + ToString.hashHex(this) + ", endpoint="
 				+ endpointURI + ", name=" + ToString.modelName(graphURI) + "]";
 	}
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraphMultilingual.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraphMultilingual.java
index a12296b59..aae7eaec0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraphMultilingual.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraphMultilingual.java
@@ -23,17 +23,17 @@ import org.apache.jena.util.iterator.WrappedIterator;
 import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
 
 public class SparqlGraphMultilingual extends SparqlGraph implements GraphWithPerform {
-    
+
     private static final Log log = LogFactory.getLog(SparqlGraphMultilingual.class);
-    
+
     protected List<String> langs;
-    
-    
+
+
     public SparqlGraphMultilingual(String endpointURI, List<String> languages) {
         super(endpointURI);
         this.langs = languages;
     }
-    
+
     @Override
     public void add(Triple arg0) throws AddDeniedException {
         performAdd(arg0);
@@ -48,10 +48,10 @@ public class SparqlGraphMultilingual extends SparqlGraph implements GraphWithPer
         if (langs == null || langs.size() == 0) {
             log.info("No language configured - adding original triple " + t);
             super.performAdd(t);
-        } else if (t.getObject().isLiteral() 
+        } else if (t.getObject().isLiteral()
                 && t.getObject().getLiteral().getDatatypeURI() == null) {
             log.info("adding language tag");
-            super.performAdd(Triple.create(t.getSubject(), 
+            super.performAdd(Triple.create(t.getSubject(),
                     t.getPredicate(), NodeFactory.createLiteral(
                             t.getObject().getLiteralLexicalForm(), langs.get(0), null)));
         } else {
@@ -59,15 +59,15 @@ public class SparqlGraphMultilingual extends SparqlGraph implements GraphWithPer
             super.performAdd(t);
         }
     }
-    
+
     @Override
     public ExtendedIterator<Triple> find(Node subject, Node predicate, Node object) {
-               
+
         long startTime = System.currentTimeMillis();
-        
+
         ExtendedIterator<Triple> rawResults = super.find(subject, predicate, object);
         long rawTime = System.currentTimeMillis() - startTime;
-        
+
         List<Triple> tripList = new ArrayList<Triple>();
         while (rawResults.hasNext()) {
             tripList.add(rawResults.next());
@@ -97,7 +97,7 @@ public class SparqlGraphMultilingual extends SparqlGraph implements GraphWithPer
                 log.info("raw time " + rawTime + " ; filter time " + filterTime);
             }
             return WrappedIterator.create(tripl.iterator());
-        } else { 
+        } else {
             if (rawTime > 9) {
                 log.info("raw time " + rawTime);
                 log.info("^ " + subject + " : " + predicate + " : " + object);
@@ -105,40 +105,40 @@ public class SparqlGraphMultilingual extends SparqlGraph implements GraphWithPer
             return WrappedIterator.create(tripList.iterator());
         }
     }
-    
+
     private class TripleSortByLang implements Comparator<Triple> {
-        
+
         public int compare(Triple t1, Triple t2) {
             if (t1 == null || t2 == null) {
                 return 0;
             } else if (!t1.getObject().isLiteral() || !t2.getObject().isLiteral()) {
                 return 0;
             }
-            
+
             String t1lang = t1.getObject().getLiteral().language();
             String t2lang = t2.getObject().getLiteral().language();
-                    
+
             if ( t1lang == null && t2lang == null) {
                 return 0;
-            } else if (t1lang == null) { 
+            } else if (t1lang == null) {
                 return 1;
             } else if (t2lang == null) {
                 return -1;
             } else {
                 int t1langPref = langs.indexOf(t1.getObject().getLiteral().language());
                 if (t1langPref == -1) {
-                    t1langPref = Integer.MAX_VALUE; 
+                    t1langPref = Integer.MAX_VALUE;
                 }
                 int t2langPref = langs.indexOf(t2.getObject().getLiteral().language());
                 if (t2langPref == -1) {
-                    t2langPref = Integer.MAX_VALUE; 
+                    t2langPref = Integer.MAX_VALUE;
                 }
                 return t1langPref - t2langPref;
-            }           
+            }
         }
-        
+
     }
-    
+
 	@Override
 	public String toString() {
 		return "SparqlGraphMultilingual[" + ToString.hashHex(this)
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/StaticDatasetFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/StaticDatasetFactory.java
index 08882cde1..4f8ff6747 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/StaticDatasetFactory.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/StaticDatasetFactory.java
@@ -5,15 +5,15 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena;
 import org.apache.jena.query.Dataset;
 
 public class StaticDatasetFactory implements DatasetWrapperFactory {
-    
+
     private Dataset _dataset;
-    
+
     public StaticDatasetFactory (Dataset dataset) {
         _dataset = dataset;
     }
-    
+
     public DatasetWrapper getDatasetWrapper() {
         return new DatasetWrapper(_dataset);
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/TripleStoreUnavailableException.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/TripleStoreUnavailableException.java
index 11e286f12..8e4a3ec6a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/TripleStoreUnavailableException.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/TripleStoreUnavailableException.java
@@ -3,7 +3,7 @@
 package edu.cornell.mannlib.vitro.webapp.dao.jena;
 
 public class TripleStoreUnavailableException extends Exception {
-	
+
 	// nothing special (yet)
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJena.java
index 5843f53c5..73557fd5c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJena.java
@@ -486,7 +486,7 @@ public class UserAccountsDaoJena extends JenaBaseDao implements UserAccountsDao
 	/**
 	 * Since there is no reasoner on the UserAccountModel, this will return a
 	 * false negative for a subtype of the specified type.
-	 * 
+	 *
 	 * There should already be a lock on the model when this is called.
 	 */
 	private boolean isResourceOfType(OntResource r, OntClass type) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java
index c70cbbc4e..8d79155b1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java
@@ -76,7 +76,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
     protected OntModel getOntModel() {
         return getOntModelSelector().getTBoxModel();
     }
-    
+
     protected boolean isUnderlyingStoreReasoned() {
         return this.isUnderlyingStoreReasoned;
     }
@@ -87,7 +87,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
         cls.getModel().enterCriticalSection(Lock.READ);
         try {
             if (cls.isAnon()) {
-                if (cls.isRestriction()) {	    		
+                if (cls.isRestriction()) {
                     Restriction rest = cls.asRestriction();
                     OntProperty onProperty = rest.getOnProperty();
                     StringBuilder labelStr = new StringBuilder();
@@ -103,7 +103,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                             fillerRes = svfRest.getSomeValuesFrom();
                             labelStr.append("some values from ");
                         }
-                        if (fillerRes.canAs(OntClass.class)) { 
+                        if (fillerRes.canAs(OntClass.class)) {
                             OntClass avf = fillerRes.as(OntClass.class);
                             labelStr.append(getLabelForClass(avf,withPrefix,forPickList));
                         } else {
@@ -112,7 +112,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                             } catch (Exception e) {
                                 labelStr.append("???");
                             }
-                        }		    			
+                        }
                     } else if (rest.isHasValueRestriction()) {
                         HasValueRestriction hvRest = rest.asHasValueRestriction();
                         labelStr.append("has value ");
@@ -148,7 +148,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                         labelStr.append(getLabelForClass(ccls.getOperand(), withPrefix, forPickList));
                     } else if (cls.isIntersectionClass()) {
                         IntersectionClass icls = cls.as(IntersectionClass.class);
-                        for (Iterator<? extends OntClass> operandIt = 
+                        for (Iterator<? extends OntClass> operandIt =
                                 icls.listOperands(); operandIt.hasNext();) {
                             OntClass operand = operandIt.next();
                             labelStr.append(getLabelForClass(operand, withPrefix, forPickList));
@@ -158,7 +158,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                         }
                     } else if (cls.isUnionClass()) {
                         UnionClass icls = cls.as(UnionClass.class);
-                        for (Iterator<? extends OntClass> operandIt = 
+                        for (Iterator<? extends OntClass> operandIt =
                                 icls.listOperands(); operandIt.hasNext();) {
                             OntClass operand = operandIt.next();
                             labelStr.append(getLabelForClass(operand, withPrefix, forPickList));
@@ -172,8 +172,8 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                     // BJL23 2009-02-19
                     // I'm putting the link markup in because I need it,
                     // but obviously we need to factor this out into the display layer.
-                    return "<a href=\"vclassEdit?uri=" + 
-                            URLEncoder.encode(getClassURIStr(cls)) + 
+                    return "<a href=\"vclassEdit?uri=" +
+                            URLEncoder.encode(getClassURIStr(cls)) +
                                     "\">[anonymous class]</a>";
                 }
             } else {
@@ -181,10 +181,10 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                     OntologyDao oDao=getWebappDaoFactory().getOntologyDao();
                     Ontology o = oDao.getOntologyByURI(cls.getNameSpace());
                     if (o!=null) {
-                        if (withPrefix) {                        	
+                        if (withPrefix) {
                             return(o.getPrefix()==null?(o.getName()==null?"unspec:"+getLabelOrId(cls):o.getName()+":"+getLabelOrId(cls)):o.getPrefix()+":"+getLabelOrId(cls));
                         } else {
-                            return(getLabelOrId(cls)+(o.getPrefix()==null?(o.getName()==null?" (unspec)":" ("+o.getName()+")"):" ("+o.getPrefix()+")"));                            
+                            return(getLabelOrId(cls)+(o.getPrefix()==null?(o.getName()==null?" (unspec)":" ("+o.getName()+")"):" ("+o.getPrefix()+")"));
                         }
                     } else {
                         return getLabelOrId(cls);
@@ -249,7 +249,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
         List<String> uriList = new ArrayList<String>();
         getOntModel().enterCriticalSection(Lock.READ);
         try {
-            for (Iterator<? extends OntClass> i = 
+            for (Iterator<? extends OntClass> i =
                     ontClass.listDisjointWith(); i.hasNext(); ) {
                 OntClass disjointClass = i.next();
                 uriList.add(getClassURIStr(disjointClass));
@@ -296,7 +296,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
             OntClass ontClass = getOntClass(getOntModel(), classURI);
             ClosableIterator<OntClass> equivalentOntClassIt = ontClass.listEquivalentClasses();
             try {
-                for (Iterator<OntClass> eqOntClassIt = 
+                for (Iterator<OntClass> eqOntClassIt =
                         equivalentOntClassIt; eqOntClassIt.hasNext(); ) {
                     OntClass eqClass = eqOntClassIt.next();
                     equivalentClassURIs.add(getClassURIStr(eqClass));
@@ -308,13 +308,13 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
             // Current language profile does not support equivalent classes.
             // We'd prefer to return an empty list instead of throwing an exception
         } catch (Exception e) {
-            // we'll try this again using a different method that 
+            // we'll try this again using a different method that
             // doesn't try to convert to OntClass
             List<Resource> supList = this.listDirectObjectPropertyValues(
                     getOntModel().getResource(classURI), OWL.equivalentClass);
             for (Resource res : supList) {
                 equivalentClassURIs.add(getClassURIStr(res));
-            }  
+            }
         } finally {
             getOntModel().leaveCriticalSection();
         }
@@ -423,7 +423,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
 
         List<String> superclassURIs = null;
 
-        if (isUnderlyingStoreReasoned()) {	
+        if (isUnderlyingStoreReasoned()) {
             superclassURIs = new ArrayList<String>();
             Resource cls = ResourceFactory.createResource(classURI);
             StmtIterator superClassIt = getOntModel().listStatements(
@@ -485,10 +485,10 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
         return classes;
     }
 
-    /** 
-     * The basic idea here is that we ignore anonymous superclasses for the purpose 
+    /**
+     * The basic idea here is that we ignore anonymous superclasses for the purpose
      * of determining whether something is a root class.
-     * We also avoid ClassCastExceptions deep in Jena-land by eschewing Jena's 
+     * We also avoid ClassCastExceptions deep in Jena-land by eschewing Jena's
      * listSuperClasses() method.
      */
     private Iterator<OntClass> smarterListHierarchyRootClasses(OntModel ontModel, String ontologyURI) {
@@ -505,20 +505,20 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                             continue;
                         }
                         Resource superClass = (Resource) stmt.getObject();
-                        if (!superClass.isAnon() && 
+                        if (!superClass.isAnon() &&
                                 ((ontologyURI==null) || (ontologyURI.equals(superClass.getNameSpace()))) &&
-                                !OWL.Thing.equals(superClass) && 
-                                !superClass.equals(ontClass) && 
-                                !( ontModel.contains(ontClass,OWL.equivalentClass,superClass) || 
-                                        ontModel.contains(superClass,OWL.equivalentClass,ontClass) ) )  {	
-                            if ( (superClass.getNameSpace() != null) 
+                                !OWL.Thing.equals(superClass) &&
+                                !superClass.equals(ontClass) &&
+                                !( ontModel.contains(ontClass,OWL.equivalentClass,superClass) ||
+                                        ontModel.contains(superClass,OWL.equivalentClass,ontClass) ) )  {
+                            if ( (superClass.getNameSpace() != null)
                                     && (!(NONUSER_NAMESPACES.contains(
                                             superClass.getNameSpace()))) ) {
                                 isRoot=false;
                                 break;
                             }
                         }
-                        
+
                     }
                     if (isRoot && ontClass.canAs(OntClass.class)) {
                         rootClassList.add(ontClass.as(OntClass.class));
@@ -543,9 +543,9 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
         try {
             Iterator<OntClass> rootIt = smarterListHierarchyRootClasses(
                     getOntModel(), ontologyURI);
-            while (rootIt.hasNext()) {    
+            while (rootIt.hasNext()) {
                 OntClass cls = rootIt.next();
-                if (!cls.isAnon() && cls.getNameSpace() != null 
+                if (!cls.isAnon() && cls.getNameSpace() != null
                         && !(NONUSER_NAMESPACES.contains(cls.getNameSpace()))) {
                     rootClasses.add(new VClassJena(cls,getWebappDaoFactory()));
                 }
@@ -563,7 +563,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
             throw new RuntimeException("can't find root classes for null ontology URI");
         }
         // return getRootClasses(ontologyURI);
-        List<VClass> ontologyRootClasses = new ArrayList<VClass>(); 
+        List<VClass> ontologyRootClasses = new ArrayList<VClass>();
         OntModel ontModel = getOntModel();
         ontModel.enterCriticalSection(Lock.READ);
         try {
@@ -578,7 +578,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                     try {
                         while (superStmtIt.hasNext()) {
                             Statement superStmt = superStmtIt.nextStatement();
-                            if ( superStmt.getObject().isResource() 
+                            if ( superStmt.getObject().isResource()
                                     && ontologyURI.equals(
                                             ((Resource) superStmt.getObject())
                                             .getNameSpace()) ) {
@@ -591,7 +591,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                     }
                     if (root && ontClass.canAs(OntClass.class)) {
                         ontologyRootClasses.add(new VClassJena(
-                                (OntClass) ontClass.as(OntClass.class), 
+                                (OntClass) ontClass.as(OntClass.class),
                                 getWebappDaoFactory()));
                     }
                 }
@@ -632,10 +632,10 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
             }
         } catch (Exception e) {
             log.debug(e,e);
-            // we'll try this again using a different method 
+            // we'll try this again using a different method
             // that doesn't try to convert to OntClass
             supURIs.clear();
-            List<Resource> supList = (direct) 
+            List<Resource> supList = (direct)
                     ? listDirectObjectPropertyValues(subClass, RDFS.subClassOf)
                     : listObjectPropertyValues(subClass, RDFS.subClassOf);
             for (Resource res : supList) {
@@ -656,7 +656,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
         }
         return values;
     }
-    
+
     public VClass getTopConcept() {
         VClass top = new VClass();
         if (getOntModel().getProfile().NAMESPACE().equals(RDFS.getURI())) {
@@ -669,7 +669,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
             return top;
         } else {
             return null;
-        } 
+        }
     }
 
     public VClass getBottomConcept() {
@@ -705,7 +705,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
         insertNewVClass(cls,getOntModelSelector().getTBoxModel());
     }
 
-    public List<VClass> getVClassesForProperty(String propertyURI, boolean domainSide) {    
+    public List<VClass> getVClassesForProperty(String propertyURI, boolean domainSide) {
         return getVClassesForProperty(null, propertyURI, domainSide);
     }
 
@@ -728,12 +728,12 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                     superproperties.add(propertyURI);
                     HashSet<String> subjSuperclasses = new HashSet<String>(
                             getAllSuperClassURIs(vclassURI));
-                    subjSuperclasses.add(vclassURI); 
+                    subjSuperclasses.add(vclassURI);
                     for (String objectPropertyURI : superproperties) {
                         for (Iterator restStmtIt = getOntModel().listStatements(
                                 null,OWL.onProperty,getOntModel().getProperty(objectPropertyURI)); restStmtIt.hasNext();) {
                             Statement restStmt = (Statement) restStmtIt.next();
-                            Resource restRes = restStmt.getSubject();	            		
+                            Resource restRes = restStmt.getSubject();
                             for (Iterator axStmtIt = getOntModel().listStatements(null,null,restRes); axStmtIt.hasNext();) {
                                 Statement axStmt = (Statement) axStmtIt.next();
                                 OntResource subjOntRes = null;
@@ -742,7 +742,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                                 }
                                 if (
                                         (subjOntRes != null) && (subjSuperclasses.contains(getClassURIStr(subjOntRes))) &&
-                                        (axStmt.getPredicate().equals(RDFS.subClassOf) || (axStmt.getPredicate().equals(OWL.equivalentClass)))	
+                                        (axStmt.getPredicate().equals(RDFS.subClassOf) || (axStmt.getPredicate().equals(OWL.equivalentClass)))
                                         ) {
                                     if (restRes.canAs(AllValuesFromRestriction.class)) {
                                         AllValuesFromRestriction avfRest = restRes.as(AllValuesFromRestriction.class);
@@ -750,19 +750,19 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                                         if (avf.canAs(OntClass.class)) {
                                             superclass = avfRest.getAllValuesFrom().as(OntClass.class);
                                         }
-                                    } 
+                                    }
                                 }
                             }
                         }
                     }
-                }    	
+                }
                 if (superclass == null) {
                     superclass = (domainSide) ? op.getRange() : op.getDomain();
                     if (superclass == null) {
                     	//this section to prevent all subclasses of owl:Thing
                         //returned if range is owl:Thing, refer to NIHVIVO-3357 NIHVIVO-3814
                     	//This is unfortunate case of warping the model for the ease of the display.
-                    	return Collections.emptyList();                        
+                    	return Collections.emptyList();
                     }
                 }
                 if (superclass != null) {
@@ -779,7 +779,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                     	return Collections.emptyList();
                     }
                     if (superVclass != null) {
-                        vClasses.add(superVclass);                                                                       
+                        vClasses.add(superVclass);
 						// if this model infers types based on the taxonomy, adding the subclasses will only
 						// waste time for no benefit
 						if (!isUnderlyingStoreReasoned()) {
@@ -788,7 +788,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                                 if (vClass != null)
                                     vClasses.add(vClass);
                             }
-						} 
+						}
                     }
                 }
             }
@@ -815,7 +815,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
 
         if (getIndividualCount) {
             group.setIndividualCount( getClassGroupInstanceCount(group));
-        } 
+        }
 
         try {
             if ((group != null) && (group.getURI() != null)) {
@@ -849,7 +849,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                                         vcw.setEntityCount(count);
                                         classIsInstantiated = (count > 0);
                                     } else if (!includeUninstantiatedClasses) {
-                                        // Note: to support SDB models, may want to do this with 
+                                        // Note: to support SDB models, may want to do this with
                                         // SPARQL and LIMIT 1 if SDB can take advantage of it
                                         Model aboxModel = getOntModelSelector().getABoxModel();
                                         aboxModel.enterCriticalSection(Lock.READ);
@@ -886,16 +886,16 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
         }
     }
 
-    int getClassGroupInstanceCount(VClassGroup vcg){        
+    int getClassGroupInstanceCount(VClassGroup vcg){
         Model ontModel = getOntModel();
         ontModel.enterCriticalSection(Lock.READ);
         int count = 0;
         try {
-            String queryText =              
-                    "SELECT COUNT( DISTINCT ?instance ) WHERE { \n" +                    
-                            "      ?class <"+VitroVocabulary.IN_CLASSGROUP+"> <"+vcg.getURI() +"> .\n" +                
-                            "      ?instance a ?class .  \n" +                    
-                            "}" ;                
+            String queryText =
+                    "SELECT COUNT( DISTINCT ?instance ) WHERE { \n" +
+                            "      ?class <"+VitroVocabulary.IN_CLASSGROUP+"> <"+vcg.getURI() +"> .\n" +
+                            "      ?instance a ?class .  \n" +
+                            "}" ;
             Query countQuery = QueryFactory.create(queryText, Syntax.syntaxARQ);
             QueryExecution qe = QueryExecutionFactory.create(countQuery, ontModel);
             ResultSet rs =qe.execSelect();
@@ -993,7 +993,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
             addPropertyFloatValue(ontCls, SEARCH_BOOST_ANNOT, cls.getSearchBoost(), ontModel);
         } finally {
             getOntModel().getBaseModel().notifyEvent(new EditEvent(getWebappDaoFactory().getUserURI(),false));
-            ontModel.leaveCriticalSection();           
+            ontModel.leaveCriticalSection();
         }
         return 0;
     }
@@ -1019,7 +1019,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                 updatePropertyFloatValue(ontCls, SEARCH_BOOST_ANNOT, cls.getSearchBoost(), ontModel);
 
                 if (cls.getHiddenFromDisplayBelowRoleLevel() != null) {
-                    updatePropertyResourceURIValue(ontCls,HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT,cls.getHiddenFromDisplayBelowRoleLevel().getURI(),ontModel);                    
+                    updatePropertyResourceURIValue(ontCls,HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT,cls.getHiddenFromDisplayBelowRoleLevel().getURI(),ontModel);
                 }
 
                 if (cls.getProhibitedFromUpdateBelowRoleLevel() != null) {
@@ -1055,7 +1055,7 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
             OntResource subclass = getOntClass(ontModel,c2c.getSubclassURI());
             OntResource superclass = getOntClass(ontModel,c2c.getSuperclassURI());
             if(subclass == null || superclass == null) {
-                log.warn("unable to delete " + c2c.getSubclassURI() + 
+                log.warn("unable to delete " + c2c.getSubclassURI() +
                         " rdfs:subClassOf " + c2c.getSuperclassURI());
                 if (subclass == null) {
                     log.warn(c2c.getSubclassURI() + " not found in the model.");
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java
index 317713b2a..cc6e7bea7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java
@@ -29,29 +29,29 @@ public class VClassDaoSDB extends VClassDaoJena {
 
 	private DatasetWrapperFactory dwf;
 	private SDBDatasetMode datasetMode;
-	
-    public VClassDaoSDB(DatasetWrapperFactory datasetWrapperFactory, 
+
+    public VClassDaoSDB(DatasetWrapperFactory datasetWrapperFactory,
                         SDBDatasetMode datasetMode,
                         WebappDaoFactoryJena wadf, boolean isUnderlyingStoreReasoned) {
         super(wadf, isUnderlyingStoreReasoned);
         this.dwf = datasetWrapperFactory;
         this.datasetMode = datasetMode;
     }
-    
+
     protected DatasetWrapper getDatasetWrapper() {
     	return dwf.getDatasetWrapper();
     }
-    
+
     @Deprecated
     public void addVClassesToGroup(VClassGroup group, boolean includeUninstantiatedClasses, boolean getIndividualCount) {
-        
+
         if (getIndividualCount) {
             group.setIndividualCount( getClassGroupInstanceCount(group));
-        } 
-        
+        }
+
         getOntModel().enterCriticalSection(Lock.READ);
         try {
-            if ((group != null) && (group.getURI() != null)) {                                
+            if ((group != null) && (group.getURI() != null)) {
                 Resource groupRes = ResourceFactory.createResource(group.getURI());
                 Property inClassGroup = ResourceFactory.createProperty(VitroVocabulary.IN_CLASSGROUP);
                 if (inClassGroup != null) {
@@ -64,8 +64,8 @@ public class VClassDaoSDB extends VClassDaoJena {
                                 VClass vcw = getVClassByURI(cls.getURI());
                                 if (vcw != null) {
                                     boolean classIsInstantiated = false;
-                                    if (getIndividualCount) {                                                                            
-                                    	int count = 0;                                    	
+                                    if (getIndividualCount) {
+                                    	int count = 0;
                                 	    String[] graphVars = { "?g" };
                                 		String countQueryStr = "SELECT COUNT(DISTINCT ?s) WHERE \n" +
                                 		                       "{ GRAPH ?g { ?s a <" + cls.getURI() + "> } \n" +
@@ -74,7 +74,7 @@ public class VClassDaoSDB extends VClassDaoJena {
                                 		Query countQuery = QueryFactory.create(countQueryStr, Syntax.syntaxARQ);
                                 		DatasetWrapper w = getDatasetWrapper();
                                 		Dataset dataset = w.getDataset();
-                                		dataset.getLock().enterCriticalSection(Lock.READ);                                    		
+                                		dataset.getLock().enterCriticalSection(Lock.READ);
                                 		try {
                                     		QueryExecution qe = QueryExecutionFactory.create(countQuery, dataset);
                                     		ResultSet rs = qe.execSelect();
@@ -86,7 +86,7 @@ public class VClassDaoSDB extends VClassDaoJena {
                                     	vcw.setEntityCount(count);
                                     	classIsInstantiated = (count > 0);
                                     } else if (!includeUninstantiatedClasses) {
-                                        // Note: to support SDB models, may want to do this with 
+                                        // Note: to support SDB models, may want to do this with
                                         // SPARQL and LIMIT 1 if SDB can take advantage of it
                                     	Model aboxModel = getOntModelSelector().getABoxModel();
                                     	aboxModel.enterCriticalSection(Lock.READ);
@@ -103,7 +103,7 @@ public class VClassDaoSDB extends VClassDaoJena {
                                     		aboxModel.leaveCriticalSection();
                                     	}
                                     }
-                                    
+
                                     if (includeUninstantiatedClasses || classIsInstantiated) {
                                         group.add(vcw);
                                     }
@@ -122,23 +122,23 @@ public class VClassDaoSDB extends VClassDaoJena {
             getOntModel().leaveCriticalSection();
         }
     }
-        
+
 //    protected void addIndividualCountToGroups( List<VClassGroup> cgList ){
-//        for( VClassGroup cg : cgList){           
+//        for( VClassGroup cg : cgList){
 //            cg.setIndividualCount(getClassGroupInstanceCount(cg));
-//        }        
+//        }
 //    }
-    
+
     @Override
     int getClassGroupInstanceCount(VClassGroup vcg){
-        int count = 0;               
+        int count = 0;
         try {
-            String queryText =              
+            String queryText =
                 "SELECT COUNT( DISTINCT ?instance ) WHERE { \n" +
-                "      ?class <"+VitroVocabulary.IN_CLASSGROUP+"> <"+vcg.getURI() +"> .\n" +                
+                "      ?class <"+VitroVocabulary.IN_CLASSGROUP+"> <"+vcg.getURI() +"> .\n" +
                 "      ?instance a ?class .  \n" +
                 "} \n" ;
-            
+
             Query countQuery = QueryFactory.create(queryText, Syntax.syntaxARQ);
             DatasetWrapper w = getDatasetWrapper();
             Dataset dataset = w.getDataset();
@@ -153,10 +153,10 @@ public class VClassDaoSDB extends VClassDaoJena {
             }
         }catch(Exception ex){
             log.error("error in getClassGroupInstanceCount()", ex);
-        }    
-        
+        }
+
         return count;
     }
 
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java
index 26b187c3c..96c125f04 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java
@@ -50,18 +50,18 @@ import edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread;
 
 /**
  * This is a cache of classgroups with classes.  Each class should have a count
- * of individuals. These counts are cached so they don't have to be recomputed. 
- * 
- * The cache is updated asynchronously by the thread RebuildGroupCacheThread. 
- * A synchronous rebuild can be performed with VClassGroupCache.doSynchronousRebuild() 
- * 
- * This class should handle the condition where the search engine is not available.  
+ * of individuals. These counts are cached so they don't have to be recomputed.
+ *
+ * The cache is updated asynchronously by the thread RebuildGroupCacheThread.
+ * A synchronous rebuild can be performed with VClassGroupCache.doSynchronousRebuild()
+ *
+ * This class should handle the condition where the search engine is not available.
  * It will not throw an exception but it will return a empty list of classes
  * or class groups.
- * 
+ *
  * VClassGroupCache.doSynchronousRebuild() and the RebuildGroupCacheThread will try
- * to connect to the search engine a couple of times and then give up.  
- * 
+ * to connect to the search engine a couple of times and then give up.
+ *
  * As of VIVO release 1.4, the counts come from the search index. If the
  * search index is not built or if there were problems building the index,
  * the class counts from VClassGroupCache will be incorrect.
@@ -86,9 +86,9 @@ public class VClassGroupCache implements SearchIndexer.Listener {
      * and other information */
     private Map<String, VClass> VclassMap = new HashMap<String, VClass>();
 
-    
+
     private final RebuildGroupCacheThread _cacheRebuildThread;
-    
+
     /**
      * Need a pointer to the context to get DAOs and models.
      */
@@ -104,19 +104,19 @@ public class VClassGroupCache implements SearchIndexer.Listener {
             return;
         }
 
-        /* Need to register for changes of rdf:type for individuals in abox 
-         * and for changes of classgroups for classes. */         
+        /* Need to register for changes of rdf:type for individuals in abox
+         * and for changes of classgroups for classes. */
         VClassGroupCacheChangeListener bccl = new VClassGroupCacheChangeListener();
         ModelContext.registerListenerForChanges(context, bccl);
 
         _cacheRebuildThread = new RebuildGroupCacheThread(this);
-        _cacheRebuildThread.setDaemon(true);        
-        _cacheRebuildThread.start();        
+        _cacheRebuildThread.setDaemon(true);
+        _cacheRebuildThread.start();
     }
 
-    public synchronized VClassGroup getGroup(String vClassGroupURI) {        
+    public synchronized VClassGroup getGroup(String vClassGroupURI) {
         if (vClassGroupURI == null || vClassGroupURI.isEmpty())
-            return null;                
+            return null;
         List<VClassGroup> cgList = getGroups();
         for (VClassGroup cg : cgList) {
             if (vClassGroupURI.equals(cg.getURI()))
@@ -130,7 +130,7 @@ public class VClassGroupCache implements SearchIndexer.Listener {
         if (_groupList == null){
             doSynchronousRebuild();
         }
-        
+
         if (_groupList == null){
             requestCacheUpdate();
             return Collections.emptyList();
@@ -145,31 +145,31 @@ public class VClassGroupCache implements SearchIndexer.Listener {
         if ( VclassMap == null ){
             doSynchronousRebuild();
         }
-        
+
         if( VclassMap == null){
             requestCacheUpdate();
             return null;
         }else{
             if (VclassMap.containsKey(classUri)) {
                 return VclassMap.get(classUri);
-            }else{ 
-                return null; 
+            }else{
+                return null;
             }
-        }    
+        }
     }
 
     protected synchronized void setCache(List<VClassGroup> newGroups, Map<String,VClass> classMap){
         _groupList = newGroups;
         VclassMap = classMap;
     }
-    
+
     private boolean paused = false;
     private boolean updateRequested = false;
-    
+
     public void pause() {
         this.paused = true;
     }
-    
+
     public void unpause() {
         this.paused = false;
         if(updateRequested) {
@@ -177,7 +177,7 @@ public class VClassGroupCache implements SearchIndexer.Listener {
             requestCacheUpdate();
         }
     }
-    
+
     public void requestCacheUpdate() {
         log.debug("requesting update");
         if(paused) {
@@ -186,7 +186,7 @@ public class VClassGroupCache implements SearchIndexer.Listener {
             _cacheRebuildThread.informOfQueueChange();
         }
     }
-    
+
     protected void requestStop() {
         if (_cacheRebuildThread != null) {
             _cacheRebuildThread.kill();
@@ -201,30 +201,30 @@ public class VClassGroupCache implements SearchIndexer.Listener {
     protected VClassGroupDao getVCGDao() {
 		return ModelAccess.on(context).getWebappDaoFactory().getVClassGroupDao();
     }
-    
+
     public void doSynchronousRebuild(){
         //try to rebuild a couple times since the search engine may not yet be up.
-        
+
         int attempts = 0;
         int maxTries = 5;
         SearchEngineException exception = null;
-        
+
         while( attempts < maxTries ){
             try {
                 attempts++;
                 rebuildCacheUsingSearch(this);
-                break;                
+                break;
             } catch (SearchEngineException e) {
                 exception = e;
                 try { Thread.sleep(1000); }
                 catch (InterruptedException e1) {/*ignore interrupt*/}
             }
         }
-        
+
         if( exception != null )
             log.error("Could not rebuild cache. " + exception.getCause().getMessage() );
     }
-    
+
     /**
      * Handle notification of events from the IndexBuilder.
      */
@@ -234,15 +234,15 @@ public class VClassGroupCache implements SearchIndexer.Listener {
     	case STOP_URIS:
             log.debug("rebuilding because of IndexBuilder " + event.getType());
             requestCacheUpdate();
-            break;            
-        default: 
+            break;
+        default:
             log.debug("ignoring event type " + event.getType());
             break;
     	}
 	}
-    
+
     /* **************** static utility methods ***************** */
-    
+
     /**
      * Use getVClassGroupCache(ServletContext) to get a VClassGroupCache.
      */
@@ -257,25 +257,25 @@ public class VClassGroupCache implements SearchIndexer.Listener {
     public static VClassGroupsForRequest getVClassGroups(HttpServletRequest req) {
     	return new VClassGroupsForRequest(req, getVClassGroupCache(req.getSession().getServletContext()));
     }
-    
+
     /**
      * Method that rebuilds the cache. This will use a WebappDaoFactory and a SearchEngine.
      */
-    protected static void rebuildCacheUsingSearch( VClassGroupCache cache ) throws SearchEngineException{                        
+    protected static void rebuildCacheUsingSearch( VClassGroupCache cache ) throws SearchEngineException{
         long start = System.currentTimeMillis();
 		WebappDaoFactory wdFactory = ModelAccess.on(cache.context).getWebappDaoFactory();
 
 		SearchEngine searchEngine = ApplicationUtils.instance().getSearchEngine();
-        
+
         VitroFilters vFilters = VitroFilterUtils.getPublicFilter(cache.context);
         VClassGroupDao vcgDao = new WebappDaoFactoryFiltering(wdFactory, vFilters).getVClassGroupDao();
-        
-        List<VClassGroup> groups = vcgDao.getPublicGroupsWithVClasses(ORDER_BY_DISPLAYRANK, 
+
+        List<VClassGroup> groups = vcgDao.getPublicGroupsWithVClasses(ORDER_BY_DISPLAYRANK,
                 INCLUDE_UNINSTANTIATED, DONT_INCLUDE_INDIVIDUAL_COUNT);
-                                
-        addCountsUsingSearch(groups, searchEngine);        
+
+        addCountsUsingSearch(groups, searchEngine);
         cache.setCache(groups, classMapForGroups(groups));
-        
+
         log.debug("msec to build cache: " + (System.currentTimeMillis() - start));
     }
 
@@ -291,44 +291,44 @@ public class VClassGroupCache implements SearchIndexer.Listener {
             }
         }
         return newClassMap;
-    }      
+    }
+
 
-    
     /**
      * Add the Individual count to classes in groups.
-     * @throws SearchEngineException 
+     * @throws SearchEngineException
      */
-    protected static void addCountsUsingSearch(List<VClassGroup> groups, SearchEngine searchEngine) 
-    throws SearchEngineException {        
-        if( groups == null || searchEngine == null ) 
-            return;       
-        for( VClassGroup group : groups){            
-            addClassCountsToGroup(group, searchEngine);            
+    protected static void addCountsUsingSearch(List<VClassGroup> groups, SearchEngine searchEngine)
+    throws SearchEngineException {
+        if( groups == null || searchEngine == null )
+            return;
+        for( VClassGroup group : groups){
+            addClassCountsToGroup(group, searchEngine);
         }
-    }    
-    
+    }
+
     protected static void addClassCountsToGroup(VClassGroup group, SearchEngine searchEngine)
     throws SearchEngineException {
         if( group == null ) return;
-        
+
         String groupUri = group.getURI();
         String facetOnField = VitroSearchTermNames.RDFTYPE;
-        
+
         SearchQuery query = searchEngine.createQuery().
             setRows(0).
-            setQuery(VitroSearchTermNames.CLASSGROUP_URI + ":" + groupUri ).        
+            setQuery(VitroSearchTermNames.CLASSGROUP_URI + ":" + groupUri ).
             addFacetFields( facetOnField ). //facet on type to get counts for classes in classgroup
             setFacetMinCount(0);
-        
+
         log.debug("query: " + query);
-        
+
         SearchResponse rsp = searchEngine.query(query);
 
         //Get individual count
         long individualCount = rsp.getResults().getNumFound();
         log.debug("Number of individuals found " + individualCount);
         group.setIndividualCount((int) individualCount);
-        
+
         //get counts for classes
         SearchFacetField ff = rsp.getFacetField( facetOnField );
         if( ff != null ){
@@ -337,13 +337,13 @@ public class VClassGroupCache implements SearchIndexer.Listener {
                 for( Count ct: counts){
                     if( ct != null ){
                         String classUri = ct.getName();
-                        long individualsInClass = ct.getCount();            
+                        long individualsInClass = ct.getCount();
                         setClassCount( group, classUri, individualsInClass);
                     }
                 }
             }else{
-               log.debug("no Counts found for FacetField " + facetOnField);   
-            }            
+               log.debug("no Counts found for FacetField " + facetOnField);
+            }
         }else{
             log.debug("no FaccetField found for " + facetOnField);
         }
@@ -355,19 +355,19 @@ public class VClassGroupCache implements SearchIndexer.Listener {
             if( clz.getURI().equals(classUri)){
                 clz.setEntityCount( (int) individualsInClass );
             }
-        }        
+        }
     }
 
     protected static boolean isClassNameChange(Statement stmt, OntModel jenaOntModel) {
         // Check if the stmt is a rdfs:label change and that the
         // subject is an owl:Class.
-        if( RDFS.label.equals( stmt.getPredicate() )) {                
+        if( RDFS.label.equals( stmt.getPredicate() )) {
             jenaOntModel.enterCriticalSection(Lock.READ);
-            try{                                                  
+            try{
                 return jenaOntModel.contains(
                         ResourceFactory.createStatement(
-                                ResourceFactory.createResource(stmt.getSubject().getURI()), 
-                                RDF.type, 
+                                ResourceFactory.createResource(stmt.getSubject().getURI()),
+                                RDF.type,
                                 OWL.Class));
             }finally{
                 jenaOntModel.leaveCriticalSection();
@@ -377,15 +377,15 @@ public class VClassGroupCache implements SearchIndexer.Listener {
         }
     }
     /* ******************** RebuildGroupCacheThread **************** */
-    
+
     protected class RebuildGroupCacheThread extends VitroBackgroundThread {
         private final VClassGroupCache cache;
-        private long queueChangeMillis = 0L; 
+        private long queueChangeMillis = 0L;
         private boolean rebuildRequested = false;
         private volatile boolean die = false;
         private int failedAttempts = 0;
         private final int maxFailedAttempts = 5;
-        
+
         RebuildGroupCacheThread(VClassGroupCache cache) {
             super("VClassGroupCache.RebuildGroupCacheThread");
             this.cache = cache;
@@ -402,19 +402,19 @@ public class VClassGroupCache implements SearchIndexer.Listener {
                 } else if ((System.currentTimeMillis() - queueChangeMillis ) < 500) {
                     log.debug("rebuildGroupCacheThread.run() -- delay start of rebuild");
                     delay = 500;
-                } else {                                        
+                } else {
                     setWorkLevel(WorkLevel.WORKING);
-                    rebuildRequested = false;                    
+                    rebuildRequested = false;
                     try {
-                        rebuildCacheUsingSearch( cache );                        
+                        rebuildCacheUsingSearch( cache );
                         log.debug("rebuildGroupCacheThread.run() -- rebuilt cache ");
                         failedAttempts = 0;
                         delay = 100;
-                    } catch (SearchEngineException e) {                        
+                    } catch (SearchEngineException e) {
                         failedAttempts++;
-                        if( failedAttempts >= maxFailedAttempts ){                                                        
+                        if( failedAttempts >= maxFailedAttempts ){
                             log.error("Could not build VClassGroupCache. " +
-                            		  "Could not connect with the search engine after " + 
+                            		  "Could not connect with the search engine after " +
                             		   failedAttempts + " attempts.", e.getCause());
                             rebuildRequested = false;
                             failedAttempts = 0;
@@ -423,13 +423,13 @@ public class VClassGroupCache implements SearchIndexer.Listener {
                             rebuildRequested = true;
                             delay = (int) (( Math.pow(2, failedAttempts) ) * 1000);
                             log.debug("Could not connect with the search engine, will attempt " +
-                            		  "again in " + delay + " msec.");                            
+                            		  "again in " + delay + " msec.");
                         }
                     }catch(Exception ex){
                         log.error("could not build cache",ex);
                         delay = 1000;
                     }
-                    setWorkLevel(WorkLevel.IDLE);                    
+                    setWorkLevel(WorkLevel.IDLE);
                 }
 
                 if (delay > 0) {
@@ -444,7 +444,7 @@ public class VClassGroupCache implements SearchIndexer.Listener {
                 }
             }
             log.debug("rebuildGroupCacheThread.run() -- die()");
-        }        
+        }
 
         synchronized void informOfQueueChange() {
             queueChangeMillis = System.currentTimeMillis();
@@ -456,14 +456,14 @@ public class VClassGroupCache implements SearchIndexer.Listener {
             die = true;
             this.notifyAll();
         }
-    }        
+    }
 
     /* ****************** Jena Model Change Listener***************************** */
-    
+
     /**
      * Listen for changes to what class group classes are in and their display rank.
      */
-    protected class VClassGroupCacheChangeListener extends StatementListener {        
+    protected class VClassGroupCacheChangeListener extends StatementListener {
         @Override
 		public void addedStatement(Statement stmt) {
             checkAndDoUpdate(stmt);
@@ -489,14 +489,14 @@ public class VClassGroupCache implements SearchIndexer.Listener {
             	requestCacheUpdate();
             } else if (RDFS.label.equals(stmt.getPredicate())){
                 OntModel jenaOntModel = ModelAccess.on(context).getOntModelSelector().getTBoxModel();
-                if( isClassNameChange(stmt, jenaOntModel) ) {            
+                if( isClassNameChange(stmt, jenaOntModel) ) {
                     requestCacheUpdate();
                 }
             }
-        }       
-        
+        }
+
         public void notifyEvent(Model model, Object event) {
-            if (event instanceof BulkUpdateEvent) { 
+            if (event instanceof BulkUpdateEvent) {
                 if(((BulkUpdateEvent) event).getBegin()) {
                     pause();
                 } else {
@@ -504,19 +504,19 @@ public class VClassGroupCache implements SearchIndexer.Listener {
                 }
             }
         }
-       
+
     }
-    
+
     /* ******************** ServletContextListener **************** */
     public static class Setup implements ServletContextListener {
         @Override
-        public void contextInitialized(ServletContextEvent sce) {            
+        public void contextInitialized(ServletContextEvent sce) {
             ServletContext context = sce.getServletContext();
             VClassGroupCache vcgc = new VClassGroupCache(context);
             vcgc.requestCacheUpdate();
-            context.setAttribute(ATTRIBUTE_NAME,vcgc);           
-            log.info("VClassGroupCache added to context");   
-            
+            context.setAttribute(ATTRIBUTE_NAME,vcgc);
+            log.info("VClassGroupCache added to context");
+
             SearchIndexer searchIndexer = ApplicationUtils.instance().getSearchIndexer();
             searchIndexer.addListener(vcgc);
             log.info("VClassGroupCache set to listen to events from IndexBuilder");
@@ -531,6 +531,6 @@ public class VClassGroupCache implements SearchIndexer.Listener {
         }
     }
 
-  
+
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java
index 5b7f26f21..3ba868de8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupDaoJena.java
@@ -43,7 +43,7 @@ public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao {
     protected OntModel getOntModel() {
     	return getOntModelSelector().getApplicationMetadataModel();
     }
-    
+
     public void deleteVClassGroup(VClassGroup vcg) {
     	deleteVClassGroup(vcg,getOntModel());
     }
@@ -61,7 +61,7 @@ public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao {
         OntModel tboxModel = getOntModelSelector().getTBoxModel();
         tboxModel.enterCriticalSection(Lock.WRITE);
         try {
-            Resource groupRes = ResourceFactory.createResource(vcg.getURI());            
+            Resource groupRes = ResourceFactory.createResource(vcg.getURI());
             tboxModel.removeAll(groupRes, null, null);
             tboxModel.removeAll(null, null, groupRes);
         } finally {
@@ -138,7 +138,7 @@ public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao {
                     if (vgrp != null) {
                         groups.add(vgrp);
                     }
-                }    
+                }
                 java.util.Collections.sort(groups);
             } finally {
                 groupIt.close();
@@ -149,21 +149,21 @@ public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao {
         for (VClassGroup vgrp : groups) {
             classDao.addVClassesToGroup(vgrp, includeUninstantiatedClasses, getIndividualCount);
         }
-        if (groups.size()>0) {                
+        if (groups.size()>0) {
             return groups;
         } else {
-            /* bdc34: the effect of the following code is that 
+            /* bdc34: the effect of the following code is that
              * classgroups will get empty vclasses added to them
              * when includeUninstantiatedClasses == false and all
              * the vclasses are empty.
-             * This may not be the desired behavior. 
+             * This may not be the desired behavior.
              */
-            classDao.addVClassesToGroups(groups);                
+            classDao.addVClassesToGroups(groups);
                 return groups;
         }
     }
-    
-    
+
+
     public VClassGroup groupFromGroupIndividual(Individual groupInd) {
         if (groupInd==null) {
             return null;
@@ -173,7 +173,7 @@ public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao {
         group.setURI(groupInd.getURI());
         group.setNamespace(groupInd.getNameSpace());
         group.setLocalName(groupInd.getLocalName());
-        group.setDisplayRank(getPropertyNonNegativeIntValue(groupInd, DISPLAY_RANK));       
+        group.setDisplayRank(getPropertyNonNegativeIntValue(groupInd, DISPLAY_RANK));
         return group;
     }
 
@@ -183,25 +183,25 @@ public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao {
     }
 
     public int insertNewVClassGroup(VClassGroup vcg, OntModel ontModel) {
-    	
+
     	// VitroClassGroups should really inherit from Individual objects now,
     	// but they don't (yet).
     	// I'm going to make an Individual so I can avoid duplicating URI code.
-    	
-    	edu.cornell.mannlib.vitro.webapp.beans.Individual groupInd = 
+
+    	edu.cornell.mannlib.vitro.webapp.beans.Individual groupInd =
     		new IndividualImpl(); // We should make a factory for these
     	groupInd.setURI(vcg.getURI());
     	groupInd.setNamespace(DEFAULT_NAMESPACE+"vitroClassGroup");
     	groupInd.setName(vcg.getPublicName());
     	groupInd.setVClassURI(CLASSGROUP.getURI());
-    	
+
     	String groupURI = null;
-    	
+
     	OntModel unionForURIGeneration = ModelFactory.createOntologyModel(
     	        OntModelSpec.OWL_MEM, ModelFactory.createUnion(
-    	                getOntModelSelector().getApplicationMetadataModel(), 
+    	                getOntModelSelector().getApplicationMetadataModel(),
     	                getOntModelSelector().getFullModel()));
-    	
+
     	WebappDaoFactory wadfForURIGeneration = null;
     	try {
     	    wadfForURIGeneration = new WebappDaoFactoryJena(
@@ -213,7 +213,7 @@ public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao {
     	} finally {
     	    wadfForURIGeneration.close();
     	}
-    	
+
     	if (groupURI != null) {
 	        ontModel.enterCriticalSection(Lock.WRITE);
 	        try {
@@ -231,7 +231,7 @@ public class VClassGroupDaoJena extends JenaBaseDao implements VClassGroupDao {
     		log.error("Unable to insert class group " + vcg.getPublicName());
     		return 1;
     	}
-        
+
     }
 
     public int removeUnpopulatedGroups(List<VClassGroup> groups) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJena.java
index 165a32dcd..7c1c5351a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJena.java
@@ -27,14 +27,14 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
  *
  */
 public class VClassJena extends VClass {
-	
+
     private static final Log log = LogFactory.getLog(VClassJena.class.getName());
     private OntClass cls = null;
     private WebappDaoFactoryJena webappDaoFactory = null;
 
     public VClassJena(OntClass cls, WebappDaoFactoryJena wadf) {
         this.cls = cls;
-        
+
         if (cls.isAnon()) {
         	this.setNamespace(VitroVocabulary.PSEUDO_BNODE_NS);
         	this.setLocalName(cls.getId().toString());
@@ -43,12 +43,12 @@ public class VClassJena extends VClass {
         	this.namespace = cls.getNameSpace();
         	this.localName = cls.getLocalName();
         }
-                
+
         this.webappDaoFactory = wadf;
     }
-    
+
     /**
- 	 * Constructs the VClassJena as a deep copy of an existing VClassJena. 
+ 	 * Constructs the VClassJena as a deep copy of an existing VClassJena.
  	 */
      @Override
 	public VClassJena copy() {
@@ -62,35 +62,35 @@ public class VClassJena extends VClass {
      */
     @Override
     public String getName() {
-    	
+
         if (this.myName != null) {
             return myName;
         } else {
             cls.getOntModel().enterCriticalSection(Lock.READ);
             try {
                 VClassDao vClassDao = webappDaoFactory.getVClassDao();
-                
+
                 if (vClassDao instanceof VClassDaoJena) {
                 	this.myName = ((VClassDaoJena) vClassDao).getLabelForClass(cls,false,false);
                 } else {
                     log.error("WebappDaoFactory returned a type of " + vClassDao.getClass().getName() + ". Expected  VClassDaoJena");
                     this.myName = webappDaoFactory.getJenaBaseDao().getLabelOrId(cls);
                 }
-                         
+
                 return this.myName;
             } finally {
                 cls.getOntModel().leaveCriticalSection();
             }
         }
     }
-    
-    @Override 
+
+    @Override
     public String getLabel() {
         return getName();
     }
-    
+
     @Override
-    public String getLocalNameWithPrefix() { 	
+    public String getLocalNameWithPrefix() {
         if (this.localNameWithPrefix != null) {
             return localNameWithPrefix;
         } else {
@@ -98,7 +98,7 @@ public class VClassJena extends VClass {
             return this.localNameWithPrefix;
         }
     }
-    
+
     @Override
     public String getPickListName() {
         if (this.pickListName != null) {
@@ -114,7 +114,7 @@ public class VClassJena extends VClass {
      */
     @Override
     public  String getExample()  {
-    	
+
         if (this.myExample != null) {
             return myExample;
         } else {
@@ -127,13 +127,13 @@ public class VClassJena extends VClass {
             }
         }
     }
-    
+
     /**
      * Information about the type of information expected of a member of this VClass
      */
     @Override
     public  String getDescription()  {
-    	
+
         if (this.myDescription != null) {
             return myDescription;
         } else {
@@ -146,10 +146,10 @@ public class VClassJena extends VClass {
             }
         }
     }
-   
+
     @Override
     public  String getShortDef()  {
-    	
+
         if (this.myShortDefinition != null) {
             return myShortDefinition;
         } else {
@@ -160,12 +160,12 @@ public class VClassJena extends VClass {
             } finally {
                 cls.getOntModel().leaveCriticalSection();
             }
-        }		
+        }
     }
-       
+
     @Override
     public  int  getDisplayLimit() {
-    	
+
         if (this.displayLimit != null) {
             return displayLimit;
         } else {
@@ -176,12 +176,12 @@ public class VClassJena extends VClass {
             } finally {
                 cls.getOntModel().leaveCriticalSection();
             }
-        }		 	 	
+        }
     }
-   
+
     @Override
     public  int  getDisplayRank()  {
-    	
+
         if (this.displayRank != null) {
             return displayRank;
         } else {
@@ -192,37 +192,37 @@ public class VClassJena extends VClass {
             } finally {
                 cls.getOntModel().leaveCriticalSection();
             }
-        }		 	    
+        }
     }
-   
+
     @Override
     public String  getGroupURI()  {
-    	
+
         if (this.groupURI != null) {
             return this.groupURI;
         } else {
             cls.getOntModel().enterCriticalSection(Lock.READ);
             try {
                 Resource groupRes = (Resource) cls.getPropertyValue(webappDaoFactory.getJenaBaseDao().IN_CLASSGROUP);
-                
+
                 if (groupRes != null) {
                     setGroupURI(groupRes.getURI());
                 }
-                
+
             } catch (Exception e) {
                 log.error("error retrieving vitro:inClassGroup property value for " + cls.getURI());
-                log.trace(e);           	
+                log.trace(e);
             } finally {
                 cls.getOntModel().leaveCriticalSection();
             }
-            
+
             return this.groupURI;
-        }		 	         
+        }
     }
-    
+
     @Override
     public  String getCustomEntryForm()  {
-    	
+
         if (this.customEntryForm != null) {
             return this.customEntryForm;
         } else {
@@ -233,12 +233,12 @@ public class VClassJena extends VClass {
             } finally {
                 cls.getOntModel().leaveCriticalSection();
             }
-        }		       
+        }
     }
-    
+
     @Override
     public  String getCustomDisplayView()  {
-    	
+
         if (this.customDisplayView != null) {
             return this.customDisplayView;
         } else {
@@ -249,12 +249,12 @@ public class VClassJena extends VClass {
             } finally {
                 cls.getOntModel().leaveCriticalSection();
             }
-        }		        	
+        }
     }
-    
+
     @Override
-    public  String getCustomShortView() { 
-    	
+    public  String getCustomShortView() {
+
         if (this.customShortView != null) {
             return this.customShortView;
         } else {
@@ -265,12 +265,12 @@ public class VClassJena extends VClass {
             } finally {
                 cls.getOntModel().leaveCriticalSection();
             }
-        }		        	   		
+        }
     }
-    
+
     @Override
     public  String getCustomSearchView() {
-    	
+
         if (this.customSearchView != null) {
             return this.customSearchView;
         } else {
@@ -281,12 +281,12 @@ public class VClassJena extends VClass {
             } finally {
                 cls.getOntModel().leaveCriticalSection();
             }
-        }		        	   		
+        }
     }
-        
+
     @Override
     public Float getSearchBoost() {
-    	
+
         if (this.searchBoost != null) {
             return this.searchBoost;
         } else {
@@ -297,21 +297,21 @@ public class VClassJena extends VClass {
             } finally {
                 cls.getOntModel().leaveCriticalSection();
             }
-        }		 	    
-    } 
-    
+        }
+    }
+
     @Override
     public RoleLevel getHiddenFromDisplayBelowRoleLevel() {
-       
+
         if (this.hiddenFromDisplayBelowRoleLevel != null) {
             return this.hiddenFromDisplayBelowRoleLevel;
         } else {
             cls.getOntModel().enterCriticalSection(Lock.READ);
-            try {            	
+            try {
                 //There might be multiple HIDDEN_FROM_EDIT_DISPLAY_ANNOT properties, only use the highest
                 StmtIterator it = cls.listProperties(webappDaoFactory.getJenaBaseDao().HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT);
                 BaseResourceBean.RoleLevel hiddenRoleLevel = null;
-            
+
                 while( it.hasNext() ){
                     Statement stmt = it.nextStatement();
                     RDFNode obj;
@@ -319,30 +319,30 @@ public class VClassJena extends VClass {
                         Resource res = obj.as(Resource.class);
                         if( res != null && res.getURI() != null ){
                             BaseResourceBean.RoleLevel roleFromModel = BaseResourceBean.RoleLevel.getRoleByUri(res.getURI());
-                            if( roleFromModel != null && 
+                            if( roleFromModel != null &&
                                 (hiddenRoleLevel == null || roleFromModel.compareTo(hiddenRoleLevel) > 0 )){
-                                hiddenRoleLevel = roleFromModel;                            
+                                hiddenRoleLevel = roleFromModel;
                             }
                         }
                     }
                 }
-                
+
                 setHiddenFromDisplayBelowRoleLevel(hiddenRoleLevel); //this might get set to null
             	return this.hiddenFromDisplayBelowRoleLevel;
             } finally {
                 cls.getOntModel().leaveCriticalSection();
             }
-        }		 	               
+        }
     }
-    
+
     @Override
     public RoleLevel getProhibitedFromUpdateBelowRoleLevel() {
-        
+
         if (this.prohibitedFromUpdateBelowRoleLevel != null) {
             return this.prohibitedFromUpdateBelowRoleLevel;
         } else {
             cls.getOntModel().enterCriticalSection(Lock.READ);
-            try {            	
+            try {
                 //There might be multiple PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT properties, only use the highest
             	StmtIterator it = cls.listProperties(webappDaoFactory.getJenaBaseDao().PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT);
                 BaseResourceBean.RoleLevel prohibitedRoleLevel = null;
@@ -353,34 +353,34 @@ public class VClassJena extends VClass {
                         Resource res = obj.as(Resource.class);
                         if( res != null && res.getURI() != null ){
                             BaseResourceBean.RoleLevel roleFromModel = BaseResourceBean.RoleLevel.getRoleByUri(res.getURI());
-                            if( roleFromModel != null && 
+                            if( roleFromModel != null &&
                                 (prohibitedRoleLevel == null || roleFromModel.compareTo(prohibitedRoleLevel) > 0 )){
-                                prohibitedRoleLevel = roleFromModel;                            
+                                prohibitedRoleLevel = roleFromModel;
                             }
                         }
                     }
                 }
-                
+
                 setProhibitedFromUpdateBelowRoleLevel(prohibitedRoleLevel); //this might get set to null
             	return this.prohibitedFromUpdateBelowRoleLevel;
             } finally {
                 cls.getOntModel().leaveCriticalSection();
             }
-        }		 	                      
+        }
     }
-    
+
     @Override
     public RoleLevel getHiddenFromPublishBelowRoleLevel() {
-       
+
         if (this.hiddenFromPublishBelowRoleLevel != null) {
             return this.hiddenFromPublishBelowRoleLevel;
         } else {
             cls.getOntModel().enterCriticalSection(Lock.READ);
-            try {            	
+            try {
                 //There might be multiple HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT properties, only use the highest
                 StmtIterator it = cls.listProperties(webappDaoFactory.getJenaBaseDao().HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT);
                 BaseResourceBean.RoleLevel publishRoleLevel = null;
-            
+
                 while( it.hasNext() ){
                     Statement stmt = it.nextStatement();
                     RDFNode obj;
@@ -388,27 +388,27 @@ public class VClassJena extends VClass {
                         Resource res = obj.as(Resource.class);
                         if( res != null && res.getURI() != null ){
                             BaseResourceBean.RoleLevel roleFromModel = BaseResourceBean.RoleLevel.getRoleByUri(res.getURI());
-                            if( roleFromModel != null && 
+                            if( roleFromModel != null &&
                                 (publishRoleLevel == null || roleFromModel.compareTo(publishRoleLevel) > 0 )){
-                                publishRoleLevel = roleFromModel;                            
+                                publishRoleLevel = roleFromModel;
                             }
                         }
                     }
                 }
-                
+
                 setHiddenFromPublishBelowRoleLevel(publishRoleLevel); //this might get set to null
             	return this.hiddenFromPublishBelowRoleLevel;
             } finally {
                 cls.getOntModel().leaveCriticalSection();
             }
-        }		 	               
+        }
     }
-    
+
     @Override
     public boolean isUnion() {
         return this.cls.isUnionClass();
     }
-    
+
     //TODO consider anonymous components
     @Override
     public List<VClass> getUnionComponents() {
@@ -419,11 +419,11 @@ public class VClassJena extends VClass {
             while(opIt.hasNext()) {
                 OntClass component = opIt.next();
                 if (!component.isAnon()) {
-                    unionComponents.add(new VClassJena(component, this.webappDaoFactory));  
+                    unionComponents.add(new VClassJena(component, this.webappDaoFactory));
                 }
             }
         }
         return unionComponents;
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroModelSource.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroModelSource.java
index 0bdea75cb..84026ba4e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroModelSource.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroModelSource.java
@@ -12,11 +12,11 @@ import org.apache.jena.rdf.model.ModelSource;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames;
 
-/** 
+/**
  * ModelSource that will handle specially named Vitro models such
  * as display and t-box. Any other models will be retrieved from
- * the inner ModelSource. 
- * 
+ * the inner ModelSource.
+ *
  * None of these models will be retrieved
  * from the attributes of a ServletRequest.
  */
@@ -24,9 +24,9 @@ public class VitroModelSource implements ModelSource {
 
     private ModelSource innerSource;
     private ServletContext context;
-    
-    /** 
-     * Each of these values identifies a model in the system.     
+
+    /**
+     * Each of these values identifies a model in the system.
      */
     public enum ModelName {
         /** Name for default assertion model. */
@@ -38,18 +38,18 @@ public class VitroModelSource implements ModelSource {
         /** Name for t-box for DISPLAY. */
         DISPLAY_TBOX,
         /** Name for display model related to DISPLAY and DISPLAY_TBOX. */
-        DISPLAY_DISPLAY, 
+        DISPLAY_DISPLAY,
         /** Name for user accounts model. */
         USER_ACCOUNTS
-        
-        //may need a way to specify unions of these models and unions of URI models 
+
+        //may need a way to specify unions of these models and unions of URI models
     }
-    
+
     public VitroModelSource(ModelSource innerSource, ServletContext context){
         this.innerSource = innerSource;
         this.context = context;
     }
-    
+
     @Override
     public Model getModel(String arg0) {
         ModelName pn = getModelName( arg0 );
@@ -101,12 +101,12 @@ public class VitroModelSource implements ModelSource {
     }
 
     /**
-     * This should not return null for any value of pmn in 
+     * This should not return null for any value of pmn in
      * the enum PrivilegedModelName.
      */
     private Model getNamedModel( ModelName pmn ){
         switch( pmn ){
-            case ABOX: 
+            case ABOX:
             	return ModelAccess.on(context).getOntModel();
             case TBOX:
                 return (Model) context.getAttribute("tboxmodel???");
@@ -122,16 +122,16 @@ public class VitroModelSource implements ModelSource {
                 throw new IllegalArgumentException("getNamedModel() should handle all values for enum PrivilegedModelName");
         }
     }
-    
-    
+
+
     /**
      * Returns null if the string is not a ModelName.
      */
     public static ModelName getModelName( String string ){
         if( StringUtils.isEmpty(string))
             return null;
-        
-        try{ 
+
+        try{
             return ModelName.valueOf( string.trim().toUpperCase());
         }catch(IllegalArgumentException ex){
             //Did not find value in enum ModelName for the string, no problem.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java
index 84d2917c9..26aabf0be 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java
@@ -58,7 +58,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.jena.URIUtils;
 public class WebappDaoFactoryJena implements WebappDaoFactory {
 
     private static final Log log = LogFactory.getLog(WebappDaoFactoryJena.class);
-    
+
     protected IndividualDao entityWebappDao;
     protected ApplicationDaoJena applicationDao;
     protected UserAccountsDao userAccountsDao;
@@ -67,19 +67,19 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
 
     private PageDao pageDao;
     private MenuDao menuDao;
-    
+
     protected OntModelSelector ontModelSelector;
-    
+
     protected WebappDaoFactoryConfig config;
-    
+
     protected String userURI;
-	
+
 	private Map<String,String> properties = new HashMap<String,String>();
-	
+
 	protected DatasetWrapperFactory dwf;
-	
+
 	protected RDFService rdfService;
-	
+
     /* **************** constructors **************** */
 
     public WebappDaoFactoryJena(WebappDaoFactoryJena base, String userURI) {
@@ -89,48 +89,48 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
         this.dwf = base.dwf;
     }
 
-    public WebappDaoFactoryJena(OntModelSelector ontModelSelector, 
+    public WebappDaoFactoryJena(OntModelSelector ontModelSelector,
                                 OntModelSelector baseOntModelSelector,
                                 OntModelSelector inferenceOntModelSelector,
-                                WebappDaoFactoryConfig config, 
+                                WebappDaoFactoryConfig config,
                                 String userURI) {
-    	
+
         this.ontModelSelector = ontModelSelector;
         this.config = config;
         this.userURI = userURI;
-        
-        Model assertions = (baseOntModelSelector != null) 
+
+        Model assertions = (baseOntModelSelector != null)
                 ? baseOntModelSelector.getFullModel()
                 : ontModelSelector.getFullModel();
-        Model inferences = (inferenceOntModelSelector != null) 
+        Model inferences = (inferenceOntModelSelector != null)
                 ? inferenceOntModelSelector.getFullModel()
                 : null;
-        
-        Dataset dataset = makeInMemoryDataset(assertions, inferences);      
-        this.dwf = new StaticDatasetFactory(dataset);
-        
-        this.rdfService = new RDFServiceModel(ontModelSelector.getFullModel());
-        
-    } 
 
-    public WebappDaoFactoryJena(OntModelSelector ontModelSelector, 
+        Dataset dataset = makeInMemoryDataset(assertions, inferences);
+        this.dwf = new StaticDatasetFactory(dataset);
+
+        this.rdfService = new RDFServiceModel(ontModelSelector.getFullModel());
+
+    }
+
+    public WebappDaoFactoryJena(OntModelSelector ontModelSelector,
                                 WebappDaoFactoryConfig config,
                                 String userURI) {
         this(ontModelSelector, null, null, config, userURI);
     }
 
-    public WebappDaoFactoryJena(OntModelSelector ontModelSelector, 
+    public WebappDaoFactoryJena(OntModelSelector ontModelSelector,
                                 WebappDaoFactoryConfig config) {
         this(ontModelSelector, config, null);
     }
-    
-    public WebappDaoFactoryJena(OntModelSelector ontModelSelector, 
-    		                    OntModelSelector baseOntModelSelector, 
-    		                    OntModelSelector inferenceOntModelSelector, 
+
+    public WebappDaoFactoryJena(OntModelSelector ontModelSelector,
+    		                    OntModelSelector baseOntModelSelector,
+    		                    OntModelSelector inferenceOntModelSelector,
     		                    WebappDaoFactoryConfig config) {
-        this(ontModelSelector, 
-             baseOntModelSelector, 
-             inferenceOntModelSelector, 
+        this(ontModelSelector,
+             baseOntModelSelector,
+             inferenceOntModelSelector,
              config,
              null);
     }
@@ -138,31 +138,31 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
     public WebappDaoFactoryJena(OntModelSelector ontModelSelector) {
         this(ontModelSelector, new WebappDaoFactoryConfig(), null);
     }
-    
+
     public WebappDaoFactoryJena(OntModel ontModel) {
     	this(new SimpleOntModelSelector(
     			ontModel), new WebappDaoFactoryConfig(), null);
     }
-    
+
     public OntModelSelector getOntModelSelector() {
     	return this.ontModelSelector;
     }
-    
+
     public OntModel getOntModel() {
     	return this.ontModelSelector.getFullModel();
     }
-       
-    public static Dataset makeInMemoryDataset(Model assertions, 
+
+    public static Dataset makeInMemoryDataset(Model assertions,
                                               Model inferences) {
-        Dataset dataset = DatasetFactory.createMem();        
-        OntModel union = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);        
+        Dataset dataset = DatasetFactory.createMem();
+        OntModel union = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
         if (assertions != null) {
             dataset.addNamedModel(
             		ModelNames.ABOX_ASSERTIONS, assertions);
             union.addSubModel(assertions);
-        } 
+        }
         if (inferences != null) {
-            dataset.addNamedModel(ModelNames.ABOX_INFERENCES, 
+            dataset.addNamedModel(ModelNames.ABOX_INFERENCES,
                     inferences);
             union.addSubModel(inferences);
         }
@@ -186,21 +186,21 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
 		if (this.hasExistingURI(uriStr)) {
 			return "URI is already in use. Please enter another URI. ";
 		}
-		
+
 		return null;
 	}
-    
+
     @Override
 	public String checkURIForEditableEntity(String uriStr) {
 		String errorMessage = checkURIForValidity(uriStr);
 		if (errorMessage != null) {
 			return errorMessage;
 		}
-		
+
 		if(hasEditableEntity(uriStr)) {
 			return "URI is already in use. Please enter another URI. ";
 		}
-		
+
 		return null;
 	}
 
@@ -221,22 +221,22 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
 		} catch (Exception e) {
 			return "Not a valid URI.  Please enter another URI. ";
 		}
-		
+
 		return null;
 	}
 
 	//Check if URI already in use or not either as resource OR as property
     @Override
 	public boolean hasExistingURI(String uriStr) {
-    	OntModel ontModel = ontModelSelector.getFullModel(); 
+    	OntModel ontModel = ontModelSelector.getFullModel();
 		return URIUtils.hasExistingURI(uriStr, ontModel);
     }
-    
+
     private boolean hasEditableEntity(String uriStr) {
     	OntModel ontModel = ontModelSelector.getFullModel();
     	return URIUtils.hasEditableEntity(uriStr, ontModel);
     }
-    
+
     @Override
 	public WebappDaoFactory getUserAwareDaoFactory(String userURI) {
         return new WebappDaoFactoryJena(this, userURI);
@@ -253,17 +253,17 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
 	public String getDefaultNamespace() {
         return config.getDefaultNamespace();
     }
-    
+
     @Override
 	public List<String> getPreferredLanguages() {
     	return config.getPreferredLanguages();
     }
-    
+
     @Override
 	public Set<String> getNonuserNamespaces() {
     	return config.getNonUserNamespaces();
     }
-    
+
     @Override
 	public List<String> getCommentsForResource(String resourceURI) {
     	List<String> commentList = new LinkedList<String>();
@@ -295,7 +295,7 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
         else
             return entityWebappDao = new IndividualDaoJena(this);
     }
-    
+
     @Override
 	public ApplicationDao getApplicationDao() {
     	if (applicationDao != null) {
@@ -312,7 +312,7 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
         else
             return vClassGroupDao = new VClassGroupDaoJena(this);
     }
-    
+
     @Override
 	public PropertyGroupDao getPropertyGroupDao() {
         if (propertyGroupDao != null)
@@ -395,7 +395,7 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
     	}
     	return fauxPropertyDao;
     }
-    
+
     private PropertyInstanceDao propertyInstanceDao = null;
     @Override
 	public PropertyInstanceDao getPropertyInstanceDao() {
@@ -412,8 +412,8 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
         return vClassDao;
     }
 
-    private JenaBaseDao jenaBaseDao = null;    
-    
+    private JenaBaseDao jenaBaseDao = null;
+
     public JenaBaseDao getJenaBaseDao() {
         if (jenaBaseDao == null) {
             jenaBaseDao = new JenaBaseDao(this);
@@ -434,26 +434,26 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
             menuDao = new MenuDaoJena(this);
         return menuDao;
     }
-    
+
     @Override
     public DisplayModelDao getDisplayModelDao(){
         return new DisplayModelDaoJena( this );
     }
-    
+
     @Override
     public void close() {
         if (applicationDao != null) {
             applicationDao.close();
-        }   
+        }
     }
-    
+
     /**
      * Method for creating a copy - does not pass the same object
      * @param base DAO Factory
      */
     public WebappDaoFactoryJena (WebappDaoFactoryJena base) {
-    	// Not sure if selector somehow has greater longevity so 
-    	// making a copy instead of reference.    	
+    	// Not sure if selector somehow has greater longevity so
+    	// making a copy instead of reference.
     	if(base.ontModelSelector instanceof OntModelSelectorImpl) {
     		OntModelSelectorImpl selector = new OntModelSelectorImpl();
     		selector.setABoxModel(base.ontModelSelector.getABoxModel());
@@ -479,55 +479,55 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
     	} else {
     		//Not sure what this is but will set to equivalence here
     		this.ontModelSelector = base.ontModelSelector;
-    	}   	
+    	}
         this.config = base.config;
         this.userURI = base.userURI;
         this.dwf = base.dwf;
     }
-    
+
     /**
-     * Method for using a special model, such as the display model, with the 
-     * WebappDaoFactory.  The goal here is to modify this WebappDaoFactory so 
-     * that it is using specialModel, specialTboxModel and specialDisplayModel 
-     * for individual editing. 
-     * 
+     * Method for using a special model, such as the display model, with the
+     * WebappDaoFactory.  The goal here is to modify this WebappDaoFactory so
+     * that it is using specialModel, specialTboxModel and specialDisplayModel
+     * for individual editing.
+     *
      * DAOs related to the application configuration and user accounts
      * should remain unchanged.
-     */    
-    public void setSpecialDataModel(OntModel specialModel, 
-                                    OntModel specialTboxModel, 
+     */
+    public void setSpecialDataModel(OntModel specialModel,
+                                    OntModel specialTboxModel,
                                     OntModel specialDisplayModel) {
         if( specialModel == null )
             throw new IllegalStateException("specialModel must not be null");
-        
+
     	//Can we get the "original" models here from somewhere?
     	OntModelSelector originalSelector = this.getOntModelSelector();
-    	
+
     	// Set up model selector for this special WDF
     	// The selector is used by the object property DAO, therefore should be
-    	// set up even though we use the new webapp dao factory object to 
+    	// set up even though we use the new webapp dao factory object to
     	// generate portions to overwrite the regular webapp dao factory.
-    	
-    	//The WDF expects the full model in the OntModelSelect that has 
-    	//both the ABox and TBox.  This is used to run SPARQL queries against.    	
+
+    	//The WDF expects the full model in the OntModelSelect that has
+    	//both the ABox and TBox.  This is used to run SPARQL queries against.
     	OntModel unionModel = ModelFactory.createOntologyModel(
     			OntModelSpec.OWL_MEM);
         unionModel.addSubModel(specialModel);
-        
+
     	OntModelSelectorImpl specialSelector = new OntModelSelectorImpl();
     	specialSelector.setFullModel(unionModel);
     	// Keeping original application metadata model and adding special model.
-    	// Adding both  allows us to prevent errors in  ApplicationDao which may 
-    	// depend on a specific individual from the regular application metadata 
-    	// model to  pick the theme.   Adding the new  model would  take care of 
-    	// special  situations  where  the switch  model  may  contain important 
+    	// Adding both  allows us to prevent errors in  ApplicationDao which may
+    	// depend on a specific individual from the regular application metadata
+    	// model to  pick the theme.   Adding the new  model would  take care of
+    	// special  situations  where  the switch  model  may  contain important
     	// information.
     	OntModel newApplicationModel = ModelFactory.createOntologyModel(
     			OntModelSpec.OWL_MEM);
     	newApplicationModel.add(specialModel);
     	newApplicationModel.add(originalSelector.getApplicationMetadataModel());
-    	specialSelector.setApplicationMetadataModel(newApplicationModel);    	
-    	
+    	specialSelector.setApplicationMetadataModel(newApplicationModel);
+
     	if(specialDisplayModel != null) {
     		specialSelector.setDisplayModel(specialDisplayModel);
     	    unionModel.addSubModel(specialDisplayModel);
@@ -546,22 +546,22 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
     		if(selectorTboxModel != null) {
     			specialSelector.setTBoxModel(originalSelector.getTBoxModel());
     		}
-    	}    	    
-    	
+    	}
+
     	specialSelector.setABoxModel(specialModel);
     	specialSelector.setUserAccountsModel(specialModel);
-    	// Although we're only using part of the new wadf and copy over below, 
-    	// the object property dao utilizes methods that will employ the display 
-    	// model returned from the simple ontmodel selector, so if the object 
-    	// property dao is to be copied over we need to ensure we have the 
+    	// Although we're only using part of the new wadf and copy over below,
+    	// the object property dao utilizes methods that will employ the display
+    	// model returned from the simple ontmodel selector, so if the object
+    	// property dao is to be copied over we need to ensure we have the
     	// correct display model and tbox model.
     	WebappDaoFactoryJena specialWadfj = new WebappDaoFactoryJena(
     			specialSelector);
     	entityWebappDao = specialWadfj.getIndividualDao();
     	vClassGroupDao = specialWadfj.getVClassGroupDao();
     	// To allow for testing, add a property group, this will allow
-    	// the unassigned group method section to be executed and main Image to 
-    	// be assigned to that group.  Otherwise, the dummy group does not allow 
+    	// the unassigned group method section to be executed and main Image to
+    	// be assigned to that group.  Otherwise, the dummy group does not allow
     	// for the unassigned group to be executed.
     	propertyGroupDao = specialWadfj.getPropertyGroupDao();
     	objectPropertyDao = specialWadfj.getObjectPropertyDao();
@@ -570,9 +570,9 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
     	dataPropertyStatementDao = specialWadfj.getDataPropertyStatementDao();
     	// Why can't we set the selector to be the same?
     	ontModelSelector = specialSelector;
-    	
+
     }
-    
+
     public String makeLocalNameWithPrefix(ResourceBean bean) {
         OntologyDao oDao = this.getOntologyDao();
         Ontology o = oDao.getOntologyByURI(bean.getNamespace());
@@ -585,12 +585,12 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
             }
         } else {
             String prefix = o.getPrefix() == null ? (
-                    o.getName() == null ? 
+                    o.getName() == null ?
                             "unspec" : o.getName()) : o.getPrefix();
             return prefix + ":" + bean.getLocalName();
-        }    
+        }
     }
-    
+
     public String makePickListName(ResourceBean bean) {
         OntologyDao oDao = this.getOntologyDao();
         Ontology o = oDao.getOntologyByURI(bean.getNamespace());
@@ -605,11 +605,11 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
             }
         } else {
             String prefix = o.getPrefix() == null ? (
-                    o.getName() == null ? 
+                    o.getName() == null ?
                             "unspec" : o.getName()) : o.getPrefix();
             return label + " (" + prefix + ")";
-        }       
+        }
     }
-    
-   
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java
index a70ae9f9d..7a140f2c3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java
@@ -23,22 +23,22 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 
 public class WebappDaoFactorySDB extends WebappDaoFactoryJena {
-	 
+
     private SDBDatasetMode datasetMode = SDBDatasetMode.ASSERTIONS_AND_INFERENCES;
-    
+
 	public WebappDaoFactorySDB(RDFService rdfService,
-	                          OntModelSelector ontModelSelector) { 
+	                          OntModelSelector ontModelSelector) {
 		this(rdfService, ontModelSelector, new WebappDaoFactoryConfig());
 	}
-	
+
     public WebappDaoFactorySDB(RDFService rdfService,
                                OntModelSelector ontModelSelector,
                                WebappDaoFactoryConfig config) {
         this(rdfService, ontModelSelector, config, null);
     }
-    
+
     public WebappDaoFactorySDB(RDFService rdfService,
-                               OntModelSelector ontModelSelector, 
+                               OntModelSelector ontModelSelector,
                                WebappDaoFactoryConfig config,
                                SDBDatasetMode datasetMode) {
         super(ontModelSelector, config);
@@ -48,7 +48,7 @@ public class WebappDaoFactorySDB extends WebappDaoFactoryJena {
             this.datasetMode = datasetMode;
         }
     }
-    
+
 	@Override
 	public String toString() {
 		return "WebappDaoFactorySDB[" + Integer.toString(hashCode(), 16) + ", "
@@ -63,7 +63,7 @@ public class WebappDaoFactorySDB extends WebappDaoFactoryJena {
         this.dwf = base.dwf;
         this.rdfService = base.rdfService;
     }
-	
+
 	@Override
     public IndividualDao getIndividualDao() {
         if (entityWebappDao != null)
@@ -72,47 +72,47 @@ public class WebappDaoFactorySDB extends WebappDaoFactoryJena {
             return entityWebappDao = new IndividualDaoSDB(
                     dwf, datasetMode, this);
     }
-	
+
 	@Override
 	public DataPropertyStatementDao getDataPropertyStatementDao() {
-		if (dataPropertyStatementDao != null) 
+		if (dataPropertyStatementDao != null)
 			return dataPropertyStatementDao;
 		else
 			return dataPropertyStatementDao = new DataPropertyStatementDaoSDB(
 			        dwf, datasetMode, this);
 	}
-	
+
 	@Override
 	public ObjectPropertyStatementDao getObjectPropertyStatementDao() {
-		if (objectPropertyStatementDao != null) 
+		if (objectPropertyStatementDao != null)
 			return objectPropertyStatementDao;
 		else
-			return objectPropertyStatementDao = 
+			return objectPropertyStatementDao =
 			    new ObjectPropertyStatementDaoSDB(rdfService, dwf, datasetMode, this);
 	}
-	
+
 	@Override
 	public VClassDao getVClassDao() {
-		if (vClassDao != null) 
+		if (vClassDao != null)
 			return vClassDao;
 		else
 			return vClassDao = new VClassDaoSDB(dwf, datasetMode, this, config.isUnderlyingStoreReasoned());
 	}
-	
+
 	@Override
 	public WebappDaoFactory getUserAwareDaoFactory(String userURI) {
         return new WebappDaoFactorySDB(this, userURI);
     }
-	
+
 	public RDFService getRDFService() {
 	    return this.rdfService;
 	}
-	
+
 	public enum SDBDatasetMode {
 	    ASSERTIONS_ONLY, INFERENCES_ONLY, ASSERTIONS_AND_INFERENCES
 	}
-	
-	public static String getFilterBlock(String[] graphVars, 
+
+	public static String getFilterBlock(String[] graphVars,
 	                                    SDBDatasetMode datasetMode) {
 	    StringBuilder filterBlock = new StringBuilder();
 		for (String graphVar : graphVars) {
@@ -148,7 +148,7 @@ public class WebappDaoFactorySDB extends WebappDaoFactoryJena {
 		}
 	    return filterBlock.toString();
 	}
-	
+
 	@Override
 	public void close() {
 	    super.close();
@@ -156,18 +156,18 @@ public class WebappDaoFactorySDB extends WebappDaoFactoryJena {
 	        this.rdfService.close();
 	    }
 	}
-	
+
 	private class ReconnectingDatasetFactory implements DatasetWrapperFactory {
-	    
+
 	    private BasicDataSource _bds;
 	    private StoreDesc _storeDesc;
-	    
-	    public ReconnectingDatasetFactory(BasicDataSource bds, 
+
+	    public ReconnectingDatasetFactory(BasicDataSource bds,
                                           StoreDesc storeDesc) {
 	        _bds = bds;
 	        _storeDesc = storeDesc;
 	    }
-	    
+
 	    public DatasetWrapper getDatasetWrapper() {
 	        try {
                 Connection sqlConn = _bds.getConnection();
@@ -180,7 +180,7 @@ public class WebappDaoFactorySDB extends WebappDaoFactoryJena {
                 		"Unable to connect to database", sqe);
             }
 	    }
-	    
-	}    
-	
+
+	}
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/BulkUpdateEvent.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/BulkUpdateEvent.java
index a49b050a5..a7f82f054 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/BulkUpdateEvent.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/BulkUpdateEvent.java
@@ -7,9 +7,9 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 public class BulkUpdateEvent extends EditEvent {
 
 	private static final String BULK_UPDATE_EVENT = VitroVocabulary.BULK_UPDATE_EVENT;
-		
+
 	public BulkUpdateEvent(String userURI, boolean begin) {
 		super(userURI, begin);
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/EditEvent.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/EditEvent.java
index 58cec1aca..d455c2201 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/EditEvent.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/EditEvent.java
@@ -13,7 +13,7 @@ import org.apache.jena.rdf.model.ResourceFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 
 public class EditEvent {
-	
+
     private static final String EDIT_EVENT = VitroVocabulary.EDIT_EVENT;
     private static final String EDIT_EVENT_AGENT = VitroVocabulary.EDIT_EVENT_AGENT;
 
@@ -21,12 +21,12 @@ public class EditEvent {
 	private String userURI;
     protected List<String> eventTypeURIList;
     protected Map<String,List<RDFNode>> propertyMap;
-	
+
 	public EditEvent (String userURI, boolean begin) {
 		this.begin = begin;
 		this.userURI = userURI;
 	}
-	
+
 	public Map<String,List<RDFNode>> getPropertyMap() {
 		this.propertyMap = new HashMap<String,List<RDFNode>>();
 		List<RDFNode> agentValueList = new LinkedList<RDFNode>();
@@ -34,13 +34,13 @@ public class EditEvent {
 		this.propertyMap.put(EDIT_EVENT_AGENT, agentValueList);
 		return propertyMap;
 	}
-	
+
 	public Boolean getBegin() {
 		return this.begin;
 	}
-	
+
 	public List<String> getEventTypeURIList() {
 		return eventTypeURIList;
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualCreationEvent.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualCreationEvent.java
index 890c6fd1a..f926f9ff0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualCreationEvent.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualCreationEvent.java
@@ -12,13 +12,13 @@ import org.apache.jena.rdf.model.ResourceFactory;
 import org.apache.jena.vocabulary.RDF;
 
 public class IndividualCreationEvent extends IndividualEditEvent {
-	
-	private static final String INDIVIDUAL_CREATION_EVENT = VitroVocabulary.INDIVIDUAL_CREATION_EVENT; 
-	
+
+	private static final String INDIVIDUAL_CREATION_EVENT = VitroVocabulary.INDIVIDUAL_CREATION_EVENT;
+
 	public IndividualCreationEvent(String userURI, boolean begin, String individualURI) {
 		super(userURI,begin,individualURI);
 	}
-	
+
     public Map<String,List<RDFNode>> getPropertyMap() {
 		Map<String,List<RDFNode>> map = super.getPropertyMap();
 		List<RDFNode> typeValueList = map.get(RDF.type.getURI());
@@ -27,6 +27,6 @@ public class IndividualCreationEvent extends IndividualEditEvent {
 		}
 		typeValueList.add(ResourceFactory.createResource(INDIVIDUAL_CREATION_EVENT));
 		map.put(RDF.type.getURI(),typeValueList);
-		return map;	
+		return map;
 	}
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualDeletionEvent.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualDeletionEvent.java
index 6961b65d2..58f4f0867 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualDeletionEvent.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualDeletionEvent.java
@@ -14,12 +14,12 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 
 public class IndividualDeletionEvent extends IndividualEditEvent {
 
-	private static final String INDIVIDUAL_DELETION_EVENT = VitroVocabulary.INDIVIDUAL_DELETION_EVENT; 
-	
+	private static final String INDIVIDUAL_DELETION_EVENT = VitroVocabulary.INDIVIDUAL_DELETION_EVENT;
+
 	public IndividualDeletionEvent(String userURI, boolean begin, String individualURI) {
 		super(userURI,begin,individualURI);
 	}
-	
+
 	public Map<String,List<RDFNode>> getPropertyMap() {
 		Map<String,List<RDFNode>> map = super.getPropertyMap();
 		List<RDFNode> typeValueList = map.get(RDF.type.getURI());
@@ -28,7 +28,7 @@ public class IndividualDeletionEvent extends IndividualEditEvent {
 		}
 		typeValueList.add(ResourceFactory.createResource(INDIVIDUAL_DELETION_EVENT));
 		map.put(RDF.type.getURI(),typeValueList);
-		return map;	
+		return map;
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualEditEvent.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualEditEvent.java
index 4e357debb..12d0e636c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualEditEvent.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualEditEvent.java
@@ -16,14 +16,14 @@ public class IndividualEditEvent extends EditEvent {
 
 	private static final String INDIVIDUAL_EDIT_EVENT = VitroVocabulary.INDIVIDUAL_EDIT_EVENT;
 	private static final String EDITED_INDIVIDUAL = VitroVocabulary.EDITED_INDIVIDUAL;
-	
+
 	private String individualURI;
-	
+
 	public IndividualEditEvent(String userURI, boolean begin, String individualURI) {
 		super(userURI, begin);
 		this.individualURI = individualURI;
 	}
-	
+
 	public String getIndividualURI() {
 		return individualURI;
 	}
@@ -39,7 +39,7 @@ public class IndividualEditEvent extends EditEvent {
 		}
 		typeValueList.add(ResourceFactory.createResource(INDIVIDUAL_EDIT_EVENT));
 		map.put(RDF.type.getURI(),typeValueList);
-		return map;	
+		return map;
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualUpdateEvent.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualUpdateEvent.java
index 1b2bac359..68257fa3c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualUpdateEvent.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/event/IndividualUpdateEvent.java
@@ -14,12 +14,12 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 
 public class IndividualUpdateEvent extends IndividualEditEvent {
 
-	private static final String INDIVIDUAL_UPDATE_EVENT = VitroVocabulary.INDIVIDUAL_UPDATE_EVENT; 
-	
+	private static final String INDIVIDUAL_UPDATE_EVENT = VitroVocabulary.INDIVIDUAL_UPDATE_EVENT;
+
 	public IndividualUpdateEvent(String userURI, boolean begin, String individualURI) {
 		super(userURI,begin,individualURI);
 	}
-	
+
 	public Map<String,List<RDFNode>> getPropertyMap() {
 		Map<String,List<RDFNode>> map = super.getPropertyMap();
 		List<RDFNode> typeValueList = map.get(RDF.type.getURI());
@@ -28,7 +28,7 @@ public class IndividualUpdateEvent extends IndividualEditEvent {
 		}
 		typeValueList.add(ResourceFactory.createResource(INDIVIDUAL_UPDATE_EVENT));
 		map.put(RDF.type.getURI(),typeValueList);
-		return map;	
+		return map;
 	}
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/vclassgroup/ProhibitedFromSearch.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/vclassgroup/ProhibitedFromSearch.java
index 6153800fb..d777057aa 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/vclassgroup/ProhibitedFromSearch.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/vclassgroup/ProhibitedFromSearch.java
@@ -28,19 +28,19 @@ import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
 public class ProhibitedFromSearch {
 	List<String> prohibitedClasses;
 	String ProhibitedFromSearchURI;
-	
+
 	private static final String queryForProhibitedClasses = "SELECT ?prohibited WHERE{" +
 			"?searchConfig <" + DisplayVocabulary.EXCLUDE_CLASS + "> ?prohibited . }";
-		
-	protected static final Log log = LogFactory.getLog(ProhibitedFromSearch.class.getName()); 
-		
+
+	protected static final Log log = LogFactory.getLog(ProhibitedFromSearch.class.getName());
+
 	public ProhibitedFromSearch(String URI, OntModel model){
 		this.ProhibitedFromSearchURI = URI;
 		this.prohibitedClasses = new ArrayList<String>();
 		addAllProhibitedClasses( buildProhibitedClassesList(URI,model) );
 		model.register(new ProhibitedFromSearchChangeListener( this ));
 	}
-	 
+
 	public synchronized boolean isClassProhibitedFromSearch(String classURI){
 		if( classURI != null ){
 			boolean p = prohibitedClasses.contains(classURI);
@@ -51,22 +51,22 @@ public class ProhibitedFromSearch {
 			return false;
 		}
 	}
-	
+
 	private synchronized void removeProhibitedClass(String classURI){
 		prohibitedClasses.remove(classURI);
 	}
-	
+
 	private synchronized void addProhibitedClass(String classURI){
 		prohibitedClasses.add(classURI);
 	}
-	
+
 	private synchronized void addAllProhibitedClasses(List<String> classURIs){
 		prohibitedClasses.addAll(classURIs);
 	}
-	
+
 	private List<String> buildProhibitedClassesList( String URI, OntModel model){
 		List<String> newProhibitedClasses = new ArrayList<String>();
-		
+
 		QuerySolutionMap initialBinding = new QuerySolutionMap();
 		Resource searchConfig = ResourceFactory.createResource(URI);
 		initialBinding.add("searchConfig", searchConfig);
@@ -78,7 +78,7 @@ public class ProhibitedFromSearch {
 			try{
 				ResultSet results = qExec.execSelect();
 				for(;results.hasNext();){
-					QuerySolution soln = results.nextSolution();				
+					QuerySolution soln = results.nextSolution();
 					RDFNode n = soln.get("prohibited");
 					if( n.isResource() && !n.isAnon()){
 						newProhibitedClasses.add(((Resource) n).getURI());
@@ -87,34 +87,34 @@ public class ProhibitedFromSearch {
 					}
 				}
 			}catch(Throwable t){
-				log.error(t,t);			
+				log.error(t,t);
 			}finally{ qExec.close(); }
 		}finally{ model.leaveCriticalSection(); }
-		
+
 		return newProhibitedClasses;
 	}
 
 	private static enum ChangeType { ADD, REMOVE }
-	
+
 	class ProhibitedFromSearchChangeListener extends StatementListener {
 		ProhibitedFromSearch pfs;
-		
+
 		ProhibitedFromSearchChangeListener(ProhibitedFromSearch pfs){
 			this.pfs = pfs;
 		}
-		
+
 		@Override
 		public void addedStatement(Statement s) { processChange(s,ChangeType.ADD);}
 
 		@Override
 		public void removedStatement(Statement s) {	processChange(s,ChangeType.REMOVE); }
-	
+
 		private void processChange( Statement s, ChangeType add){
 			//is it a change to an exclude class property?
-			if( s != null && s.getPredicate() != null 
-				&& s.getPredicate().getURI() != null 
+			if( s != null && s.getPredicate() != null
+				&& s.getPredicate().getURI() != null
 				&& s.getPredicate().getURI().equals(DisplayVocabulary.EXCLUDE_CLASS.getURI())){
-				
+
 				//is it about this ProhibitedFromSearch?
 				if( s.getSubject() != null ){
 					String subURI = s.getSubject().getURI() ;
@@ -128,8 +128,8 @@ public class ProhibitedFromSearch {
 						}
 					}
 				}
-			}							
+			}
 		}
-		
+
 	}
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dwr/EntityDWR.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dwr/EntityDWR.java
index e67b1824d..4a0d50049 100755
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dwr/EntityDWR.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dwr/EntityDWR.java
@@ -52,7 +52,7 @@ public class EntityDWR {
         WebContext ctx = WebContextFactory.get();
         HttpServletRequest req = ctx.getHttpServletRequest();
         VitroRequest vreq = new VitroRequest(req);
-        
+
         Individual ind = vreq.getWebappDaoFactory().getIndividualDao().getIndividualByURI(entityURI);
         return ind;
     }
@@ -67,7 +67,7 @@ public class EntityDWR {
         HttpServletRequest req = ctx.getHttpServletRequest();
         VitroRequest vreq = new VitroRequest(req);
         IndividualDao entityWADao = vreq.getWebappDaoFactory().getIndividualDao();
-        
+
         return entityWADao.getIndividualsByVClass( vc );
     }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dwr/PropertyDWR.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dwr/PropertyDWR.java
index dc391b820..f92ba09c4 100755
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dwr/PropertyDWR.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dwr/PropertyDWR.java
@@ -28,21 +28,21 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
    destructive.
 */
 public class PropertyDWR {
-	
+
 	private static final Log log = LogFactory.getLog(PropertyDWR.class.getName());
-	
+
     public static boolean debug = true;
 
-    public PropertyDWR(){               
+    public PropertyDWR(){
     }
-    
+
     public Object test(){
         WebContext ctx = WebContextFactory.get();
         HttpServletRequest req = ctx.getHttpServletRequest();
         VitroRequest vreq = new VitroRequest(req);
         WebappDaoFactory wdf = vreq.getWebappDaoFactory();
-        
-        Collection c = 
+
+        Collection c =
             wdf.getPropertyInstanceDao().getExistingProperties("http://example.org/property", null);
         return c.iterator().next();
     }
@@ -56,19 +56,19 @@ public class PropertyDWR {
         HttpServletRequest req = ctx.getHttpServletRequest();
         VitroRequest vreq = new VitroRequest(req);
         WebappDaoFactory wdf = vreq.getUnfilteredWebappDaoFactory();
-        
-        Collection c = 
+
+        Collection c =
             wdf.getPropertyInstanceDao().getAllPropInstByVClass(classURI);
         return c;
     }
-    
+
     public Collection getAllPossiblePropInstForIndividual(String individualURI) {
         WebContext ctx = WebContextFactory.get();
         HttpServletRequest req = ctx.getHttpServletRequest();
         VitroRequest vreq = new VitroRequest(req);
         WebappDaoFactory wdf = vreq.getUnfilteredWebappDaoFactory();
 
-        Collection c = 
+        Collection c =
             wdf.getPropertyInstanceDao().getAllPossiblePropInstForIndividual(individualURI);
     	return c;
     }
@@ -78,7 +78,7 @@ public class PropertyDWR {
         HttpServletRequest req = ctx.getHttpServletRequest();
         VitroRequest vreq = new VitroRequest(req);
         WebappDaoFactory wdf = vreq.getUnfilteredWebappDaoFactory();
-        
+
        return wdf.getPropertyInstanceDao().getProperty(subjectURI, predicateURI, objectURI);
     }
 
@@ -86,7 +86,7 @@ public class PropertyDWR {
         WebContext ctx = WebContextFactory.get();
         HttpServletRequest req = ctx.getHttpServletRequest();
         VitroRequest vreq = new VitroRequest(req);
-        return vreq.getUnfilteredWebappDaoFactory().getPropertyInstanceDao().insertProp(prop);                
+        return vreq.getUnfilteredWebappDaoFactory().getPropertyInstanceDao().insertProp(prop);
     }
 
     public int deleteProp(String subjectUri, String predicateUri, String objectUri){
@@ -118,18 +118,18 @@ public class PropertyDWR {
        HttpServletRequest req = ctx.getHttpServletRequest();
        VitroRequest vreq = new VitroRequest(req);
        WebappDaoFactory wdf = vreq.getUnfilteredWebappDaoFactory();
-       
-       return wdf.getPropertyInstanceDao().getExistingProperties(entityURI, null);       
+
+       return wdf.getPropertyInstanceDao().getExistingProperties(entityURI, null);
    }
-   
+
 //   private PropertyInstance prepare(PropertyInstance in){
 //       return in;
 //   }
-//   
+//
 //   public Collection prepare(Collection properties){
 //       if( properties == null || properties.size() == 0 )
 //           return Collections.EMPTY_LIST;
-//       
+//
 //       ArrayList outProps = new ArrayList(properties.size());
 //       for( Object prop : properties){
 //           if( prop instanceof PropertyIn
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dwr/VClassDWR.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dwr/VClassDWR.java
index 957fed71a..8e9541120 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dwr/VClassDWR.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dwr/VClassDWR.java
@@ -15,9 +15,9 @@ import org.directwebremoting.WebContextFactory;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 
-public class VClassDWR {    
+public class VClassDWR {
 
-    public VClassDWR(){        
+    public VClassDWR(){
     }
 
     /**
@@ -36,17 +36,17 @@ public class VClassDWR {
      */
     public Collection <VClass> getVClasses(String vclassURI, String propertyURI, boolean filterOutUninstanciated){
         List <VClass> vclasses = new ArrayList <VClass>();
-        
+
         WebContext ctx = WebContextFactory.get();
         HttpServletRequest req = ctx.getHttpServletRequest();
         VitroRequest vreq = new VitroRequest(req);
-        
+
         vclasses = vreq.getWebappDaoFactory().getVClassDao().getVClassesForProperty(vclassURI, propertyURI);
-        
+
         //it seems that filterOutUninstanciated was removed in the RDFService conversion.
-                
-        Collections.sort(vclasses); //sort vClasses NIHVIVO-3963        
+
+        Collections.sort(vclasses); //sort vClasses NIHVIVO-3963
         return vclasses;
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/listener/impl/IndividualDataPropertyStatementProcessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/listener/impl/IndividualDataPropertyStatementProcessor.java
index b6f921614..f2b6cad4f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/listener/impl/IndividualDataPropertyStatementProcessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/listener/impl/IndividualDataPropertyStatementProcessor.java
@@ -22,7 +22,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.BasicValidationVTwo;
 
 public class IndividualDataPropertyStatementProcessor implements ChangeListener {
-	
+
 	private static final Log log = LogFactory.getLog(IndividualDataPropertyStatementProcessor.class.getName());
 
     public void doInserted(Object newObj, EditProcessObject epo) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/AdditionsAndRetractions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/AdditionsAndRetractions.java
index 2ba9f3200..7c83d8822 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/AdditionsAndRetractions.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/AdditionsAndRetractions.java
@@ -11,32 +11,32 @@ import org.apache.jena.rdf.model.ModelFactory;
 /**
  * This is a data structure to allow a method to return
  * a pair of Model objects for additions and retractions.
- * 
+ *
  */
 public class AdditionsAndRetractions {
     Model additions;
     Model retractions;
-    
+
     public AdditionsAndRetractions(List<Model>adds, List<Model>retractions){
         Model allAdds = ModelFactory.createDefaultModel();
         Model allRetractions = ModelFactory.createDefaultModel();
-        
+
         for( Model model : adds ) {
             allAdds.add( model );
         }
         for( Model model : retractions ){
             allRetractions.add( model );
         }
-        
+
         this.setAdditions(allAdds);
         this.setRetractions(allRetractions);
     }
-    
+
     public AdditionsAndRetractions(Model add, Model retract){
         this.additions = add;
         this.retractions = retract;
     }
-    
+
     public Model getAdditions() {
         return additions;
     }
@@ -49,28 +49,28 @@ public class AdditionsAndRetractions {
     public void setRetractions(Model retractions) {
         this.retractions = retractions;
     }
-    
+
     @Override
     public String toString(){
         String str = "{";
-        
+
         str += "\nadditions:[";
         if( getAdditions() != null ) {
            StringWriter writer = new StringWriter();
            getAdditions().write(writer, "N3-PP");
            str += "\n" + writer.toString() + "\n";
         }
-        str += "],\n";        
-        
+        str += "],\n";
+
         str += "\nretractions:[";
         if( getRetractions() != null ) {
            StringWriter writer = new StringWriter();
            getRetractions().write(writer, "N3-PP");
            str += "\n" + writer.toString() + "\n";
         }
-        str += "],\n";        
-        
+        str += "],\n";
+
         return str;
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java
index d601fabed..a3e90d083 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java
@@ -18,15 +18,15 @@ public abstract class BaseEditElementVTwo  implements EditElementVTwo {
     private static final Log log = LogFactory.getLog(BaseEditElementVTwo.class);
 
     protected FieldVTwo field;
-    
+
     public BaseEditElementVTwo(FieldVTwo field){
         this.field = field;
     }
-    
+
     public void setField(FieldVTwo field){
         this.field = field;
     }
-    
+
     /**
      * Utility method for use in EditElements to merge a freemarker template.
      */
@@ -36,15 +36,15 @@ public abstract class BaseEditElementVTwo  implements EditElementVTwo {
             template = fmConfig.getTemplate(templateName);
         } catch (IOException e) {
             log.error("Cannot get template " + templateName);
-        }  
-         
+        }
+
         StringWriter writer = new StringWriter();
         try {
             template.process(map, writer);
         } catch (TemplateException | IOException e) {
             log.error(e,e);
         }
-        return writer.toString();        
+        return writer.toString();
     }
 
     /**
@@ -55,7 +55,7 @@ public abstract class BaseEditElementVTwo  implements EditElementVTwo {
     protected boolean hasNoneOrSingle(String key, Map<String, String[]> queryParameters){
         if( queryParameters != null ){
             if( ! queryParameters.containsKey(key) )
-                return true; //none            
+                return true; //none
             String[] vt = queryParameters.get(key);
             return vt == null || vt.length == 0 || vt.length==1;
         }else{
@@ -63,11 +63,11 @@ public abstract class BaseEditElementVTwo  implements EditElementVTwo {
             return false;
         }
     }
-    
+
     protected boolean hasSingleNonNullNonEmptyValueForKey(String key, Map<String, String[]> queryParameters){
         if( queryParameters != null ){
             if( ! queryParameters.containsKey(key) )
-                return true; //none            
+                return true; //none
             String[] vt = queryParameters.get(key);
             return vt != null && vt.length == 1 && vt[0] != null && ! vt[0].isEmpty() ;
         }else{
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditSubmissionPreprocessorVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditSubmissionPreprocessorVTwo.java
index 1b43cc156..6eb13f69c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditSubmissionPreprocessorVTwo.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditSubmissionPreprocessorVTwo.java
@@ -6,10 +6,10 @@ public abstract class BaseEditSubmissionPreprocessorVTwo implements
         EditSubmissionVTwoPreprocessor {
 
     protected EditConfigurationVTwo editConfiguration;
-    
+
     public BaseEditSubmissionPreprocessorVTwo(EditConfigurationVTwo editConfig) {
         editConfiguration = editConfig;
     }
-    
+
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java
index 4f064ac1c..c5eb8280f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java
@@ -30,7 +30,7 @@ public class BasicValidationVTwo {
 
     Map<String, List<String>> varsToValidations;
     EditConfigurationVTwo editConfig;
-    
+
     public BasicValidationVTwo(EditConfigurationVTwo editConfig, MultiValueEditSubmission editSub){
         this.editConfig = editConfig;
         Map<String,List<String>> validatorsForFields = new HashMap<String,List<String>>();
@@ -49,14 +49,14 @@ public class BasicValidationVTwo {
 
     public Map<String,String> validateUris(Map<String,List<String>> varNamesToValues){
         HashMap<String,String> errors = new HashMap<String,String>();
-        
+
         for( String name : varNamesToValues.keySet()){
-        	
+
             List<String> values = varNamesToValues.get(name);
             List<String> validations = varsToValidations.get(name);
             if( validations!= null){
                 for( String validationType : validations){
-                	//Appending validate message if same field has multiple values 
+                	//Appending validate message if same field has multiple values
                 	StringBuilder validateMsg = null;
                 	for(String value: values){
                 		String thisValidateMsg = validate(validationType,value);
@@ -70,10 +70,10 @@ public class BasicValidationVTwo {
                 	}
                     if( validateMsg != null) {
                         errors.put(name, validateMsg.toString());
-                    }    
+                    }
                 }
             }
-        }               
+        }
         return errors;
     }
 
@@ -87,14 +87,14 @@ public class BasicValidationVTwo {
             if( validations != null ){
                 // NB this is case-sensitive
                 boolean isRequiredField = validations.contains("nonempty");
-                
+
                 for( String validationType : validations){
                     String value = null;
                     StringBuilder validateMsg = null;
                     //If no literals and this field was required, this is an error message
                     //and can return
                     if((literals == null || literals.size() == 0) && isRequiredField) {
-                    	errors.put(name, REQUIRED_FIELD_EMPTY_MSG);     
+                    	errors.put(name, REQUIRED_FIELD_EMPTY_MSG);
                         break;
                     }
                     //Loop through literals if literals exist
@@ -104,12 +104,12 @@ public class BasicValidationVTwo {
 		                        if( literal != null ){
 		                            value = literal.getString();
 		                        }
-		                    }catch(Throwable th){ 
-		                        log.debug("could not convert literal to string" , th); 
+		                    }catch(Throwable th){
+		                        log.debug("could not convert literal to string" , th);
 		                    }
 		                    // Empty field: if required, include only the empty field
-		                    // error message, not a format validation message. If non-required, 
-		                    // don't do format validation, since that is both unnecessary and may 
+		                    // error message, not a format validation message. If non-required,
+		                    // don't do format validation, since that is both unnecessary and may
 		                    // incorrectly generate errors.
 		                    if (isEmpty(value)) {
 		                        if (isRequiredField) {
@@ -135,22 +135,22 @@ public class BasicValidationVTwo {
         }
         return errors;
     }
-    
-    public Map<String,String>validateFiles(Map<String, List<FileItem>> fileItemMap) {        
-        
+
+    public Map<String,String>validateFiles(Map<String, List<FileItem>> fileItemMap) {
+
         HashMap<String,String> errors = new HashMap<String,String>();
-        for(String name: editConfig.getFilesOnForm() ){            
-            List<String> validators = varsToValidations.get(name);            
+        for(String name: editConfig.getFilesOnForm() ){
+            List<String> validators = varsToValidations.get(name);
             for( String validationType : validators){
                 String validateMsg = validate(validationType, fileItemMap.get(name));
                 if( validateMsg != null ) {
                     errors.put(name, validateMsg);
-                }    
+                }
             }
-        }            
-        return errors;    
+        }
+        return errors;
     }
-    
+
     private String validate(String validationType, List<FileItem> fileItems) {
         if( "nonempty".equalsIgnoreCase(validationType)){
             if( fileItems == null || fileItems.size() == 0 ){
@@ -185,19 +185,19 @@ public class BasicValidationVTwo {
         }
         else if( validationType.indexOf("datatype:") == 0 ) {
             String datatypeURI = validationType.substring(9);
-            String errorMsg = validateAgainstDatatype( value, datatypeURI ); 
-            if ( errorMsg == null ) { 
+            String errorMsg = validateAgainstDatatype( value, datatypeURI );
+            if ( errorMsg == null ) {
                 return SUCCESS;
             } else {
                 return errorMsg;
             }
-        } else if ("httpUrl".equalsIgnoreCase(validationType)){ 
+        } else if ("httpUrl".equalsIgnoreCase(validationType)){
         	//check if it has http or https, we could do more but for now this is all.
         	if(! value.startsWith("http://") && ! value.startsWith("https://") ){
-        		return "This URL must start with http:// or https://"; 
+        		return "This URL must start with http:// or https://";
         	}else{
-        		return SUCCESS;        		
-        	}        	 
+        		return SUCCESS;
+        	}
         }
         //Date not past validation
         else if( "dateNotPast".equalsIgnoreCase(validationType)){
@@ -222,7 +222,7 @@ public class BasicValidationVTwo {
             	} else {
             		return SUCCESS;
             	}
-        	}	
+        	}
         }
         return null; //
     }
@@ -230,9 +230,9 @@ public class BasicValidationVTwo {
     private boolean isDate(String in){
          return datePattern.matcher(in).matches();
     }
-    
+
     private static DatatypeDaoJena ddao = null;
-    
+
     public static synchronized String validateAgainstDatatype( String value, String datatypeURI ) {
         if ( ( datatypeURI != null ) && ( datatypeURI.length()>0 ) ) {
             RDFDatatype datatype = TypeMapper.getInstance().getSafeTypeByName(datatypeURI);
@@ -258,10 +258,10 @@ public class BasicValidationVTwo {
         List<String> unknown = new ArrayList<String>();
         for( String key : varsToValidations.keySet()){
             if( varsToValidations.get(key) == null )
-                continue;            
+                continue;
             for( String validator : varsToValidations.get(key)){
                 if( ! basicValidations.contains( validator)) {
-                    if ( ! ( ( validator != null) &&  
+                    if ( ! ( ( validator != null) &&
                          ( validator.indexOf( "datatype:" ) == 0 ) ) ) {
                         unknown.add(validator);
                     }
@@ -273,13 +273,13 @@ public class BasicValidationVTwo {
 
         throw new Error( "Unknown basic validators: " + Arrays.toString(unknown.toArray()));
     }
-    
+
     private static boolean isEmpty(String value) {
-        return (value == null || value.trim().length() == 0); 
+        return (value == null || value.trim().length() == 0);
     }
 
-    
-    
+
+
     private static Pattern urlRX = Pattern.compile("(([a-zA-Z][0-9a-zA-Z+\\-\\.]*:)/{0,2}[0-9a-zA-Z;/?:@&=+$\\.\\-_!~*'()%]+)(#[0-9a-zA-Z;/?:@&=+$\\.\\-_!~*'()%]+)?");
 
     /** we use null to indicate success */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeIntervalValidationVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeIntervalValidationVTwo.java
index 8c596f8a4..73bd586ad 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeIntervalValidationVTwo.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeIntervalValidationVTwo.java
@@ -18,13 +18,13 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary.Precision;
 
 /*
  * Assumption for date time interval validation: Only one start field/end field/and precision.
- * We are currently not accepting multiple values for start time, end time, or precision. 
+ * We are currently not accepting multiple values for start time, end time, or precision.
  */
 
 
 public class DateTimeIntervalValidationVTwo implements N3ValidatorVTwo {
     private static Log log = LogFactory.getLog(DateTimeIntervalValidationVTwo.class);
-    
+
     private String startFieldName;
     private String endFieldName;
     private String templateName;
@@ -34,7 +34,7 @@ public class DateTimeIntervalValidationVTwo implements N3ValidatorVTwo {
 
     private String startPrecisionName;
     private String endPrecisionName;
-    
+
     public DateTimeIntervalValidationVTwo(String startFieldName, String endFieldName){
         this.startFieldName = startFieldName;
         this.endFieldName = endFieldName;
@@ -43,7 +43,7 @@ public class DateTimeIntervalValidationVTwo implements N3ValidatorVTwo {
         startPrecisionName = startFieldName + "-precision";
         endPrecisionName = endFieldName + "-precision";
     }
-    
+
     public DateTimeIntervalValidationVTwo(String startFieldName, String endFieldName, String template){
         this.templateName = template;
         this.startFieldName = startFieldName;
@@ -66,19 +66,19 @@ public class DateTimeIntervalValidationVTwo implements N3ValidatorVTwo {
 
         VitroVocabulary.Precision startPrecision = getPrecision(startPrecisionName, editConfig, editSub);
         VitroVocabulary.Precision endPrecision = getPrecision(endPrecisionName, editConfig, editSub);
-        
+
         Map<String, String> errors = new HashMap<String, String>();
 
         // NIHVIVO-2541 Commented out to allow end date with no start date
-//        if( formStartYear == null && formEndYear != null ){                               
+//        if( formStartYear == null && formEndYear != null ){
 //            errors.put(startFieldName, "If there is an end date, there should be a start date");
-//            return errors;              
+//            return errors;
 //        }
         // We need to ensure that the user has entered a start year or end year -- tlw72
         if ( templateName != null && templateName.equals("dateTimeIntervalForm.ftl")) {
-            if ( literalListIsNull(formStartYear) && literalListIsNull(formEndYear) ) {  
+            if ( literalListIsNull(formStartYear) && literalListIsNull(formEndYear) ) {
                 errors.put(startFieldName, "Date/time intervals must begin with a year. Please enter a start year, an end year or both.");
-                return errors;              
+                return errors;
             }
         }
         //Assuming form start year and form end year are working in conjunction with multiple values
@@ -90,7 +90,7 @@ public class DateTimeIntervalValidationVTwo implements N3ValidatorVTwo {
         		errors.put(startFieldName, "DateTimeIntervalValidationVTwo does not support multiple start years or end years");
         		return errors;
         	}
-        	
+
         	if(numberStartYears > 0 && numberEndYears > 0) {
         		errors.putAll(checkDateLiterals(formStartYear.get(0), formEndYear.get(0), startPrecision, endPrecision));
         	}
@@ -101,19 +101,19 @@ public class DateTimeIntervalValidationVTwo implements N3ValidatorVTwo {
         		errors.put(startFieldName, "DateTimeIntervalValidationVTwo does not support multiple start years or end years");
         		return errors;
         	}
-        	
+
         	if(numberStartYears > 0 && numberEndYears > 0) {
         		errors.putAll(checkDateLiterals(formStartYear.get(0), existingEndYear.get(0), startPrecision, endPrecision));
         	}
         } else if (!literalListIsNull(existingStartYear)  && !literalListIsNull(formEndYear)) {
-        	
+
         	int numberStartYears = existingStartYear.size();
         	int numberEndYears = formEndYear.size();
         	if(numberStartYears > 1 && numberEndYears > 1) {
         		errors.put(startFieldName, "DateTimeIntervalValidationVTwo does not support multiple start years or end years");
         		return errors;
         	}
-        	
+
         	if(numberStartYears > 0 && numberEndYears > 0) {
         		errors.putAll(checkDateLiterals(existingStartYear.get(0), formEndYear.get(0), startPrecision, endPrecision));
         	}
@@ -124,7 +124,7 @@ public class DateTimeIntervalValidationVTwo implements N3ValidatorVTwo {
         		errors.put(startFieldName, "DateTimeIntervalValidationVTwo does not support multiple start years or end years");
         		return errors;
         	}
-        	
+
         	if(numberStartYears > 0 && numberEndYears > 0) {
         		errors.putAll(checkDateLiterals(existingStartYear.get(0), existingEndYear.get(0), startPrecision, endPrecision));
         	}
@@ -138,9 +138,9 @@ public class DateTimeIntervalValidationVTwo implements N3ValidatorVTwo {
 
     private Precision getPrecision(String precisionVarName,
             EditConfigurationVTwo editConfig, MultiValueEditSubmission editSub) {
-        if( editSub != null 
-                && editSub.getUrisFromForm() != null 
-                && editSub.getUrisFromForm().containsKey(precisionVarName)){            
+        if( editSub != null
+                && editSub.getUrisFromForm() != null
+                && editSub.getUrisFromForm().containsKey(precisionVarName)){
             List<String> precisionStr = editSub.getUrisFromForm().get(precisionVarName);
             //TODO: Check if we need to handle multiple precision strings and what to do then
             //Currently checks first precision str and then returns response
@@ -154,9 +154,9 @@ public class DateTimeIntervalValidationVTwo implements N3ValidatorVTwo {
             } else {
             	log.error("No precision strings returned");
             }
-            
-        }else if( editConfig != null 
-                && editConfig.getUrisInScope() != null 
+
+        }else if( editConfig != null
+                && editConfig.getUrisInScope() != null
                 && editConfig.getUrisInScope().containsKey(precisionVarName)){
             List<String> precisionStr = editConfig.getUrisInScope().get(precisionVarName);
             //TODO: Check if we need to handle multiple precision strings and what to do then
@@ -167,36 +167,36 @@ public class DateTimeIntervalValidationVTwo implements N3ValidatorVTwo {
                 if( precision == null )
                     log.warn("cannot convert " + precisionString + " to a precision");
                 else
-                    return precision; 
+                    return precision;
             } else {
             	log.error("No precision strings returned");
             }
-                   
+
         }
         //this is what is returned if a precision was not found in the config or submission
         return null;
     }
 
     private Map<String, String> checkDateLiterals(
-            Literal startLit, Literal endLit, 
-            VitroVocabulary.Precision startPrecision, VitroVocabulary.Precision endPrecision) {                
-        Map<String, String> errors = new HashMap<String, String>();        
-        
+            Literal startLit, Literal endLit,
+            VitroVocabulary.Precision startPrecision, VitroVocabulary.Precision endPrecision) {
+        Map<String, String> errors = new HashMap<String, String>();
+
         if( endPrecision == null ){
             //there is no end date, nothing to check
             return errors;
-        }             
-        
+        }
+
         try{
              XSDDateTime startDate = (XSDDateTime)startLit.getValue();
              XSDDateTime endDate = (XSDDateTime)endLit.getValue();
              if( startDate != null && endDate!= null ){
                  Calendar startCal = startDate.asCalendar();
                  Calendar endCal = endDate.asCalendar();
-                                  
+
                  if( endCal != null ){
                      if( !startCal.before( endCal ) ){
-                         if( startPrecision == VitroVocabulary.Precision.YEAR 
+                         if( startPrecision == VitroVocabulary.Precision.YEAR
                              && endPrecision == VitroVocabulary.Precision.YEAR ){
                              errors.putAll( checkYears(startCal,endCal));
                          }else{
@@ -211,23 +211,23 @@ public class DateTimeIntervalValidationVTwo implements N3ValidatorVTwo {
             errors.put(endFieldName, "could not format start or end date");
             log.debug("could not format dates " + cce);
         }
-            
+
         return errors;
     }
 
     private Map<? extends String, ? extends String> checkYears(
             Calendar startCal, Calendar endCal) {
-        
-        Map<String, String> errors = new HashMap<String, String>();    
-     
+
+        Map<String, String> errors = new HashMap<String, String>();
+
         if( ! (endCal.get(Calendar.YEAR) >=  startCal.get(Calendar.YEAR) )){
             errors.put(startFieldName, "Start must be before end");
             errors.put(endFieldName, "End must be after start");
         }
-        
+
         return errors;
     }
-    
+
     //MEthod that checks whether list of literals is null or contains only null
     private boolean literalListIsNull(List<Literal> literalList) {
     	if(literalList == null)
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeWithPrecisionVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeWithPrecisionVTwo.java
index 8f525d2e1..034d6b2cc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeWithPrecisionVTwo.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeWithPrecisionVTwo.java
@@ -24,47 +24,47 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
 import freemarker.template.Configuration;
 
 /**
- * This is intended to work in conjunction with a template to create the HTML for a 
- * datetime with precision and to convert the submitted parameters into 
+ * This is intended to work in conjunction with a template to create the HTML for a
+ * datetime with precision and to convert the submitted parameters into
  * varname -&gt; Literal and varname -&gt; URI maps.
- * 
+ *
  * The variables that get passed to the template are defined in:
- * DateTimeWithPrecision.getMapForTemplate() 
- * 
+ * DateTimeWithPrecision.getMapForTemplate()
+ *
  * Two variables will be defined for the N3 edit graphs (These are NOT variables passed to FM templates):
  * $fieldname.precision - URI of datetime precision
- * $fieldname.value - DateTime literal  
- * 
+ * $fieldname.value - DateTime literal
+ *
  */
-public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {        
-    
+public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {
+
     /**
-     * This is the minimum datetime precision that this element 
+     * This is the minimum datetime precision that this element
      * will accept.  If the parameters submitted do not meet this
-     * requirement, then a validation error will be created.  
+     * requirement, then a validation error will be created.
      */
     VitroVocabulary.Precision minimumPrecision;
-    
+
     /**
-     * This is the maximum precision that the form should 
-     * allow the user to enter.  This value is not used by 
-     * DateTimeWithPrecision for validation, it is only passed 
-     * to the template.  This should be removed when it can be 
+     * This is the maximum precision that the form should
+     * allow the user to enter.  This value is not used by
+     * DateTimeWithPrecision for validation, it is only passed
+     * to the template.  This should be removed when it can be
      * specified in a ftl file.
-     * 
-     * This could be thought of as the maximum precision to display. 
+     *
+     * This could be thought of as the maximum precision to display.
      */
     VitroVocabulary.Precision displayRequiredLevel;
-    
+
 
     VitroVocabulary.Precision DEFAULT_MIN_PRECISION = VitroVocabulary.Precision.DAY;
     VitroVocabulary.Precision DEFAULT_DISPLAY_LEVEL = VitroVocabulary.Precision.DAY;
     VitroVocabulary.Precision[] precisions = VitroVocabulary.Precision.values();
-    
+
     protected static final String BLANK_SENTINEL = ">SUBMITTED VALUE WAS BLANK<";
-    
+
     public DateTimeWithPrecisionVTwo(FieldVTwo field) {
-        super(field);        
+        super(field);
         minimumPrecision = DEFAULT_MIN_PRECISION;
         displayRequiredLevel = DEFAULT_DISPLAY_LEVEL;
     }
@@ -74,78 +74,78 @@ public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {
         if( minimumPrecision != null )
             this.minimumPrecision = minimumPrecision;
         else
-            this.minimumPrecision = DEFAULT_MIN_PRECISION;  
+            this.minimumPrecision = DEFAULT_MIN_PRECISION;
         this.displayRequiredLevel = this.minimumPrecision;
     }
-    
-    //it would be nice to have only the version of the constructor that takes the enum 
+
+    //it would be nice to have only the version of the constructor that takes the enum
     //but this is to quickly get the JSP configuration working.
     public DateTimeWithPrecisionVTwo(FieldVTwo field, String minimumPrecisionURI, String displayRequiredLevelUri){
         this(field);
-        
-        this.minimumPrecision = toPrecision( minimumPrecisionURI);                
+
+        this.minimumPrecision = toPrecision( minimumPrecisionURI);
         if( this.minimumPrecision == null )
-            throw new IllegalArgumentException(minimumPrecisionURI 
+            throw new IllegalArgumentException(minimumPrecisionURI
                     +" is not a valid precision for minimumPrecision, see VitroVocabulary.Precision");
-                
+
         this.displayRequiredLevel = toPrecision( displayRequiredLevelUri );
         if( this.displayRequiredLevel == null )
-            throw new IllegalArgumentException(displayRequiredLevelUri 
+            throw new IllegalArgumentException(displayRequiredLevelUri
                     +" is not a valid precision for displayRequiredLevel, see VitroVocabulary.Precision");
-        
+
 //        if( this.displayRequiredLevel.ordinal() < this.minimumPrecision.ordinal() ){
-//            throw new IllegalArgumentException("the display precision level " + this.displayRequiredLevel 
+//            throw new IllegalArgumentException("the display precision level " + this.displayRequiredLevel
 //                    + " is less precise than the required minimum precision of " + this.minimumPrecision);
 //        }
     }
-    
-    private String getFieldName(){ 
-        return field.getName(); 
+
+    private String getFieldName(){
+        return field.getName();
     }
-    
+
     private static final Log log = LogFactory.getLog(DateTimeWithPrecisionVTwo.class);
     protected String TEMPLATE_NAME = "dateTimeWithPrecision.ftl";
-    
+
     @Override
     public String draw(String fieldName, EditConfigurationVTwo editConfig,
-            MultiValueEditSubmission editSub, Configuration fmConfig) {                        
-        Map map = getMapForTemplate( editConfig, editSub);    
+            MultiValueEditSubmission editSub, Configuration fmConfig) {
+        Map map = getMapForTemplate( editConfig, editSub);
         return merge( fmConfig, TEMPLATE_NAME, map);
-    }    
-    
+    }
+
     /**
-     * This produces a map for use in the template. Will be using this b/c 
+     * This produces a map for use in the template. Will be using this b/c
      */
-    public Map getMapForTemplate(EditConfigurationVTwo editConfig, MultiValueEditSubmission editSub) {              
-        Map<String,Object>map = new HashMap<String,Object>();       
+    public Map getMapForTemplate(EditConfigurationVTwo editConfig, MultiValueEditSubmission editSub) {
+        Map<String,Object>map = new HashMap<String,Object>();
 
         //always need the fieldName, required precision, and constants
         map.put("fieldName", getFieldName());
         addPrecisionConstants(map);
         map.put("minimumPrecision", minimumPrecision.uri());
         map.put("requiredLevel", displayRequiredLevel.uri());
-        
+
         //Still expecting single precision uri not multiple
         String precisionUri= getPrecision(editConfig,editSub);
-        
+
         VitroVocabulary.Precision existingPrec = toPrecision(precisionUri);
-        
+
         if( precisionUri != null && !"".equals(precisionUri) && existingPrec == null ){
             if( ! BLANK_SENTINEL.equals( precisionUri )){
                 log.debug("field " + getFieldName() + ": existing precision uri was " +
             		"'" + precisionUri + "' but could not convert to Precision object");
             }
         }
-        
+
         if( precisionUri == null || precisionUri.isEmpty() || existingPrec == null){
             map.put("existingPrecision", "");
-            
+
             /* no precision so there should also be no datetime */
             DateTime value = getTimeValue(editConfig,editSub);
             if( value != null )
-                log.debug("Unexpected state: Precision for " + getFieldName() 
+                log.debug("Unexpected state: Precision for " + getFieldName()
                         + " was '" + precisionUri + "' but date time was " + value);
-            
+
             map.put("year", "");
             map.put("month", "");
             map.put("day", "");
@@ -155,67 +155,67 @@ public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {
         } else if( VitroVocabulary.Precision.NONE.uri().equals(precisionUri) ){
             //bdc34: not sure what to do with the NONE precision
             map.put("existingPrecision", precisionUri);
-            
+
             map.put("year", "");
             map.put("month", "");
             map.put("day", "");
             map.put("hour", "");
             map.put("minute", "");
-            map.put("second", "") ;                        
-        }else{            
+            map.put("second", "") ;
+        }else{
             map.put("existingPrecision", precisionUri);
-                        
+
             DateTime value = getTimeValue(editConfig,editSub);
             /* This is the case where there is a precision so there should be a datetime */
             if( value == null ) {
             	//If there is no value, then this is an error condition
-                log.error("Field " + getFieldName() + " has precision " + precisionUri 
-                        + " but the date time value is null ");  
+                log.error("Field " + getFieldName() + " has precision " + precisionUri
+                        + " but the date time value is null ");
                 map.put("year", "");
                 map.put("month", "");
                 map.put("day", "");
                 map.put("hour", "");
                 map.put("minute", "");
                 map.put("second", "") ;
-                
+
             } else {
-            
+
 	            /* only put the values in the map for ones which are significant based on the precision */
 	            if( existingPrec.ordinal() >= VitroVocabulary.Precision.SECOND.ordinal() )
 	            		map.put("second", Integer.toString(value.getSecondOfMinute() )) ;
 	            else
 	                map.put("second", "");
-	            
+
 	            if( existingPrec.ordinal() >= VitroVocabulary.Precision.MINUTE.ordinal()  )
-	                map.put("minute", Integer.toString(value.getMinuteOfHour()) );    
+	                map.put("minute", Integer.toString(value.getMinuteOfHour()) );
 	            else
 	                map.put("minute", "");
-	            
+
 	            if( existingPrec.ordinal() >= VitroVocabulary.Precision.HOUR.ordinal() )
 	                map.put("hour", Integer.toString(value.getHourOfDay()) );
 	            else
 	                map.put("hour", "");
-	            
+
 	            if( existingPrec.ordinal() >= VitroVocabulary.Precision.DAY.ordinal()  )
-	                map.put("day", Integer.toString(value.getDayOfMonth()) );                    
+	                map.put("day", Integer.toString(value.getDayOfMonth()) );
 	            else
 	                map.put("day", "");
-	            
+
 	            if( existingPrec.ordinal() >= VitroVocabulary.Precision.MONTH.ordinal() )
-	                map.put("month", Integer.toString(value.getMonthOfYear()));                            
+	                map.put("month", Integer.toString(value.getMonthOfYear()));
 	            else
 	                map.put("month", "");
-	            
+
 	            if( existingPrec.ordinal() >= VitroVocabulary.Precision.YEAR.ordinal() )
-	                map.put("year", Integer.toString(value.getYear()));                  
+	                map.put("year", Integer.toString(value.getYear()));
 	            else
 	                map.put("year", "");
 	            }
-        }               
-        
+        }
+
         return map;
     }
-   
+
     /** Adds precisionURIs for use by the templates */
     private void addPrecisionConstants(Map<String,Object> map){
         Map<String,Object> constants = new HashMap<String,Object>();
@@ -224,29 +224,29 @@ public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {
         }
         map.put("precisionConstants", constants);
     }
-    
+
     /**
      * Gets the currently set precision.  May return null.
      */
     private String getPrecision(EditConfigurationVTwo editConfig, MultiValueEditSubmission editSub) {
         if( editSub != null ){
             List<String> submittedPrecisionURI = editSub.getUrisFromForm().get( getPrecisionVariableName() );
-            if( submittedPrecisionURI != null 
+            if( submittedPrecisionURI != null
             		&& submittedPrecisionURI.size() > 0
             		&& submittedPrecisionURI.get(0) != null){
                 return submittedPrecisionURI.get(0);
             }
         }
-        
+
         List<String> existingPrecisionURI = editConfig.getUrisInScope().get( getPrecisionVariableName() );
-        if( existingPrecisionURI != null 
+        if( existingPrecisionURI != null
         		&& existingPrecisionURI.size() > 0
         		&& existingPrecisionURI.get(0) != null){
         	//TODO: Check if relevant to return more than one element
             return existingPrecisionURI.get(0);
         }else{
             return null;
-        }         
+        }
     }
 
     private DateTime getTimeValue(EditConfigurationVTwo editConfig, MultiValueEditSubmission editSub) {
@@ -258,8 +258,8 @@ public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {
             		return new DateTime( submittedValue.get(0).getLexicalForm() );
             	}
             }
-        }        
-        
+        }
+
         List<Literal> dtValue = editConfig.getLiteralsInScope().get( getValueVariableName() );
         if( dtValue != null ){
         	if(dtValue.size() > 0 && dtValue.get(0) != null)
@@ -267,27 +267,27 @@ public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {
         		return new DateTime( dtValue.get(0).getLexicalForm() );
         	}
         }
-        
+
         return null;
     }
 
     /**
-     * This gets the literals for a submitted form from the queryParmeters. 
+     * This gets the literals for a submitted form from the queryParmeters.
      * It will only be called if getValidationErrors() doesn't return any errors.
      */
     @Override
     public Map<String, List<Literal>> getLiterals(String fieldName,
-            EditConfigurationVTwo editConfig, Map<String, String[]> queryParameters) {         
+            EditConfigurationVTwo editConfig, Map<String, String[]> queryParameters) {
         Map<String,List<Literal>> literalMap = new HashMap<String,List<Literal>>();
-       
+
         Literal datetime =getDateTime( queryParameters);
         List<Literal> literals = new ArrayList<Literal>();
         literals.add(datetime);
         literalMap.put(fieldName+"-value", literals);
-        
+
         return literalMap;
     }
-    
+
     protected Literal getDateTime(  Map<String, String[]> queryParameters ) {
         String submittedPrec = BLANK_SENTINEL;
         try {
@@ -295,19 +295,19 @@ public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {
         } catch (Exception e) {
             log.error("could not get submitted precsion",e);
         }
-        
+
         if( BLANK_SENTINEL.equals( submittedPrec ) )
             return null;
-        
+
         Integer year = parseToInt(getFieldName()+"-year", queryParameters);
-        
-        //this is the case where date has not been filled out at all.        
-        if( year == null ) 
+
+        //this is the case where date has not been filled out at all.
+        if( year == null )
             return null;
-        
+
         Integer month = parseToInt(getFieldName()+"-month", queryParameters);
-        if( month == null || month == 0 ) 
-            month = 1;        
+        if( month == null || month == 0 )
+            month = 1;
         Integer day = parseToInt(getFieldName()+"-day", queryParameters);
         if( day == null || day == 0 )
             day = 1;
@@ -319,48 +319,48 @@ public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {
             minute = 0;
         Integer second = parseToInt(getFieldName()+"-second", queryParameters);
         if( second == null )
-            second = 0;                
-        
+            second = 0;
+
         DateTime value = new DateTime(
                 year.intValue(),month.intValue(),day.intValue(),
                 hour.intValue(),minute.intValue(),second.intValue(),0/*millis*/
         );
-                
+
         return ResourceFactory.createTypedLiteral(
                 ISODateTimeFormat.dateHourMinuteSecond().print(value), /*does not include timezone*/
                 XSDDatatype.XSDdateTime);
     }
 
     /**
-     * This gets the URIs for a submitted form from the queryParmeters. 
+     * This gets the URIs for a submitted form from the queryParmeters.
      * It will only be called if getValidationErrors() doesn't return any errors.
      */
     @Override
     public Map<String, List<String>> getURIs(String fieldName,
-            EditConfigurationVTwo editConfig, Map<String, String[]> queryParameters) {                                
+            EditConfigurationVTwo editConfig, Map<String, String[]> queryParameters) {
         String precisionUri;
         try {
             precisionUri = getSubmittedPrecision( queryParameters);
         } catch (Exception e) {
             log.error("getURIs() should only be called on input that passed getValidationErrors()");
-            return Collections.emptyMap();        
+            return Collections.emptyMap();
         }
         Map<String,List<String>> uriMap = new HashMap<String,List<String>>();
         if( precisionUri != null ){
         	List<String> uris = new ArrayList<String>();
         	uris.add(precisionUri);
-            uriMap.put(fieldName+"-precision", uris);  
+            uriMap.put(fieldName+"-precision", uris);
         }
         return uriMap;
     }
-    
+
     /**
      * Precision is based on the values returned by the form. Throws an exception with
      * the error message if the queryParameters cannot make a valid date/precision because
      * there are values missing.
      */
     protected String getSubmittedPrecision(Map<String, String[]> queryParameters) throws Exception {
-        
+
         Integer year = parseToInt(getFieldName()+"-year",queryParameters);
         Integer month = parseToInt(getFieldName()+"-month",queryParameters);
         Integer day = parseToInt(getFieldName()+"-day",queryParameters);
@@ -368,28 +368,28 @@ public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {
         Integer minute = parseToInt(getFieldName()+"-minute",queryParameters);
         Integer second = parseToInt(getFieldName()+"-second",queryParameters);
         Integer[] values = { year, month, day, hour, minute, second };
-        
+
         /*  find the most significant date field that is null. */
-        int indexOfFirstNull= -1;        
+        int indexOfFirstNull= -1;
         for(int i=0; i < values.length ; i++){
             if( values[i] == null ){
                 indexOfFirstNull = i;
                 break;
-            }            
+            }
         }
-        
+
         /* the field wasn't filled out at all */
         if( indexOfFirstNull == 0 )
             //return VitroVocabulary.Precision.NONE.uri();
             return BLANK_SENTINEL;
-        
+
         /* if they all had values then we have seconds precision */
         if( indexOfFirstNull == -1 )
             return VitroVocabulary.Precision.SECOND.uri();
-       
-        
-        /* check that there are no values after the most significant null field 
-         * that are non-null. */         
+
+
+        /* check that there are no values after the most significant null field
+         * that are non-null. */
         boolean nonNullAfterFirstNull=false;
         for(int i=0; i < values.length ; i++){
             if( i > indexOfFirstNull && values[i] != null ){
@@ -399,34 +399,34 @@ public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {
         }
         if( nonNullAfterFirstNull )
             throw new Exception("Invalid date-time value. When creating a date-time value, there cannot be gaps between any of the selected fields.");
-        else{            
-            return precisions[ indexOfFirstNull ].uri(); 
+        else{
+            return precisions[ indexOfFirstNull ].uri();
         }
     }
-    
+
     @Override
     public Map<String, String> getValidationMessages(String fieldName,
             EditConfigurationVTwo editConfig, Map<String, String[]> queryParameters) {
-        Map<String,String> errorMsgMap = new HashMap<String,String>();                               
-                
+        Map<String,String> errorMsgMap = new HashMap<String,String>();
+
         //check that any parameters we got are single values
         String[] names = {"year","month","day","hour","minute","second", "precision"};
-        for( String name:names){            
+        for( String name:names){
             if ( !hasNoneOrSingle(fieldName+"-"+name, queryParameters))
-                errorMsgMap.put(fieldName+"-"+name, "must have only one value for " + name);            
+                errorMsgMap.put(fieldName+"-"+name, "must have only one value for " + name);
         }
-        
+
         String precisionURI = null;
         try{
             precisionURI = getSubmittedPrecision( queryParameters);
-        }catch(Exception ex){            
+        }catch(Exception ex){
             errorMsgMap.put(fieldName,ex.getMessage());
             return errorMsgMap;
         }
-        
+
         errorMsgMap.putAll(checkDate( precisionURI,  queryParameters) );
-        
-        return errorMsgMap; 
+
+        return errorMsgMap;
     }
 
     /**
@@ -438,19 +438,19 @@ public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {
     final static String NON_INTEGER_HOUR = "must enter a valid hour";
     final static String NON_INTEGER_MINUTE = "must enter a valid minute";
     final static String NON_INTEGER_SECOND = "must enter a valid second";
-    
+
     private Map<String,String> checkDate( String precisionURI, Map<String, String[]> qp){
         if( precisionURI == null )
             return Collections.emptyMap();
-        
+
         Map<String,String> errors = new HashMap<String,String>();
-        
+
         Integer year,month,day,hour,minute,second;
-                
+
         //just check if the values for the precision parse to integers
         if( precisionURI.equals(VitroVocabulary.Precision.YEAR.uri() ) ){
             if( ! canParseToNumber(getFieldName()+"-year" ,qp))
-                errors.put(getFieldName()+"-year", NON_INTEGER_YEAR);            
+                errors.put(getFieldName()+"-year", NON_INTEGER_YEAR);
         }else if( precisionURI.equals( VitroVocabulary.Precision.MONTH.uri() )){
             if( ! canParseToNumber(getFieldName()+"-year" ,qp))
                 errors.put(getFieldName()+"-year", NON_INTEGER_YEAR);
@@ -497,10 +497,10 @@ public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {
             if( ! canParseToNumber(getFieldName()+"-second" ,qp))
                 errors.put(getFieldName()+"-second", NON_INTEGER_SECOND);
         }
-                       
+
         //check if we can make a valid date with these integers
         year = parseToInt(getFieldName()+"-year", qp);
-        if( year == null ) 
+        if( year == null )
             year = 1999;
         month= parseToInt(getFieldName()+"-month", qp);
         if(month == null )
@@ -516,16 +516,16 @@ public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {
             minute = 0;
         second = parseToInt(getFieldName()+"-second", qp);
         if( second == null )
-            second = 0;                
-                
-        //initialize to something so that we can be assured not to get 
+            second = 0;
+
+        //initialize to something so that we can be assured not to get
         //system date dependent behavior
         DateTime dateTime = new DateTime("1970-01-01T00:00:00Z");
-        
+
         try{
             dateTime = dateTime.withYear(year);
         }catch(IllegalArgumentException iae){
-           errors.put(getFieldName()+"-year", iae.getLocalizedMessage());   
+           errors.put(getFieldName()+"-year", iae.getLocalizedMessage());
         }
         try{
             dateTime = dateTime.withMonthOfYear(month);
@@ -545,13 +545,13 @@ public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {
         try{
             dateTime = dateTime.withSecondOfMinute(second);
         }catch(IllegalArgumentException iae){
-            errors.put(getFieldName()+"-second", iae.getLocalizedMessage());    
-        }       
+            errors.put(getFieldName()+"-second", iae.getLocalizedMessage());
+        }
 
         return errors;
-    }       
-    
-    
+    }
+
+
     private boolean fieldMatchesPattern( String fieldName, Map<String,String[]>queryParameters, Pattern pattern){
         String[] varg = queryParameters.get(fieldName);
         if( varg == null || varg.length != 1 || varg[0] == null)
@@ -560,12 +560,12 @@ public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {
         Matcher match = pattern.matcher(value);
         return match.matches();
     }
-    
+
     private boolean emptyOrBlank(String key,Map<String, String[]> queryParameters){
         String[] vt = queryParameters.get(key);
         return ( vt == null || vt.length ==0 || vt[0] == null || vt[0].length() == 0 );
     }
-    
+
     private boolean canParseToNumber(String key,Map<String, String[]> queryParameters){
         Integer out = null;
         try{
@@ -575,16 +575,16 @@ public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {
             else{
                 out = Integer.parseInt(vt[0]);
                 return true;
-            }            
+            }
         }catch(IndexOutOfBoundsException | NullPointerException | NumberFormatException iex){
             out =  null;
         }
         return false;
     }
-    
-    
-  
-    private Integer parseToInt(String key,Map<String, String[]> queryParameters){        
+
+
+
+    private Integer parseToInt(String key,Map<String, String[]> queryParameters){
         Integer out = null;
         try{
             String[] vt = queryParameters.get(key);
@@ -606,16 +606,16 @@ public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {
             VitroVocabulary.Precision requiredMinimumPrecision) {
         this.minimumPrecision = requiredMinimumPrecision;
     }
-    
+
     /* returns null if it cannot convert */
-    public static VitroVocabulary.Precision toPrecision(String precisionUri){              
+    public static VitroVocabulary.Precision toPrecision(String precisionUri){
         for( VitroVocabulary.Precision precision : VitroVocabulary.Precision.values()){
             if( precision.uri().equals(precisionUri))
                 return precision;
         }
-        return null;                
+        return null;
     }
-    
+
     public String getValueVariableName(){ return getFieldName() + "-value" ; }
     public String getPrecisionVariableName(){ return getFieldName() + "-precision" ; }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java
index dec801149..e72e172c1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java
@@ -34,33 +34,33 @@ public class EditConfigurationUtils {
 	private static Log log = LogFactory.getLog(EditConfigurationUtils.class);
 
     protected static final String MULTI_VALUED_EDIT_SUBMISSION = "MultiValueEditSubmission";
-    
+
     /* *************** Static utility methods used in edit configuration and in generators *********** */
     public static String getSubjectUri(VitroRequest vreq) {
     	return vreq.getParameter("subjectUri");
     }
-    
+
     public static String getPredicateUri(VitroRequest vreq) {
     	return vreq.getParameter("predicateUri");
     }
-    
+
     /*
     public static String getData(VitroRequest vreq) {
     	return vreq.getParameter("subjectUri");
     }*/
-    
+
     public static String getObjectUri(VitroRequest vreq) {
     	return vreq.getParameter("objectUri");
     }
-    
+
     public static String getDomainUri(VitroRequest vreq) {
         return vreq.getParameter("domainUri");
     }
-    
+
     public static String getRangeUri(VitroRequest vreq) {
         return vreq.getParameter("rangeUri");
     }
-    
+
     public static VClass getRangeVClass(VitroRequest vreq) {
         // This needs a WebappDaoFactory with no filtering/RDFService
         // funny business because it needs to be able to retrieve anonymous union
@@ -70,22 +70,22 @@ public class EditConfigurationUtils {
                 vreq.getSession().getServletContext()).getWebappDaoFactory();
         return ctxDaoFact.getVClassDao().getVClassByURI(getRangeUri(vreq));
     }
-    
+
     //get individual
-    
+
     public static Individual getSubjectIndividual(VitroRequest vreq) {
     	Individual subject = null;
     	String subjectUri = getSubjectUri(vreq);
     	subject = getIndividual(vreq, subjectUri);
-    	
+
     	 if( subject!= null ){
-	         vreq.setAttribute("subject", subject);    
+	         vreq.setAttribute("subject", subject);
 	 	 }
     	return subject;
     }
-    
+
     public static Individual getIndividual(VitroRequest vreq, String uri) {
-    	Individual individual = null; 
+    	Individual individual = null;
     	WebappDaoFactory wdf = vreq.getWebappDaoFactory();
 
     	 if( uri != null ){
@@ -93,41 +93,41 @@ public class EditConfigurationUtils {
     	 }
     	return individual;
     }
-    
+
     public static Individual getObjectIndividual(VitroRequest vreq) {
     	String objectUri = getObjectUri(vreq);
     	Individual object = getIndividual(vreq, objectUri);
         if( object != null ) {
-             vreq.setAttribute("subject", object);    
+             vreq.setAttribute("subject", object);
  	    }
     	return object;
     }
-   
-    
+
+
     public static ObjectProperty getObjectProperty(VitroRequest vreq) {
     	return getObjectPropertyForPredicate(vreq, getPredicateUri(vreq));
     }
-    
+
     public static DataProperty getDataProperty(VitroRequest vreq) {
     	String predicateUri = getPredicateUri(vreq);
     	return getDataPropertyForPredicate(vreq, predicateUri);
     }
-    
-    public static ObjectProperty getObjectPropertyForPredicate(VitroRequest vreq, 
+
+    public static ObjectProperty getObjectPropertyForPredicate(VitroRequest vreq,
             String predicateUri) {
         String domainUri = getDomainUri(vreq);
         String rangeUri = getRangeUri(vreq);
         return getObjectPropertyForPredicate(vreq, predicateUri, domainUri, rangeUri);
     }
-    
-    public static ObjectProperty getObjectPropertyForPredicate(VitroRequest vreq, 
+
+    public static ObjectProperty getObjectPropertyForPredicate(VitroRequest vreq,
             String predicateUri, String domainUri, String rangeUri) {
     	WebappDaoFactory wdf = vreq.getWebappDaoFactory();
     	ObjectProperty objectProp = wdf.getObjectPropertyDao().getObjectPropertyByURIs(
     	        predicateUri, domainUri, rangeUri);
     	return objectProp;
     }
-    
+
     public static DataProperty getDataPropertyForPredicate(VitroRequest vreq, String predicateUri) {
     	WebappDaoFactory wdf = vreq.getWebappDaoFactory();
     	//TODO: Check reason for employing unfiltered webapp dao factory and note if using a different version
@@ -143,7 +143,7 @@ public class EditConfigurationUtils {
     	     return wdf.getDataPropertyDao().getDataPropertyByURI(predicateUri);
     	 }
     }
-    
+
     //get url without context - used for edit configuration object
     public static String getFormUrlWithoutContext(VitroRequest vreq) {
     	return getEditUrlWithoutContext(vreq) + "?" + vreq.getQueryString();
@@ -151,30 +151,30 @@ public class EditConfigurationUtils {
     public static String getFormUrl(VitroRequest vreq) {
     	return getEditUrl(vreq) + "?" + vreq.getQueryString();
     }
-    
+
     public static String getEditUrl(VitroRequest vreq) {
     	return vreq.getContextPath() + getEditUrlWithoutContext(vreq);
     }
-    
+
     public static String getEditUrlWithoutContext(VitroRequest vreq) {
     	return "/editRequestDispatch";
     }
-    
+
     public static String getCancelUrlBase(VitroRequest vreq) {
     	 return vreq.getContextPath() + "/postEditCleanupController";
     }
-    
-    
+
+
     public static String getEditKey(VitroRequest vreq) {
-    	HttpSession session = vreq.getSession();        
-        String editKey = 
-            (EditConfigurationVTwo.getEditKeyFromRequest(vreq) == null) 
+    	HttpSession session = vreq.getSession();
+        String editKey =
+            (EditConfigurationVTwo.getEditKeyFromRequest(vreq) == null)
                 ? EditConfigurationVTwo.newEditKey(session)
                 : EditConfigurationVTwo.getEditKeyFromRequest(vreq);
         return editKey;
-    	
+
     }
-    
+
   //is data property or vitro label
     public static boolean isDataProperty(String predicateUri, VitroRequest vreq) {
     	if(predicateUri == null) {
@@ -187,11 +187,11 @@ public class EditConfigurationUtils {
     	DataProperty dataProp = vreq.getWebappDaoFactory().getDataPropertyDao().getDataPropertyByURI(predicateUri);
     	return (dataProp != null);
     }
-    
+
     protected static String getDataPropKey(VitroRequest vreq) {
-        return vreq.getParameter("datapropKey");        
+        return vreq.getParameter("datapropKey");
     }
-    
+
     //is object property
     public static boolean isObjectProperty(String predicateUri, VitroRequest vreq) {
     	if(predicateUri == null) {
@@ -204,23 +204,23 @@ public class EditConfigurationUtils {
     	log.debug("For " + predicateUri + ", object property from dao null? " + (op == null) + " and data property  null?" + (dp == null));
     	return (op != null && dp == null);
     }
-    
+
 	private static boolean isVitroLabel(String predicateUri) {
 		return predicateUri.equals(VitroVocabulary.LABEL);
 	}
-	
+
 	/**
-	 * May return null if data property statement cannot be found. 
+	 * May return null if data property statement cannot be found.
 	 */
     public static DataPropertyStatement getDataPropertyStatement(VitroRequest vreq, HttpSession session, Integer dataHash, String predicateUri) {
     	DataPropertyStatement dps = null;
    	    if( dataHash != 0) {
    			OntModel model = ModelAccess.on(session.getServletContext()).getOntModel();
-   	        dps = RdfLiteralHash.getPropertyStmtByHash(EditConfigurationUtils.getSubjectUri(vreq), predicateUri, dataHash, model);   	        
+   	        dps = RdfLiteralHash.getPropertyStmtByHash(EditConfigurationUtils.getSubjectUri(vreq), predicateUri, dataHash, model);
    	    }
    	    return dps;
     }
-    
+
     //TODO: Include get object property statement
     public static Integer getDataHash(VitroRequest vreq) {
     	Integer dataHash = null;
@@ -235,9 +235,9 @@ public class EditConfigurationUtils {
 	    }
 		return dataHash;
     }
-    
+
     //
-    
+
     //Copied from the original input element formatting tag
     //Allows the retrieval of the string values for the literals
     //Useful for cases with date/time and other mechanisms
@@ -245,7 +245,7 @@ public class EditConfigurationUtils {
     	Map<String, List<String>> literalsInScopeStringValues = transformLiteralMap(editConfig.getLiteralsInScope());
     	return literalsInScopeStringValues;
     }
-    
+
     private static List<String> transformLiteralListToStringList(List<Literal> literalValues){
     	List<String> stringValues = new ArrayList<String>();
     	if(literalValues != null) {
@@ -253,7 +253,7 @@ public class EditConfigurationUtils {
 	    		//Could do additional processing here if required, for example if date etc. if need be
 	    		if(l != null) {
 	    			stringValues.add(l.getValue().toString());
-	    		} 
+	    		}
 	    		//else {
 	    			//TODO: //Do we keep null as a value for this key?
 	    			//stringValues.add(null);
@@ -262,10 +262,10 @@ public class EditConfigurationUtils {
 		}
     	return stringValues;
     }
-    
+
     public static Map<String, List<String>> transformLiteralMap(Map<String, List<Literal>> map) {
     	Map<String, List<String>> literalMapStringValues = new HashMap<String, List<String>>();
-    	
+
     	for(String key: map.keySet() ) {
     		List<String> stringValues = transformLiteralListToStringList(map.get(key));
     		literalMapStringValues.put(key, stringValues);
@@ -276,8 +276,8 @@ public class EditConfigurationUtils {
 	public static Map<String, List<String>> getExistingUriValues(EditConfigurationVTwo editConfig) {
     	return editConfig.getUrisInScope();
     }
-	
-	//Generate HTML for a specific field name given 
+
+	//Generate HTML for a specific field name given
 	public static String generateHTMLForElement(VitroRequest vreq, String fieldName, EditConfigurationVTwo editConfig) {
 		String html = "";
         Configuration fmConfig = FreemarkerConfiguration.getConfig(vreq);
@@ -286,7 +286,7 @@ public class EditConfigurationUtils {
         MultiValueEditSubmission editSub = EditSubmissionUtils.getEditSubmissionFromSession(vreq.getSession(), editConfig);
         //Should we create one if one doesn't exist?
         //TODO: Check if one needs to be created if it doesn't exist?
-        //MultiValueEditSubmission editSub =  new MultiValueEditSubmission(vreq.getParameterMap(), editConfig);  
+        //MultiValueEditSubmission editSub =  new MultiValueEditSubmission(vreq.getParameterMap(), editConfig);
         if( field != null && field.getEditElement() != null ){
     	  html = field.getEditElement().draw(fieldName, editConfig, editSub, fmConfig);
         }
@@ -298,12 +298,12 @@ public class EditConfigurationUtils {
         List<String> copyList = new ArrayList<String>();
         copyList.addAll(list);
         return copyList;
-   }        
-    
+   }
+
     public static Map<String,String> copyMap(Map<String,String> source) {
         HashMap<String, String> map = new HashMap<String, String>();
         Set<String> keys = map.keySet();
-        for(String key: keys) {            
+        for(String key: keys) {
             if( source.get(key) != null )
                 map.put(key, source.get(key));
             else
@@ -311,7 +311,7 @@ public class EditConfigurationUtils {
         }
         return map;
     }
-    
+
     public static Map<String, List<String>> copyListMap(Map<String, List<String>> source) {
         HashMap<String, List<String>> map = new HashMap<String, List<String>>();
         Set<String> keys = map.keySet();
@@ -320,12 +320,12 @@ public class EditConfigurationUtils {
             map.put(key, copy(vals));
         }
         return map;
-    }    
+    }
 
     public static EditConfigurationVTwo getEditConfiguration(HttpServletRequest request) {
         HttpSession session = request.getSession();
-        EditConfigurationVTwo editConfiguration = EditConfigurationVTwo.getConfigFromSession(session, request);     
+        EditConfigurationVTwo editConfiguration = EditConfigurationVTwo.getConfigFromSession(session, request);
         return editConfiguration;
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java
index 069294bee..7da05cb27 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java
@@ -49,7 +49,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocesso
  * in preparation for N3. They may also be appended with a datatype or lang.
  */
 public class EditConfigurationVTwo {
-    
+
 	//Strings representing required n3 for RDF
     List<String> n3Required = new ArrayList<String>();
     //String representing optional N3 for RDF
@@ -60,25 +60,25 @@ public class EditConfigurationVTwo {
     List<String> literalsOnForm = new ArrayList<String>();
     //Names of variables corresponding to Files on form
     List<String> filesOnForm = new ArrayList<String>();
-    
+
     //Multi values now supported for uris and literals, so second parameter needs to be List<String>
     //Mapping of variable name for object to values for object, i.e. URIs, e.g. "hasElement" = "<a.com>, <b.com>"
     Map<String,List<String>> urisInScope = new HashMap<String,List<String>>();
     //Mapping from variable name to values for literals
     Map<String, List<Literal>> literalsInScope = new HashMap<String,List<Literal>>();
-    
+
     //Map name of variable to sparql query which should return a one-column result set of URIs corresponding to variable
     //E.g. sparql for inverse of object property
     Map<String,String> sparqlForAdditionalUrisInScope = new HashMap<String,String>();
-    //Mapping variable to sparql query returning literals 
+    //Mapping variable to sparql query returning literals
     Map<String,String> sparqlForAdditionalLiteralsInScope = new HashMap<String,String>();
-    
+
     //Variable names to URI prefixes for variables that are allowed to have new instances created
     Map<String,String> newResources = new HashMap<String,String>();
-    
+
     //Variable names to fields, Field = additional configuration for variable
     Map<String,FieldVTwo> fields = new HashMap<String,FieldVTwo>();
-    
+
     //Mapping variable name to Sparql query to find existing literals corresponding to variable, result set should be one-column multi-row of literals
     Map<String,String>sparqlForExistingLiterals = new HashMap<String,String>();
     //Mapping variable name to Sparql query to find existing URIs corresponding to variable, result set should be one-column multi-row of URIs/URI resources
@@ -96,83 +96,83 @@ public class EditConfigurationVTwo {
      * object is the URI, it has no quoting or &lt; or &gt;.
      */
     String object;
-    
+
     /**
      * This can be the variable name for the object of a statement in
      * a object property or data property form.
      */
-    String varNameForObject;   
+    String varNameForObject;
 
     Integer datapropKey=null;
-    
+
     /** urlPatternToReturnTo is the URL to use as the servlet to return to.
      * Usually it is "/individual" and entityToReturnTo will be added as a
      * "uri" parameter.   */
     String urlPatternToReturnTo = INDIVIDUAL_CONTROLLER ;
-    
+
     /** If this is non-null it should be the URI of an Individual to return to after
-     * the edit. */     
+     * the edit. */
     String entityToReturnTo;
-    
+
     /**
-     * If this value is not null, it will force the edit to return to the specified 
-     * URL from the PostEditCleanupController after an edit or a cancel.  This string does 
-     * NOT get values substituted in and it does NOT get the context appended. 
+     * If this value is not null, it will force the edit to return to the specified
+     * URL from the PostEditCleanupController after an edit or a cancel.  This string does
+     * NOT get values substituted in and it does NOT get the context appended.
      */
     String urlToReturnTo = null;
-    
+
     /**
-     * formUrl saves the URL that was used to request the form so that it can be 
+     * formUrl saves the URL that was used to request the form so that it can be
      * reissued if a form validation fails and the client can be redirected back
      * to the original form. */
     String formUrl;
-    
+
     /**
      * skipToUrl is a URL that should be forwarded to instead of displaying
      * a form.  This will need the context if it is relative.  It may be a
      * full off site URL.
      */
     String skipToUrl;
-    
+
     String editKey;
 
     List<N3ValidatorVTwo> validators;
 
-	EditN3GeneratorVTwo n3generator;   
+	EditN3GeneratorVTwo n3generator;
 
     private List<ModelChangePreprocessor> modelChangePreprocessors =new LinkedList<ModelChangePreprocessor>();
-    
+
     private List<EditSubmissionVTwoPreprocessor> editSubmissionPreprocessors;
-    
+
     private ProhibitedFromSearch prohibitedFromSearch;
 
     //TODO: can we rename this to match the name "pageData" that is used on the templates for this?
     //How about we change pageData to something else since page is in the name of just about everything related
     //to templates.
     private HashMap<String, Object> formSpecificData;
-    
+
     /** Name of freemarker template to generate form. */
     String template;
-    
+
     /** URL to submit form to. */
     String submitToUrl;
-    
-    /** 
+
+    /**
      * If true, then any dependent resources that are unlinked should be
-     * removed using DependentResourceDelete. 
+     * removed using DependentResourceDelete.
      *Setting to false for now as we should no longer be utilizing dependent resource deletion.
      */
-    private boolean useDependentResourceDelete = false;   
+    private boolean useDependentResourceDelete = false;
 
     /** Model id from write model. */
     private String writeModelId;
-    
-    /** Model id for the abox. */    
+
+    /** Model id for the abox. */
     private String aboxModelId;
-    
+
     /** Model id for the tbox. */
     private String tboxModelId;
-    
+
 	/** Model to write changes of a completed edit to. Usually this is null
      * and the edit will be written to the main graph of the system.     */
     private ModelSelector writeModelSelector;
@@ -180,22 +180,22 @@ public class EditConfigurationVTwo {
     /** Model to query for existing and things like that. Usually this is null
      * and the main Model of the system will be used as the default.     */
     private ModelSelector queryModelSelector;
-    
+
     /** Model to check when making new URIs to check that there is not already
      * a resource with a given URI. */
     private ModelSelector resourceModelSelector;
-    
-    /** WebappDaoFactory to build option, check box, and radio button lists. 
+
+    /** WebappDaoFactory to build option, check box, and radio button lists.
      * Usually this is set to null and the main model will be used. */
     private WDFSelector wdfSelectorForOptons;
-    
+
     private boolean hasBeenPreparedForUpdate;
-    
-    public EditConfigurationVTwo(){ 
+
+    public EditConfigurationVTwo(){
         writeModelSelector = StandardModelSelector.selector;
-        queryModelSelector = StandardModelSelector.selector;   
+        queryModelSelector = StandardModelSelector.selector;
         resourceModelSelector = StandardModelSelector.selector;
-        wdfSelectorForOptons = StandardWDFSelector.selector;        
+        wdfSelectorForOptons = StandardWDFSelector.selector;
         n3generator = new EditN3GeneratorVTwo();
     }
 
@@ -223,9 +223,9 @@ public class EditConfigurationVTwo {
     	editConfig.setVarNameForObject(this.getVarNameForObject());
 
     	editConfig.setDatapropKey(this.getDatapropKey());
-    	    	
+
     	editConfig.setUrlPatternToReturnTo(this.getUrlPatternToReturnTo());
-   
+
     	//n3 required
     	editConfig.setN3Required(EditConfigurationUtils.copy(this.getN3Required()));
     	//n3 optional
@@ -236,63 +236,63 @@ public class EditConfigurationVTwo {
     	editConfig.setLiteralsOnForm(EditConfigurationUtils.copy(this.getLiteralsOnForm()));
     	//files on form
     	editConfig.setFilesOnForm(EditConfigurationUtils.copy(this.getFilesOnForm()));
-    	//new resources    	
+    	//new resources
     	editConfig.setNewResources(EditConfigurationUtils.copyMap(this.getNewResources()));
     	//uris in scope
     	editConfig.setUrisInScope(EditConfigurationUtils.copyListMap(this.getUrisInScope()));
 
     	//TODO: ensure this is not a shallow copy of literals but makes entirely new literal objects
-    	editConfig.setLiteralsInScope(this.getLiteralsInScope());    	
+    	editConfig.setLiteralsInScope(this.getLiteralsInScope());
     	//editConfig.setLiteralsInScope(EditConfigurationUtils.copy(this.getLiteralsInScope()));
-    	
+
     	//sparql for additional uris in scope
     	editConfig.setSparqlForAdditionalUrisInScope(
-    			EditConfigurationUtils.copyMap(this.getSparqlForAdditionalUrisInScope()));     					
+    			EditConfigurationUtils.copyMap(this.getSparqlForAdditionalUrisInScope()));
     	//sparql for additional literals in scope
     	editConfig.setSparqlForAdditionalLiteralsInScope(
-    			EditConfigurationUtils.copyMap(this.getSparqlForAdditionalLiteralsInScope()));     					
+    			EditConfigurationUtils.copyMap(this.getSparqlForAdditionalLiteralsInScope()));
     	//sparql for existing literals
     	editConfig.setSparqlForExistingLiterals(
-    			EditConfigurationUtils.copyMap(this.getSparqlForExistingLiterals()));     					
+    			EditConfigurationUtils.copyMap(this.getSparqlForExistingLiterals()));
     	//sparql for existing uris
     	editConfig.setSparqlForExistingUris(
-    			EditConfigurationUtils.copyMap(this.getSparqlForExistingUris()));     					
-    	
+    			EditConfigurationUtils.copyMap(this.getSparqlForExistingUris()));
+
     	//TODO: Ensure this is true copy of field and not just shallow copy with same references
     	Map<String, FieldVTwo> fields = this.getFields();
     	editConfig.setFields(fields);
-    	
+
     	return editConfig;
-    }     	   
-    
-    
+    }
+
+
     /**
-     * Add symbols for things like currentTime and editingUser to 
+     * Add symbols for things like currentTime and editingUser to
      * editConfig.urisInScope and editConfig.literalsInScope.
      */
     public void addSystemValues( Model model, HttpServletRequest request, ServletContext context){
         if( model == null ) throw new Error("EditConfiguration.addSystemValues() needs a Model");
-        if( request == null ) throw new Error("EditConfiguration.addSystemValues() needs a request");        
-     
+        if( request == null ) throw new Error("EditConfiguration.addSystemValues() needs a request");
+
         /* current time */
-        if( getSparqlForAdditionalLiteralsInScope() != null && 
+        if( getSparqlForAdditionalLiteralsInScope() != null &&
             getSparqlForAdditionalLiteralsInScope().containsKey("currentTime") &&
             USE_SYSTEM_VALUE.equals(getSparqlForAdditionalLiteralsInScope().get("currentTime"))){
         	//Updating so that this is represented as an XSD Date Time literal - to allow for comparison later
-        	//Currently it appears that this is only used for file upload 
+        	//Currently it appears that this is only used for file upload
             //getLiteralsInScope().put("currentTime", ResourceFactory.createTypedLiteral(new Date()));
         	SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
     		String formattedDate = dateTime.format(Calendar.getInstance().getTime());
     		List<Literal> dateLiterals = new ArrayList<Literal>();
     		dateLiterals.add(ResourceFactory.createTypedLiteral(formattedDate, XSDDatatype.XSDdateTime));
     		literalsInScope.put("currentTime", dateLiterals);
-        }            
-        
+        }
+
         /* editing user */
-        if( getSparqlForAdditionalUrisInScope() != null && 
+        if( getSparqlForAdditionalUrisInScope() != null &&
             getSparqlForAdditionalUrisInScope().containsKey("editingUser") &&
             USE_SYSTEM_VALUE.equals(getSparqlForAdditionalUrisInScope().get("editingUser"))) {
-            
+
             if( request.getSession() == null )
                 throw new Error("EditConfiguration.addSystemValues() needs a session");
 
@@ -302,53 +302,53 @@ public class EditConfigurationVTwo {
            	List<String> userUriList = new ArrayList<String>();
            	userUriList.add(userUri);
             urisInScope.put("editingUser", userUriList);
-        }   
+        }
     }
-    
+
     protected void basicPrepare( ){
-        if( subjectUri != null && ! subjectUri.trim().isEmpty() && 
-            varNameForSubject != null && ! varNameForSubject.trim().isEmpty() ){            
+        if( subjectUri != null && ! subjectUri.trim().isEmpty() &&
+            varNameForSubject != null && ! varNameForSubject.trim().isEmpty() ){
             urisInScope.put( varNameForSubject, Arrays.asList( subjectUri ));
             log.debug("Putting uris in scope - var name for subject "
                     + varNameForSubject + " and subject is " + subjectUri);
         }
-        
+
         if( predicateUri != null && ! predicateUri.trim().isEmpty() &&
             varNameForPredicate != null && ! varNameForPredicate.trim().isEmpty() ){
             urisInScope.put( varNameForPredicate, Arrays.asList( predicateUri ));
             log.debug("Putting uris in scope - var name for predicate "
                     + varNameForPredicate + " and predicate is " + predicateUri);
         }
-        
-        if( isObjectResource() && 
+
+        if( isObjectResource() &&
             varNameForObject != null && ! varNameForObject.trim().isEmpty() ){
             urisInScope.put( varNameForObject, Arrays.asList(getObject()));
-            log.debug("Putting uris in scope - var name for object " 
+            log.debug("Putting uris in scope - var name for object "
                     + varNameForObject + " and object is " + object);
-        }        
+        }
     }
-     
+
     /**
      * Prepare an EditConfiguration for a DataProperty update.
-     * This should only be used when editing a existing data property statement. 
+     * This should only be used when editing a existing data property statement.
      */
     public void prepareForDataPropUpdate( Model model, DataPropertyDao dataPropertyDao ){
-        if( model == null ) throw new Error("EditConfiguration.prepareForDataPropUpdate() needs a Model");        
+        if( model == null ) throw new Error("EditConfiguration.prepareForDataPropUpdate() needs a Model");
         if( isObjectResource() ){
            throw new Error("This request does not seems to be a DataPropStmt update");
         } else  if (datapropKey == null) {
-            throw new Error("This request does not appear to be for an update since it lacks a dataProp hash key ");                           
-        }                     
-        
+            throw new Error("This request does not appear to be for an update since it lacks a dataProp hash key ");
+        }
+
         basicPrepare();
-        
-        DefaultDataPropertyFormGenerator.prepareForDataPropUpdate(model, this,dataPropertyDao );        
+
+        DefaultDataPropertyFormGenerator.prepareForDataPropUpdate(model, this,dataPropertyDao );
 
         // run SPARQL, sub in values
         SparqlEvaluateVTwo sparqlEval = new SparqlEvaluateVTwo(model);
         runSparqlForAdditional( sparqlEval );
         runSparqlForExisting( sparqlEval );
-       
+
         hasBeenPreparedForUpdate = true;
     }
 
@@ -362,11 +362,11 @@ public class EditConfigurationVTwo {
         	throw new Error("EditConfiguration.prepareForObjPropUpdate() needs a non-null Model");}
         if( !isObjectResource() ) {
         	log.debug("This does not seem to be an object property update. Lacks object.");
-            throw new Error("This request does not appear to be for a object property update.");              
-        }        
-        
-        basicPrepare();        
-        
+            throw new Error("This request does not appear to be for a object property update.");
+        }
+
+        basicPrepare();
+
         // run SPARQL, sub in values
         SparqlEvaluateVTwo sparqlEval = new SparqlEvaluateVTwo( model );
         runSparqlForAdditional( sparqlEval );
@@ -378,7 +378,7 @@ public class EditConfigurationVTwo {
 
         hasBeenPreparedForUpdate = true;
     }
-    
+
     /**
      * Prepare for a param update: Run SPARQL for existing values.
      *  This can be used for a direct form which does not correspond directly to either
@@ -388,10 +388,10 @@ public class EditConfigurationVTwo {
         if( model == null ) {
         	log.debug("Model is null and will be throwing an error");
         	throw new Error("EditConfiguration.prepareForObjPropUpdate() needs a non-null Model");}
-            
-        
-        basicPrepare();        
-        
+
+
+        basicPrepare();
+
         // run SPARQL, sub in values
         SparqlEvaluateVTwo sparqlEval = new SparqlEvaluateVTwo( model );
         runSparqlForAdditional( sparqlEval );
@@ -412,12 +412,12 @@ public class EditConfigurationVTwo {
         if( model == null ) throw new Error("prepareForNonUpdate() needs a non-null Model");
 
         basicPrepare();
-        
+
         SparqlEvaluateVTwo sparqlEval = new SparqlEvaluateVTwo( model );
         runSparqlForAdditional( sparqlEval );
-        //runSparqlForExisting( sparqlEval );                
+        //runSparqlForExisting( sparqlEval );
     }
-    
+
     public void setFields(Map<String,FieldVTwo> fields) {
     	this.fields = fields;
     }
@@ -465,9 +465,9 @@ public class EditConfigurationVTwo {
     public void addN3Required(List<String> n3RequiredInput) {
     	this.n3Required.addAll(n3RequiredInput);
     }
-    
+
     public void addN3Required(String ... n3RequiredStrsInput) {
-    	 this.n3Required.addAll(Arrays.asList( n3RequiredStrsInput ));  
+    	 this.n3Required.addAll(Arrays.asList( n3RequiredStrsInput ));
     }
      /** return a copy of the value so that the configuration is not modified by external code.
      */
@@ -480,18 +480,18 @@ public class EditConfigurationVTwo {
     }
 
     public void setN3Optional(String ... n3Strs){
-        this.n3Optional = new ArrayList<String>(Arrays.asList( n3Strs )); //using ArrayList to allow list to be resized       
+        this.n3Optional = new ArrayList<String>(Arrays.asList( n3Strs )); //using ArrayList to allow list to be resized
     }
-    
+
     public void addN3Optional(List<String> n3Optional) {
         this.n3Optional.addAll(n3Optional);
     }
 
     public void addN3Optional(String ... n3Strs){
-        this.n3Optional.addAll(Arrays.asList( n3Strs ));        
+        this.n3Optional.addAll(Arrays.asList( n3Strs ));
     }
 
-    
+
     public Map<String,String> getNewResources() {
         return newResources;
     }
@@ -499,21 +499,21 @@ public class EditConfigurationVTwo {
     public void setNewResources(Map<String,String> newResources) {
         this.newResources = newResources;
     }
-    
+
     public void setNewResources(String ... strs){
         if( strs == null || strs.length % 2 != 0 ){
             throw new Error(" setNewResources() must have pairs of varName, prefix ");
         }
         Map<String,String> map = new HashMap<String,String>();
-        
+
         for( int i=0;i<strs.length;i=i+2 ){
-            map.put(strs[i],strs[i+1]);            
+            map.put(strs[i],strs[i+1]);
         }
-        
+
         this.newResources = map;
     }
 
-    
+
     public List<String> getUrisOnform() {
         return urisOnform;
     }
@@ -523,7 +523,7 @@ public class EditConfigurationVTwo {
     }
 
     public void setUrisOnForm(String ... strs){
-        this.urisOnform = new ArrayList<String>(Arrays.asList( strs )); //using ArrayList to allow resizing        
+        this.urisOnform = new ArrayList<String>(Arrays.asList( strs )); //using ArrayList to allow resizing
     }
     //This doesn't overwrite or set but adds to existing list
     public void addUrisOnForm(List<String> urisOnform) {
@@ -531,10 +531,10 @@ public class EditConfigurationVTwo {
     }
 
     public void addUrisOnForm(String ... strs){
-        this.urisOnform.addAll(Arrays.asList( strs ));        
+        this.urisOnform.addAll(Arrays.asList( strs ));
     }
-    
-    
+
+
     public void setFilesOnForm(List<String> filesOnForm){
         this.filesOnForm = filesOnForm;
     }
@@ -552,17 +552,17 @@ public class EditConfigurationVTwo {
     }
 
     public void setLiteralsOnForm(String ... strs){
-        this.literalsOnForm = new ArrayList<String>(Arrays.asList( strs ));//using ArrayList to allow resizing        
+        this.literalsOnForm = new ArrayList<String>(Arrays.asList( strs ));//using ArrayList to allow resizing
     }
-    
+
     public void addLiteralsOnForm(List<String> literalsOnForm) {
     	this.literalsOnForm.addAll(literalsOnForm);
     }
-    
+
     public void addLiteralsOnForm(String ... strs){
-        this.literalsOnForm.addAll(Arrays.asList( strs ));        
+        this.literalsOnForm.addAll(Arrays.asList( strs ));
     }
-    
+
     public Map<String, List<String>> getUrisInScope() {
         return urisInScope;
     }
@@ -576,19 +576,19 @@ public class EditConfigurationVTwo {
             urisInScope = new HashMap<String, List<String>>();
         }
         urisInScope.put(key, list);
-        return this;        
+        return this;
     }
-    
+
     public EditConfigurationVTwo addUrisInScope(Map<String, List<String>> uriValues) {
         if( urisInScope  == null ){
             urisInScope = new HashMap<String, List<String>>();
         }
         urisInScope.putAll(uriValues);
-        return this;        
+        return this;
     }
-    
-   
-    
+
+
+
     public Map<String, List<Literal>> getLiteralsInScope() {
         return literalsInScope;
     }
@@ -599,8 +599,8 @@ public class EditConfigurationVTwo {
 
     /** Return a copy of the value so that the configuration is not modified by external code.
      */
-    public Map<String, String> getSparqlForAdditionalUrisInScope() {        
-        return copyMap(sparqlForAdditionalUrisInScope);        
+    public Map<String, String> getSparqlForAdditionalUrisInScope() {
+        return copyMap(sparqlForAdditionalUrisInScope);
     }
 
     public void setSparqlForAdditionalUrisInScope(Map<String, String> sparqlForAdditionalUrisInScope) {
@@ -609,17 +609,17 @@ public class EditConfigurationVTwo {
 
      /** Return a copy of the value so that the configuration is not modified by external code.
      */
-    public Map<String, String> getSparqlForAdditionalLiteralsInScope() {        
-        return copyMap(sparqlForAdditionalLiteralsInScope);        
-    }        
-    
+    public Map<String, String> getSparqlForAdditionalLiteralsInScope() {
+        return copyMap(sparqlForAdditionalLiteralsInScope);
+    }
+
     private Map<String,String> copyMap(Map<String,String> source){
         if( source == null ) return null;
-        Map<String, String> dest = new HashMap<String, String>();        
+        Map<String, String> dest = new HashMap<String, String>();
         for( String key : source.keySet()){
             if( source.get(key) != null )
                 dest.put(key, source.get(key));
-            else 
+            else
                 dest.put(key, null);
         }
         return dest;
@@ -648,7 +648,7 @@ public class EditConfigurationVTwo {
      /** return a copy of the value so that the configuration is not modified by external code.
      */
     public Map<String, String> getSparqlForExistingLiterals() {
-        return copyMap(sparqlForExistingLiterals);        
+        return copyMap(sparqlForExistingLiterals);
     }
 
     public void setSparqlForExistingLiterals(Map<String, String> sparqlForExistingLiterals) {
@@ -657,13 +657,13 @@ public class EditConfigurationVTwo {
 
      /** return a copy of the value so that the configuration is not modified by external code.
      */
-    public Map<String, String> getSparqlForExistingUris() {         
-        return copyMap(sparqlForExistingUris);        
+    public Map<String, String> getSparqlForExistingUris() {
+        return copyMap(sparqlForExistingUris);
     }
 
     public void setSparqlForExistingUris(Map<String, String> sparqlForExistingUris) {
         this.sparqlForExistingUris = sparqlForExistingUris;
-    }       
+    }
 
     /* ********************** static methods to get EditConfigs from Session ******************************** */
 
@@ -709,7 +709,7 @@ public class EditConfigurationVTwo {
      */
     public static EditConfigurationVTwo getConfigFromSession( HttpSession sess, HttpServletRequest request ){
         String key = getEditKeyFromRequest(request);
-        
+
         if( key == null )
             return null;
         return getConfigFromSession(sess, key);
@@ -728,13 +728,13 @@ public class EditConfigurationVTwo {
             if( isMultipart ) {
                 //multipart parsing will consume all request parameters so
                 //the editKey needs to be stashed in the request attributes.
-                key = (String)request.getAttribute("editKey");    
+                key = (String)request.getAttribute("editKey");
                 if( key == null ) {
                     // handle the cancel button where nothing is really uploaded
                     key = request.getParameter("editKey");
-                }                               
-            }else{            	
-            	key = (String)request.getAttribute("editKey");                
+                }
+            }else{
+            	key = (String)request.getAttribute("editKey");
                 if( key  != null  ){
                     return key;
                 } else {
@@ -765,7 +765,7 @@ public class EditConfigurationVTwo {
             return Integer.toString(mills);
         }
     }
-    
+
     /*
      * getters and setters
      */
@@ -788,7 +788,7 @@ public class EditConfigurationVTwo {
 		if( dataKeyFound && objectFound )
 		    throw new Error("Bad configuration: both datapropKey and object are defined.");
 		return objectFound;
-	}	
+	}
 
 	public Integer getDatapropKey() {
         return datapropKey;
@@ -797,7 +797,7 @@ public class EditConfigurationVTwo {
     public void setDatapropKey(Integer datapropKey) {
         this.datapropKey = datapropKey;
     }
-    
+
     public String getSubjectUri() {
         return subjectUri;
     }
@@ -821,15 +821,15 @@ public class EditConfigurationVTwo {
     public String getEditKey() {
         return editKey;
     }
-    
+
     public void setEditKey(String editKey) {
     	this.editKey = editKey;
     }
-    
+
     public String getFormUrl() {
         return formUrl;
     }
-    
+
     public void setFormUrl(String formUrl) {
     	this.formUrl = formUrl;
     }
@@ -837,23 +837,23 @@ public class EditConfigurationVTwo {
     public EditN3GeneratorVTwo getN3Generator(){
         return n3generator;
     }
-    
+
     public void setN3Generator(EditN3GeneratorVTwo gen) {
     	this.n3generator = gen;
     }
-    
+
     public String getVarNameForSubject() {
     	return this.varNameForSubject;
     }
-    
+
     public void setVarNameForSubject(String varName) {
     	this.varNameForSubject = varName;
     }
-    
+
     public String getVarNameForPredicate() {
     	return this.varNameForPredicate;
     }
-    
+
     public void setVarNameForPredicate(String varName) {
     	this.varNameForPredicate = varName;
     }
@@ -861,11 +861,11 @@ public class EditConfigurationVTwo {
     public String getVarNameForObject(){
         return this.varNameForObject;
     }
-    
+
     public void setVarNameForObject(String varName) {
     	this.varNameForObject = varName;
     }
-    
+
     /**If this is set to true, then dependent resources should be deleted on edits that
      * remove the parent resource.
      */
@@ -879,23 +879,23 @@ public class EditConfigurationVTwo {
 	public void setUseDependentResourceDelete(boolean useDependentResourceDelete) {
 		this.useDependentResourceDelete = useDependentResourceDelete;
 	}
-	
+
     public List<ModelChangePreprocessor> getModelChangePreprocessors() {
     	return this.modelChangePreprocessors;
     }
-       
+
     public void addModelChangePreprocessor( ModelChangePreprocessor modelChangePreprocessor) {
     	this.modelChangePreprocessors.add( modelChangePreprocessor );
     }
-    
+
     public void setProhibitedFromSearch( ProhibitedFromSearch prohibitedFromSearch) {
     	this.prohibitedFromSearch = prohibitedFromSearch;
     }
-    
+
     public ProhibitedFromSearch getProhibitedFromSearch() {
     	return this.prohibitedFromSearch;
     }
-    
+
     private void debugScope(String msg){
         if( log.isDebugEnabled()){
             log.debug(msg);
@@ -911,9 +911,9 @@ public class EditConfigurationVTwo {
             }
         }
     }
-    
+
     public final static String USE_SYSTEM_VALUE = "USE_SYSTEM_VALUE";
-    
+
     private static final Log log = LogFactory.getLog(EditConfigurationVTwo.class.getName());
 
     public ModelSelector getWriteModelSelector() {
@@ -922,7 +922,7 @@ public class EditConfigurationVTwo {
 
     public void setWriteModelSelector(ModelSelector writeModel) {
         if( writeModel != null )
-            this.writeModelSelector = writeModel;        
+            this.writeModelSelector = writeModel;
     }
 
     public ModelSelector getQueryModelSelector() {
@@ -950,7 +950,7 @@ public class EditConfigurationVTwo {
         if( resourceModelSelector != null )
             this.resourceModelSelector = resourceModelSelector;
     }
-        
+
     public List<N3ValidatorVTwo> getValidators() {
 		return validators;
 	}
@@ -958,15 +958,15 @@ public class EditConfigurationVTwo {
     public void addValidator( N3ValidatorVTwo validator){
     	if( this.validators == null )
     		this.validators = new ArrayList<N3ValidatorVTwo>();
-    	this.validators.add(validator);    		
-    }    
+    	this.validators.add(validator);
+    }
 
     public void addEditSubmissionPreprocessor( EditSubmissionVTwoPreprocessor preprocessor){
         if( editSubmissionPreprocessors == null )
             editSubmissionPreprocessors = new ArrayList<EditSubmissionVTwoPreprocessor>();
-        editSubmissionPreprocessors.add(preprocessor);         
-    }  
-    
+        editSubmissionPreprocessors.add(preprocessor);
+    }
+
     public List<EditSubmissionVTwoPreprocessor> getEditSubmissionPreprocessors() {
         return editSubmissionPreprocessors;
     }
@@ -974,7 +974,7 @@ public class EditConfigurationVTwo {
     public void setTemplate(String template){
         this.template = template;
     }
-    
+
     public String getTemplate() {
         return this.template;
     }
@@ -986,21 +986,21 @@ public class EditConfigurationVTwo {
     public void setSubmitToUrl(String submitToUrl) {
         this.submitToUrl = submitToUrl;
     }
-    
+
     public boolean isUpdate(){
-        //return isObjectPropertyUpdate() || isDataPropertyUpdate(); 
+        //return isObjectPropertyUpdate() || isDataPropertyUpdate();
     	//TODO: Change back if this doesn't work
     	return isObjectPropertyUpdate() || isDataPropertyUpdate() || isParamUpdate();
     }
-    
+
     public boolean isObjectPropertyUpdate(){
-        return this.getObject() != null && this.getObject().trim().length() > 0;  
+        return this.getObject() != null && this.getObject().trim().length() > 0;
     }
-    
+
     public boolean isDataPropertyUpdate() {
     	return this.getDatapropKey() != null ;
     }
-    
+
     //*****TEST Method***Remove if doesn't work******//
     public boolean isParamUpdate = false;
     public void setParamUpdate (boolean inputParamUpdate) {
@@ -1009,12 +1009,12 @@ public class EditConfigurationVTwo {
     public boolean isParamUpdate() {
     	return this.isParamUpdate;
     }
-    
+
     //TODO: can we rename this to match the name "pageData" that is used on the templates for this?
     //How about we change pageData to something else since page is in the name of just about everything related
     //to templates.
-    
-    /** This is for specific data for a form that will be set by the generator. */    
+
+    /** This is for specific data for a form that will be set by the generator. */
 	public  void setFormSpecificData(HashMap<String, Object> formSpecificData) {
 		this.formSpecificData = formSpecificData;
 	}
@@ -1026,141 +1026,141 @@ public class EditConfigurationVTwo {
 	    if( this.formSpecificData == null){
 	        this.formSpecificData = new HashMap<String,Object>();
 	    }
-	    this.formSpecificData.put(key,value);	    
+	    this.formSpecificData.put(key,value);
 	}
-	
+
     //TODO: can we rename this to match the name "pageData" that is used on the templates for this?
     //How about we change pageData to something else since page is in the name of just about everything related
     //to templates.
-	
-	public HashMap<String, Object> getFormSpecificData() {	
+
+	public HashMap<String, Object> getFormSpecificData() {
 		return this.formSpecificData;
 	}
 
 	public boolean hasBeenPreparedForUpdate() {
 	    return hasBeenPreparedForUpdate;
 	}
-	
-    public void addNewResource(String key, String namespace){        
-        if( key == null || key.isEmpty() ) 
+
+    public void addNewResource(String key, String namespace){
+        if( key == null || key.isEmpty() )
             throw new IllegalArgumentException("key of new resource must not be null");
         if( newResources == null ) {
             newResources = new HashMap<String,String>();
-            newResources.put(key, namespace);            
+            newResources.put(key, namespace);
         }else{
-            newResources.put(key, namespace);            
-        }        
+            newResources.put(key, namespace);
+        }
     }
-    
+
     public void addSparqlForExistingLiteral(String key, String sparql){
-        if( key == null || key.isEmpty() ) 
-            throw new IllegalArgumentException("key must not be null");
-        if( sparql == null || sparql .isEmpty() ) 
-            throw new IllegalArgumentException("sparql must not be null");
-        
-        Map<String,String> map = sparqlForExistingLiterals;
-        if( map == null ) {
-            map = new HashMap<String,String>();
-            map.put(key, sparql);   
-            setSparqlForExistingLiterals(map);
-        }else{
-            map.put(key, sparql);            
-        }        
-    }
-    
-    public void addSparqlForExistingUris(String key, String sparql){
-        if( key == null || key.isEmpty() ) 
+        if( key == null || key.isEmpty() )
             throw new IllegalArgumentException("key must not be null");
         if( sparql == null || sparql .isEmpty() )
             throw new IllegalArgumentException("sparql must not be null");
-        
+
+        Map<String,String> map = sparqlForExistingLiterals;
+        if( map == null ) {
+            map = new HashMap<String,String>();
+            map.put(key, sparql);
+            setSparqlForExistingLiterals(map);
+        }else{
+            map.put(key, sparql);
+        }
+    }
+
+    public void addSparqlForExistingUris(String key, String sparql){
+        if( key == null || key.isEmpty() )
+            throw new IllegalArgumentException("key must not be null");
+        if( sparql == null || sparql .isEmpty() )
+            throw new IllegalArgumentException("sparql must not be null");
+
         Map<String,String> map = sparqlForExistingUris;
         if( map == null ) {
             map = new HashMap<String,String>();
             map.put(key, sparql);
             setSparqlForExistingUris(map);
         }else{
-            map.put(key, sparql);            
-        }        
+            map.put(key, sparql);
+        }
     }
-    
+
     public void addSparqlForAdditionalLiteralsInScope(String key, String sparql){
-        if( key == null || key.isEmpty() ) 
-            throw new IllegalArgumentException("key must not be null");
-        if( sparql == null || sparql .isEmpty() ) 
-            throw new IllegalArgumentException("sparql must not be null");
-        
-        Map<String,String> map = sparqlForAdditionalLiteralsInScope;
-        if( map == null ) {
-            map = new HashMap<String,String>();
-            map.put(key, sparql);      
-            setSparqlForAdditionalLiteralsInScope(map);
-        }else{
-            map.put(key, sparql);            
-        }        
-    }
-    
-    public void addSparqlForAdditionalUrisInScope(String key, String sparql){
-        if( key == null || key.isEmpty() ) 
+        if( key == null || key.isEmpty() )
             throw new IllegalArgumentException("key must not be null");
         if( sparql == null || sparql .isEmpty() )
             throw new IllegalArgumentException("sparql must not be null");
-        
+
+        Map<String,String> map = sparqlForAdditionalLiteralsInScope;
+        if( map == null ) {
+            map = new HashMap<String,String>();
+            map.put(key, sparql);
+            setSparqlForAdditionalLiteralsInScope(map);
+        }else{
+            map.put(key, sparql);
+        }
+    }
+
+    public void addSparqlForAdditionalUrisInScope(String key, String sparql){
+        if( key == null || key.isEmpty() )
+            throw new IllegalArgumentException("key must not be null");
+        if( sparql == null || sparql .isEmpty() )
+            throw new IllegalArgumentException("sparql must not be null");
+
         Map<String,String> map = sparqlForAdditionalUrisInScope;
         if( map == null ) {
             map = new HashMap<String,String>();
             map.put(key, sparql);
             setSparqlForAdditionalUrisInScope(map);
         }else{
-            map.put(key, sparql);            
-        }        
+            map.put(key, sparql);
+        }
     }
 
     public void addField( FieldVTwo field){
-        if( field == null ) 
+        if( field == null )
             throw new IllegalArgumentException("field must not be null");
-        if( field.getName() == null || field.getName().isEmpty() ) 
-            throw new IllegalArgumentException("field must not have null or empty name");        
+        if( field.getName() == null || field.getName().isEmpty() )
+            throw new IllegalArgumentException("field must not have null or empty name");
         if( fields == null )
             fields = new HashMap<String, FieldVTwo>();
-                
+
         if( fields.containsKey(field.getName() ))
             throw new IllegalArgumentException("adding filed that is already in the field list");
-        
-        fields.put( field.getName(), field);                
+
+        fields.put( field.getName(), field);
     }
 
     public void addFields(List<FieldVTwo> fields) {
-    	if( fields != null ) 
-	    {    	
+    	if( fields != null )
+	    {
     		for(FieldVTwo f: fields) {
 	    		this.addField(f);
 	    	}
     	}
-    	
+
     }
-    
+
     @Override
-    public String toString(){        
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);        
+    public String toString(){
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
-    
+
     private static final String INDIVIDUAL_CONTROLLER = "/individual";
 
     public EditConfigurationVTwo addLiteralInScope(String key, Literal ... values) {
         if( literalsInScope  == null ){
             literalsInScope = new HashMap<String, List<Literal>>();
-        }        
+        }
         literalsInScope.put(key, Arrays.asList(values));
-        return this;                
+        return this;
     }
-    
+
     public EditConfigurationVTwo addLiteralsInScope(Map<String, List<Literal>> scopeLiterals) {
         if( literalsInScope  == null ){
             literalsInScope = new HashMap<String, List<Literal>>();
-        }        
+        }
         literalsInScope.putAll(scopeLiterals);
-        return this;                
+        return this;
     }
 
     public void setUrlToReturnTo(String url){
@@ -1174,7 +1174,7 @@ public class EditConfigurationVTwo {
     public void setSkipToUrl(String url){
         skipToUrl=url;
     }
-    
+
     public String getSkipToUrl() {
         return skipToUrl;
     }
@@ -1201,5 +1201,5 @@ public class EditConfigurationVTwo {
 
     public String getTboxModelId() {
         return tboxModelId;
-    }    
+    }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditElementVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditElementVTwo.java
index 03001fb47..5466cc60f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditElementVTwo.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditElementVTwo.java
@@ -10,40 +10,40 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTw
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
 import freemarker.template.Configuration;
 /**
- * All classes that implement this interface must have a public constructor that 
- * takes a edu.cornell.mannlib.vitro.webapp.edit.n3editing.Field.  It will be 
+ * All classes that implement this interface must have a public constructor that
+ * takes a edu.cornell.mannlib.vitro.webapp.edit.n3editing.Field.  It will be
  * called with using reflection.
  */
-public interface EditElementVTwo {  
+public interface EditElementVTwo {
     /**
-     * This is a method to get a map of variable name to Literal value from the submitted form. 
+     * This is a method to get a map of variable name to Literal value from the submitted form.
      */
-    public Map<String,List<Literal>> 
+    public Map<String,List<Literal>>
         getLiterals(String fieldName, EditConfigurationVTwo editConfig, Map<String,String[]> queryParameters );
-    
+
     /**
-     * This is a method to get a map of variable name to URI values from the submitted form. 
+     * This is a method to get a map of variable name to URI values from the submitted form.
      */
-    public Map<String,List<String>> 
+    public Map<String,List<String>>
         getURIs(String fieldName, EditConfigurationVTwo editConfig, Map<String,String[]> queryParameters );
-    
+
     /**
      * Gets validation error messages.  Returns an empty list if there are no errors.
      */
     public Map<String,String>
         getValidationMessages(String fieldName, EditConfigurationVTwo editConfig, Map<String,String[]> queryParameters);
-    
+
     /**
      * This is a method to generate the HTML output for a form element.  It should use a freemarker template
-     * to produce the output.  
+     * to produce the output.
      */
     public String draw(String fieldName, EditConfigurationVTwo editConfig, MultiValueEditSubmission editSub, Configuration fmConfig);
-    
+
     /**
      * This method gets the map with the data that can then be passed to the template
      */
-    public Map getMapForTemplate(EditConfigurationVTwo editConfig, MultiValueEditSubmission editSub);            
-    
+    public Map getMapForTemplate(EditConfigurationVTwo editConfig, MultiValueEditSubmission editSub);
+
     /* in the future, we may need to get existing values */
     /*
     public Map<String,Literal> getExistingLiterals(???)
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java
index fef6b2712..015652445 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java
@@ -21,25 +21,25 @@ import org.apache.jena.vocabulary.XSD;
  * and EditSubmission.   Main responsibility is the proper substitution
  * of URI and literal strings in to the template N3.
  *
- * 
+ *
  */
 public class EditN3GeneratorVTwo {
-    
-    static final Log log = LogFactory.getLog( EditN3GeneratorVTwo.class );  
+
+    static final Log log = LogFactory.getLog( EditN3GeneratorVTwo.class );
 
     /**
      * This is the method to use to substitute in URIs into variables of target N3 strings.
      * This takes into account multiple values that would be returned from a select list.
      * subInUris should no longer be used.
-     * 
+     *
      * It's important that the map contain String to List&lt;String&gt; mapping.
-     * 
+     *
      * Before values are sent in, all of the values for a variable should be placed within an array.
-     * 
+     *
      * The List n3targets will be modified.
-     */       
-    public void subInMultiUris(Map<String,List<String>> varsToVals, List<String> n3targets){       
-    	
+     */
+    public void subInMultiUris(Map<String,List<String>> varsToVals, List<String> n3targets){
+
     	if( varsToVals == null || varsToVals.isEmpty() || n3targets == null)
     	    return;
 
@@ -50,32 +50,32 @@ public class EditN3GeneratorVTwo {
     	        continue;
             Set<String> keySet = varsToVals.keySet();
             for (String key : keySet) {
-                List<String> values = varsToVals.get(key);  
+                List<String> values = varsToVals.get(key);
                 if( values == null ){
                     log.debug("skipping var " + key + " because value List is null");
                     continue;
                 }else if( containsNullOrEmpty( values )){
-                    
+
                     //bdc34: what should we do if the list contains nulls or empty strings?
-                    //for now we just skip the whole key/var.  
+                    //for now we just skip the whole key/var.
                     //Maybe it would be useful to strip the nulls+empties out of the list?
-                    
+
                     log.debug("skipping var " + key + " because it contains nulls or empty strings");
                     continue;
                 }
-                log.debug("The original value String is " + values.toString());                
-                
+                log.debug("The original value String is " + values.toString());
+
                 String valueString = org.apache.commons.lang3.StringUtils.join(values,
-                        ">, <");                                
-                valueString = "<" + valueString + ">";                
+                        ">, <");
+                valueString = "<" + valueString + ">";
                 log.debug("The multiUri value String is " + valueString);
-                
+
                 result = subInNonBracketedURIS(key, valueString, result);
             }
             n3targets.set(i, result);
-        }         
+        }
     }
-  
+
     private boolean containsNullOrEmpty(List<String> values) {
     	if(values == null || values.isEmpty()) return true ;
     	for(String str : values) {
@@ -92,69 +92,69 @@ public class EditN3GeneratorVTwo {
             return;
 
         for( int i = 0; i < targets.size() ; i++ ){
-            String result = targets.get(i);   
+            String result = targets.get(i);
             if( result == null )
                 continue;
             for( String key : varsToVals.keySet()) {
                 result =  subInUris( key, varsToVals.get(key), result);
             }
             targets.set(i,result);
-        }        
+        }
     }
-   
+
     public String subInUris(String var, String value, String target) {
         // empty URIs get skipped
         if( var == null || var.isEmpty() || value == null || value.isEmpty() || target == null)
-            return target;        
-        
+            return target;
+
     	return subInNonBracketedURIS(var, "<" + value + ">", target);
     }
- 
+
     public void subInUris(String var, String value, List<String> targets){
         if( targets == null )
             return;
         for( String target : targets){
              subInUris( var, value, target);
-        }        
+        }
     }
 
     /**
      * This is the method to use to substitute in Literals into variables of target N3 strings.
      * This takes into account multiple values that would be returned from a select list.
      * subInUris should no longer be used.
-     * 
+     *
      * It will modify the list n3targets.
      */
     public void subInMultiLiterals(Map<String,List<Literal>> varsToVals, List<String> n3targets){
-        if( varsToVals == null || varsToVals.isEmpty() || n3targets == null) 
+        if( varsToVals == null || varsToVals.isEmpty() || n3targets == null)
             return;
-        
+
         for( int i=0; i< n3targets.size() ; i++ ){
             String orginalN3 = n3targets.get(i);
             if( orginalN3 == null)
                 continue;
             String newN3 = orginalN3;
             for( String key : varsToVals.keySet() ){
-                newN3 = subInMultiLiterals( key, varsToVals.get(key), newN3 );                
-            }         
+                newN3 = subInMultiLiterals( key, varsToVals.get(key), newN3 );
+            }
             n3targets.set(i, newN3);
         }
     }
-    
+
     public void subInLiterals(Map<String, Literal> varsToVals, List<String> n3targets){
-        if( varsToVals == null || varsToVals.isEmpty() || n3targets==null) 
+        if( varsToVals == null || varsToVals.isEmpty() || n3targets==null)
             return;
-        
+
         for( int i=0; i< n3targets.size() ; i++ ){
             String orginalN3 = n3targets.get(i);
-            if( orginalN3 == null ) 
+            if( orginalN3 == null )
                 continue;
             String newN3 = orginalN3;
             for( String key : varsToVals.keySet() ){
-                newN3 = subInLiterals( key, varsToVals.get(key), newN3 );                
-            }         
+                newN3 = subInLiterals( key, varsToVals.get(key), newN3 );
+            }
             n3targets.set(i, newN3);
-        }        
+        }
     }
 
 
@@ -177,38 +177,38 @@ public class EditN3GeneratorVTwo {
             log.debug("subInLiterals was passed a null value for var '"+var+"'; returning target: '"+target+"'");
             return target;
         }
-                
+
         try{
         if( literal.getValue() == null )
-            log.debug("value of literal for " + var + " was null");        
+            log.debug("value of literal for " + var + " was null");
         }catch(org.apache.jena.datatypes.DatatypeFormatException ex){
             log.debug("value for " + var + " " + ex.getMessage());
-        }        
-        
-        String replacement = null;                       
+        }
+
+        String replacement = null;
         if ( literal.getLexicalForm().length()==0 ) {
             log.debug("empty string found on form for " + var + ".");
             replacement = ">::" + var + " was empty::<";
         }else{
             replacement = formatLiteral(literal);
         }
-        
+
         String out = null;
         if( replacement != null )
             out = target.replaceAll(varRegex, Matcher.quoteReplacement( replacement ));
         else
             out = target;
-        
-        if( out != null && out.length() > 0 ) 
+
+        if( out != null && out.length() > 0 )
             return out;
         else{
             log.debug("After attempting to substitue in literals, the target N3 was empty" );
             return target;
         }
-    }    
-    
-    
-     protected String subInMultiLiterals(String var, List<Literal>values, String n3){        
+    }
+
+
+     protected String subInMultiLiterals(String var, List<Literal>values, String n3){
 	  if (n3==null ) {
           log.error("subInMultiLiterals was passed a null n3 String");
           return "blankBecauseTargetOrValueWasNull";
@@ -220,41 +220,41 @@ public class EditN3GeneratorVTwo {
           return n3;
       }
     	String tmp = n3;
-        
+
         //make the multivalue literal string
-        List<String> n3Values = new ArrayList<String>(values.size());        
+        List<String> n3Values = new ArrayList<String>(values.size());
         for( Literal value : values){
         	if(value != null) {
         		n3Values.add( formatLiteral(value) );
         	} else {
-                log.debug("value of literal for " + var + " was null");        
+                log.debug("value of literal for " + var + " was null");
         	}
         }
         String valueString = org.apache.commons.lang3.StringUtils.join(n3Values, ",");
-        
+
         //Substitute it in to n3
         String varRegex = "\\?" + var + "(?=\\p{Punct}|\\p{Space}|$)";
-        
+
         String out = null;
         if( valueString != null )
             out = tmp.replaceAll(varRegex, Matcher.quoteReplacement( valueString ));
         else
             out = n3;
-        
+
         return out;
     }
-    
-    
+
+
 
 
     protected String quoteForN3(String in){
         //TODO: THIS  NEEDS TO BE ESCAPED FOR N3 which is python string escaping
         return in;
     }
-    
-    
+
+
     //Already includes "<> for URIs so no need to add those here
-    protected String subInNonBracketedURIS(String var, String value, String target) {       
+    protected String subInNonBracketedURIS(String var, String value, String target) {
         /* var followed by dot some whitespace OR var followed by whitespace OR at end of line*/
         String varRegex = "\\?" + var + "(?=\\p{Punct}|\\p{Space}|$)";
         String out = null;
@@ -263,19 +263,19 @@ public class EditN3GeneratorVTwo {
         else {
             String replaceWith =  Matcher.quoteReplacement(value);
             return target.replaceAll(varRegex,replaceWith);
-        }        
+        }
     }
-    
+
     /*
      * bdc34 2008-07-33
      *
-     * The following methods are from 
-     * HP's Jena project ver 2.5.5   
+     * The following methods are from
+     * HP's Jena project ver 2.5.5
      * Found in file Jena-2.5.5/src/org.apache/jena/n3/N3JenaWriterCommon.java
      *
      * The following copyright statement applies to these methods.
      */
-    
+
     /*
      *  (c) Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Hewlett-Packard Development Company, LP
      *  All rights reserved.
@@ -302,13 +302,13 @@ public class EditN3GeneratorVTwo {
      * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
      * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      */
-    
+
     protected static String formatLiteral(Literal literal)
     {
         String datatype = literal.getDatatypeURI() ;
         String lang = literal.getLanguage() ;
         String s = literal.getLexicalForm() ;
-    
+
         if ( datatype != null )
         {
             // Special form we know how to handle?
@@ -322,7 +322,7 @@ public class EditN3GeneratorVTwo {
                 // No luck.  Continue.
                 // Continuing is always safe.
             }
-                
+
             if ( datatype.equals(XSD.decimal.getURI()) )
             {
                 // Must have ., can't have e or E
@@ -336,7 +336,7 @@ public class EditN3GeneratorVTwo {
                     } catch (NumberFormatException nfe) {}
                 }
             }
-            
+
             if ( datatype.equals(XSD.xdouble.getURI()) )
             {
                 // Must have 'e' or 'E' (N3 and Turtle now read 2.3 as a decimal).
@@ -354,20 +354,20 @@ public class EditN3GeneratorVTwo {
         }
         // Format the text - with escaping.
         StringBuffer sbuff = new StringBuffer() ;
-        
+
         String quoteMarks = "\"" ;
-        
+
         sbuff.append(quoteMarks);
         pyString(sbuff, s ) ;
         sbuff.append(quoteMarks);
-    
-        // Format the language tag 
+
+        // Format the language tag
         if ( lang != null && lang.length()>0)
         {
             sbuff.append("@") ;
             sbuff.append(lang) ;
         }
-        
+
         // Format the datatype
         if ( datatype != null )
         {
@@ -377,12 +377,12 @@ public class EditN3GeneratorVTwo {
         return sbuff.toString() ;
     }
 
-    
+
     /*
-     * 
+     *
      * see http://www.python.org/doc/2.5.2/ref/strings.html
      * or see jena's n3 grammar jena/src/org.apache/jena/n3/n3.g
-     */ 
+     */
     protected static void pyString(StringBuffer sbuff, String s)
     {
         for (int i = 0; i < s.length(); i++) {
@@ -394,19 +394,19 @@ public class EditN3GeneratorVTwo {
                 sbuff.append('\\') ;
                 sbuff.append(c) ;
                 continue ;
-            }            
+            }
 
-            // Whitespace                        
+            // Whitespace
             if (c == '\n'){ sbuff.append("\\n");continue; }
             if (c == '\t'){ sbuff.append("\\t");continue; }
             if (c == '\r'){ sbuff.append("\\r");continue; }
-            if (c == '\f'){ sbuff.append("\\f");continue; }                            
+            if (c == '\f'){ sbuff.append("\\f");continue; }
             if (c == '\b'){ sbuff.append("\\b");continue; }
             if( c == 7 )  { sbuff.append("\\a");continue; }
-            
+
             // Output as is (subject to UTF-8 encoding on output that is)
             sbuff.append(c) ;
-            
+
 //            // Unicode escapes
 //            // c < 32, c >= 127, not whitespace or other specials
 //            String hexstr = Integer.toHexString(c).toUpperCase();
@@ -425,8 +425,8 @@ public class EditN3GeneratorVTwo {
         // It should be right - the writer should be UTF-8 on output.
         return "<"+uriStr+">" ;
     }
-    
+
     /*************************************************************************
-     * End code taken from the Jena project and Hewlett-Packard 
+     * End code taken from the Jena project and Hewlett-Packard
      *************************************************************************/
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditSubmissionUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditSubmissionUtils.java
index 52e798402..7fb6a143e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditSubmissionUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditSubmissionUtils.java
@@ -11,11 +11,11 @@ import javax.servlet.http.HttpSession;
 public class EditSubmissionUtils {
 
     protected static final String MULTI_VALUED_EDIT_SUBMISSION = "MultiValueEditSubmission";
-    
+
     /* *************** Static utility methods to get EditSub from Session *********** */
 
     public static MultiValueEditSubmission getEditSubmissionFromSession(HttpSession sess, EditConfigurationVTwo editConfig){
-        Map<String,MultiValueEditSubmission> submissions = 
+        Map<String,MultiValueEditSubmission> submissions =
             (Map<String,MultiValueEditSubmission>)sess.getAttribute(MULTI_VALUED_EDIT_SUBMISSION);
         if( submissions == null )
           return null;
@@ -55,9 +55,9 @@ public class EditSubmissionUtils {
             Map<String, List<String>> queryParameters) {
         HashMap<String,String[]> out = new HashMap<String,String[]>();
         for( String key : queryParameters.keySet()){
-            List item = queryParameters.get(key);            
+            List item = queryParameters.get(key);
             out.put(key, (String[])item.toArray(new String[item.size()]));
         }
         return out;
-    }                 
+    }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/JspToGeneratorMapping.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/JspToGeneratorMapping.java
index 9c82267a0..0d3cf69dc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/JspToGeneratorMapping.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/JspToGeneratorMapping.java
@@ -11,13 +11,13 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.
 
 public class JspToGeneratorMapping {
     static Log log = LogFactory.getLog( JspToGeneratorMapping.class );
-    
+
     public static Map<String,String> jspsToGenerators;
-    
+
     static{
         jspsToGenerators = new HashMap<String,String>();
-        Map<String, String> map = jspsToGenerators;        
-        
+        Map<String, String> map = jspsToGenerators;
+
         // vitro forms:
 //        map.put("autoCompleteDatapropForm.jsp",
 //                edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AutoCompleteDatapropFormGenerator.class.getName());
@@ -41,20 +41,20 @@ public class JspToGeneratorMapping {
                 edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DefaultDeleteGenerator.class.getName());
         map.put("rdfsLabelForm.jsp",
                 RDFSLabelGenerator.class.getName());
-        
+
         //add in the vivo mappings if they exist
         Object object = null;
         try {
-            Class classDefinition = 
+            Class classDefinition =
                 Class.forName("edu.cornell.mannlib.vitro.webapp.edit.n3editing.N3TransitionToV2Mapping");
             object = classDefinition.newInstance();
             Map<String,String> vivoJspsToGenerators = (Map) object;
             if( vivoJspsToGenerators != null )
             map.putAll( vivoJspsToGenerators );
-           
+
         } catch (Throwable th){
             log.error( "could not load VIVO jsp mappings",th );
-        }                                       
+        }
     }
 
     public static <T> T createFor(String jsp, Class<T> clazz) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java
index ce125bbc3..8f61f4870 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java
@@ -31,7 +31,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
 public class MultiValueEditSubmission {
 
     String editKey;
-    
+
     private Map<String,List<Literal>> literalsFromForm ;
     private Map<String,List<String>> urisFromForm ;
 
@@ -41,46 +41,46 @@ public class MultiValueEditSubmission {
     private Map<String, List<FileItem>> filesFromForm;
 
     private static Model literalCreationModel;
-    
+
     private String entityToReturnTo;
-    
+
     static{
         literalCreationModel = ModelFactory.createDefaultModel();
     }
-    
+
     public MultiValueEditSubmission(Map<String,String[]> queryParameters,  EditConfigurationVTwo editConfig){
         if( editConfig == null )
-            throw new Error("EditSubmission needs an EditConfiguration");            
-        this.editKey = editConfig.getEditKey();         
+            throw new Error("EditSubmission needs an EditConfiguration");
+        this.editKey = editConfig.getEditKey();
         if( this.editKey == null || this.editKey.trim().length() == 0)
-            throw new Error("EditSubmission needs an 'editKey' parameter from the EditConfiguration");        
+            throw new Error("EditSubmission needs an 'editKey' parameter from the EditConfiguration");
 
         entityToReturnTo = editConfig.getEntityToReturnTo();
-        
+
         validationErrors = new HashMap<String,String>();
-        
+
         this.urisFromForm = new HashMap<String,List<String>>();
-        for( String var: editConfig.getUrisOnform() ){     
+        for( String var: editConfig.getUrisOnform() ){
             String[] valuesArray = queryParameters.get( var );
             //String uri = null;
             addUriToForm(editConfig, var, valuesArray);
         }
-        
-        this.literalsFromForm =new HashMap<String,List<Literal>>();        
-        for(String var: editConfig.getLiteralsOnForm() ){            
+
+        this.literalsFromForm =new HashMap<String,List<Literal>>();
+        for(String var: editConfig.getLiteralsOnForm() ){
             FieldVTwo field = editConfig.getField(var);
             if( field == null ) {
                 log.error("could not find field " + var + " in EditConfiguration" );
-                continue;   
-            } else if( field.getEditElement() != null ){                
+                continue;
+            } else if( field.getEditElement() != null ){
                 log.debug("skipping field with edit element, it should not be in literals on form list");
             }else{
-               String[] valuesArray = queryParameters.get(var); 
+               String[] valuesArray = queryParameters.get(var);
                addLiteralToForm(editConfig, field, var, valuesArray);
             }
         }
 
-        if( log.isDebugEnabled() ){         
+        if( log.isDebugEnabled() ){
             for( String key : literalsFromForm.keySet() ){
                 log.debug( key + " literal " + literalsFromForm.get(key) );
             }
@@ -88,29 +88,29 @@ public class MultiValueEditSubmission {
                 log.debug( key + " uri " + urisFromForm.get(key) );
             }
         }
-        
+
         processEditElementFields(editConfig,queryParameters);
         //Incorporating basic validation
         //Validate URIS
         this.basicValidation = new BasicValidationVTwo(editConfig, this);
-        Map<String,String> errors = basicValidation.validateUris( urisFromForm ); 
+        Map<String,String> errors = basicValidation.validateUris( urisFromForm );
         //Validate literals and add errors to the list of existing errors
         errors.putAll(basicValidation.validateLiterals( literalsFromForm ));
         if( errors != null ) {
             validationErrors.putAll( errors);
-        }              
-        
+        }
+
         if(editConfig.getValidators() != null ){
             for( N3ValidatorVTwo validator : editConfig.getValidators()){
-                if( validator != null ){     
+                if( validator != null ){
                     //throw new Error("need to implemente a validator interface that works with the new MultivalueEditSubmission.");
                     errors = validator.validate(editConfig, this);
                     if ( errors != null )
                         validationErrors.putAll(errors);
                 }
             }
-        }           
-                
+        }
+
         if( log.isDebugEnabled() )
             log.debug( this.toString() );
     }
@@ -119,15 +119,15 @@ public class MultiValueEditSubmission {
         for( String fieldName : editConfig.getFields().keySet()){
             FieldVTwo field = editConfig.getFields().get(fieldName);
             if( field != null && field.getEditElement() != null ){
-                EditElementVTwo element = field.getEditElement();                
+                EditElementVTwo element = field.getEditElement();
                 log.debug("Checking EditElement for field " + fieldName + " type: " + element.getClass().getName());
-                
+
                 //check for validation error messages
-                Map<String,String> errMsgs = 
+                Map<String,String> errMsgs =
                     element.getValidationMessages(fieldName, editConfig, queryParameters);
                 validationErrors.putAll(errMsgs);
-                                
-                if( errMsgs == null || errMsgs.isEmpty()){                    
+
+                if( errMsgs == null || errMsgs.isEmpty()){
                     //only check for uris and literals when element has no validation errors
                     Map<String,List<String>> urisFromElement = element.getURIs(fieldName, editConfig, queryParameters);
                     if( urisFromElement != null )
@@ -138,26 +138,26 @@ public class MultiValueEditSubmission {
                 }else{
                     log.debug("got validation errors for field " + fieldName + " not processing field for literals or URIs");
                 }
-            }            
-        }        
-    }    
+            }
+        }
+    }
 
     /* maybe this could be static */
     public Literal createLiteral(String value, String datatypeUri, String lang) {
-        if( datatypeUri != null ){            
+        if( datatypeUri != null ){
             if( "http://www.w3.org/2001/XMLSchema:anyURI".equals(datatypeUri) ){
                 try {
                     return literalCreationModel.createTypedLiteral( URLEncoder.encode(value, "UTF8"), datatypeUri);
-                } catch (UnsupportedEncodingException e) { 
+                } catch (UnsupportedEncodingException e) {
                     log.error(e, e);
-                }                
-            }   
+                }
+            }
             return literalCreationModel.createTypedLiteral(value, datatypeUri);
         }else if( lang != null && lang.length() > 0 )
             return literalCreationModel.createLiteral(value, lang);
-        else 
-            return ResourceFactory.createPlainLiteral(value);        
-    }               
+        else
+            return ResourceFactory.createPlainLiteral(value);
+    }
 
     private static final String DATE_TIME_URI = XSD.dateTime.getURI();
     private static final String DATE_URI = XSD.date.getURI();
@@ -180,58 +180,58 @@ public class MultiValueEditSubmission {
     /**
      * need to generate something like
      *  {@code "09:10:11"^^<http://www.w3.org/2001/XMLSchema#time>}
-     */ 
+     */
     public Literal getTime(Map<String,String[]> queryParameters,String fieldName) {
         List<String> hour = Arrays.asList(queryParameters.get("hour" + fieldName));
         List<String> minute = Arrays.asList(queryParameters.get("minute" + fieldName));
-        
+
         if ( hour == null || hour.size() == 0 ||
              minute == null || minute.size() == 0 ) {
             log.info("Could not find query parameter values for time field " + fieldName);
             validationErrors.put(fieldName, "time must be supplied");
             return null;
         }
-        
+
         int hourInt = -1;
         int minuteInt = -1;
-        
+
         String hourParamStr = hour.get(0);
         String minuteParamStr = minute.get(0);
-        
+
         // if all fields are blank, just return a null value
         if (hourParamStr.length() == 0 && minuteParamStr.length() == 0) {
             return null;
         }
-        
+
          String errors = "";
-         try{ 
+         try{
              hourInt = Integer.parseInt(hour.get(0));
              if (hourInt < 0 || hourInt > 23) {
                  throw new NumberFormatException();
              }
-         } catch( NumberFormatException nfe ) { 
-             errors += "Please enter a valid hour.  "; 
-         }        
+         } catch( NumberFormatException nfe ) {
+             errors += "Please enter a valid hour.  ";
+         }
          try{
              minuteInt = Integer.parseInt(minute.get(0));
              if (minuteInt < 0 || minuteInt > 59) {
                  throw new NumberFormatException();
              }
-         } catch( NumberFormatException nfe ) { 
-             errors += "Please enter a valid minute.  "; 
-         }        
+         } catch( NumberFormatException nfe ) {
+             errors += "Please enter a valid minute.  ";
+         }
          if( errors.length() > 0 ){
              validationErrors.put( fieldName, errors);
              return null;
          }
-        
-         
+
+
          String hourStr = (hourInt < 10) ? "0" + Integer.toString(hourInt) :  Integer.toString(hourInt);
          String minuteStr = (minuteInt < 10) ? "0" + Integer.toString(minuteInt) :  Integer.toString(minuteInt);
          String secondStr = "00";
-         
+
          return new EditLiteral(hourStr + ":" + minuteStr + ":" + secondStr, TIME_URI, null);
-         
+
     }
     public void setLiteralsFromForm(Map<String, List<Literal>> literalsFromForm) {
         this.literalsFromForm = literalsFromForm;
@@ -241,8 +241,8 @@ public class MultiValueEditSubmission {
         this.urisFromForm = urisFromForm;
     }
 
-    public String toString(){        
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);        
+    public String toString(){
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
 
     private Log log = LogFactory.getLog(MultiValueEditSubmission.class);
@@ -253,11 +253,11 @@ public class MultiValueEditSubmission {
 
     public void setEntityToReturnTo(String string) {
         entityToReturnTo = string;
-    }    
-    
+    }
+
     //Added specifically to help with "dynamic" forms such as addition of concept
     public void addLiteralToForm(EditConfigurationVTwo editConfig, FieldVTwo field, String var, String[] valuesArray) {
-    	List<String> valueList = (valuesArray != null) ? Arrays.asList(valuesArray) : null;                
+    	List<String> valueList = (valuesArray != null) ? Arrays.asList(valuesArray) : null;
         if( valueList != null && valueList.size() > 0 ) {
         	List<Literal> literalsArray = new ArrayList<Literal>();
         	//now support multiple values
@@ -266,13 +266,13 @@ public class MultiValueEditSubmission {
                 //Add to array of literals corresponding to this variable
                 if (!StringUtils.isEmpty(value)) {
                     literalsArray.add(createLiteral(
-                                                value, 
-                                                field.getRangeDatatypeUri(), 
+                                                value,
+                                                field.getRangeDatatypeUri(),
                                                 field.getRangeLang()));
                 }
         	}
         	literalsFromForm.put(var, literalsArray);
-            
+
         }else{
             log.debug("could not find value for parameter " + var  );
         }
@@ -291,16 +291,16 @@ public class MultiValueEditSubmission {
 		            }
 	            }
          }  else {
-             log.debug("No value found for query parameter " + var);              
+             log.debug("No value found for query parameter " + var);
          }
     }
-    
-    //Check if a certain key has a value associated that is not null 
-    
+
+    //Check if a certain key has a value associated that is not null
+
     public boolean hasLiteralValue(String key) {
     	return (this.literalsFromForm.containsKey(key) && this.literalsFromForm.get(key) != null);
     }
-    
+
     public boolean hasUriValue(String key) {
     	return (this.urisFromForm.containsKey(key) && this.urisFromForm.get(key) != null);
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/N3EditUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/N3EditUtils.java
index aa575b4cc..282624c5c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/N3EditUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/N3EditUtils.java
@@ -39,13 +39,13 @@ import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.DataGetterUtils;
 public class N3EditUtils {
     final static Log log = LogFactory.getLog(N3EditUtils.class);
 
-    
+
     /**
-     * Execute any modelChangePreprocessors in the editConfiguration; 
+     * Execute any modelChangePreprocessors in the editConfiguration;
      */
     public static void preprocessModels(
-            AdditionsAndRetractions changes, 
-            EditConfigurationVTwo editConfiguration, 
+            AdditionsAndRetractions changes,
+            EditConfigurationVTwo editConfiguration,
             VitroRequest request){
 
         List<ModelChangePreprocessor> modelChangePreprocessors = editConfiguration.getModelChangePreprocessors();
@@ -58,37 +58,37 @@ public class N3EditUtils {
         	//if configuration specific preprocessors are null, use default preprocessors instead
         	modelChangePreprocessors = defaultPreprocessors;
         }
-        
+
        if(modelChangePreprocessors != null) {
             for ( ModelChangePreprocessor pp : modelChangePreprocessors ) {
                 //these work by side effect
                 pp.preprocess( changes.getRetractions(), changes.getAdditions(), request );
             }
-       }                   
+       }
     }
-    
+
     /**
-     * Find which default model preprocessors are associated with the application.  These will 
-     * be run everytime an edit/addition occurs, i.e. whenever the preprocessModels method is called. 
+     * Find which default model preprocessors are associated with the application.  These will
+     * be run everytime an edit/addition occurs, i.e. whenever the preprocessModels method is called.
      */
-    
+
     public static List<ModelChangePreprocessor> getDefaultModelChangePreprocessors(VitroRequest vreq, Model displayModel) {
     	List<ModelChangePreprocessor> preprocessors = new ArrayList<ModelChangePreprocessor>();
-    	
+
     	//From the display model, find which preprocessors have been declared
     	String preprocessorOwlClass = "java:edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.ModelChangePreprocessor";
     	String prefixes =        "PREFIX rdf:   <" + VitroVocabulary.RDF +"> \n" +
-    	        "PREFIX rdfs:  <" + VitroVocabulary.RDFS +"> \n" + 
+    	        "PREFIX rdfs:  <" + VitroVocabulary.RDFS +"> \n" +
     	        "PREFIX xsd:  <http://www.w3.org/2001/XMLSchema#> \n" +
     	        "PREFIX display: <" + DisplayVocabulary.DISPLAY_NS +"> \n";
-    	String query = prefixes + 
+    	String query = prefixes +
                 "SELECT ?modelChangePreprocessor  WHERE { ?modelChangePreprocessor a <" + preprocessorOwlClass + "> . }";
         Query preprocessorQuery = QueryFactory.create(query);
         displayModel.enterCriticalSection(false);
            try{
                QueryExecution qexec = QueryExecutionFactory.create(preprocessorQuery,displayModel );
-               try{                                                    
-                   ResultSet results = qexec.execSelect();                
+               try{
+                   ResultSet results = qexec.execSelect();
                    while (results.hasNext()) {
                        QuerySolution soln = results.nextSolution();
                        Resource modelChangePreprocessor = soln.getResource("modelChangePreprocessor");
@@ -100,7 +100,7 @@ public class N3EditUtils {
                         	  if(p != null) {
                         		  preprocessors.add(p);
                         	  }
-                          
+
                           } catch(Exception ex) {
                         	  log.error("Retrieving model change preprocessor resulted in an error", ex);
                           }
@@ -108,35 +108,35 @@ public class N3EditUtils {
                    }
                }finally{ qexec.close(); }
            }finally{ displayModel.leaveCriticalSection(); }
-                   
-   	
+
+
     	return preprocessors;
     }
-    
+
     //Copied this from DataGetterUtils - will need to refactor to put all of this in one place
     /**
-     * Returns a DataGetter using information in the 
+     * Returns a DataGetter using information in the
      * displayModel for the individual with the URI given by dataGetterURI
-     * to configure it. 
-     * 
+     * to configure it.
+     *
      * May return null.
      * This should not throw an exception if the URI exists and has a type
      * that does not implement the DataGetter interface.
      */
-    public static ModelChangePreprocessor preprocessorForURI(VitroRequest vreq, Model displayModel, String preprocessorURI) 
-    throws InstantiationException, IllegalAccessException, ClassNotFoundException, IllegalArgumentException, InvocationTargetException, SecurityException 
+    public static ModelChangePreprocessor preprocessorForURI(VitroRequest vreq, Model displayModel, String preprocessorURI)
+    throws InstantiationException, IllegalAccessException, ClassNotFoundException, IllegalArgumentException, InvocationTargetException, SecurityException
     {
         //get java class for dataGetterURI
-    	
+
         String preprocessorClassName = DataGetterUtils.getClassNameFromUri(preprocessorURI);
-        
+
         //figure out if it implements interface DataGetter
         Class<?> clz = Class.forName(preprocessorClassName);
         if( ! ModelChangePreprocessor.class.isAssignableFrom(clz) ){
     		log.debug("Class doesn't implement ModelChangePreprocessor: '" + preprocessorClassName + "'");
             return null;
         }
-        
+
        //We should get the arguments from the constructor from the display model as well
         //So we don't need to check or constrain what can be passed here
        //Right now, this supports a preprocessor with no arguments
@@ -150,20 +150,20 @@ public class N3EditUtils {
         return (ModelChangePreprocessor) clz.newInstance();
     }
 
-    /** 
-     * Process Entity to Return to - substituting uris etc. 
+    /**
+     * Process Entity to Return to - substituting uris etc.
      * May return null.  */
     public static String processEntityToReturnTo(
-            EditConfigurationVTwo configuration, 
-            MultiValueEditSubmission submission, 
-            VitroRequest vreq) {      
+            EditConfigurationVTwo configuration,
+            MultiValueEditSubmission submission,
+            VitroRequest vreq) {
         String returnTo = null;
-        
+
         //usually the submission should have a returnTo that is
         // already substituted in with values during ProcessRdfForm.process()
-        if( submission != null && submission.getEntityToReturnTo() != null 
+        if( submission != null && submission.getEntityToReturnTo() != null
                 && !submission.getEntityToReturnTo().trim().isEmpty()){
-            returnTo = submission.getEntityToReturnTo();            
+            returnTo = submission.getEntityToReturnTo();
         }else{
             //If submission doesn't have it, do the best that we can do.
             //this will not have the new resource URIs.
@@ -171,26 +171,26 @@ public class N3EditUtils {
             String entity = configuration.getEntityToReturnTo();
             entityToReturnTo.add(entity);
             EditN3GeneratorVTwo n3Subber = configuration.getN3Generator();
-        
+
             //Substitute URIs and literals from form
             n3Subber.subInMultiUris(submission.getUrisFromForm(), entityToReturnTo);
             n3Subber.subInMultiLiterals(submission.getLiteralsFromForm(), entityToReturnTo);
-        
+
             //TODO: this won't work to get new resoruce URIs,
             //must the same new resources as in ProcessRdfForm.process
             //setVarToNewResource(configuration, vreq);
             //entityToReturnTo = n3Subber.subInMultiUris(varToNewResource, entityToReturnTo);
-            
+
             returnTo = entityToReturnTo.get(0);
         }
 
-        //remove brackets from sub in of URIs 
-        if(returnTo != null) {            
-            returnTo = returnTo.trim().replaceAll("<","").replaceAll(">","");       
+        //remove brackets from sub in of URIs
+        if(returnTo != null) {
+            returnTo = returnTo.trim().replaceAll("<","").replaceAll(">","");
         }
         return returnTo;
     }
-    
+
     /**
      * If the edit was a data property statement edit, then this updates the EditConfiguration to
      * be an edit of the new post-edit statement.  This allows a back button to the form to get the
@@ -199,20 +199,20 @@ public class N3EditUtils {
      */
     public static void updateEditConfigurationForBackButton(
             EditConfigurationVTwo editConfig,
-            MultiValueEditSubmission submission, 
-            VitroRequest vreq, 
+            MultiValueEditSubmission submission,
+            VitroRequest vreq,
             Model writeModel) {
-        
+
         //now setup an EditConfiguration so a single back button submissions can be handled
         //Do this if data property
         if(EditConfigurationUtils.isDataProperty(editConfig.getPredicateUri(), vreq)) {
             EditConfigurationVTwo copy = editConfig.copy();
-            
-            //need a new DataPropHash and a new editConfig that uses that, and replace 
+
+            //need a new DataPropHash and a new editConfig that uses that, and replace
             //the editConfig used for this submission in the session.  The same thing
             //is done for an update or a new insert since it will convert the insert
-            //EditConfig into an update EditConfig.                       
-             
+            //EditConfig into an update EditConfig.
+
             DataPropertyStatement dps = new DataPropertyStatementImpl();
             List<Literal> submitted = submission.getLiteralsFromForm().get(copy.getVarNameForObject());
             if( submitted != null && submitted.size() > 0){
@@ -222,21 +222,21 @@ public class N3EditUtils {
                     dps.setDatatypeURI( submittedLiteral.getDatatypeURI());
                     dps.setLanguage( submittedLiteral.getLanguage() );
                     dps.setData( submittedLiteral.getLexicalForm() );
-                   
-                    copy.setDatapropKey( RdfLiteralHash.makeRdfLiteralHash(dps) );                    
-                    copy.prepareForDataPropUpdate(writeModel, vreq.getWebappDaoFactory().getDataPropertyDao());                    
+
+                    copy.setDatapropKey( RdfLiteralHash.makeRdfLiteralHash(dps) );
+                    copy.prepareForDataPropUpdate(writeModel, vreq.getWebappDaoFactory().getDataPropertyDao());
                 }
                 EditConfigurationVTwo.putConfigInSession(copy,vreq.getSession());
             }
         }
-        
+
     }
 
 
     /** Several places could give an editor URI. Return the first one. */
     public static String getEditorUri(HttpServletRequest request) {
         IdentifierBundle ids = RequestIdentifiers.getIdBundleForRequest(request);
-    
+
         List<String> uris = new ArrayList<String>();
         uris.addAll(IsUser.getUserUris(ids));
         uris.addAll(HasProfile.getProfileUris(ids));
@@ -261,7 +261,7 @@ public class N3EditUtils {
             }
         }
         return out.toString();
-    }    
-    
-   
+    }
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/N3ValidatorVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/N3ValidatorVTwo.java
index e8269f90c..f0699ce13 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/N3ValidatorVTwo.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/N3ValidatorVTwo.java
@@ -5,5 +5,5 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
 import java.util.Map;
 
 public interface N3ValidatorVTwo {
-	public Map<String,String> validate(EditConfigurationVTwo editConfig, MultiValueEditSubmission editSub);	
+	public Map<String,String> validate(EditConfigurationVTwo editConfig, MultiValueEditSubmission editSub);
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/NewURIMaker.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/NewURIMaker.java
index 7f8f1244a..a57cad808 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/NewURIMaker.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/NewURIMaker.java
@@ -5,16 +5,16 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
 import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
 
 /**
- * Interface for an object that returns a new, unused URI, 
- * in the default namespace or in a specified namespace. 
+ * Interface for an object that returns a new, unused URI,
+ * in the default namespace or in a specified namespace.
  *
  */
 public interface NewURIMaker {
     /**
-     * @param prefixURI - may be null, the use the default namespace. If it is 
-     * not null, then it is used as prefix of the new URI, a random integer may be added. 
+     * @param prefixURI - may be null, the use the default namespace. If it is
+     * not null, then it is used as prefix of the new URI, a random integer may be added.
      * @return a URI that is not currently in use by the system.
-     * @throws InsertException 
+     * @throws InsertException
      */
-    String getUnusedNewURI( String prefixURI ) throws InsertException;    
+    String getUnusedNewURI( String prefixURI ) throws InsertException;
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java
index d39946e51..54fd7fb1b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java
@@ -26,104 +26,104 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfigurationConstants;
 
 /**
- * The goal of this class is to provide processing from 
+ * The goal of this class is to provide processing from
  * an EditConfiguration and an EditSubmission to produce
  * a set of additions and retractions.
- * 
- * When working with the default object property form or the 
- * default data property from, the way to avoid having 
- * any optional N3 is to originally configure the 
- * configuration.setN3Optional() to be empty. 
+ *
+ * When working with the default object property form or the
+ * default data property from, the way to avoid having
+ * any optional N3 is to originally configure the
+ * configuration.setN3Optional() to be empty.
  */
-public class ProcessRdfForm {               
-       
+public class ProcessRdfForm {
+
     private NewURIMaker newURIMaker;
     private EditN3GeneratorVTwo populator;
-    
-    private Map<String,String> urisForNewResources = null; 
+
+    private Map<String,String> urisForNewResources = null;
    /**
-     * Construct the ProcessRdfForm object. 
+     * Construct the ProcessRdfForm object.
      */
     public ProcessRdfForm( EditConfigurationVTwo config, NewURIMaker newURIMaker){
         this.newURIMaker = newURIMaker;
         this.populator = config.getN3Generator();
     }
-    
+
     /**
      * This detects if this is an edit of an existing statement or an edit
      * to create a new statement or set of statements. Then the correct
      * method will be called to convert the EditConfiguration and EditSubmission
      * into a set of additions and retractions.
-     * 
-     * This will handle data property editing, object property editing 
+     *
+     * This will handle data property editing, object property editing
      * and general editing.
-     * 
+     *
      * The submission object will be modified to have its entityToReturnTo string
      * substituted with the values from the processing.
-     * 
+     *
      * @throws Exception May throw an exception if Required N3 does not
      * parse correctly.
      */
     public AdditionsAndRetractions  process(
             EditConfigurationVTwo configuration,
             MultiValueEditSubmission submission,
-            VitroRequest vreq) 
-    throws Exception{  
+            VitroRequest vreq)
+    throws Exception{
         log.debug("configuration:\n" + configuration.toString());
         log.debug("submission:\n" + submission.toString());
-        
+
         applyEditSubmissionPreprocessors( configuration, submission, vreq );
-        
+
         AdditionsAndRetractions changes;
         if( configuration.isUpdate() ){
             changes = editExistingStatements(configuration, submission);
         } else {
             changes = createNewStatements(configuration, submission );
-        }       
+        }
+
+        changes = getMinimalChanges(changes);
+        logChanges( configuration, changes);
 
-        changes = getMinimalChanges(changes);      
-        logChanges( configuration, changes);        
-        
         return changes;
     }
-    
-    /** 
-     * Processes an EditConfiguration for to create a new statement or a 
+
+    /**
+     * Processes an EditConfiguration for to create a new statement or a
      * set of new statements.
-     *  
-     * This will handle data property editing, object property editing 
+     *
+     * This will handle data property editing, object property editing
      * and general editing.
-     * 
-     * When working with the default object property form or the 
-     * default data property from, the way to avoid having 
-     * any optional N3 is to originally configure the 
-     * configuration.setN3Optional() to be empty. 
-     * 
-     * @throws Exception May throw an exception if the required N3 
+     *
+     * When working with the default object property form or the
+     * default data property from, the way to avoid having
+     * any optional N3 is to originally configure the
+     * configuration.setN3Optional() to be empty.
+     *
+     * @throws Exception May throw an exception if the required N3
      * does not parse.
-     */          
+     */
     private AdditionsAndRetractions createNewStatements(
-            EditConfigurationVTwo configuration, 
-            MultiValueEditSubmission submission) throws Exception {                
-        log.debug("in createNewStatements()" );        
-        
-        //getN3Required and getN3Optional will return copies of the 
+            EditConfigurationVTwo configuration,
+            MultiValueEditSubmission submission) throws Exception {
+        log.debug("in createNewStatements()" );
+
+        //getN3Required and getN3Optional will return copies of the
         //N3 String Lists so that this code will not modify the originals.
         List<String> requiredN3 = configuration.getN3Required();
-        List<String> optionalN3 = configuration.getN3Optional();                        
-        
+        List<String> optionalN3 = configuration.getN3Optional();
+
         /* substitute in the form values and existing values */
         subInValuesToN3( configuration, submission, requiredN3, optionalN3, null , null);
-                   
-        /* parse N3 to RDF Models, No retractions since all of the statements are new. */         
-        return parseN3ToChange(requiredN3, optionalN3, null, null);        
+
+        /* parse N3 to RDF Models, No retractions since all of the statements are new. */
+        return parseN3ToChange(requiredN3, optionalN3, null, null);
     }
 
-    /* for a list of N3 strings, substitute in the subject, predicate and object URIs 
+    /* for a list of N3 strings, substitute in the subject, predicate and object URIs
      * from the EditConfiguration. */
     protected void substituteInSubPredObjURIs(
             EditConfigurationVTwo configuration,
-            List<String>... n3StrLists){                
+            List<String>... n3StrLists){
         Map<String, String> valueMap = getSubPedObjVarMap(configuration);
         for (List<String> n3s : n3StrLists) {
             populator.subInUris(valueMap, n3s);
@@ -132,10 +132,10 @@ public class ProcessRdfForm {
 
     /**
      * Process an EditConfiguration to edit a set of existing statements.
-     * 
+     *
      * This will handle data property editing, object property editing and
      * general editing.
-     * 
+     *
      * No longer checking if field has changed, because assertions and
      * retractions are mutually diff'ed before statements are added to or
      * removed from the model. The explicit change check can cause problems in
@@ -145,73 +145,73 @@ public class ProcessRdfForm {
             EditConfigurationVTwo editConfig,
             MultiValueEditSubmission submission) throws Exception {
 
-        log.debug("editing an existing resource: " + editConfig.getObject() );        
+        log.debug("editing an existing resource: " + editConfig.getObject() );
 
-        //getN3Required and getN3Optional will return copies of the 
+        //getN3Required and getN3Optional will return copies of the
         //N3 String Lists so that this code will not modify the originals.
-        List<String> N3RequiredAssert = editConfig.getN3Required();        
+        List<String> N3RequiredAssert = editConfig.getN3Required();
         List<String> N3OptionalAssert = editConfig.getN3Optional();
-        List<String> N3RequiredRetract = editConfig.getN3Required();        
+        List<String> N3RequiredRetract = editConfig.getN3Required();
         List<String> N3OptionalRetract = editConfig.getN3Optional();
 
-        subInValuesToN3(editConfig, submission, 
-                N3RequiredAssert, N3OptionalAssert, 
+        subInValuesToN3(editConfig, submission,
+                N3RequiredAssert, N3OptionalAssert,
                 N3RequiredRetract, N3OptionalRetract);
-                                  
-        return parseN3ToChange( 
-                N3RequiredAssert,N3OptionalAssert, 
-                N3RequiredRetract, N3OptionalRetract);        
-    }    
-    
+
+        return parseN3ToChange(
+                N3RequiredAssert,N3OptionalAssert,
+                N3RequiredRetract, N3OptionalRetract);
+    }
+
     @SuppressWarnings("unchecked")
     protected void subInValuesToN3(
-            EditConfigurationVTwo editConfig, MultiValueEditSubmission submission, 
+            EditConfigurationVTwo editConfig, MultiValueEditSubmission submission,
             List<String> requiredAsserts, List<String> optionalAsserts,
             List<String> requiredRetracts, List<String> optionalRetracts ) throws InsertException{
-        
+
         //need to substitute into the return to URL becase it may need new resource URIs
         List<String> URLToReturnTo = Arrays.asList(submission.getEntityToReturnTo());
-        
+
         /* *********** Check if new resource needs to be forcibly created ******** */
         urisForNewResources = URIsForNewRsources(editConfig, newURIMaker);
         substituteInForcedNewURIs(urisForNewResources, submission.getUrisFromForm(), requiredAsserts, optionalAsserts, URLToReturnTo);
         logSubstitue( "Added form URIs that required new URIs", requiredAsserts, optionalAsserts, requiredRetracts, optionalRetracts);
 
-        
+
         /* ********** Form submission URIs ********* */
         substituteInMultiURIs(submission.getUrisFromForm(), requiredAsserts, optionalAsserts, URLToReturnTo);
         logSubstitue( "Added form URIs", requiredAsserts, optionalAsserts, requiredRetracts, optionalRetracts);
         //Retractions does NOT get values from form.
-        
+
         /* ******** Form submission Literals *********** */
         substituteInMultiLiterals( submission.getLiteralsFromForm(), requiredAsserts, optionalAsserts, URLToReturnTo);
         logSubstitue( "Added form Literals", requiredAsserts, optionalAsserts, requiredRetracts, optionalRetracts);
-        //Retractions does NOT get values from form.                               
-        
-    
-        
+        //Retractions does NOT get values from form.
+
+
+
         /* *********** Add subject, object and predicate ******** */
         substituteInSubPredObjURIs(editConfig, requiredAsserts, optionalAsserts, requiredRetracts, optionalRetracts, URLToReturnTo);
         logSubstitue( "Added sub, pred and obj URIs", requiredAsserts, optionalAsserts, requiredRetracts, optionalRetracts);
-        
-     
+
+
         /* ********* Existing URIs and Literals ********** */
-        substituteInMultiURIs(editConfig.getUrisInScope(), 
+        substituteInMultiURIs(editConfig.getUrisInScope(),
                 requiredAsserts, optionalAsserts, requiredRetracts, optionalRetracts, URLToReturnTo);
         logSubstitue( "Added existing URIs", requiredAsserts, optionalAsserts, requiredRetracts, optionalRetracts);
-        
-        substituteInMultiLiterals(editConfig.getLiteralsInScope(), 
+
+        substituteInMultiLiterals(editConfig.getLiteralsInScope(),
                 requiredAsserts, optionalAsserts, requiredRetracts, optionalRetracts, URLToReturnTo);
         logSubstitue( "Added existing Literals", requiredAsserts, optionalAsserts, requiredRetracts, optionalRetracts);
         //Both Assertions and Retractions get existing values.
-        
+
         /* ************  Edits may need new resources *********** */
         //moved this up?
         //urisForNewResources = URIsForNewRsources(editConfig, newURIMaker);
         substituteInURIs( urisForNewResources, requiredAsserts, optionalAsserts, URLToReturnTo);
         logSubstitue( "Added URIs for new Resources", requiredAsserts, optionalAsserts, requiredRetracts, optionalRetracts);
-        // Only Assertions get new resources.       
-        
+        // Only Assertions get new resources.
+
         submission.setEntityToReturnTo(URLToReturnTo.get(0));
     }
 
@@ -219,27 +219,27 @@ public class ProcessRdfForm {
 
 	//TODO: maybe move this to utils or contorller?
     public static AdditionsAndRetractions addDependentDeletes( AdditionsAndRetractions changes, Model queryModel){
-        //Add retractions for dependent resource delete if that is configured and 
-        //if there are any dependent resources.                     
-        Model depResRetractions = 
+        //Add retractions for dependent resource delete if that is configured and
+        //if there are any dependent resources.
+        Model depResRetractions =
             DependentResourceDeleteJena
-            .getDependentResourceDeleteForChange(changes.getAdditions(),changes.getRetractions(),queryModel);                
+            .getDependentResourceDeleteForChange(changes.getAdditions(),changes.getRetractions(),queryModel);
 
-        changes.getRetractions().add(depResRetractions);        
-        return changes; 
+        changes.getRetractions().add(depResRetractions);
+        return changes;
     }
-       
+
     public static void applyChangesToWriteModel(
-            AdditionsAndRetractions changes, 
-            Model queryModel, Model writeModel, String editorUri) {                             
-        //side effect: modify the write model with the changes      
+            AdditionsAndRetractions changes,
+            Model queryModel, Model writeModel, String editorUri) {
+        //side effect: modify the write model with the changes
         Lock lock = null;
         try{
             lock =  writeModel.getLock();
             lock.enterCriticalSection(Lock.WRITE);
             if( writeModel instanceof OntModel){
-                ((OntModel)writeModel).getBaseModel().notifyEvent(new EditEvent(editorUri,true));    
-            }               
+                ((OntModel)writeModel).getBaseModel().notifyEvent(new EditEvent(editorUri,true));
+            }
             writeModel.add( changes.getAdditions() );
             writeModel.remove( changes.getRetractions() );
         }catch(Throwable t){
@@ -249,37 +249,37 @@ public class ProcessRdfForm {
                 ((OntModel)writeModel).getBaseModel().notifyEvent(new EditEvent(editorUri,false));
             }
             lock.leaveCriticalSection();
-        }          
+        }
     }
-        
-    protected AdditionsAndRetractions parseN3ToChange( 
+
+    protected AdditionsAndRetractions parseN3ToChange(
             List<String> requiredAdds, List<String> optionalAdds,
             List<String> requiredDels, List<String> optionalDels) throws Exception{
-        
+
         List<Model> adds = parseN3ToRDF(requiredAdds, REQUIRED);
         adds.addAll( parseN3ToRDF(optionalAdds, OPTIONAL));
-        
+
         List<Model> retracts = new ArrayList<Model>();
         if( requiredDels != null && optionalDels != null ){
             retracts.addAll( parseN3ToRDF(requiredDels, REQUIRED) );
             retracts.addAll( parseN3ToRDF(optionalDels, OPTIONAL) );
         }
-        
+
         return new AdditionsAndRetractions(adds,retracts);
     }
-    
+
     /**
      * Parse the n3Strings to a List of RDF Model objects.
-     * 
+     *
      * @param n3Strings N3 Strings to parse
      * @param parseType if OPTIONAL, then don't throw exceptions on errors
      * If REQUIRED, then throw exceptions on errors.
-     * @throws Exception 
+     * @throws Exception
      */
     protected static List<Model> parseN3ToRDF(
             List<String> n3Strings, N3ParseType parseType ) throws Exception {
        List<String> errorMessages = new ArrayList<String>();
-       
+
         List<Model> rdfModels = new ArrayList<Model>();
         for(String n3 : n3Strings){
             try{
@@ -291,14 +291,14 @@ public class ProcessRdfForm {
                 errorMessages.add(t.getMessage() + "\nN3: \n" + n3 + "\n");
             }
         }
-        
+
         StringBuilder errors = new StringBuilder();
         for( String errorMsg : errorMessages){
             errors.append(errorMsg).append('\n');
         }
-        
+
        if( !errorMessages.isEmpty() ){
-           if( REQUIRED.equals(parseType)  ){        
+           if( REQUIRED.equals(parseType)  ){
                throw new Exception("Errors processing required N3. The EditConfiguration should " +
                     "be setup so that if a submission passes validation, there will not be errors " +
                     "in the required N3.\n" +  errors );
@@ -311,10 +311,10 @@ public class ProcessRdfForm {
                log.debug(errors.toString());
            }
        }
-              
-       return rdfModels;       
-    }      
-		    
+
+       return rdfModels;
+    }
+
     protected void logSubstitue(String msg, List<String> requiredAsserts,
             List<String> optionalAsserts, List<String> requiredRetracts,
             List<String> optionalRetracts) {
@@ -323,56 +323,56 @@ public class ProcessRdfForm {
         logSubstitueN3( msg, requiredAsserts, "required assertions");
         logSubstitueN3( msg, optionalAsserts, "optional assertions");
         logSubstitueN3( msg, requiredRetracts, "required retractions");
-        logSubstitueN3( msg, optionalRetracts, "optional retractions");        
+        logSubstitueN3( msg, optionalRetracts, "optional retractions");
     }
-    
+
     private void logSubstitueN3(String msg, List<String> n3, String label){
-        if( n3 == null || n3.size() == 0) return;        
+        if( n3 == null || n3.size() == 0) return;
         StringBuilder out = new StringBuilder(label + ":\n");
         for( String str : n3 ){
             out.append("    ").append(str).append("\n");
-        }                      
+        }
         log.debug(out.toString());
     }
-    
+
 	private static Map<String, String> getSubPedObjVarMap(
-            EditConfigurationVTwo configuration) 
+            EditConfigurationVTwo configuration)
     {
         Map<String,String> varToValue = new HashMap<String,String>();
-        
+
         String varNameForSub = configuration.getVarNameForSubject();
-        if( varNameForSub != null && ! varNameForSub.isEmpty()){            
-            varToValue.put( varNameForSub,configuration.getSubjectUri());                 
+        if( varNameForSub != null && ! varNameForSub.isEmpty()){
+            varToValue.put( varNameForSub,configuration.getSubjectUri());
         }else{
             log.debug("no varNameForSubject found in configuration");
         }
-        
+
         String varNameForPred = configuration.getVarNameForPredicate();
-        if( varNameForPred != null && ! varNameForPred.isEmpty()){            
+        if( varNameForPred != null && ! varNameForPred.isEmpty()){
             varToValue.put( varNameForPred,configuration.getPredicateUri());
         }else{
             log.debug("no varNameForPredicate found in configuration");
         }
         String varNameForObj = configuration.getVarNameForObject();
-        if( varNameForObj != null 
-        		&& ! varNameForObj.isEmpty()){            
+        if( varNameForObj != null
+        		&& ! varNameForObj.isEmpty()){
             varToValue.put( varNameForObj, configuration.getObject());
         }else{
             log.debug("no varNameForObject found in configuration");
-        }        
-        
-        return varToValue;        
+        }
+
+        return varToValue;
     }
-    
+
 	protected static AdditionsAndRetractions getMinimalChanges( AdditionsAndRetractions changes ){
-        //make a model with all the assertions and a model with all the 
+        //make a model with all the assertions and a model with all the
         //retractions, do a diff on those and then only add those to the jenaOntModel
         Model allPossibleAssertions = changes.getAdditions();
-        Model allPossibleRetractions = changes.getRetractions();        
-        
+        Model allPossibleRetractions = changes.getRetractions();
+
         //find the minimal change set
-        Model assertions = allPossibleAssertions.difference( allPossibleRetractions );    
-        Model retractions = allPossibleRetractions.difference( allPossibleAssertions );        
+        Model assertions = allPossibleAssertions.difference( allPossibleRetractions );
+        Model retractions = allPossibleRetractions.difference( allPossibleAssertions );
         return new AdditionsAndRetractions(assertions,retractions);
     }
 
@@ -386,19 +386,19 @@ public class ProcessRdfForm {
         }
     }
 
-   
+
    //Note this would require more analysis in context of multiple URIs
    public Map<String,String> URIsForNewRsources(
-           EditConfigurationVTwo configuration, NewURIMaker newURIMaker) 
-           throws InsertException {       
+           EditConfigurationVTwo configuration, NewURIMaker newURIMaker)
+           throws InsertException {
        Map<String,String> newResources = configuration.getNewResources();
-       
-       HashMap<String,String> varToNewURIs = new HashMap<String,String>();       
+
+       HashMap<String,String> varToNewURIs = new HashMap<String,String>();
        for (String key : newResources.keySet()) {
            String prefix = newResources.get(key);
-           String uri = newURIMaker.getUnusedNewURI(prefix);                        
-           varToNewURIs.put(key, uri);  
-       }   
+           String uri = newURIMaker.getUnusedNewURI(prefix);
+           varToNewURIs.put(key, uri);
+       }
        log.debug( "URIs for new resources: " + varToNewURIs );
        return varToNewURIs;
    }
@@ -406,26 +406,26 @@ public class ProcessRdfForm {
    private static void logChanges(EditConfigurationVTwo configuration,
            AdditionsAndRetractions changes) {
        if( log.isDebugEnabled() )
-           log.debug("Changes for edit " + configuration.getEditKey() + 
+           log.debug("Changes for edit " + configuration.getEditKey() +
                    "\n" + changes.toString());
    }
-   
+
    private static N3ParseType OPTIONAL = N3ParseType.OPTIONAL;
    private static N3ParseType REQUIRED = N3ParseType.REQUIRED;
-   
+
    private enum N3ParseType {
-       /* indicates that the n3 is optional and that a parse error should not 
-        * throw an exception */         
-       OPTIONAL,  
-       /* indicates that the N3 is required and that a parse error should 
+       /* indicates that the n3 is optional and that a parse error should not
+        * throw an exception */
+       OPTIONAL,
+       /* indicates that the N3 is required and that a parse error should
         * stop the processing and throw an exception. */
-       REQUIRED 
+       REQUIRED
    };
 
    private void substituteInMultiLiterals(
            Map<String, List<Literal>> literalsFromForm,
            List<String> ... n3StrLists) {
-       
+
        for( List<String> n3s : n3StrLists){
            populator.subInMultiLiterals(literalsFromForm, n3s);
        }
@@ -433,23 +433,23 @@ public class ProcessRdfForm {
 
    private  void substituteInMultiURIs(
            Map<String, List<String>> multiUris, List<String> ... n3StrLists) {
-       
+
        for( List<String> n3s : n3StrLists){
            if( n3s != null ){
                populator.subInMultiUris(multiUris, n3s);
            }
-       }                
+       }
    }
 
    private void substituteInURIs(
-           Map<String, String> uris, List<String> ... n3StrLists) {        
+           Map<String, String> uris, List<String> ... n3StrLists) {
        for( List<String> n3s : n3StrLists){
            if( n3s != null ){
                populator.subInUris(uris, n3s);
            }
-       }                
-   }    
-   
+       }
+   }
+
    /*
     * In some situations, an object may have an existing URI but be left blank
     * when the desired behavior is that a new object be created to replace the existing URI
@@ -474,9 +474,9 @@ public class ProcessRdfForm {
 	   if(newUris.size() > 0) {
 		   substituteInMultiURIs(newUris, requiredAsserts, optionalAsserts, uRLToReturnTo);
 	   }
-	   
+
 	}
-   
-      
+
+
    private static Log log = LogFactory.getLog(ProcessRdfForm.class);
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/RdfLiteralHash.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/RdfLiteralHash.java
index f8666a457..26ead9657 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/RdfLiteralHash.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/RdfLiteralHash.java
@@ -19,33 +19,33 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 /**
  * Set of static methods to create hashes for RDF literal statements
  * so they can be referenced in HTTP parameters.
- * This allows the creation of a URL to request the deletion of a 
+ * This allows the creation of a URL to request the deletion of a
  * RDF literal statement without including the whole literal in the parameters.
  *
  * ex.
  * {@code http://fake.com/delete?sub="http://bob"&pred="http://hasNickName"&stmtHash="23443434"}
  *
- * This could request the deletion of a the statement for Bob's nickname where the 
+ * This could request the deletion of a the statement for Bob's nickname where the
  * literal matched the hash 23443434.
- * 
+ *
  * The hash is for the whole statement, not just the literal part.  The has will only match
- * if the subject, predicate, datetype/language and literal match. 
- * 
+ * if the subject, predicate, datetype/language and literal match.
+ *
  */
 public class RdfLiteralHash {
-    
+
     private static final Log log = LogFactory.getLog(RdfLiteralHash.class.getName());
-    
+
     /**
      * Make a hash based on individual, property, literal and (lang or datatype).
-     * 
+     *
      * @param stmt Data statement
-     * @return a value between MIN_INTEGER and MAX_INTEGER 
+     * @return a value between MIN_INTEGER and MAX_INTEGER
      */
     public static int makeRdfLiteralHash( DataPropertyStatement stmt ){
         if( stmt.getIndividualURI() == null || stmt.getIndividualURI().trim().length() == 0 )
             throw new Error("Cannot make a hash for a statement with no subject URI");
-        
+
         if( stmt.getDatapropURI() == null || stmt.getDatapropURI().trim().length() == 0)
             throw new Error("Cannot make a hash for a statement with no predicate URI");
 
@@ -69,10 +69,10 @@ public class RdfLiteralHash {
      * @param stmt Data statement
      * @param hash Hash
      */
-    public static boolean doesStmtMatchHash( DataPropertyStatement stmt, int hash){ 
+    public static boolean doesStmtMatchHash( DataPropertyStatement stmt, int hash){
         if( stmt == null )
             return false;
-        
+
         int stmtHash;
         try{
             stmtHash = makeRdfLiteralHash(stmt);
@@ -82,7 +82,7 @@ public class RdfLiteralHash {
         }
         return stmtHash == hash;
     }
-    
+
     /**
      * Forward to either getDataPropertyStmtByHash or getRdfsLabelStatementByHash, depending on the property.
      * @param subjectUri  Subject URI
@@ -92,20 +92,20 @@ public class RdfLiteralHash {
      * @return a DataPropertyStatement if found or null if not found
      */
 
-    public static DataPropertyStatement getPropertyStmtByHash(String subjectUri, String predicateUri, int hash, Model model) {        
+    public static DataPropertyStatement getPropertyStmtByHash(String subjectUri, String predicateUri, int hash, Model model) {
         if (subjectUri == null || predicateUri == null ) return null;
-        
+
         model.enterCriticalSection(false);
-        StmtIterator stmts = model.listStatements(model.createResource(subjectUri),  
+        StmtIterator stmts = model.listStatements(model.createResource(subjectUri),
                                                   model.getProperty(predicateUri),
-                                                  (RDFNode)null);        
+                                                  (RDFNode)null);
         try {
             while (stmts.hasNext()) {
                 Statement stmt = stmts.nextStatement();
                 RDFNode node = stmt.getObject();
                 if ( node.isLiteral() ){
                     DataPropertyStatement dps =
-                        makeDataPropertyStatementFromStatement(stmt, node);          
+                        makeDataPropertyStatementFromStatement(stmt, node);
                     if (doesStmtMatchHash(dps, hash)) {
                         return dps;
                     }
@@ -115,22 +115,22 @@ public class RdfLiteralHash {
         } finally {
                 stmts.close();
                 model.leaveCriticalSection();
-        }    
-    }   
-    
-    
-    public static int makeRdfsLabelLiteralHash( Individual subject, String value, Model  model) { 
-        
+        }
+    }
+
+
+    public static int makeRdfsLabelLiteralHash( Individual subject, String value, Model  model) {
+
         String subjectUri = subject.getURI();
         String predicateUri = VitroVocabulary.LABEL;
-        
-        StmtIterator stmts = model.listStatements(model.createResource(subjectUri), 
-                                                  model.getProperty(predicateUri), 
-                                                  (RDFNode) null);                     
+
+        StmtIterator stmts = model.listStatements(model.createResource(subjectUri),
+                                                  model.getProperty(predicateUri),
+                                                  (RDFNode) null);
         DataPropertyStatement dps = null;
         int hash = 0;
         int count = 0;
-        try {           
+        try {
             while (stmts.hasNext()) {
                 Statement stmt = stmts.nextStatement();
                 RDFNode node = stmt.getObject();
@@ -143,20 +143,20 @@ public class RdfLiteralHash {
         } finally {
             stmts.close();
         }
-        
+
         if( count == 1 ) {
             return hash;
         } else if( count == 0 ){
             log.debug("No data property statement for " +
                     "subject:" + subjectUri + "\npredicate:" + predicateUri + "\nvalue: " + value);
             throw new IllegalArgumentException("Could not create RdfLiteralHash because " +
-                    "there was no data property statement with the given value.");      
+                    "there was no data property statement with the given value.");
         } else{
             log.debug("Multiple data property statements for " +
                     "subject:" + subjectUri + "\npredicate:" + predicateUri + "\nvalue: " + value);
             throw new IllegalArgumentException("Could not create RdfLiteralHash because " +
-                    "there were multiple data property statements with the given value.");                  
-        }       
+                    "there were multiple data property statements with the given value.");
+        }
     }
 
     private static DataPropertyStatement makeDataPropertyStatementFromStatement(Statement statement, RDFNode node) {
@@ -172,8 +172,8 @@ public class RdfLiteralHash {
         dps.setData(value);
         dps.setDatapropURI(statement.getPredicate().getURI());
         dps.setIndividualURI(statement.getSubject().getURI());
-         
+
         return dps;
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/SparqlEvaluateVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/SparqlEvaluateVTwo.java
index caaccbcb8..0891c6259 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/SparqlEvaluateVTwo.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/SparqlEvaluateVTwo.java
@@ -92,7 +92,7 @@ public class SparqlEvaluateVTwo {
         Map<String,List<Literal>> varToLiterals = new HashMap<String,List<Literal>>();
         for(String var : varToSparql.keySet()){
             String query = varToSparql.get(var);
-            log.debug("Var name " + var + " and query = " + query);           
+            log.debug("Var name " + var + " and query = " + query);
             /* skip if var set to use a system generated value */
             if( query == null || EditConfigurationVTwo.USE_SYSTEM_VALUE.equals( query )) {
             	log.debug("Query is null or using system value so will not continue with rest of method");
@@ -118,7 +118,7 @@ public class SparqlEvaluateVTwo {
 
         for(String var : varToSparql.keySet()){
             String query = varToSparql.get(var);
-            log.debug("Var name " + var + " and query = " + query);           
+            log.debug("Var name " + var + " and query = " + query);
             /* skip if var set to use a system generated value */
             if( query == null || EditConfigurationVTwo.USE_SYSTEM_VALUE.equals( query )) {
             	log.debug("Query is null or using system value so will not continue with rest of method");
@@ -132,13 +132,13 @@ public class SparqlEvaluateVTwo {
             log.debug("Query after substituting literals in scope: " + queryStrings.toString());
             List<String> uriFromQuery = queryToUri(  queryStrings.get(0) );
             if( uriFromQuery != null )
-            {    
+            {
             	//Added parens and output
             	varToUris.put(var, uriFromQuery);
             }
-            else 
-                log.debug("sparqlEvaluateForUris(): for var " + var 
-                        + " the following query evaluated to null:\n"+queryStrings.get(0)+"\n(end of query)\n");                            
+            else
+                log.debug("sparqlEvaluateForUris(): for var " + var
+                        + " the following query evaluated to null:\n"+queryStrings.get(0)+"\n(end of query)\n");
         }
 
         return varToUris;
@@ -160,13 +160,13 @@ public class SparqlEvaluateVTwo {
 //            if( literalFromQuery != null )
 //                varToLiterals.put(var, literalFromQuery );
 //            else
-//                log.debug("sparqlEvaluateForAdditionalLiterals(): for var " + var 
+//                log.debug("sparqlEvaluateForAdditionalLiterals(): for var " + var
 //                        + "query evaluated to null. query: '" + queryStrings.get(0) +"'");
 //        }
 //
 //        return varToLiterals;
 //    }
-    
+
     //now can return multiple uris
     public  List<String> queryToUri(String querystr){
         log.debug("Query string in queryToUri():" + querystr);
@@ -189,9 +189,9 @@ public class SparqlEvaluateVTwo {
                         value =  resource.getURI();
                         values.add(value);
                     }
-                    
-                    
-                   
+
+
+
                 }else{
                 	log.debug("Query had no results");
                     return null;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesOptions.java
index f975d5b73..f87dd8f48 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesOptions.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesOptions.java
@@ -23,65 +23,65 @@ public class ChildVClassesOptions implements FieldOptions {
     private String vclassUri;
 
     private String defaultOptionLabel;
-    
+
     static Log log = LogFactory.getLog(ChildVClassesOptions.class);
-    
+
     public ChildVClassesOptions(String vclassUri) {
-        super();        
-        this.vclassUri = vclassUri;        
+        super();
+        this.vclassUri = vclassUri;
     }
-    
+
     public ChildVClassesOptions setDefaultOptionLabel(String label){
         this.defaultOptionLabel = label;
         return this;
     }
 
     @Override
-    public Map<String, String> getOptions(            
-            EditConfigurationVTwo editConfig, 
-            String fieldName, 
+    public Map<String, String> getOptions(
+            EditConfigurationVTwo editConfig,
+            String fieldName,
             WebappDaoFactory wDaoFact) throws Exception{
         // now create an empty HashMap to populate and return
         HashMap <String,String> optionsMap = new LinkedHashMap<String,String>();
-        
+
         // for debugging, keep a count of the number of options populated
         int optionsCount=0;
 
-        
+
         if (vclassUri==null || vclassUri.equals("")){
             throw new Exception("no vclassUri found for field \""+fieldName+"\" in SelectListGenerator.getOptions() when OptionsType CHILD_VCLASSES specified");
         } else {
-            
-            // first test to see whether there's a default "leave blank" value specified with the literal options            
+
+            // first test to see whether there's a default "leave blank" value specified with the literal options
             if (defaultOptionLabel!=null) {
                 optionsMap.put(LEFT_BLANK, defaultOptionLabel);
             }
-            
-            // now populate the options                            
+
+            // now populate the options
             VClassDao vclassDao = wDaoFact.getVClassDao();
             List<String> subClassList = vclassDao.getAllSubClassURIs(vclassUri);
-            
-            if( subClassList == null || subClassList.size()==0 ) { 
+
+            if( subClassList == null || subClassList.size()==0 ) {
                 log.debug("No subclasses of " + vclassUri + " found in the model so only default value from field's literalOptions will be used" );
-            } else {                
+            } else {
                 for( String subClassUri : subClassList ) {
                     VClass subClass = vclassDao.getVClassByURI(subClassUri);
-                    if( subClass != null && !OWL.Nothing.getURI().equals(subClassUri)) {                        
-                        optionsMap.put(subClassUri,subClass.getName().trim());                        
+                    if( subClass != null && !OWL.Nothing.getURI().equals(subClassUri)) {
+                        optionsMap.put(subClassUri,subClass.getName().trim());
                         ++optionsCount;
                     }
                 }
             }
         }
-        
+
         log.debug("added "+optionsCount+" options for field \""+fieldName+"\"");
         return optionsMap;
     }
 
     public String getClassUri(){
-        return vclassUri;    
+        return vclassUri;
     }
-    
+
     public Comparator<String[]> getCustomComparator() {
     	return null;
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesWithParent.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesWithParent.java
index c80d8570c..135b38474 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesWithParent.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesWithParent.java
@@ -22,34 +22,34 @@ public class ChildVClassesWithParent implements FieldOptions {
     String fieldName;
     String classUri;
     String defaultOptionLabel = null;
-    
+
     public ChildVClassesWithParent(String classUri) throws Exception {
         super();
-        
+
         if (classUri==null || classUri.equals(""))
             throw new Exception ("vclassUri not set");
-        
+
         this.classUri = classUri;
     }
-   
+
     public ChildVClassesWithParent setDefaultOption(String label){
         this.defaultOptionLabel = label;
         return this;
     }
-    
+
     @Override
     public Map<String, String> getOptions(
-            EditConfigurationVTwo editConfig, 
-            String fieldName, 
+            EditConfigurationVTwo editConfig,
+            String fieldName,
             WebappDaoFactory wDaoFact) throws Exception {
-        
-        HashMap <String,String> optionsMap = new LinkedHashMap<String,String>();      
-        // first test to see whether there's a default "leave blank" value specified with the literal options        
+
+        HashMap <String,String> optionsMap = new LinkedHashMap<String,String>();
+        // first test to see whether there's a default "leave blank" value specified with the literal options
         if ( ! StringUtils.isEmpty( defaultOptionLabel ) ){
-            optionsMap.put(LEFT_BLANK, defaultOptionLabel);        
-        } 
-        
-        optionsMap.put(classUri, "Other");       
+            optionsMap.put(LEFT_BLANK, defaultOptionLabel);
+        }
+
+        optionsMap.put(classUri, "Other");
 
         VClassDao vclassDao = wDaoFact.getVClassDao();
         List<String> subClassList = vclassDao.getAllSubClassURIs(classUri);
@@ -57,13 +57,13 @@ public class ChildVClassesWithParent implements FieldOptions {
             for (String subClassUri : subClassList) {
                 VClass subClass = vclassDao.getVClassByURI(subClassUri);
                 if (subClass != null && !OWL.Nothing.getURI().equals(subClassUri)) {
-                    optionsMap.put(subClassUri, subClass.getName().trim());         
+                    optionsMap.put(subClassUri, subClass.getName().trim());
                 }
             }
         }
        return optionsMap;
     }
-    
+
     public Comparator<String[]> getCustomComparator() {
     	return null;
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ConstantFieldOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ConstantFieldOptions.java
index 656a8253c..3c68ac14d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ConstantFieldOptions.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ConstantFieldOptions.java
@@ -13,67 +13,67 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTw
 
 public class ConstantFieldOptions implements FieldOptions {
 
-    List<List<String>> options;       
-    
+    List<List<String>> options;
+
     public ConstantFieldOptions(String ... optionPairs) throws Exception {
-        super();                
-        
-        if (optionPairs==null) 
+        super();
+
+        if (optionPairs==null)
             throw new Exception("Must specify option pairs in ConstantFieldOptions constructor");
-        
+
         if( optionPairs.length % 2 != 0)
             throw new Exception("options must be in pairs of (value,lable)");
-        
-        options = new ArrayList<List<String>>( optionPairs.length / 2 );        
+
+        options = new ArrayList<List<String>>( optionPairs.length / 2 );
         for(int i=0; i< optionPairs.length ; i=i+2){
-            List<String> pair = new ArrayList<String>(2);                        
+            List<String> pair = new ArrayList<String>(2);
             pair.add(optionPairs[i]);
-            pair.add(optionPairs[i+1]);                        
+            pair.add(optionPairs[i+1]);
             options.add( pair );
-        }                
+        }
     }
 
 
     public ConstantFieldOptions(String fieldName2,
             List<List<String>> optionPairs) throws Exception {
-                        
+
         for(List<String> literalPair: optionPairs ){
             if( literalPair == null)
                 throw new Exception("no items in optionPairs may be null.");
             if( literalPair.size() == 0 )
                 throw new Exception("no items in optionPairs  may be empty lists.");
             if( literalPair.size() > 2)
-                throw new Exception("no items in optionPairs  may be lists longer than 2 items.");                        
+                throw new Exception("no items in optionPairs  may be lists longer than 2 items.");
         }
-                
+
         options = optionPairs;
     }
 
 
     @Override
     public Map<String, String> getOptions(
-            EditConfigurationVTwo editConfig, 
-            String fieldName, 
+            EditConfigurationVTwo editConfig,
+            String fieldName,
             WebappDaoFactory wDaoFact) throws Exception {
         // originally not auto-sorted but sorted now, and empty values not removed or replaced
         HashMap <String,String> optionsMap = new LinkedHashMap<String,String>();
-        
+
         for(Object obj: ((Iterable)options)){
             List<String> literalPair = (List)obj;
             String value=(String)literalPair.get(0);
             if( value != null){  // allow empty string as a value
                 String label=(String)literalPair.get(1);
-                if (label!=null) { 
+                if (label!=null) {
                     optionsMap.put(value,label);
                 } else {
                     optionsMap.put(value, value);
-                }                
+                }
             }
         }
-        
+
         return optionsMap;
     }
-    
+
     public Comparator<String[]> getCustomComparator() {
     	return null;
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/FieldOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/FieldOptions.java
index 4b6bc26e6..b2c67f549 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/FieldOptions.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/FieldOptions.java
@@ -10,31 +10,31 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTw
 /**
  * Represents an object that can return a list of options
  * for an HTML select list.
- * 
- * @author bdc34 
- *        
+ *
+ * @author bdc34
+ *
  */
 public interface FieldOptions {
-    
+
     /**
      * Any object that are needed to get the options should
      * be passed in the constructor of the implementation.
-     * 
+     *
      * @return return a map of value-&gt;label for the options.
      * Should never return null.
-     * 
-     * @throws Exception 
+     *
+     * @throws Exception
      */
     public Map<String,String> getOptions(
-            EditConfigurationVTwo editConfig, 
-            String fieldName, 
+            EditConfigurationVTwo editConfig,
+            String fieldName,
             WebappDaoFactory wDaoFact) throws Exception;
-    
+
     /*
      * Certain field options may have custom sorting requirements. If no sorting requirements exist,
      * then the method will return null.
      */
-    
+
     public Comparator<String[]> getCustomComparator();
 }
 
@@ -43,19 +43,19 @@ public interface FieldOptions {
 LITERALS,x
 
 HARDCODED_LITERALS,
-STRINGS_VIA_DATATYPE_PROPERTY, 
+STRINGS_VIA_DATATYPE_PROPERTY,
 
 INDIVIDUALS_VIA_OBJECT_PROPERTY, x
 
-INDIVIDUALS_VIA_VCLASS, 
+INDIVIDUALS_VIA_VCLASS,
 
 CHILD_VCLASSES, x
 
 CHILD_VCLASSES_WITH_PARENT,
 VCLASSGROUP,
-FILE, 
+FILE,
 UNDEFINED, x
-DATETIME, 
+DATETIME,
 DATE,
 TIME
-*/
\ No newline at end of file
+*/
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/FieldVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/FieldVTwo.java
index 9e1b87e3d..45c73c30d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/FieldVTwo.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/FieldVTwo.java
@@ -13,34 +13,34 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditElementVTwo;
 public class FieldVTwo {
 
 //    public enum OptionsType {
-//        LITERALS, 
+//        LITERALS,
 //        HARDCODED_LITERALS,
-//        STRINGS_VIA_DATATYPE_PROPERTY, 
-//        INDIVIDUALS_VIA_OBJECT_PROPERTY, 
-//        INDIVIDUALS_VIA_VCLASS, 
-//        CHILD_VCLASSES, 
+//        STRINGS_VIA_DATATYPE_PROPERTY,
+//        INDIVIDUALS_VIA_OBJECT_PROPERTY,
+//        INDIVIDUALS_VIA_VCLASS,
+//        CHILD_VCLASSES,
 //        CHILD_VCLASSES_WITH_PARENT,
 //        VCLASSGROUP,
-//        FILE, 
-//        UNDEFINED, 
-//        DATETIME, 
+//        FILE,
+//        UNDEFINED,
+//        DATETIME,
 //        DATE,
 //        TIME
 //    };
 
     public static String RDF_XML_LITERAL_URI = "http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral";
-                
-       
+
+
     private String name;
-    
+
     /**
      * List of basic validators.  See BaiscValidation.
      */
-    private List <String> validators = new ArrayList<String>();  
-    
+    private List <String> validators = new ArrayList<String>();
+
     /** Object to get options from. */
     private FieldOptions fieldOptions;
-    
+
     /**
      * Used for holding the expected/required datatype of the predicate when the predicate is a datatype propertyl.
      * this can be a explicit URI or a qname.
@@ -50,7 +50,7 @@ public class FieldVTwo {
      *  "this is the literal"^^someprefix:type23
      */
     private String rangeDatatypeUri;
-    
+
     /**
      * Used for holding the language of the literal when the predicate is a datatype property.
      * This is the lang of the literal.  lang strings must be: [a-z]+(-[a-z0-9]+)*
@@ -61,11 +61,11 @@ public class FieldVTwo {
      * Property for special edit element.
      */
     private EditElementVTwo editElement=null;;
-        
+
     /* *********************** Constructors ************************** */
-    
+
     public FieldVTwo() {}
-        
+
     //private static String[] parameterNames = {"editElement","newResource","validators","optionsType","predicateUri","objectClassUri","rangeDatatypeUri","rangeLang","literalOptions","assertions"};
     //static{  Arrays.sort(parameterNames); }
 
@@ -73,17 +73,17 @@ public class FieldVTwo {
 
     public FieldVTwo setEditElement(EditElementVTwo editElement){
         this.editElement = editElement;
-        
+
         if( editElement instanceof BaseEditElementVTwo)
             ((BaseEditElementVTwo) editElement).setField(this);
-        
+
         return this;
     }
-       
+
 
     public String getName(){
         return name;
-    }                    
+    }
 
     public List <String> getValidators() {
         return validators;
@@ -97,22 +97,22 @@ public class FieldVTwo {
         this.fieldOptions = fopts;
         return this;
     }
-    
+
     public FieldOptions getFieldOptions(){
         return this.fieldOptions;
     }
-    
+
     public String getRangeDatatypeUri() {
         return rangeDatatypeUri;
     }
     public FieldVTwo setRangeDatatypeUri(String r) {
         if( rangeLang != null && rangeLang.trim().length() > 0 )
             throw new IllegalArgumentException("A Field object may not have both rangeDatatypeUri and rangeLanguage set");
-        
+
         rangeDatatypeUri = r;
         return this;
     }
-     
+
     public String getRangeLang() {
         return rangeLang;
     }
@@ -120,7 +120,7 @@ public class FieldVTwo {
     public FieldVTwo setRangeLang(String rangeLang) {
         if( rangeDatatypeUri != null && rangeDatatypeUri.trim().length() > 0)
             throw new IllegalArgumentException("A Field object may not have both rangeDatatypeUri and rangeLanguage set");
-        
+
         this.rangeLang = rangeLang;
         return this;
     }
@@ -128,19 +128,19 @@ public class FieldVTwo {
     public EditElementVTwo getEditElement(){
         return editElement;
     }
-        
+
     public FieldVTwo setName(String name){
-        this.name = name;    
+        this.name = name;
         return this;
     }
-    
+
     @Override
     public String toString(){
         return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
     }
-    
+
     //Check that two fields are the same
-    //Not sure how to compare EditElement and FieldOptions 
+    //Not sure how to compare EditElement and FieldOptions
     public boolean isEqualTo(FieldVTwo inputField) {
     	//Name required
     	boolean nameEqual = this.name.equals(inputField.getName());
@@ -148,16 +148,16 @@ public class FieldVTwo {
     	boolean validatorsEqual = this.validators.equals(inputField.getValidators());
     	//other fields optional and may be null
     	boolean rangeDatatypeEqual = ((this.rangeDatatypeUri == null && inputField.getRangeDatatypeUri() == null) ||
-    								(this.rangeDatatypeUri != null && inputField.getRangeDatatypeUri() != null 
+    								(this.rangeDatatypeUri != null && inputField.getRangeDatatypeUri() != null
     								&& this.rangeDatatypeUri.equals(inputField.getRangeDatatypeUri())));
     	boolean rangeLangEqual = ((this.rangeLang == null && inputField.getRangeLang() == null) ||
-				(this.rangeLang != null && inputField.getRangeLang() != null 
+				(this.rangeLang != null && inputField.getRangeLang() != null
 				&& this.rangeLang.equals(inputField.getRangeLang())));
-    	
+
     	return (nameEqual &&
     			validatorsEqual &&
     			rangeDatatypeEqual &&
     			rangeLangEqual);
-    	
+
     }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaClassGroupOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaClassGroupOptions.java
index a157b2ee1..b0a499005 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaClassGroupOptions.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaClassGroupOptions.java
@@ -11,8 +11,8 @@ public class IndividualsViaClassGroupOptions implements FieldOptions {
 
     String classGroupUri;
     String defualtOptionLabel=null;
-    
-    
+
+
     public IndividualsViaClassGroupOptions(String classGroupUri) {
         super();
         this.classGroupUri = classGroupUri;
@@ -25,19 +25,19 @@ public class IndividualsViaClassGroupOptions implements FieldOptions {
 
     @Override
     public Map<String, String> getOptions(
-            EditConfigurationVTwo editConfig, 
-            String fieldName, 
+            EditConfigurationVTwo editConfig,
+            String fieldName,
             WebappDaoFactory wDaoFact) throws Exception {
         throw new Error("not implemented");
     }
-    
-    
+
+
     public String getClassGroupUri(){
         return classGroupUri;
     }
-    
+
     public Comparator<String[]> getCustomComparator() {
     	return null;
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropertyByRankOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropertyByRankOptions.java
index 3287f945b..138dc090c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropertyByRankOptions.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropertyByRankOptions.java
@@ -32,11 +32,11 @@ public class IndividualsViaObjectPropertyByRankOptions extends IndividualsViaObj
        this.wdf = wdf;
        this.queryModel = model;
     }
-    
+
     public Comparator<String[]> getCustomComparator() {
     	return new DisplayRankComparator(wdf, queryModel);
     }
-    
+
     private static class DisplayRankComparator implements Comparator<String[]> {
     	private WebappDaoFactory wdf = null;
         private Model queryModel = null;
@@ -61,11 +61,11 @@ public class IndividualsViaObjectPropertyByRankOptions extends IndividualsViaObj
                 } else if (s1[1] == null){
                     return -1;
                 } else {
-                    return compareRanks(s1, s2); 
+                    return compareRanks(s1, s2);
                 }
             }
         }
-        
+
         private  int compareRanks(String[] s1, String[] s2) {
         	String uri1 = s1[0];
         	String uri2 = s2[0];
@@ -73,13 +73,13 @@ public class IndividualsViaObjectPropertyByRankOptions extends IndividualsViaObj
         	Individual ind2 = this.wdf.getIndividualDao().getIndividualByURI(uri2);
         	int displayRank1 = getDisplayRank(ind1);
         	int displayRank2 = getDisplayRank(ind2);
-        	//Get display ranks 
+        	//Get display ranks
         	return (Integer.compare(displayRank1, displayRank2));
         	//TODO: Incorporate sparql query here to retrieve the ranks
         	//This qualifies as neither a data property or an object property so will need to access
         	//using sparql query
         }
-        
+
         //Run sparql query to get display rank for individual - uses vitro annotation property
         private Integer getDisplayRank(Individual ind) {
         	Integer rankResult = new Integer(0);
@@ -103,7 +103,7 @@ public class IndividualsViaObjectPropertyByRankOptions extends IndividualsViaObj
                 		} else {
                 			log.debug("Rank was not returned in query or was not literal");
                 		}
-                		
+
                 	}
                 }finally{ qe.close(); }
 
@@ -112,13 +112,13 @@ public class IndividualsViaObjectPropertyByRankOptions extends IndividualsViaObj
             } finally {
             	this.queryModel.leaveCriticalSection();
             }
-        	
+
         	return rankResult;
         }
-        
+
         private String getRankQuery() {
-        	return "PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> " + 
+        	return "PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> " +
         			"SELECT ?rank WHERE {?individualURI vitro:displayRankAnnot ?rank .} ";
         }
-    }    
+    }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropetyOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropetyOptions.java
index acd46c217..6a5d30be5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropetyOptions.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropetyOptions.java
@@ -27,29 +27,29 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
 import edu.cornell.mannlib.vitro.webapp.utils.fields.FieldUtils;
 
 public class IndividualsViaObjectPropetyOptions implements FieldOptions {
-    
+
     private static final Log log = LogFactory.getLog(IndividualsViaObjectPropetyOptions.class);
-    
+
     private static final String LEFT_BLANK = "";
     private String subjectUri;
-    private String predicateUri;    
+    private String predicateUri;
     private List<VClass> rangeTypes;
     private String objectUri;
     private VitroRequest vreq;
     private boolean hasSubclasses = true;
-    
+
     private String defaultOptionLabel;
-    
+
     public IndividualsViaObjectPropetyOptions(String subjectUri,
             String predicateUri, List<VClass> rangeTypes, String objectUri, VitroRequest vreq) throws Exception {
         super();
-        
+
         if (subjectUri == null || subjectUri.equals("")) {
             throw new Exception("no subjectUri found for field ");
         }
         if (predicateUri == null || predicateUri.equals("")) {
-            throw new Exception("no predicateUri found for field ");                    
-        } 
+            throw new Exception("no predicateUri found for field ");
+        }
 
         this.subjectUri = subjectUri;
         this.predicateUri = predicateUri;
@@ -57,7 +57,7 @@ public class IndividualsViaObjectPropetyOptions implements FieldOptions {
         this.objectUri = objectUri;
 		this.vreq = vreq;
     }
-    
+
     public IndividualsViaObjectPropetyOptions(String subjectUri,
             String predicateUri, String objectUri) throws Exception {
         this (subjectUri, predicateUri, null, objectUri);
@@ -72,26 +72,26 @@ public class IndividualsViaObjectPropetyOptions implements FieldOptions {
         this.defaultOptionLabel = label;
         return this;
     }
-    
+
     @Override
     public Map<String, String> getOptions(
-            EditConfigurationVTwo editConfig, 
-            String fieldName, 
+            EditConfigurationVTwo editConfig,
+            String fieldName,
             WebappDaoFactory wDaoFact) {
         HashMap<String, String> optionsMap = new LinkedHashMap<String, String>();
         int optionsCount = 0;
- 
+
         // first test to see whether there's a default "leave blank"
-        // value specified with the literal options                
+        // value specified with the literal options
         if ((defaultOptionLabel ) != null) {
             optionsMap.put(LEFT_BLANK, defaultOptionLabel);
         }
-        
-        Individual subject = wDaoFact.getIndividualDao().getIndividualByURI(subjectUri);                    
+
+        Individual subject = wDaoFact.getIndividualDao().getIndividualByURI(subjectUri);
 
         //get all vclasses applicable to the individual subject
         HashSet<String> vclassesURIs = getApplicableVClassURIs(subject, wDaoFact);
-        
+
         if (!rangeTypes.isEmpty()) {
             vclassesURIs = filterToSubclassesOfRange(vclassesURIs, rangeTypes, wDaoFact);
 	        // is there only one range class and does it have any subclasses? If not, there's no
@@ -100,13 +100,13 @@ public class IndividualsViaObjectPropetyOptions implements FieldOptions {
 				hasSubclasses = rangeHasSubclasses(rangeTypes.get(0), vreq);
 			}
         }
-                
-        if (vclassesURIs.size() == 0) {           
+
+        if (vclassesURIs.size() == 0) {
             return optionsMap;
         }
-        
+
         List<Individual> individuals = new ArrayList<Individual>();
-        HashSet<String> uriSet = new HashSet<String>();        
+        HashSet<String> uriSet = new HashSet<String>();
         for (String vclassURI: vclassesURIs) {
             List<Individual> inds = wDaoFact.getIndividualDao().getIndividualsByVClassURI(vclassURI, -1, -1);
             for (Individual ind : inds) {
@@ -126,10 +126,10 @@ public class IndividualsViaObjectPropetyOptions implements FieldOptions {
         for (Individual ind : individuals) {
             String uri = ind.getURI();
             if (uri != null) {
-                // The picklist should only display individuals with rdfs labels. 
+                // The picklist should only display individuals with rdfs labels.
                 // SO changing the following line  -- tlw72
 				// String label = ind.getName().trim();
-				String label = ind.getRdfsLabel();				
+				String label = ind.getRdfsLabel();
 				if ( label != null ) {
 					List<String> msTypes = ind.getMostSpecificTypeURIs();
 					if ( hasSubclasses && msTypes.size() > 0 ) {
@@ -154,16 +154,16 @@ public class IndividualsViaObjectPropetyOptions implements FieldOptions {
                 vclassesURIs.add(rangeType.getURI());
                 rangeBuff.append(rangeType.getURI()).append(", ");
             }
-            log.debug("individualsViaObjectProperty using rangeUri " + rangeBuff.toString());            
+            log.debug("individualsViaObjectProperty using rangeUri " + rangeBuff.toString());
             return vclassesURIs;
-        } 
-        
+        }
+
         log.debug("individualsViaObjectProperty not using any rangeUri");
-        
+
         List<VClass> subjectVClasses = subject.getVClasses();
-        
+
         //using hashset to prevent duplicates
-        
+
         //Get the range vclasses applicable for the property and each vclass for the subject
         for(VClass subjectVClass: subjectVClasses) {
             List<VClass> vclasses = wDaoFact.getVClassDao().getVClassesForProperty(subjectVClass.getURI(), predicateUri);
@@ -174,12 +174,12 @@ public class IndividualsViaObjectPropetyOptions implements FieldOptions {
                 }
             }
         }
-        
+
         return vclassesURIs;
     }
-    
-    private HashSet<String> filterToSubclassesOfRange(HashSet<String> vclassesURIs, 
-                                              List<VClass> rangeTypes, 
+
+    private HashSet<String> filterToSubclassesOfRange(HashSet<String> vclassesURIs,
+                                              List<VClass> rangeTypes,
                                               WebappDaoFactory wDaoFact) {
         HashSet<String> filteredVClassesURIs = new HashSet<String>();
         VClassDao vcDao = wDaoFact.getVClassDao();
@@ -192,13 +192,13 @@ public class IndividualsViaObjectPropetyOptions implements FieldOptions {
         }
         return filteredVClassesURIs;
     }
-    
-   
-    
+
+
+
     public Comparator<String[]> getCustomComparator() {
     	return null;
     }
-    
+
 	private String getMsTypeLocalName(String theUri, WebappDaoFactory wDaoFact) {
 		VClassDao vcDao = wDaoFact.getVClassDao();
 		VClass vClass = vcDao.getVClassByURI(theUri);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaSearchQueryOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaSearchQueryOptions.java
index f7f746340..ec7167c58 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaSearchQueryOptions.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaSearchQueryOptions.java
@@ -26,32 +26,32 @@ import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames;
 import edu.cornell.mannlib.vitro.webapp.utils.fields.FieldUtils;
 
 /*
- * This runs a search query to get individuals of a certain class instead of relying on the dao classes. 
+ * This runs a search query to get individuals of a certain class instead of relying on the dao classes.
  * Also it gets individuals that belong to the most specific type(s) specified.
  */
 public class IndividualsViaSearchQueryOptions extends IndividualsViaVClassOptions implements FieldOptions {
-	private Log log = LogFactory.getLog(IndividualsViaSearchQueryOptions.class);	
+	private Log log = LogFactory.getLog(IndividualsViaSearchQueryOptions.class);
 
     private String subjectUri;
     private String predicateUri;
     private String objectUri;
     public IndividualsViaSearchQueryOptions(String inputSubjectUri, String inputPredicateUri, String inputObjectUri, String ... vclassURIs) throws Exception {
-        super(vclassURIs);           
+        super(vclassURIs);
         this.subjectUri = inputSubjectUri;
         this.predicateUri  = inputPredicateUri;
         this.objectUri = inputObjectUri;
     }
-    
+
     @Override
     protected Map<String,Individual> getIndividualsForClass(String vclassURI, WebappDaoFactory wDaoFact ){
     	Map<String, Individual> individualMap = new HashMap<String, Individual>();
     	try {
 			SearchEngine searchEngine = ApplicationUtils.instance().getSearchEngine();
-	
-			//search query for type count.    		
+
+			//search query for type count.
 			SearchQuery query = searchEngine.createQuery();
 			if( VitroVocabulary.OWL_THING.equals( vclassURI )){
-				query.setQuery( "*:*" );    			
+				query.setQuery( "*:*" );
 			}else{
 				query.setQuery( VitroSearchTermNames.MOST_SPECIFIC_TYPE_URIS + ":" + vclassURI);
 			}
@@ -72,7 +72,7 @@ public class IndividualsViaSearchQueryOptions extends IndividualsViaVClassOption
 						} else {
 							individualMap.put(individual.getURI(), individual);
 							log.debug("Adding individual " + uri + " to individual list");
-						} 
+						}
 					}
 					catch(Exception ex) {
 						log.error("An error occurred retrieving the individual search resutls", ex);
@@ -83,54 +83,54 @@ public class IndividualsViaSearchQueryOptions extends IndividualsViaVClassOption
     	} catch(Exception ex) {
     		log.error("Error occurred in executing search query ", ex);
     	}
-        return individualMap;        
+        return individualMap;
     }
-    
+
     @Override
     public Map<String, String> getOptions(
-            EditConfigurationVTwo editConfig, 
-            String fieldName, 
-            WebappDaoFactory wDaoFact) throws Exception {              
-        
+            EditConfigurationVTwo editConfig,
+            String fieldName,
+            WebappDaoFactory wDaoFact) throws Exception {
+
     	 Map<String, Individual> individualMap = new HashMap<String, Individual>();
 
          for( String vclassURI : vclassURIs){
              individualMap.putAll(  getIndividualsForClass( vclassURI, wDaoFact) );
          }
 
-         //sort the individuals 
+         //sort the individuals
          List<Individual> individuals = new ArrayList<Individual>();
          individuals.addAll(individualMap.values());
-         
+
          //Here we will remove individuals already in the range
-         Individual subject = wDaoFact.getIndividualDao().getIndividualByURI(subjectUri);                   
+         Individual subject = wDaoFact.getIndividualDao().getIndividualByURI(subjectUri);
          List<ObjectPropertyStatement> stmts = subject.getObjectPropertyStatements();
 
          individuals = FieldUtils.removeIndividualsAlreadyInRange(
                  individuals, stmts, predicateUri, objectUri);
-         //Also remove subjectUri if it 
+         //Also remove subjectUri if it
          individuals = removeSubjectUri(individuals, subjectUri);
          //sort the list
          Collections.sort(individuals);
          //set up the options map
          Map<String, String> optionsMap = new HashMap<String,String>();
-         
+
          if (defaultOptionLabel != null) {
              optionsMap.put(LEFT_BLANK, defaultOptionLabel);
          }
 
-         if (individuals.size() == 0) {     
+         if (individuals.size() == 0) {
         	//return empty map, unlike individualsViaVclass
              return optionsMap ;
          } else {
-             for (Individual ind : individuals) {                
+             for (Individual ind : individuals) {
                  if (ind.getURI() != null) {
                      optionsMap.put(ind.getURI(), ind.getName().trim());
                  }
              }
          }
          return optionsMap;
-        
+
     }
 
     //TODO: Check if this can be done simply by reference
@@ -140,11 +140,11 @@ public class IndividualsViaSearchQueryOptions extends IndividualsViaVClassOption
 	        while(it.hasNext()){
 	            Individual ind = it.next();
 	            if( ind.getURI().equals(subjectUri)) {
-	                it.remove();   
+	                it.remove();
 	            }
 	        }
 	       return individuals;
 	}
 
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaVClassOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaVClassOptions.java
index 52acc06e0..a251489eb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaVClassOptions.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaVClassOptions.java
@@ -18,54 +18,54 @@ import edu.cornell.mannlib.vitro.webapp.modules.tboxreasoner.TBoxReasonerStatus;
 public class IndividualsViaVClassOptions implements FieldOptions {
 
     public static final String LEFT_BLANK = "";
-    protected List<String> vclassURIs;    
-    protected String defaultOptionLabel;    
+    protected List<String> vclassURIs;
+    protected String defaultOptionLabel;
 
     public IndividualsViaVClassOptions(String ... vclassURIs) throws Exception {
         super();
-        
+
         if (vclassURIs==null )
             throw new Exception("vclassURIs must not be null or empty ");
-                
+
         this.vclassURIs = new ArrayList<String>(vclassURIs.length);
         for (String vclassURI : vclassURIs) {
             if (vclassURI != null && !vclassURI.trim().isEmpty())
                 this.vclassURIs.add(vclassURI);
-        }                              
+        }
     }
 
     public FieldOptions setDefaultOptionLabel(String label){
         this.defaultOptionLabel = label;
         return this;
     }
-    
+
     @Override
     public Map<String, String> getOptions(
-            EditConfigurationVTwo editConfig, 
-            String fieldName, 
-            WebappDaoFactory wDaoFact) throws Exception {              
-        
+            EditConfigurationVTwo editConfig,
+            String fieldName,
+            WebappDaoFactory wDaoFact) throws Exception {
+
         Map<String, Individual> individualMap = new HashMap<String, Individual>();
 
         for( String vclassURI : this.vclassURIs){
             individualMap.putAll(  getIndividualsForClass( vclassURI, wDaoFact) );
         }
 
-        //sort the individuals 
+        //sort the individuals
         List<Individual> individuals = new ArrayList<Individual>();
         individuals.addAll(individualMap.values());
         Collections.sort(individuals);
 
         Map<String, String> optionsMap = new HashMap<String,String>();
-        
+
         if (defaultOptionLabel != null) {
             optionsMap.put(LEFT_BLANK, defaultOptionLabel);
         }
 
-        if (individuals.size() == 0) {                        
+        if (individuals.size() == 0) {
             optionsMap.putAll( notFoundMsg() );
         } else {
-            for (Individual ind : individuals) {                
+            for (Individual ind : individuals) {
                 if (ind.getURI() != null) {
                     optionsMap.put(ind.getURI(), ind.getName().trim());
                 }
@@ -73,8 +73,8 @@ public class IndividualsViaVClassOptions implements FieldOptions {
         }
         return optionsMap;
     }
-    
-    
+
+
     private Map<? extends String, ? extends String> notFoundMsg() {
         StringBuilder msg = new StringBuilder("No individuals found for " + (vclassURIs.size() > 1 ? "types" : "type"));
         for( String uri : vclassURIs ){
@@ -86,41 +86,41 @@ public class IndividualsViaVClassOptions implements FieldOptions {
     protected Map<String,Individual> getIndividualsForClass(String vclassURI, WebappDaoFactory wDaoFact ){
         Map<String, Individual> individualMap = new HashMap<String, Individual>();
         IndividualDao indDao = wDaoFact.getIndividualDao();
-        
-        List<Individual> indsForClass= indDao.getIndividualsByVClassURI(vclassURI, -1, -1);                          
+
+        List<Individual> indsForClass= indDao.getIndividualsByVClassURI(vclassURI, -1, -1);
         for (Individual ind : indsForClass) {
             if (ind.getURI() != null) {
                 individualMap.put(ind.getURI(), ind);
             }
         }
-        
+
         // if reasoning isn't available, we will also need to add
         // individuals asserted in subclasses
-        individualMap.putAll( addWhenMissingInference(vclassURI, wDaoFact));        
+        individualMap.putAll( addWhenMissingInference(vclassURI, wDaoFact));
 
-        return individualMap;        
+        return individualMap;
     }
-    
+
     protected boolean isReasoningAvailable(){
     	TBoxReasonerStatus status = ApplicationUtils.instance().getTBoxReasonerModule().getStatus();
     	return status.isConsistent() && !status.isInErrorState();
     }
-    
+
     protected Map<String, Individual> addWhenMissingInference( String classUri , WebappDaoFactory wDaoFact ){
-        boolean inferenceAvailable = isReasoningAvailable();    
+        boolean inferenceAvailable = isReasoningAvailable();
         Map<String,Individual> individualMap = new HashMap<String,Individual>();
         if ( !inferenceAvailable ) {
             for (String subclassURI : wDaoFact.getVClassDao().getAllSubClassURIs(classUri)) {
                 for (Individual ind : wDaoFact.getIndividualDao().getIndividualsByVClassURI(subclassURI, -1, -1)) {
-                    if (ind.getURI() != null) {                       
+                    if (ind.getURI() != null) {
                         individualMap.put(ind.getURI(), ind);
                     }
                 }
             }
         }
-        return individualMap;   
-    }    
-    
+        return individualMap;
+    }
+
     public Comparator<String[]> getCustomComparator() {
     	return null;
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/RdfTypeOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/RdfTypeOptions.java
index ebc4cb49a..994385673 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/RdfTypeOptions.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/RdfTypeOptions.java
@@ -12,24 +12,24 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTw
 
 public class RdfTypeOptions implements FieldOptions {
 
-    String[] typeURIs;        
-    
-    public RdfTypeOptions(String ... superClassURIs) 
+    String[] typeURIs;
+
+    public RdfTypeOptions(String ... superClassURIs)
     throws Exception {
         super();
         if( superClassURIs == null )
             throw new Exception("superClassURIs must be supplied "+
             		"to constructor.");
-        
-        this.typeURIs = superClassURIs;        
+
+        this.typeURIs = superClassURIs;
     }
 
 
     @Override
     public Map<String, String> getOptions(
-            EditConfigurationVTwo editConfig, 
-            String fieldName, 
-            WebappDaoFactory wdf) {        
+            EditConfigurationVTwo editConfig,
+            String fieldName,
+            WebappDaoFactory wdf) {
         Map<String,String> uriToLabel = new HashMap<String,String>();
 
         for (String uri : typeURIs) {
@@ -53,10 +53,10 @@ public class RdfTypeOptions implements FieldOptions {
                 }
             }
         }
-        
+
         return uriToLabel;
     }
-    
+
     public Comparator<String[]> getCustomComparator() {
     	return null;
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java
index 07063500a..3e732ce58 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java
@@ -19,15 +19,15 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
 
 public class SelectListGeneratorVTwo {
-    
+
     static Log log = LogFactory.getLog(SelectListGeneratorVTwo.class);
-    
+
     public static Map<String,String> getOptions(
-            EditConfigurationVTwo editConfig, 
-            String fieldName, 
+            EditConfigurationVTwo editConfig,
+            String fieldName,
             WebappDaoFactory wDaoFact){
 
-        
+
         if( editConfig == null ){
             log.error( "fieldToSelectItemList() must be called with a non-null EditConfigurationVTwo ");
             return Collections.emptyMap();
@@ -35,18 +35,18 @@ public class SelectListGeneratorVTwo {
         if( fieldName == null ){
             log.error( "fieldToSelectItemList() must be called with a non-null fieldName");
             return Collections.emptyMap();
-        }                            
-        
+        }
+
         FieldVTwo field = editConfig.getField(fieldName);
         if (field==null) {
             log.error("no field \""+fieldName+"\" found from editConfig.");
             return Collections.emptyMap();
         }
-        
+
         if( field.getFieldOptions() == null ){
             return Collections.emptyMap();
         }
-        
+
         try {
             return field.getFieldOptions().getOptions(editConfig,fieldName,wDaoFact);
         } catch (Exception e) {
@@ -54,12 +54,12 @@ public class SelectListGeneratorVTwo {
             return Collections.emptyMap();
         }
     }
-   
-      
-    //Methods to sort the options map 
+
+
+    //Methods to sort the options map
     // from http://forum.java.sun.com/thread.jspa?threadID=639077&messageID=4250708
     //Modified to allow for a custom comparator to be sent in, defaults to mapPairsComparator
-    public static Map<String,String> getSortedMap(Map<String,String> hmap, 
+    public static Map<String,String> getSortedMap(Map<String,String> hmap,
             Comparator<String[]> comparator, VitroRequest vreq){
         // first make temporary list of String arrays holding both the key and its corresponding value, so that the list can be sorted with a decent comparator
         List<String[]> objectsToSort = new ArrayList<String[]>(hmap.size());
@@ -69,12 +69,12 @@ public class SelectListGeneratorVTwo {
             x[1] = hmap.get(key);
             objectsToSort.add(x);
         }
-        
+
         //if no comparator is passed in, utilize MapPairsComparator
         if(comparator == null) {
         	comparator = new MapPairsComparator(vreq);
         }
-        
+
         objectsToSort.sort(comparator);
 
         HashMap<String,String> map = new LinkedHashMap<String,String>(objectsToSort.size());
@@ -84,11 +84,11 @@ public class SelectListGeneratorVTwo {
         return map;
     }
 
-    //Sorts by the value of the 2nd element in each of the arrays 
+    //Sorts by the value of the 2nd element in each of the arrays
     private static class MapPairsComparator implements Comparator<String[]> {
-        
+
         private Collator collator;
-        
+
         public MapPairsComparator(VitroRequest vreq) {
             this.collator = vreq.getCollator();
         }
@@ -112,5 +112,5 @@ public class SelectListGeneratorVTwo {
                 }
             }
         }
-    }    
+    }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/EditConfigurationConstants.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/EditConfigurationConstants.java
index 37100f6dc..7a227db6c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/EditConfigurationConstants.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/EditConfigurationConstants.java
@@ -20,7 +20,7 @@ public class EditConfigurationConstants {
     	Map<String, String> constants = new HashMap<String, String>();
     	java.lang.reflect.Field[] fields = EditConfigurationConstants.class.getDeclaredFields();
     	for(java.lang.reflect.Field f: fields) {
-    		if(Modifier.isStatic(f.getModifiers()) && 
+    		if(Modifier.isStatic(f.getModifiers()) &&
     			Modifier.isPublic(f.getModifiers())) {
     			try {
     				constants.put(f.getName(), f.get(null).toString());
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/ModelSelector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/ModelSelector.java
index f2f2c07e2..44d771eb5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/ModelSelector.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/ModelSelector.java
@@ -8,13 +8,13 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.jena.rdf.model.Model;
 
 /**
- * Interface that is intended to be used with N3 Editing to 
+ * Interface that is intended to be used with N3 Editing to
  * allow a EditConfiguration to specify which models will be used
- * during editing.   
- * 
+ * during editing.
+ *
  *  With Jim's new ModelAccess it may be better to use ModelAccess
  *  identifiers and graph URIs.
- *  
+ *
  */
 public interface ModelSelector {
     public Model getModel(HttpServletRequest request, ServletContext context);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/StandardModelSelector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/StandardModelSelector.java
index c2c2bc577..0a413a461 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/StandardModelSelector.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/StandardModelSelector.java
@@ -16,12 +16,12 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 
 public class StandardModelSelector implements ModelSelector {
     private static final Log log = LogFactory.getLog(StandardModelSelector.class);
-    
+
     @Override
 	public OntModel getModel(HttpServletRequest request, ServletContext context) {
     	return ModelAccess.on(context).getOntModel(ABOX_UNION);
     }
-    
+
     public static final ModelSelector selector = new StandardModelSelector();
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteObjectPropertyFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteObjectPropertyFormGenerator.java
index 310e4d2b6..01bab656a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteObjectPropertyFormGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteObjectPropertyFormGenerator.java
@@ -17,12 +17,12 @@ public class AutocompleteObjectPropertyFormGenerator extends DefaultObjectProper
 	@Override
 	public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
 			HttpSession session) throws Exception {
-		//force auto complete 
+		//force auto complete
 		doAutoComplete = true;
-		
+
 		return super.getEditConfiguration(vreq, session);
 	}
 
 
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/BaseEditConfigurationGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/BaseEditConfigurationGenerator.java
index 7bf5358e3..f5de55789 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/BaseEditConfigurationGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/BaseEditConfigurationGenerator.java
@@ -21,57 +21,57 @@ public abstract class BaseEditConfigurationGenerator implements EditConfiguratio
 
     /* constants */
     public static final String DEFAULT_NS_FOR_NEW_RESOURCE= "";
-    
+
     /* Utility Methods */
-    
+
     /**
      * Sets up the things that should be done for just about every form.
      */
-    void initBasics(EditConfigurationVTwo editConf, VitroRequest vreq){                        
-        String editKey = EditConfigurationUtils.getEditKey(vreq);   
-        editConf.setEditKey(editKey);        
-        
-        String formUrl = EditConfigurationUtils.getFormUrlWithoutContext(vreq);  
-        editConf.setFormUrl(formUrl);                                   
+    void initBasics(EditConfigurationVTwo editConf, VitroRequest vreq){
+        String editKey = EditConfigurationUtils.getEditKey(vreq);
+        editConf.setEditKey(editKey);
+
+        String formUrl = EditConfigurationUtils.getFormUrlWithoutContext(vreq);
+        editConf.setFormUrl(formUrl);
     }
-    
-    /** 
-     * Method that setups up a form for basic object or data property editing. 
+
+    /**
+     * Method that setups up a form for basic object or data property editing.
      */
     void  initPropertyParameters(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
         //set up the subject URI based on request
         String subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
         editConfiguration.setSubjectUri(subjectUri);
-        
+
         //set up predicate URI based on request
-        String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);                           
+        String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
         editConfiguration.setPredicateUri(predicateUri);
-        
-        editConfiguration.setUrlPatternToReturnTo("/individual");        
+
+        editConfiguration.setUrlPatternToReturnTo("/individual");
         editConfiguration.setEntityToReturnTo(subjectUri);
     }
-        
-    void initObjectPropForm(EditConfigurationVTwo editConfiguration,VitroRequest vreq) {                      
-        editConfiguration.setObject( EditConfigurationUtils.getObjectUri(vreq) );        
-    }    
-    
+
+    void initObjectPropForm(EditConfigurationVTwo editConfiguration,VitroRequest vreq) {
+        editConfiguration.setObject( EditConfigurationUtils.getObjectUri(vreq) );
+    }
+
     //Prepare for update or non-update
     //Originally included in edit request dispatch controller but moved here due to
     //exceptions such as default add missing individual form
     void prepare(VitroRequest vreq, EditConfigurationVTwo editConfig) {
         //setup the model selectors for query, write and display models on editConfig
-        setupModelSelectorsFromVitroRequest(vreq, editConfig);        
-        
+        setupModelSelectorsFromVitroRequest(vreq, editConfig);
+
         OntModel queryModel = ModelAccess.on(vreq).getOntModel();
-        
+
         if( editConfig.getSubjectUri() == null)
             editConfig.setSubjectUri( EditConfigurationUtils.getSubjectUri(vreq));
         if( editConfig.getPredicateUri() == null )
             editConfig.setPredicateUri( EditConfigurationUtils.getPredicateUri(vreq));
-        
+
         String objectUri = EditConfigurationUtils.getObjectUri(vreq);
         Integer dataKey = EditConfigurationUtils.getDataHash(vreq);
-        if (objectUri != null && ! objectUri.trim().isEmpty()) { 
+        if (objectUri != null && ! objectUri.trim().isEmpty()) {
             // editing existing object
             if( editConfig.getObject() == null)
                 editConfig.setObject( EditConfigurationUtils.getObjectUri(vreq));
@@ -83,7 +83,7 @@ public abstract class BaseEditConfigurationGenerator implements EditConfiguratio
             //this might be a create new or a form
             editConfig.prepareForNonUpdate(queryModel);
         }
-    }     
+    }
 
     /**
      * Setup the model selectors using the models set in the VitroRequest. Call this
@@ -98,27 +98,27 @@ public abstract class BaseEditConfigurationGenerator implements EditConfiguratio
         }else{
             editConfig.setWriteModelSelector( StandardModelSelector.selector );
         }
-        
+
         if( ! StringUtils.isEmpty( vreq.getNameForABOXModel() )){
             editConfig.setQueryModelSelector( new IdModelSelector(vreq.getNameForABOXModel() ));
             editConfig.setResourceModelSelector( new IdModelSelector(vreq.getNameForABOXModel() ));
-            editConfig.setAboxModelId(vreq.getNameForABOXModel());            
+            editConfig.setAboxModelId(vreq.getNameForABOXModel());
         }else{
             editConfig.setQueryModelSelector( StandardModelSelector.selector );
             editConfig.setResourceModelSelector( StandardModelSelector.selector );
         }
-        
+
         if( ! StringUtils.isEmpty( vreq.getNameForTBOXModel() )){
-            editConfig.setTboxModelId(vreq.getNameForTBOXModel());    
-        }                
+            editConfig.setTboxModelId(vreq.getNameForTBOXModel());
+        }
     }
-    
+
     /**
-     * Method to turn Strings or multiple List<String> to List<String>. 
-     * Only accepts String and List<String> as multi args.  
+     * Method to turn Strings or multiple List<String> to List<String>.
+     * Only accepts String and List<String> as multi args.
      */
     static List<String> list( Object ... objs){
-        List<String> rv = new ArrayList<String>();        
+        List<String> rv = new ArrayList<String>();
         for( Object obj: objs){
             if( obj instanceof String)
                 rv.add((String)obj);
@@ -128,14 +128,14 @@ public abstract class BaseEditConfigurationGenerator implements EditConfiguratio
                         rv.add((String)innerObj);
                     }else{
                         throw new Error("list may only take String " +
-                        		"and List<String>. It does not accept List<" 
+                        		"and List<String>. It does not accept List<"
                                 + innerObj.getClass().getName() + ">");
                     }
-                }                
+                }
             }else{
                 throw new Error("list may only take String " +
-                        "and List<String>. It does not accept " 
-                        + obj.getClass().getName() );            
+                        "and List<String>. It does not accept "
+                        + obj.getClass().getName() );
             }
         }
         return rv;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeIntervalFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeIntervalFormGenerator.java
index bfec0a78e..4a9c32d91 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeIntervalFormGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeIntervalFormGenerator.java
@@ -27,7 +27,7 @@ public class DateTimeIntervalFormGenerator extends
 	final static String dateTimeValue = vivoCore + "dateTime";
 	final static String dateTimeValueType = vivoCore + "DateTimeValue";
 	final static String dateTimePrecision = vivoCore + "dateTimePrecision";
-	
+
 	@Override
 	public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
 			HttpSession session) {
@@ -36,51 +36,51 @@ public class DateTimeIntervalFormGenerator extends
         //Prepare
         prepare(vreq, conf);
         return conf;
-        
+
 	}
-	
-	//Enables refactoring by other generators, as this code can be used to partially setup an 
+
+	//Enables refactoring by other generators, as this code can be used to partially setup an
 	//edit configuration object which can then be extended - prepare can then be called independently
 	//enabling sparql queries to be evaluated using the final edit configuration object
 	public void setupEditConfiguration(EditConfigurationVTwo conf, VitroRequest vreq, HttpSession session) {
         initBasics(conf, vreq);
         initPropertyParameters(vreq, session, conf);
-        initObjectPropForm(conf, vreq);               
-        
+        initObjectPropForm(conf, vreq);
+
         conf.setTemplate("dateTimeIntervalForm.ftl");
-        
+
         conf.setVarNameForSubject("subject");
         conf.setVarNameForPredicate("toDateTimeInterval");
         conf.setVarNameForObject(getNodeVar());
-        
+
         conf.setN3Optional(n3ForStart, n3ForEnd);
-        
+
         conf.addNewResource(getNodeVar(), DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("startNode", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.addNewResource("endNode", DEFAULT_NS_FOR_NEW_RESOURCE);
-        
+
         conf.addSparqlForExistingLiteral(
         		"startField-value", existingStartDateQuery);
         conf.addSparqlForExistingLiteral(
         		"endField-value", existingEndDateQuery);
-        
+
         conf.addSparqlForExistingUris("startNode", existingStartNodeQuery);
         conf.addSparqlForExistingUris("endNode", existingEndNodeQuery);
         conf.addSparqlForExistingUris(
         		"startField-precision", existingStartPrecisionQuery);
         conf.addSparqlForExistingUris(
         		"endField-precision", existingEndPrecisionQuery);
-        
+
         FieldVTwo startField = new FieldVTwo().setName("startField");
-        		startField.setEditElement(new DateTimeWithPrecisionVTwo(startField, 
-        				VitroVocabulary.Precision.SECOND.uri(), 
+        		startField.setEditElement(new DateTimeWithPrecisionVTwo(startField,
+        				VitroVocabulary.Precision.SECOND.uri(),
         				VitroVocabulary.Precision.NONE.uri()));
 
         FieldVTwo endField = new FieldVTwo().setName("endField");
-        		endField.setEditElement(new DateTimeWithPrecisionVTwo(endField, 
-        		        VitroVocabulary.Precision.SECOND.uri(), 
+        		endField.setEditElement(new DateTimeWithPrecisionVTwo(endField,
+        		        VitroVocabulary.Precision.SECOND.uri(),
             			VitroVocabulary.Precision.NONE.uri()));
-        
+
         conf.addField(startField);
         conf.addField(endField);
         //Need to add validators
@@ -88,82 +88,82 @@ public class DateTimeIntervalFormGenerator extends
         //Adding additional data, specifically edit mode
         addFormSpecificData(conf, vreq);
 	}
-	
-	final String n3ForStart = 
-	    "?subject <" + getToDateTimeIntervalPredicate() + "> " + getNodeN3Var() + " . \n" +    
-	    getNodeN3Var() + "  a <" + intervalType + "> . \n" + 
-	    getNodeN3Var() + " <" + intervalToStart + "> ?startNode . \n" +    
+
+	final String n3ForStart =
+	    "?subject <" + getToDateTimeIntervalPredicate() + "> " + getNodeN3Var() + " . \n" +
+	    getNodeN3Var() + "  a <" + intervalType + "> . \n" +
+	    getNodeN3Var() + " <" + intervalToStart + "> ?startNode . \n" +
 	    "?startNode a <" + dateTimeValueType + "> . \n" +
 	    "?startNode  <" + dateTimeValue + "> ?startField-value . \n" +
 	    "?startNode  <" + dateTimePrecision + "> ?startField-precision . \n";
-	
-	final  String n3ForEnd = 
-        "?subject <" + getToDateTimeIntervalPredicate() + "> " + getNodeN3Var() + " . \n" +       
+
+	final  String n3ForEnd =
+        "?subject <" + getToDateTimeIntervalPredicate() + "> " + getNodeN3Var() + " . \n" +
         getNodeN3Var() + " a <" + intervalType + "> . \n" +
         getNodeN3Var() + " <" + intervalToEnd + "> ?endNode . \n" +
         "?endNode a <" + dateTimeValueType + "> . \n" +
         "?endNode  <" + dateTimeValue + "> ?endField-value . \n" +
         "?endNode  <" + dateTimePrecision + "> ?endField-precision .";
-	
+
 	final  String existingStartDateQuery =
-        "SELECT ?existingDateStart WHERE { \n" +     
-        "?subject <" + getToDateTimeIntervalPredicate() + "> " + getNodeN3Var() + " . \n" +     
+        "SELECT ?existingDateStart WHERE { \n" +
+        "?subject <" + getToDateTimeIntervalPredicate() + "> " + getNodeN3Var() + " . \n" +
         getNodeN3Var() + " a <" + intervalType + "> . \n" +
         getNodeN3Var() + " <" + intervalToStart + "> ?startNode . \n" +
         "?startNode a <" + dateTimeValueType + "> . \n" +
         "?startNode <" + dateTimeValue + "> ?existingDateStart }";
 
-	final  String existingEndDateQuery = 
+	final  String existingEndDateQuery =
         "SELECT ?existingEndDate WHERE { \n" +
         "?subject <" + getToDateTimeIntervalPredicate() + "> " + getNodeN3Var() + " . \n" +
         getNodeN3Var() + " a <" + intervalType + "> . \n" +
         getNodeN3Var() + " <" + intervalToEnd + "> ?endNode . \n" +
         "?endNode a <" + dateTimeValueType + "> . \n " +
         "?endNode <" + dateTimeValue + "> ?existingEndDate . }";
-	
-	
+
+
 	final  String existingStartNodeQuery =
 		"SELECT ?existingStartNode WHERE { \n" +
         "?subject <" + getToDateTimeIntervalPredicate() + "> " + getNodeN3Var() + " . \n" +
         getNodeN3Var() + " a <" + intervalType + "> . \n" +
-        getNodeN3Var() + " <" + intervalToStart + "> ?existingStartNode . \n" + 
+        getNodeN3Var() + " <" + intervalToStart + "> ?existingStartNode . \n" +
         "?existingStartNode a <" + dateTimeValueType + "> .}  ";
-	
-	final  String existingEndNodeQuery = 
-        "SELECT ?existingEndNode WHERE { \n" + 
+
+	final  String existingEndNodeQuery =
+        "SELECT ?existingEndNode WHERE { \n" +
         "?subject <" + getToDateTimeIntervalPredicate() + "> " + getNodeN3Var() + " . \n" +
         getNodeN3Var() + " a <" + intervalType + "> . \n" +
-        getNodeN3Var() + " <" + intervalToEnd + "> ?existingEndNode . \n" + 
+        getNodeN3Var() + " <" + intervalToEnd + "> ?existingEndNode . \n" +
         "?existingEndNode a <" + dateTimeValueType + "> .} ";
-	
-	final  String existingStartPrecisionQuery = 
-        "SELECT ?existingStartPrecision WHERE { \n" +    
-        "?subject <" + getToDateTimeIntervalPredicate() + "> " + getNodeN3Var() + " . \n" +      
+
+	final  String existingStartPrecisionQuery =
+        "SELECT ?existingStartPrecision WHERE { \n" +
+        "?subject <" + getToDateTimeIntervalPredicate() + "> " + getNodeN3Var() + " . \n" +
         getNodeN3Var() + " a <" + intervalType + "> . \n" +
         getNodeN3Var() + " <" + intervalToStart + "> ?startNode . \n" +
-        "?startNode a <" + dateTimeValueType + "> . \n" +          
+        "?startNode a <" + dateTimeValueType + "> . \n" +
         "?startNode <" + dateTimePrecision + "> ?existingStartPrecision . }";
-	
+
 	final  String existingEndPrecisionQuery =
 		"SELECT ?existingEndPrecision WHERE { \n" +
-        "?subject <" + getToDateTimeIntervalPredicate() + "> " + getNodeN3Var() + " . \n" +      
+        "?subject <" + getToDateTimeIntervalPredicate() + "> " + getNodeN3Var() + " . \n" +
         getNodeN3Var() + " a <" + intervalType + "> . \n" +
         getNodeN3Var() + " <" + intervalToEnd + "> ?endNode . \n" +
-        "?endNode a <" + dateTimeValueType + "> . \n" +          
+        "?endNode a <" + dateTimeValueType + "> . \n" +
         "?endNode <" + dateTimePrecision + "> ?existingEndPrecision . }";
 
 	public  String getToDateTimeIntervalPredicate() {
 		return toDateTimeInterval;
 	}
-	
+
 	public  String getNodeVar() {
 		return "intervalNode";
 	}
-	
+
 	public  String getNodeN3Var() {
 		return "?" + getNodeVar();
 	}
-	
+
     //Adding form specific data such as edit mode
     public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
     	HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
@@ -178,7 +178,7 @@ public class DateTimeIntervalFormGenerator extends
 		EditMode editMode = FrontEndEditingUtils.EditMode.ADD;
 		if(objectUri != null && !objectUri.isEmpty()) {
 			editMode = FrontEndEditingUtils.EditMode.EDIT;
-			
+
 		}
 		return editMode;
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimePropertyGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimePropertyGenerator.java
index 25e448a30..7d7dc7b22 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimePropertyGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimePropertyGenerator.java
@@ -10,25 +10,25 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUti
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
 
 /**
- * 
+ *
  * @author hjk54
  *
  * There are multiple date time properties in VIVO, all of which have a DateTimeValue individual as an object.
- * I am extending DateTimeValueFormGenerator to enable the predicate to be utilized as the "toDateTimeValue" property, i.e. 
+ * I am extending DateTimeValueFormGenerator to enable the predicate to be utilized as the "toDateTimeValue" property, i.e.
  * the property associating the subject with the date time value individual.  The dateTimeValueForm template has been
- * used as the basis for the general form for this generator that can be applied to multiple properties. 
+ * used as the basis for the general form for this generator that can be applied to multiple properties.
  */
 
 public class DateTimePropertyGenerator extends DateTimeValueFormGenerator {
-	
+
 	String predicate = null;
 	@Override
 	public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
 			HttpSession session) {
-		predicate = EditConfigurationUtils.getPredicateUri(vreq);  
+		predicate = EditConfigurationUtils.getPredicateUri(vreq);
         EditConfigurationVTwo conf = super.getEditConfiguration(vreq, session);
-        return conf; 
-	} 	
+        return conf;
+	}
 
 	//isolating the predicate in this fashion allows this class to be subclassed for other date time value
 	//properties
@@ -36,5 +36,5 @@ public class DateTimePropertyGenerator extends DateTimeValueFormGenerator {
 	protected String getToDateTimeValuePredicate() {
 		return predicate;
 	}
-	
-}
\ No newline at end of file
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeValueFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeValueFormGenerator.java
index 85e9cbcf2..962166618 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeValueFormGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeValueFormGenerator.java
@@ -19,7 +19,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode;
 
 public class DateTimeValueFormGenerator extends BaseEditConfigurationGenerator
         implements EditConfigurationGenerator {
-	
+
 	final static String vivoCore = "http://vivoweb.org/ontology/core#";
 	final  String toDateTimeValue = vivoCore + "dateTimeValue";
 	final static String valueType = vivoCore + "DateTimeValue";
@@ -30,69 +30,69 @@ public class DateTimeValueFormGenerator extends BaseEditConfigurationGenerator
 	public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
 			HttpSession session) {
         EditConfigurationVTwo conf = new EditConfigurationVTwo();
-        
+
         initBasics(conf, vreq);
         initPropertyParameters(vreq, session, conf);
-        initObjectPropForm(conf, vreq); 
-        
+        initObjectPropForm(conf, vreq);
+
         conf.setTemplate(this.getTemplate());
-        
+
         conf.setVarNameForSubject("subject");
         conf.setVarNameForPredicate("toDateTimeValue");
         conf.setVarNameForObject("valueNode");
         //Value node value will be in scope if we have an object uri that exists for editing
         conf.setN3Optional(Arrays.asList(getN3ForValue()));
-        
+
         conf.addNewResource("valueNode", DEFAULT_NS_FOR_NEW_RESOURCE);
-        
+
         conf.addSparqlForExistingLiteral(
         		"dateTimeField-value", getExistingDateTimeValueQuery());
         conf.addSparqlForExistingUris(
         		"dateTimeField-precision", getExistingPrecisionQuery());
-        
+
         FieldVTwo dateTimeField = new FieldVTwo().setName(this.getDateTimeFieldName());
-        		dateTimeField.setEditElement(new DateTimeWithPrecisionVTwo(dateTimeField, 
-        				VitroVocabulary.Precision.SECOND.uri(), 
+        		dateTimeField.setEditElement(new DateTimeWithPrecisionVTwo(dateTimeField,
+        				VitroVocabulary.Precision.SECOND.uri(),
         				VitroVocabulary.Precision.NONE.uri()));
-        
+
         conf.addField(dateTimeField);
-        
+
         //Adding additional data, specifically edit mode
         addFormSpecificData(conf, vreq);
         //prepare
-        prepare(vreq, conf); 
-        return conf; 
-	} 
-	
-	
+        prepare(vreq, conf);
+        return conf;
+	}
+
+
 	//Writing these as methods instead of static strings allows the method getToDateTimeValuePredicate
 	//to be called after the class has been initialized - this is important for subclasses of this generator
-	//that rely on vreq for predicate 
+	//that rely on vreq for predicate
 	protected String getN3ForValue() {
         return "?subject <" + this.getToDateTimeValuePredicate() + "> ?valueNode . \n" +
         "?valueNode a <" + valueType + "> . \n" +
         "?valueNode  <" + dateTimeValue + "> ?dateTimeField-value . \n" +
-        "?valueNode  <" + dateTimePrecision + "> ?dateTimeField-precision ."; 
+        "?valueNode  <" + dateTimePrecision + "> ?dateTimeField-precision .";
 	}
-	
+
 	protected String getExistingDateTimeValueQuery () {
         return "SELECT ?existingDateTimeValue WHERE { \n" +
         "?subject <" + this.getToDateTimeValuePredicate() + "> ?valueNode . \n" +
         "?valueNode a <" + valueType + "> . \n" +
         "?valueNode <" + dateTimeValue + "> ?existingDateTimeValue }";
 	}
-	
+
 	protected String getExistingPrecisionQuery() {
         return "SELECT ?existingPrecision WHERE { \n" +
         "?subject <" + this.getToDateTimeValuePredicate() + "> ?valueNode . \n" +
         "?valueNode a <" + valueType + "> . \n" +
         "?valueNode <"  + dateTimePrecision + "> ?existingPrecision }";
 	}
-	
+
 	public static String getNodeVar() {
 		return "valueNode";
 	}
-	
+
 	public static String getNodeN3Var() {
 		return "?" + getNodeVar();
 	}
@@ -102,11 +102,11 @@ public class DateTimeValueFormGenerator extends BaseEditConfigurationGenerator
 	protected String getToDateTimeValuePredicate() {
 		return this.toDateTimeValue;
 	}
-	
+
 	protected String getDateTimeFieldName() {
 		return "dateTimeField";
 	}
-	
+
 	protected String getTemplate() {
 		return "dateTimeValueForm.ftl";
 	}
@@ -117,7 +117,7 @@ public class DateTimeValueFormGenerator extends BaseEditConfigurationGenerator
 		formSpecificData.put("domainUri", getDomainUri(vreq));
 		editConfiguration.setFormSpecificData(formSpecificData);
 	}
-	
+
 	public EditMode getEditMode(VitroRequest vreq) {
 		//In this case, the original jsp didn't rely on FrontEndEditingUtils
 		//but instead relied on whether or not the object Uri existed
@@ -125,14 +125,14 @@ public class DateTimeValueFormGenerator extends BaseEditConfigurationGenerator
 		EditMode editMode = FrontEndEditingUtils.EditMode.ADD;
 		if(objectUri != null && !objectUri.isEmpty()) {
 			editMode = FrontEndEditingUtils.EditMode.EDIT;
-			
+
 		}
 		return editMode;
 	}
 
 	private String getDomainUri(VitroRequest vreq) {
-        String domainUri = vreq.getParameter("domainUri"); 
-        
+        String domainUri = vreq.getParameter("domainUri");
+
 		return domainUri;
 	}
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java
index 6302a7b5e..702474da2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java
@@ -50,10 +50,10 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
 		String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
 		//This method also looks at domain and range uris and so is different than just getting the
 		//object property based on predicate uri alone
-		ObjectProperty objProp = EditConfigurationUtils.getObjectPropertyForPredicate(vreq, 
+		ObjectProperty objProp = EditConfigurationUtils.getObjectPropertyForPredicate(vreq,
 	            predicateUri);
 		if(objProp != null) {
-			return(objProp.getOfferCreateNewOption() && 
+			return(objProp.getOfferCreateNewOption() &&
 					(
 							(command != null && command.equals(createCommand)) ||
 									!objProp.getSelectFromExisting()
@@ -65,29 +65,29 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
     @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));
-    	
-    
+
+
     	editConfiguration.setNewResources(this.generateNewResources(vreq));
     	//In scope
     	this.setUrisAndLiteralsInScope(editConfiguration);
-    	
+
     	//on Form
     	this.setUrisAndLiteralsOnForm(editConfiguration, vreq);
-    	
+
     	editConfiguration.setFilesOnForm(new ArrayList<String>());
-    	
+
     	//Sparql queries
     	this.setSparqlQueries(editConfiguration);
-    	
+
     	//set fields
     	setFields(editConfiguration, vreq, EditConfigurationUtils.getPredicateUri(vreq));
 
@@ -98,20 +98,20 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
     	addPreprocessors(vreq, editConfiguration);
 
     	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
     	//default obj property form.populateTemplate or some such method
     	//Select from existing also set within template itself
     	setTemplate(editConfiguration, vreq);
-    	
+
     	editConfiguration.addValidator(new AntiXssValidation());
-    	
+
     	//edit key now set in the edit request dispatch controller
     	return editConfiguration;
     }
-    
+
     protected Map<String, String> generateNewResources(VitroRequest vreq) {
 		HashMap<String, String> newResources = new HashMap<String, String>();
 		//Null triggers default namespace
@@ -127,11 +127,11 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
     	String editKey = EditConfigurationVTwo.newEditKey(session);
     	editConfiguration.setEditKey(editKey);
     }
-    
+
 	private void setTemplate(EditConfigurationVTwo editConfiguration,
 			VitroRequest vreq) {
     	editConfiguration.setTemplate(template);
-		
+
 	}
 
 	//Initialize setup: process parameters
@@ -141,19 +141,19 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
 
     	subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
     	predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
-    
+
     	editConfiguration.setFormUrl(formUrl);
-    	
-    	
+
+
     	editConfiguration.setUrlPatternToReturnTo("/individual");
-    	
+
     	editConfiguration.setVarNameForSubject("subject");
     	editConfiguration.setSubjectUri(subjectUri);
     	editConfiguration.setEntityToReturnTo(subjectUri);
     	editConfiguration.setVarNameForPredicate("predicate");
     	editConfiguration.setPredicateUri(predicateUri);
-    	
-    	
+
+
     	//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
     	//"object"       : [ "newIndividual" ,  "${objectUriJson}" , "URI"],
@@ -166,11 +166,11 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
     		log.error("Add missing individual called for a data property instead of object property");
     	}
     }
-    
-    
 
 
-    
+
+
+
 	private void initObjectParameters(VitroRequest vreq) {
 		//in case of object property
 		String thisObjectUri = EditConfigurationUtils.getObjectUri(vreq);
@@ -182,7 +182,7 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
 
 	//this particular form uses a different var name for object "newIndividual"
 	private void processObjectPropForm(VitroRequest vreq, EditConfigurationVTwo editConfiguration) {
-    	editConfiguration.setVarNameForObject(objectVarName);    	
+    	editConfiguration.setVarNameForObject(objectVarName);
     	//If is replace with new, set Object resource to null
     	if(isReplaceWithNew(vreq)) {
     		editConfiguration.setObject(null);
@@ -191,13 +191,13 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
     	}
     	//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
     }
-    
-    
-    
-    //Get N3 required 
-    //Handles both object and data property    
+
+
+
+    //Get N3 required
+    //Handles both object and data property
     private List<String> generateN3Required(VitroRequest vreq) {
     	List<String> n3ForEdit = new ArrayList<String>();
     	n3ForEdit.add(getN3PrefixesAsString() + "\n" + getN3ForName());
@@ -205,23 +205,23 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
     	n3ForEdit.add(getN3PrefixesAsString() + "\n" + "?" + objectVarName + " rdf:type <" + getRangeClassUri(vreq) + "> . ");
     	return n3ForEdit;
     }
-    
+
     protected List<String> getN3Prefixes() {
     	List<String> prefixStrings = new ArrayList<String>();
     	prefixStrings.add("@prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .");
     	prefixStrings.add("@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .");
     	return prefixStrings;
     }
-    
+
     protected String getN3PrefixesAsString() {
     	String prefixes = StringUtils.join(getN3Prefixes(), "\n");
     	return prefixes;
     }
-    
+
     protected String getN3ForName() {
     	return "?" + objectVarName + " rdfs:label ?name .";
     }
-    
+
     protected List<String> generateN3Optional(VitroRequest vreq) {
     	//flag uri and asserted types need to be added here
     	List<String> n3Optional = new ArrayList<String>();
@@ -231,12 +231,12 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
     	//n3Optional.add(getN3AssertedTypes(vreq));
     	n3Optional.add(getN3PrefixesAsString() + "\n" + "?" + objectVarName + " rdf:type <" + getFlagURI(vreq) + "> . ");
     	return n3Optional;
-    	
+
     }
-    
+
     private String getFlagURI(VitroRequest vreq) {
     	WebappDaoFactory wdf = vreq.getWebappDaoFactory();
-    	String flagURI = wdf.getVClassDao().getTopConcept().getURI(); 
+    	String flagURI = wdf.getVClassDao().getTopConcept().getURI();
     	return flagURI;
 	}
 	private String getN3AssertedTypes(VitroRequest vreq) {
@@ -249,21 +249,21 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
 			+ "    WHERE { ?inverse_property owl:inverseOf ?predicate } ";
     	return queryForInverse;
     }
-    
+
     private void setUrisAndLiteralsInScope(EditConfigurationVTwo editConfiguration) {
     	HashMap<String, List<String>> urisInScope = new HashMap<String, List<String>>();
     	//Add subject uri and predicate turo to 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()}));
-    	editConfiguration.setUrisInScope(urisInScope);    	
+    	editConfiguration.setUrisInScope(urisInScope);
     	editConfiguration.setLiteralsInScope(new HashMap<String, List<Literal>>());
     }
-    
+
     //n3 should look as follows
-    //?subject ?predicate ?objectVar 
-    
+    //?subject ?predicate ?objectVar
+
     protected void setUrisAndLiteralsOnForm(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
     	List<String> urisOnForm = new ArrayList<String>();
     	List<String> literalsOnForm = new ArrayList<String>();
@@ -271,30 +271,30 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
     	editConfiguration.setUrisOnform(urisOnForm);
     	editConfiguration.setLiteralsOnForm(literalsOnForm);
     }
-   
-    
+
+
     //This is for various items
     private void setSparqlQueries(EditConfigurationVTwo editConfiguration) {
     	//Sparql queries defining retrieval of literals etc.
     	editConfiguration.setSparqlForAdditionalLiteralsInScope(new HashMap<String, String>());
-    	
+
     	Map<String, String> urisInScope = new HashMap<String, String>();
     	urisInScope.put("inverseProp", this.retrieveQueryForInverse());
     	editConfiguration.setSparqlForAdditionalUrisInScope(urisInScope);
-    	
+
     	editConfiguration.setSparqlForExistingLiterals(generateSparqlForExistingLiterals());
     	editConfiguration.setSparqlForExistingUris(generateSparqlForExistingUris());
     }
-    
-    
+
+
     //Sparql queries
-   
-    
+
+
     private HashMap<String, String> generateSparqlForExistingUris() {
     	HashMap<String, String> map = new HashMap<String, String>();
     	return map;
     }
-    
+
     private HashMap<String, String> generateSparqlForExistingLiterals() {
     	HashMap<String, String> map = new HashMap<String, String>();
     	String query = "PREFIX rdfs:  <http://www.w3.org/2000/01/rdf-schema#> ";
@@ -303,32 +303,32 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
     	return map;
     }
 
-    
+
     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 field = new FieldVTwo();
-	        field.setName("name");      	        
-	        
+	        field.setName("name");
+
 	        List<String> validators = new ArrayList<String>();
 	        validators.add("nonempty");
-	        field.setValidators(validators);   
-	                            
+	        field.setValidators(validators);
+
 	        fields.put(field.getName(), field);
-    	        
+
     	} else {
     		log.error("Is not object property so fields not set");
     	}
-    	
+
     	editConfiguration.setFields(fields);
     }
 
 	private String getRangeClassUri(VitroRequest vreq) {
 		Individual subject = EditConfigurationUtils.getSubjectIndividual(vreq);
 		ObjectProperty prop = EditConfigurationUtils.getObjectProperty(vreq);
-		
+
 	    WebappDaoFactory wdf = vreq.getWebappDaoFactory();
 	    if( prop.getRangeVClassURI() == null ) {
 	        // If property has no explicit range, we will use e.g. owl:Thing.
@@ -343,19 +343,19 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
 	    	rangeClass = wdf.getVClassDao().getVClassByURI( typeOfNew );
 	    if( rangeClass == null ){
 	    	rangeClass = wdf.getVClassDao().getVClassByURI(prop.getRangeVClassURI());
-	    	if( rangeClass == null ) throw new Error ("Cannot find class for range for property.  Looking for " + prop.getRangeVClassURI() );    
+	    	if( rangeClass == null ) throw new Error ("Cannot find class for range for property.  Looking for " + prop.getRangeVClassURI() );
 	    }
 		return rangeClass.getURI();
 	}
 
 	private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
-    	//Here, retrieve model from 
+    	//Here, retrieve model from
 		OntModel model = ModelAccess.on(session.getServletContext()).getOntModel();
     	//if object property
     	if(EditConfigurationUtils.isObjectProperty(EditConfigurationUtils.getPredicateUri(vreq), vreq)){
 	    	Individual objectIndividual = EditConfigurationUtils.getObjectIndividual(vreq);
-	    	if(!isReplaceWithNew(vreq) && 
-	    			(isForwardToCreateButEdit(vreq) || 
+	    	if(!isReplaceWithNew(vreq) &&
+	    			(isForwardToCreateButEdit(vreq) ||
 	    			objectIndividual != null)
 	    		) {
 	    		editConfiguration.prepareForObjPropUpdate(model);
@@ -365,10 +365,10 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
 	        }
     	} else {
     		log.error("Data property not object property so update can't be done correctly");
-    		
+
     	}
     }
-    
+
 	private void addPreprocessors(VitroRequest vreq, EditConfigurationVTwo editConfiguration) {
 		if(isReplaceWithNew(vreq)) {
 			//String subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
@@ -377,16 +377,16 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
 			editConfiguration.addModelChangePreprocessor(
 					new DefaultAddMissingIndividualFormModelPreprocessor(
 							subjectUri, predicateUri, objectUri));
-			
+
 		}
 	}
-	
+
     //Command processing
     private boolean isTypeOfNew(VitroRequest vreq) {
     	String typeOfNew = getTypeOfNew(vreq);
     	return (typeOfNew != null && !typeOfNew.isEmpty());
     }
-    
+
     protected String getTypeOfNew(VitroRequest vreq) {
     	return  vreq.getParameter("typeOfNew");
     }
@@ -402,45 +402,45 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
     	if(hasCustomForm(objectProp)) {
     		return false;
     	}
-    	
-       boolean isForwardToCreateNew = 
+
+       boolean isForwardToCreateNew =
            ( objectProp != null && objectProp.getOfferCreateNewOption() )
            && ( objectProp.getSelectFromExisting() == false
            ||   "create".equals(command));
 
        return isForwardToCreateNew;
-	   
+
     }
-    
+
     private boolean hasCustomForm(ObjectProperty objectProp) {
-    	return( objectProp != null && 
-    			objectProp.getCustomEntryForm() != null && 
+    	return( objectProp != null &&
+    			objectProp.getCustomEntryForm() != null &&
     			!objectProp.getCustomEntryForm().isEmpty());
-	     
+
     }*/
-    
+
     private boolean isReplaceWithNew(VitroRequest vreq) {
     	ObjectProperty objectProp = EditConfigurationUtils.getObjectProperty(vreq);
     	boolean isEditOfExistingStmt = isEditOfExistingStatement(vreq);
     	String command = vreq.getParameter("cmd");
-    	return (isEditOfExistingStmt 
-    			&& "create".equals(command)) 
+    	return (isEditOfExistingStmt
+    			&& "create".equals(command))
     	       && (objectProp != null)
     	       && (objectProp.getOfferCreateNewOption());
     }
-    
+
     private boolean isForwardToCreateButEdit(VitroRequest vreq) {
     	boolean isEditOfExistingStmt = isEditOfExistingStatement(vreq);
     	ObjectProperty objectProp = EditConfigurationUtils.getObjectProperty(vreq);
     	String command = vreq.getParameter("cmd");
-    	return (isEditOfExistingStmt 
+    	return (isEditOfExistingStmt
     			&& (! "create".equals(command))
-    			&& (objectProp != null) 
+    			&& (objectProp != null)
     	       && (objectProp.getOfferCreateNewOption())
     	       && (!objectProp.getSelectFromExisting())
     	     );
     }
-    
+
     //Is edit of existing statement only applicable to object properties
     private boolean isEditOfExistingStatement(VitroRequest vreq) {
     	//TODO: Check if also applicable to data property, currently returning false
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDataPropertyFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDataPropertyFormGenerator.java
index a97a75c7a..f7e236577 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDataPropertyFormGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDataPropertyFormGenerator.java
@@ -28,24 +28,24 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.DefaultDataPropertyFormValidator;
 
 public class DefaultDataPropertyFormGenerator extends BaseEditConfigurationGenerator implements EditConfigurationGenerator {
-	
+
 	private static Log log = LogFactory.getLog(DefaultDataPropertyFormGenerator.class);
 
-	static final String literalVar =  "literal";                             
+	static final String literalVar =  "literal";
     static final String literalPlaceholder = "?"+literalVar;
     static final String dataPropN3 = "?subject ?predicate " + literalPlaceholder + " . " ;
-    
+
 	@Override
-	public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) {	    			    	    	    	   	    
+	public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) {
 	    String subjectUri   = vreq.getParameter("subjectUri");
         Individual subject = vreq.getWebappDaoFactory().getIndividualDao().getIndividualByURI(subjectUri);
-        if( subject == null ) 
+        if( subject == null )
             throw new Error("In DefaultDataPropertyFormGenerator, could not find individual for URI " + subjectUri);
-        
+
 	    String predicateUri = vreq.getParameter("predicateUri");
 	    WebappDaoFactory unfilteredWdf = vreq.getUnfilteredWebappDaoFactory();
 	    DataProperty dataproperty = unfilteredWdf.getDataPropertyDao().getDataPropertyByURI( predicateUri );
-	    
+
 	    dataproperty = vreq.getWebappDaoFactory().getDataPropertyDao().getDataPropertyByURI( predicateUri );
 	    if( dataproperty == null) {
 	        // No dataproperty will be returned for rdfs:label, but we shouldn't throw an error.
@@ -55,48 +55,48 @@ public class DefaultDataPropertyFormGenerator extends BaseEditConfigurationGener
 	            throw new Error("Could not find DataProperty in model: " + predicateUri);
 	        }
 	    }
-	    
-       String rangeDatatypeUri = dataproperty.getRangeDatatypeURI(); 
+
+       String rangeDatatypeUri = dataproperty.getRangeDatatypeURI();
         if( rangeDatatypeUri == null || rangeDatatypeUri.trim().isEmpty() ){
-            rangeDatatypeUri = vreq.getWebappDaoFactory().getDataPropertyDao().getRequiredDatatypeURI(subject, dataproperty);    
-        }   
-	        	    
+            rangeDatatypeUri = vreq.getWebappDaoFactory().getDataPropertyDao().getRequiredDatatypeURI(subject, dataproperty);
+        }
+
         Integer dataHash = EditConfigurationUtils.getDataHash(vreq);
         boolean update = ( dataHash != null );
-        
+
 	    EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();
-	    	
+
 	    initBasics(editConfiguration, vreq);
 	    initPropertyParameters(vreq, session, editConfiguration);
-	    
+
 	    editConfiguration.setTemplate("defaultDataPropertyForm.ftl");
-	        		        	    	    	
+
     	editConfiguration.setDatapropKey( dataHash );
-    	
-    	editConfiguration.setVarNameForSubject("subject");    	    	    	
-    	editConfiguration.setVarNameForPredicate("predicate");    	
+
+    	editConfiguration.setVarNameForSubject("subject");
+    	editConfiguration.setVarNameForPredicate("predicate");
     	editConfiguration.setVarNameForObject( literalVar );
-    	
-    	editConfiguration.setLiteralsOnForm( Arrays.asList( literalVar ));    	    	    
-    	
+
+    	editConfiguration.setLiteralsOnForm( Arrays.asList( literalVar ));
+
     	FieldVTwo literalField =  new FieldVTwo()
             .setName( literalVar )
             .setRangeDatatypeUri(rangeDatatypeUri);
-    	        
-    	editConfiguration.addField( literalField );    	    
-        
+
+    	editConfiguration.addField( literalField );
+
     	editConfiguration.addValidator(new AntiXssValidation());
-    	
-        // An empty field on an update gets special treatment 
+
+        // An empty field on an update gets special treatment
         if( update ) {
             // on update, allow an empty field and deal with it in DefaultDataPropEmptyField
             // see comments in DefaultDataPropEmptyField and VITRO-432
             editConfiguration.addModelChangePreprocessor( new DefaultDataPropEmptyField() );
             editConfiguration.setN3Optional(Arrays.asList( dataPropN3 ));
         }else{
-            //on new, don't allow an empty field 
+            //on new, don't allow an empty field
             literalField.setValidators(list( "nonempty" ));
-            editConfiguration.setN3Required(Arrays.asList( dataPropN3 ));                        
+            editConfiguration.setN3Required(Arrays.asList( dataPropN3 ));
         }
 		// if the property has a rangeDatatypeUri, validate it
 		if ( rangeDatatypeUri != null ) {
@@ -104,41 +104,41 @@ public class DefaultDataPropertyFormGenerator extends BaseEditConfigurationGener
 		}
         //prepare
         prepare(vreq, editConfiguration);
-		return editConfiguration;	
+		return editConfiguration;
 	}
-	
-	
+
+
 	public static void prepareForDataPropUpdate(Model model, EditConfigurationVTwo editConfiguration, DataPropertyDao dataPropertyDao){
-	      
+
 	    String subjectUri = editConfiguration.getSubjectUri();
 	    String predicateUri = editConfiguration.getPredicateUri();
-	    Integer dataHash = editConfiguration.getDatapropKey();	    
-	    
+	    Integer dataHash = editConfiguration.getDatapropKey();
+
 	    if( predicateUri == null )
 	        throw new Error("predicateUri was null");
-	    
+
 	    DataProperty dataproperty = dataPropertyDao.getDataPropertyByURI( predicateUri );
 	    if( dataproperty == null && ! VitroVocabulary.LABEL.equals( predicateUri ))
 	        throw new Error("could not get data property for " + predicateUri);
-	    
+
         DataPropertyStatement dps = null;
         if( dataHash == null ){
             throw new Error("prepareForDataPropUpdate() should not be called if the EditConfiguration is not a data property statement update ");
         }else{
-            dps = RdfLiteralHash.getPropertyStmtByHash(subjectUri, predicateUri, dataHash, model);                                  
-            if (dps==null){ 
+            dps = RdfLiteralHash.getPropertyStmtByHash(subjectUri, predicateUri, dataHash, model);
+            if (dps==null){
                 throw new Error("No match to existing data property \""+predicateUri+"\" statement for subject \""+subjectUri+"\" via key "+dataHash);
             }else{
-                //Put data property statement's literal in scope                
-                //TODO: Check if multiple statements might affect this implementation?                
+                //Put data property statement's literal in scope
+                //TODO: Check if multiple statements might affect this implementation?
                 editConfiguration.addLiteralInScope(
-                        editConfiguration.getVarNameForObject(), 
+                        editConfiguration.getVarNameForObject(),
                         new EditLiteral(dps.getData(),dps.getDatatypeURI(), dps.getLanguage()) );
-    
-                dataTypeDebug( dps, dataproperty );                                               
+
+                dataTypeDebug( dps, dataproperty );
             }
-        }         
-        
+        }
+
 
 
 	}
@@ -147,27 +147,27 @@ public class DefaultDataPropertyFormGenerator extends BaseEditConfigurationGener
             DataProperty dataproperty) {
         if( dps == null )
             return;
-        
+
         String statementDataType = null;
         String statementLang = null;
-        
+
         statementLang = dps.getLanguage();
         if( statementLang == null ) {
-            log.debug("no language attribute on data property statement in DefaultDataPropertyFormGenerator");                
+            log.debug("no language attribute on data property statement in DefaultDataPropertyFormGenerator");
         }else{
-            log.debug("language attribute of ["+statementLang+"] on data property statement in DefaultDataPropertyFormGenerator");                
+            log.debug("language attribute of ["+statementLang+"] on data property statement in DefaultDataPropertyFormGenerator");
         }
-                
+
         if( dataproperty == null )
             return;
-                                     
+
         statementDataType = dps.getDatatypeURI();
         if( statementDataType == null ){
-            log.debug("no range datatype uri set on data property statement when property's range datatype is "+dataproperty.getRangeDatatypeURI()+" in DefaultDataPropertyFormGenerator");                
+            log.debug("no range datatype uri set on data property statement when property's range datatype is "+dataproperty.getRangeDatatypeURI()+" in DefaultDataPropertyFormGenerator");
         } else {
             log.debug("range datatype uri of ["+statementDataType+"] on data property statement in DefaultDataPropertyFormGenerator");
-        }                          
+        }
     }
-	
-	
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDeleteGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDeleteGenerator.java
index f052ecf37..7b77786d4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDeleteGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDeleteGenerator.java
@@ -16,15 +16,15 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTw
 
 /**
  * Generates delete form which submits the deletion request to the deletion controller.
- * This is the page to which the user is redirected if they select Delete on the default property form. 
+ * This is the page to which the user is redirected if they select Delete on the default property form.
  *
  */
 public class DefaultDeleteGenerator extends BaseEditConfigurationGenerator implements EditConfigurationGenerator {
-	
+
 	private Log log = LogFactory.getLog(DefaultObjectPropertyFormGenerator.class);
 	private String subjectUri = null;
 	private String predicateUri = null;
-	private String objectUri = null;	
+	private String objectUri = null;
 	private Integer dataHash = 0;
 	private DataPropertyStatement dps = null;
 	private String dataLiteral = null;
@@ -55,9 +55,9 @@ public class DefaultDeleteGenerator extends BaseEditConfigurationGenerator imple
 		//set edit key for this as well
 		editConfiguration.setEditKey(editConfiguration.newEditKey(session));
 		return editConfiguration;
-		
+
 	}
-	
+
 	//Do need to know whether data or object property and how to handle that
     private void initProcessParameters(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
     	subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
@@ -71,13 +71,13 @@ public class DefaultDeleteGenerator extends BaseEditConfigurationGenerator imple
     		//not concerned about remainder, can move into default obj prop form if required
     		this.initObjectParameters(vreq);
     		this.processObjectPropForm(vreq, editConfiguration);
-    	} else {    		
+    	} else {
     	   this.processDataPropForm(vreq, session, editConfiguration);
     	}
     }
 
 
-    
+
 	private void initObjectParameters(VitroRequest vreq) {
 		//in case of object property
     	objectUri = EditConfigurationUtils.getObjectUri(vreq);
@@ -89,11 +89,11 @@ public class DefaultDeleteGenerator extends BaseEditConfigurationGenerator imple
     	//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
     }
-    
-	
+
+
     private void processDataPropForm(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
         dataHash = EditConfigurationUtils.getDataHash(vreq);
-        if( dataHash != null ){     
+        if( dataHash != null ){
             log.debug("Found a datapropKey in parameters and parsed it to int: " + dataHash);
             editConfiguration.setDatapropKey( dataHash );
             dps = EditConfigurationUtils.getDataPropertyStatement(vreq, session, dataHash, predicateUri);
@@ -105,9 +105,9 @@ public class DefaultDeleteGenerator extends BaseEditConfigurationGenerator imple
         }else{
             log.debug("Did NOT find a datapropKey for hte data hash.");
             editConfiguration.addFormSpecificData("dataPropertyLexicalValue", "unknown value");
-        }                
+        }
     }
-    
+
 
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java
index 92027e071..ce471ca98 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java
@@ -47,62 +47,62 @@ import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode;
 /**
  * Generates the edit configuration for a default property form.
  * This handles the default object property auto complete.
- * 
+ *
  * If a default property form is request and the number of indivdiuals
  * found in the range is too large, the the auto complete setup and
  * template will be used instead.
  */
 public class DefaultObjectPropertyFormGenerator implements EditConfigurationGenerator {
 
-	private Log log = LogFactory.getLog(DefaultObjectPropertyFormGenerator.class);	
+	private Log log = LogFactory.getLog(DefaultObjectPropertyFormGenerator.class);
 	private String subjectUri = null;
 	private String predicateUri = null;
-	private String objectUri = null;	
-		
+	private String objectUri = null;
+
 	private String objectPropertyTemplate = "defaultPropertyForm.ftl";
-	private String acObjectPropertyTemplate = "autoCompleteObjectPropForm.ftl";		
-	
+	private String acObjectPropertyTemplate = "autoCompleteObjectPropForm.ftl";
+
 	protected boolean doAutoComplete = false;
 	protected boolean tooManyRangeIndividuals = false;
-	
+
 	protected long maxNonACRangeIndividualCount = 300;
 	protected String customErrorMessages = null;
-	
+
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
             HttpSession session) throws Exception {
 
-    	if(!EditConfigurationUtils.isObjectProperty(EditConfigurationUtils.getPredicateUri(vreq), vreq)) {    	    	
+    	if(!EditConfigurationUtils.isObjectProperty(EditConfigurationUtils.getPredicateUri(vreq), vreq)) {
     	    throw new Exception("DefaultObjectPropertyFormGenerator does not handle data properties.");
     	}
-    	
+
     	//Custom error can also be represented as an exception above, but in this case
     	//we would like the page to enable the user to go back to the profile page
-    	
+
     	customErrorMessages = getCustomErrorMessages(vreq);
     	if(customErrorMessages != null) {
     		return this.getCustomErrorEditConfiguration(vreq, session);
     	}
-    	
+
      	if( tooManyRangeOptions( vreq, session ) ){
     		tooManyRangeIndividuals = true;
     		doAutoComplete = true;
     	}
-     	
+
     	//Check if create new and return specific edit configuration from that generator.
     	if(DefaultAddMissingIndividualFormGenerator.isCreateNewIndividual(vreq, session)) {
 			EditConfigurationGenerator generator = JspToGeneratorMapping.createFor("defaultAddMissingIndividualForm.jsp", DefaultAddMissingIndividualFormGenerator.class);
     		return generator.getEditConfiguration(vreq, session);
     	}
-    	    
+
     	//TODO: Add a generator for delete: based on command being delete - propDelete.jsp
         //Generate a edit configuration for the default object property form and return it.
     	//if(DefaultDeleteGenerator.isDelete( vreq,session)){
     	//  return (new DefaultDeleteGenerator()).getEditConfiguration(vreq,session);
-    	
+
     	return getDefaultObjectEditConfiguration(vreq, session);
     }
-	
+
     private String getCustomErrorMessages(VitroRequest vreq) {
 		String errorMessages = null;
     	String rangeUri = vreq.getParameter("rangeUri");
@@ -114,7 +114,7 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
    		    	errorMessages = I18n.text(vreq,"the_range_class_does_not_exist");
    		    }
 		}
-		
+
 		return errorMessages;
 	}
 
@@ -135,7 +135,7 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
    		    VClass rangeVClass = ctxDaoFact.getVClassDao().getVClassByURI(rangeUri);
    		    if(rangeVClass != null) {
 	   		    if (!rangeVClass.isUnion()) {
-	   		        types.add(rangeVClass);    
+	   		        types.add(rangeVClass);
 	   		    } else {
 					types.addAll(rangeVClass.getUnionComponents());
 	   		    }
@@ -163,34 +163,34 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
    			log.error("Subject individual was null for");
    		}
         return types;
-	}	
-	
+	}
+
     private boolean tooManyRangeOptions(VitroRequest vreq, HttpSession session ) throws SearchEngineException {
     	List<VClass> rangeTypes = getRangeTypes(vreq);
 		SearchEngine searchEngine = ApplicationUtils.instance().getSearchEngine();
-    	
+
     	List<String> types = new ArrayList<String>();
     	for (VClass vclass : rangeTypes) {
     	    if (vclass.getURI() != null) {
     	        types.add(vclass.getURI());
     	    }
     	}
-    	
+
     	//empty list means the range is not set to anything, force Thing
     	if(types.size() == 0 ){
     		types.add(VitroVocabulary.OWL_THING);
-    	} 
-    	
-    	long count = 0;    		   
+    	}
+
+    	long count = 0;
     	for( String type:types){
-    		//search query for type count.    		
+    		//search query for type count.
     		SearchQuery query = searchEngine.createQuery();
     		if( VitroVocabulary.OWL_THING.equals( type )){
-    			query.setQuery( "*:*" );    			
+    			query.setQuery( "*:*" );
     		}else{
     			query.setQuery( VitroSearchTermNames.RDFTYPE + ":" + type);
     		}
-    		query.setRows(0);	
+    		query.setRows(0);
     		SearchResponse rsp = searchEngine.query(query);
     		SearchResultDocumentList docs = rsp.getResults();
     		long found = docs.getNumFound();
@@ -198,87 +198,87 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
     		if( count > maxNonACRangeIndividualCount )
     			break;
     	}
-    	    	
-    	return  count > maxNonACRangeIndividualCount ;    	    	   
+
+    	return  count > maxNonACRangeIndividualCount ;
 	}
 
-    
+
 	private EditConfigurationVTwo getDefaultObjectEditConfiguration(VitroRequest vreq, HttpSession session) throws Exception {
-    	EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();    	
-    	
+    	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());
-    	
+
     	//Todo: what do new resources depend on here?
     	//In original form, these variables start off empty
     	editConfiguration.setNewResources(new HashMap<String, String>());
     	//In scope
     	this.setUrisAndLiteralsInScope(editConfiguration);
-    	
+
     	//on Form
     	this.setUrisAndLiteralsOnForm(editConfiguration, vreq);
-    	
+
     	editConfiguration.setFilesOnForm(new ArrayList<String>());
-    	
+
     	//Sparql queries
     	this.setSparqlQueries(editConfiguration);
-    	
+
     	//set fields
     	setFields(editConfiguration, vreq, EditConfigurationUtils.getPredicateUri(vreq), getRangeTypes(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);
-    	
+
     	//After the main processing is done, check if select from existing process
     	processProhibitedFromSearch(vreq, session, editConfiguration);
-    	
+
     	//Form title and submit label moved to template
     	setTemplate(editConfiguration, vreq);
-    	
+
     	editConfiguration.addValidator(new AntiXssValidation());
-    	
+
     	//Set edit key
     	setEditKey(editConfiguration, vreq);
-    	    	       	    	
+
     	//Adding additional data, specifically edit mode
     	if( doAutoComplete ){
     		addFormSpecificDataForAC(editConfiguration, vreq, session);
-    	}else{	    
+    	}else{
 	        addFormSpecificData(editConfiguration, vreq);
-    	}      
-    	
+    	}
+
     	return editConfiguration;
     }
-	
+
 	//We only need enough for the error message to show up
 	private EditConfigurationVTwo getCustomErrorEditConfiguration(VitroRequest vreq, HttpSession session) {
-		EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();    	
-    	
+		EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();
+
     	//process subject, predicate, object parameters
     	this.initProcessParameters(vreq, session, editConfiguration);
-    	
+
     	this.setUrisAndLiteralsInScope(editConfiguration);
-    	
+
     	//Sparql queries
     	this.setSparqlQueries(editConfiguration);
-    	
-    
+
+
     	prepareForUpdate(vreq, session, editConfiguration);
-    	
+
     	editConfiguration.setTemplate("customErrorMessages.ftl");
-    	
+
     	//Set edit key
     	setEditKey(editConfiguration, vreq);
-    	
+
     	//if custom error messages is not null, then add to form specific data
     	if(customErrorMessages != null) {
     		//at this point, it shouldn't be null
@@ -288,19 +288,19 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
     	}
     	return editConfiguration;
 	}
-    
+
     private void setEditKey(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-    	String editKey = EditConfigurationUtils.getEditKey(vreq);	
+    	String editKey = EditConfigurationUtils.getEditKey(vreq);
     	editConfiguration.setEditKey(editKey);
     }
-    
+
 	private void setTemplate(EditConfigurationVTwo editConfiguration,
 			VitroRequest vreq) {
 		if( doAutoComplete )
 			editConfiguration.setTemplate(acObjectPropertyTemplate);
 		else
 			editConfiguration.setTemplate(objectPropertyTemplate);
-		
+
 	}
 
 	//Initialize setup: process parameters
@@ -309,18 +309,18 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
 
     	subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
     	predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
-    
+
     	editConfiguration.setFormUrl(formUrl);
-    	
+
     	editConfiguration.setUrlPatternToReturnTo("/individual");
-    	
+
     	editConfiguration.setVarNameForSubject("subject");
     	editConfiguration.setSubjectUri(subjectUri);
     	editConfiguration.setEntityToReturnTo(subjectUri);
     	editConfiguration.setVarNameForPredicate("predicate");
     	editConfiguration.setPredicateUri(predicateUri);
-    	
-    	
+
+
     	//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
     	//"object"       : [ "objectVar" ,  "${objectUriJson}" , "URI"],
@@ -331,40 +331,40 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
     	} else {
     		log.debug("This is a data property: " + predicateUri);
         }
-    }    
+    }
+
 
-    
 	private void initObjectParameters(VitroRequest vreq) {
 		//in case of object property
     	objectUri = EditConfigurationUtils.getObjectUri(vreq);
 	}
 
 	private void processObjectPropForm(VitroRequest vreq, EditConfigurationVTwo editConfiguration) {
-    	editConfiguration.setVarNameForObject("objectVar");    	
+    	editConfiguration.setVarNameForObject("objectVar");
     	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
     }
-       
-    //Get N3 required 
-    //Handles both object and data property    
+
+    //Get N3 required
+    //Handles both object and data property
     private List<String> generateN3Required(VitroRequest vreq) {
     	List<String> n3ForEdit = new ArrayList<String>();
-    	String editString = "?subject ?predicate ";    	
-    	editString += "?objectVar";    	
+    	String editString = "?subject ?predicate ";
+    	editString += "?objectVar";
     	editString += " .";
     	n3ForEdit.add(editString);
     	return n3ForEdit;
     }
-    
+
     private List<String> generateN3Optional() {
-    	List<String> n3Inverse = new ArrayList<String>();    	
-    	n3Inverse.add("?objectVar ?inverseProp ?subject .");    	
+    	List<String> n3Inverse = new ArrayList<String>();
+    	n3Inverse.add("?objectVar ?inverseProp ?subject .");
     	return n3Inverse;
-    	
+
     }
-    
+
     //Set queries
     private String retrieveQueryForInverse () {
     	String queryForInverse =  "PREFIX owl:  <http://www.w3.org/2002/07/owl#>"
@@ -372,78 +372,78 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
 			+ "    WHERE { ?inverse_property owl:inverseOf ?predicate } ";
     	return queryForInverse;
     }
-    
+
     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()}));
     	//this shoudl happen in edit configuration prepare for object prop update
-    	//urisInScope.put(editConfiguration.getVarNameForObject(), 
+    	//urisInScope.put(editConfiguration.getVarNameForObject(),
     	//		Arrays.asList(new String[]{editConfiguration.getObject()}));
     	//inverse property uris should be included in sparql for additional uris in edit configuration
     	editConfiguration.setUrisInScope(urisInScope);
     	//Uris in scope include subject, predicate, and object var
-    	
+
     	editConfiguration.setLiteralsInScope(new HashMap<String, List<Literal>>());
     }
-    
+
     //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>();
-    	
+
     	//uris on form should be empty if data property
     	urisOnForm.add("objectVar");
-    	
+
     	editConfiguration.setUrisOnform(urisOnForm);
     	editConfiguration.setLiteralsOnForm(literalsOnForm);
     }
-        
+
     //This is for various items
     private void setSparqlQueries(EditConfigurationVTwo editConfiguration) {
     	//Sparql queries defining retrieval of literals etc.
     	editConfiguration.setSparqlForAdditionalLiteralsInScope(new HashMap<String, String>());
-    	
+
     	Map<String, String> urisInScope = new HashMap<String, String>();
     	urisInScope.put("inverseProp", this.retrieveQueryForInverse());
     	editConfiguration.setSparqlForAdditionalUrisInScope(urisInScope);
-    	
+
     	editConfiguration.setSparqlForExistingLiterals(generateSparqlForExistingLiterals());
     	editConfiguration.setSparqlForExistingUris(generateSparqlForExistingUris());
     }
-    
-    
+
+
     //Get page uri for object
     private HashMap<String, String> generateSparqlForExistingUris() {
     	HashMap<String, String> map = new HashMap<String, String>();
     	return map;
     }
-    
+
     private HashMap<String, String> generateSparqlForExistingLiterals() {
     	HashMap<String, String> map = new HashMap<String, String>();
     	return map;
     }
-    
+
     protected void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vreq, String predicateUri) throws Exception {
         setFields(editConfiguration, vreq, predicateUri, null);
     }
-    
+
     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 ){
     		field.setOptions( new IndividualsViaObjectPropetyOptions(
-    	        subjectUri, 
+    	        subjectUri,
     	        predicateUri,
     	        rangeTypes,
     	        objectUri,
@@ -451,15 +451,15 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
     	}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);
-    }       
+    }
 
 	private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
-    	//Here, retrieve model from 
+    	//Here, retrieve model from
 		OntModel model = ModelAccess.on(session.getServletContext()).getOntModel();
     	//if object property
     	if(EditConfigurationUtils.isObjectProperty(EditConfigurationUtils.getPredicateUri(vreq), vreq)){
@@ -475,7 +475,7 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
     	    throw new Error("DefaultObjectPropertyForm does not handle data properties.");
     	}
     }
-      
+
     private boolean isSelectFromExisting(VitroRequest vreq) {
     	String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
     	if(EditConfigurationUtils.isDataProperty(predicateUri, vreq)) {
@@ -484,7 +484,7 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
     	ObjectProperty objProp = EditConfigurationUtils.getObjectPropertyForPredicate(vreq, EditConfigurationUtils.getPredicateUri(vreq));
     	return objProp.getSelectFromExisting();
     }
-    
+
     //Additional processing, eg. select from existing
     //This is really process prohibited from search
     private void processProhibitedFromSearch(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfig) {
@@ -498,11 +498,11 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
                 editConfig.setProhibitedFromSearch(pfs);
     	}
     }
-    
+
   //Form specific data
 	public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
 		HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
-		//range options need to be stored for object property 
+		//range options need to be stored for object property
 		//Store field names
 		List<String> objectSelect = new ArrayList<String>();
 		objectSelect.add(editConfiguration.getVarNameForObject());
@@ -513,12 +513,12 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
 		}
 		editConfiguration.setFormSpecificData(formSpecificData);
 	}
-        			
+
 	public void addFormSpecificDataForAC(EditConfigurationVTwo editConfiguration, VitroRequest vreq, HttpSession session) throws SearchEngineException {
 		HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
 		//Get the edit mode
 		formSpecificData.put("editMode", getEditMode(vreq).toString().toLowerCase());
-		
+
 		//We also need the type of the object itself
 		List<VClass> types = getRangeTypes(vreq);
         //if types array contains only owl:Thing, the search will not return any results
@@ -526,26 +526,26 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
         if(types.size() == 1 && types.get(0).getURI().equals(VitroVocabulary.OWL_THING) ){
         	types = new ArrayList<VClass>();
         }
-		
+
         StringBuilder typesBuff = new StringBuilder();
         for (VClass type : types) {
             if (type.getURI() != null) {
                 typesBuff.append(type.getURI()).append(",");
             }
         }
-        
+
 		formSpecificData.put("objectTypes", typesBuff.toString());
 		log.debug("autocomplete object types : "  + formSpecificData.get("objectTypes"));
-		
+
 		//Get label for individual if it exists
 		if(EditConfigurationUtils.getObjectIndividual(vreq) != null) {
 			String objectLabel = EditConfigurationUtils.getObjectIndividual(vreq).getName();
 			formSpecificData.put("objectLabel", objectLabel);
 		}
-		
+
 		//TODO: find out if there are any individuals in the classes of objectTypes
 		formSpecificData.put("rangeIndividualsExist", rangeIndividualsExist(types) );
-		
+
 		formSpecificData.put("sparqlForAcFilter", getSparqlForAcFilter(vreq));
 		if(customErrorMessages != null && !customErrorMessages.isEmpty()) {
 			formSpecificData.put("customErrorMessages", customErrorMessages);
@@ -553,40 +553,40 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
 		editConfiguration.setTemplate(acObjectPropertyTemplate);
 		editConfiguration.setFormSpecificData(formSpecificData);
 	}
-	
-	private Object rangeIndividualsExist(List<VClass> types) throws SearchEngineException {		
+
+	private Object rangeIndividualsExist(List<VClass> types) throws SearchEngineException {
 		SearchEngine searchEngine = ApplicationUtils.instance().getSearchEngine();
-    	
+
     	boolean rangeIndividualsFound = false;
     	for( VClass type:types){
     		//search  for type count.
-    		SearchQuery query = searchEngine.createQuery();   
+    		SearchQuery query = searchEngine.createQuery();
     		query.setQuery( VitroSearchTermNames.RDFTYPE + ":" + type.getURI());
     		query.setRows(0);
-    		
+
     		SearchResponse rsp = searchEngine.query(query);
     		SearchResultDocumentList docs = rsp.getResults();
     		if( docs.getNumFound() > 0 ){
     			rangeIndividualsFound = true;
     			break;
-    		}    		
+    		}
     	}
-    	
-    	return  rangeIndividualsFound;		
+
+    	return  rangeIndividualsFound;
 	}
 
 	public String getSubjectUri() {
 		return subjectUri;
 	}
-	
+
 	public String getPredicateUri() {
 		return predicateUri;
 	}
-	
+
 	public String getObjectUri() {
 		return objectUri;
 	}
-	
+
 
 	/** get the auto complete edit mode */
 	public EditMode getEditMode(VitroRequest vreq) {
@@ -596,19 +596,19 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
 		EditMode editMode = FrontEndEditingUtils.EditMode.ADD;
 		if(objectUri != null && !objectUri.isEmpty()) {
 			editMode = FrontEndEditingUtils.EditMode.EDIT;
-			
+
 		}
 		return editMode;
 	}
-    
+
 	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/IndividualsByRankFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/IndividualsByRankFormGenerator.java
index 22d3d4f2f..555ee34d6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/IndividualsByRankFormGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/IndividualsByRankFormGenerator.java
@@ -18,44 +18,44 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsVi
 /**
  * Generates the edit configuration for a default property form.
  * This handles the default object property auto complete.
- * 
+ *
  * If a default property form is request and the number of individuals
  * found in the range is too large, the the auto complete setup and
  * template will be used instead.
  */
 public class IndividualsByRankFormGenerator extends DefaultObjectPropertyFormGenerator implements EditConfigurationGenerator {
 
-	private Log log = LogFactory.getLog(IndividualsByRankFormGenerator.class);	
-	
+	private Log log = LogFactory.getLog(IndividualsByRankFormGenerator.class);
+
 	/*
 	 *   (non-Javadoc)
 	 * @see edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DefaultObjectPropertyFormGenerator#setFields(edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo, edu.cornell.mannlib.vitro.webapp.controller.VitroRequest, java.lang.String)
 	 *
 	 * Updates here include using different field options that enable sorting of individuals for the property by display rank
 	 */
-   @Override    
-    protected void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vreq, String predicateUri) throws Exception {    	
+   @Override
+    protected void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vreq, String predicateUri) 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 ){
     		field.setOptions( new IndividualsViaObjectPropertyByRankOptions(
     	        super.getSubjectUri(),
-    	        super.getPredicateUri(), 
+    	        super.getPredicateUri(),
     	        super.getObjectUri(),
-    	        vreq.getWebappDaoFactory(), 
+    	        vreq.getWebappDaoFactory(),
     	        vreq.getJenaOntModel()));
     	}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/InstitutionalInternalClassForm.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/InstitutionalInternalClassForm.java
index b02e32609..5c9ae5e43 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/InstitutionalInternalClassForm.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/InstitutionalInternalClassForm.java
@@ -13,40 +13,40 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTw
 /**
  * Generate the EditConfiguration for the Institutional Internal Class Form.
  * see http://issues.library.cornell.edu/browse/NIHVIVO-2666
- *  
+ *
  *
  */
 public class InstitutionalInternalClassForm extends BaseEditConfigurationGenerator implements EditConfigurationGenerator {
 
     String INTERNAL_CLASS_ANNOTATION_URI= "<http://example.com/vivo#ChangeMeUniveristy>";
-    
+
     @Override
-    public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) { 
+    public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) {
         EditConfigurationVTwo editConfig = new EditConfigurationVTwo();
-        
+
         //set up the template for the form
         editConfig.setTemplate("institutionalInternalClassForm.ftl");
-        
+
         //Set the n3 that is required for the edit
         //bdc34: don't know how the annotation will be structured
         StringList n3ForInternalClass =new StringList( " ?internalClassUri "+INTERNAL_CLASS_ANNOTATION_URI+" \"true\" . " );
         editConfig.setN3Required( n3ForInternalClass );
-        
+
         //bdc34: maybe this is redundant with the keys of the fields Map?
-        editConfig.setUrisOnform( new StringList( "internalClassUri" ));                        
-        
+        editConfig.setUrisOnform( new StringList( "internalClassUri" ));
+
         //edit config should have URL to submit the form to
-        //editConfig.setUrl 
+        //editConfig.setUrl
         //set the url pattern that the client will return to after a successful edit
-        editConfig.setUrlPatternToReturnTo("/siteAdmin");        
-        
+        editConfig.setUrlPatternToReturnTo("/siteAdmin");
+
         editConfig.setSubmitToUrl("/edit/process");
         //prepare
         prepare(vreq, editConfig);
         return editConfig;
     }
 
-    
+
     public class StringList extends ArrayList<String>{
         public StringList( String ... strings){
             super();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForIndividualGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForIndividualGenerator.java
index 04449d8f0..15782747b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForIndividualGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForIndividualGenerator.java
@@ -45,7 +45,7 @@ import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.DataProper
 
 /**
  *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 ManageLabelsForIndividualGenerator extends BaseEditConfigurationGenerator implements EditConfigurationGenerator {
     public static Log log = LogFactory.getLog(ManageLabelsForIndividualGenerator.class);
@@ -55,7 +55,7 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
     //list of language names sorted alphabetically
     private List<String> existingSortedLanguageNameList = null;
     //This would be for the full list and can be used for the existing labels list as well
-    
+
     private HashMap<String, String> fullLanguageNameToCodeMap = null;
     private static String predicateUri = RDFS.label.getURI();
     @Override
@@ -66,7 +66,7 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
 
         initBasics(config, vreq);
         initPropertyParameters(vreq, session, config);
-       
+
         //This form is technically not an object property form in the true sense
         //or a data property form because it is used to list the various labels
         //and allow for adding new labels
@@ -74,7 +74,7 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
         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
@@ -85,10 +85,10 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
     	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
@@ -96,12 +96,12 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
 			   new ManageLabelsForIndividualPreprocessor(config));
  	   //This will handle generating the label from the first name and last name 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
     /*
@@ -109,11 +109,11 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
     	conf.addNewResource("fullName", DEFAULT_NS_FOR_NEW_RESOURCE);
         conf.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,61 +129,61 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
 	private List<String> generateN3Optional(VitroRequest vreq) {
 		List<String> n3Optional = new ArrayList<String>();
 		String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
-		String n3 = "?subject <" + predicateUri + "> ?label ";		
+		String n3 = "?subject <" + predicateUri + "> ?label ";
 		n3Optional.add(n3);
 		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("label").
-                setValidators(getLabelValidators(vreq, editConfiguration)));    
+                setValidators(getLabelValidators(vreq, editConfiguration)));
     	editConfiguration.addField(new FieldVTwo(
-    			).setName("newLabelLanguage"));    	
+    			).setName("newLabelLanguage"));
     }
-    
-	
+
+
 
 	//validate label if person is not true
 	private List<String> getLabelValidators(VitroRequest vreq, EditConfigurationVTwo config) {
 		List<String> validators = new ArrayList<String>();
 		return validators;
 	}
-    
 
-    
+
+
 	private void setUrisAndLiteralsOnForm(EditConfigurationVTwo config,
 			VitroRequest vreq) {
 		List<String> literalsOnForm = new ArrayList<String>();
 		literalsOnForm.add("label");
 		literalsOnForm.add("newLabelLanguage");
 		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);		
+		this.existingLabelLiterals = this.getExistingLabels(config.getSubjectUri(), vreq);
 	}
-    
+
 
 	private List<String> getExistingSortedLanguageNamesList() {
 		HashSet<String> existingLanguages = new HashSet<String>();
@@ -214,7 +214,7 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
 		//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);
@@ -222,26 +222,26 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
 		 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");              
 
-      
+
+        //How do we edit? Will need to see
+        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);
         }
-       
+
   		//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) {
@@ -264,7 +264,7 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
                 return languageName1.compareTo(languageName2);
             }
         });
-		
+
 		return availableLocales;
 	}
 
@@ -282,7 +282,7 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
 
 
 
-	
+
 	//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());
@@ -295,11 +295,11 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
 			VitroRequest vreq) {
 		String subjectUri = config.getSubjectUri();
 		String propertyUri = config.getPredicateUri();
-		
-		
+
+
 		//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 = "";
@@ -311,7 +311,7 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
 			} 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>());
@@ -326,7 +326,7 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
 						l, dpstm.getEditUrl(), dpstm.getDeleteUrl(), languageTag, languageName));
 			}
 		}
-		
+
 		//Sort each label list
 		LabelInformationComparator lic = new LabelInformationComparator();
 		for(String languageName: labelsHash.keySet()) {
@@ -334,12 +334,12 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
 			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());
 		}
@@ -351,8 +351,8 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
 	        + "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);
@@ -364,31 +364,31 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
             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);
@@ -405,27 +405,27 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
 						+ "': " + 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) {
@@ -433,13 +433,13 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
     		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 {
@@ -449,14 +449,14 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
 		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;
@@ -464,32 +464,32 @@ public class ManageLabelsForIndividualGenerator extends BaseEditConfigurationGen
     		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/ManageLabelsGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsGenerator.java
index 80a9e6b56..cd1e1a9bf 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsGenerator.java
@@ -11,7 +11,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTw
 
 /**
  *This generator selects the actual generator to be employed.  This generator can be overwritten in applications
- *that use/extend Vitro to allow for class-based label handling.  
+ *that use/extend Vitro to allow for class-based label handling.
  */
 public class ManageLabelsGenerator extends BaseEditConfigurationGenerator implements EditConfigurationGenerator {
     public static Log log = LogFactory.getLog(ManageLabelsForIndividualGenerator.class);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java
index a9b04a267..9f259afa1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java
@@ -50,35 +50,35 @@ import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.DataGetterUtils;
 import edu.cornell.mannlib.vitro.webapp.utils.menuManagement.MenuManagementDataUtils;
 
 /**
- * Generates the form for adding and editing a page in the display model. 
+ * Generates the form for adding and editing a page in the display model.
  *
  */
 public class ManagePageGenerator extends BaseEditConfigurationGenerator implements EditConfigurationGenerator{
-	
+
 	private String template = "pageManagement.ftl";
 	public static final String defaultDisplayNs = DisplayVocabulary.NAMESPACE.getURI() + "n";
 	private Log log = LogFactory.getLog(ManagePageGenerator.class);
 
 	@Override
-    public EditConfigurationVTwo getEditConfiguration( VitroRequest vreq, HttpSession session) { 
+    public EditConfigurationVTwo getEditConfiguration( VitroRequest vreq, HttpSession session) {
         EditConfigurationVTwo conf = new EditConfigurationVTwo();
         conf.setTemplate(template);
 
         //get editkey and url of form
-        initBasics(conf, vreq);        
+        initBasics(conf, vreq);
         initPropertyParameters(vreq, session, conf);
         //if object uri exists, sets object URI
-        initObjectPropForm(conf, vreq);     
+        initObjectPropForm(conf, vreq);
         //Depending on whether this is a new individual to be created or editing
         //an existing one, the var names will differ
         setVarNames(conf);
         //Set N3 required and optional
         setN3Required(conf);
         setN3Optional(conf);
-        
+
         //Designate new resources if any exist
         setNewResources(conf);
-        
+
         //Add sparql queries
         setSparqlQueries(conf);
      // In scope
@@ -96,33 +96,33 @@ public class ManagePageGenerator extends BaseEditConfigurationGenerator implemen
         prepare(vreq, conf);
         //This method specifically retrieves information for edit
         populateExistingDataGetter(vreq, conf, session.getServletContext());
-      
+
         return conf	;
     }
-	
-	
+
+
 
 	private void setUrisAndLiteralsOnForm(EditConfigurationVTwo conf,
 			VitroRequest vreq) {
 		conf.setUrisOnForm(new String[]{"page", "menuItem", "action"}); //new resources: should this be on form for new - should be for existing
 		conf.setLiteralsOnForm(new String[]{"pageName", "prettyUrl", "menuPosition", "menuLinkText", "customTemplate", "isSelfContainedTemplate", "pageContentUnit"}); //page content unit = data getter JSON object
-		
+
 	}
 
 	private void setUrisAndLiteralsInScope(EditConfigurationVTwo conf,
 			VitroRequest vreq) {
 		//URIs
-		conf.addUrisInScope(conf.getVarNameForSubject(), 
+		conf.addUrisInScope(conf.getVarNameForSubject(),
 							Arrays.asList(new String[]{conf.getSubjectUri()}));
-		conf.addUrisInScope(conf.getVarNameForPredicate(), 
+		conf.addUrisInScope(conf.getVarNameForPredicate(),
 				Arrays.asList(new String[]{conf.getPredicateUri()}));
 
-		
+
 	}
 
 	private void setN3Optional(EditConfigurationVTwo conf) {
 		//body template is not required, and a given page may or may not be a menu item, but should linked to menu if menu item
-	      conf.setN3Optional(new ArrayList<String>(Arrays.asList(prefixes + pageBodyTemplateN3, 
+	      conf.setN3Optional(new ArrayList<String>(Arrays.asList(prefixes + pageBodyTemplateN3,
 	    		  							prefixes + menuItemN3 + menuN3,
 	    		  							prefixes + isSelfContainedTemplateN3,
 	    		  							prefixes + permissionN3)));
@@ -130,14 +130,14 @@ public class ManagePageGenerator extends BaseEditConfigurationGenerator implemen
 
 	private void setN3Required(EditConfigurationVTwo conf) {
 	      conf.setN3Required(new ArrayList<String>(Arrays.asList(prefixes + pageN3)));
-		
+
 	}
-	
+
 	private void setFields(EditConfigurationVTwo conf) {
 		//Required fields for page include: Page title, page URL Mapping
 		//Data getter fields will be dealt with in preprocessor/util classes
 		//Optional fields for page include body template
-		
+
 		//required, therefore nonempty
 		FieldVTwo titleField = new FieldVTwo().setName("pageName").
 												setValidators(Arrays.asList("nonempty"));
@@ -145,32 +145,32 @@ public class ManagePageGenerator extends BaseEditConfigurationGenerator implemen
 
 		FieldVTwo urlField = new FieldVTwo().setName("prettyUrl").setValidators(Arrays.asList("nonempty"));
 		conf.addField(urlField);
-		
+
 		//optional: body template
 		FieldVTwo bodyTemplateField = new FieldVTwo().setName("customTemplate");
 		conf.addField(bodyTemplateField);
 
-		
+
 		//For menu item, these are optional b/c they depend on menu item
 		FieldVTwo menuItemLinkTextField = new FieldVTwo().setName("menuLinkText");
 		conf.addField(menuItemLinkTextField);
-		
+
 		FieldVTwo menuItemPositionField = new FieldVTwo().setName("menuPosition").setRangeDatatypeUri(XSD.integer.getURI());
 		conf.addField(menuItemPositionField);
-		
+
 		//If this is a self contained template, the appropriate flag will be set
 		FieldVTwo isSelfContainedTemplateField = new FieldVTwo().setName("isSelfContainedTemplate");
 		conf.addField(isSelfContainedTemplateField);
-		
+
 		//Permission for the page
 		FieldVTwo permissionField = new FieldVTwo().setName("action");
 		conf.addField(permissionField);
-		
+
 		//The actual page content information is stored in this field, and then
 		//interpreted using the preprocessor
 		FieldVTwo pageContentUnitField = new FieldVTwo().setName("pageContentUnit");
 		conf.addField(pageContentUnitField);
-		
+
 		//For existing values, will need to include fields here
 	}
 
@@ -184,22 +184,22 @@ public class ManagePageGenerator extends BaseEditConfigurationGenerator implemen
         	conf.setVarNameForSubject("subjectNotUsed");
         	conf.setVarNameForPredicate("predicateNotUsed");
         }
-		
+
 	}
 
 	//overriding
 	@Override
 	  void  initPropertyParameters(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
-	        
+
 	        String subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
-	        String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);                           
+	        String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
         	editConfiguration.setUrlToReturnTo(UrlBuilder.getUrl("/pageList"));
 	      //For the case of a new page
 	        if(subjectUri == null) {
 	        	//Once added, return to pageList
 		    	editConfiguration.setEntityToReturnTo("?page");
 		    	editConfiguration.setPredicateUri(predicateUri);
-		        
+
 	        } else {
 	        	//For the case of an existing page
 	        	//Page title pageName or page hasDataGetter dataGetter
@@ -207,55 +207,55 @@ public class ManagePageGenerator extends BaseEditConfigurationGenerator implemen
 		        //Set update version here
 			    //if subject uri = page uri != null or empty, editing existing page
 	        	editConfiguration.setParamUpdate(true);
-		        
+
 	        }
 	        editConfiguration.setSubjectUri(subjectUri);
 	    	editConfiguration.setPredicateUri(predicateUri);
 	    }
-	
-	  
+
+
 	 //also overriding
 	@Override
 	  void prepare(VitroRequest vreq, EditConfigurationVTwo editConfig) {
 	        //setup the model selectors for query, write and display models on editConfig
-	        setupModelSelectorsFromVitroRequest(vreq, editConfig);         
+	        setupModelSelectorsFromVitroRequest(vreq, editConfig);
 			OntModel queryModel = ModelAccess.on(vreq).getOntModel();
-	        if (editConfig.isParamUpdate()) { 
+	        if (editConfig.isParamUpdate()) {
 	        	editConfig.prepareForParamUpdate(queryModel);
-	        	
+
 	        }
 	         else{
 	            //if no subject uri, this is creating a new page
 	            editConfig.prepareForNonUpdate(queryModel);
 	        }
-	    }     
-	  
+	    }
+
 	private void populateExistingDataGetter(VitroRequest vreq,
 			EditConfigurationVTwo editConfig,
 			ServletContext context) {
-        if (editConfig.isParamUpdate()) { 
+        if (editConfig.isParamUpdate()) {
         	 //setup the model selectors for query, write and display models on editConfig
-	        setupModelSelectorsFromVitroRequest(vreq, editConfig);         
+	        setupModelSelectorsFromVitroRequest(vreq, editConfig);
 			OntModel queryModel = ModelAccess.on(vreq).getOntModel();
         	retrieveExistingDataGetterInfo(context, editConfig, queryModel);
         }
-		
+
 	}
-    
+
 	//This method will get the data getters related to this page
 	//And retrieve the current information for each of those data getters
-    private void retrieveExistingDataGetterInfo(ServletContext context, 
-    		EditConfigurationVTwo editConfig, 
+    private void retrieveExistingDataGetterInfo(ServletContext context,
+    		EditConfigurationVTwo editConfig,
     		OntModel queryModel) {
 		String pageUri = editConfig.getSubjectUri();
 		executeExistingDataGettersInfo(context, editConfig, pageUri, queryModel);
-		 
-		
+
+
 	}
-    
+
     private void executeExistingDataGettersInfo(ServletContext servletContext,
-    		EditConfigurationVTwo editConfig, 
-    		String pageUri, 
+    		EditConfigurationVTwo editConfig,
+    		String pageUri,
     		OntModel queryModel) {
     	//Create json array to be set within form specific data
     	ArrayNode jsonArray = new ObjectMapper().createArrayNode();
@@ -276,10 +276,10 @@ public class ManagePageGenerator extends BaseEditConfigurationGenerator implemen
             	String dgClassName = getClassName(dgType.getURI());
             	//literals in scope/on form and fields/ as well as
             	//json representation to be returned to template saved in json array
-            	processExistingDataGetter(counter, 
-            			dg.getURI(), 
+            	processExistingDataGetter(counter,
+            			dg.getURI(),
             			dgClassName, editConfig, queryModel, jsonArray, servletContext);
-            
+
             	counter++;
             }
             //add json array to form specific data to be returned
@@ -290,19 +290,19 @@ public class ManagePageGenerator extends BaseEditConfigurationGenerator implemen
         	log.error("Error occurred in executing query " + querystr, ex);
         }
     }
-    
+
     private void addJSONArrayToFormSpecificData(ArrayNode jsonArray, EditConfigurationVTwo editConfig) {
-    	HashMap<String, Object> data = editConfig.getFormSpecificData();		
+    	HashMap<String, Object> data = editConfig.getFormSpecificData();
 		data.put("existingPageContentUnits", jsonArray.toString());
 		//Experimenting with putting actual array in
 		data.put("existingPageContentUnitsJSONArray", jsonArray);
-		
+
 	}
 
 	private void processExistingDataGetter(int counter, String dataGetterURI, String dgClassName,
 			EditConfigurationVTwo editConfig, OntModel queryModel, ArrayNode jsonArray, ServletContext context) {
     	ProcessDataGetterN3 pn = ProcessDataGetterN3Utils.getDataGetterProcessorN3(dgClassName, null);
-    	
+
 		//Add N3 Optional as well
 		addExistingN3Optional(editConfig, pn, counter);
 		// Add URIs on Form and Add Literals On Form
@@ -315,13 +315,13 @@ public class ManagePageGenerator extends BaseEditConfigurationGenerator implemen
     	addValuesInScope(editConfig, pn, counter, dataGetterURI, queryModel);
     	//Get data getter-specific form specific data should it exist
     	addDataGetterSpecificFormData(dataGetterURI, pn, queryModel, jsonArray, context);
-    	
-		
+
+
 	}
 
 	//Any data that needs to be placed within form specific data
 	//including: (i) The JSON object representing the existing information to be returned to template
-	
+
 	//Takes data getter information, packs within JSON object to send back to the form
 	private void addDataGetterSpecificFormData(String dataGetterURI, ProcessDataGetterN3 pn, OntModel queryModel, ArrayNode jsonArray, ServletContext context) {
 		ObjectNode jo = pn.getExistingValuesJSON(dataGetterURI, queryModel, context);
@@ -339,9 +339,9 @@ public class ManagePageGenerator extends BaseEditConfigurationGenerator implemen
 		//Add n3 connecting page to this data getter
 		n3.add(getPageToDataGetterN3(pn, counter));
 		editConfig.addN3Optional(n3);
-		
+
 	}
-	
+
 	private String getPageToDataGetterN3(ProcessDataGetterN3 pn, int counter) {
 		String dataGetterVar = pn.getDataGetterVar(counter);
 		//Put this method in the generator but can be put elsewhere
@@ -354,13 +354,13 @@ public class ManagePageGenerator extends BaseEditConfigurationGenerator implemen
 		editConfig.addLiteralsOnForm(literalsOnForm);
 		List<String> urisOnForm = pn.retrieveUrisOnForm(counter);
 		editConfig.addUrisOnForm(urisOnForm);
-		
+
 	}
 
 	private void addExistingFields(EditConfigurationVTwo editConfig, ProcessDataGetterN3 pn, int counter) {
 		List<FieldVTwo> existingFields = pn.retrieveFields(counter);
 		editConfig.addFields(existingFields);
-		
+
 	}
 
 	private void addExistingDataGetterNewResources(EditConfigurationVTwo editConfig, ProcessDataGetterN3 pn,
@@ -371,9 +371,9 @@ public class ManagePageGenerator extends BaseEditConfigurationGenerator implemen
 			//using default for now but will have to check
 			editConfig.addNewResource(r, null);
 		}
-		
+
 	}
-	
+
 	 private void addValuesInScope(EditConfigurationVTwo editConfig,
 				ProcessDataGetterN3 pn, int counter, String dataGetterURI, OntModel queryModel) {
 		 	pn.populateExistingValues(dataGetterURI, counter, queryModel);
@@ -389,50 +389,50 @@ public class ManagePageGenerator extends BaseEditConfigurationGenerator implemen
     	}
     	return dataGetterURI;
     }
-    
+
     //Get the data getter uri and the type of the data getter
     private String getExistingDataGettersQuery() {
-    	String query = getSparqlPrefix() + "SELECT ?dataGetter ?dataGetterType WHERE {" + 
+    	String query = getSparqlPrefix() + "SELECT ?dataGetter ?dataGetterType WHERE {" +
     			"?page display:hasDataGetter ?dataGetter .  ?dataGetter rdf:type ?dataGetterType .}";
     	return query;
     }
-    
 
-	//In the case where this is a new page, need to ensure page gets a new 
+
+	//In the case where this is a new page, need to ensure page gets a new
     private void setNewResources(EditConfigurationVTwo conf) {
 		//null makes default namespace be triggered
     	//conf.addNewResource("page", defaultDisplayNs);
     	//conf.addNewResource("menuItem", defaultDisplayNs);
     	conf.addNewResource("page", null);
     	conf.addNewResource("menuItem", null);
-		
-	}    
-    
+
+	}
+
     //This is for various items
     private void setSparqlQueries(EditConfigurationVTwo editConfiguration) {
     	//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());
     	editConfiguration.setSparqlForExistingUris(generateSparqlForExistingUris());
     }
-    
-    
+
+
     private HashMap<String, String> generateSparqlForExistingUris() {
     	HashMap<String, String> map = new HashMap<String, String>();
     	map.put("menuItem", getExistingMenuItemQuery());
     	map.put("action", getExistingActionQuery());
     	return map;
     }
-    
+
     private String getExistingMenuItemQuery() {
 		String query = getSparqlPrefix() + "SELECT ?menuItem WHERE {?menuItem display:toPage ?page .}";
 		return query;
 	}
-    
+
     private String getExistingActionQuery() {
 		String query = getSparqlPrefix() + "SELECT ?action WHERE {?page display:requiresAction ?action .}";
 		return query;
@@ -451,12 +451,12 @@ public class ManagePageGenerator extends BaseEditConfigurationGenerator implemen
     	map.put("isSelfContainedTemplate", getExistingIsSelfContainedTemplateQuery());
     	return map;
     }
-    
+
   private String getSparqlPrefix() {
-	  return  "PREFIX display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> \n" + 
+	  return  "PREFIX display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> \n" +
 			  "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>";
   }
-    
+
   private String getExistingPageNameQuery() {
 		// TODO Auto-generated method stub
 	  String query = getSparqlPrefix() + "SELECT ?pageName WHERE {" +
@@ -465,20 +465,20 @@ public class ManagePageGenerator extends BaseEditConfigurationGenerator implemen
 	}
 
 private String getExistingPrettyUrlQuery() {
-		String query = getSparqlPrefix() + "SELECT ?prettyUrl WHERE {" + 
+		String query = getSparqlPrefix() + "SELECT ?prettyUrl WHERE {" +
 		"?page	display:urlMapping ?prettyUrl .}";
 		return query;
 	}
 
 //If menu, return menu position
 private String getExistingMenuPositionQuery() {
-		String menuPositionQuery = getSparqlPrefix() + "SELECT ?menuPosition WHERE {" + 
+		String menuPositionQuery = getSparqlPrefix() + "SELECT ?menuPosition WHERE {" +
 		"?menuItem display:toPage ?page . ?menuItem display:menuPosition ?menuPosition. }";
 		return menuPositionQuery;
 	}
 
 private String getExistingMenuLinkTextQuery() {
-	String menuPositionQuery = getSparqlPrefix() + "SELECT ?menuLinkText WHERE {" + 
+	String menuPositionQuery = getSparqlPrefix() + "SELECT ?menuLinkText WHERE {" +
 			"?menuItem display:toPage ?page . ?menuItem display:linkText ?menuLinkText. }";
 			return menuPositionQuery;
 	}
@@ -510,18 +510,18 @@ private String getExistingIsSelfContainedTemplateQuery() {
 		//For every type of page, will need some "always required" data
 		addRequiredPageData(vreq, formSpecificData);
 		//For a new page, we will need to add the following data
-		//Is param update not 
+		//Is param update not
 		if(editConfiguration.getSubjectUri() != null) {
 			addExistingPageData(vreq, formSpecificData);
 		} else {
 			addNewPageData(vreq, formSpecificData);
-		}		
+		}
 
 		  //for menu position, return either existing menu position or get the highest available menu position
         retrieveMenuPosition(editConfiguration, vreq, formSpecificData);
 		editConfiguration.setFormSpecificData(formSpecificData);
 	}
-	
+
 	private void addRequiredPageData(VitroRequest vreq, Map<String, Object> data) {
      	MenuManagementDataUtils.includeRequiredSystemData(vreq.getSession().getServletContext(), data);
     	data.put("classGroup", new ArrayList<String>());
@@ -531,7 +531,7 @@ private String getExistingIsSelfContainedTemplateQuery() {
     	data.put("availablePermissions", this.getAvailablePermissions(vreq));
     	data.put("availablePermissionOrderedList", this.getAvailablePermissonsOrderedURIs());
 	}
-	
+
 	private void addExistingPageData(VitroRequest vreq, Map<String, Object> data) {
 		addNewPageData(vreq, data);
 		data.put("menuAction", "Edit");
@@ -539,19 +539,19 @@ private String getExistingIsSelfContainedTemplateQuery() {
 		//Set up pageContentUnits as String - to save later
 		data.put("existingPageContentUnits", null);
 	}
-	
+
 	private void addNewPageData(VitroRequest vreq, Map<String, Object> data) {
     	data.put("title", "Add Menu Item");
-		data.put("menuAction", "Add");    
+		data.put("menuAction", "Add");
     	data.put("selectedTemplateType", "default");
     	//Check for parameter specifying that this is a new menu page, in which case
     	//menu item should be selected
     	String menuItemParam = vreq.getParameter("addMenuItem");
     	if(menuItemParam != null) {
     		data.put("addMenuItem", menuItemParam);
-    	} 
+    	}
 	}
-	
+
 	private HashMap<String, String> getAvailablePermissions(VitroRequest vreq) {
 		HashMap<String, String> availablePermissions = new HashMap<String, String>();
 		String actionNamespace = "java:edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission#";
@@ -562,7 +562,7 @@ private String getExistingIsSelfContainedTemplateQuery() {
 		availablePermissions.put(actionNamespace + "PageViewablePublic", I18n.text(vreq,"page_public_permission_option"));
 		return availablePermissions;
 	}
-	
+
 	//To display the permissions in a specific order, we can't rely on the hashmap whose keys are not guaranteed to return in a specific order
 	//This is to allow the display to work correctly
 	private List<String> getAvailablePermissonsOrderedURIs() {
@@ -576,47 +576,47 @@ private String getExistingIsSelfContainedTemplateQuery() {
 
 		return availablePermissionsOrdered;
 	}
-	
+
 	//N3 strings
-	
+
 	//For new or existing page
-	final static String prefixes = "@prefix display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> . \n" + 
+	final static String prefixes = "@prefix display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> . \n" +
 	"@prefix rdfs:<http://www.w3.org/2000/01/rdf-schema#> . \n";
-	
-	final static String pageN3 = "?page a display:Page ;  \n" +  
-		"display:title ?pageName ;\n" +  
-		"display:urlMapping ?prettyUrl .";  
+
+	final static String pageN3 = "?page a display:Page ;  \n" +
+		"display:title ?pageName ;\n" +
+		"display:urlMapping ?prettyUrl .";
 
 	//"display:hasDataGetter ?pageDataGetter .";
-	
+
 	//A page may also require a body template so we can get that here as well
 	//That would be optional
-	
+
 	final static String pageBodyTemplateN3 = "?page display:requiresBodyTemplate ?customTemplate .";
-	
+
 	//If self contained template, n3 will denote this using a flag
 	final static String isSelfContainedTemplateN3 = "?page display:isSelfContainedTemplate ?isSelfContainedTemplate .";
 
-	
+
 	//Menu position is added dynamically at end by default and can be changed on reordering page
-	final static String menuItemN3 = "?menuItem a display:NavigationElement ; \n" + 
-    	"display:menuPosition ?menuPosition; \n" + 
-    	"display:linkText ?menuLinkText; \n" + 
+	final static String menuItemN3 = "?menuItem a display:NavigationElement ; \n" +
+    	"display:menuPosition ?menuPosition; \n" +
+    	"display:linkText ?menuLinkText; \n" +
     	"display:toPage ?page .";
-	
+
 	//We define n3 here from default menu item up through page, but data getters are added dyamically
 	//so will be dealt with in the preprocessor
-	
+
 	final static String menuN3 = "display:DefaultMenu display:hasElement ?menuItem .";
-	
+
 	//N3 that will assign a permission to a page
 	final static String permissionN3 = "?page display:requiresAction ?action .";
-	
+
 	//These are public static methods that can be used in the preprocessor
 	public final static String getDataGetterN3(String dataGetterVar) {
 		return prefixes + "?page display:hasDataGetter " + dataGetterVar + ".";
 	}
-	
+
 	public void retrieveMenuPosition(EditConfigurationVTwo editConfig, VitroRequest vreq, Map<String, Object> formSpecificData) {
 		boolean returnHighestMenuPosition = false;
 		//if adding a new page or if editing an existing page which does not have an associated
@@ -624,9 +624,9 @@ private String getExistingIsSelfContainedTemplateQuery() {
 		int availableMenuPosition = this.getAvailableMenuPosition(editConfig, vreq);
 		formSpecificData.put("highestMenuPosition", "" + availableMenuPosition);
 	}
-	
+
 	//Get the highest menu position and return that + 1 for the menu position that can be associated
-	//for a new menu item 
+	//for a new menu item
 	public int getAvailableMenuPosition(EditConfigurationVTwo editConfig, VitroRequest vreq) {
 		//Execute sparql query to get highest menu position
 		int maxMenuPosition = getMaxMenuPosition(editConfig, vreq);
@@ -638,7 +638,7 @@ private String getExistingIsSelfContainedTemplateQuery() {
 	private int getMaxMenuPosition(EditConfigurationVTwo editConfig, VitroRequest vreq) {
 		int maxMenuPosition = 0;
 		Literal menuPosition = null;
-		setupModelSelectorsFromVitroRequest(vreq, editConfig);         
+		setupModelSelectorsFromVitroRequest(vreq, editConfig);
 		OntModel queryModel = ModelAccess.on(vreq).getOntModel();
 
 		String maxMenuPositionQuery = getMaxMenuPositionQueryString();
@@ -655,7 +655,7 @@ private String getExistingIsSelfContainedTemplateQuery() {
         } catch(Exception ex) {
         	log.error("Error occurred in executing query " + maxMenuPositionQuery, ex);
         }
-        
+
         if(menuPosition != null) {
         	maxMenuPosition = menuPosition.getInt();
         }
@@ -665,24 +665,24 @@ private String getExistingIsSelfContainedTemplateQuery() {
 
 
 	private String getMaxMenuPositionQueryString() {
-		String query = getSparqlPrefix() + 
-				"SELECT ?menuPosition WHERE {?pageUri display:menuPosition ?menuPosition . } " + 
+		String query = getSparqlPrefix() +
+				"SELECT ?menuPosition WHERE {?pageUri display:menuPosition ?menuPosition . } " +
 				"ORDER BY DESC(?menuPosition) LIMIT 1";
 		return query;
 	}
-	
+
 	//Get all vclasses for the list of vclasses for search
 	//Originally considered using an ajax request to get the vclasses list which is fine for adding a new content type
 	//but for an existing search content type, would need to make yet another ajax request which seems too much
 	private List<HashMap<String, String>> getAllVClasses(VitroRequest vreq) {
-		List<VClass> vclasses = new ArrayList<VClass>();     
+		List<VClass> vclasses = new ArrayList<VClass>();
         VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
         List<VClassGroup> groups = vcgc.getGroups();
         for(VClassGroup vcg: groups) {
 			vclasses.addAll(vcg);
-            
+
         }
-       
+
         //Sort vclass by name
         Collections.sort(vclasses);
 		ArrayList<HashMap<String, String>> classes = new ArrayList<HashMap<String, String>>(vclasses.size());
@@ -692,10 +692,10 @@ private String getExistingIsSelfContainedTemplateQuery() {
         	HashMap<String, String> vcObj = new HashMap<String, String>();
         	vcObj.put("name", vc.getName());
         	vcObj.put("URI", vc.getURI());
-        	classes.add(vcObj);            
+        	classes.add(vcObj);
         }
         return classes;
 	}
-	
-	
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java
index 5f0b120c7..8c251467b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java
@@ -29,51 +29,51 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
  *
  */
 public class NewIndividualFormGenerator implements EditConfigurationGenerator {
-	
+
 	private String subjectUri = null;
 	private String predicateUri = null;
 	private String objectUri = null;
-		
+
 	private String template = "newIndividualForm.ftl";
-	
+
     @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());
-    	
+
     	//Todo: what do new resources depend on here?
     	//In original form, these variables start off empty
     	editConfiguration.setNewResources(this.generateNewResources(vreq));
     	//In scope
     	this.setUrisAndLiteralsInScope(editConfiguration);
-    	
+
     	//on Form
     	this.setUrisAndLiteralsOnForm(editConfiguration, vreq);
-    	
+
     	editConfiguration.setFilesOnForm(new ArrayList<String>());
-    	
+
     	//Sparql queries
     	this.setSparqlQueries(editConfiguration);
-    	
+
     	//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);
-    	
+
     	editConfiguration.addValidator(new AntiXssValidation());
-    	
+
     	//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
@@ -85,10 +85,10 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator {
         addFormSpecificData(editConfiguration, vreq);
 
     	return editConfiguration;
-    	
+
 
     }
-    
+
     private Map<String, String> generateNewResources(VitroRequest vreq) {
     	HashMap<String, String> newResources = new HashMap<String, String>();
 		//null makes default namespace be triggered
@@ -97,14 +97,14 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator {
 	}
 
 	private void setEditKey(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-    	String editKey = EditConfigurationUtils.getEditKey(vreq);	
+    	String editKey = EditConfigurationUtils.getEditKey(vreq);
     	editConfiguration.setEditKey(editKey);
     }
-    
+
 	private void setTemplate(EditConfigurationVTwo editConfiguration,
 			VitroRequest vreq) {
     	editConfiguration.setTemplate(template);
-		
+
 	}
 
 	//Initialize setup: process parameters
@@ -113,138 +113,138 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator {
 
     	subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
     	predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
-    
+
     	editConfiguration.setFormUrl(formUrl);
-    	
+
     	editConfiguration.setUrlPatternToReturnTo("/individual");
-    	
+
     	editConfiguration.setVarNameForSubject("subjectNotUsed");
     	editConfiguration.setSubjectUri(subjectUri);
     	editConfiguration.setEntityToReturnTo("?newInd");
     	editConfiguration.setVarNameForPredicate("predicateNotUsed");
     	editConfiguration.setPredicateUri(predicateUri);
-    	
+
 		//not concerned about remainder, can move into default obj prop form if required
 		this.initObjectParameters(vreq);
 		this.processObjectPropForm(vreq, editConfiguration);
     }
 
-    
+
 	private void initObjectParameters(VitroRequest vreq) {
 		//in case of object property
     	objectUri = EditConfigurationUtils.getObjectUri(vreq);
 	}
 
 	private void processObjectPropForm(VitroRequest vreq, EditConfigurationVTwo editConfiguration) {
-    	editConfiguration.setVarNameForObject("objectNotUsed");    	
+    	editConfiguration.setVarNameForObject("objectNotUsed");
     	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
     }
-       
-    //Get N3 required 
-    //Handles both object and data property    
+
+    //Get N3 required
+    //Handles both object and data property
     private List<String> generateN3Required(VitroRequest vreq) {
     	List<String> n3ForEdit = new ArrayList<String>();
     	String editString = "?newInd <" + VitroVocabulary.RDF_TYPE + "> <" + getTypeOfNew(vreq) + "> .";
     	n3ForEdit.add(editString);
     	return n3ForEdit;
     }
-    
+
     private List<String> generateN3Optional() {
     	List<String> n3Optional = new ArrayList<String>();
     	String editString = "?newInd <" + RDFS.label.getURI() + "> ?label .";
     	n3Optional.add(editString);
     	return n3Optional;
-    	
+
     }
-       
+
     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>>());
     }
-    
+
     //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>();
     	literalsOnForm.add("label");
     	editConfiguration.setUrisOnform(urisOnForm);
     	editConfiguration.setLiteralsOnForm(literalsOnForm);
-    }    
-    
+    }
+
     //This is for various items
     private void setSparqlQueries(EditConfigurationVTwo editConfiguration) {
     	//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());
     	editConfiguration.setSparqlForExistingUris(generateSparqlForExistingUris());
     }
-    
-    
+
+
     //Get page uri for object
     private HashMap<String, String> generateSparqlForExistingUris() {
     	HashMap<String, String> map = new HashMap<String, String>();
     	return map;
     }
-    
+
     private HashMap<String, String> generateSparqlForExistingLiterals() {
     	HashMap<String, String> map = new HashMap<String, String>();
     	return map;
     }
 
-    
+
     private void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vreq, String predicateUri) {
     	Map<String, FieldVTwo> fields = new HashMap<String, FieldVTwo>();
     	setLabelField(editConfiguration, vreq, fields);
 
     }
-    
+
     private void setLabelField(EditConfigurationVTwo editConfiguration,
 			VitroRequest vreq, Map<String, FieldVTwo> fields) {
     	FieldVTwo field = new FieldVTwo();
     	field.setName("label");
-    	field.setRangeDatatypeUri( XSD.xstring.toString() );        
-    	
+    	field.setRangeDatatypeUri( XSD.xstring.toString() );
+
     	List<String> validators = new ArrayList<String>();
     	validators.add("nonempty");
-    	field.setValidators(validators);    	
-    	
-    	fields.put(field.getName(), field);		
+    	field.setValidators(validators);
+
+    	fields.put(field.getName(), field);
     	editConfiguration.setFields(fields);
 	}
 
-	
+
 
 	private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
-    	//Here, retrieve model from 
+    	//Here, retrieve model from
 		OntModel model = ModelAccess.on(session.getServletContext()).getOntModel();
     	//This form is always doing a non-update
     	editConfiguration.prepareForNonUpdate( model );
-	      
+
     }
-    
-    
+
+
     //Get parameter
     private String getTypeOfNew(VitroRequest vreq) {
     	return vreq.getParameter("typeOfNew");
     }
-    
+
   //Form specific data
 	public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
 		HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
@@ -258,6 +258,6 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator {
 		VClass type = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(typeOfNew);
 		return type.getName();
 	}
-    
+
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RDFSLabelGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RDFSLabelGenerator.java
index 5a86336a2..3a3e7f371 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RDFSLabelGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RDFSLabelGenerator.java
@@ -28,15 +28,15 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 /**
- * Generates the edit configuration for RDFS Label form.  
+ * Generates the edit configuration for RDFS Label form.
  *
  */
 public class RDFSLabelGenerator implements EditConfigurationGenerator {
-	
+
 	private Log log = LogFactory.getLog(RDFSLabelGenerator.class);
-	
+
 	private String subjectUri = null;
-	private String predicateUri = null;	
+	private String predicateUri = null;
 	private Integer dataHash = null;
 
 	private String literalName = "label";
@@ -55,42 +55,42 @@ public class RDFSLabelGenerator implements EditConfigurationGenerator {
     	}
     	return editConfiguration;
     }
-    
+
      private EditConfigurationVTwo setupEditConfiguration(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());
-    	
+
     	//Todo: what do new resources depend on here?
     	//In original form, these variables start off empty
     	editConfiguration.setNewResources(new HashMap<String, String>());
     	//In scope
     	this.setUrisAndLiteralsInScope(editConfiguration);
-    	
+
     	//on Form
     	this.setUrisAndLiteralsOnForm(editConfiguration, vreq);
-    	
+
     	editConfiguration.setFilesOnForm(new ArrayList<String>());
-    	
+
     	//Sparql queries
     	this.setSparqlQueries(editConfiguration);
-    	
+
     	//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
     	prepareForUpdate(vreq, session, editConfiguration);
 
     	editConfiguration.addValidator(new AntiXssValidation());
-    	
+
     	//Form title and submit label now moved to edit configuration template
     	setTemplate(editConfiguration, vreq);
     	//Set edit key
@@ -98,10 +98,10 @@ public class RDFSLabelGenerator implements EditConfigurationGenerator {
     	return editConfiguration;
     }
     private void setEditKey(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-    	String editKey = EditConfigurationUtils.getEditKey(vreq);	
+    	String editKey = EditConfigurationUtils.getEditKey(vreq);
     	editConfiguration.setEditKey(editKey);
     }
-    
+
 	private void setTemplate(EditConfigurationVTwo editConfiguration,
 			VitroRequest vreq) {
     	editConfiguration.setTemplate(template);
@@ -114,9 +114,9 @@ public class RDFSLabelGenerator implements EditConfigurationGenerator {
 
     	subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
     	predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
-    
+
     	editConfiguration.setFormUrl(formUrl);
-        	
+
     	editConfiguration.setVarNameForSubject("subject");
     	editConfiguration.setSubjectUri(subjectUri);
     	editConfiguration.setEntityToReturnTo(subjectUri);
@@ -126,21 +126,21 @@ public class RDFSLabelGenerator implements EditConfigurationGenerator {
     	this.initDataParameters(vreq, session);
     	this.processDataPropForm(vreq, editConfiguration);
     }
-    
-   
-    
+
+
+
     private void initDataParameters(VitroRequest vreq, HttpSession session) {
-    	dataHash = EditConfigurationUtils.getDataHash(vreq);	    	    
+    	dataHash = EditConfigurationUtils.getDataHash(vreq);
 	}
-    
+
     private void processDataPropForm(VitroRequest vreq, EditConfigurationVTwo editConfiguration) {
-    	//set data prop value, data prop key str, 
+    	//set data prop value, data prop key str,
     	editConfiguration.setDatapropKey( EditConfigurationUtils.getDataHash(vreq) );
-    	editConfiguration.setVarNameForObject(literalName);    	    
+    	editConfiguration.setVarNameForObject(literalName);
     }
-    
-    //Get N3 required 
-    //Handles both object and data property    
+
+    //Get N3 required
+    //Handles both object and data property
     private List<String> generateN3Required(VitroRequest vreq) {
     	List<String> n3ForEdit = new ArrayList<String>();
     	String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
@@ -148,31 +148,31 @@ public class RDFSLabelGenerator implements EditConfigurationGenerator {
     	n3ForEdit.add(editString);
     	return n3ForEdit;
     }
-    
+
     //in this case, no n3 optional
     private List<String> generateN3Optional() {
     	List<String> n3Inverse = new ArrayList<String>();
     	return n3Inverse;
-    	
+
     }
-    
-  
-    
+
+
+
     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
     	editConfiguration.setLiteralsInScope(new HashMap<String, List<Literal>>());
     }
-    
+
     //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>();
@@ -180,36 +180,36 @@ public class RDFSLabelGenerator implements EditConfigurationGenerator {
     	editConfiguration.setUrisOnform(urisOnForm);
     	editConfiguration.setLiteralsOnForm(literalsOnForm);
     }
-    
+
     //This is for various items
     private void setSparqlQueries(EditConfigurationVTwo editConfiguration) {
     	//Sparql queries defining retrieval of literals etc.
     	editConfiguration.setSparqlForAdditionalLiteralsInScope(new HashMap<String, String>());
     	editConfiguration.setSparqlForAdditionalUrisInScope(new HashMap<String, String>());
-    	
+
     	editConfiguration.setSparqlForExistingLiterals(generateSparqlForExistingLiterals());
     	editConfiguration.setSparqlForExistingUris(generateSparqlForExistingUris());
     }
-    
-    
+
+
     //Get page uri for object
     private HashMap<String, String> generateSparqlForExistingUris() {
     	HashMap<String, String> map = new HashMap<String, String>();
     	return map;
     }
-    
+
     private HashMap<String, String> generateSparqlForExistingLiterals() {
     	HashMap<String, String> map = new HashMap<String, String>();
     	return map;
     }
 
-    
+
     private void setFields(EditConfigurationVTwo editConfiguration, VitroRequest vreq, String predicateUri) {
     	Map<String, FieldVTwo> fields = new HashMap<String, FieldVTwo>();
     	fields = getDataPropertyField(editConfiguration, vreq);
     	editConfiguration.setFields(fields);
     }
-    
+
     private Map<String, FieldVTwo> getDataPropertyField(
 			EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
 		Map<String, FieldVTwo> fields = new HashMap<String, FieldVTwo>();
@@ -218,16 +218,16 @@ public class RDFSLabelGenerator implements EditConfigurationGenerator {
     	//queryForExisting is not being used anywhere in Field
     	String rangeDatatypeUri = getRangeDatatypeUri(editConfiguration, vreq);
     	String rangeLang = getRangeLang(editConfiguration, vreq);
-    	
-    	List<String> validators = getFieldValidators(editConfiguration, vreq);    
-    	field.setValidators(validators);    	
+
+    	List<String> validators = getFieldValidators(editConfiguration, vreq);
+    	field.setValidators(validators);
 
     	field.setRangeDatatypeUri(rangeDatatypeUri);
     	//have either range datatype uri or range lang, otherwise results in error
     	if(rangeDatatypeUri == null) {
     		field.setRangeLang(rangeLang);
     	}
-    	    	
+
     	fields.put(field.getName(), field);
     	return fields;
 	}
@@ -236,18 +236,18 @@ public class RDFSLabelGenerator implements EditConfigurationGenerator {
 	private String getRangeLang(EditConfigurationVTwo editConfiguration,
 			VitroRequest vreq) {
 		String rangeLang = null;
-		
+
 	   DataPropertyStatement dps =EditConfigurationUtils.getDataPropertyStatement(vreq, vreq.getSession(), dataHash, predicateUri);
-	   if (dps != null) { 
+	   if (dps != null) {
 	        rangeLang = dps.getLanguage();
-	        if( rangeLang == null ) {            
+	        if( rangeLang == null ) {
 	            log.debug("no language attribute on rdfs:label statement for property " + predicateUri + "in RDFSLabelGenerator");
 	            rangeLang = "";
 	        } else {
 	            log.debug("language attribute of ["+rangeLang+"] on rdfs:label statement for property " + predicateUri + "in RDFSLabelGenerator");
 	        }
-	        
-	    } 
+
+	    }
 	   if( rangeLang != null && rangeLang.trim().length() == 0)
            rangeLang = null;
 	    return rangeLang;
@@ -264,22 +264,22 @@ public class RDFSLabelGenerator implements EditConfigurationGenerator {
 		//rangeLang = rangeLanJson
 	   DataPropertyStatement dps =EditConfigurationUtils.getDataPropertyStatement(vreq, vreq.getSession(), dataHash, predicateUri);
 	   if (dps != null) {
-	        
-	        rangeDatatypeUri = dps.getDatatypeURI();        
+
+	        rangeDatatypeUri = dps.getDatatypeURI();
 	        if (rangeDatatypeUri == null) {
 	            log.debug("no range datatype uri set on rdfs:label statement for property " + predicateUri + "in RDFSLabelGenerator");
 	        } else {
 	            log.debug("range datatype uri of [" + rangeDatatypeUri + "] on rdfs:label statement for property " + predicateUri + "in RDFSLabelGenerator");
-	        }        
-	        
+	        }
+
 	    } else {
-	        log.debug("No incoming rdfs:label statement for property "+predicateUri+"; adding a new statement");  
+	        log.debug("No incoming rdfs:label statement for property "+predicateUri+"; adding a new statement");
 	        rangeDatatypeUri = XSD.xstring.getURI();
 	    }
-	   
+
 	    if( rangeDatatypeUri != null && rangeDatatypeUri.trim().length() == 0)
             rangeDatatypeUri = null;
-	    
+
 	    return rangeDatatypeUri;
 	}
 
@@ -287,21 +287,21 @@ public class RDFSLabelGenerator implements EditConfigurationGenerator {
 		List<String> validatorList = new ArrayList<String>();
 		String predicateUri =EditConfigurationUtils.getPredicateUri(vreq);
 	    if (predicateUri.equals(VitroVocabulary.LABEL) || predicateUri.equals(VitroVocabulary.RDF_TYPE)) {
-	        validatorList.add("nonempty");       
+	        validatorList.add("nonempty");
 	    }
 	    String rangeDatatypeUri = getRangeDatatypeUri(editConfiguration, vreq);
 	    if (rangeDatatypeUri != null && !rangeDatatypeUri.isEmpty()) {
 	        validatorList.add("datatype:" +  rangeDatatypeUri);
 	    }
-		return validatorList;    
+		return validatorList;
 	}
 
 	private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
-    	//Here, retrieve model from 
+    	//Here, retrieve model from
 		OntModel model = ModelAccess.on(session.getServletContext()).getOntModel();
 		if( editConfiguration.isDataPropertyUpdate() ){
-    		editConfiguration.prepareForDataPropUpdate(model, vreq.getWebappDaoFactory().getDataPropertyDao());	
+    		editConfiguration.prepareForDataPropUpdate(model, vreq.getWebappDaoFactory().getDataPropertyDao());
 		}
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RdfTypeGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RdfTypeGenerator.java
index 72f849906..582f38e4e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RdfTypeGenerator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RdfTypeGenerator.java
@@ -18,30 +18,30 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClasses
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
 
 public class RdfTypeGenerator extends BaseEditConfigurationGenerator implements EditConfigurationGenerator  {
-    
+
     private Log log = LogFactory.getLog(RdfTypeGenerator.class);
-    
+
     @Override
-    public EditConfigurationVTwo getEditConfiguration( VitroRequest vreq, HttpSession session) {        
+    public EditConfigurationVTwo getEditConfiguration( VitroRequest vreq, HttpSession session) {
         EditConfigurationVTwo editConfig = new EditConfigurationVTwo();
-        
+
         //get editkey and url of form
-        initBasics(editConfig, vreq);        
+        initBasics(editConfig, vreq);
         initPropertyParameters(vreq, session, editConfig);
-        initObjectPropForm(editConfig, vreq);                         
-        
-        editConfig.addUrisInScope("rdfTypeUri", Arrays.asList( RDF.type.getURI() ) );       
-        
-        editConfig.setN3Required( " ?subject ?rdfTypeUri ?object . ");                        
-                
+        initObjectPropForm(editConfig, vreq);
+
+        editConfig.addUrisInScope("rdfTypeUri", Arrays.asList( RDF.type.getURI() ) );
+
+        editConfig.setN3Required( " ?subject ?rdfTypeUri ?object . ");
+
         //set fields
         editConfig.setUrisOnForm("object");
         editConfig.addField( new FieldVTwo( )
             .setName("object")
-            .setOptions( 
-                    new ChildVClassesOptions(OWL.Class.getURI()) )            
+            .setOptions(
+                    new ChildVClassesOptions(OWL.Class.getURI()) )
         );
-                      
+
         editConfig.setTemplate("rdfTypeForm.ftl");
         return editConfig;
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/DefaultAddMissingIndividualFormModelPreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/DefaultAddMissingIndividualFormModelPreprocessor.java
index 9145fa6fa..cedf5b232 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/DefaultAddMissingIndividualFormModelPreprocessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/DefaultAddMissingIndividualFormModelPreprocessor.java
@@ -10,14 +10,14 @@ import org.apache.jena.rdf.model.ResourceFactory;
 import javax.servlet.http.HttpServletRequest;
 
 /**
- * This will remove old relation triple for an edit.  
+ * This will remove old relation triple for an edit.
  * @author bdc34
  *
  */
 public class DefaultAddMissingIndividualFormModelPreprocessor implements
         ModelChangePreprocessor {
     private String subjectUri, predicateUri, objectUri;
-    
+
     public DefaultAddMissingIndividualFormModelPreprocessor(String subjectUri,
             String predicateUri, String objectUri) {
         super();
@@ -28,12 +28,12 @@ public class DefaultAddMissingIndividualFormModelPreprocessor implements
 
     public void preprocess( Model retractionsModel, Model additionsModel, HttpServletRequest r) {
         if( retractionsModel == null || additionsModel == null)
-            return;                
-        
+            return;
+
         retractionsModel.add(
                 ResourceFactory.createResource(subjectUri),
                 ResourceFactory.createProperty(predicateUri),
-                ResourceFactory.createResource(objectUri));           
+                ResourceFactory.createResource(objectUri));
     }
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/DefaultDataPropEmptyField.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/DefaultDataPropEmptyField.java
index 6424111da..e3ad28b0f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/DefaultDataPropEmptyField.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/DefaultDataPropEmptyField.java
@@ -17,7 +17,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmis
 
 /**
  * Editors have gotten into the habit of clearing the text from the
- * textarea and saving it to invoke a delete.  see Issue VITRO-432   
+ * textarea and saving it to invoke a delete.  see Issue VITRO-432
  *
  */
 public class DefaultDataPropEmptyField implements ModelChangePreprocessor{
@@ -25,28 +25,28 @@ public class DefaultDataPropEmptyField implements ModelChangePreprocessor{
     @Override
     public void preprocess(Model retractionsModel, Model additionsModel,
             HttpServletRequest request) {
-        
+
         EditConfigurationVTwo configuration = EditConfigurationUtils.getEditConfiguration(request);
-        
+
         HttpSession session = request.getSession();
         MultiValueEditSubmission submission = EditSubmissionUtils.getEditSubmissionFromSession(session,configuration);
-        
+
         //if data property, then check for empty string condition
         //which means only one value and it is an empty string
         if( checkForEmptyString(submission, configuration, new VitroRequest(request)) ) {
             additionsModel.removeAll();
-        }        
+        }
     }
-    
+
 
     protected boolean checkForEmptyString(
             MultiValueEditSubmission submission,
-            EditConfigurationVTwo configuration, 
+            EditConfigurationVTwo configuration,
             VitroRequest vreq) {
-        
+
         if(EditConfigurationUtils.isDataProperty(configuration.getPredicateUri(), vreq)) {
             // Our editors have gotten into the habit of clearing the text from the
-            // textarea and saving it to invoke a delete.  see Issue VITRO-432   
+            // textarea and saving it to invoke a delete.  see Issue VITRO-432
             if (configuration.getFields().size() == 1) {
                 String onlyField = configuration.getFields().keySet().iterator().next();
                 List<Literal> value = submission.getLiteralsFromForm().get(onlyField);
@@ -61,7 +61,7 @@ public class DefaultDataPropEmptyField implements ModelChangePreprocessor{
                 }
             }
         }
-        return false;    
+        return false;
     }
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/FoafNameToRdfsLabelPreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/FoafNameToRdfsLabelPreprocessor.java
index 6df463d72..e4482d1bb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/FoafNameToRdfsLabelPreprocessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/FoafNameToRdfsLabelPreprocessor.java
@@ -32,9 +32,9 @@ public class FoafNameToRdfsLabelPreprocessor implements ModelChangePreprocessor
 			HttpServletRequest request) {
 		updateModelWithLabel(additionsModel);
 	}
-	
+
 	private String getSparqlQuery() {
-		String queryStr = "SELECT ?subject ?firstName ?middleName ?lastName where {" + 
+		String queryStr = "SELECT ?subject ?firstName ?middleName ?lastName where {" +
 				"?subject <http://purl.obolibrary.org/obo/ARG_2000028>  ?individualVcard ." +
 				"?individualVcard <http://www.w3.org/2006/vcard/ns#hasName> ?fullName ." +
 				"?fullName <http://www.w3.org/2006/vcard/ns#givenName> ?firstName ." +
@@ -46,7 +46,7 @@ public class FoafNameToRdfsLabelPreprocessor implements ModelChangePreprocessor
 				"}";
 		return queryStr;
 	}
-	
+
 	private void updateModelWithLabel(Model additionsModel) {
 		Model changesModel = ModelFactory.createDefaultModel();
 		String queryStr = getSparqlQuery();
@@ -62,7 +62,7 @@ public class FoafNameToRdfsLabelPreprocessor implements ModelChangePreprocessor
                     query, additionsModel);
             ResultSet res = qe.execSelect();
             while( res.hasNext() ){
-				String newLabel = ""; 
+				String newLabel = "";
 				Resource subject = null;
             	QuerySolution qs = res.nextSolution();
             	subject = qs.getResource("subject");
@@ -73,14 +73,14 @@ public class FoafNameToRdfsLabelPreprocessor implements ModelChangePreprocessor
     				String firstNameLanguage = firstNameLiteral.getLanguage();
     				String lastNameLanguage = lastNameLiteral.getLanguage();
     				newLabel = lastNameLiteral.getString() + ", " + firstNameLiteral.getString();
-    				
+
     				if(qs.getLiteral("middleName") != null) {
     					Literal middleNameLiteral = qs.getLiteral("middleName");
     					newLabel += " " + middleNameLiteral.getString();
                 	}
-    				
-    				if(subject != null && 
-    						firstNameLanguage != null && lastNameLanguage != null 
+
+    				if(subject != null &&
+    						firstNameLanguage != null && lastNameLanguage != null
     						&& firstNameLanguage.equals(lastNameLanguage)) {
     					//create a literal with the appropriate value and the language
     					Literal labelWithLanguage = changesModel.createLiteral(newLabel, firstNameLanguage);
@@ -89,8 +89,8 @@ public class FoafNameToRdfsLabelPreprocessor implements ModelChangePreprocessor
     					changesModel.add(subject, rdfsLabelP, newLabel );
     				}
             	}
-            	
-            	
+
+
             }
 
         } catch(Throwable th){
@@ -101,7 +101,7 @@ public class FoafNameToRdfsLabelPreprocessor implements ModelChangePreprocessor
             }
             additionsModel.getLock().leaveCriticalSection();
         }
-        
+
         //Write changes model to additions model
         additionsModel.getLock().enterCriticalSection(Lock.WRITE);
         try {
@@ -109,7 +109,7 @@ public class FoafNameToRdfsLabelPreprocessor implements ModelChangePreprocessor
         }catch(Throwable th){
             log.error("An error occurred in writing model", th);
          } finally {
-             
+
              additionsModel.getLock().leaveCriticalSection();
          }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForIndividualPreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForIndividualPreprocessor.java
index 09c731b54..2e87dbe7b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForIndividualPreprocessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForIndividualPreprocessor.java
@@ -19,14 +19,14 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmis
 
 public class ManageLabelsForIndividualPreprocessor extends BaseEditSubmissionPreprocessorVTwo {
 
-	
 
-	
+
+
 	public ManageLabelsForIndividualPreprocessor(EditConfigurationVTwo editConfig) {
 		super(editConfig);
-		
+
 	}
-	
+
 	@Override
 	public void preprocess(MultiValueEditSubmission inputSubmission, VitroRequest vreq) {
 		//Check and see if a language was selected by the user, and this is the regular label submission
@@ -44,8 +44,8 @@ public class ManageLabelsForIndividualPreprocessor extends BaseEditSubmissionPre
 				String lang = this.getLanguage(newLabelLanguage.getString());
 				String label = labelLiteral.getString();
 				//Now add the language category to the literal
-				Literal labelWithLanguage = inputSubmission.createLiteral(label, 
-						newLabelLanguage.getDatatypeURI(), 
+				Literal labelWithLanguage = inputSubmission.createLiteral(label,
+						newLabelLanguage.getDatatypeURI(),
 						lang);
 				labels = new ArrayList<Literal>();
 				labels.add(labelWithLanguage);
@@ -54,9 +54,9 @@ public class ManageLabelsForIndividualPreprocessor extends BaseEditSubmissionPre
 				inputSubmission.setLiteralsFromForm(literalsFromForm);
 			}
 		}
-		
+
 	}
-	
+
 	//The language code returned from JAVA locales has an underscore whereas we need a hyphen
 	protected String getLanguage(String inputLanguageCode) {
 		if(inputLanguageCode.contains("_")) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManagePagePreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManagePagePreprocessor.java
index 15ee76133..ac3461ece 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManagePagePreprocessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManagePagePreprocessor.java
@@ -33,7 +33,7 @@ public class ManagePagePreprocessor extends
 	protected static final Log log = LogFactory
 			.getLog(ManagePagePreprocessor.class.getName());
 
-	
+
 	private static MultiValueEditSubmission submission = null;
 	private static EditConfigurationVTwo editConfiguration = null;
 	private static Map<String, List<String>> transformedLiteralsFromForm = null;
@@ -58,15 +58,15 @@ public class ManagePagePreprocessor extends
 		processDataGetters();
 		//In case of edit, need to force deletion of existing values where necessary
 		//In our case, values that already exist and will be overwritten will be in submission already
-		//just as new values will 
+		//just as new values will
 		//Anything left over should be replaced with blank value sentinel as that would
 		//no longer be on the form and have a value submitted and we can delete that statement
 		//if it exists
 		processExistingValues();
-		
+
 
 	}
-	
+
 	//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
@@ -83,7 +83,7 @@ public class ManagePagePreprocessor extends
 		copyMap.putAll(originalMap);
 		return copyMap;
 	}
-	
+
 	private void processExistingValues() {
 		//For all literals that were originally in scope that don't have values on the form
 		//anymore, replace with null value
@@ -93,40 +93,40 @@ public class ManagePagePreprocessor extends
 			Map<String, List<Literal>> literalsInScope = this.editConfiguration.getLiteralsInScope();
 			Map<String, List<String>> urisInScope = this.editConfiguration.getUrisInScope();
 			List<String> literalKeys = new ArrayList<String>(literalsInScope.keySet());
-	
-			
+
+
 			List<String> uriKeys = new ArrayList<String>(urisInScope.keySet());
 			for(String literalName: literalKeys) {
-				
+
 				//if submission already has value for this, then leave be
 				//otherwise replace with null which will not be valid N3
 				//TODO: Replace with better solution for forcing literal deletion
 				boolean haslv = submission.hasLiteralValue(literalName);
 				if(!submission.hasLiteralValue(literalName)) {
-					submission.addLiteralToForm(editConfiguration, 
-							 editConfiguration.getField(literalName), 
-							 literalName, 
+					submission.addLiteralToForm(editConfiguration,
+							 editConfiguration.getField(literalName),
+							 literalName,
 							 (new String[] {null}));
 				}
 			}
-			
-			
+
+
 			for(String uriName: uriKeys) {
 				//these values should never be overwritten or deleted
 				//if(uriName != "page" && uriName != "menuItem" && !uriName.startsWith("dataGetter")) {
 				if(!"page".equals(uriName)) {
 					boolean hasuv = submission.hasUriValue(uriName);
 					if(!submission.hasUriValue(uriName)) {
-						submission.addUriToForm(editConfiguration, 
-								 uriName, 
+						submission.addUriToForm(editConfiguration,
+								 uriName,
 								 (new String[] {EditConfigurationConstants.BLANK_SENTINEL}));
-					}	
+					}
 				}
 			}
 		}
-		
+
 	}
-	
+
 
 	private void processDataGetters() {
 		convertToJson();
@@ -134,7 +134,7 @@ public class ManagePagePreprocessor extends
 		for(ObjectNode jsonObject:pageContentUnitsJSON) {
 			String dataGetterClass = getDataGetterClass(jsonObject);
 			ProcessDataGetterN3 pn = ProcessDataGetterN3Utils.getDataGetterProcessorN3(dataGetterClass, jsonObject);
-			//UPDATE: using class type to indicate class type/ could also get it from 
+			//UPDATE: using class type to indicate class type/ could also get it from
 			//processor but already have it here
 			jsonObject.put("classType", pn.getClassType());
 			//Removing n3 required b/c retracts in edit case depend on both n3 required and n3 optional
@@ -155,22 +155,22 @@ public class ManagePagePreprocessor extends
 			counter++;
 		}
 	}
-	
-	
+
+
 
 	private void addNewResources(ProcessDataGetterN3 pn, int counter) {
 		// TODO Auto-generated method stub
 		List<String> newResources = pn.getNewResources(counter);
 		for(String newResource:newResources) {
 			//Will null get us display vocabulary or something else?
-			
+
 			editConfiguration.addNewResource(newResource, null);
 			//Weirdly enough, the defaultDisplayNS doesn't act as a namespace REALLY
 			//as it first gets assigned as the URI itself and this lead to an error
 			//instead of repetitively trying to get another URI
 			//editConfiguration.addNewResource(newResource, ManagePageGenerator.defaultDisplayNs );
 		}
-		
+
 	}
 
 	private void convertToJson() {
@@ -193,7 +193,7 @@ public class ManagePagePreprocessor extends
 	private void addInputsToSubmission(ProcessDataGetterN3 pn, int counter, ObjectNode jsonObject) {
 		 List<String> literalLabels = pn.getLiteralVarNamesBase();
 		 List<String> uriLabels = pn.getUriVarNamesBase();
-		 
+
 		 for(String literalLabel:literalLabels) {
 			 List<String> literalValues = new ArrayList<String>();
 			 JsonNode jsonValue = jsonObject.get(literalLabel);
@@ -218,13 +218,13 @@ public class ManagePagePreprocessor extends
 			 }
 			 String[] literalValuesSubmission = new String[literalValues.size()];
 			 literalValuesSubmission = literalValues.toArray(literalValuesSubmission);
-			 //This adds literal, connecting the field with 
-			 submission.addLiteralToForm(editConfiguration, 
-					 editConfiguration.getField(submissionLiteralName), 
-					 submissionLiteralName, 
+			 //This adds literal, connecting the field with
+			 submission.addLiteralToForm(editConfiguration,
+					 editConfiguration.getField(submissionLiteralName),
+					 submissionLiteralName,
 					 literalValuesSubmission);
 		 }
-		 
+
 		 for(String uriLabel:uriLabels) {
 			 List<String> uriValues = new ArrayList<String>();
 			 JsonNode jsonValue = jsonObject.get(uriLabel);
@@ -240,7 +240,7 @@ public class ManagePagePreprocessor extends
 				 //multiple values
 				 ArrayNode values = (ArrayNode) jsonObject.get(uriLabel);
 				 uriValues = JacksonUtils.jsonArrayToStrings(values);
-				
+
 			 } else {
 				 //This may include JSON Objects but no way to deal with these right now
 			 }
@@ -249,9 +249,9 @@ public class ManagePagePreprocessor extends
 			 uriValuesSubmission = uriValues.toArray(uriValuesSubmission);
 			 //This adds literal, connecting the field with the value
 			 submission.addUriToForm(editConfiguration, submissionUriName, uriValuesSubmission);
-			 
+
 		 }
-		
+
 		 //To get data getter uris, check if editing an existing set and include those as form inputs
 		 if(editConfiguration.isParamUpdate()) {
 			 //Although this is editing an existing page, new content might have been added which would not include
@@ -270,7 +270,7 @@ public class ManagePagePreprocessor extends
 
 			 }
 		 }
-		
+
 	}
 
 	private void replaceEncodedQuotesInList(ProcessDataGetterN3 pn, List<String> values) {
@@ -305,8 +305,8 @@ public class ManagePagePreprocessor extends
 			}
 		}
 	}
-	
-	
+
+
 
 	//original literals on form: label, uris on form: conceptNode and conceptSource
 	//This will overwrite the original values in the edit configuration
@@ -339,11 +339,11 @@ public class ManagePagePreprocessor extends
 		//Put this method in the generator but can be put elsewhere
 		String pageToDataGetterN3 = ManagePageGenerator.getDataGetterN3(dataGetterVar);
 		return Arrays.asList(pageToDataGetterN3);
-		
+
 	}
 
 	//Add n3 optional
-	
+
 	private void addN3Optional(ProcessDataGetterN3 pn, int counter) {
 		List<String> addList = new ArrayList<String>();
 		//Get required list
@@ -355,28 +355,28 @@ public class ManagePagePreprocessor extends
 		if(requiredList != null) {
 			addList.addAll(requiredList);
 		}
-		
+
 		if(optionalList != null) {
 			addList.addAll(optionalList);
 		}
-		
+
 		editConfiguration.addN3Optional(addList);
 
 	}
-	
-	
+
+
 	//Each JSON Object will indicate the type of the data getter within it
 	private String getDataGetterClass(ObjectNode jsonObject) {
 		String javaURI = jsonObject.get("dataGetterClass").asText();
 		return getQualifiedDataGetterName(javaURI);
-		
-		
+
+
 	}
-	
+
 	//Get rid of java: in front of class name
 	private String getQualifiedDataGetterName(String dataGetterTypeURI) {
 		String javaURI = "java:";
-		
+
 		if(dataGetterTypeURI.startsWith(javaURI)) {
 			int beginIndex = javaURI.length();
 			return dataGetterTypeURI.substring(beginIndex);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ModelChangePreprocessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ModelChangePreprocessor.java
index fa8037601..0eefac65d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ModelChangePreprocessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ModelChangePreprocessor.java
@@ -9,5 +9,5 @@ import javax.servlet.http.HttpServletRequest;
 public interface ModelChangePreprocessor {
 
 	public abstract void preprocess ( Model retractionsModel, Model additionsModel, HttpServletRequest request );
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessClassGroupDataGetterN3.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessClassGroupDataGetterN3.java
index 624506563..7ac74a188 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessClassGroupDataGetterN3.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessClassGroupDataGetterN3.java
@@ -35,31 +35,31 @@ public  class ProcessClassGroupDataGetterN3 extends ProcessDataGetterAbstract {
 	private Log log = LogFactory.getLog(ProcessClassGroupDataGetterN3.class);
 
 	public ProcessClassGroupDataGetterN3(){
-		
+
 	}
-	//Pass in variable that represents the counter 
+	//Pass in variable that represents the counter
 
 	//TODO: ensure correct model returned
 	//We shouldn't use the ACTUAL values here but generate the n3 required
     public List<String> retrieveN3Required(int counter) {
     	return this.retrieveN3ForTypeAndClassGroup(counter);
-    	
+
     }
     public List<String> retrieveN3Optional(int counter) {
     	return null;
     }
-    
+
     public List<String> retrieveN3ForTypeAndClassGroup(int counter) {
     	String n3ForType = this.getN3ForTypePartial(counter);
-    	String n3 = n3ForType +"; \n" + 
+    	String n3 = n3ForType +"; \n" +
     		"<" + DisplayVocabulary.FOR_CLASSGROUP + "> " + getN3VarName(classGroupVarBase, counter) + " .";
     	List<String> n3List = new ArrayList<String>();
     	n3List.add(getPrefixes() + n3);
     	return n3List;
     }
-    
+
     public String getN3ForTypePartial(int counter) {
-    	//UPDATE: including class type as 
+    	//UPDATE: including class type as
     	String dataGetterVar = getDataGetterVar(counter);
     	String classTypeVar = getN3VarName(classTypeVarBase, counter);
     	//String n3 = dataGetterVar + " a <" + getClassType() + ">";
@@ -67,18 +67,18 @@ public  class ProcessClassGroupDataGetterN3 extends ProcessDataGetterAbstract {
 
     	return n3;
     }
-    
+
     //These methods will return the literals and uris expected within the n3
-    //and the counter is used to ensure they are numbered correctly 
-    
+    //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>();
     	return literalsOnForm;
-    	
+
     }
-    
-     
+
+
     public List<String> retrieveUrisOnForm(int counter) {
     	List<String> urisOnForm = new ArrayList<String>();
     	//Class group is a URI
@@ -86,9 +86,9 @@ public  class ProcessClassGroupDataGetterN3 extends ProcessDataGetterAbstract {
     	//UPDATE: adding class type as uri on form
     	urisOnForm.add(getVarName(classTypeVarBase, counter));
     	return urisOnForm;
-    	
+
     }
-    
+
    public List<FieldVTwo> retrieveFields(int counter) {
 	   List<FieldVTwo> fields = new ArrayList<FieldVTwo>();
 	   fields.add(new FieldVTwo().setName(getVarName("classGroup", counter)));
@@ -97,24 +97,24 @@ public  class ProcessClassGroupDataGetterN3 extends ProcessDataGetterAbstract {
 
 	   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();   
+	   return Arrays.asList();
    }
 
    //these are for the fields ON the form
    public List<String> getUriVarNamesBase() {
 	   //UPDATE: adding class type as uri
-	   return Arrays.asList("classGroup", classTypeVarBase);   
+	   return Arrays.asList("classGroup", classTypeVarBase);
    }
 
    //This class can be extended so returning type here
    public String getClassType() {
 	   return classType;
    }
-   
+
    //for existing values
    //TODO: Update
    public void populateExistingValues(String dataGetterURI, int counter, OntModel queryModel) {
@@ -140,19 +140,19 @@ public  class ProcessClassGroupDataGetterN3 extends ProcessDataGetterAbstract {
        } 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 getExistingValuesClassGroup(String dataGetterURI) {
-	   String query = this.getSparqlPrefix() + " SELECT ?classGroup  WHERE {" + 
+	   String query = this.getSparqlPrefix() + " SELECT ?classGroup  WHERE {" +
 			   "<" + dataGetterURI + "> <" + DisplayVocabulary.FOR_CLASSGROUP + "> ?classGroup  . \n" +
 			   "}";
 	   return query;
    }
-   
+
    public ObjectNode getExistingValuesJSON(String dataGetterURI, OntModel queryModel, ServletContext context) {
 	   ObjectNode jObject = new ObjectMapper().createObjectNode();
 	   jObject.put("dataGetterClass", classType);
@@ -163,7 +163,7 @@ public  class ProcessClassGroupDataGetterN3 extends ProcessDataGetterAbstract {
 	   getExistingClassesInClassGroup(context, dataGetterURI, jObject);
 	   return jObject;
    }
-   
+
    private void getExistingClassGroup(String dataGetterURI, ObjectNode jObject, OntModel queryModel) {
 	   String querystr = getExistingValuesClassGroup(dataGetterURI);
 	   QueryExecution qe = null;
@@ -180,17 +180,17 @@ public  class ProcessClassGroupDataGetterN3 extends ProcessDataGetterAbstract {
        } catch(Exception ex) {
     	   log.error("Exception occurred in retrieving existing values with query " + querystr, ex);
        }
-       
-  
+
+
    }
-   
+
    //Assumes JSON Object received will have the class group resource URI within it
    //TODO: Refactor to take advantage of existing code that uses OTHER JSON library
    protected void getExistingClassesInClassGroup(ServletContext context, String dataGetterURI, ObjectNode jObject) {
 	   //Check for class group resource within json object
 	   if(jObject.has(classGroupVarBase)) {
 		   String classGroupURI = jObject.get(classGroupVarBase).asText();
-		   //Get classes for classGroupURI and include in 
+		   //Get classes for classGroupURI and include in
 		   VClassGroupCache vcgc = VClassGroupCache.getVClassGroupCache(context);
 		   VClassGroup group = vcgc.getGroup(classGroupURI);
 		   populateClassesInClassGroupJSON(jObject, group);
@@ -198,7 +198,7 @@ public  class ProcessClassGroupDataGetterN3 extends ProcessDataGetterAbstract {
 		   log.error("JSONObject does not have class group URI included. ");
 	   }
    }
-   
+
    //JSONObject will include results JSON object that will include classes JSON Arrya as well as
    //class group information
    protected void populateClassesInClassGroupJSON(ObjectNode jObject, VClassGroup group) {
@@ -211,8 +211,8 @@ public  class ProcessClassGroupDataGetterN3 extends ProcessDataGetterAbstract {
            classes.add(vcObj);
        }
        ObjectNode results = mapper.createObjectNode();
-      
-       results.set("classes", classes);                
+
+       results.set("classes", classes);
        results.put("classGroupName", group.getPublicName());
        results.put("classGroupUri", group.getURI());
        jObject.set("results", results);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterAbstract.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterAbstract.java
index 22cd83813..4e80c140e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterAbstract.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterAbstract.java
@@ -14,40 +14,40 @@ import org.apache.jena.rdf.model.Literal;
 public abstract class ProcessDataGetterAbstract implements ProcessDataGetterN3 {
 	public static String classTypeVarBase = "classType";
 	public ProcessDataGetterAbstract(){
-		
+
 	}
-	
+
     //placeholder so need "?" in front of the variable
     public String getDataGetterVar(int counter) {
     	return "?" + getDataGetterVarName(counter);
     }
-    
+
     //Just the var name, no "?"
     public String getDataGetterVarName(int counter) {
     	return "dataGetter" + counter;
     }
-    
+
     public String getPrefixes() {
-    	return "@prefix display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> . \n" + 
+    	return "@prefix display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> . \n" +
     			"@prefix rdfs:<http://www.w3.org/2000/01/rdf-schema#> . \n";
     }
-  
+
    public String getVarName(String base, int counter) {
 	   return base + counter;
    }
-   
+
    //For use within n3 strings, need a "?"
    public String getN3VarName(String base, int counter) {
 	   return "?" + getVarName(base, counter);
    }
-   
+
    //For handling encoded single and double quotes
    //For fixed html and sparql data getters, replaces encoded quotes with escaped quotes
    //Can be overridden in other processors if need be
    public String replaceEncodedQuotesWithEscapedQuotes(String inputStr) {
 	   return inputStr.replaceAll("&#39;", "\'").replaceAll("&quot;", "\"");
    }
-   
+
    //Return name of new resources
    public List<String> getNewResources(int counter) {
 	   //Each data getter requires a new resource
@@ -55,13 +55,13 @@ public abstract class ProcessDataGetterAbstract implements ProcessDataGetterN3 {
 	   newResources.add("dataGetter" + counter);
 	   return newResources;
    }
-   
+
    protected String getSparqlPrefix() {
-		  return  "PREFIX display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> \n" + 
+		  return  "PREFIX display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> \n" +
 				  "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>";
-   
+
    }
-   
+
    //For existing values
    protected  Map<String, List<Literal>> existingLiteralValues = new HashMap<String, List<Literal>>();
    protected Map<String, List<String>> existingUriValues = new HashMap<String, List<String>>();
@@ -71,19 +71,19 @@ public abstract class ProcessDataGetterAbstract implements ProcessDataGetterN3 {
    public Map<String, List<String>> retrieveExistingUriValues() {
 	  return existingUriValues;
    }
-	   
+
 	//Data getter var needs to be included in uris in scope
    public void populateExistingDataGetterURI(String dataGetterURI, int counter) {
 	   existingUriValues.put(this.getVarName("dataGetter", counter), new ArrayList<String>(Arrays.asList(dataGetterURI)));
 
    }
-   
+
    public void populateExistingClassType(String classType, int counter) {
 	   existingUriValues.put(this.getVarName(classTypeVarBase, counter), new ArrayList<String>(Arrays.asList(classType)));
 
    }
-   
- 
+
+
 }
 
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3.java
index 65fcffb58..43b126cef 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3.java
@@ -21,8 +21,8 @@ public interface ProcessDataGetterN3 {
 	public List<String> retrieveN3Required(int counter);
     public List<String> retrieveN3Optional(int counter);
     public List<String >retrieveLiteralsOnForm(int counter);
-    
-     
+
+
     public List<String> retrieveUrisOnForm(int counter);
     public List<FieldVTwo> retrieveFields(int counter);
     public List<String> getLiteralVarNamesBase();
@@ -31,7 +31,7 @@ public interface ProcessDataGetterN3 {
     public String getDataGetterVar(int counter);
     public String getDataGetterVarName(int counter);
     public List<String> getNewResources(int counter);
-    
+
     //Get Existing values to put in scope
     public Map<String, List<Literal>> retrieveExistingLiteralValues();
     public Map<String, List<String>> retrieveExistingUriValues();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java
index e56828062..b307eb0d8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java
@@ -8,7 +8,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /*
- * This class determines what n3 should be returned for a particular data getter and can be overwritten or extended in VIVO. 
+ * This class determines what n3 should be returned for a particular data getter and can be overwritten or extended in VIVO.
  */
 public class ProcessDataGetterN3Map {
     private static final Log log = LogFactory.getLog(ProcessDataGetterN3Map.class);
@@ -32,4 +32,4 @@ public class ProcessDataGetterN3Map {
 		dataGetterMap = new HashMap<String, String>();
 		dataGetterMap.putAll(newMap);
 	}
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Utils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Utils.java
index 0ea4c72b0..0a40c447c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Utils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Utils.java
@@ -11,11 +11,11 @@ import org.apache.commons.logging.LogFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 /*
- * This class determines what n3 should be returned for a particular data getter and can be overwritten or extended in VIVO. 
+ * This class determines what n3 should be returned for a particular data getter and can be overwritten or extended in VIVO.
  */
 public class ProcessDataGetterN3Utils {
     private static final Log log = LogFactory.getLog(ProcessDataGetterN3Utils.class);
-    
+
     public static ProcessDataGetterN3 getDataGetterProcessorN3(String dataGetterClass, ObjectNode jsonObject) {
     	HashMap<String, String> map = ProcessDataGetterN3Map.getDataGetterTypeToProcessorMap();
     	//
@@ -31,7 +31,7 @@ public class ProcessDataGetterN3Utils {
     	}
     	return null;
     }
-    
+
     private static ProcessDataGetterN3 instantiateClass(String processorClass, ObjectNode jsonObject) {
     	ProcessDataGetterN3 pn = null;
     	try {
@@ -43,14 +43,14 @@ public class ProcessDataGetterN3Utils {
 						 pn = (ProcessDataGetterN3) ct.newInstance(jsonObject);
 				} 	else {
 						pn = (ProcessDataGetterN3) ct.newInstance();
-				} 
+				}
 	    	}
-		
+
     	} catch(Exception ex) {
 			log.error("Error occurred instantiating " + processorClass, ex);
 		}
     	return pn;
-        		
+
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessFixedHTMLN3.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessFixedHTMLN3.java
index 8208300b1..e8281605a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessFixedHTMLN3.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessFixedHTMLN3.java
@@ -29,9 +29,9 @@ public  class ProcessFixedHTMLN3 extends ProcessDataGetterAbstract {
 	private Log log = LogFactory.getLog(ProcessFixedHTMLN3.class);
 
 	public ProcessFixedHTMLN3(){
-		
+
 	}
-	//Pass in variable that represents the counter 
+	//Pass in variable that represents the counter
 
 	//TODO: ensure correct model returned
 	//We shouldn't use the ACTUAL values here but generate the n3 required
@@ -40,39 +40,39 @@ public  class ProcessFixedHTMLN3 extends ProcessDataGetterAbstract {
     	String dataGetterVar = getDataGetterVar(counter);
     	//UPDATE: Using variable for class type
     	String classTypeVar = getN3VarName(classTypeVarBase, counter);
-    	String n3 = dataGetterVar + " a " + classTypeVar + "; \n" + 
-    	"display:saveToVar " + getN3VarName("saveToVar", counter) + "; \n" + 
+    	String n3 = dataGetterVar + " a " + classTypeVar + "; \n" +
+    	"display:saveToVar " + getN3VarName("saveToVar", counter) + "; \n" +
     	"display:htmlValue " + getN3VarName("htmlValue", counter) + " .";
     	List<String> requiredList = new ArrayList<String>();
     	requiredList.add(getPrefixes() + n3);
     	return requiredList;
-    	
+
     }
     public List<String> retrieveN3Optional(int counter) {
     	return null;
     }
-  
-    
+
+
     public List<String> retrieveLiteralsOnForm(int counter) {
     	List<String> literalsOnForm = new ArrayList<String>();
     	literalsOnForm.add(getVarName("saveToVar",counter));
     	literalsOnForm.add(getVarName("htmlValue", counter));
     	return literalsOnForm;
-    	
+
     }
-    
-     
+
+
     public List<String> retrieveUrisOnForm(int counter) {
     	List<String> urisOnForm = new ArrayList<String>();
     	//UPDATE: adding class type as uri on form
     	urisOnForm.add(getVarName(classTypeVarBase, counter));
     	return urisOnForm;
-    	
+
     }
-    
+
    public List<FieldVTwo> retrieveFields(int counter) {
 	   List<FieldVTwo> fields = new ArrayList<FieldVTwo>();
-	  
+
 	   //fields.add(new FieldVTwo().setName(getVarName("dataGetter", counter)));
 	   fields.add(new FieldVTwo().setName(getVarName("saveToVar", counter)));
 	   fields.add(new FieldVTwo().setName(getVarName("htmlValue", counter)));
@@ -80,18 +80,18 @@ public  class ProcessFixedHTMLN3 extends ProcessDataGetterAbstract {
 	   fields.add(new FieldVTwo().setName(getVarName(classTypeVarBase, counter)));
 	   return fields;
    }
-   
+
    public List<String> getLiteralVarNamesBase() {
-	   return Arrays.asList("saveToVar", "htmlValue");   
+	   return Arrays.asList("saveToVar", "htmlValue");
    }
 
    //these are for the fields ON the form
    public List<String> getUriVarNamesBase() {
-	   return Arrays.asList(classTypeVarBase);   
+	   return Arrays.asList(classTypeVarBase);
    }
 
    //For Existing Values in case of editing
-  
+
    //Execute populate before retrieval
    public void populateExistingValues(String dataGetterURI, int counter, OntModel queryModel) {
 	   //First, put dataGetterURI within scope as well
@@ -119,21 +119,21 @@ public  class ProcessFixedHTMLN3 extends ProcessDataGetterAbstract {
        } 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 getExistingValuesSparqlQuery(String dataGetterURI) {
-	   String query = this.getSparqlPrefix() + " SELECT ?saveToVar ?htmlValue WHERE {" + 
-			   "<" + dataGetterURI + "> display:saveToVar ?saveToVar . \n" + 
-			   "<" + dataGetterURI + "> display:htmlValue ?htmlValue . \n" + 
+	   String query = this.getSparqlPrefix() + " SELECT ?saveToVar ?htmlValue WHERE {" +
+			   "<" + dataGetterURI + "> display:saveToVar ?saveToVar . \n" +
+			   "<" + dataGetterURI + "> display:htmlValue ?htmlValue . \n" +
 			   "}";
 	   return query;
    }
-   
-   
+
+
    //Method to create a JSON object with existing values to return to form
    //There may be a better way to do this without having to run the query twice
    //TODO: Refactor code if required
@@ -161,13 +161,13 @@ public  class ProcessFixedHTMLN3 extends ProcessDataGetterAbstract {
     	   log.error("Exception occurred in retrieving existing values with query " + querystr, ex);
        }
        return jObject;
-	   
+
    }
-   
+
    //Escape single and double quotes for html string to be returned to form
    public String replaceQuotes(String inputStr) {
 	   return inputStr.replaceAll("\'", "&#39;").replaceAll("\"", "&quot;");
-	   
+
    }
 
    //This class can be extended so returning type here
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessIndividualsForClassesDataGetterN3.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessIndividualsForClassesDataGetterN3.java
index 47876b520..a35548ab0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessIndividualsForClassesDataGetterN3.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessIndividualsForClassesDataGetterN3.java
@@ -33,52 +33,52 @@ public  class ProcessIndividualsForClassesDataGetterN3 extends ProcessClassGroup
 	private Log log = LogFactory.getLog(ProcessIndividualsForClassesDataGetterN3.class);
 
 	public ProcessIndividualsForClassesDataGetterN3(){
-		
+
 	}
-	//Pass in variable that represents the counter 
+	//Pass in variable that represents the counter
 
 	//TODO: ensure correct model returned
 	//We shouldn't use the ACTUAL values here but generate the n3 required
     public List<String> retrieveN3Required(int counter) {
-    	
+
     	List<String> classGroupN3 = this.retrieveN3ForTypeAndClassGroup(counter);
     	classGroupN3.addAll(this.addIndividualClassesN3(counter));
     	return classGroupN3;
-    	
+
     }
-    
-    
+
+
     protected List<String> addIndividualClassesN3(int counter) {
 		List<String> classN3 = new ArrayList<String>();
 		classN3.add(generateIndividualClassN3(counter));
 		return classN3;
 	}
-    
+
    protected String generateIndividualClassN3(int counter) {
     	String dataGetterVar = getDataGetterVar(counter);
     	String n3 = dataGetterVar + " <" + DisplayVocabulary.GETINDIVIDUALS_FOR_CLASS + "> ";
     	//Consider a multi-valued field - in this case single field with multiple values
     	n3 += getN3VarName(individualClassVarNameBase, counter);
-    	
+
     	n3 += " .";
     	return n3;
-    	
+
     }
 	public List<String> retrieveN3Optional(int counter) {
     	return null;
     }
-    
+
     //These methods will return the literals and uris expected within the n3
-    //and the counter is used to ensure they are numbered correctly 
-    
+    //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>();
     	return literalsOnForm;
-    	
+
     }
-    
-     
+
+
     public List<String> retrieveUrisOnForm(int counter) {
     	//get class group uris
     	List<String> urisOnForm = super.retrieveUrisOnForm(counter);
@@ -87,10 +87,10 @@ public  class ProcessIndividualsForClassesDataGetterN3 extends ProcessClassGroup
     	//here again,consider multi-valued
     	urisOnForm.add(getVarName(individualClassVarNameBase, counter));
     	return urisOnForm;
-    	
+
     }
-    
-   
+
+
    public List<FieldVTwo> retrieveFields(int counter) {
 	   List<FieldVTwo> fields = super.retrieveFields(counter);
 	   fields.add(new FieldVTwo().setName(getVarName(individualClassVarNameBase, counter)));
@@ -102,26 +102,26 @@ public  class ProcessIndividualsForClassesDataGetterN3 extends ProcessClassGroup
 	   }*/
 	   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();   
+	   return Arrays.asList();
    }
 
    //these are for the fields ON the form
    public List<String> getUriVarNamesBase() {
-	   return Arrays.asList("classGroup", individualClassVarNameBase,  classTypeVarBase);   
+	   return Arrays.asList("classGroup", individualClassVarNameBase,  classTypeVarBase);
    }
-   
+
    @Override
    public String getClassType() {
 	   return classType;
    }
-   
+
    //Existing values
    //TODO: Correct
-   
+
    public void populateExistingValues(String dataGetterURI, int counter, OntModel queryModel) {
 	   //First, put dataGetterURI within scope as well
 	   this.populateExistingDataGetterURI(dataGetterURI, counter);
@@ -148,29 +148,29 @@ public  class ProcessIndividualsForClassesDataGetterN3 extends ProcessClassGroup
         	   Resource individualForClassResource = qs.getResource("individualForClass");
         	   individualsForClasses.add(individualForClassResource.getURI());
         	 //Put both literals in existing literals
-        	   
+
            }
-           
+
            existingUriValues.put(this.getVarName(individualClassVarNameBase, counter),
     			   new ArrayList<String>(individualsForClasses));
        } 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 getExistingValuesIndividualsForClasses(String dataGetterURI) {
-	   String query = this.getSparqlPrefix() + "SELECT ?classGroup  ?individualForClass WHERE {" + 
+	   String query = this.getSparqlPrefix() + "SELECT ?classGroup  ?individualForClass WHERE {" +
 			   "<" + dataGetterURI + "> <" + DisplayVocabulary.FOR_CLASSGROUP + "> ?classGroup  . \n" +
-			   "<" + dataGetterURI + "> <" + DisplayVocabulary.GETINDIVIDUALS_FOR_CLASS + "> ?individualForClass . \n" + 
+			   "<" + dataGetterURI + "> <" + DisplayVocabulary.GETINDIVIDUALS_FOR_CLASS + "> ?individualForClass . \n" +
 			   "}";
 	   return query;
    }
 
-   
+
    public ObjectNode getExistingValuesJSON(String dataGetterURI, OntModel queryModel, ServletContext context) {
 	   ObjectNode jObject = new ObjectMapper().createObjectNode();
 	   jObject.put("dataGetterClass", classType);
@@ -182,7 +182,7 @@ public  class ProcessIndividualsForClassesDataGetterN3 extends ProcessClassGroup
 	   super.getExistingClassesInClassGroup(context, dataGetterURI, jObject);
 	   return jObject;
    }
-   
+
    private void getExistingClassGroupAndIndividuals(String dataGetterURI, ObjectNode jObject, OntModel queryModel) {
 	   String querystr = getExistingValuesIndividualsForClasses(dataGetterURI);
 	   QueryExecution qe = null;
@@ -201,9 +201,9 @@ public  class ProcessIndividualsForClassesDataGetterN3 extends ProcessClassGroup
         	   Resource individualForClassResource = qs.getResource("individualForClass");
         	   individualsForClasses.add(individualForClassResource.getURI());
         	 //Put both literals in existing literals
-        	   
+
            }
-           
+
           jObject.put("classGroup", classGroupURI);
           //this is a json array
           jObject.set(individualClassVarNameBase, individualsForClasses);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessSearchIndividualsDataGetterN3.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessSearchIndividualsDataGetterN3.java
index 032f16b7d..32b7f81a7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessSearchIndividualsDataGetterN3.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessSearchIndividualsDataGetterN3.java
@@ -30,9 +30,9 @@ public  class ProcessSearchIndividualsDataGetterN3 extends ProcessDataGetterAbst
 	private Log log = LogFactory.getLog(ProcessFixedHTMLN3.class);
 
 	public ProcessSearchIndividualsDataGetterN3(){
-		
+
 	}
-	//Pass in variable that represents the counter 
+	//Pass in variable that represents the counter
 
 	//TODO: ensure correct model returned
 	//We shouldn't use the ACTUAL values here but generate the n3 required
@@ -41,27 +41,27 @@ public  class ProcessSearchIndividualsDataGetterN3 extends ProcessDataGetterAbst
     	String dataGetterVar = getDataGetterVar(counter);
     	//UPDATE: Using variable for class type
     	String classTypeVar = getN3VarName(classTypeVarBase, counter);
-    	String n3 = dataGetterVar + " a " + classTypeVar + "; \n" + 
-    	"display:saveToVar " + getN3VarName("saveToVar", counter) + "; \n" + 
+    	String n3 = dataGetterVar + " a " + classTypeVar + "; \n" +
+    	"display:saveToVar " + getN3VarName("saveToVar", counter) + "; \n" +
     	"display:hasVClassId " + getN3VarName("vclassUri", counter) + " .";
     	List<String> requiredList = new ArrayList<String>();
     	requiredList.add(getPrefixes() + n3);
     	return requiredList;
-    	
+
     }
     public List<String> retrieveN3Optional(int counter) {
     	return null;
     }
-  
-    
+
+
     public List<String> retrieveLiteralsOnForm(int counter) {
     	List<String> literalsOnForm = new ArrayList<String>();
     	literalsOnForm.add(getVarName("saveToVar",counter));
     	return literalsOnForm;
-    	
+
     }
-    
-     
+
+
     public List<String> retrieveUrisOnForm(int counter) {
     	List<String> urisOnForm = new ArrayList<String>();
     	//UPDATE: adding class type as uri on form
@@ -69,12 +69,12 @@ public  class ProcessSearchIndividualsDataGetterN3 extends ProcessDataGetterAbst
 
     	urisOnForm.add(getVarName(classTypeVarBase, counter));
     	return urisOnForm;
-    	
+
     }
-    
+
    public List<FieldVTwo> retrieveFields(int counter) {
 	   List<FieldVTwo> fields = new ArrayList<FieldVTwo>();
-	  
+
 	   //fields.add(new FieldVTwo().setName(getVarName("dataGetter", counter)));
 	   fields.add(new FieldVTwo().setName(getVarName("saveToVar", counter)));
 	   fields.add(new FieldVTwo().setName(getVarName("vclassUri", counter)));
@@ -82,18 +82,18 @@ public  class ProcessSearchIndividualsDataGetterN3 extends ProcessDataGetterAbst
 	   fields.add(new FieldVTwo().setName(getVarName(classTypeVarBase, counter)));
 	   return fields;
    }
-   
+
    public List<String> getLiteralVarNamesBase() {
-	   return Arrays.asList("saveToVar");   
+	   return Arrays.asList("saveToVar");
    }
 
    //these are for the fields ON the form
    public List<String> getUriVarNamesBase() {
-	   return Arrays.asList(classTypeVarBase, "vclassUri");   
+	   return Arrays.asList(classTypeVarBase, "vclassUri");
    }
 
    //For Existing Values in case of editing
-  
+
    //Execute populate before retrieval
    public void populateExistingValues(String dataGetterURI, int counter, OntModel queryModel) {
 	   //First, put dataGetterURI within scope as well
@@ -121,21 +121,21 @@ public  class ProcessSearchIndividualsDataGetterN3 extends ProcessDataGetterAbst
        } 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 getExistingValuesSparqlQuery(String dataGetterURI) {
-	   String query = this.getSparqlPrefix() + " SELECT ?saveToVar ?vclassUri WHERE {" + 
-			   "<" + dataGetterURI + "> display:saveToVar ?saveToVar . \n" + 
-			   "<" + dataGetterURI + "> display:hasVClassId ?vclassUri . \n" + 
+	   String query = this.getSparqlPrefix() + " SELECT ?saveToVar ?vclassUri WHERE {" +
+			   "<" + dataGetterURI + "> display:saveToVar ?saveToVar . \n" +
+			   "<" + dataGetterURI + "> display:hasVClassId ?vclassUri . \n" +
 			   "}";
 	   return query;
    }
-   
-   
+
+
    //Method to create a JSON object with existing values to return to form
    //There may be a better way to do this without having to run the query twice
    //TODO: Refactor code if required
@@ -162,13 +162,13 @@ public  class ProcessSearchIndividualsDataGetterN3 extends ProcessDataGetterAbst
     	   log.error("Exception occurred in retrieving existing values with query " + querystr, ex);
        }
        return jObject;
-	   
+
    }
-   
+
    //Escape single and double quotes for html string to be returned to form
    public String replaceQuotes(String inputStr) {
 	   return inputStr.replaceAll("\'", "&#39;").replaceAll("\"", "&quot;");
-	   
+
    }
 
    //This class can be extended so returning type here
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessSparqlDataGetterN3.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessSparqlDataGetterN3.java
index ae435b2f0..b0fe92a31 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessSparqlDataGetterN3.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessSparqlDataGetterN3.java
@@ -31,9 +31,9 @@ public  class ProcessSparqlDataGetterN3 extends ProcessDataGetterAbstract {
 	private Log log = LogFactory.getLog(ProcessSparqlDataGetterN3.class);
 
 	public ProcessSparqlDataGetterN3(){
-		
+
 	}
-	//Pass in variable that represents the counter 
+	//Pass in variable that represents the counter
 
 	//We shouldn't use the ACTUAL values here but generate the n3 required
     public List<String> retrieveN3Required(int counter) {
@@ -41,33 +41,33 @@ public  class ProcessSparqlDataGetterN3 extends ProcessDataGetterAbstract {
     	//UPDATE: Using variable for class type
     	String classTypeVar = getN3VarName(classTypeVarBase, counter);
 
-    	String n3 = dataGetterVar + " a " + classTypeVar + "; \n" + 
-    	"display:saveToVar " + getN3VarName("saveToVar", counter) + "; \n" + 
+    	String n3 = dataGetterVar + " a " + classTypeVar + "; \n" +
+    	"display:saveToVar " + getN3VarName("saveToVar", counter) + "; \n" +
     	"display:query " + getN3VarName("query", counter) + " .";
     	List<String> requiredList = new ArrayList<String>();
     	requiredList.add(getPrefixes() + n3);
     	return requiredList;
-    	
+
     }
     //Query model is optional
     public List<String> retrieveN3Optional(int counter) {
     	String dataGetterVar = getDataGetterVar(counter);
-    	String n3 = dataGetterVar + " display:queryModel " + getN3VarName("queryModel", counter) + ". "; 
+    	String n3 = dataGetterVar + " display:queryModel " + getN3VarName("queryModel", counter) + ". ";
     	List<String> optionalList = new ArrayList<String>();
     	optionalList.add(getPrefixes() + n3);
     	return optionalList;
     }
-  
-    
+
+
     public List<String> retrieveLiteralsOnForm(int counter) {
     	List<String> literalsOnForm = new ArrayList<String>();
     	literalsOnForm.add(getVarName("saveToVar",counter));
     	literalsOnForm.add(getVarName("query", counter));
     	return literalsOnForm;
-    	
+
     }
-    
-     
+
+
     public List<String> retrieveUrisOnForm(int counter) {
     	List<String> urisOnForm = new ArrayList<String>();
     	//We have no uris as far as I know.. well query Model is a uri
@@ -75,12 +75,12 @@ public  class ProcessSparqlDataGetterN3 extends ProcessDataGetterAbstract {
     	//UPDATE: adding class type as uri on form
     	urisOnForm.add(getVarName(classTypeVarBase, counter));
     	return urisOnForm;
-    	
+
     }
-    
+
    public List<FieldVTwo> retrieveFields(int counter) {
 	   List<FieldVTwo> fields = new ArrayList<FieldVTwo>();
-	  
+
 	   //For existing data getters
 	   //fields.add(new FieldVTwo().setName(getVarName("dataGetter", counter)));
 	   fields.add(new FieldVTwo().setName(getVarName("queryModel", counter)));
@@ -91,19 +91,19 @@ public  class ProcessSparqlDataGetterN3 extends ProcessDataGetterAbstract {
 
 	   return fields;
    }
-   
+
    public List<String> getLiteralVarNamesBase() {
-	   return Arrays.asList("saveToVar", "query");   
+	   return Arrays.asList("saveToVar", "query");
    }
 
    //these are for the fields ON the form
    public List<String> getUriVarNamesBase() {
-	   return Arrays.asList("queryModel", classTypeVarBase);   
+	   return Arrays.asList("queryModel", classTypeVarBase);
    }
-   
+
    //Existing values
    //TODO: Correct
-   
+
    public void populateExistingValues(String dataGetterURI, int counter, OntModel queryModel) {
 	   //First, put dataGetterURI within scope as well
 	   this.populateExistingDataGetterURI(dataGetterURI, counter);
@@ -124,38 +124,38 @@ public  class ProcessSparqlDataGetterN3 extends ProcessDataGetterAbstract {
         	   Resource queryModelResource = qs.getResource("queryModel");
         	   existingLiteralValues.put(this.getVarName("saveToVar", counter),
         			   new ArrayList<Literal>(Arrays.asList(saveToVarLiteral)));
-       
+
         	   existingLiteralValues.put(this.getVarName("query", counter),
         			   new ArrayList<Literal>(Arrays.asList(queryLiteral)));
         	   //Query model is optional
         	   if(queryModelResource != null && queryModelResource.getURI() != null) {
-        		   existingUriValues.put(this.getVarName("queryModel", counter), 
+        		   existingUriValues.put(this.getVarName("queryModel", counter),
         			   new ArrayList<String>(Arrays.asList(queryModelResource.getURI())));
         	   }
-        	   
+
            }
        } catch(Exception ex) {
     	   log.error("Exception occurred in retrieving existing values with query " + querystr, ex);
        }
-	   
-	   
+
+
    }
-  
-	
-   
+
+
+
    //?dataGetter a SparqlDataGetter ; display:saveToVar ?saveToVar; display:queryModel ?queryModel;
 	//display:query ?query ..
    protected String getExistingValuesSparqlQuery(String dataGetterURI) {
-	   String query = this.getSparqlPrefix() + " SELECT ?saveToVar ?query ?queryModel WHERE {" + 
-			   "<" + dataGetterURI + "> display:query ?query . \n" + 
-			   "OPTIONAL {<" + dataGetterURI + "> display:saveToVar ?saveToVar .} \n" + 
-			   "OPTIONAL {<" + dataGetterURI + "> display:queryModel ?queryModel . }\n" + 
+	   String query = this.getSparqlPrefix() + " SELECT ?saveToVar ?query ?queryModel WHERE {" +
+			   "<" + dataGetterURI + "> display:query ?query . \n" +
+			   "OPTIONAL {<" + dataGetterURI + "> display:saveToVar ?saveToVar .} \n" +
+			   "OPTIONAL {<" + dataGetterURI + "> display:queryModel ?queryModel . }\n" +
 			   "}";
 	   return query;
    }
 
 
-   
+
    public ObjectNode getExistingValuesJSON(String dataGetterURI, OntModel queryModel, ServletContext context) {
 	   ObjectNode jObject = new ObjectMapper().createObjectNode();
 	   jObject.put("dataGetterClass", classType);
@@ -190,16 +190,16 @@ public  class ProcessSparqlDataGetterN3 extends ProcessDataGetterAbstract {
        } catch(Exception ex) {
     	   log.error("Exception occurred in retrieving existing values with query " + querystr, ex);
        }
-	   
+
 	   return jObject;
    }
-   
+
    //Escape single and double quotes for html string to be returned to form
    public String replaceQuotes(String inputStr) {
 	   return inputStr.replaceAll("\'", "&#39;").replaceAll("\"", "&quot;");
-	   
+
    }
-   
+
    //This class can be extended so returning type here
    public String getClassType() {
 	   return classType;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/AntiXssValidation.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/AntiXssValidation.java
index 7604abccc..78251dfb7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/AntiXssValidation.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/AntiXssValidation.java
@@ -22,14 +22,14 @@ import edu.cornell.mannlib.vitro.webapp.web.AntiScript;
 
 /**
  * Check if the submitted text has potential XSS problems.
- * Error messages from this validator always start with XSS_ERROR_MESSAGE 
- * 
- * @author bdc34 
+ * Error messages from this validator always start with XSS_ERROR_MESSAGE
+ *
+ * @author bdc34
  */
 public class AntiXssValidation implements N3ValidatorVTwo{
     List<String> fieldNamesToValidate;
-    
-       
+
+
     /**
      * Validate all fields on submission.
      */
@@ -43,15 +43,15 @@ public class AntiXssValidation implements N3ValidatorVTwo{
     public AntiXssValidation(List<String> fieldNamesToValidate){
         this.fieldNamesToValidate = fieldNamesToValidate;
     }
-    
+
     @Override
     public Map<String, String> validate(EditConfigurationVTwo editConfig,
             MultiValueEditSubmission editSub) {
-        
+
         if( editSub == null ) {
             return null;
         }
-        
+
         Map<String,String>varToErrMsg = new HashMap<String,String>();
         if( fieldNamesToValidate == null ){
             if( editSub.getLiteralsFromForm() != null ){
@@ -64,46 +64,46 @@ public class AntiXssValidation implements N3ValidatorVTwo{
                     varToErrMsg.putAll( checkSubmissionForField( name, editSub));
                 }
             }
-        }else{                
+        }else{
             for( String fieldName : fieldNamesToValidate){
-                varToErrMsg.putAll( checkSubmissionForField(fieldName, editSub));            
+                varToErrMsg.putAll( checkSubmissionForField(fieldName, editSub));
             }
         }
-        
+
         if( varToErrMsg.isEmpty() )
             return null;
-        else            
-            return varToErrMsg;    
+        else
+            return varToErrMsg;
     }
-    
+
     /**
-     * Check for XSS for a single field. Returns NO_ERROR if there 
-     * are no errors so it can be added to a map with putAll() 
+     * Check for XSS for a single field. Returns NO_ERROR if there
+     * are no errors so it can be added to a map with putAll()
      */
     protected Map<String,String> checkSubmissionForField(
             String fieldName, MultiValueEditSubmission editSub){
-        
+
         if( fieldName == null || fieldName.isEmpty() || editSub == null)
             return NO_ERROR;
-        
-        if( editSub.getLiteralsFromForm() != null && 
+
+        if( editSub.getLiteralsFromForm() != null &&
             editSub.getLiteralsFromForm().containsKey(fieldName) ){
-            
+
             String error = null;
             try {
                 error = literalHasXSS( editSub.getLiteralsFromForm().get(fieldName) );
             } catch (ScanException | PolicyException e) {
                 error = e.getMessage();
             }
-            if( error != null ){                        
+            if( error != null ){
                 return Collections.singletonMap(fieldName, XSS_ERROR_MESSAGE + " " + error);
             }else{
                 return NO_ERROR;
             }
-            
-        } else if (editSub.getUrisFromForm() != null && 
+
+        } else if (editSub.getUrisFromForm() != null &&
                    editSub.getUrisFromForm().containsKey(fieldName)){
-                    
+
             String error;
             try {
                 error = uriHasXSS( editSub.getUrisFromForm().get(fieldName));
@@ -115,11 +115,11 @@ public class AntiXssValidation implements N3ValidatorVTwo{
             }else{
                 return NO_ERROR;
             }
-            
+
         }else{
             //field wasn't in submission
             return  NO_ERROR;
-        }                
+        }
     }
 
     /**
@@ -134,7 +134,7 @@ public class AntiXssValidation implements N3ValidatorVTwo{
             CleanResults cr = antiSamy.scan( uri );
             errorMsgs.addAll( cr.getErrorMessages() );
         }
-        
+
         if( errorMsgs.isEmpty() ){
             return null;
         }else{
@@ -149,19 +149,19 @@ public class AntiXssValidation implements N3ValidatorVTwo{
      */
     private String literalHasXSS(List<Literal> list) throws ScanException, PolicyException {
         AntiSamy antiSamy = AntiScript.getAntiSamyScanner();
-        
-        ArrayList errorMsgs = new ArrayList();        
-        for( Literal literal : list ){   
+
+        ArrayList errorMsgs = new ArrayList();
+        for( Literal literal : list ){
         	if(literal != null) {
 	            CleanResults cr = antiSamy.scan(literal.getLexicalForm());
 	            errorMsgs.addAll( cr.getErrorMessages() );
-	                         
+
 	            String dt = literal.getDatatypeURI();
 	            if( dt != null ){
 	                cr = antiSamy.scan( dt );
 	                errorMsgs.addAll( cr.getErrorMessages() );
 	            }
-	             
+
 	            String lang = literal.getLanguage() ;
 	            if( lang != null ){
 	                cr = antiSamy.scan( lang );
@@ -169,22 +169,22 @@ public class AntiXssValidation implements N3ValidatorVTwo{
 	            }
         	}
         }
-        
+
         if( errorMsgs.isEmpty() )
             return null;
         else
             return StringUtils.join(errorMsgs,", ");
-        
+
     }
 
 
     /**
-     * All error messages will start with this string. 
+     * All error messages will start with this string.
      */
-    public static String XSS_ERROR_MESSAGE = "Field contains unacceptable markup";    
-    
+    public static String XSS_ERROR_MESSAGE = "Field contains unacceptable markup";
+
     private static final Map<String,String>NO_ERROR = Collections.emptyMap();
-    
+
     //value indicates that all fields should be validated.
     private static final List<String> ALL_FIELDS = null;
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/DefaultDataPropertyFormValidator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/DefaultDataPropertyFormValidator.java
index 971adc343..d581f859a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/DefaultDataPropertyFormValidator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/DefaultDataPropertyFormValidator.java
@@ -20,9 +20,9 @@ import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 
 /**
  * Check if the submitted text has potential XSS problems.
- * Error messages from this validator always start with XSS_ERROR_MESSAGE 
- * 
- * @author bdc34  
+ * Error messages from this validator always start with XSS_ERROR_MESSAGE
+ *
+ * @author bdc34
  */
 public class DefaultDataPropertyFormValidator implements N3ValidatorVTwo{
 	private Log log = LogFactory.getLog(DefaultDataPropertyFormValidator.class);
@@ -46,7 +46,7 @@ public class DefaultDataPropertyFormValidator implements N3ValidatorVTwo{
     private final Pattern floatPattern = Pattern.compile(floatRegex);
     private final String intRegex = "^-?\\d+$";
     private final Pattern intPattern = Pattern.compile(intRegex);
-    
+
     public DefaultDataPropertyFormValidator(String datatype, VitroRequest vreq) {
         this.datatype = datatype;
 		this.vreq = vreq;
@@ -59,8 +59,8 @@ public class DefaultDataPropertyFormValidator implements N3ValidatorVTwo{
 
         Map<String,List<Literal>> literalsFromForm = editSub.getLiteralsFromForm();
 
-        Map<String,String> errors = new HashMap<String,String>();   
-        
+        Map<String,String> errors = new HashMap<String,String>();
+
         List<Literal> formLiterals = literalsFromForm.get("literal");
         Literal literal = null;
         if(formLiterals != null && formLiterals.size() > 0) {
@@ -73,7 +73,7 @@ public class DefaultDataPropertyFormValidator implements N3ValidatorVTwo{
                 literal = null;
             }
         }
-		
+
 		if ( literal != null ) {
 
 	        if ( datatype.indexOf("#dateTime") > -1 ) {
@@ -114,8 +114,8 @@ public class DefaultDataPropertyFormValidator implements N3ValidatorVTwo{
 		}
         else {
             return null;
-        }               
-        
+        }
+
         return errors.size() != 0 ? errors : null;
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestAJAXController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestAJAXController.java
index 6587e42b8..cdaf2b721 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestAJAXController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestAJAXController.java
@@ -26,22 +26,22 @@ import edu.cornell.mannlib.vitro.webapp.utils.log.LogUtils;
  * by the N3 editing system.  It will examine the request parameters, determine
  * which form to use, execute a EditConfiguration setup, and evaluate the
  * view indicated by the EditConfiguration.
- * 
- * Do not add code to this class to achieve some behavior in a 
+ *
+ * Do not add code to this class to achieve some behavior in a
  * form.  Try adding the behavior logic to the code that generates the
- * EditConfiguration for the form.  
+ * EditConfiguration for the form.
  */
 @WebServlet(name = "EditRequestAJAX", urlPatterns = {"/editRequestAJAX"} )
 public class EditRequestAJAXController extends VitroHttpServlet {
     private static final long serialVersionUID = 1L;
     public static Log log = LogFactory.getLog(EditRequestDispatchController.class);
-  
-   
+
+
 	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
     	return SimplePermission.DO_FRONT_END_EDITING.ACTION;
 	}
 
-    
+
     @Override
     protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
         super.doPost(req, resp);
@@ -65,20 +65,20 @@ public class EditRequestAJAXController extends VitroHttpServlet {
         } catch(Exception ex) {
         	log.error("An error occurred in retrieving configuration and/or generator ", ex);
         }
-        
+
     }
-    
+
     protected EditConfigurationVTwo getEditConfiguration(VitroRequest vreq) {
-    	
+
     	EditConfigurationVTwo config = EditConfigurationVTwo.getConfigFromSession(vreq.getSession(), vreq);
     	return config;
     }
-    
+
     private EditConfigurationAJAXGenerator getAJAXGenerator(
             String editConfGeneratorName, VitroRequest vreq, HttpSession session) throws Exception {
-    	
+
     	EditConfigurationAJAXGenerator EditConfigurationVTwoGenerator = null;
-    	
+
         Object object = null;
         try {
             Class classDefinition = Class.forName(editConfGeneratorName);
@@ -89,12 +89,12 @@ public class EditRequestAJAXController extends VitroHttpServlet {
         }
 
         if(EditConfigurationVTwoGenerator == null){
-        	throw new Error("Could not find EditConfigurationVTwoGenerator " + editConfGeneratorName);        	
+        	throw new Error("Could not find EditConfigurationVTwoGenerator " + editConfGeneratorName);
         } else {
            return EditConfigurationVTwoGenerator;
         }
-        
+
     }
 
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java
index 69bfba49b..8e6e0d681 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java
@@ -43,16 +43,16 @@ import edu.cornell.mannlib.vitro.webapp.web.templatemodels.edit.MultiValueEditSu
  * by the N3 editing system.  It will examine the request parameters, determine
  * which form to use, execute a EditConfiguration setup, and evaluate the
  * view indicated by the EditConfiguration.
- * 
- * Do not add code to this class to achieve some behavior in a 
+ *
+ * Do not add code to this class to achieve some behavior in a
  * form.  Try adding the behavior logic to the code that generates the
- * EditConfiguration for the form.  
+ * EditConfiguration for the form.
  */
 @WebServlet(name = "EditRequestDispatch", urlPatterns = {"/editRequestDispatch"} )
 public class EditRequestDispatchController extends FreemarkerHttpServlet {
     private static final long serialVersionUID = 1L;
     public static Log log = LogFactory.getLog(EditRequestDispatchController.class);
-    
+
     final String DEFAULT_OBJ_FORM = "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DefaultObjectPropertyFormGenerator";
     final String DEFAULT_DATA_FORM = "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DefaultDataPropertyFormGenerator";
     //TODO: Create this generator
@@ -66,33 +66,33 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
 
 	@Override
     protected ResponseValues processRequest(VitroRequest vreq) {
-      
+
     	try{
         WebappDaoFactory wdf = vreq.getWebappDaoFactory();
-        
+
         if(isMenuMode(vreq)) {
         	return redirectToMenuEdit(vreq);
         }
-        
+
         //check some error conditions and if they exist return response values
          //with error message
          if(isErrorCondition(vreq)){
         	 return doHelp(vreq, getErrorMessage(vreq));
          }
-        
+
          //if edit form needs to be skipped to object instead
          if(isSkipPredicate(vreq)) {
              log.debug("The predicate is a annotated as a skip.");
         	 return processSkipEditForm(vreq);
-         }                  
-     
+         }
+
         //Get the edit generator name
          String editConfGeneratorName = processEditConfGeneratorName(vreq);
-        
-         //session attribute 
+
+         //session attribute
          setSessionRequestFromEntity(vreq);
- 
-         // make new or get an existing edit configuration          
+
+         // make new or get an existing edit configuration
          EditConfigurationVTwo editConfig = setupEditConfiguration(editConfGeneratorName, vreq);
          log.debug("editConfiguration:\n" + editConfig );
 
@@ -100,14 +100,14 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
          if( editConfig.getSkipToUrl() != null ){
              return new DirectRedirectResponseValues(editConfig.getSkipToUrl());
          }
-         
+
          //what template?
          String template = editConfig.getTemplate();
-        
+
          //Get the multi value edit submission object
          MultiValueEditSubmission submission = getMultiValueSubmission(vreq, editConfig);
          MultiValueEditSubmissionTemplateModel submissionTemplateModel = new MultiValueEditSubmissionTemplateModel(submission);
-         
+
          //what goes in the map for templates?
          Map<String,Object> templateData = new HashMap<String,Object>();
          EditConfigurationTemplateModel etm = new EditConfigurationTemplateModel( editConfig, vreq);
@@ -122,20 +122,20 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
          templateData.put("bodyClasses", "formsEdit");
          return new TemplateResponseValues(template, templateData);
          }catch(Throwable th){
-        	
+
         	 HashMap<String,Object> map = new HashMap<String,Object>();
         	 map.put("errorMessage", th.toString());
         	 log.error(th,th);
         	 return new TemplateResponseValues("error-message.ftl", map);
-        
+
          }
-    }    
+    }
 
 
 
 	private boolean isMenuMode(VitroRequest vreq) {
 		//Check if special model, in which case forward
-	    //bdc34: the EditRequestDispatchController cannot hijack 
+	    //bdc34: the EditRequestDispatchController cannot hijack
 	    // all edits to the display model and force them into /editDisplayModel .
 	    // Consider changing URLs used on special menu form to point to /editMenu or something.
     	//return(vreq.getParameter("switchToDisplayModel") != null);
@@ -143,11 +143,11 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
 	}
 
 	private ResponseValues redirectToMenuEdit(VitroRequest vreq) {
-	    throw new RuntimeException("The EditRequestDispatchController cannot hijack"+ 
+	    throw new RuntimeException("The EditRequestDispatchController cannot hijack"+
         "all edits to the display model and force them into /editDisplayModel ."+
-        " Consider changing URLs used on special menu form to point to /editDisplayModel");        
+        " Consider changing URLs used on special menu form to point to /editDisplayModel");
 	}
-	
+
     private MultiValueEditSubmission getMultiValueSubmission(VitroRequest vreq, EditConfigurationVTwo editConfig) {
 		return EditSubmissionUtils.getEditSubmissionFromSession(vreq.getSession(), editConfig);
 	}
@@ -155,7 +155,7 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
 	//TODO: should more of what happens in this method
     //happen in the generators?
 	private EditConfigurationVTwo setupEditConfiguration(String editConfGeneratorName,
-			VitroRequest vreq) throws Exception {	    	    	    
+			VitroRequest vreq) throws Exception {
     	HttpSession session = vreq.getSession();
     	//Originally, this code called makeEditConfiguration before checking for/setting the edit key
     	//which meant that in the case of page reload on an error, you would recreate an edit configuration
@@ -166,21 +166,21 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
     	//edit key is set here, NOT in the generator class
     	EditConfigurationVTwo editConfig = null;
     	EditConfigurationVTwo existingConfig = EditConfigurationVTwo.getConfigFromSession(session, vreq);
-    	//if delete form from the editing page, then edit configuration already exists and the 
+    	//if delete form from the editing page, then edit configuration already exists and the
     	//delete generator wouldn't be used, we need to make sure that it is used if it's a delete option
     	if(existingConfig != null && !isDeleteForm(vreq)) {
     		editConfig = existingConfig;
     	} else {
-    		editConfig = 
+    		editConfig =
     	    	    makeEditConfigurationVTwo( editConfGeneratorName, vreq, session);
     	}
-    	 
+
     	if(editConfig == null) {
     	    log.error("editConfig is null! How did this happen?");
     	}
-    	String editKey = EditConfigurationUtils.getEditKey(vreq); 
-    	editConfig.setEditKey(editKey);        
-        
+    	String editKey = EditConfigurationUtils.getEditKey(vreq);
+    	editConfig.setEditKey(editKey);
+
 
         //put edit configuration in session so it can be accessed on form submit.
         EditConfigurationVTwo.putConfigInSession(editConfig, session);
@@ -193,64 +193,64 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
 		if(session.getAttribute("requestedFromEntity") == null) {
 			session.setAttribute("requestedFromEntity", subjectUri);
 		}
-		
+
 	}
 
 	/**
 	 * Determine the java class name to use for the EditConfigurationGenerator.
-	 * 
-	 * Forwarding should NOT be done here.  If an EditConfiguration needs to 
+	 *
+	 * Forwarding should NOT be done here.  If an EditConfiguration needs to
 	 * forward to a URL use editConfig.getSkipToUrl(). Also consider using a skip predicate annotation.
 	 */
 	private String processEditConfGeneratorName(VitroRequest vreq) {
 	    String editConfGeneratorName = null;
-	    
+
 	    String predicateUri =  getPredicateUri(vreq);
 	    String domainUri = EditConfigurationUtils.getDomainUri(vreq);
 	    String rangeUri = EditConfigurationUtils.getRangeUri(vreq);
-	    
-        // *** handle the case where the form is specified as a request parameter ***	    
+
+        // *** handle the case where the form is specified as a request parameter ***
         String formParam = getFormParam(vreq);
         if(  formParam != null && !formParam.isEmpty() ){
             // please, always do this case first.
             //form parameter must be a fully qualified java class name of a EditConfigurationVTwoGenerator implementation.
             editConfGeneratorName = formParam;
-            
-        //  *** do magic cmd=delete 
+
+        //  *** do magic cmd=delete
         }else if(isDeleteForm(vreq)) {
             //TODO: cmd=delete would be better if it was moved to the the EditConfigurationGenerator that uses it.
         	return DEFAULT_DELETE_FORM;
 
-      	// *** check for a predicate URI in the request        	
-        }else if( predicateUri != null && !predicateUri.isEmpty() ){                      
+      	// *** check for a predicate URI in the request
+        }else if( predicateUri != null && !predicateUri.isEmpty() ){
             Property prop = getProperty( predicateUri, domainUri, rangeUri, vreq);
             if (prop != null && rangeUri != null) {
                 editConfGeneratorName = getCustomEntryForm(prop);
             } else if( prop != null && prop.getCustomEntryForm() != null ){
                 //there is a custom form, great! let's use it.
                 editConfGeneratorName = prop.getCustomEntryForm();
-                
+
             }else if( RDFS.label.getURI().equals( predicateUri ) ) {
                 // set RDFS_LABLE_FORM after a custom entry form on the property
-                // so that there is a chance that rdfs:label could have a configurable 
+                // so that there is a chance that rdfs:label could have a configurable
                 // custom form it the future
                 editConfGeneratorName = RDFS_LABEL_FORM;
-                
-            }else if( isDataProperty(prop) ){                   
+
+            }else if( isDataProperty(prop) ){
                 editConfGeneratorName = DEFAULT_DATA_FORM;
             }else{
                 editConfGeneratorName = DEFAULT_OBJ_FORM;
             }
-            
+
         // *** default to the object property form when there is nothing
-        }else{       
+        }else{
             editConfGeneratorName = DEFAULT_OBJ_FORM;
         }
-                
+
         if( editConfGeneratorName == null )
             log.error("problem: editConfGeneratorName is null but " +
             		"processEditConfGeneratorName() should never return null.");
-        
+
         log.debug("generator name is " + editConfGeneratorName);
         return editConfGeneratorName;
 	}
@@ -262,8 +262,8 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
 	        return prop.getCustomEntryForm();
 	    }
 	}
-	
-	private Property getProperty(String predicateUri, String domainUri, String rangeUri, VitroRequest vreq) {	   
+
+	private Property getProperty(String predicateUri, String domainUri, String rangeUri, VitroRequest vreq) {
 		Property p = null;
 		try{
     		p = vreq.getWebappDaoFactory().getObjectPropertyDao().getObjectPropertyByURIs(
@@ -284,14 +284,14 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
 	}
 
     private boolean isDataProperty( Property prop ) {
-        return ( prop != null && prop instanceof DataProperty );        
+        return ( prop != null && prop instanceof DataProperty );
     }
 
 
 	//if skip edit form
 	private boolean isSkipPredicate(VitroRequest vreq) {
 		 //Certain predicates may be annotated to change the behavior of the edit
-        //link.  Check for this annotation and, if present, simply redirect 
+        //link.  Check for this annotation and, if present, simply redirect
         //to the normal individual display for the object URI instead of bringing
         //up an editing form.
         //Note that we do not want this behavior for the delete link (handled above).
@@ -303,15 +303,15 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
         return (isEditOfExistingStmt && (wdf.getObjectPropertyDao().skipEditForm(predicateUri)));
 	}
 
-    private ResponseValues processSkipEditForm(VitroRequest vreq) {        
+    private ResponseValues processSkipEditForm(VitroRequest vreq) {
         ParamMap params = new ParamMap();
         params.put("uri",EditConfigurationUtils.getObjectUri(vreq));
         params.put("relatedSubjectUri",EditConfigurationUtils.getSubjectUri(vreq));
         params.put("relatingPredicateUri",EditConfigurationUtils.getPredicateUri(vreq));
-                
+
         return new DirectRedirectResponseValues(
                 UrlBuilder.getUrl(UrlBuilder.Route.INDIVIDUAL, params),
-                HttpServletResponse.SC_SEE_OTHER);		
+                HttpServletResponse.SC_SEE_OTHER);
 	}
 
 	//Check error conditions
@@ -327,10 +327,10 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
             }
             if (subjectUri == null || subjectUri.trim().length() == 0){
             	return true;
-                        
+
             }
         }
-    	
+
     	//Check predicate - if not vitro label and neither data prop nor object prop return error
     	WebappDaoFactory wdf = vreq.getWebappDaoFactory();
     	//TODO: Check if any error conditions are not met here
@@ -341,7 +341,7 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
                 && !isVitroLabel(predicateUri)
                 && !EditConfigurationUtils.isDataProperty(predicateUri, vreq);
     }
-    
+
     private String getErrorMessage(VitroRequest vreq) {
     	String errorMessage = null;
     	 String subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
@@ -355,18 +355,18 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
              }
              if (subjectUri == null || subjectUri.trim().length() == 0){
                  return "subjectUri was empty. If no editForm is specified," +
-                 		" it is required by EditRequestDispatch.";                
+                 		" it is required by EditRequestDispatch.";
              }
          }
          return errorMessage;
     }
-    
+
 	//should return null
 	private String getFormParam(VitroRequest vreq) {
 		String formParam = (String) vreq.getParameter("editForm");
 		return formParam;
 	}
-    
+
     private boolean isEditOfExistingStmt(VitroRequest vreq) {
         String objectUri = vreq.getParameter("objectUri");
 
@@ -377,7 +377,7 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
     	}
     	return false;
     }
-    
+
     //Check whether command is delete and either process or save
     //Original code involved doing a jsp forward
     //TODO: Check how to integrate deletion
@@ -385,13 +385,13 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
     	String command = vreq.getParameter("cmd");
         return "delete".equals(command);
     }
-    
-       
+
+
     private EditConfigurationVTwo makeEditConfigurationVTwo(
             String editConfGeneratorName, VitroRequest vreq, HttpSession session) throws Exception {
-    	
+
     	EditConfigurationGenerator EditConfigurationVTwoGenerator = null;
-    	
+
         Object object = null;
         try {
             Class classDefinition = Class.forName(editConfGeneratorName);
@@ -402,27 +402,27 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet {
         }
 
         if(EditConfigurationVTwoGenerator == null){
-        	throw new Error("Could not find EditConfigurationVTwoGenerator " + editConfGeneratorName);        	
+        	throw new Error("Could not find EditConfigurationVTwoGenerator " + editConfGeneratorName);
         } else {
             log.debug("Created EditConfiguration using " + editConfGeneratorName);
             return EditConfigurationVTwoGenerator.getEditConfiguration(vreq, session);
         }
-        
+
     }
 
-    
+
     private ResponseValues doHelp(VitroRequest vreq, String message){
         //output some sort of help message for the developers.
-        
+
     	HashMap<String,Object> map = new HashMap<String,Object>();
    	 map.put("errorMessage", "help is not yet implemented");
    	 return new TemplateResponseValues("error-message.ftl", map);    }
-    
-    
+
+
     //Get submission url
     private String getSubmissionUrl(VitroRequest vreq) {
     	return vreq.getContextPath() + "/edit/process";
     }
-    
-    
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java
index 6e4932098..64f605103 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java
@@ -30,18 +30,18 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.controller.ProcessRdfForm
 
 @WebServlet(name = "PostEditCleanupController", urlPatterns = {"/postEditCleanupController"} )
 public class PostEditCleanupController extends FreemarkerHttpServlet{
-	
-    private static Log log = LogFactory.getLog(PostEditCleanupController.class);    	    
-	
+
+    private static Log log = LogFactory.getLog(PostEditCleanupController.class);
+
     @Override
 	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
     	return SimplePermission.DO_FRONT_END_EDITING.ACTION;
 	}
 
-    @Override 
-	protected ResponseValues processRequest(VitroRequest vreq) {	
+    @Override
+	protected ResponseValues processRequest(VitroRequest vreq) {
 		doPostEditCleanup( vreq );
-		return doPostEditRedirect( vreq, null);	
+		return doPostEditRedirect( vreq, null);
 	}
 
 	/**
@@ -50,79 +50,79 @@ public class PostEditCleanupController extends FreemarkerHttpServlet{
 	 * @param entityToReturnTo - may be null
 	 */
     protected static ResponseValues doPostEditRedirect( VitroRequest vreq , String entityToReturnTo){
-        EditConfigurationVTwo editConfig = EditConfigurationVTwo.getConfigFromSession(vreq.getSession(), vreq);      
+        EditConfigurationVTwo editConfig = EditConfigurationVTwo.getConfigFromSession(vreq.getSession(), vreq);
         if(editConfig == null){
-            log.error("No edit configuration found in doPostEditRedirect()");        
+            log.error("No edit configuration found in doPostEditRedirect()");
             return new RedirectResponseValues( UrlBuilder.getHomeUrl() );
         }
-        
+
         //In some cases, a generator/form may have a regular URL to return to but the same generator
         //may be used from different pages, so a parameter allowing the form to return to a specific page
         //would be useful
-        
+
         String returnURLParameter = vreq.getParameter("returnURL");
         if(returnURLParameter != null) {
             return new DirectRedirectResponseValues( returnURLParameter );
         }
-        
-        // If there is a urlToReturnTo that takes precedence 
+
+        // If there is a urlToReturnTo that takes precedence
         if( editConfig.getUrlToReturnTo() != null && ! editConfig.getUrlToReturnTo().trim().isEmpty()){
             //this does not get value substitution or the predicate anchor
             return new DirectRedirectResponseValues( editConfig.getUrlToReturnTo() );
         }
-        
+
         //The submission for getting the entity to return to is not retrieved from the session but needs
         //to be created - as it is in processRdfForm3.jsp
         if( entityToReturnTo == null ){
-            //this will not work if there entityToReturnTo has a new resource URI, 
+            //this will not work if there entityToReturnTo has a new resource URI,
             //in that case entityToReturnTo should not have been passed to this method as null
-            MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq.getParameterMap(), editConfig);        
-            entityToReturnTo = N3EditUtils.processEntityToReturnTo(editConfig, submission, vreq);                  
+            MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq.getParameterMap(), editConfig);
+            entityToReturnTo = N3EditUtils.processEntityToReturnTo(editConfig, submission, vreq);
         }
-      
+
         //Get url pattern
-        String urlPattern = Utilities.getPostEditUrlPattern(vreq, editConfig);                
-        
-        //Redirect appropriately        
+        String urlPattern = Utilities.getPostEditUrlPattern(vreq, editConfig);
+
+        //Redirect appropriately
         if( entityToReturnTo != null ){
 
             //Try to redirect to the entityToReturnTo
             ParamMap paramMap = new ParamMap();
             paramMap.put("uri", entityToReturnTo);
-            paramMap.put("extra","true"); //for ie6       
+            paramMap.put("extra","true"); //for ie6
             //If url already contains an ? then need to add extra params
             String path = UrlBuilder.addParams(urlPattern, paramMap);
             path += getSpecialModelParam( vreq, editConfig);
-            path += getPredicateAnchor( vreq, editConfig );            
+            path += getPredicateAnchor( vreq, editConfig );
             return new RedirectResponseValues( path );
-            
+
         } else if ( !urlPattern.endsWith("individual") && !urlPattern.endsWith("entity") ){
-            
+
             //Try to redirect to just the EditConfig.UrlPattern
             //since it doesn't seem to be for the profile page
             return new RedirectResponseValues( urlPattern );
-            
-        }else if( editConfig.getSubjectUri() != null ){ 
-            
+
+        }else if( editConfig.getSubjectUri() != null ){
+
             //Try to redirect to the EditConf.subjectUri profile page
             //since things seem a little odd.
             ParamMap paramMap = new ParamMap();
             paramMap.put("uri", editConfig.getSubjectUri() );
-            paramMap.put("extra","true"); //for ie6           
+            paramMap.put("extra","true"); //for ie6
             String path = UrlBuilder.getPath( UrlBuilder.Route.INDIVIDUAL, paramMap);
             path += getSpecialModelParam( vreq, editConfig);
-            path += getPredicateAnchor( vreq, editConfig );            
+            path += getPredicateAnchor( vreq, editConfig );
             return new RedirectResponseValues( path );
-            
+
         }else{
             //Not sure where to go
             return new RedirectResponseValues( Route.LOGIN );
         }
     }
-    
+
     private static String getSpecialModelParam(VitroRequest vreq,
             EditConfigurationVTwo editConfig) {
-        if( editConfig.getAboxModelId() != null && 
+        if( editConfig.getAboxModelId() != null &&
             editConfig.getAboxModelId().equals(VitroModelSource.ModelName.DISPLAY.toString())){
             return "&"+ DisplayVocabulary.SWITCH_TO_DISPLAY_MODEL + "=1";
         }else{
@@ -131,36 +131,36 @@ public class PostEditCleanupController extends FreemarkerHttpServlet{
     }
 
     public static void doPostEditCleanup( VitroRequest vreq ) {
-        EditConfigurationVTwo configuration = EditConfigurationVTwo.getConfigFromSession(vreq.getSession(), vreq);      
+        EditConfigurationVTwo configuration = EditConfigurationVTwo.getConfigFromSession(vreq.getSession(), vreq);
         if(configuration == null)
-            return;        
-        
+            return;
+
         HttpSession session = vreq.getSession(false);
         if( session != null ) {
             EditConfigurationVTwo editConfig = EditConfigurationVTwo.getConfigFromSession(session,vreq);
             //In order to support back button resubmissions, don't remove the editConfig from session.
-            //EditConfiguration.clearEditConfigurationInSession(session, editConfig);            
+            //EditConfiguration.clearEditConfigurationInSession(session, editConfig);
             //Here, edit submission is retrieved so it can be cleared out in case it exists
-            MultiValueEditSubmission editSub = EditSubmissionUtils.getEditSubmissionFromSession(session,editConfig);        
-            EditSubmissionUtils.clearEditSubmissionInSession(session, editSub);                               
-        }               
-    }    
-	
-    
+            MultiValueEditSubmission editSub = EditSubmissionUtils.getEditSubmissionFromSession(session,editConfig);
+            EditSubmissionUtils.clearEditSubmissionInSession(session, editSub);
+        }
+    }
+
+
     /**
      * Adds a attribute to the request to indicate which predicate was edited.
      * This attribute is used by some controllers to send the browser to the
      * place on the page relevant to the predicate.
-     * 
-     * Never returns null, it will return an empty string if there is nothing. 
+     *
+     * Never returns null, it will return an empty string if there is nothing.
      */
     public static String getPredicateAnchor( HttpServletRequest req, EditConfigurationVTwo config){
         if( req == null || config == null )
-            return "";  
-        
+            return "";
+
         //Get prop local name if it exists
         String predicateLocalName = Utilities.getPredicateLocalName(config);
-        
+
         if( predicateLocalName != null && predicateLocalName.length() > 0){
             String predicateAnchor = "#" + predicateLocalName;
             req.setAttribute("predicateAnchor", predicateAnchor);
@@ -168,5 +168,5 @@ public class PostEditCleanupController extends FreemarkerHttpServlet{
         }else{
             return "";
         }
-    }    
+    }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java
index 4eaedf7fa..790781a95 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java
@@ -41,92 +41,92 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.RdfLiteralHash;
 import javax.servlet.annotation.WebServlet;
 
 /**
- * This servlet will convert a request to an EditSubmission, 
- * find the EditConfiguration associated with the request, 
+ * This servlet will convert a request to an EditSubmission,
+ * find the EditConfiguration associated with the request,
  * use ProcessRdfForm to process these to a set of RDF additions and retractions,
- * the apply these to the models. 
+ * the apply these to the models.
  */
 @WebServlet(name = "ProcessRdfFormController", urlPatterns = {"/edit/process"} )
 public class ProcessRdfFormController extends FreemarkerHttpServlet{
-	
+
     private Log log = LogFactory.getLog(ProcessRdfFormController.class);
 
 
-    	
+
     @Override
 	protected AuthorizationRequest requiredActions(VitroRequest vreq) {
     	return SimplePermission.DO_FRONT_END_EDITING.ACTION;
 	}
 
-	@Override 
-	protected ResponseValues processRequest(VitroRequest vreq) {			
-		//get the EditConfiguration 
+	@Override
+	protected ResponseValues processRequest(VitroRequest vreq) {
+		//get the EditConfiguration
 		EditConfigurationVTwo configuration = EditConfigurationUtils.getEditConfiguration(vreq);
         if(configuration == null)
             return handleMissingConfiguration(vreq);
 
         //get the EditSubmission
-        MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq.getParameterMap(), configuration);        	
+        MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq.getParameterMap(), configuration);
         EditSubmissionUtils.putEditSubmissionInSession(vreq.getSession(), submission);
-       
+
         //if errors, return error response
 		ResponseValues errorResponse = doValidationErrors(vreq, configuration, submission);
 		if( errorResponse != null )
 		    return errorResponse;
 
-        // get the models to work with in case the write model and query model are not the defaults 
-		Model queryModel = configuration.getQueryModelSelector().getModel(vreq, getServletContext());		
-	    Model writeModel = configuration.getWriteModelSelector().getModel(vreq,getServletContext());  
-	    
+        // get the models to work with in case the write model and query model are not the defaults
+		Model queryModel = configuration.getQueryModelSelector().getModel(vreq, getServletContext());
+	    Model writeModel = configuration.getWriteModelSelector().getModel(vreq,getServletContext());
+
 	    //If data property check for back button confusion
 	    boolean isBackButton = checkForBackButtonConfusion(configuration, vreq, queryModel);
 	    if(isBackButton) {
 	    	//Process back button issues and do a return here
 	    	return doProcessBackButton(configuration, submission, vreq);
 	    }
-	    
+
 	    //Otherwise, process as usual
-	    
+
 	    AdditionsAndRetractions changes;
         try {
 
-            ProcessRdfForm prf = 
-                new ProcessRdfForm(configuration, new NewURIMakerVitro(vreq.getWebappDaoFactory()));        
-            changes = prf.process(configuration, submission, vreq);  
-            
+            ProcessRdfForm prf =
+                new ProcessRdfForm(configuration, new NewURIMakerVitro(vreq.getWebappDaoFactory()));
+            changes = prf.process(configuration, submission, vreq);
+
         } catch (Exception e) {
             throw new Error(e);
-        }	    
-		
+        }
+
 		if( configuration.isUseDependentResourceDelete() )
-		    changes = ProcessRdfForm.addDependentDeletes(changes, queryModel);		
-		
-		N3EditUtils.preprocessModels(changes, configuration, vreq);		
-		
+		    changes = ProcessRdfForm.addDependentDeletes(changes, queryModel);
+
+		N3EditUtils.preprocessModels(changes, configuration, vreq);
+
 		ProcessRdfForm.applyChangesToWriteModel(changes, queryModel, writeModel, N3EditUtils.getEditorUri(vreq) );
-		
-		//Here we are trying to get the entity to return to URL,  
+
+		//Here we are trying to get the entity to return to URL,
 		//More involved processing for data property apparently
 		String entityToReturnTo = N3EditUtils.processEntityToReturnTo(configuration, submission, vreq);
-		
-        //For data property processing, need to update edit configuration for back button 
+
+        //For data property processing, need to update edit configuration for back button
 		N3EditUtils.updateEditConfigurationForBackButton(configuration, submission, vreq, writeModel);
         PostEditCleanupController.doPostEditCleanup(vreq);
         return PostEditCleanupController.doPostEditRedirect(vreq, entityToReturnTo);
 	}
 
 	//In case of back button confusion
-	//Currently returning an error message: 
+	//Currently returning an error message:
 	//Later TODO: Per Brian Caruso's instructions, replicate
 	//the logic in the original datapropertyBackButtonProblems.jsp
 	private ResponseValues doProcessBackButton(EditConfigurationVTwo configuration,
 			MultiValueEditSubmission submission, VitroRequest vreq) {
-		  
+
 		//The bulk of the processing should probably/already sits in ProcessRdfForm so that should remain there
 		//The issue is what then to do with the actual redirect? What do we redirect to?
 		HashMap<String,Object> map = new HashMap<String,Object>();
    	 	map.put("errorMessage", "Back button confusion has occurred");
-		ResponseValues values = new TemplateResponseValues("error-message.ftl", map);        
+		ResponseValues values = new TemplateResponseValues("error-message.ftl", map);
 		return values;
 	}
 
@@ -137,18 +137,18 @@ public class ProcessRdfFormController extends FreemarkerHttpServlet{
 		if(EditConfigurationUtils.isObjectProperty(editConfig.getPredicateUri(), vreq)) {
 			return false;
 		}
-		
+
 		WebappDaoFactory wdf = vreq.getWebappDaoFactory();
 		 if ( ! editConfig.isDataPropertyUpdate())
 	            return false;
-	        
+
         Integer dpropHash = editConfig.getDatapropKey();
-        DataPropertyStatement dps = 
-            RdfLiteralHash.getPropertyStmtByHash(editConfig.getSubjectUri(), 
+        DataPropertyStatement dps =
+            RdfLiteralHash.getPropertyStmtByHash(editConfig.getSubjectUri(),
                     editConfig.getPredicateUri(), dpropHash, model);
         if (dps != null)
             return false;
-        
+
         DataProperty dp = wdf.getDataPropertyDao().getDataPropertyByURI(
                 editConfig.getPredicateUri());
         if (dp != null) {
@@ -157,16 +157,16 @@ public class ProcessRdfFormController extends FreemarkerHttpServlet{
         return false;
 
 	}
-	
+
 	private ResponseValues doValidationErrors(VitroRequest vreq,
 			EditConfigurationVTwo editConfiguration, MultiValueEditSubmission submission) {
-		
+
 		Map<String, String> errors = submission.getValidationErrors();
-		
+
 		if(errors != null && !errors.isEmpty()){
 			String form = editConfiguration.getFormUrl();
 			vreq.setAttribute("formUrl", form);
-			vreq.setAttribute("view", vreq.getParameter("view"));	
+			vreq.setAttribute("view", vreq.getParameter("view"));
 			//Need to ensure that edit key is set so that the correct
 			//edit configuration and edit submission are retrieved
 			//This can also be set as a parameter instead
@@ -174,7 +174,7 @@ public class ProcessRdfFormController extends FreemarkerHttpServlet{
 			formUrl += "&editKey=" + editConfiguration.getEditKey();
 	        return new RedirectResponseValues(formUrl);
 		}
-		return null; //no errors		
+		return null; //no errors
 	}
 
     /**
@@ -187,32 +187,32 @@ public class ProcessRdfFormController extends FreemarkerHttpServlet{
         map.put("params",vreq.getParameterMap());
         return new TemplateResponseValues( "missingEditConfig.ftl", map );
     }
-	
+
 	//Move to EditN3Utils but keep make new uris here
 	public static class Utilities {
-		
+
 		private static Log log = LogFactory.getLog(ProcessRdfFormController.class);
-	    
+
 		public static String assertionsType = "assertions";
 		public static String retractionsType = "retractions";
-		
+
 		public static boolean isDataProperty(EditConfigurationVTwo configuration, VitroRequest vreq) {
 			return EditConfigurationUtils.isDataProperty(configuration.getPredicateUri(), vreq);
 		}
-		
+
 		public static boolean isObjectProperty(EditConfigurationVTwo configuration, VitroRequest vreq) {
-			
+
 			return EditConfigurationUtils.isObjectProperty(configuration.getPredicateUri(), vreq);
 		}
-		
+
 	    public static List<String> makeListCopy(List<String> list) {
 	    	List<String> copyOfN3 = new ArrayList<String>();
 			copyOfN3.addAll(list);
             return copyOfN3;
 	    }
-	     
+
 	     //TODO: Check if this would be correct with multiple values and uris being passed back
-	     //First, need to order by uris in original and new values probably and 
+	     //First, need to order by uris in original and new values probably and
 	     //for literals, order by? Alphabetical or numeric value? Hard to say
 	     public static boolean hasFieldChanged(String fieldName,
 	             EditConfigurationVTwo editConfig, MultiValueEditSubmission submission) {
@@ -257,20 +257,20 @@ public class ProcessRdfFormController extends FreemarkerHttpServlet{
 	                 + (fieldChanged ? "did Change" : "did NOT change"));
 	         return fieldChanged;
 	     }
-	     		
+
 		//Get predicate local anchor
 		public static String getPredicateLocalName(EditConfigurationVTwo editConfig) {
 			String predicateLocalName = null;
 	        if( editConfig != null ){
-                String predicateUri = editConfig.getPredicateUri();            
+                String predicateUri = editConfig.getPredicateUri();
                 if( predicateUri != null ){
                     try{
                         Property prop = ResourceFactory.createProperty(predicateUri);
                         predicateLocalName = prop.getLocalName();
-                    
+
                     }catch (org.apache.jena.shared.InvalidPropertyURIException e){
                         log.debug("could not convert predicateUri into a valid URI",e);
-                    }                               
+                    }
                 }
 	        }
 	        return predicateLocalName;
@@ -290,33 +290,33 @@ public class ProcessRdfFormController extends FreemarkerHttpServlet{
             if (cancel != null && cancel.equals("true") && !StringUtils.isEmpty(urlPatternToCancelTo)) {
                 urlPattern = urlPatternToCancelTo;
             } else if (!StringUtils.isEmpty(urlPatternToReturnTo)) {
-                urlPattern = urlPatternToReturnTo;       
+                urlPattern = urlPatternToReturnTo;
             } else {
-                urlPattern = "/individual";         
+                urlPattern = "/individual";
             }
             return urlPattern;
 		}
-		
+
 		//Get resource to redirect to
 		public static String getResourceToRedirect(VitroRequest vreq, EditConfigurationVTwo editConfig, String entityToReturnTo ) {
 			String resourceToRedirectTo = null;
 			if( editConfig != null ){
 
-                if( editConfig.getEntityToReturnTo() != null && editConfig.getEntityToReturnTo().startsWith("?") ){             
-                    resourceToRedirectTo = entityToReturnTo;            
-                }else{            
+                if( editConfig.getEntityToReturnTo() != null && editConfig.getEntityToReturnTo().startsWith("?") ){
+                    resourceToRedirectTo = entityToReturnTo;
+                }else{
                     resourceToRedirectTo = editConfig.getEntityToReturnTo();
                 }
-                
+
                 //if there is no entity to return to it is likely a cancel
                 if( resourceToRedirectTo == null || resourceToRedirectTo.length() == 0 )
-                    resourceToRedirectTo = editConfig.getSubjectUri();                
+                    resourceToRedirectTo = editConfig.getSubjectUri();
             }
 			return resourceToRedirectTo;
 		}
-		
 
-			
+
+
 	}
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailFactory.java
index 41c3404d3..b7987979c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailFactory.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailFactory.java
@@ -31,11 +31,11 @@ import freemarker.template.Configuration;
 
 /**
  * A factory that creates Freemarker-based email messages.
- * 
+ *
  * Client code should call isConfigured(), to be sure that the required email
  * properties have been provided. If isConfigured() returns false, the client
  * code should respond accordingly.
- * 
+ *
  * On the other hand, if the configuration properties are provided, but are
  * syntactically invalid, an exception is thrown and startup is aborted.
  */
@@ -188,7 +188,7 @@ public class FreemarkerEmailFactory {
 		/**
 		 * Try to open a connection to the SMTP host and conduct an "empty"
 		 * conversation using SMTP.
-		 * 
+		 *
 		 * @throws InvalidSmtpHost
 		 *             If anything goes wrong.
 		 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java
index 6462f58af..ee5a9ef17 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java
@@ -35,12 +35,12 @@ import freemarker.template.TemplateException;
 /**
  * A framework that makes it simpler to send email messages with a body built
  * from a Freemarker template.
- * 
+ *
  * The template must call the @email directive, which may provide the subject
  * line, the HTML content, and the plain text content. If these values are not
  * provided by the directive, they default to empty strings, or to values that
  * were set by the controller.
- * 
+ *
  * @see EmailDirective
  */
 public class FreemarkerEmailMessage {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/FileServingHelper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/FileServingHelper.java
index 6b85229b8..a48ebeebe 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/FileServingHelper.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/FileServingHelper.java
@@ -19,7 +19,7 @@ public class FileServingHelper {
 	private static final Log log = LogFactory.getLog(FileServingHelper.class);
 
 	public static final String PROPERTY_DEFAULT_NAMESPACE = "Vitro.defaultNamespace";
-	
+
 	private static final String DEFAULT_PATH = "/individual/";
 	private static final String FILE_PATH = "/file/";
 	private static boolean warned; // Only issue the warning once.
@@ -59,7 +59,7 @@ public class FileServingHelper {
 	 * URL, replacing it with the file prefix, and adding the filename to the
 	 * end.
 	 * </p>
-	 * 
+	 *
 	 * @return <ul>
 	 *         <li>the translated URL, if the URI was in the default namespace,</li>
 	 *         <li>the original URI, if it wasn't in the default namespace,</li>
@@ -105,7 +105,7 @@ public class FileServingHelper {
 	 * This should involve removing the filename from the end of the URL, and
 	 * replacing the file prefix with the default namespace.
 	 * </p>
-	 * 
+	 *
 	 * @return the URI, or {@code null} if the URL couldn't be translated.
 	 */
 	public static String getBytestreamUri(String path, ServletContext ctx) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/TempFileHolder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/TempFileHolder.java
index 8ad13e100..31c7147fb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/TempFileHolder.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/TempFileHolder.java
@@ -33,7 +33,7 @@ public class TempFileHolder implements HttpSessionBindingListener {
 	/**
 	 * Create a  holding the given {@link FileInfo}, and
 	 * attach it to the session with the given attribute name.
-	 * 
+	 *
 	 * If an attribute with this name already exists, it is replaced.
 	 */
 	public static void attach(HttpSession session, String attributeName,
@@ -55,7 +55,7 @@ public class TempFileHolder implements HttpSessionBindingListener {
 	 * Get the  which is stored as an attribute on this
 	 * session, extract the {@link FileInfo} from it, and remove it from the
 	 * session.
-	 * 
+	 *
 	 * If there is no such attribute, of if it is not a ,
 	 * return null.
 	 */
@@ -126,7 +126,7 @@ public class TempFileHolder implements HttpSessionBindingListener {
 			return;
 		}
 
-		FileStorage fs = ApplicationUtils.instance().getFileStorage(); 
+		FileStorage fs = ApplicationUtils.instance().getFileStorage();
 		try {
 			fs.deleteFile(fileInfo.getBytestreamUri());
 			log.debug("Deleted file " + fileInfo);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/UploadedFileHelper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/UploadedFileHelper.java
index fb4367ed4..5f68c93ed 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/UploadedFileHelper.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/UploadedFileHelper.java
@@ -53,7 +53,7 @@ public class UploadedFileHelper {
 	/**
 	 * We have a filename, a mimetype, and some content. Create a file in the
 	 * file storage system and in the model.
-	 * 
+	 *
 	 * @return information about the newly created file.
 	 */
 	public FileInfo createFile(String filename, String mimeType,
@@ -129,7 +129,7 @@ public class UploadedFileHelper {
 	 * If this Individual has an image, remove it and the thumbnail. If the
 	 * image file and/or the thumbnail file have no other references, delete
 	 * them.
-	 * 
+	 *
 	 * Note: after this operation, entity is stale.
 	 */
 	public void removeMainImage(Individual entity) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/impl/FileStorageHelper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/impl/FileStorageHelper.java
index 766d50a8d..7ee7d18c8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/impl/FileStorageHelper.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/impl/FileStorageHelper.java
@@ -283,9 +283,9 @@ public class FileStorageHelper {
 	private static String excludeWindowsWordsFromPath(String rawPath) {
 		String path = rawPath.replace(File.separatorChar, '/');
 		String[] parts = path.split("/");
-		
+
 		StringBuilder newPath = new StringBuilder();
-		
+
 		for (int i = 0; i < parts.length; i++) {
 			String part = excludeWindowsReservedNames(parts[i]);
 			if (i > 0) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/impl/FileStorageImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/impl/FileStorageImpl.java
index 91534e7a5..8e0b8d5f2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/impl/FileStorageImpl.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/impl/FileStorageImpl.java
@@ -45,7 +45,7 @@ public class FileStorageImpl {
 	 * How often to we insert path separator characters?
 	 */
 	public static final int SHORTY_LENGTH = 3;
-	
+
 
 	private static final Log log = LogFactory.getLog(FileStorageImpl.class);
 
@@ -62,7 +62,7 @@ public class FileStorageImpl {
 	 * Use the arguments to create an instance. If the base directory is empty,
 	 * initialize it. Otherwise, check that it was initialized to the same
 	 * namespaces.
-	 * 
+	 *
 	 * @throws IllegalArgumentException
 	 *             if the configuration property doesn't point to an existing,
 	 *             writeable directory.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/impl/package-info.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/impl/package-info.java
index a8644cd35..693388bf6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/impl/package-info.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/impl/package-info.java
@@ -249,4 +249,4 @@
  * 		edu.cornell.mannlib.vitro.webapp.filestorage.impl.FileStorageHelperTest
  * 	</pre>
  */
-package edu.cornell.mannlib.vitro.webapp.filestorage.impl;
\ No newline at end of file
+package edu.cornell.mannlib.vitro.webapp.filestorage.impl;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/model/ImageInfo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/model/ImageInfo.java
index 190d59e8c..34a05d239 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/model/ImageInfo.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filestorage/model/ImageInfo.java
@@ -15,9 +15,9 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
  */
 public class ImageInfo {
 	private static final Log log = LogFactory.getLog(ImageInfo.class);
-	
+
 	public static final ImageInfo EMPTY_IMAGE_INFO = emptyInstance();
-	
+
 	// ----------------------------------------------------------------------
 	// static Factory methods.
 	// ----------------------------------------------------------------------
@@ -29,7 +29,7 @@ public class ImageInfo {
 		FileInfo emptyFileInfo = new FileInfo.Builder().build();
 		return new ImageInfo(emptyFileInfo, emptyFileInfo);
 	}
-	
+
 	/**
 	 * If this Individual has a main image and a thumbnail, return their info.
 	 * Otherwise, return null.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CachingResponseFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CachingResponseFilter.java
index 02cc0706d..93c86ad9d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CachingResponseFilter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CachingResponseFilter.java
@@ -37,34 +37,34 @@ import edu.cornell.mannlib.vitro.webapp.utils.searchengine.SearchResultsParser;
 
 /**
  * Assist in cache management for individual profile pages.
- * 
+ *
  * Must be enabled in runtime.properties.
- * 
+ *
  * Only works for users who are not logged in.
- * 
+ *
  * The search index must be configured to keep an ETAG on each individual's
  * record. The ETAG is a hash of the record's content and is updated each time
  * the individual is re-indexed.
- * 
+ *
  * But this ETAG is not sufficient, since the page may have different versions
  * for different languages. So we append a hash of the Locales from the request
  * to the ETAG to make it unique. NOTE: If we allow users to choose their
  * preferred languages, the LocalSelectionFilter must execute before this one.
- * 
+ *
  * When an external cache (e.g. Squid) is asked for an individual's profile
  * page, it will ask VIVO whether the version in the cache is still current, and
  * to provide a new version if it is not. This is a conditional request.
- * 
+ *
  * When a conditional request is received, this filter will check to see whether
  * the request is on behalf of a logged-in user. If so, a fresh response is
  * generated, with a Cache-Control header that should prevent the cache from
  * storing that response.
- * 
+ *
  * If the requesting user is not logged in, this filter will ask the search
  * engine for the ETAG on the requested individual. If it is the same as the
  * ETAG supplied by the cache in the request, then the response is 304 Not
  * Modified. Otherwise, a fresh response is generated.
- * 
+ *
  * An unconditional request may mean that there is no external cache, or that
  * the cache doesn't have a copy of this particular page.
  */
@@ -183,11 +183,11 @@ public class CachingResponseFilter implements Filter {
 	/**
 	 * This rejects some of the requests as being obviously not individuals, and
 	 * then assumes that the last part of any request is a Localname.
-	 * 
+	 *
 	 * This is not always true, of course, but it will work because we will
 	 * prepend the default namespace and look for the resulting "URI" in the URI
 	 * field of the search index. If we find it there, then it is valid.
-	 * 
+	 *
 	 * If we were to make this more rigorous, it would reduce the number of
 	 * unnecessary searches.
 	 */
@@ -211,16 +211,16 @@ public class CachingResponseFilter implements Filter {
 	/**
 	 * Requests for profile pages come in many forms, but we can still narrow
 	 * them down.
-	 * 
+	 *
 	 * Eliminate CSS files, JavaScript files, and images.
-	 * 
+	 *
 	 * That leaves these acceptable forms:
-	 * 
+	 *
 	 * <pre>
 	 *     /individual?uri=urlencodedURI
 	 *     /individual?netId=bdc34
 	 *     /individual?netid=bdc34
-	 *     /individual/localname         
+	 *     /individual/localname
 	 *     /display/localname
 	 *     /individual/localname/localname.rdf
 	 *     /individual/localname/localname.n3
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CharsetEncodingFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CharsetEncodingFilter.java
index f801a3c82..6aceb3d40 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CharsetEncodingFilter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/CharsetEncodingFilter.java
@@ -48,7 +48,7 @@ public class CharsetEncodingFilter implements Filter {
 		if (servletResponse.getContentType() != null) {
 			return;
 		}
-		
+
 		String uri = req.getRequestURI();
 		if (!hasExtension(uri)) {
 			servletResponse.setContentType("text/html;charset=UTF-8");
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/ClickjackFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/ClickjackFilter.java
index 1846db2f0..ce93d9ec5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/ClickjackFilter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/ClickjackFilter.java
@@ -17,7 +17,7 @@ import javax.servlet.http.HttpServletResponse;
 /**
  * Add X-FRAME-OPTIONS response header to tell IE8 (and any other browsers who
  * decide to implement) not to display this content in a frame.
- * 
+ *
  * For details, refer to
  * http://blogs.msdn.com/sdl/archive/2009/02/05/clickjacking-defense-in-ie8.aspx,
  * https://www.owasp.org/index.php/ClickjackFilter_for_Java_EE
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/ModelSwitcher.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/ModelSwitcher.java
index 3fdcfbb2e..7c0813275 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/ModelSwitcher.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/ModelSwitcher.java
@@ -44,7 +44,7 @@ public class ModelSwitcher {
 	private static final Log log = LogFactory.getLog(ModelSwitcher.class);
 
 	/**
-	 * Are they authorized for whatever models they are asking for? 
+	 * Are they authorized for whatever models they are asking for?
 	 */
 	public static boolean authorizedForSpecialModel(HttpServletRequest req) {
 		if (isParameterPresent(req, SWITCH_TO_DISPLAY_MODEL)) {
@@ -63,9 +63,9 @@ public class ModelSwitcher {
 	}
 
 	private static boolean isParameterPresent(HttpServletRequest req, String key) {
-		return StringUtils.isNotEmpty(req.getParameter(key)); 
+		return StringUtils.isNotEmpty(req.getParameter(key));
 	}
-	
+
 	/**
 	 * Check if special model is requested - this is for enabling the use of a different
 	 * model for menu management. Also enables the use of a completely different
@@ -75,7 +75,7 @@ public class ModelSwitcher {
     	ServletContext _context = vreq.getSession().getServletContext();
         //TODO: Does the dataset in the vreq get set when using a special WDF? Does it need to?
         //TODO: Does the unfiltered WDF get set when using a special WDF? Does it need to?
-        
+
     	// If this isn't a Jena WADF, then there's nothing to be done.
     	if (!(inputWadf instanceof WebappDaoFactoryJena)) {
     		log.warn("Can't set special models: " +
@@ -85,43 +85,43 @@ public class ModelSwitcher {
     	}
 
     	WebappDaoFactoryJena wadf = (WebappDaoFactoryJena) inputWadf;
-    	
+
     	// If they asked for the display model, give it to them.
 		if (isParameterPresent(vreq, SWITCH_TO_DISPLAY_MODEL)) {
 			OntModel mainOntModel = ModelAccess.on(_context).getOntModel(DISPLAY);
 			OntModel tboxOntModel = ModelAccess.on(_context).getOntModel(DISPLAY_TBOX);
 	   		setSpecialWriteModel(vreq, mainOntModel);
-	   		
+
 	   		vreq.setAttribute(VitroRequest.ID_FOR_ABOX_MODEL, VitroModelSource.ModelName.DISPLAY.toString());
 	   		vreq.setAttribute(VitroRequest.ID_FOR_TBOX_MODEL, VitroModelSource.ModelName.DISPLAY_TBOX.toString());
 	   		vreq.setAttribute(VitroRequest.ID_FOR_DISPLAY_MODEL, VitroModelSource.ModelName.DISPLAY_DISPLAY.toString());
 	   		vreq.setAttribute(VitroRequest.ID_FOR_WRITE_MODEL, VitroModelSource.ModelName.DISPLAY.toString());
-	   		
+
 			return createNewWebappDaoFactory(wadf, mainOntModel, tboxOntModel, null);
 		}
-    	
+
 		// If they asked for other models by URI, set them.
 		if (anyOtherSpecialProperties(vreq)) {
-	    	OntModel mainOntModel = createSpecialModel(vreq, USE_MODEL_PARAM);	    	
+	    	OntModel mainOntModel = createSpecialModel(vreq, USE_MODEL_PARAM);
 	    	OntModel tboxOntModel = createSpecialModel(vreq, USE_TBOX_MODEL_PARAM);
 	    	OntModel displayOntModel = createSpecialModel(vreq, USE_DISPLAY_MODEL_PARAM);
-	    	
+
 	    	vreq.setAttribute(VitroRequest.ID_FOR_ABOX_MODEL, vreq.getParameter(USE_MODEL_PARAM));
 	    	vreq.setAttribute(VitroRequest.ID_FOR_WRITE_MODEL, vreq.getParameter(USE_MODEL_PARAM));
             vreq.setAttribute(VitroRequest.ID_FOR_TBOX_MODEL, vreq.getParameter(USE_TBOX_MODEL_PARAM));
-            vreq.setAttribute(VitroRequest.ID_FOR_DISPLAY_MODEL, vreq.getParameter(USE_DISPLAY_MODEL_PARAM));            
-            
+            vreq.setAttribute(VitroRequest.ID_FOR_DISPLAY_MODEL, vreq.getParameter(USE_DISPLAY_MODEL_PARAM));
+
 	   		setSpecialWriteModel(vreq, mainOntModel);
 	    	return createNewWebappDaoFactory(wadf, mainOntModel, tboxOntModel, displayOntModel);
 		}
-		
+
 		// Otherwise, there's nothing special about this request.
     	removeSpecialWriteModel(vreq);
 		return wadf;
 
     }
 
-	private void setSpecialWriteModel(VitroRequest vreq, OntModel mainOntModel) {	    
+	private void setSpecialWriteModel(VitroRequest vreq, OntModel mainOntModel) {
 		if (mainOntModel != null) {
 			((RequestModelAccessImpl) ModelAccess.on(vreq)).setSpecialWriteModel(mainOntModel);
 			vreq.setAttribute(SPECIAL_WRITE_MODEL, mainOntModel);
@@ -133,21 +133,21 @@ public class ModelSwitcher {
 			vreq.removeAttribute(SPECIAL_WRITE_MODEL);
 		}
 	}
-	
+
 	/**
 	 * The goal here is to return a new WDF that is set to
 	 * have the mainOntModel as its ABox, the tboxOntModel as it
 	 * TBox and displayOntModel as it display model.
-	 * 
-	 * Right now this is achieved by creating a copy of 
+	 *
+	 * Right now this is achieved by creating a copy of
 	 * the WADF, and setting the special models onto it.
-	 *  
+	 *
 	 * If a model is null, it will have no effect.
 	 */
 	private WebappDaoFactory createNewWebappDaoFactory(
 			WebappDaoFactoryJena inputWadf, OntModel mainOntModel,
 			OntModel tboxOntModel, OntModel displayOntModel) {
-	    
+
 		WebappDaoFactoryJena wadfj = new WebappDaoFactoryJena(inputWadf);
 		wadfj.setSpecialDataModel(mainOntModel, tboxOntModel, displayOntModel);
 		return wadfj;
@@ -156,7 +156,7 @@ public class ModelSwitcher {
 	/**
 	 * If the request asks for a special model by URI, create it from the
 	 * Database.
-	 * 
+	 *
 	 * @return the model they asked for, or null if they didn't ask for one.
 	 * @throws IllegalStateException
 	 *             if it's not found.
@@ -165,9 +165,9 @@ public class ModelSwitcher {
 		if (!isParameterPresent(vreq, key)) {
 			return null;
 		}
-		
+
 		String modelUri = vreq.getParameter(key);
-		
+
 		OntModel ont = findModelInRdfService(vreq, modelUri, CONFIGURATION);
 		if (ont == null) {
 			ont = findModelInRdfService(vreq, modelUri, CONTENT);
@@ -186,7 +186,7 @@ public class ModelSwitcher {
 			if (!rdfService.getGraphURIs().contains(modelUri)) {
 				return null;
 			}
-			
+
 			Model m = new RDFServiceDataset(rdfService).getNamedModel(modelUri);
 			return ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, m);
 		} catch (Exception e) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java
index 3dd4f0b95..d956483f6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java
@@ -28,89 +28,89 @@ import edu.cornell.mannlib.vitro.webapp.dao.PageDao;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 /**
  * This filter is intended to route requests to pages defined in the display model.
- * 
+ *
  * It should be last in the chain of filters since it will not call filters further
  * down the chain.
- * 
+ *
  * It should only be applied to requests, not forwards, includes or errors.
  */
 @WebFilter(filterName = "PageRoutingFilter", urlPatterns = {"/*"}, dispatcherTypes = {DispatcherType.REQUEST})
 public class PageRoutingFilter implements Filter{
     protected FilterConfig filterConfig;
-    
+
     private final static Log log = LogFactory.getLog( PageRoutingFilter.class);
-        
+
     protected final static String URL_PART_PATTERN = "(/[^/]*).*";
     protected final static String PAGE_CONTROLLER_NAME = "PageController";
     protected final static String HOME_CONTROLLER_NAME = "HomePageController";
-    
-    protected final Pattern urlPartPattern = Pattern.compile(URL_PART_PATTERN);    
-    
+
+    protected final Pattern urlPartPattern = Pattern.compile(URL_PART_PATTERN);
+
     @Override
     public void init(FilterConfig arg0) throws ServletException {
-        this.filterConfig = arg0;    
+        this.filterConfig = arg0;
         log.debug("pageRoutingFilter setup");
     }
-    
+
     @Override
-    public void doFilter(ServletRequest arg0, ServletResponse arg1, FilterChain chain) 
-        throws IOException, ServletException {        
+    public void doFilter(ServletRequest arg0, ServletResponse arg1, FilterChain chain)
+        throws IOException, ServletException {
         ServletContext ctx = filterConfig.getServletContext();
-        
-		PageDao pageDao = ModelAccess.on(ctx).getWebappDaoFactory().getPageDao();        
+
+		PageDao pageDao = ModelAccess.on(ctx).getWebappDaoFactory().getPageDao();
         Map<String,String> urlMappings = pageDao.getPageMappings();
-        
+
         // get URL without hostname or servlet context
         HttpServletResponse response = (HttpServletResponse) arg1;
-        HttpServletRequest req = (HttpServletRequest) arg0;        
+        HttpServletRequest req = (HttpServletRequest) arg0;
         String path = req.getRequestURI().substring(req.getContextPath().length());
-        
+
         // check for first part of path
         // ex. /hats/superHat -> /hats
         Matcher m = urlPartPattern.matcher(path);
         if( m.matches() && m.groupCount() >= 1){
-            String path1stPart = m.group(1);            
+            String path1stPart = m.group(1);
             String pageUri = urlMappings.get(path1stPart);
-            
+
             //try it with a leading slash?
             if( pageUri == null )
-                pageUri = urlMappings.get("/"+path1stPart);            
-            
+                pageUri = urlMappings.get("/"+path1stPart);
+
             if( pageUri != null && ! pageUri.isEmpty() ){
                 log.debug(path + "is a request to a page defined in the display model as " + pageUri );
-                		
+
                 //add the pageUri to the request scope for use by the PageController
                 PageController.putPageUri(req, pageUri);
-                
+
                 //This will send requests to HomePageController or PageController
-                String controllerName = getControllerToForwardTo(req, pageUri, pageDao);            
+                String controllerName = getControllerToForwardTo(req, pageUri, pageDao);
                 log.debug(path + " is being forwarded to controller " + controllerName);
-                
+
                 RequestDispatcher rd = ctx.getNamedDispatcher( controllerName );
                 if( rd == null ){
                     log.error(path + " should be forwarded to controller " + controllerName + " but there " +
                     		"is no servlet named that defined for the web application in web.xml");
                     //TODO: what should be done in this case?
                 }
-                
+
                 rd.forward(req, response);
             }else if( "/".equals( path ) || path.isEmpty() ){
                 log.debug("url '" +path + "' is being forward to home controller" );
-                RequestDispatcher rd = ctx.getNamedDispatcher( HOME_CONTROLLER_NAME );            
+                RequestDispatcher rd = ctx.getNamedDispatcher( HOME_CONTROLLER_NAME );
                 rd.forward(req, response);
             }else{
                 doNonDisplayPage(path,arg0,arg1,chain);
             }
         }else{
-            doNonDisplayPage(path,arg0,arg1,chain);    
-        }        
+            doNonDisplayPage(path,arg0,arg1,chain);
+        }
     }
-    
+
     protected void doNonDisplayPage(String path, ServletRequest arg0, ServletResponse arg1, FilterChain chain) throws IOException, ServletException{
         log.debug(path + "this isn't a request to a page defined in the display model, handle it normally.");
-        chain.doFilter(arg0, arg1);    
+        chain.doFilter(arg0, arg1);
     }
-    
+
     protected String getControllerToForwardTo(HttpServletRequest req,
             String pageUri, PageDao pageDao) {
         String homePageUri = pageDao.getHomePageUri();
@@ -122,6 +122,6 @@ public class PageRoutingFilter implements Filter{
 
     @Override
     public void destroy() {
-       //nothing to do here        
+       //nothing to do here
     }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/RequestLoggerFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/RequestLoggerFilter.java
index 52dc76aa2..b24deae4a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/RequestLoggerFilter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/RequestLoggerFilter.java
@@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory;
 public class RequestLoggerFilter implements Filter {
 
 	private static final Log log = LogFactory.getLog(RequestLoggerFilter.class);
-	
+
 	public void destroy() {
 		// TODO Auto-generated method stub
 
@@ -45,7 +45,7 @@ public class RequestLoggerFilter implements Filter {
 			}
 		} catch (Exception e) {
 			// This shouldn't really happen, but if it does, we'll be ready for it.
-		} finally {		
+		} finally {
 			filterChain.doFilter(request, response);
 		}
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java
index 6c9c55e8e..84aa831ed 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/RequestModelsPrep.java
@@ -29,7 +29,7 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
  * This used to set up a lot of request-based objects. Now, most of them are
  * obtained through ModelAccess, which does not require setup here. However, it
  * does require teardown.
- * 
+ *
  * This is done in a filter, so it applies to both Servlets and JSPs.
  */
 @WebFilter(filterName = "RequestModelsPrep", urlPatterns = {"/*"}, dispatcherTypes = {DispatcherType.REQUEST, DispatcherType.FORWARD})
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java
index c82d2f0ef..ae900957f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java
@@ -34,7 +34,7 @@ import freemarker.template.TemplateException;
  * No matter what URL is requested, check to see whether the StartupStatus
  * contains errors or warnings. If it does, hijack the request to show the
  * StartupStatus display page.
- * 
+ *
  * If the status only contains warnings, this only happens once. Subsequent
  * requests will display normally. However, if the status contains a fatal
  * error, this filter will hijack every request, and will not let you proceed.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewriterFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewriterFilter.java
index 7f79879c8..bcfe8e184 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewriterFilter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewriterFilter.java
@@ -28,14 +28,14 @@ import javax.servlet.http.HttpServletResponse;
 public class URLRewriterFilter implements Filter {
 
 	private ServletContext _context;
-	
+
 	public void destroy() {
 		// Nothing to do here
 	}
 
 	public void doFilter(ServletRequest request, ServletResponse response,
 			FilterChain chain) throws IOException, ServletException {
-		
+
 		if (response instanceof HttpServletResponse) {
 			chain.doFilter(request, new URLRewritingHttpServletResponse((HttpServletResponse)response,(HttpServletRequest)request,_context));
 		} else {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponse.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponse.java
index e3c7a7297..15141337c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponse.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponse.java
@@ -24,13 +24,13 @@ import edu.cornell.mannlib.vitro.webapp.utils.NamespaceMapperFactory;
 public class URLRewritingHttpServletResponse extends HttpServletResponseWrapper/*implements HttpServletResponse */{
 
 	private final static Log log = LogFactory.getLog(URLRewritingHttpServletResponse.class);
-	
+
 	private HttpServletResponse _response;
 	private ServletContext _context;
 	private WebappDaoFactory wadf;
 	private int contextPathDepth;
 	private Pattern slashPattern = Pattern.compile("/");
-	
+
 	public URLRewritingHttpServletResponse(HttpServletResponse response, HttpServletRequest request, ServletContext context) {
 	    super(response);
 		this._response = response;
@@ -38,12 +38,12 @@ public class URLRewritingHttpServletResponse extends HttpServletResponseWrapper/
 		this.wadf =	ModelAccess.on(context).getWebappDaoFactory();
 		this.contextPathDepth = slashPattern.split(request.getContextPath()).length-1;
 	}
-		
+
 	/** for testing. */
 	protected URLRewritingHttpServletResponse(HttpServletResponse res){
 	    super(res);
 	}
-	
+
 	/**
 	 * @deprecated
 	 */
@@ -54,7 +54,7 @@ public class URLRewritingHttpServletResponse extends HttpServletResponseWrapper/
 	public String encodeRedirectURL(String arg0) {
 		return _response.encodeRedirectURL(arg0);
 	}
-	
+
 	/**
 	 * @deprecated
 	 */
@@ -75,7 +75,7 @@ public class URLRewritingHttpServletResponse extends HttpServletResponseWrapper/
             log.debug("externallyLinkedNamespaces " + externallyLinkedNamespaces);
             log.debug( inUrl );
         }
-        
+
 	    String encodedUrl = encodeForVitro(
 	            inUrl,
 	            this.getCharacterEncoding(),
@@ -85,20 +85,20 @@ public class URLRewritingHttpServletResponse extends HttpServletResponseWrapper/
 	            wadf.getDefaultNamespace(),
 	            externallyLinkedNamespaces
 	            );
-	    
+
 	    log.debug(encodedUrl);
 	    log.debug("END");
 	    return encodedUrl;
 	}
-	
+
 	/**
-	 * bdc34: Isolating this method for unit 
-	 * testing purposes.  This method should not use 
-	 * any object properties, only objects passed into method. 
+	 * bdc34: Isolating this method for unit
+	 * testing purposes.  This method should not use
+	 * any object properties, only objects passed into method.
 	 */
 	protected String encodeForVitro(
-	        String inUrl, 
-	        String characterEncoding, 
+	        String inUrl,
+	        String characterEncoding,
 	        Boolean isSInglePortal,
 	        int contextPathDepth,
 	        NamespaceMapper nsMap,
@@ -112,19 +112,19 @@ public class URLRewritingHttpServletResponse extends HttpServletResponseWrapper/
 			if (url.host != null) {
 				// if it's not an in-context URL, we don't want to mess with it
 				// It looks like encodeURL isn't even called for external URLs
-			    //String rv = _response.encodeURL(inUrl); 
+			    //String rv = _response.encodeURL(inUrl);
 	            String rv = inUrl;
 			    if( log.isDebugEnabled()){
 			        log.debug("Encoded as  '"+rv+"'");
 			    }
 				return rv;
 			}
-			
+
 			// rewrite "entity" as "individual"
 			if ("entity".equals(url.pathParts.get(url.pathParts.size()-1))) {
 				url.pathParts.set(url.pathParts.size()-1, "individual");
 			}
-			
+
 			// rewrite individual URI parameters as pretty URLs if possible
 			if ("individual".equals(url.pathParts.get(url.pathParts.size()-1))) {
 				Iterator<String[]> qpIt = url.queryParams.iterator();
@@ -138,7 +138,7 @@ public class URLRewritingHttpServletResponse extends HttpServletResponseWrapper/
 							IndividualImpl uri = new IndividualImpl(keyAndValue[1]);
 							String namespace = uri.getNamespace();
 							String localName = uri.getLocalName();
-							if ( (namespace != null) && (localName != null) ) { 
+							if ( (namespace != null) && (localName != null) ) {
 								String prefix = nsMap.getPrefixForNamespace(namespace);
 								if (defaultNamespace.equals(namespace) && prefix == null) {
 									// make a URI that matches the URI
@@ -147,7 +147,7 @@ public class URLRewritingHttpServletResponse extends HttpServletResponseWrapper/
 									url.pathParts.add(localName);
 									// remove the ugly uri parameter
 									indexToRemove = qpIndex;
-							    // namespace returned from URIImpl.getNamespace() ends in a slash, so will 
+							    // namespace returned from URIImpl.getNamespace() ends in a slash, so will
 							    // match externally linked namespaces, which also end in a slash
 								} else if (isExternallyLinkedNamespace(namespace,externalNamespaces)) {
 								    log.debug("Found externally linked namespace " + namespace);
@@ -183,7 +183,7 @@ public class URLRewritingHttpServletResponse extends HttpServletResponseWrapper/
 				if (indexToRemove > -1) {
 					url.queryParams.remove(indexToRemove);
 				}
-	
+
 			}
 			//String rv = _response.encodeURL(_response.encodeURL(url.toString()));
 	         String rv = url.toString();
@@ -191,17 +191,17 @@ public class URLRewritingHttpServletResponse extends HttpServletResponseWrapper/
 			    log.debug("Encoded as  '" + rv + "'");
 			}
 			return rv;
-		} catch (Exception e) {			
-			log.error(e,e);			
+		} catch (Exception e) {
+			log.error(e,e);
             //String rv =  _response.encodeURL(inUrl);
 			String rv =  inUrl;
             log.error("Encoded as  '"+rv+"'");
 			return rv;
 		}
-	}	
-	
-	private boolean isExternallyLinkedNamespace(String namespace,List<String> externallyLinkedNamespaces) {	    
+	}
+
+	private boolean isExternallyLinkedNamespace(String namespace,List<String> externallyLinkedNamespaces) {
 	    return externallyLinkedNamespaces.contains(namespace);
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/VitroURL.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/VitroURL.java
index 386db34a7..33cdeee30 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/VitroURL.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/VitroURL.java
@@ -17,44 +17,44 @@ import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-/** 
+/**
  * Brian Caruso with changes contributed by David Cliff, 2010-11-03
  * Before 2010-11 this was a private class of URLRewritingHttpServletResponse.java.
- * 
+ *
  * Useful reference:
  * http://labs.apache.org/webarch/uri/rfc/rfc3986.html
  */
 class VitroURL {
-    // this is to get away from some of the 
+    // this is to get away from some of the
     // annoyingness of java.net.URL
     // and to handle general weirdness
-    
+
     private String characterEncoding;
-    
+
     public String protocol;
     public String host;
     public String port;
     public List<String> pathParts;
     public List<String[]> queryParams;
     public String fragment;
-    
+
     /**
      * Pattern to get the path and query of a relative URL
      * ex.
-     *   /entity -> /entity 
+     *   /entity -> /entity
      *   /entity?query=abc -> /entity query=abc
      */
     private Pattern pathPattern = Pattern.compile("([^\\?]*)\\??(.*)");
-    
+
     private Pattern commaPattern = Pattern.compile("/");
     private Pattern equalsSignPattern = Pattern.compile("=");
-    private Pattern ampersandPattern = Pattern.compile("&");          
+    private Pattern ampersandPattern = Pattern.compile("&");
     public  boolean pathBeginsWithSlash = false;
     public  boolean pathEndsInSlash = false;
     public  boolean wasXMLEscaped = false;
-    
+
     private final static Log log = LogFactory.getLog(VitroURL.class);
-    
+
     public VitroURL(String urlStr, String characterEncoding) {
         this.characterEncoding = characterEncoding;
         if (urlStr.indexOf("&amp;")>-1) {
@@ -71,7 +71,7 @@ class VitroURL {
             this.pathEndsInSlash = endsInSlash(url.getPath());
             this.queryParams = parseQueryParams(url.getQuery());
             this.fragment = url.getRef();
-        } catch (Exception e) { 
+        } catch (Exception e) {
             // Under normal circumstances, this is because the urlStr is relative
             // We'll assume that we just have a path and possibly a query string.
             // This is likely to be a bad assumption, but let's roll with it.
@@ -84,7 +84,7 @@ class VitroURL {
             }else{
                 //???
             }
-                         
+
             try {
                 this.pathParts = splitPath(URLDecoder.decode(getPath(urlStr),characterEncoding));
                 this.pathBeginsWithSlash = beginsWithSlash(urlParts[0]);
@@ -97,7 +97,7 @@ class VitroURL {
             }
         }
     }
-    
+
     private String getPath(String urlStr){
         Matcher m = pathPattern.matcher(urlStr);
         if( m.matches() )
@@ -105,8 +105,8 @@ class VitroURL {
         else
             return "";
     }
-    
-    
+
+
     private List<String> splitPath(String pathStr) {
         String[] splitStr = commaPattern.split(pathStr);
         if (splitStr.length>0) {
@@ -129,32 +129,32 @@ class VitroURL {
                 splitStr = temp;
             }
         }
-        // TODO: rewrite the chunk above with lists in mind. 
+        // TODO: rewrite the chunk above with lists in mind.
         List<String> strList = new ArrayList<String>();
         Collections.addAll(strList, splitStr);
         return strList;
-    }   
-    
+    }
+
     public boolean beginsWithSlash(String pathStr) {
         if (pathStr.length() == 0) {
             return false;
         }
         return (pathStr.charAt(0) == '/');
     }
-    
+
     public boolean endsInSlash(String pathStr) {
         if (pathStr.length() == 0) {
             return false;
         }
         return (pathStr.charAt(pathStr.length()-1) == '/');
     }
-    
-  
+
+
     /**
      * This is attempting to parse query parameters that might not be URLEncoded.
-     * This seems like a huge problem.  We will only correctly handle odd things 
+     * This seems like a huge problem.  We will only correctly handle odd things
      * as a query parameter 'uri' in the last position.
-     *  
+     *
      * @param queryStr Querst string
      */
     protected List<String[]> parseQueryParams(String queryStr) {
@@ -162,12 +162,12 @@ class VitroURL {
         if (queryStr == null) {
             return queryParamList;
         }
-      
+
         while ( queryStr.length() > 0 ){
             //remove leading & if there was one
             if( queryStr.startsWith("&"))
                 queryStr = queryStr.substring(1);
-            
+
             String[] simplepair = getSimpleQueryMatch(queryStr);
             if( simplepair != null ){
                 if( simplepair[1].contains("?") ){
@@ -179,7 +179,7 @@ class VitroURL {
                     }else{
                         throw new Error("Cannot parse query string for URL " +
                         		"queryParams: \"" + queryStr + "\" this only accepts " +
-                        	    "complex parameters in the final position with the key 'uri'."); 
+                        	    "complex parameters in the final position with the key 'uri'.");
                     }
                 }else{
                     queryParamList.add(simplepair);
@@ -198,13 +198,13 @@ class VitroURL {
         }
         return queryParamList;
     }
-    
+
     /** Query for simple query param at start of string. */
     private Pattern simpleQueryParamPattern = Pattern.compile("^([^\\=]*)=([^\\&]*)");
 
     /**
      * Check for a simple match in a queryParam.
-     * May return null.     
+     * May return null.
      */
     protected String[] getSimpleQueryMatch(String querystr){
         Matcher simpleMatch = simpleQueryParamPattern.matcher(querystr);
@@ -217,7 +217,7 @@ class VitroURL {
             return null;
         }
     }
-    
+
     private Pattern finalQueryParamPattern = Pattern.compile("^(uri)=(.*)");
     /**
      * Checks only for uri=.* as the last match of the queryParams.
@@ -233,9 +233,9 @@ class VitroURL {
         }else{
             return null;
         }
-        
+
     }
-    
+
     public String toString() {
         StringBuilder out = new StringBuilder();
             try {
@@ -275,7 +275,7 @@ class VitroURL {
                     if (keyAndValue.length>1) {
                         out.append(URLEncoder.encode(keyAndValue[1],characterEncoding));
                     }
-                    if (qpIt.hasNext()) { 
+                    if (qpIt.hasNext()) {
                         out.append("&");
                     }
                 }
@@ -288,5 +288,5 @@ class VitroURL {
             str = StringEscapeUtils.escapeXml(str);
         }
         return str;
-    }       
+    }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfiguration.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfiguration.java
index c25e5514c..c0ab92d25 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfiguration.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfiguration.java
@@ -44,15 +44,15 @@ import freemarker.template.TemplateModelException;
 
 /**
  * Access point for a singleton Configuration instance.
- * 
+ *
  * The instance is created at system startup, so we can fail early if there are
  * any problems.
- * 
+ *
  * The Configuration is slightly extended to hold request-based information in a
  * ThreadLocal. The net result is although there is only one configuration (and
  * hence only one template cache), each request gets a customization with its
  * own locale, etc.
- * 
+ *
  * Each time a request asks for the configuration, check to see whether the
  * cache is still valid, whether the theme has changed (needs a new
  * TemplateLoader), and whether the DeveloperSettings have changed (might need a
@@ -95,7 +95,7 @@ public abstract class FreemarkerConfiguration {
 	/**
 	 * Keep track of the theme directory. If it changes, create an appropriate
 	 * new TemplateLoader.
-	 * 
+	 *
 	 * Note that setting a new TemplateLoader on the context Configuration also
 	 * creates a new, empty TemplateCache.
 	 */
@@ -154,7 +154,7 @@ public abstract class FreemarkerConfiguration {
 
 		// TODO VIVO-243 Why is this here?
 		loaders.add(new ClassTemplateLoader(FreemarkerConfiguration.class, ""));
-		
+
 		TemplateLoader[] loaderArray = loaders
 				.toArray(new TemplateLoader[loaders.size()]);
 		TemplateLoader tl = new MultiTemplateLoader(loaderArray);
@@ -164,7 +164,7 @@ public abstract class FreemarkerConfiguration {
 		if (settings.getBoolean(Key.INSERT_FREEMARKER_DELIMITERS)) {
 			tl =  new DelimitingTemplateLoader(tl);
 		}
-		
+
 		return tl;
 	}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java
index bd108e255..10e2d9926 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java
@@ -39,26 +39,26 @@ import freemarker.template.utility.DeepUnwrap;
 /**
  * Extend the Freemarker Configuration class to include some information that is
  * particular to the current request.
- * 
+ *
  * A reference to the current request is not always available to the Freemarker
  * Configuration, so we take advantage of the fact that each request runs in a
  * separate thread, and store a reference to that request in a ThreadLocal
  * object.
- * 
+ *
  * Then, we override any methods that should return that request-based
  * information instead of (or in addition to) the common info.
- * 
+ *
  * Only the getters are overridden, not the setters. So if you call
  * setAllSharedVariables(), for example, it will have no effect on the
  * request-based information.
- * 
+ *
  * Notice that the reference to the current request is actually stored through a
  * WeakReference. This is because the ThreadLocal will not be cleared when the
  * webapp is stopped, so none of the references from that ThreadLocal are
  * eligible for garbage collection. If any of those references is an instance of
  * a class that is loaded by the webapp, then the webapp ClassLoader is not
  * eligible for garbage collection. This would be a huge memory leak.
- * 
+ *
  * Thanks to the WeakReference, the request is eligible for garbage collection
  * if nothing else refers to it. In theory, this means that the WeakReference
  * could return a null, but if the garbage collector has taken the request, then
@@ -141,7 +141,7 @@ public class FreemarkerConfigurationImpl extends Configuration {
 	/**
 	 * Override getTemplate(), so we can apply DataGetters to all included
 	 * templates.
-	 * 
+	 *
 	 * This won't work for top-level Templates, since the Environment hasn't
 	 * been created yet. When TemplateProcessingHelper creates the Environment,
 	 * it must call retrieveAndRunDataGetters() for the top-level Template.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/loader/FreemarkerTemplateLoader.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/loader/FreemarkerTemplateLoader.java
index 91fc55666..290304671 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/loader/FreemarkerTemplateLoader.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/loader/FreemarkerTemplateLoader.java
@@ -26,34 +26,34 @@ import freemarker.cache.TemplateLoader;
 
 /**
  * Loads Freemarker templates from a given directory.
- * 
+ *
  * Different from a file loader in two ways:
- * 
+ *
  * 1) Flattens the directory. When it searches for a template, it will look in
  * the base directory and in any sub-directories. While doing this, it ignores
  * any path that is attached to the template name.
- * 
+ *
  * So if you were to ask for 'admin/silly.ftl', it would search for 'silly.ftl'
  * in the base directory, and in any sub-directories, until it finds one.
- * 
+ *
  * 2) Accepts approximate matches on locales. When asked for a template, it will
  * accepts an approximate match that matches the basename and extension, and
  * language or region if specifed. So a search for a template with no language
  * or region will prefer an exact match, but will accept one with language or
  * both language and region.
- * 
+ *
  * <pre>
  * "this_es_MX.ftl" matches "this_es_MX.ftl"
  * "this_es.ftl"    matches "this_es.ftl" or "this_es_MX.ftl"
  * "this.ftl"       matches "this.ftl" or "this_es.ftl" or "this_es_MX.ftl"
  * </pre>
- * 
+ *
  * This allows Freemarker to mimic the behavior of the language filtering RDF
  * service, because if Freemarker does not find a match for "this_es_MX.ftl", it
  * will try again with "this_es.ftl" and "this.ftl". So the net effect is that a
  * search for "silly_es_MX.ftl" would eventually return any of these, in order
  * of preference:
- * 
+ *
  * <pre>
  * silly_es_MX.ftl
  * silly_es.ftl
@@ -61,7 +61,7 @@ import freemarker.cache.TemplateLoader;
  * silly.ftl
  * silly_*.ftl
  * </pre>
- * 
+ *
  * If more than one template file qualifies, we choose by best fit, shortest
  * path, and alphabetical order, to insure that identical requests produce
  * identical results.
@@ -126,7 +126,7 @@ public class FreemarkerTemplateLoader implements TemplateLoader {
 
 	/**
 	 * Ask the file when it was last modified.
-	 * 
+	 *
 	 * @param templateSource
 	 *            a File that was obtained earlier from findTemplateSource().
 	 */
@@ -138,7 +138,7 @@ public class FreemarkerTemplateLoader implements TemplateLoader {
 	/**
 	 * Get a Reader on this File. The framework will close the Reader after
 	 * reading it.
-	 * 
+	 *
 	 * @param templateSource
 	 *            a File that was obtained earlier from findTemplateSource().
 	 */
@@ -150,7 +150,7 @@ public class FreemarkerTemplateLoader implements TemplateLoader {
 
 	/**
 	 * Nothing to do here. No resources to free up.
-	 * 
+	 *
 	 * @param templateSource
 	 *            a File that was obtained earlier from findTemplateSource().
 	 */
@@ -221,7 +221,7 @@ public class FreemarkerTemplateLoader implements TemplateLoader {
 
 		/**
 		 * If I'm searching for this, is that an acceptable match?
-		 * 
+		 *
 		 * Note that this is asymetrical -- a search term without a region will
 		 * match a candidate with a region, but not vice versa. Same with
 		 * language.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java
index 4e31787ea..8f07f7301 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java
@@ -27,9 +27,9 @@ import edu.cornell.mannlib.vitro.webapp.utils.developer.Key;
 /**
  * Provides access to a bundle of text strings, based on the name of the bundle,
  * the Locale of the requesting browser, and the current theme directory.
- * 
+ *
  * If the bundle name is not specified, the default name of "all" is used.
- * 
+ *
  * If a requested bundle is not found, no error is thrown. Instead, an empty
  * bundle is returned that produces error message strings when asked for text.
  */
@@ -97,12 +97,12 @@ public class I18n {
 	 * Get an I18nBundle by this name. The request provides the preferred
 	 * Locale, the application directory, the theme directory and the
 	 * development mode flag.
-	 * 
+	 *
 	 * If the request indicates that the system is in development mode, then the
 	 * cache is cleared on each request.
-	 * 
+	 *
 	 * If the theme directory has changed, the cache is cleared.
-	 * 
+	 *
 	 * Declared 'protected' so it can be overridden in unit tests.
 	 */
 	protected I18nBundle getBundle(String bundleName, HttpServletRequest req) {
@@ -223,7 +223,7 @@ public class I18n {
 		/**
 		 * When creating the chain of acceptable Locales, include approximate
 		 * matches before giving up and using the root Locale.
-		 * 
+		 *
 		 * Check the list of supported Locales to see if any have the same
 		 * language but different region. If we find any, sort them and insert
 		 * them into the usual result list, just before the root Locale.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18nBundle.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18nBundle.java
index 131ec4f27..0d57cb8fd 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18nBundle.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18nBundle.java
@@ -13,7 +13,7 @@ import org.apache.commons.logging.LogFactory;
 /**
  * A wrapper for a ResourceBundle that will not throw an exception, no matter
  * what string you request.
- * 
+ *
  * If the ResourceBundle was not found, or if it doesn't contain the requested
  * key, an error message string is returned, to help the developer diagnose the
  * problem.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18nLogger.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18nLogger.java
index 3dd32a742..b17f1933e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18nLogger.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18nLogger.java
@@ -13,7 +13,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.developer.Key;
 /**
  * If enabled in developer mode, write a message to the log each time someone
  * asks for a language string.
- * 
+ *
  * The I18nBundle has a life span of one HTTP request, and so does this.
  */
 public class I18nLogger {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/VitroResourceBundle.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/VitroResourceBundle.java
index 0ec5fa7b9..8a8b0053c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/VitroResourceBundle.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/VitroResourceBundle.java
@@ -23,26 +23,26 @@ import org.apache.commons.logging.LogFactory;
 
 /**
  * Works like a PropertyResourceBundle with two exceptions:
- * 
+ *
  * It looks for the file in both the i18n directory of the theme and in the i18n
  * directory of the application. Properties found in the theme override those
  * found in the application.
- * 
+ *
  * It allows a property to take its contents from a file. File paths are
  * relative to the i18n directory. Again, a file in the theme will override one
  * in the application.
- * 
+ *
  * If a property has a value (after overriding) of "@@file &lt;filepath&gt;", the
  * bundle looks for the file relative to the i18n directory of the theme, then
  * relative to the i18n directory of the application. If the file is not found
  * in either location, a warning is written to the log and the property will
  * contain an error message for displayed.
- * 
+ *
  * Note that the filename is not manipulated for Locale, so the author of the
  * properties files must do it explicitly. For example:
- * 
+ *
  * In all.properties: account_email_html = @@file accountEmail.html
- * 
+ *
  * In all_es.properties: account_email_html = @@file accountEmail_es.html
  */
 public class VitroResourceBundle extends ResourceBundle {
@@ -75,17 +75,17 @@ public class VitroResourceBundle extends ResourceBundle {
 	 * Returns the bundle for the for foo_ba_RR, providing that
 	 * foo_ba_RR.properties exists in the I18n area of either the theme or the
 	 * application.
-	 * 
+	 *
 	 * If the desired file doesn't exist in either location, return null.
 	 * Usually, this does not indicate a problem but only that we were looking
 	 * for too specific a bundle. For example, if the base name of the bundle is
 	 * "all" and the locale is "en_US", we will likely return null on the search
 	 * for all_en_US.properties, and all_en.properties, but will return a full
 	 * bundle for all.properties.
-	 * 
+	 *
 	 * Of course, if all.properties doesn't exist either, then we have a
 	 * problem, but that will be reported elsewhere.
-	 * 
+	 *
 	 * @return the populated bundle or null.
 	 */
 	public static VitroResourceBundle getBundle(String bundleName,
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/freemarker/I18nMethodModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/freemarker/I18nMethodModel.java
index 19138959e..7dead7163 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/freemarker/I18nMethodModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/freemarker/I18nMethodModel.java
@@ -18,7 +18,7 @@ import freemarker.template.TemplateModelException;
 /**
  * This Freemarker method will produce a bundle of text strings. It is simply a
  * wrapper around I18n that produces a wrapped I18nBundle.
- * 
+ *
  * If the bundle name is not provided, the default bundle is assumed.
  */
 public class I18nMethodModel implements TemplateMethodModel {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/freemarker/I18nStringTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/freemarker/I18nStringTemplateModel.java
index 0861c326d..c7b129349 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/freemarker/I18nStringTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/freemarker/I18nStringTemplateModel.java
@@ -18,11 +18,11 @@ import freemarker.template.utility.DeepUnwrap;
  * A Freemarker representation of a text string. Because it implements
  * TemplateScalarModel, you can use it as a string value. And because it
  * implements TemplateMethodModel, you can pass arguments to it for formatting.
- * 
+ *
  * So if the string is "His name is {0}!", then these references could be used:
  * {@code
  * ${string} ==> "His name is {0}!"
- * 
+ *
  * ${string("Bozo")} ==> "His name is Bozo!"
  * }
  * Note that the format of the message is determined by java.text.MessageFormat,
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionController.java
index b1845b7a1..de9d52c88 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionController.java
@@ -24,16 +24,16 @@ import edu.cornell.mannlib.vitro.webapp.i18n.I18n;
 /**
  * {@code
  * Call this at /selectLocale&selection=[locale_string]
- * 
+ *
  * For example: /selectLocale&selection=en_US or /selectLocale&selection=es
  * }
  * Write an error to the log (and to DisplayMessage) if the selection is not
  * syntactically valid.
- * 
+ *
  * Write a warning to the log if the selection code is not one of the selectable
  * Locales from runtime.properties, or if the selection code is not recognized
  * by the system.
- * 
+ *
  * Set the new Locale in the Session using SelectedLocale and return to the
  * referrer.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionDataGetter.java
index 15015beac..3fd949e87 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionDataGetter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionDataGetter.java
@@ -20,15 +20,15 @@ import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.DataGetter;
 /**
  * Get the data for the selectable Locales, so the Freemarker template can
  * create a row of flag images that will select the desired locale.
- * 
+ *
  * If there are no selectable Locales in runtime.properties, we return an empty
  * map. (selectLocale?? will return false)
- * 
+ *
  * If the Locale has been forced by runtime.properties, we do the same.
- * 
+ *
  * If there are selectable Locales, the returned map will contain a structure
  * like this:
- * 
+ *
  * <pre>
  * {selectLocale={
  *   selectLocaleUrl = [the URL for the form action to select a Locale]
@@ -39,7 +39,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.DataGetter;
  *         imageUrl =      [the URL of the image that represents the Locale]
  *         selected =      [true, if this locale is currently selected]
  *       }
- *     }  
+ *     }
  *   }
  * }
  * </pre>
@@ -94,5 +94,5 @@ public class LocaleSelectionDataGetter implements DataGetter {
 		map.put("selected", currentLocale.equals(locale));
 		return map;
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionFilter.java
index 07e68c9a8..39a574daf 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionFilter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionFilter.java
@@ -24,10 +24,10 @@ import org.apache.commons.logging.LogFactory;
 /**
  * Check for a Locale in the ServletContext or the Session that should override
  * the Locale in the ServletRequest.
- * 
+ *
  * If there is such a Locale, wrap the ServletRequest so it behaves as if that
  * is the preferred Locale.
- * 
+ *
  * Otherwise, just process the request as usual.
  */
 @WebFilter(filterName = "Locale selection filter", urlPatterns = {"/*"})
@@ -86,7 +86,7 @@ public class LocaleSelectionFilter implements Filter {
 				throw new NullPointerException(
 						"selectedLocale may not be null.");
 			}
-			
+
 			this.selectedLocale = selectedLocale;
 		}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java
index bb8df65cf..6530d8aff 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java
@@ -19,7 +19,7 @@ import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 /**
  * Check the ConfigurationProperties for a forced locale, or for a
  * comma-separate list of selectable locales.
- * 
+ *
  * Create the appropriate Locale objects and store them in the ServletContext.
  */
 public class LocaleSelectionSetup implements ServletContextListener {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectorUtilities.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectorUtilities.java
index af0f2bd13..111181574 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectorUtilities.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectorUtilities.java
@@ -23,14 +23,14 @@ public class LocaleSelectorUtilities {
 	/**
 	 * Look in the current theme directory to find a selection image for this
 	 * Locale.
-	 * 
+	 *
 	 * Images are expected at a resource path like
 	 * /[themeDir]/i18n/images/select_locale_[locale_code].*
-	 * 
+	 *
 	 * For example, /themes/wilma/i18n/images/select_locale_en.png
 	 * /themes/wilma/i18n/images/select_locale_en.JPEG
 	 * /themes/wilma/i18n/images/select_locale_en.gif
-	 * 
+	 *
 	 * To create a proper URL, prepend the context path.
 	 */
 	public static String getImageUrl(VitroRequest vreq, Locale locale)
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/SelectedLocale.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/SelectedLocale.java
index 9f7e93ab6..4605436a4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/SelectedLocale.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/SelectedLocale.java
@@ -16,7 +16,7 @@ import org.apache.commons.logging.LogFactory;
 
 /**
  * A utility class for storing and retrieving Locale information.
- * 
+ *
  * The static methods create beans and store them in the ServletContext or the
  * session, where the information can be found later.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/imageprocessor/imageio/IIOImageProcessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/imageprocessor/imageio/IIOImageProcessor.java
index 455a3f601..b4de2abd9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/imageprocessor/imageio/IIOImageProcessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/imageprocessor/imageio/IIOImageProcessor.java
@@ -27,19 +27,19 @@ import com.twelvemonkeys.image.ResampleOp;
 /**
  * Crop the main image as specified, and scale it to the correct size for a
  * thumbnail.
- * 
+ *
  * Use the JAI library to read the file because the javax.imageio package
  * doesn't read extended JPEG properly. Use JAI to remove transparency from
  * JPEGs and PNGs, simply by removing the alpha channel. Annoyingly, this will
  * not work with GIFs with transparent pixels.
- * 
+ *
  * The transforms in the JAI library are buggy, so standard AWT operations do
  * the scaling and cropping. The most obvious problem in the JAI library is the
  * refusal to crop after scaling an image.
- * 
+ *
  * Scale first to avoid the boundary error that produces black lines along the
  * edge of the image.
- * 
+ *
  * Use the javax.imagio pacakge to write the thumbnail image as a JPEG file.
  */
 public class IIOImageProcessor implements ImageProcessor {
@@ -173,10 +173,10 @@ public class IIOImageProcessor implements ImageProcessor {
 	private byte[] encodeAsJpeg(BufferedImage image) throws IOException {
 		ImageWriter writer = ImageIO.getImageWritersByFormatName("jpeg").next();
 		ImageWriteParam param = writer.getDefaultWriteParam();
-		param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT); 
-		param.setCompressionQuality(0.8f); 
-		ByteArrayOutputStream bytes = new ByteArrayOutputStream(); 
-		writer.setOutput(new MemoryCacheImageOutputStream(bytes)); 
+		param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+		param.setCompressionQuality(0.8f);
+		ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+		writer.setOutput(new MemoryCacheImageOutputStream(bytes));
 		writer.write(null, new IIOImage(image,null,null),param);
 		writer.dispose();
 		return bytes.toByteArray();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/migration/rel17/Release17Migrator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/migration/rel17/Release17Migrator.java
index 5c2cb3237..dbe6e79d8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/migration/rel17/Release17Migrator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/migration/rel17/Release17Migrator.java
@@ -9,14 +9,14 @@ import edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdateKnowledgeBase;
 
 /**
  * Call UpdateKnowledgeBase; migrate from release 1.6 to release 1.7
- * 
+ *
  * Remove permissions that are no longer used.
  */
 public class Release17Migrator implements ServletContextListener {
 	@Override
 	public void contextInitialized(ServletContextEvent sce) {
 		new UpdateKnowledgeBase("/WEB-INF/ontologies/update16to17/", this).contextInitialized(sce);
-		
+
 		new RemoveObsoletePermissions().contextInitialized(sce);
 	}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/migration/rel18/FauxPropertiesUpdater.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/migration/rel18/FauxPropertiesUpdater.java
index e28d5f0d5..fad60e9d0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/migration/rel18/FauxPropertiesUpdater.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/migration/rel18/FauxPropertiesUpdater.java
@@ -29,12 +29,12 @@ import edu.cornell.mannlib.vitro.webapp.utils.jena.criticalsection.LockedOntMode
 /**
  * PropertyConfig.n3 has moved to rdf/display/firsttime, so it is only pulled in
  * if the display model is empty.
- * 
+ *
  * Let's pull it in one time, anyway.
- * 
+ *
  * Check askUpdated.sparql for an example of how we know that it is necessary.
  * Also check success.n3
- * 
+ *
  * If a special triple is not found in the display model, read the file from
  * firsttime. If we can't find the file, warn
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/migration/rel18/RemoveObsoleteMetadataGraphs.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/migration/rel18/RemoveObsoleteMetadataGraphs.java
index 855e027b4..a4ffc0aa1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/migration/rel18/RemoveObsoleteMetadataGraphs.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/migration/rel18/RemoveObsoleteMetadataGraphs.java
@@ -20,7 +20,7 @@ import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
  * The graphs http://vitro.mannlib.cornell.edu/ns/vitro/sdb/metadata were used
  * in Content models through release 1.7 and in Configuration models in release
  * 1.7
- * 
+ *
  * In release 1.8, they area no longer used, and produce annoying warning
  * messages.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ContextModelAccess.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ContextModelAccess.java
index daf02a0fa..a4cd0762b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ContextModelAccess.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ContextModelAccess.java
@@ -14,7 +14,7 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 
 /**
  * Data structures on the context have fewer options than those on a request.
- * 
+ *
  * There is no Preferred Language or Policy restrictions if there is no
  * "current user".
  */
@@ -30,22 +30,22 @@ public interface ContextModelAccess {
 
 	/** Get the Dataset for either CONTENT or CONFIGURATION models. */
 	public Dataset getDataset(WhichService which);
-	
+
 	/** Get the ModelMaker for the CONTENT models. */
 	public ModelMaker getModelMaker();
 
 	/** Get the ModelMaker for either CONTENT or CONFIGURATION models. */
 	public ModelMaker getModelMaker(WhichService which);
-	
+
 	/** Get the FULL_UNION OntModel. */
 	public OntModel getOntModel();
 
 	/** Get an OntModel by name. */
 	public OntModel getOntModel(String name);
-	
+
 	/** Get the ASSERTIONS_AND_INFERENCES OntModelSelector. */
 	public OntModelSelector getOntModelSelector();
-	
+
 	/** Get an OntModelSelector based on ASSERTIONS, INFERENCES, or both. */
 	public OntModelSelector getOntModelSelector(ReasoningOption option);
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ModelAccess.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ModelAccess.java
index dec816255..def4d22a6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ModelAccess.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ModelAccess.java
@@ -15,33 +15,33 @@ import edu.cornell.mannlib.vitro.webapp.triplesource.CombinedTripleSource;
 /**
  * The root access point for the RDF data structures: RDFServices, Datasets,
  * ModelMakers, OntModels, OntModelSelectors and WebappDaoFactories.
- * 
+ *
  * Get a long-term data structure by accessing from the context. Get a
  * short-term data structure by accessing from the request.
- * 
+ *
  * <pre>
  * ModelAccess.on(ctx).getRDFService(CONFIGURATION);
  * ModelAccess.on(req).getOntModel(ModelNames.DISPLAY);
  * </pre>
- * 
+ *
  * ------------------------------------
- * 
+ *
  * The elaborate structure of options enums allows us to specify method
  * signatures like this on RequestModelAccess:
- * 
+ *
  * <pre>
  * getOntModelSelector(OntModelSelectorOption... options);
  * </pre>
- * 
+ *
  * Which can be invoked in any of these ways:
- * 
+ *
  * <pre>
  * ModelAccess.on(req).getOntModelSelector();
  * ModelAccess.on(req).getOntModelSelector(LANGUAGE_NEUTRAL);
  * ModelAccess.on(req).getOntModelSelector(INFERENCES_ONLY);
  * ModelAccess.on(req).getOntModelSelector(ASSERTIONS_ONLY, LANGUAGE_NEUTRAL);
  * </pre>
- * 
+ *
  * The compiler insures that only appropriate options are specified. However, if
  * conflicting options are supplied, it will only be caught at runtime.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/RequestModelAccess.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/RequestModelAccess.java
index 05b9e4127..7feea72f8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/RequestModelAccess.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/RequestModelAccess.java
@@ -33,7 +33,7 @@ public interface RequestModelAccess {
 	 * Get the FULL_UNION OntModel: Language-aware or not.
 	 */
 	OntModel getOntModel(LanguageOption... options);
-	
+
 	/**
 	 * Get an OntModel: Language-aware or not.
 	 */
@@ -49,7 +49,7 @@ public interface RequestModelAccess {
 	 * ASSERTIONS or INFERENCES or both.
 	 */
 	WebappDaoFactory getWebappDaoFactory(WebappDaoFactoryOption... options);
-	
+
 	/**
 	 * When finished, release any resources.
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/AbstractModelMakerDecorator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/AbstractModelMakerDecorator.java
index 54bafd319..2b21d01ad 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/AbstractModelMakerDecorator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/AbstractModelMakerDecorator.java
@@ -21,10 +21,10 @@ public class AbstractModelMakerDecorator implements ModelMaker {
 		}
 		this.inner = inner;
 	}
-	
+
 	@Override public String toString() {
 		return this.getClass().getSimpleName() + "[inner="
-				+ String.valueOf(inner) + "]"; 
+				+ String.valueOf(inner) + "]";
 	}
 
 	@Override
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ListCachingModelMaker.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ListCachingModelMaker.java
index de8d44055..5ea91d28d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ListCachingModelMaker.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ListCachingModelMaker.java
@@ -13,14 +13,14 @@ import org.apache.jena.util.iterator.WrappedIterator;
 
 /**
  * This ModelMaker keeps a cached list of the available models.
- * 
+ *
  * The methods that create a model must add its name to the list. The methods
  * that remove a model must remove its name from the list.
- * 
+ *
  * This is a useful decorator for some ModelMakers where listModels() is a
  * costly operation. The drawback is that it will not see models that were
  * created at a lower level; perhaps by RDFServiceDataset.getNamedModel().
- * 
+ *
  * If listModels() is not costly, you might be better off with a
  * ModelMakerWithPersistentEmptyModels.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/MemoryMappingModelMaker.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/MemoryMappingModelMaker.java
index bc526f321..c2a26e737 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/MemoryMappingModelMaker.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/MemoryMappingModelMaker.java
@@ -15,7 +15,7 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.adapters.MemoryMappedModel;
 /**
  * Provides fast read access to small models, by creating a "mapped" model in
  * memory.
- * 
+ *
  * When updates are detected on the "mapped" model, they are propagated to the
  * base model.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ModelMakerWithPersistentEmptyModels.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ModelMakerWithPersistentEmptyModels.java
index a7b3a72d1..f9a601ed2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ModelMakerWithPersistentEmptyModels.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/adapters/ModelMakerWithPersistentEmptyModels.java
@@ -16,17 +16,17 @@ import org.apache.jena.util.iterator.WrappedIterator;
  * This ModelMaker will remember the URIs of models you create, even if you
  * don't add triples to them. Of course, when VIVO is shut down, this ModelMaker
  * forgets.
- * 
+ *
  * This is a useful decorator for some triple stores which do not remember empty
  * models. SDB, for example. With this decorator, a GUI can offer to let you
  * create a model, and then offer to let you add triples to it. Without this
  * decorator, you would need to do that in a single step.
- * 
+ *
  * If you are dealing with a triple store where listModels() is a costly
  * operation, you might be better off using a ListCachingModelMaker instead. The
  * drawback is that ListCachingModelMaker will not see models that were created
  * at a lower level; perhaps by RDFServiceDataset.getNamedModel().
- * 
+ *
  * The methods that create a model must add its name to the list. The methods
  * that remove a model must remove its name from the list.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/ContextModelAccessImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/ContextModelAccessImpl.java
index 3c050ba7e..320c6c236 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/ContextModelAccessImpl.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/ContextModelAccessImpl.java
@@ -51,10 +51,10 @@ import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
 /**
  * The context-based model access is simpler than the request-based model
  * access.
- * 
+ *
  * There is no "current user", so there can be no preferred language or
  * policy-based filtering.
- * 
+ *
  * We are confident that each of these structures will be used at some point, so
  * there is no need for lazy initialization.
  */
@@ -79,7 +79,7 @@ public class ContextModelAccessImpl implements ContextModelAccess {
 	 * Pull all of the items into maps, instead of fetching them from the
 	 * factory on demand. We don't know that the factory wouldn't create fresh
 	 * ones.
-	 * 
+	 *
 	 * The exception is the OntModels, for two reasons: first, because the
 	 * OntModelCache assures us that it won't create fresh copies, and second
 	 * because we may not know the names of all of the models that will be
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/RequestModelAccessImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/RequestModelAccessImpl.java
index 28a37c8aa..63d70691c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/RequestModelAccessImpl.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/RequestModelAccessImpl.java
@@ -56,26 +56,26 @@ import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
 
 /**
  * For each category of data structure, the pattern is the same:
- * 
+ *
  * Build a key from the supplied options. If the cache contains a structure with
  * that key, return it.
- * 
+ *
  * Otherwise, create the requested structure, often from a simplified version.
  * For example, if the request was for a LANGUAGE_AWARE RDFService, get the
  * LANGUAGE_NEUTRAL RDFService and wrap it with langauge awareness.
- * 
+ *
  * This second step is a recursive call, so we check again to see if the cache
  * contains the new requested structure based on a modified key. If it does
  * contain the structure, use it. Otherwise, create it. Eventually, we reach a
  * request for the simplest structure, which we fetch from the
  * ShortTermDataStructuresFactory.
- * 
+ *
  * If the request includes language-awareness, the structure can be created from
  * the language-neutral version. If language-awareness is disabled, the
  * language-neutral structure will be cached under two different keys.
- * 
+ *
  * ----------------------------------------
- * 
+ *
  * There are two hacks here to support model switching: one in the OntModels and
  * one in the WebappDaoFactories. These are hacks for several reasons, not the
  * least of which is that the model switching will not be available on
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/keys/ModelAccessKey.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/keys/ModelAccessKey.java
index fa0ca2750..13877754d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/keys/ModelAccessKey.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/keys/ModelAccessKey.java
@@ -15,12 +15,12 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.WhichService;
 
 /**
  * An immutable collection of options that can be used as a key in a hashmap.
- * 
+ *
  * The class of the key is part of the hash, so a OntModelKey and a
  * RDFServiceKey can both be used in the same map without conflict.
  */
 public abstract class ModelAccessKey {
-	
+
 	// ----------------------------------------------------------------------
 	// Static methods
 	// ----------------------------------------------------------------------
@@ -69,7 +69,7 @@ public abstract class ModelAccessKey {
 	/**
 	 * Search through the options for values from the specified class. If none
 	 * are found, use the default value.
-	 * 
+	 *
 	 * Redundant options are silently accepted, but conflicting options will
 	 * throw an exception.
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/keys/OntModelKey.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/keys/OntModelKey.java
index 6a0cf3a3b..389a2e28b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/keys/OntModelKey.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/impl/keys/OntModelKey.java
@@ -7,7 +7,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
 
 /**
  * An immutable key for storing and retrieving OntModels.
- * 
+ *
  * In addition to the usual options, it has a name, which adds to the
  * uniqueness.
  */
@@ -44,5 +44,5 @@ public final class OntModelKey extends ModelAccessKey {
 	public String toString() {
 		return super.toString() + " " + ToString.modelName(name);
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/JoinedOntModelCache.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/JoinedOntModelCache.java
index 43281ab7b..358db0a7a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/JoinedOntModelCache.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/JoinedOntModelCache.java
@@ -16,10 +16,10 @@ import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
 
 /**
  * Use two OntModelCaches as one.
- * 
+ *
  * If both caches contain models with the same name, a warning will be written
  * to the log, and the model from the primary cache will be used.
- * 
+ *
  * Any new models will be created on the primary cache.
  */
 public class JoinedOntModelCache implements OntModelCache {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/MaskingOntModelCache.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/MaskingOntModelCache.java
index 502d97c9c..9978bc603 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/MaskingOntModelCache.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/MaskingOntModelCache.java
@@ -18,10 +18,10 @@ import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
 /**
  * The named models in the masking cache will be used in preference to a model
  * of the same name in the base cache.
- * 
+ *
  * If a named model doesn't exist in the masking cache, a warning is written to
  * the log and the name will be ignored.
- * 
+ *
  * New models are created in the base cache only.
  */
 public class MaskingOntModelCache implements OntModelCache {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/OntModelCache.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/OntModelCache.java
index 60b03b7e8..dcddaf9ca 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/OntModelCache.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/OntModelCache.java
@@ -8,10 +8,10 @@ import org.apache.jena.ontology.OntModel;
 
 /**
  * A source for OntModels from the triple-store. The contract is this:
- * 
+ *
  * If you ask by a name that is not in use, an OntModel will be created.
- * 
- * If you ask by the same name twice, you get the same OntModel. 
+ *
+ * If you ask by the same name twice, you get the same OntModel.
  */
 public interface OntModelCache {
 	/**
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/UnionModelsOntModelsCache.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/UnionModelsOntModelsCache.java
index b9ad09a65..e814ab5ce 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/UnionModelsOntModelsCache.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ontmodels/UnionModelsOntModelsCache.java
@@ -15,10 +15,10 @@ import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
 /**
  * Decorates an OntModelCache with some "virtual" OntModels, each of which is a
  * union of two actual OntModels.
- * 
+ *
  * For example, we might create a model called FULL_ASSERTIONS, that is the
  * union of two models called ABOX_ASSERTIONS and TBOX_ASSERTIONS.
- * 
+ *
  * The inner class UnionSpec holds the model names, and allows us to lazily
  * create the union models.
  */
@@ -28,7 +28,7 @@ public class UnionModelsOntModelsCache implements OntModelCache {
 
 	/**
 	 * Create it like this:
-	 * 
+	 *
 	 * <pre>
 	 * new UnionModelsOntModelsCache(inner,
 	 *     UnionSpec.base("baseUri").plus("plusUri").yields("unionUri"),
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/fileStorage/FileStorage.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/fileStorage/FileStorage.java
index 29fb25317..43934f5fa 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/fileStorage/FileStorage.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/fileStorage/FileStorage.java
@@ -15,18 +15,18 @@ public interface FileStorage extends Application.Module {
 	/**
 	 * Store the bytes from this stream as a file with the specified ID and
 	 * filename. If the file already exists, it is over-written.
-	 * 
+	 *
 	 * @throws FileAlreadyExistsException
 	 *             if a file already exists with this ID but with a different
 	 *             filename.
-	 * 
+	 *
 	 */
 	void createFile(String id, String filename, InputStream bytes)
 			throws FileAlreadyExistsException, IOException;
 
 	/**
 	 * If a file exists with this ID, get its name.
-	 * 
+	 *
 	 * @return The name of the file (un-encoded) if it exists, or
 	 *         {@code null} if it does not.
 	 */
@@ -36,7 +36,7 @@ public interface FileStorage extends Application.Module {
 	 * Get a stream that will provide the contents of the file that was stored
 	 * with this ID and this filename. Close the stream when you're finished
 	 * with it.
-	 * 
+	 *
 	 * @throws FileNotFoundException
 	 *             if there is no file that matches this ID and filename.
 	 */
@@ -46,7 +46,7 @@ public interface FileStorage extends Application.Module {
 	/**
 	 * If a file exists with this ID, it will be deleted, regardless of the file
 	 * name. If no such file exists, no action is taken, no exception is thrown.
-	 * 
+	 *
 	 * @return {@code true} if a file existed, {@code false} otherwise.
 	 */
 	boolean deleteFile(String id) throws IOException;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/imageProcessor/ImageProcessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/imageProcessor/ImageProcessor.java
index 8d49e0684..f94478c01 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/imageProcessor/ImageProcessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/imageProcessor/ImageProcessor.java
@@ -19,7 +19,7 @@ public interface ImageProcessor extends Application.Module {
 
 	/**
 	 * How big is the image contained in this stream?
-	 * 
+	 *
 	 * @param image
 	 *            The image stream. This method will not close it.
 	 * @return The dimensions of the image. Never returns null.
@@ -34,11 +34,11 @@ public interface ImageProcessor extends Application.Module {
 	/**
 	 * Create a new image from a portion of the supplied image, and reduce to
 	 * fit a limiting size.
-	 * 
+	 *
 	 * If the crop rectangle extends beyond the image boundaries, it is limited
 	 * to fit, or relocated if limiting would make it smaller than the
 	 * MINIMUM_CROP_SIZE.
-	 * 
+	 *
 	 * @param image
 	 *            The image stream. This method will not close it.
 	 * @param crop
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchEngine.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchEngine.java
index 3c6e8bcdf..3ab0b3ddb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchEngine.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchEngine.java
@@ -9,7 +9,7 @@ import edu.cornell.mannlib.vitro.webapp.modules.Application;
 /**
  * The principle interface for the SearchEngine. All search-related objects are
  * created by these methods.
- * 
+ *
  * All methods that throw SearchEngineException should attempt to distinguish
  * whether the exception is caused because the SearchEngine is not responding.
  * In that case, they should throw a SearchEngineNotRespondingException, so the
@@ -19,7 +19,7 @@ public interface SearchEngine extends Application.Module {
 
 	/**
 	 * Check to see whether the SearchEngine is alive.
-	 * 
+	 *
 	 * @throws SearchEngineException
 	 *             if the SearchEngine does not respond.
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchEngineException.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchEngineException.java
index 9b22ebcb8..9121189ad 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchEngineException.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchEngineException.java
@@ -14,11 +14,11 @@ public class SearchEngineException extends Exception {
 	public SearchEngineException(String message) {
 		super(message);
 	}
-	
+
 	public SearchEngineException(Throwable cause) {
 		super(cause);
 	}
-	
+
 	public SearchEngineException(String message, Throwable cause) {
 		super(message, cause);
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchInputDocument.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchInputDocument.java
index 1cc7009d0..c4dd9e8ac 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchInputDocument.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchInputDocument.java
@@ -31,7 +31,7 @@ public interface SearchInputDocument {
 
 	/**
 	 * Create a field with this name and values, and put it into the document.
-	 * 
+	 *
 	 * If a field with this name already exists in the document, these values
 	 * will be added to the existing values on the field.
 	 */
@@ -39,8 +39,8 @@ public interface SearchInputDocument {
 
 	/**
 	 * Create a field with this name, boost level and values, and put it into
-	 * the document. 
-	 * 
+	 * the document.
+	 *
 	 * If a field with this name already exists in the document,
 	 * these values will be added to the existing values on the field, and the
 	 * existing boost will be multipled by this boost.
@@ -49,8 +49,8 @@ public interface SearchInputDocument {
 
 	/**
 	 * Create a field with this name, boost level and values, and put it into
-	 * the document. 
-	 * 
+	 * the document.
+	 *
 	 * If a field with this name already exists in the document,
 	 * these values will be added to the existing values on the field, and the
 	 * existing boost will be multipled by this boost.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchQuery.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchQuery.java
index acda8d158..15c687330 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchQuery.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchQuery.java
@@ -8,7 +8,7 @@ import java.util.Set;
 
 /**
  * A collection of search terms that will be used to query the search index.
- * 
+ *
  * Each of the "set" and "add" methods will return the searchQuery itself, so
  * calls can easily be chained together.
  */
@@ -19,7 +19,7 @@ public interface SearchQuery {
 
 	/**
 	 * Set the text of the query. This will be parsed using Lucene query syntax.
-	 * 
+	 *
 	 * @return this query
 	 */
 	SearchQuery setQuery(String query);
@@ -28,7 +28,7 @@ public interface SearchQuery {
 	 * Where in the ordered list of result documents should the response begin?
 	 * That is, how many of the results should be skipped? (allows paging of
 	 * results). The default is 0.
-	 * 
+	 *
 	 * @return this query
 	 */
 	SearchQuery setStart(int start);
@@ -36,49 +36,49 @@ public interface SearchQuery {
 	/**
 	 * What is the maximum number of documents that will be returned from the
 	 * query? A negative value means no limit. The default is -1.
-	 * 
+	 *
 	 * @return this query
 	 */
 	SearchQuery setRows(int rows);
 
 	/**
 	 * Which fields should be returned from the query?
-	 * 
+	 *
 	 * @return this query
 	 */
 	SearchQuery addFields(String... names);
 
 	/**
 	 * Which fields should be returned from the query?
-	 * 
+	 *
 	 * @return this query
 	 */
 	SearchQuery addFields(Collection<String> names);
 
 	/**
 	 * What field should be used to sort the results, and in what order?
-	 * 
+	 *
 	 * @return this query
 	 */
 	SearchQuery addSortField(String name, Order order);
 
 	/**
 	 * Restrict the results by this query.
-	 * 
+	 *
 	 * @return this query
 	 */
 	SearchQuery addFilterQuery(String filterQuery);
 
 	/**
 	 * Restrict the results by these queries.
-	 * 
+	 *
 	 * @return this query
 	 */
 	SearchQuery addFilterQueries(String... filterQueries);
 
 	/**
 	 * What fields should be used to facet the results?
-	 * 
+	 *
 	 * @return this query
 	 */
 	SearchQuery addFacetFields(String... fields);
@@ -86,14 +86,14 @@ public interface SearchQuery {
 	/**
 	 * The maximum number of facet counts that will be returned from the query.
 	 * The default is 100. A negative value means no limit.
-	 * 
+	 *
 	 * @return this query
 	 */
 	SearchQuery setFacetLimit(int cnt);
 
 	/**
 	 * Facet having fewer hits will be excluded from the list. The default is 0.
-	 * 
+	 *
 	 * @return this query
 	 */
 	SearchQuery setFacetMinCount(int cnt);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchResultDocumentList.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchResultDocumentList.java
index 01523fe20..297ab1f2b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchResultDocumentList.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchResultDocumentList.java
@@ -20,7 +20,7 @@ public interface SearchResultDocumentList extends
 
 	/**
 	 * Retrieve the i'th document, starting with 0.
-	 * 
+	 *
 	 * @throws ArrayIndexOutOfBoundsException
 	 */
 	SearchResultDocument get(int i);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexer.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexer.java
index db9d99f9b..75d2e0f23 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexer.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexer.java
@@ -12,14 +12,14 @@ import edu.cornell.mannlib.vitro.webapp.modules.ComponentStartupStatus;
 
 /**
  * Interface for the code that controls the contents of the search index.
- * 
+ *
  * The search indexer is started rather late in the startup sequence, since it
  * requires the search engine, the triple stores and the filters.
- * 
+ *
  * If calls are made to schedule tasks prior to startup(), they will be queued.
  * Calls to pause or unpause set the state as expected, but tasks will not be
  * run until the indexer is both started and unpaused.
- * 
+ *
  * The only calls that are valid after shutdown are shutdown(), getStatus() and
  * removeListener(). Calls to other methods produce a warning, but have no other
  * effect.
@@ -28,7 +28,7 @@ public interface SearchIndexer extends Application.Module {
 
 	/**
 	 * Start processing. If unpaused, schedule any queued tasks.
-	 * 
+	 *
 	 * @throws IllegalStateException
 	 *             if called after shutdown, or if called more than once.
 	 */
@@ -38,7 +38,7 @@ public interface SearchIndexer extends Application.Module {
 	/**
 	 * Stop processing new tasks. Requests will be queued until a call to
 	 * unpause(). Fires a PAUSED event to listeners.
-	 * 
+	 *
 	 * This call has no effect if already paused, or if called after shutdown.
 	 */
 	void pause();
@@ -47,10 +47,10 @@ public interface SearchIndexer extends Application.Module {
 	 * Resume processing new tasks. Any requests that were received since the
 	 * call to pause() will now be scheduled for processing. Fires an UNPAUSED
 	 * event to listeners.
-	 * 
+	 *
 	 * If startup has not been called, the unpaused state will be recorded, but
 	 * tasks will still await the call to startup.
-	 * 
+	 *
 	 * This call has no effect if not paused, or if called after shutdown.
 	 */
 	void unpause();
@@ -58,7 +58,7 @@ public interface SearchIndexer extends Application.Module {
 	/**
 	 * Stop processing and release resources. This call should block until the
 	 * dependent threads are stopped.
-	 * 
+	 *
 	 * Repeated calls have no effect.
 	 */
 	@Override
@@ -66,17 +66,17 @@ public interface SearchIndexer extends Application.Module {
 
 	/**
 	 * Update any search documents that are affected by these statements.
-	 * 
+	 *
 	 * These statements are a mixture of additions and deletions. In either
 	 * case, we feed them to the URI finders to see what individuals might have
 	 * been affected by the change.
-	 * 
+	 *
 	 * We accumulate a batch of affected URIs, removing duplicates if they
 	 * occur, and then submit them for updates.
-	 * 
+	 *
 	 * If called before startup or while paused, the task will be queued. If
 	 * called after shutdown, this has no effect.
-	 * 
+	 *
 	 * @param changes
 	 *            if null or empty, this call has no effect.
 	 */
@@ -84,17 +84,17 @@ public interface SearchIndexer extends Application.Module {
 
 	/**
 	 * Update the search documents for these URIs.
-	 * 
+	 *
 	 * For each URI that belongs in the index, a new search document is built,
 	 * replacing any document that may already exist for that URI. For each URI
 	 * that does not belong in the index, any existing document is removed.
-	 * 
+	 *
 	 * A URI belongs in the index if it refers to an existing individual in the
 	 * model, and is not excluded.
-	 * 
+	 *
 	 * If called before startup or while paused, the task will be queued. If
 	 * called after shutdown, this has no effect.
-	 * 
+	 *
 	 * @param uris
 	 *            if null or empty, this call has no effect.
 	 */
@@ -103,10 +103,10 @@ public interface SearchIndexer extends Application.Module {
 	/**
 	 * Remove all of the existing documents in the index, and schedule updates
 	 * for all of the individuals in the model.
-	 * 
+	 *
 	 * If a rebuild is already pending or in progress, this method has no
 	 * effect.
-	 * 
+	 *
 	 * If called before startup or while paused, the task will be queued. If
 	 * called after shutdown, this has no effect.
 	 */
@@ -114,21 +114,21 @@ public interface SearchIndexer extends Application.Module {
 
 	/**
 	 * What is the current status of the indexer?
-	 * 
+	 *
 	 * Still valid after shutdown().
 	 */
 	SearchIndexerStatus getStatus();
 
 	/**
 	 * Add this listener, allowing it to receive events from the indexer.
-	 * 
+	 *
 	 * The listener can safely assume that the SearchIndexer is not paused. If
 	 * the SearchIndexer is indeed paused when the listener is added, then a
 	 * PAUSE event will immediately be passed to the listener.
-	 * 
+	 *
 	 * If this listener has already been added, or if called after shutdown,
 	 * this method has no effect.
-	 * 
+	 *
 	 * @param listener
 	 *            if null, this method has no effect.
 	 */
@@ -137,10 +137,10 @@ public interface SearchIndexer extends Application.Module {
 	/**
 	 * Remove this listener, meaning that it will no longer receive events from
 	 * the indexer.
-	 * 
+	 *
 	 * If this listener is not active, or if called after shutdown, this method
 	 * has no effect.
-	 * 
+	 *
 	 * @param listener
 	 *            if null, this method has no effect.
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexerStatus.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexerStatus.java
index f40877fe3..8c6a60333 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexerStatus.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexerStatus.java
@@ -8,11 +8,11 @@ import java.util.Date;
 /**
  * An immutable summary of the status of the SearchIndexer, at a fixed point in
  * time. Contains the current state, the time, and some counts.
- * 
+ *
  * If the indexer is processing URIs, processing statements, or preparing a
  * rebuild, the counts are URI_COUNTS, STATEMENT_COUNTS, or REBUILD_COUNTS,
  * respectively.
- * 
+ *
  * When the indexer starts up, becomes idle, or shuts down, the counts are
  * NO_COUNTS.
  */
@@ -120,7 +120,7 @@ public class SearchIndexerStatus {
 		public int getExcluded() {
 			return excluded;
 		}
-		
+
 		public int getDeleted() {
 			return deleted;
 		}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexerUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexerUtils.java
index 68d2d3ad3..876fea882 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexerUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexerUtils.java
@@ -6,7 +6,7 @@ package edu.cornell.mannlib.vitro.webapp.modules.searchIndexer;
  * Some handy methods for dealing with the search index.
  */
 public class SearchIndexerUtils {
-	
+
 	/**
 	 * The document ID in the search index is derived from the individual's URI.
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tboxreasoner/TBoxReasonerStatus.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tboxreasoner/TBoxReasonerStatus.java
index f4193f552..cae75614b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tboxreasoner/TBoxReasonerStatus.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tboxreasoner/TBoxReasonerStatus.java
@@ -10,7 +10,7 @@ public interface TBoxReasonerStatus {
 	 * Is reasoning in progress based on changes to the TBox?
 	 */
 	boolean isReasoning();
-	
+
 	/**
 	 * Is the TBox free of inconsistency?
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tripleSource/ContentTripleSource.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tripleSource/ContentTripleSource.java
index fe03b76b0..999d18e1d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tripleSource/ContentTripleSource.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tripleSource/ContentTripleSource.java
@@ -26,13 +26,13 @@ public abstract class ContentTripleSource implements TripleSource {
 	 */
 	protected static final String[] MEMORY_MAPPED_CONTENT_MODELS = {
 		APPLICATION_METADATA, TBOX_ASSERTIONS, TBOX_INFERENCES };
-	
+
 	private static final String CONTENT_DEFAULT_MODEL_NAME = FULL_UNION;
 
 	/**
 	 * These decorations are added to a Content ModelMaker, regardless of the
 	 * source.
-	 * 
+	 *
 	 * Use the default model as the full union.
 	 */
 	protected static ModelMaker addContentDecorators(ModelMaker sourceMM) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ABoxUpdater.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ABoxUpdater.java
index a20427f04..1433c3d72 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ABoxUpdater.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ABoxUpdater.java
@@ -32,10 +32,10 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceDataset;
 import edu.cornell.mannlib.vitro.webapp.ontology.update.AtomicOntologyChange.AtomicChangeType;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 
-/**  
+/**
 * Performs knowledge base updates to the abox to align with a new ontology version
-*   
-*/ 
+*
+*/
 public class ABoxUpdater {
 
     private final Log log = LogFactory.getLog(ABoxUpdater.class);
@@ -45,25 +45,25 @@ public class ABoxUpdater {
 	private RDFService rdfService;
 	private OntModel newTBoxAnnotationsModel;
 	private TBoxUpdater tboxUpdater;
-	private ChangeLogger logger;  
+	private ChangeLogger logger;
 	private ChangeRecord record;
 	private OntClass OWL_THING = (ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM)).createClass(OWL.Thing.getURI());
 
 	/**
-	 * 
-	 * Constructor 
-	 *  
+	 *
+	 * Constructor
+	 *
 	 * @param   settings     - Update settings
 	 * @param   logger       - for writing to the change log
 	 *                         and the error log.
-	 * @param   record       - for writing to the additions model 
+	 * @param   record       - for writing to the additions model
 	 *                         and the retractions model.
-	 *                    
+	 *
 	 */
 	public ABoxUpdater(UpdateSettings settings,
 		               ChangeLogger logger,
 		               ChangeRecord record) {
-		
+
 	    this.oldTboxModel = settings.getOldTBoxModel();
         this.newTboxModel = settings.getNewTBoxModel();
         RDFService rdfService = settings.getRDFService();
@@ -74,20 +74,20 @@ public class ABoxUpdater {
 		this.record = record;
 		this.tboxUpdater = new TBoxUpdater(settings, logger, record);
 	}
-	
+
 	/**
-	 * 
-	 * Update a knowledge base to align with changes in the class definitions in 
+	 *
+	 * Update a knowledge base to align with changes in the class definitions in
 	 * a new version of the ontology. The two versions of the ontology and the
 	 * knowledge base to be updated are provided in the class constructor and
 	 * are referenced via class level variables.
-	 *  
+	 *
 	 * @param   changes - a list of AtomicOntologyChange objects, each representing
 	 *                    one change in class definition in the new version of the
-	 *                    ontology. 
-	 *                    
+	 *                    ontology.
+	 *
 	 *  Writes to the change log file, the error log file, and the incremental change
-	 *  knowledge base.                  
+	 *  knowledge base.
 	 */
 	public void processClassChanges(List<AtomicOntologyChange> changes) throws IOException {
 
@@ -113,19 +113,19 @@ public class ABoxUpdater {
 	}
 
 	/**
-	 * 
+	 *
 	 * Update the knowledge base for a class rename in the ontology. All references to the
 	 * old class URI in either the subject or the object position of a statement are
-	 * changed to use the new class URI. 
-	 *  
+	 * changed to use the new class URI.
+	 *
 	 * @param   change - an AtomicOntologyChange object representing a class
 	 *                   rename operation.
-	 *                    
+	 *
 	 */
 	public void renameClass(AtomicOntologyChange change) throws IOException {
-		
+
 		//logger.log("Processing a class rename from: " + change.getSourceURI() + " to " + change.getDestinationURI());
-	    
+
 	    Iterator<String> graphIt = dataset.listNames();
 	    while(graphIt.hasNext()) {
 	        String graph = graphIt.next();
@@ -135,42 +135,42 @@ public class ABoxUpdater {
 	        Model aboxModel = dataset.getNamedModel(graph);
 	        aboxModel.enterCriticalSection(Lock.WRITE);
     		try {
-    			
+
     	       Model additions = ModelFactory.createDefaultModel();
     	       Model retractions = ModelFactory.createDefaultModel();
-    	       
+
     	       //TODO - look for these in the models and log error if not found
     		   Resource oldClass = ResourceFactory.createResource(change.getSourceURI());
-    		   Resource newClass = ResourceFactory.createResource(change.getDestinationURI());	   
-    		   
+    		   Resource newClass = ResourceFactory.createResource(change.getDestinationURI());
+
     		   // Change class references in the subjects of statements
-    		   
+
     		   // BJL 2010-04-09 : In future versions we need to keep track of
     		   // the difference between true direct renamings and "use-insteads."
     		   // For now, the best behavior is to remove any remaining statements
     		   // where the old class is the subject, *unless* the statements
     		   // is part of the new annotations file (see comment below) or the
     		   // predicate is vitro:autolinkedToTab.  In the latter case,
-    		   // the autolinking annotation should be rewritten using the 
+    		   // the autolinking annotation should be rewritten using the
     		   // new class name.
-    		   
+
     		   StmtIterator iter = aboxModel.listStatements(oldClass, (Property) null, (RDFNode) null);
-    
+
     		   int removeCount = 0;
     		   while (iter.hasNext()) {
     			   Statement oldStatement = iter.next();
     			   removeCount++;
     			   retractions.add(oldStatement);
     		   }
-    		   
+
     		   //log summary of changes
     		   if (removeCount > 0) {
     			   logger.log("Removed " + removeCount + " subject reference" + ((removeCount > 1) ? "s" : "") + " to the "  + oldClass.getURI() + " class");
     		   }
-    
+
     		   // Change class references in the objects of rdf:type statements
     		   iter = aboxModel.listStatements((Resource) null, RDF.type, oldClass);
-    
+
     		   int renameCount = 0;
     		   while (iter.hasNext()) {
     			   renameCount++;
@@ -179,17 +179,17 @@ public class ABoxUpdater {
     			   retractions.add(oldStatement);
     			   additions.add(newStatement);
     		   }
-    		   
+
     		   //log summary of changes
     		   if (renameCount > 0) {
     			   logger.log("Retyped " + renameCount + " individual" + ((renameCount > 1) ? "s" : "") + " from type "  + oldClass.getURI() + " to type " + newClass.getURI());
     		   }
-    		   
+
     		   aboxModel.remove(retractions);
     		   record.recordRetractions(retractions);
     		   aboxModel.add(additions);
     		   record.recordAdditions(additions);
-    		   
+
     		} finally {
     			aboxModel.leaveCriticalSection();
     		}
@@ -197,33 +197,33 @@ public class ABoxUpdater {
 	}
 
 	/**
-	 * 
+	 *
 	 * Examine the knowledge base for a class addition to the ontology and
-	 * add messages to the change log indicating where manual review is 
+	 * add messages to the change log indicating where manual review is
 	 * recommended. If the added class has a direct parent in the new ontology
 	 * that is not OWL.Thing, and if the knowledge base contains individuals
 	 * asserted to be in the parent class, then log a message recommending
 	 * review of those individuals to see whether they are of the new
 	 * class type.
-	 *  
+	 *
 	 * @param   change - an AtomicOntologyChange object representing a class
 	 *                   addition operation.
-	 *                    
+	 *
 	 */
 	public void addClass(AtomicOntologyChange change) throws IOException {
-	   
+
 		//logger.log("Processing a class addition of class " + change.getDestinationURI());
-		
+
 		OntClass addedClass = newTboxModel.getOntClass(change.getDestinationURI());
-		
+
 		if (addedClass == null) {
 			logger.logError("didn't find the added class " + change.getDestinationURI() + " in the new model.");
 			return;
 		}
-		
+
 		List<OntClass> classList = addedClass.listSuperClasses(true).toList();
 		List<OntClass> namedClassList = new ArrayList<OntClass>();
-		for (OntClass ontClass : classList) { 
+		for (OntClass ontClass : classList) {
 			if (!ontClass.isAnon()) {
 				namedClassList.add(ontClass);
 			}
@@ -260,26 +260,26 @@ public class ABoxUpdater {
 	}
 
 	/**
-	 * 
+	 *
 	 * Update a knowledge base to account for a class deletion in the ontology.
 	 * All references to the deleted class URI in either the subject or the object
 	 * position of a statement are changed to use the closest available parent of
 	 * the deleted class from the previous ontology that remains in the new version
 	 * of the ontology. Note that the closest available parent may be owl:Thing.
 	 * If the deleted class has more than one closest available parent, then
-	 * change individuals that were asserted to be of the deleted class to be 
-	 * asserted to be of both parent classes. 
-	 *  
+	 * change individuals that were asserted to be of the deleted class to be
+	 * asserted to be of both parent classes.
+	 *
 	 * @param   change - an AtomicOntologyChange object representing a class
 	 *                   delete operation.
-	 *                    
+	 *
 	 */
 	public void renameClassToParent(AtomicOntologyChange change) throws IOException {
 
 		//logger.log("Processing a class migration to parent for deleted class " + change.getSourceURI());
-		
+
 		OntClass deletedClass = oldTboxModel.getOntClass(change.getSourceURI());
-		
+
 		if (deletedClass == null) {
 			logger.log("WARNING: didn't find the deleted class " +  change.getSourceURI() + " in the old model. Skipping updates for this deletion");
 			return;
@@ -287,54 +287,54 @@ public class ABoxUpdater {
 
 		List<OntClass> classList = deletedClass.listSuperClasses(true).toList();
 		List<OntClass> namedClassList = new ArrayList<OntClass>();
-		for (OntClass ontClass : classList) { 
+		for (OntClass ontClass : classList) {
 			if (!ontClass.isAnon()) {
 				namedClassList.add(ontClass);
 			}
 		}
-		
-		OntClass parent = (!namedClassList.isEmpty()) 
-								? namedClassList.get(0) 
+
+		OntClass parent = (!namedClassList.isEmpty())
+								? namedClassList.get(0)
 								: OWL_THING;
-										
+
 		OntClass replacementClass = newTboxModel.getOntClass(parent.getURI());
-		
+
 		while (replacementClass == null) {
 			 parent = parent.getSuperClass();
-			 
+
 			 if (parent == null) {
-				  replacementClass = OWL_THING; 
+				  replacementClass = OWL_THING;
 			 } else {
 	    	      replacementClass = newTboxModel.getOntClass(parent.getURI());
 			 }
-		} 
+		}
 
 	    //log summary of changes
 	    logger.log("Class " + deletedClass.getURI() + " has been deleted. Any references to it in the knowledge base have been changed to " +   replacementClass.getURI());
 
 		AtomicOntologyChange chg = new AtomicOntologyChange(deletedClass.getURI(), replacementClass.getURI(), AtomicChangeType.RENAME, change.getNotes());
-		renameClass(chg);			
+		renameClass(chg);
 	}
-	
+
 	/**
-	 * 
+	 *
 	 * Remove all instances of the given class from the abox of the knowledge base.
-	 * 
+	 *
 	 * @param   change - an AtomicOntologyChange object representing a class
 	 *                   delete operation.
-	 *                    
+	 *
 	 */
 	public void deleteIndividualsOfType(AtomicOntologyChange change) throws IOException {
 
 		//logger.log("Processing a class deletion of class " + change.getSourceURI());
-		
+
 		OntClass deletedClass = oldTboxModel.getOntClass(change.getSourceURI());
-		
+
 		if (deletedClass == null) {
 			logger.log("WARNING: didn't find the deleted class " +  change.getSourceURI() + " in the old model. Skipping updates for this deletion");
 			return;
 		}
-		
+
 		// Remove instances of the deleted class
         Iterator<String> graphIt = dataset.listNames();
         while(graphIt.hasNext()) {
@@ -348,28 +348,28 @@ public class ABoxUpdater {
     	       int count = 0;
     	       int refCount = 0;
     	       StmtIterator iter = aboxModel.listStatements((Resource) null, RDF.type, deletedClass);
-    
+
         	   while (iter.hasNext()) {
     			   count++;
-    			   Statement typeStmt = iter.next();   
+    			   Statement typeStmt = iter.next();
     			   refCount = deleteIndividual(typeStmt.getSubject());
-    		   }   
-    		   
+    		   }
+
     		   if (count > 0) {
     			   logger.log("Removed " + count + " individual" + (((count > 1) ? "s" : "") + " of type " + deletedClass.getURI()) + " (refs = " + refCount + ")");
     		   }
-    		   		   
+
     		} finally {
     			aboxModel.leaveCriticalSection();
     		}
         }
 	}
-	
+
 	protected int deleteIndividual(Resource individual) throws IOException {
 
 	    Model retractions = ModelFactory.createDefaultModel();
 	    int refCount = 0;
-	    
+
         Iterator<String> graphIt = dataset.listNames();
         while(graphIt.hasNext()) {
             String graph = graphIt.next();
@@ -378,33 +378,33 @@ public class ABoxUpdater {
             }
             Model aboxModel = dataset.getNamedModel(graph);
     		aboxModel.enterCriticalSection(Lock.WRITE);
-    	    try {			   
+    	    try {
     		   StmtIterator iter = aboxModel.listStatements(individual, (Property) null, (RDFNode) null);
-    			   
+
     		   while (iter.hasNext()) {
     			  Statement subjstmt = iter.next();
     			  retractions.add(subjstmt);
     		   }
-    			   
+
     		   iter = aboxModel.listStatements((Resource) null, (Property) null, individual);
-    			   
+
     		    while (iter.hasNext()) {
     			    Statement objstmt = iter.next();
     			    retractions.add(objstmt);
     			    refCount++;
     			}
-    		   
+
     		   aboxModel.remove(retractions);
-    		   record.recordRetractions(retractions);		
-    		   
+    		   record.recordRetractions(retractions);
+
     		} finally {
     			aboxModel.leaveCriticalSection();
     		}
         }
-		
+
 		return refCount;
 	}
-	
+
 	public void processPropertyChanges(List<AtomicOntologyChange> changes) throws IOException {
 
 		for (AtomicOntologyChange propChangeObj : changes) {
@@ -437,24 +437,24 @@ public class ABoxUpdater {
 			}
 		}
 	}
-	
+
 	private void addProperty(AtomicOntologyChange propObj) throws IOException{
-		
+
 		//logger.log("Processing a property addition of property " + propObj.getDestinationURI());
-		
+
 		OntProperty addedProperty = newTboxModel.getOntProperty 	(propObj.getDestinationURI());
-		
+
 		if (addedProperty == null) {
 			logger.logError("Unable to find property " + propObj.getDestinationURI() + 	" in new TBox");
 			return;
 		}
-		
+
 		//  if the newly added property has an inverse in the new TBox, then for all  existing
 		//  ABox statements involving that inverse (if the inverse is new also there won't be
 		//  any) add the corresponding statement with the new property.
-		
+
 		OntProperty inverseOfAddedProperty = addedProperty.getInverseOf();
-		
+
 		if (inverseOfAddedProperty != null) {
 			Model additions = ModelFactory.createDefaultModel();
             Iterator<String> graphIt = dataset.listNames();
@@ -465,14 +465,14 @@ public class ABoxUpdater {
                 }
                 Model aboxModel = dataset.getNamedModel(graph);
     			aboxModel.enterCriticalSection(Lock.WRITE);
-    			
+
     			try {
     				StmtIterator iter = aboxModel.listStatements((Resource) null, inverseOfAddedProperty, (RDFNode) null);
-    		
+
     				while (iter.hasNext()) {
-    					
+
     					Statement stmt = iter.next();
-    					
+
     					if (stmt.getObject().isResource()) {
     					   Statement newStmt = ResourceFactory.createStatement(stmt.getObject().asResource(), addedProperty, stmt.getSubject());
     					   additions.add(newStmt);
@@ -480,59 +480,59 @@ public class ABoxUpdater {
     						logger.log("WARNING: expected the object of this statement to be a Resource but it is not. No inverse has been asserted: " + stmtString(stmt));
     					}
     				}
-    				
+
     				aboxModel.add(additions);
     				record.recordAdditions(additions);
-    				
+
     				if (additions.size() > 0) {
-    					logger.log("Added " + additions.size() + " statement" + 
+    					logger.log("Added " + additions.size() + " statement" +
     							((additions.size() > 1) ? "s" : "") +
-    							" with predicate " + addedProperty.getURI() + 
-    							" (as an inverse to existing  " + inverseOfAddedProperty.getURI() + 
+    							" with predicate " + addedProperty.getURI() +
+    							" (as an inverse to existing  " + inverseOfAddedProperty.getURI() +
     							" statement" + ((additions.size() > 1) ? "s" : "") + ")");
     				}
-    				
+
     			} finally {
     				aboxModel.leaveCriticalSection();
     			}
             }
 		}
 	}
-	
+
 	private void deleteProperty(AtomicOntologyChange propObj) throws IOException{
-		
+
 		//logger.log("Processing a property deletion of property " + propObj.getSourceURI());
-		
+
 		OntProperty deletedProperty = oldTboxModel.getOntProperty(propObj.getSourceURI());
-		
+
 		if (deletedProperty == null && "Prop".equals(propObj.getNotes())) {
 			deletedProperty = (ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM)).createOntProperty(propObj.getSourceURI());
 		}
-		
+
 		if (deletedProperty == null ) {
 			logger.log("WARNING: didn't find deleted property " + propObj.getSourceURI() + " in oldTBoxModel");
 			return;
 		}
-		
+
 		OntProperty replacementProperty = null;
-		
+
 		if (!propObj.getNotes().equals("Delete")) {
-		
+
 			OntProperty parent =  deletedProperty.getSuperProperty();
-			
+
 			if (parent != null) {
 				replacementProperty = newTboxModel.getOntProperty(parent.getURI());
-				
+
 				while (replacementProperty == null) {
 					 parent = parent.getSuperProperty();
 					 if (parent == null) {
 						 break;
 					 }
-			    	 replacementProperty = newTboxModel.getOntProperty(parent.getURI()); 			
-				} 
+			    	 replacementProperty = newTboxModel.getOntProperty(parent.getURI());
+				}
 			}
 		}
-		
+
         Iterator<String> graphIt = dataset.listNames();
         while(graphIt.hasNext()) {
             String graph = graphIt.next();
@@ -541,9 +541,9 @@ public class ABoxUpdater {
             }
             Model aboxModel = dataset.getNamedModel(graph);
     		Model deletePropModel = ModelFactory.createDefaultModel();
-    		
+
     		if (replacementProperty == null) {
-    						
+
     			aboxModel.enterCriticalSection(Lock.WRITE);
     			try {
     				deletePropModel.add(aboxModel.listStatements((Resource) null, deletedProperty, (RDFNode) null));
@@ -554,34 +554,34 @@ public class ABoxUpdater {
     			record.recordRetractions(deletePropModel);
     			boolean plural = (deletePropModel.size() > 1);
     			if (deletePropModel.size() > 0) {
-    				logger.log("Removed " + deletePropModel.size() + " statement" + (plural ? "s" : "") + " with predicate " + 
+    				logger.log("Removed " + deletePropModel.size() + " statement" + (plural ? "s" : "") + " with predicate " +
     						propObj.getSourceURI());
     			}
     		} else {
     			AtomicOntologyChange chg = new AtomicOntologyChange(deletedProperty.getURI(), replacementProperty.getURI(), AtomicChangeType.RENAME, propObj.getNotes());
     			renameProperty(chg);
-    		}		
+    		}
         }
-		
+
 	}
-	
+
 	private void renameProperty(AtomicOntologyChange propObj) throws IOException {
-		
+
 		logger.log("Processing a property rename from: " + propObj.getSourceURI() + " to " + propObj.getDestinationURI());
-		
+
 		OntProperty oldProperty = oldTboxModel.getOntProperty(propObj.getSourceURI());
 		OntProperty newProperty = newTboxModel.getOntProperty(propObj.getDestinationURI());
-		
+
 		if (oldProperty == null) {
 			logger.logError("didn't find the " + propObj.getSourceURI() + " property in the old TBox");
 			return;
 		}
-		
+
 		if (newProperty == null) {
 			logger.logError("didn't find the " + propObj.getDestinationURI() + " property in the new TBox");
 			return;
 		}
-		
+
 		long start = System.currentTimeMillis();
         Iterator<String> graphIt = dataset.listNames();
         while(graphIt.hasNext()) {
@@ -590,14 +590,14 @@ public class ABoxUpdater {
                 continue;
             }
             Model aboxModel = dataset.getNamedModel(graph);
-		
+
     		Model renamePropAddModel = ModelFactory.createDefaultModel();
     		Model renamePropRetractModel = 	ModelFactory.createDefaultModel();
     		log.debug("renaming " + oldProperty.getURI() + " in graph " + graph);
     		aboxModel.enterCriticalSection(Lock.WRITE);
     		try {
     		    start = System.currentTimeMillis();
-    		    
+
 //    		    String queryStr = "CONSTRUCT { ?s <" + oldProperty.getURI() + "> ?o } WHERE { GRAPH<" + graph + "> { ?s <" + oldProperty.getURI() + "> ?o } } ";
 //    		    try {
 //    		        renamePropRetractModel = RDFServiceUtils.parseModel(rdfService.sparqlConstructQuery(queryStr, RDFService.ModelSerializationFormat.NTRIPLE), RDFService.ModelSerializationFormat.NTRIPLE);
@@ -627,21 +627,21 @@ public class ABoxUpdater {
     		} finally {
     			aboxModel.leaveCriticalSection();
     		}
-    		
+
     		record.recordAdditions(renamePropAddModel);
     		record.recordRetractions(renamePropRetractModel);
-    		
+
     		if (renamePropRetractModel.size() > 0) {
-    			logger.log("Changed " + renamePropRetractModel.size() + " statement" + 
+    			logger.log("Changed " + renamePropRetractModel.size() + " statement" +
     					((renamePropRetractModel.size() > 1) ? "s" : "") +
     					" with predicate " + propObj.getSourceURI() + " to use " +
-    					propObj.getDestinationURI() + " instead");		
+    					propObj.getDestinationURI() + " instead");
     		}
         }
-        
+
         tboxUpdater.renameProperty(propObj);
 	}
-	
+
 	public void logChanges(Statement oldStatement, Statement newStatement) throws IOException {
        logChange(oldStatement,false);
        logChange(newStatement,true);
@@ -655,13 +655,13 @@ public class ABoxUpdater {
     	return  " [subject = " + statement.getSubject().getURI() +
     			"] [property = " + statement.getPredicate().getURI() +
                 "] [object = " + (statement.getObject().isLiteral() ? ((Literal)statement.getObject()).getLexicalForm() + " (Literal)"
-                		                                          : ((Resource)statement.getObject()).getURI() + " (Resource)") + "]";	
-    }    
-	
+                		                                          : ((Resource)statement.getObject()).getURI() + " (Resource)") + "]";
+    }
+
     public static String stmtString(Resource subject, Property predicate, RDFNode object) {
     	return  " [subject = " + subject.getURI() +
     			"] [property = " + predicate.getURI() +
                 "] [object = " + (object.isLiteral() ? ((Literal)object).getLexicalForm() + " (Literal)"
-                		                             : ((Resource)object).getURI() + " (Resource)") + "]";	
-    }    
+                		                             : ((Resource)object).getURI() + " (Resource)") + "]";
+    }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/AtomicOntologyChange.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/AtomicOntologyChange.java
index 5765f7908..ab24a8af6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/AtomicOntologyChange.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/AtomicOntologyChange.java
@@ -3,14 +3,14 @@
 package edu.cornell.mannlib.vitro.webapp.ontology.update;
 
 /**
- * 
+ *
  * We need to document what is in source and destinationURI for each
  * change type.
  *
  */
 public class AtomicOntologyChange {
 
-	private String sourceURI;	
+	private String sourceURI;
 	private String destinationURI;
 	private AtomicChangeType atomicChangeType;
 	private String notes;
@@ -23,7 +23,7 @@ public class AtomicOntologyChange {
 	                            String destinationURI,
 	                            AtomicChangeType atomicChangeType,
 	                            String notes) {
-		
+
 		this.sourceURI = sourceURI;
 		this.destinationURI = destinationURI;
 		this.atomicChangeType = atomicChangeType;
@@ -35,7 +35,7 @@ public class AtomicOntologyChange {
 	    return "Source: " + sourceURI + "; Destination: " + destinationURI +
 	            "; Type: " + atomicChangeType + "; Notes:" + notes;
 	}
-	
+
 	/**
 	 * Contains the URI of a class or property in the previous version of
 	 * the ontology, or null if a new class or property was introduced
@@ -44,24 +44,24 @@ public class AtomicOntologyChange {
 	public String getSourceURI() {
 		return this.sourceURI;
 	}
-	
+
 	public void setSourceURI(String sourceURI) {
 		this.sourceURI = sourceURI;
 	}
-	
+
 	/**
-	 * Contains the URI of a class or property in the current version of 
+	 * Contains the URI of a class or property in the current version of
 	 * the ontology, or null if a class or property was removed from the
 	 * previous version of the ontology.
 	 */
 	public String getDestinationURI() {
 		return this.destinationURI;
 	}
-	
+
 	public void setDestinationURI(String destinationURI) {
 		this.destinationURI = destinationURI;
 	}
-	
+
 	public AtomicChangeType getAtomicChangeType() {
 		return atomicChangeType;
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ChangeLogger.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ChangeLogger.java
index ecb164c9e..8f6a57edf 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ChangeLogger.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ChangeLogger.java
@@ -7,13 +7,13 @@ import java.io.IOException;
 public interface ChangeLogger {
 
 	public void log(String logMessage) throws IOException;
-	
+
 	public void logWithDate(String logMessage) throws IOException;
-	
+
 	public void logError(String errorMessage) throws IOException;
-	
+
 	public void closeLogs() throws IOException;
-	
+
 	public boolean errorsWritten();
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ChangeRecord.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ChangeRecord.java
index 091b10cfc..ce2632e3c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ChangeRecord.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/ChangeRecord.java
@@ -5,13 +5,13 @@ package edu.cornell.mannlib.vitro.webapp.ontology.update;
 import org.apache.jena.rdf.model.Model;
 
 public interface ChangeRecord {
-	
+
 	public void recordAdditions(Model incrementalAdditions);
-	
+
 	public void recordRetractions(Model incrementalRetractions);
-	
+
 	public void writeChanges();
-	
+
 	public boolean hasRecordedChanges();
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java
index 5c5ec1f08..d2edb4dcb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java
@@ -48,29 +48,29 @@ import edu.cornell.mannlib.vitro.webapp.utils.jena.JenaIngestUtils;
 public class KnowledgeBaseUpdater {
 
 	private final Log log = LogFactory.getLog(KnowledgeBaseUpdater.class);
-	
+
 	private UpdateSettings settings;
 	private ChangeLogger logger;
 	private ChangeRecord record;
-	
+
 	public KnowledgeBaseUpdater(UpdateSettings settings) {
 		this.settings = settings;
 		this.logger = null;
 		this.record = new SimpleChangeRecord(settings.getAddedDataFile(), settings.getRemovedDataFile());
 	}
-	
-	public boolean update(ServletContext servletContext) throws IOException {	
-					
+
+	public boolean update(ServletContext servletContext) throws IOException {
+
 		if (this.logger == null) {
 			this.logger = new SimpleChangeLogger(settings.getLogFile(),	settings.getErrorLogFile());
 		}
-			
+
 		long startTime = System.currentTimeMillis();
         log.info("Performing any necessary data migration");
         logger.log("Started knowledge base migration");
-		
+
         boolean changesPerformed = false;
-        
+
 		try {
 		     changesPerformed = performUpdate(servletContext);
 		} catch (Exception e) {
@@ -82,46 +82,46 @@ public class KnowledgeBaseUpdater {
 			assertSuccess(servletContext);
 	    	logger.logWithDate("Finished knowledge base migration");
 		}
-		
+
 		record.writeChanges();
 		logger.closeLogs();
 
-		long elapsedSecs = (System.currentTimeMillis() - startTime)/1000;		
+		long elapsedSecs = (System.currentTimeMillis() - startTime)/1000;
 		log.info("Finished checking knowledge base in " + elapsedSecs + " second" + (elapsedSecs != 1 ? "s" : ""));
-		
+
 		// The following was removed because it forced a recompute even if only
 		// annotation values changed:
 		// return record.hasRecordedChanges();
-		
+
 		return changesPerformed;
 	}
-	
+
 	// returns true if ontology changes were found
 	private boolean performUpdate(ServletContext servletContext) throws Exception {
-		
+
 		List<AtomicOntologyChange> rawChanges = getAtomicOntologyChanges();
-		
+
 		AtomicOntologyChangeLists changes = new AtomicOntologyChangeLists(rawChanges,settings.getNewTBoxModel(),settings.getOldTBoxModel());
-	        	
+
 		// update ABox data any time
     	log.debug("performing SPARQL CONSTRUCT additions");
     	performSparqlConstructs(settings.getSparqlConstructAdditionsDir(), settings.getRDFService(), ADD);
-    	
+
         log.debug("performing SPARQL CONSTRUCT retractions");
         performSparqlConstructs(settings.getSparqlConstructDeletionsDir(), settings.getRDFService(), RETRACT);
-        
+
         log.info("\tchecking the abox");
         updateABox(changes);
-        
+
         log.debug("performing post-processing SPARQL CONSTRUCT additions");
-        performSparqlConstructs(settings.getSparqlConstructAdditionsDir() + "/post/", 
+        performSparqlConstructs(settings.getSparqlConstructAdditionsDir() + "/post/",
                 settings.getRDFService(), ADD);
-        
+
         log.debug("performing post-processing SPARQL CONSTRUCT retractions");
-        performSparqlConstructs(settings.getSparqlConstructDeletionsDir() + "/post/", 
+        performSparqlConstructs(settings.getSparqlConstructDeletionsDir() + "/post/",
                 settings.getRDFService(), RETRACT);
-        
-        
+
+
         // Only modify the TBox and migration metadata the first time
         if(updateRequired(servletContext)) {
             //process the TBox before the ABox
@@ -130,18 +130,18 @@ public class KnowledgeBaseUpdater {
                 updateTBoxAnnotations();
             } catch (Exception e) {
                 log.error(e,e);
-            }          
+            }
         }
-        
+
         return !rawChanges.isEmpty();
 
 	}
-	
+
     private static final boolean ADD = true;
     private static final boolean RETRACT = !ADD;
-	
+
     /**
-     * Performs a set of arbitrary SPARQL CONSTRUCT queries on the 
+     * Performs a set of arbitrary SPARQL CONSTRUCT queries on the
      * data, for changes that cannot be expressed as simple property
      * or class additions, deletions, or renamings.
      * Blank nodes created by the queries are given random URIs.
@@ -149,14 +149,14 @@ public class KnowledgeBaseUpdater {
 	 * @param rdfService RDF Service to use
 	 * @param add (add = true; retract = false)
 	 */
-    private void performSparqlConstructs(String sparqlConstructDir, 
+    private void performSparqlConstructs(String sparqlConstructDir,
             RDFService rdfService,
             boolean add)   throws IOException {
         Dataset dataset = new RDFServiceDataset(rdfService);
         File sparqlConstructDirectory = new File(sparqlConstructDir);
         log.debug("Using SPARQL CONSTRUCT directory " + sparqlConstructDirectory);
         if (!sparqlConstructDirectory.isDirectory()) {
-            String logMsg = this.getClass().getName() + 
+            String logMsg = this.getClass().getName() +
                     "performSparqlConstructs() expected to find a directory " +
                     " at " + sparqlConstructDir + ". Unable to execute " +
                     " SPARQL CONSTRUCTS.";
@@ -167,7 +167,7 @@ public class KnowledgeBaseUpdater {
         List<File> sparqlFiles = Arrays.asList(sparqlConstructDirectory.listFiles());
         Collections.sort(sparqlFiles); // queries may depend on being run in a certain order
         JenaIngestUtils jiu = new JenaIngestUtils();
-        for (File sparqlFile : sparqlFiles) {	
+        for (File sparqlFile : sparqlFiles) {
             if(sparqlFile.isDirectory()) {
                 continue;
             }
@@ -184,40 +184,40 @@ public class KnowledgeBaseUpdater {
                 logger.log(logMsg);
                 log.info(logMsg);
                 continue;
-            }   
+            }
             Model anonModel = ModelFactory.createDefaultModel();
             try {
                 log.debug("\t\tprocessing SPARQL construct query from file " + sparqlFile.getName());
-                
+
                 anonModel = RDFServiceUtils.parseModel(
-                        rdfService.sparqlConstructQuery(fileContents.toString(), 
-                                RDFService.ModelSerializationFormat.NTRIPLE), 
+                        rdfService.sparqlConstructQuery(fileContents.toString(),
+                                RDFService.ModelSerializationFormat.NTRIPLE),
                                 ModelSerializationFormat.NTRIPLE);
 
                 long num = anonModel.size();
                 if (num > 0) {
-                    String logMsg = (add ? "Added " : "Removed ") + num + 
-                            " statement"  + ((num > 1) ? "s" : "") + 
-                            " using the SPARQL construct query from file " + 
+                    String logMsg = (add ? "Added " : "Removed ") + num +
+                            " statement"  + ((num > 1) ? "s" : "") +
+                            " using the SPARQL construct query from file " +
                             sparqlFile.getParentFile().getName() +
                             "/" + sparqlFile.getName();
                     logger.log(logMsg);
                     log.info(logMsg);
                 }
-        
+
             } catch (Exception e) {
-                logger.logError(this.getClass().getName() + 
+                logger.logError(this.getClass().getName() +
                         ".performSparqlConstructs() unable to execute " +
                         "query at " + sparqlFile + ". Error message is: " + e.getMessage());
                 log.error(e,e);
             }
-        
+
             if(!add) {
                 StmtIterator sit = anonModel.listStatements();
                 while (sit.hasNext()) {
                     Statement stmt = sit.nextStatement();
-                    // Skip statements with blank nodes (unsupported) to avoid 
-                    // excessive deletion.  In the future, the whole updater 
+                    // Skip statements with blank nodes (unsupported) to avoid
+                    // excessive deletion.  In the future, the whole updater
                     // could be modified to change whole graphs at once through
                     // the RDFService, but right now this whole thing is statement
                     // based.
@@ -235,7 +235,7 @@ public class KnowledgeBaseUpdater {
                             writeModel.remove(stmt);
                         }
                     }
-                }            
+                }
                 record.recordRetractions(anonModel);
                 //log.info("removed " + anonModel.size() + " statements from SPARQL CONSTRUCTs");
             } else {
@@ -245,21 +245,21 @@ public class KnowledgeBaseUpdater {
                         anonModel, settings.getDefaultNamespace() + "n", dedupeModel);
                 additions = stripBadURIs(additions);
                 Model actualAdditions = ModelFactory.createDefaultModel();
-                StmtIterator stmtIt = additions.listStatements();      
+                StmtIterator stmtIt = additions.listStatements();
                 while (stmtIt.hasNext()) {
                     Statement stmt = stmtIt.nextStatement();
                     if (!writeModel.contains(stmt)) {
                         actualAdditions.add(stmt);
                     }
-                }      
+                }
                 writeModel.add(actualAdditions);
                 //log.info("added " + actualAdditions.size() + " statements from SPARQL CONSTRUCTs");
                 record.recordAdditions(actualAdditions);
             }
-            
+
         }
     }
-    
+
     private Model stripBadURIs(Model additions) {
         Model badURITriples = ModelFactory.createDefaultModel();
         StmtIterator stmtIt = additions.listStatements();
@@ -283,32 +283,32 @@ public class KnowledgeBaseUpdater {
                         log.error("Discarding added triple " + stmt + " because " +
                                   "it includes one or more invalid URIs.");
                         break;
-                    } 
+                    }
                 }
             }
         }
         additions.remove(badURITriples);
         return additions;
     }
-	
-	private List<AtomicOntologyChange> getAtomicOntologyChanges() 
+
+	private List<AtomicOntologyChange> getAtomicOntologyChanges()
 			throws IOException {
 		return (new OntologyChangeParser(logger)).parseFile(settings.getDiffFile());
 	}
-	
 
-	
-	private void updateABox(AtomicOntologyChangeLists changes) 
+
+
+	private void updateABox(AtomicOntologyChangeLists changes)
 			throws IOException {
-		
-	
+
+
 		ABoxUpdater aboxUpdater = new ABoxUpdater(settings, logger, record);
 		aboxUpdater.processPropertyChanges(changes.getAtomicPropertyChanges());
 		aboxUpdater.processClassChanges(changes.getAtomicClassChanges());
 	}
-	
+
 	private void updateTBoxAnnotations() {
-		TBoxUpdater tboxUpdater = new TBoxUpdater(settings, logger, record);         
+		TBoxUpdater tboxUpdater = new TBoxUpdater(settings, logger, record);
 		try {
 		    tboxUpdater.modifyPropertyQualifications();
 		} catch (Exception e) {
@@ -320,19 +320,19 @@ public class KnowledgeBaseUpdater {
 		    log.error("Unable to update default annotation values ", e);
 		}
 	}
-	
+
 	/**
 	 * Executes a SPARQL ASK query to determine whether the knowledge base
 	 * needs to be updated to conform to a new ontology version
 	 */
 	public boolean updateRequired(ServletContext servletContext) throws IOException {
 		boolean required = true;
-		
+
 		String sparqlQueryStr = loadSparqlQuery(settings.getAskUpdatedQueryFile());
 		if (sparqlQueryStr == null) {
 			return required;
 		}
-		
+
 		RDFService rdfService = ModelAccess.on(servletContext).getRDFService();
 
 		// if the ASK query DOES have a solution (i.e. the assertions exist
@@ -344,77 +344,77 @@ public class KnowledgeBaseUpdater {
 			} else {
 				required = true;
 				if (JenaDataSourceSetupBase.isFirstStartup()) {
-					assertSuccess(servletContext);  
+					assertSuccess(servletContext);
 					log.info("The application is starting with an empty database. " +
 					         "An indication will be added to the database that a " +
 					         "knowledge base migration to the current version is " +
 					         "not required.");
-				    required = false;	
+				    required = false;
 				}
-			}		   
+			}
 		} catch (RDFServiceException e) {
-			log.error("error trying to execute query to find out if knowledge base update is required",e); 
+			log.error("error trying to execute query to find out if knowledge base update is required",e);
 		}
-		
-		return required; 
+
+		return required;
 	}
-	
+
 	/**
 	 * loads a SPARQL ASK query from a text file
 	 * @param filePath Path of a file
 	 * @return the query string or null if file not found
 	 */
 	public static String loadSparqlQuery(String filePath) throws IOException {
-		
-		File file = new File(filePath);	
+
+		File file = new File(filePath);
 		if (!file.exists()) {
 			throw new RuntimeException("SPARQL file not found at " + filePath);
 		}
 		BufferedReader reader = new BufferedReader(new FileReader(file));
 		StringBuilder fileContents = new StringBuilder();
-		String ln;		
+		String ln;
 		while ((ln = reader.readLine()) != null) {
 			fileContents.append(ln).append('\n');
 		}
-		return fileContents.toString();				
+		return fileContents.toString();
 	}
-	
+
 	private void assertSuccess(ServletContext servletContext) throws FileNotFoundException, IOException {
-		try {				
+		try {
 			RDFService rdfService = ModelAccess.on(servletContext).getRDFService();
-			
+
 			ChangeSet changeSet = rdfService.manufactureChangeSet();
-		    File successAssertionsFile = new File(settings.getSuccessAssertionsFile()); 
-		    InputStream inStream = new FileInputStream(successAssertionsFile);		    
+		    File successAssertionsFile = new File(settings.getSuccessAssertionsFile());
+		    InputStream inStream = new FileInputStream(successAssertionsFile);
 		    changeSet.addAddition(inStream, RDFService.ModelSerializationFormat.N3, ModelNames.APPLICATION_METADATA);
-			rdfService.changeSetUpdate(changeSet);	
+			rdfService.changeSetUpdate(changeSet);
 		} catch (Exception e) {
 			log.error("unable to make RDF assertions about successful " +
 					" update to new ontology version: ", e);
-		}		
+		}
 	}
-	
+
 	public static boolean isUpdatableABoxGraph(String graphName) {
-	    return (graphName != null && !graphName.contains("tbox") 
-	            && !graphName.contains("filegraph") 
+	    return (graphName != null && !graphName.contains("tbox")
+	            && !graphName.contains("filegraph")
 	            && !graphName.contains("x-arq:UnionGraph"));
 	}
 
 	/**
 	 * A class that allows to access two different ontology change lists,
-	 * one for class changes and the other for property changes.  The 
+	 * one for class changes and the other for property changes.  The
 	 * constructor will split a list containing both types of changes.
 	 * @author bjl23
 	 *
 	 */
 	private class AtomicOntologyChangeLists {
-		
-		private List<AtomicOntologyChange> atomicClassChanges = 
+
+		private List<AtomicOntologyChange> atomicClassChanges =
 				new ArrayList<AtomicOntologyChange>();
 
 		private List<AtomicOntologyChange> atomicPropertyChanges =
 				new ArrayList<AtomicOntologyChange>();
-		
+
 		public AtomicOntologyChangeLists (
 				List<AtomicOntologyChange> changeList, OntModel newTboxModel,
 				OntModel oldTboxModel) throws IOException {
@@ -454,14 +454,14 @@ public class KnowledgeBaseUpdater {
 			}
 			//logger.log("Property and Class change Object lists have been created");
 		}
-		
+
 		public List<AtomicOntologyChange> getAtomicClassChanges() {
 			return atomicClassChanges;
 		}
 
 		public List<AtomicOntologyChange> getAtomicPropertyChanges() {
 			return atomicPropertyChanges;
-		}		
-		
-	}	
+		}
+
+	}
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyChangeParser.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyChangeParser.java
index 7c5e48d52..fd25d3c60 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyChangeParser.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/OntologyChangeParser.java
@@ -19,7 +19,7 @@ import edu.cornell.mannlib.vitro.webapp.ontology.update.AtomicOntologyChange.Ato
 
 /**
  * Performs parsing on Prompt output and provides change object list.
- * 
+ *
  * @author ass92
  *
  */
@@ -27,20 +27,20 @@ import edu.cornell.mannlib.vitro.webapp.ontology.update.AtomicOntologyChange.Ato
 public class OntologyChangeParser {
 
     private final Log log = LogFactory.getLog(OntologyChangeParser.class);
-    
+
 	private ChangeLogger logger;
-	
+
 	public OntologyChangeParser(ChangeLogger logger) {
 		this.logger = logger;
 	}
-		
+
 	/**
 	 * @param diffPath Diff path
 	 */
-	
+
 	@SuppressWarnings({ "unchecked", "null", "static-access" })
 	public ArrayList<AtomicOntologyChange> parseFile(String diffPath) throws IOException{
-		
+
 		AtomicOntologyChange changeObj;
 		ArrayList<AtomicOntologyChange> changeObjects = new ArrayList<AtomicOntologyChange>();
 		int countColumns = 0;
@@ -48,7 +48,7 @@ public class OntologyChangeParser {
 		String rename = null;
 		String sourceURI = null;
 		String destinationURI = null;
-		StringTokenizer stArr = null; 
+		StringTokenizer stArr = null;
 		FileInputStream in = new FileInputStream(new File(diffPath));
 
 		CSVParser readFile = new CSVParser(new InputStreamReader(in),
@@ -82,7 +82,7 @@ public class OntologyChangeParser {
 				if ("Yes".equals(record.get(2))) {
 					changeObj.setAtomicChangeType(AtomicChangeType.RENAME);
 				} else if ("Delete".equals(record.get(3))) {
-					changeObj.setAtomicChangeType(AtomicChangeType.DELETE); 
+					changeObj.setAtomicChangeType(AtomicChangeType.DELETE);
 				} else if ("Add".equals(record.get(3))) {
 					changeObj.setAtomicChangeType(AtomicChangeType.ADD);
 				} else {
@@ -91,13 +91,13 @@ public class OntologyChangeParser {
 				}
 
 			    log.debug(changeObj);
-				
+
 				changeObjects.add(changeObj);
 			}
 		}
 
 		readFile.close();
-		
+
 		if (changeObjects.size() == 0) {
 			logger.log("No ABox updates are required.");
 		}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/SimpleChangeLogger.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/SimpleChangeLogger.java
index 428f837b8..04edeef53 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/SimpleChangeLogger.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/SimpleChangeLogger.java
@@ -14,9 +14,9 @@ public class SimpleChangeLogger implements ChangeLogger {
 
 	private Writer logWriter;
 	private Writer errorWriter;
-	
+
 	private boolean errorsWritten = false;
-	
+
 	public SimpleChangeLogger( String logPath, String errorPath ) {
 		File logFile = new File(logPath);
 		File errorFile = new File(errorPath);
@@ -36,15 +36,15 @@ public class SimpleChangeLogger implements ChangeLogger {
 		className = className.substring(className.lastIndexOf('.') + 1 );
 		//String methodName = ((StackTraceElement)elements[1]).getMethodName();
 		//logWriter.write(className + "." + methodName +  ":  " + logMessage + "\n\n");
-		
+
 		Date now = new Date();
 		SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
 		logWriter.write(formatter.format(now) + " " + className + ":  " + logMessage + "\n\n");
-		logWriter.flush();		
+		logWriter.flush();
 	}
 
 	public void logWithDate(String logMessage) throws IOException {
-		
+
 		Exception e = new Exception();
 		StackTraceElement[] elements = e.getStackTrace();
 		String className = ((StackTraceElement)elements[1]).getClassName();
@@ -52,7 +52,7 @@ public class SimpleChangeLogger implements ChangeLogger {
 		Date now = new Date();
 		SimpleDateFormat formatter = new SimpleDateFormat("MMM dd, yyyy hh:mm a z");
 		logWriter.write(formatter.format(now) + " " + className + ":  " + logMessage + "\n\n");
-		logWriter.flush();		
+		logWriter.flush();
 	}
 
 	public void logError(String errorMessage) throws IOException {
@@ -63,19 +63,19 @@ public class SimpleChangeLogger implements ChangeLogger {
 		String className = ((StackTraceElement)elements[1]).getClassName();
 		className = className.substring(className.lastIndexOf('.') + 1 );
 		String methodName = ((StackTraceElement)elements[1]).getMethodName();
-		int lineNumber = ((StackTraceElement)elements[1]).getLineNumber(); 
+		int lineNumber = ((StackTraceElement)elements[1]).getLineNumber();
 
 		errorWriter.write(className + "." + methodName +  " line " + lineNumber + ":  " + errorMessage + "\n");
 		errorWriter.flush();
 	}
-	
+
 	public void closeLogs() throws IOException {
 		logWriter.flush();
 		logWriter.close();
 		errorWriter.flush();
 		errorWriter.close();
 	}
-	
+
 	public boolean errorsWritten() {
 		return errorsWritten;
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/SimpleChangeRecord.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/SimpleChangeRecord.java
index 0f0c2eba2..6516e72ff 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/SimpleChangeRecord.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/SimpleChangeRecord.java
@@ -16,37 +16,37 @@ import org.apache.jena.rdf.model.ModelFactory;
 
 public class SimpleChangeRecord implements ChangeRecord {
 
-	private final static Log log = 
+	private final static Log log =
 			LogFactory.getLog(SimpleChangeRecord.class);
-	
+
 	private final static String RDF_SYNTAX = "N3";
-	
+
 	private Model additionsModel = ModelFactory.createDefaultModel();
 	private Model retractionsModel = ModelFactory.createDefaultModel();
 	private File additionsFile;
 	private File retractionsFile;
-	
+
 	private int additionsCount = 0;
 	private int retractionsCount = 0;
-	
+
 	public SimpleChangeRecord(
 			String additionsFile, String retractionsFile) {
 		this.additionsFile = new File(additionsFile);
 		try {
 			FileWriter test = new FileWriter(additionsFile);
 		} catch (IOException ioe) {
-				throw new RuntimeException(this.getClass().getName() + 
+				throw new RuntimeException(this.getClass().getName() +
 					" unable to create required file at " + additionsFile);
-		}	
+		}
 		this.retractionsFile = new File(retractionsFile);
-		try { 
+		try {
 			FileWriter test = new FileWriter(retractionsFile);
 		} catch (IOException ioe) {
-			throw new RuntimeException(this.getClass().getName() + 
-					" unable to create required file at " + retractionsFile);			
+			throw new RuntimeException(this.getClass().getName() +
+					" unable to create required file at " + retractionsFile);
 		}
 	}
-	
+
 	public void recordAdditions(Model incrementalAdditions) {
 		additionsModel.add(incrementalAdditions);
 	    additionsCount += incrementalAdditions.size();
@@ -56,17 +56,17 @@ public class SimpleChangeRecord implements ChangeRecord {
 		retractionsModel.add(incrementalRetractions);
 		retractionsCount += incrementalRetractions.size();
 	}
-	
+
 	private void write(Model model, File file) {
 		try {
 			FileOutputStream fos = new FileOutputStream(file);
 			model.write(fos, RDF_SYNTAX);
 		} catch (FileNotFoundException fnfe) {
-			log.error(this.getClass().getName() + 
+			log.error(this.getClass().getName() +
 					  " unable to write to RDF file", fnfe);
 		}
 	}
-	
+
 	public void writeChanges() {
 		if (additionsModel.size() > 0) {
 			write(additionsModel, additionsFile);
@@ -75,7 +75,7 @@ public class SimpleChangeRecord implements ChangeRecord {
 			write(retractionsModel, retractionsFile);
 		}
 	}
-	
+
 	public boolean hasRecordedChanges() {
 	    return additionsCount > 0 || retractionsCount > 0;
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/TBoxUpdater.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/TBoxUpdater.java
index 93f445861..2a082be80 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/TBoxUpdater.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/TBoxUpdater.java
@@ -33,10 +33,10 @@ import org.apache.jena.vocabulary.RDFS;
 
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 
-/**  
+/**
  * Performs knowledge base updates to the tbox to align with a new ontology version
- *   
- */ 
+ *
+ */
 public class TBoxUpdater {
 
     private static final Log log = LogFactory.getLog(TBoxUpdater.class);
@@ -45,7 +45,7 @@ public class TBoxUpdater {
     private OntModel oldTboxAnnotationsModel;
     private OntModel newTboxAnnotationsModel;
     private OntModel siteModel;
-    private ChangeLogger logger;  
+    private ChangeLogger logger;
     private ChangeRecord record;
     private boolean detailLogs = false;
 
@@ -55,15 +55,15 @@ public class TBoxUpdater {
     private Property inClassGroupProp = (ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM)).createProperty(inClassGroupURI);
 
     /**
-     * 
-     * Constructor 
+     *
+     * Constructor
      *
      * @param   settings     - update settings
      * @param   logger       - for writing to the change log
      *                         and the error log.
-     * @param   record       - for writing to the additions model 
+     * @param   record       - for writing to the additions model
      *                         and the retractions model.
-     *                    
+     *
      */
     public TBoxUpdater(UpdateSettings settings,
             ChangeLogger logger,
@@ -81,35 +81,35 @@ public class TBoxUpdater {
      * to use any applicable settings from obsolete subproperties
      */
     public void modifyPropertyQualifications() throws IOException {
- 
+
     }
-    
+
     public void updateDefaultAnnotationValues() throws IOException {
         updateDefaultAnnotationValues(null);
     }
 
     /**
-     * 
-     * Update a knowledge base to align with changes to vitro annotation property default 
+     *
+     * Update a knowledge base to align with changes to vitro annotation property default
      * values in a new version of the ontology. The two versions of the ontology and the
      * knowledge base to be updated are provided in the class constructor and are
-     * referenced via class level variables. 
-     *                    
-     * If the default value (i.e. the value that is provided in the vivo-core 
+     * referenced via class level variables.
+     *
+     * If the default value (i.e. the value that is provided in the vivo-core
      * annotations files) of a vitro annotation property has been changed for a vivo
      * core class, and that default value has not been changed in the site knowledge
      * base, then update the value in the site knowledge base to be the new default.
-     * Also, if a new vitro annotation property setting (i.e. either an existing 
+     * Also, if a new vitro annotation property setting (i.e. either an existing
      * setting applied to an existing class where it wasn't applied before, or
      * an existing setting applied to a new class) has been applied to a vivo
      * core class then copy that new property statement into the site model.
      * If a property setting for a class exists in the old ontology but
      * not in the new one, then that statement will be removed from the
      * site knowledge base.
-     *                    
+     *
      *  Writes to the change log file, the error log file, and the incremental change
-     *  knowledge base.                  
-     *  
+     *  knowledge base.
+     *
      *  Note: as specified, this method for now assumes that no new vitro annotation
      *  properties have been introduced. This should be updated for future versions.
      */
@@ -123,14 +123,14 @@ public class TBoxUpdater {
             Model retractions = ModelFactory.createDefaultModel();
 
             //  Update defaults values for vitro annotation properties in the site model
-            //  if the default has changed in the new version of the ontology AND if 
+            //  if the default has changed in the new version of the ontology AND if
             //  the site hasn't overidden the previous default in their knowledge base.
 
             if(oldTboxAnnotationsModel == null) {
                 logger.log("oldTboxAnnotationModel is null; aborting update of annotation values");
                 return;
             }
-            
+
             Resource subj = (subjectURI == null) ? null : ResourceFactory.createResource(subjectURI);
 
             StmtIterator iter = oldTboxAnnotationsModel.listStatements(subj, null, (RDFNode) null);
@@ -142,8 +142,8 @@ public class TBoxUpdater {
                 Property predicate = stmt.getPredicate();
                 RDFNode oldObject = stmt.getObject();
 
-                if (! ( (RDFS.getURI().equals(predicate.getNameSpace())) || 
-                        (VitroVocabulary.vitroURI.equals(predicate.getNameSpace())) 
+                if (! ( (RDFS.getURI().equals(predicate.getNameSpace())) ||
+                        (VitroVocabulary.vitroURI.equals(predicate.getNameSpace()))
                         ) ) {
                     // this annotation updater is only concerned with properties
                     // such as rdfs:comment and properties in the vitro application
@@ -161,7 +161,7 @@ public class TBoxUpdater {
                     if (siteObjects.size() > 1) {
                         /*
 					 logger.log("WARNING: found " + siteObjects.size() +
-					 		 " statements with subject = " + subject.getURI() + 
+					 		 " statements with subject = " + subject.getURI() +
 							 " and property = " + predicate.getURI() +
 							 " in the site database (maximum of one is expected)");
                          */
@@ -170,11 +170,11 @@ public class TBoxUpdater {
                     if (siteObjects.size() > 0) {
                         RDFNode siteNode = siteObjects.get(0);
                         if (siteNode.equals(oldObject)) {
-                            retractions.add(siteModel.listStatements(subject, predicate, (RDFNode) null));		 
+                            retractions.add(siteModel.listStatements(subject, predicate, (RDFNode) null));
                         }
                     }
 
-                    continue;				 			 
+                    continue;
                 }
 
                 RDFNode newObject = newObjects.next();
@@ -183,19 +183,19 @@ public class TBoxUpdater {
                 while (newObjects.hasNext()) {
                     i++;
                     newObjects.next();
-                } 
+                }
 
                 if (i > 1) {
                     /*
 				 logger.log("WARNING: found " + i +
-						 " statements with subject = " + subject.getURI() + 
+						 " statements with subject = " + subject.getURI() +
 						 " and property = " + predicate.getURI() +
 						 " in the new version of the annotations ontology (maximum of one is expected)");
-                     */		 
-                    continue; 
+                     */
+                    continue;
                 }
 
-                // If a subject-property pair occurs in the old annotation TBox and the new annotations 
+                // If a subject-property pair occurs in the old annotation TBox and the new annotations
                 // TBox, but not in the site model, then it is considered an erroneous deletion and
                 // the value from the new TBox is added into the site model.
                 // sjm: 7-16-2010. We want this here now to add back in annotations mistakenly dropped
@@ -211,13 +211,13 @@ public class TBoxUpdater {
                         if (detailLogs) {
                             logger.log( "adding Statement: subject = " + subject.getURI() +
                                     " property = " + predicate.getURI() +
-                                    " object = " + (newObject.isLiteral() ?  ((Literal)newObject).getLexicalForm() 
-                                            : ((Resource)newObject).getURI()));	
+                                    " object = " + (newObject.isLiteral() ?  ((Literal)newObject).getLexicalForm()
+                                            : ((Resource)newObject).getURI()));
                         }
                     } catch (Exception e) {
                         logger.logError("Error trying to add statement with property " + predicate.getURI() +
                                 " of class = " + subject.getURI() + " in the knowledge base:\n" + e.getMessage());
-                    }				 
+                    }
 
                     continue;
                 }
@@ -229,28 +229,28 @@ public class TBoxUpdater {
 
                     i = 1;
                     while (siteObjects.hasNext()) {
-                        i++; 
+                        i++;
                         siteObjects.next();
-                    } 
+                    }
 
                     if (i > 1) {
                         /*
 					 logger.log("WARNING: found " + i +
-							 " statements with subject = " + subject.getURI() + 
+							 " statements with subject = " + subject.getURI() +
 							 " and property = " + predicate.getURI() +
-							 " in the site annotations model (maximum of one is expected) "); 
+							 " in the site annotations model (maximum of one is expected) ");
                          */
-                        continue; 
+                        continue;
                     }
 
                     if (siteObject.equals(oldObject)) {
                         try {
                             StmtIterator it = siteModel.listStatements(subject, predicate, (RDFNode)null);
                             while (it.hasNext()) {
-                                retractions.add(it.next());	
+                                retractions.add(it.next());
                             }
                         } catch (Exception e) {
-                            logger.logError("Error removing statement for subject = " + subject.getURI() + 
+                            logger.logError("Error removing statement for subject = " + subject.getURI() +
                                     "and property = " + predicate.getURI() +
                                     "from the knowledge base:\n" + e.getMessage());
                         }
@@ -260,10 +260,10 @@ public class TBoxUpdater {
 
                             if (detailLogs) {
                                 logger.log("Changed the value of property "  + predicate.getURI() +
-                                        " of subject = " + subject.getURI() + 
+                                        " of subject = " + subject.getURI() +
                                         " from " +
-                                        (oldObject.isResource() ? ((Resource)oldObject).getURI() : ((Literal)oldObject).getLexicalForm()) +								
-                                        " to " + 
+                                        (oldObject.isResource() ? ((Resource)oldObject).getURI() : ((Literal)oldObject).getLexicalForm()) +
+                                        " to " +
                                         (newObject.isResource() ? ((Resource)newObject).getURI() : ((Literal)newObject).getLexicalForm()) +
                                         " in the knowledge base:\n");
                             }
@@ -272,7 +272,7 @@ public class TBoxUpdater {
                                     " of class = " + subject.getURI() + " in the knowledge base:\n" + e.getMessage());
                         }
                     }
-                }		  
+                }
             }
 
             Model actualAdditions = additions.difference(retractions);
@@ -287,7 +287,7 @@ public class TBoxUpdater {
 
             // log summary of changes
             if (numAdded > 0) {
-                logger.log("Updated the default vitro annotation value for " + 
+                logger.log("Updated the default vitro annotation value for " +
                         numAdded + " statements in the knowledge base");
             }
 
@@ -298,7 +298,7 @@ public class TBoxUpdater {
 
             //	   Copy annotation property settings that were introduced in the new ontology
             //     into the site model.
-            //		  
+            //
 
             Model newAnnotationSettings = newTboxAnnotationsModel.difference(oldTboxAnnotationsModel);
             Model newAnnotationSettingsToAdd = ModelFactory.createDefaultModel();
@@ -311,8 +311,8 @@ public class TBoxUpdater {
                     if (detailLogs) {
                         logger.log( "adding Statement: subject = " + stmt.getSubject().getURI() +
                                 " property = " + stmt.getPredicate().getURI() +
-                                " object = " + (stmt.getObject().isLiteral() ?  ((Literal)stmt.getObject()).getLexicalForm() 
-                                        : ((Resource)stmt.getObject()).getURI()));	
+                                " object = " + (stmt.getObject().isLiteral() ?  ((Literal)stmt.getObject()).getLexicalForm()
+                                        : ((Resource)stmt.getObject()).getURI()));
                     }
                 }
             }
@@ -334,34 +334,34 @@ public class TBoxUpdater {
     }
 
     /**
-     * 
-     * Update a knowledge base to align with changes to the vitro annotation model  
+     *
+     * Update a knowledge base to align with changes to the vitro annotation model
      * in a new version of the ontology. The two versions of the ontology and the
      * knowledge base to be updated are provided in the class constructor and are
-     * referenced via class level variables. 
-     *                    
+     * referenced via class level variables.
+     *
      * Currently, this method only handles deletions of a ClassGroup
-     *                    
+     *
      *  Writes to the change log file, the error log file, and the incremental change
-     *  knowledge base.                  
-     *  
-     */	
+     *  knowledge base.
+     *
+     */
     public void updateAnnotationModel() throws IOException {
 
-        // for each ClassGroup in the old vitro annotations model: if it is not in 
-        // the new vitro annotations model and the site has no classes asserted to 
+        // for each ClassGroup in the old vitro annotations model: if it is not in
+        // the new vitro annotations model and the site has no classes asserted to
         // be in that class group then delete it.
 
         removeObsoleteAnnotations();
 
         siteModel.enterCriticalSection(Lock.WRITE);
 
-        try {	
+        try {
             Model retractions = ModelFactory.createDefaultModel();
 
             StmtIterator iter = oldTboxAnnotationsModel.listStatements((Resource) null, RDF.type, classGroupClass);
 
-            while (iter.hasNext()) {  
+            while (iter.hasNext()) {
                 Statement stmt = iter.next();
 
                 if (!newTboxAnnotationsModel.contains(stmt) && !usesGroup(siteModel, stmt.getSubject())) {
@@ -370,22 +370,22 @@ public class TBoxUpdater {
                     long post = retractions.size();
                     if ((post - pre) > 0) {
                         logger.log("Removed the " + stmt.getSubject().getURI() + " ClassGroup from the annotations model");
-                    }  
+                    }
                 }
             }
 
             if (retractions.size() > 0) {
                 siteModel.remove(retractions);
                 record.recordRetractions(retractions);
-            }   
+            }
 
         } finally {
             siteModel.leaveCriticalSection();
         }
 
         // If we were going to handle add, this is the logic:
-        // for each ClassGroup in new old vitro annotations model: if it is not in 
-        // the old vitro annotations and it is not in the site model, then 
+        // for each ClassGroup in new old vitro annotations model: if it is not in
+        // the old vitro annotations and it is not in the site model, then
         // add it.
 
     }
@@ -394,7 +394,7 @@ public class TBoxUpdater {
 
         model.enterCriticalSection(Lock.READ);
 
-        try {	   
+        try {
             return (model.contains((Resource) null, inClassGroupProp, theClassGroup));
         } finally {
             model.leaveCriticalSection();
@@ -416,7 +416,7 @@ public class TBoxUpdater {
 
         siteModel.enterCriticalSection(Lock.WRITE);
 
-        try {	
+        try {
             Model retractions = ModelFactory.createDefaultModel();
 
             if (siteModel.contains(subj1, inClassGroupProp, obj1) ) {
@@ -437,29 +437,29 @@ public class TBoxUpdater {
             if (retractions.size() > 0) {
                 siteModel.remove(retractions);
                 record.recordRetractions(retractions);
-            }   
+            }
 
         } finally {
             siteModel.leaveCriticalSection();
         }
     }
-    
+
     public void renameProperty(AtomicOntologyChange changeObj) throws IOException {
         if(changeObj.getNotes() != null && changeObj.getNotes().startsWith("cc:")) {
             mergePropertyAnnotationsToPropertyConfig(changeObj, siteModel);
-        }        
+        }
         Resource renamedProperty = siteModel.getResource(changeObj.getSourceURI());
         siteModel.removeAll(renamedProperty, null, (RDFNode) null);
         siteModel.removeAll(null, null, renamedProperty);
     }
-    
+
     private void mergePropertyAnnotationsToPropertyConfig(AtomicOntologyChange changeObj,
             Model userAnnotationsModel) throws IOException {
         String contextURI = VitroVocabulary.PROPERTY_CONFIG_DATA + changeObj.getNotes().substring(3);
         String oldPropertyURI = changeObj.getSourceURI();
         Model oldAnnotationsModel = settings.getOldTBoxAnnotationsModel();
-        
-        String propertyAnnotationsQuery = 
+
+        String propertyAnnotationsQuery =
                 "PREFIX config: <" + VitroVocabulary.configURI + "> \n" +
                 "PREFIX vitro: <" + VitroVocabulary.vitroURI  + "> \n" +
                 "CONSTRUCT { \n" +
@@ -469,14 +469,14 @@ public class TBoxUpdater {
                 "    { <" + oldPropertyURI + "> <" + RDFS.label.getURI() + "> ?label } \n" +
                 "    UNION { <" + oldPropertyURI + "> ?vitroProp ?vitroValue  \n" +
                 "    FILTER (regex(str(?vitroProp), \"" + VitroVocabulary.vitroURI + "\")) } \n" +
-                "} \n" ; 
-        
+                "} \n" ;
+
         Model userAnnotations = construct(
                 propertyAnnotationsQuery, userAnnotationsModel);
         Model oldAnnotations = construct(propertyAnnotationsQuery, oldAnnotationsModel);
-        
+
         Model diff = userAnnotations.difference(oldAnnotations);
-        
+
         // migrate all current values for any predicate that has been modified
         // from the default
         Model valuesToMigrate = ModelFactory.createDefaultModel();
@@ -485,16 +485,16 @@ public class TBoxUpdater {
             Statement stmt = sit.nextStatement();
             valuesToMigrate.add(userAnnotations.listStatements(
                     null, stmt.getPredicate(), (RDFNode) null));
-            
+
         }
-        
+
         if(valuesToMigrate.size() == 0) {
             return;
         } else {
             log.info("Updating PropertyConfig.n3 to include locally-changed " +
                     "settings from old property " + oldPropertyURI);
         }
-        
+
         String newQuery = "PREFIX config: <" + VitroVocabulary.configURI + "> \n" +
                 "PREFIX vitro: <" + VitroVocabulary.vitroURI  + "> \n" +
                 "CONSTRUCT { \n" +
@@ -508,13 +508,13 @@ public class TBoxUpdater {
                 "    OPTIONAL { <" + oldPropertyURI + "> ?vitroProp ?vitroValue  \n" +
                 "    FILTER (regex(str(?vitroProp), \"" + VitroVocabulary.vitroURI + "\")) } \n" +
                 "} \n" ;
-        
+
         String existingQuery = "PREFIX config: <" + VitroVocabulary.configURI + "> \n" +
                 "PREFIX vitro: <" + VitroVocabulary.vitroURI  + "> \n" +
                 "CONSTRUCT { \n" +
                 "    ?configuration config:propertyGroup ?group . \n" +
                 "    ?configuration config:displayName ?label . \n" +
-                "    ?configuration ?vitroProp ?vitroValue . \n" +                           
+                "    ?configuration ?vitroProp ?vitroValue . \n" +
                 "} WHERE { \n" +
                 "    <" + contextURI + "> config:hasConfiguration ?configuration . \n" +
                 "    OPTIONAL { ?configuration config:propertyGroup ?group } \n" +
@@ -522,7 +522,7 @@ public class TBoxUpdater {
                 "    OPTIONAL { ?configuration ?vitroProp ?vitroValue  \n" +
                 "    FILTER (regex(str(?vitroProp), \"" + VitroVocabulary.vitroURI + "\")) } \n" +
                 "} \n" ;
-        
+
         Model configModel = ModelFactory.createDefaultModel();
         String configFileName = settings.getQualifiedPropertyConfigFile();
         File file = new File(configFileName);
@@ -532,11 +532,11 @@ public class TBoxUpdater {
         Model userChangesUnion = ModelFactory.createUnion(configModel, valuesToMigrate);
 
         Model userAnnotationsAsConfig = construct(newQuery, userChangesUnion);
-        Model currentDefaultConfig = construct(existingQuery, configModel); 
-        
+        Model currentDefaultConfig = construct(existingQuery, configModel);
+
         Model additions = userAnnotationsAsConfig.difference(currentDefaultConfig);
         Model retractions = currentDefaultConfig.difference(userAnnotationsAsConfig);
-        
+
         // filter the retractions so we won't remove a value for a given predicate
         // unless the additions model contains at least one value for the same predicate
         Model filteredRetractions = ModelFactory.createDefaultModel();
@@ -547,7 +547,7 @@ public class TBoxUpdater {
                 filteredRetractions.add(candidate);
             }
         }
-        
+
         if (additions.size() > 0 || filteredRetractions.size() > 0) {
             configModel.remove(filteredRetractions);
             log.debug("Removing " + filteredRetractions.size() + " statements from " + contextURI);
@@ -557,8 +557,8 @@ public class TBoxUpdater {
             configModel.write(fos, "N3");
         }
     }
-    
-    private Model construct(String queryStr, Model model) {    
+
+    private Model construct(String queryStr, Model model) {
         Query query = QueryFactory.create(queryStr);
         QueryExecution qe = QueryExecutionFactory.create(query, model);
         try {
@@ -568,4 +568,4 @@ public class TBoxUpdater {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/UpdateSettings.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/UpdateSettings.java
index 8ea1f74b7..a0fbce7dc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/UpdateSettings.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/ontology/update/UpdateSettings.java
@@ -40,7 +40,7 @@ public class UpdateSettings {
 	private OntModel loadedAtStartupDisplayModel;
 	private OntModel oldDisplayModelVivoListViewConfig;
 	private RDFService rdfService;
-	
+
 	public String getDataDir() {
 		return dataDir;
 	}
@@ -167,32 +167,32 @@ public class UpdateSettings {
 	public void setNewTBoxAnnotationsModel(OntModel newTBoxAnnotationsModel) {
 		this.newTBoxAnnotationsModel = newTBoxAnnotationsModel;
 	}
-	
+
 	//Old and new display model methods
 	public void setOldDisplayModelTboxModel(OntModel oldDisplayModelTboxModel) {
 		this.oldDisplayModelTboxModel = oldDisplayModelTboxModel;
 	}
-	
+
 	public void setNewDisplayModelTboxModel(OntModel newDisplayModelTboxModel) {
 		this.newDisplayModelTboxModel = newDisplayModelTboxModel;
 	}
-	
+
 	public void setOldDisplayModelDisplayMetadataModel(OntModel oldDisplayModelDisplayMetadataModel) {
 		this.oldDisplayModelDisplayMetadataModel = oldDisplayModelDisplayMetadataModel;
 	}
-	
+
 	public void setNewDisplayModelDisplayMetadataModel(OntModel newDisplayModelDisplayMetadataModel) {
 		this.newDisplayModelDisplayMetadataModel = newDisplayModelDisplayMetadataModel;
 	}
-	
+
 	public void setDisplayModel(OntModel displayModel) {
 		this.displayModel = displayModel;
 	}
-	
+
 	public OntModel getOldDisplayModelTboxModel() {
 		return this.oldDisplayModelTboxModel;
 	}
-	
+
 	public OntModel getNewDisplayModelTboxModel() {
 		return this.newDisplayModelTboxModel;
 	}
@@ -200,46 +200,46 @@ public class UpdateSettings {
 	public OntModel getOldDisplayModelDisplayMetadataModel() {
 		return this.oldDisplayModelDisplayMetadataModel;
 	}
-	
+
 	public OntModel getNewDisplayModelDisplayMetadataModel() {
 		return this.newDisplayModelDisplayMetadataModel;
 	}
-	
+
 	public OntModel getDisplayModel() {
 		return this.displayModel;
 	}
-	
+
 	public void setNewDisplayModelFromFile(OntModel newDisplayModel) {
 		this.newDisplayModelFromFile = newDisplayModel;
 	}
-	
+
 	public OntModel getNewDisplayModelFromFile() {
 		return this.newDisplayModelFromFile;
 	}
-	
+
 	public void setLoadedAtStartupDisplayModel(OntModel loadedModel) {
 		this.loadedAtStartupDisplayModel = loadedModel;
 	}
-	
+
 	public OntModel getLoadedAtStartupDisplayModel() {
 		return this.loadedAtStartupDisplayModel;
 	}
-	
+
 	public void setVivoListViewConfigDisplayModel(OntModel loadedModel) {
 		this.oldDisplayModelVivoListViewConfig = loadedModel;
 	}
-	
+
 	public OntModel getVivoListViewConfigDisplayModel() {
 		return this.oldDisplayModelVivoListViewConfig;
 	}
-	
+
 	public RDFService getRDFService() {
 	    return this.rdfService;
 	}
-	
+
 	public void setRDFService(RDFService rdfService) {
 	    this.rdfService = rdfService;
 	}
-	
-	
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/ChangeListener.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/ChangeListener.java
index b105663fd..be7ef6a95 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/ChangeListener.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/ChangeListener.java
@@ -4,22 +4,22 @@ package edu.cornell.mannlib.vitro.webapp.rdfservice;
 
 /**
  * An interface for listening to triples that are added to or removed
- * from the triple store, and other miscellaneous events.   
+ * from the triple store, and other miscellaneous events.
  */
 
-public interface ChangeListener {		
+public interface ChangeListener {
 	/**
-	 * Override this to listen to each model change 
-	 * 
+	 * Override this to listen to each model change
+	 *
 	 * @param modelChange - the object representing the model change
 	 */
 	public void notifyModelChange(ModelChange modelChange);
-		
+
 	/**
-	 * Override this to listen to events pertaining to the given graphURI. 
-	 * 
+	 * Override this to listen to events pertaining to the given graphURI.
+	 *
 	 * @param graphURI - the graph to which the event pertains
-	 * @param event - the event that occurred. 
+	 * @param event - the event that occurred.
 	 */
 	public void notifyEvent(String graphURI, Object event);
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/ChangeSet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/ChangeSet.java
index 61b220913..61547cfd9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/ChangeSet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/ChangeSet.java
@@ -7,109 +7,109 @@ import java.util.List;
 
 /**
  * Input parameter to changeSetUpdate() method in RDFService.
- * Represents a precondition query and an ordered list of model changes. 
+ * Represents a precondition query and an ordered list of model changes.
  */
 
 public interface ChangeSet {
-		
-	/**   
-	 * @return String - a SPARQL query            
-	 */	
+
+	/**
+	 * @return String - a SPARQL query
+	 */
 	public String getPreconditionQuery();
-	
-	/**   
-	 * @param preconditionQuery - a SPARQL query            
-	 */	
+
+	/**
+	 * @param preconditionQuery - a SPARQL query
+	 */
 	public void setPreconditionQuery(String preconditionQuery);
-	
-	/**   
-	 * @return RDFService.SPARQLQueryType - the precondition query type           
-	 */	
+
+	/**
+	 * @return RDFService.SPARQLQueryType - the precondition query type
+	 */
 	public RDFService.SPARQLQueryType getPreconditionQueryType();
-	
-	/**   
-	 * @param queryType - the precondition query type           
-	 */	
+
+	/**
+	 * @param queryType - the precondition query type
+	 */
 	public void setPreconditionQueryType(RDFService.SPARQLQueryType queryType);
 
-	/**   
+	/**
 	 */
 	public List<ModelChange> getModelChanges();
-	
-	/**   
+
+	/**
 	 * Adds one model change representing an addition to the list of model changes
-	 * 
-	 * @param model - a serialized RDF model (collection of triples)  
+	 *
+	 * @param model - a serialized RDF model (collection of triples)
 	 * @param serializationFormat - format of the serialized RDF model
-	 * @param graphURI - URI of the graph to which the RDF model should be added         
-	 */		
-	public void addAddition(InputStream model, 
+	 * @param graphURI - URI of the graph to which the RDF model should be added
+	 */
+	public void addAddition(InputStream model,
 			                RDFService.ModelSerializationFormat serializationFormat,
 			                String graphURI);
-	
-	/**   
+
+	/**
 	 * Adds one model change representing a deletion to the list of model changes
-	 * 
-	 * @param model - a serialized RDF model (collection of triples)  
+	 *
+	 * @param model - a serialized RDF model (collection of triples)
 	 * @param serializationFormat - format of the serialized RDF model
-	 * @param graphURI - URI of the graph from which the RDF model should be removed         
-	 */		
+	 * @param graphURI - URI of the graph from which the RDF model should be removed
+	 */
 	public void addRemoval(InputStream model,
 			               RDFService.ModelSerializationFormat serializationFormat,
 			               String graphURI);
 
-	/**   
-	 * Creates an instance of the ModelChange class 
-	 * 
-	 * @return ModelChange - an empty instance of the ModelChange class
-	 */		
-	public ModelChange manufactureModelChange();
-	
-	/**   
+	/**
 	 * Creates an instance of the ModelChange class
-	 * 
-	 * @param serializedModel - a serialized RDF model (collection of triples)  
+	 *
+	 * @return ModelChange - an empty instance of the ModelChange class
+	 */
+	public ModelChange manufactureModelChange();
+
+	/**
+	 * Creates an instance of the ModelChange class
+	 *
+	 * @param serializedModel - a serialized RDF model (collection of triples)
 	 * @param serializationFormat - format of the serialized RDF model
-	 * @param operation - the type of operation to be performed with the serialized RDF model 
-	 * @param graphURI - URI of the graph on which to apply the model change operation 
-	 * 
+	 * @param operation - the type of operation to be performed with the serialized RDF model
+	 * @param graphURI - URI of the graph on which to apply the model change operation
+	 *
 	 * @return ModelChange - a ModelChange instance initialized with the input
 	 *                       model, model format, operation and graphURI
-	 */		
+	 */
 	public ModelChange manufactureModelChange(InputStream serializedModel,
                                               RDFService.ModelSerializationFormat serializationFormat,
                                               ModelChange.Operation operation,
                                               String graphURI);
-	
+
 	/**
 	 * Adds an event that will be be passed to any change listeners in advance of
 	 * the change set additions and retractions being performed. The event
 	 * will only be fired if the precondition (if any) is met.
-	 * 
+	 *
 	 * @param event - event to notify listeners of in advance of making
 	 *                changes to the triple store.
 	 */
 	public void addPreChangeEvent(Object event);
-	    
+
     /**
      * Adds an event that will be be passed to any change listeners after all of
      * the change set additions and retractions are performed.
-     * 
-     * @param event - the event to notify listeners of after the changes are 
+     *
+     * @param event - the event to notify listeners of after the changes are
      *                performed.
      */
     public void addPostChangeEvent(Object event);
 
     /**
-     * Returns a list of events to pass to any change listeners in 
+     * Returns a list of events to pass to any change listeners in
      * advance of the change set additions and retractions being performed.
      */
 	public List<Object> getPreChangeEvents();
-	
+
     /**
-     * Returns a list of events to pass to any change listeners after 
+     * Returns a list of events to pass to any change listeners after
      * the change set additions and retractions are performed.
      */
     public List<Object> getPostChangeEvents();
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/ModelChange.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/ModelChange.java
index d3f995f01..7bcc37364 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/ModelChange.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/ModelChange.java
@@ -7,7 +7,7 @@ import java.io.InputStream;
 /**
  * A ModelChange is one component of a ChangeSet.
  * Represents a model (collection of RDF triples), the URI
- * of a graph, and an indication of whether to add or 
+ * of a graph, and an indication of whether to add or
  * remove the model from the graph.
  */
 
@@ -16,27 +16,27 @@ public interface ModelChange {
 	public enum Operation {
 	    ADD, REMOVE
 	}
-	
-	/**   
-	 * @return InputStream - the serialized model (collection of RDF triples) representing a change to make           
+
+	/**
+	 * @return InputStream - the serialized model (collection of RDF triples) representing a change to make
 	 */
 	public InputStream getSerializedModel();
-	
+
 	/**
-	 * @param serializedModel - the serialized model (collection of RDF triples) representing a change to make           
+	 * @param serializedModel - the serialized model (collection of RDF triples) representing a change to make
 	 */
 	public void setSerializedModel(InputStream serializedModel);
-	
+
 	/**
 	 * @return RDFService.ModelSerializationFormat - the serialization format of the model
 	 */
 	public RDFService.ModelSerializationFormat getSerializationFormat();
-	
+
 	/**
 	 * @param serializationFormat - the serialization format of the model
 	 */
 	public void setSerializationFormat(RDFService.ModelSerializationFormat serializationFormat);
-	
+
 	/**
 	 * @return ModelChange.Operation - the operation to be performed
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFService.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFService.java
index 2fbcbed88..babac6c52 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFService.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFService.java
@@ -11,7 +11,7 @@ import org.apache.jena.rdf.model.ModelChangedListener;
 import org.apache.jena.rdf.model.RDFNode;
 
 /**
- * Interface for API to write, read, and update Vitro's RDF store, with support 
+ * Interface for API to write, read, and update Vitro's RDF store, with support
  * to allow listening, logging and auditing.
  */
 
@@ -24,36 +24,36 @@ public interface RDFService {
 	public enum ModelSerializationFormat {
 	    RDFXML, N3, NTRIPLE
 	}
-	
+
 	public enum ResultFormat {
 	    JSON, CSV, XML, TEXT
 	}
-	
+
 	/**
 	 * Performs a series of additions to and or removals from specified graphs
-	 * in the RDF store.  preConditionSparql is executed against the 
-	 * union of all the graphs in the knowledge base before any updates are made. 
+	 * in the RDF store.  preConditionSparql is executed against the
+	 * union of all the graphs in the knowledge base before any updates are made.
 	 * If the precondition query returns a non-empty result, no updates
-	 * are made made. 
-	 * 
+	 * are made made.
+	 *
 	 * @param changeSet - a set of changes to be performed on the RDF store.
-	 *    
-	 * @return boolean - indicates whether the precondition was satisfied            
+	 *
+	 * @return boolean - indicates whether the precondition was satisfied
 	 */
 	public boolean changeSetUpdate(ChangeSet changeSet) throws RDFServiceException;
-		
+
 	/**
-	 * If the given individual already exists in the default write graph, throws an 
+	 * If the given individual already exists in the default write graph, throws an
 	 * RDFServiceException, otherwise adds one type assertion to the default write
 	 * graph.
-	 * 
+	 *
 	 * @param individualURI - URI of the individual to be added
 	 * @param individualTypeURI - URI of the type for the individual
 	 */
 	public void newIndividual(String individualURI, String individualTypeURI) throws RDFServiceException;
 
 	/**
-	 * If the given individual already exists in the given graph, throws an 
+	 * If the given individual already exists in the given graph, throws an
 	 * RDFServiceException, otherwise adds one type assertion to the given
 	 * graph.
 	 *
@@ -62,18 +62,18 @@ public interface RDFService {
 	 * @param graphURI - URI of the graph to which to add the individual
 	 */
 	public void newIndividual(String individualURI, String individualTypeURI, String graphURI) throws RDFServiceException;
-	
+
 	/**
 	 * Performs a SPARQL construct query against the knowledge base. The query may have
 	 * an embedded graph identifier. If the query does not contain a graph identifier
-	 * the query is executed against the union of all named and unnamed graphs in the 
+	 * the query is executed against the union of all named and unnamed graphs in the
 	 * store.
-	 * 
+	 *
 	 * @param query - the SPARQL query to be executed against the RDF store
 	 * @param resultFormat - type of serialization for RDF result of the SPARQL query
-	 * 
+	 *
 	 * @return InputStream - the result of the query
-	 * 
+	 *
 	 */
 	public InputStream sparqlConstructQuery(String query, RDFService.ModelSerializationFormat resultFormat) throws RDFServiceException;
 
@@ -91,28 +91,28 @@ public interface RDFService {
 	/**
 	 * Performs a SPARQL describe query against the knowledge base. The query may have
 	 * an embedded graph identifier. If the query does not contain a graph identifier
-	 * the query is executed against the union of all named and unnamed graphs in the 
+	 * the query is executed against the union of all named and unnamed graphs in the
 	 * store.
-	 * 
+	 *
 	 * @param query - the SPARQL query to be executed against the RDF store
 	 * @param resultFormat - type of serialization for RDF result of the SPARQL query
-	 * 
+	 *
 	 * @return InputStream - the result of the query
-	 * 
+	 *
 	 */
 	public InputStream sparqlDescribeQuery(String query, RDFService.ModelSerializationFormat resultFormat) throws RDFServiceException;
-	
+
 	/**
 	 * Performs a SPARQL select query against the knowledge base. The query may have
 	 * an embedded graph identifier. If the query does not contain a graph identifier
-	 * the query is executed against the union of all named and unnamed graphs in the 
+	 * the query is executed against the union of all named and unnamed graphs in the
 	 * store.
-	 * 
+	 *
 	 * @param query - the SPARQL query to be executed against the RDF store
 	 * @param resultFormat - format for the result of the Select query
-	 * 
+	 *
 	 * @return InputStream - the result of the query
-	 * 
+	 *
 	 */
 	public InputStream sparqlSelectQuery(String query, RDFService.ResultFormat resultFormat) throws RDFServiceException;
 
@@ -130,21 +130,21 @@ public interface RDFService {
 	/**
 	 * Performs a SPARQL ASK query against the knowledge base. The query may have
 	 * an embedded graph identifier. If the query does not contain a graph identifier
-	 * the query is executed against the union of all named and unnamed graphs in the 
+	 * the query is executed against the union of all named and unnamed graphs in the
 	 * store.
-	 * 
+	 *
 	 * @param query - the SPARQL ASK query to be executed against the RDF store
-	 * 
-	 * @return  boolean - the result of the SPARQL ASK query 
+	 *
+	 * @return  boolean - the result of the SPARQL ASK query
 	 */
 	public boolean sparqlAskQuery(String query) throws RDFServiceException;
-	
+
 	/**
 	 * Returns a list of all the graph URIs in the RDF store.
-	 * 
+	 *
 	 * @return  list of all the named graph URIs in the RDF store.
 	 *          Return an empty list of there no named graphs in
-	 *                         the store. 
+	 *                         the store.
 	 */
 	public List<String> getGraphURIs() throws RDFServiceException;
 
@@ -153,49 +153,49 @@ public interface RDFService {
 	 * in current implementations.
 	 */
 	public void getGraphMetadata() throws RDFServiceException;
-		
+
 	/**
 	 * Returns the URI of the default write graph
-	 * 
+	 *
 	 * @return String URI of default write graph. Returns null if no
 	 *         default write graph has been set.
 	 */
 	public String getDefaultWriteGraphURI() throws RDFServiceException;
-	
+
 	/**
 	 * Serializes the union of all named and unnamed graphs in the store to the
-	 * supplied OutputStream, in N-Quads format. This method is designed for 
-	 * exporting data from VIVO, so any filters should be bypassed. If possible, 
-	 * this should be done without buffering in memory, so arbitrarily large 
+	 * supplied OutputStream, in N-Quads format. This method is designed for
+	 * exporting data from VIVO, so any filters should be bypassed. If possible,
+	 * this should be done without buffering in memory, so arbitrarily large
 	 * graphs can be exported.
-	 * 
+	 *
 	 * @param outputStream - receives the serialized result.
 	 */
 	public void serializeAll(OutputStream outputStream) throws RDFServiceException;
 
 	/**
 	 * Serializes the contents of the named graph to the supplied OutputStream,
-	 * in N-Triples format. This method is designed for exporting data from 
-	 * VIVO, so any filters should be bypassed. If possible, this should be 
-	 * done without buffering in memory, so arbitrarily large graphs can be 
+	 * in N-Triples format. This method is designed for exporting data from
+	 * VIVO, so any filters should be bypassed. If possible, this should be
+	 * done without buffering in memory, so arbitrarily large graphs can be
 	 * exported.
-	 * 
+	 *
 	 * @param graphURI - the URI of the desired graph. May not be null.
 	 * @param outputStream - receives the serialized result.
 	 */
 	public void serializeGraph(String graphURI, OutputStream outputStream) throws RDFServiceException;
 
 	/**
-	 * Tests to see whether the supplied serialization is equivalent to the 
-	 * named graph, as it exists in the store. Equivalence means that if this 
-	 * serialization were written to the store, the resulting graph would be 
+	 * Tests to see whether the supplied serialization is equivalent to the
+	 * named graph, as it exists in the store. Equivalence means that if this
+	 * serialization were written to the store, the resulting graph would be
 	 * isomorphic to the existing named graph.
-	 * 
+	 *
 	 * @param graphURI - the URI of the graph to test against. May not be null.
 	 * @param serializedGraph - the contents to be compared with the existing graph. May not be null.
 	 * @param serializationFormat - May not be null.
 	 */
-	public boolean isEquivalentGraph(String graphURI, InputStream serializedGraph, 
+	public boolean isEquivalentGraph(String graphURI, InputStream serializedGraph,
 			ModelSerializationFormat serializationFormat) throws RDFServiceException;
 
 	/**
@@ -212,40 +212,40 @@ public interface RDFService {
 	/**
 	 * Registers a Jena listener to listen to changes in any graph in
 	 * the RDF store.
-	 * 
+	 *
 	 * @param changeListener - the change listener
 	 */
-	public void registerJenaModelChangedListener(ModelChangedListener changeListener) 
+	public void registerJenaModelChangedListener(ModelChangedListener changeListener)
 	        throws RDFServiceException;
-	
+
 	/**
 	 * Unregisters a Jena listener from listening to changes in
 	 * any graph in the RDF store
-	 * 
+	 *
 	 * @param changeListener - the change listener
 	 */
-	public void unregisterJenaModelChangedListener(ModelChangedListener changeListener) 
+	public void unregisterJenaModelChangedListener(ModelChangedListener changeListener)
 	        throws RDFServiceException;
-	
+
 	/**
      * Registers a listener to listen to changes in any graph in
      * the RDF store.
-     * 
+     *
      * @param changeListener - the change listener
      */
     public void registerListener(ChangeListener changeListener) throws RDFServiceException;
-    
+
     /**
      * Unregisters a listener from listening to changes in
      * any graph in the RDF store
-     * 
+     *
      * @param changeListener - the change listener
      */
     public void unregisterListener(ChangeListener changeListener) throws RDFServiceException;
 
 	/**
 	 * Creates a ChangeSet object
-	 * 
+	 *
 	 * @return ChangeSet an empty ChangeSet object
 	 */
 	public ChangeSet manufactureChangeSet();
@@ -255,10 +255,10 @@ public interface RDFService {
 	public Model getTriples(RDFNode subject, RDFNode predicate, RDFNode object, long limit, long offset) throws RDFServiceException;
 
 	public boolean preferPreciseOptionals();
-		
+
 	/**
      * Frees any resources held by this RDFService object
-     * 
+     *
      * The implementation of this method should be idempotent so that
      * multiple invocations do not cause an error.
      */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFServiceException.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFServiceException.java
index 4371a90d5..71add78c3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFServiceException.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFServiceException.java
@@ -7,15 +7,15 @@ public class RDFServiceException extends Exception {
 	public RDFServiceException() {
 		super();
 	}
-	
+
 	public RDFServiceException(Throwable cause) {
 	    super(cause);
 	}
-	
+
 	public RDFServiceException(String message) {
 		super(message);
 	}
-	
+
     public RDFServiceException(String message, Throwable cause) {
         super(message, cause);
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFServiceFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFServiceFactory.java
index 295741ab2..12de49313 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFServiceFactory.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFServiceFactory.java
@@ -10,58 +10,58 @@ public interface RDFServiceFactory {
      * @return RDFService - an RDFService instance
      */
     public RDFService getRDFService();
-    
+
     /**
      * Returns an instance of RDFService that may not support being left idle
      * for long periods of time.  RDFService instances returned by this method
      * should be immediately used and closed, not stored in (for example) session
      * or context attributes.
-     * 
+     *
      * This method exists to enable performance improvements resulting from a
      * lack of need to handle database connection or other service timeouts and
      * reconnects.
-     * 
-     * The results provided by RDFService instances returned by this method must 
-     * be identical to those provided by instances returned by getRDFService().  
-     *   
+     *
+     * The results provided by RDFService instances returned by this method must
+     * be identical to those provided by instances returned by getRDFService().
+     *
      * @return RDFService - an RDFService instance
      */
     public RDFService getShortTermRDFService();
-    
+
     /**
      * Registers a listener to listen to changes in any graph in
      * the RDF store.  Any RDFService objects returned by this factory
      * should notify this listener of changes.
-     * 
+     *
      * @param changeListener - the change listener
      */
     public void registerListener(ChangeListener changeListener) throws RDFServiceException;
-    
+
     /**
      * Unregisters a listener from listening to changes in the RDF store.
      * Any RDFService objects returned by this factory should no longer notify
      * this listener of changes.
-     * 
+     *
      * @param changeListener - the change listener
      */
     public void unregisterListener(ChangeListener changeListener) throws RDFServiceException;
-    
+
     /**
      * Registers a Jena ModelChangedListener to listen to changes in any graph in
      * the RDF store.  Any RDFService objects returned by this factory
      * should notify this listener of changes.
-     * 
+     *
      * @param changeListener - the change listener
      */
     public void registerJenaModelChangedListener(ModelChangedListener changeListener) throws RDFServiceException;
-    
+
     /**
      * Unregisters a Jena ModelChangedListener from listening to changes in the RDF store.
      * Any RDFService objects returned by this factory should no longer notify
      * this listener of changes.
-     * 
+     *
      * @param changeListener - the change listener
      */
     public void unregisterJenaModelChangedListener(ModelChangedListener changeListener) throws RDFServiceException;
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java
index 113e282b7..33f9c5f0e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java
@@ -45,7 +45,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
 
 /**
  * The base class for a delegating model decorator.
- * 
+ *
  * As implemented, all methods simply delegate to the inner model. Subclasses
  * should override selected methods to provide functionality.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractOntModelDecorator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractOntModelDecorator.java
index c40f61071..619413f20 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractOntModelDecorator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractOntModelDecorator.java
@@ -84,7 +84,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
 
 /**
  * The base class for a delegating ontology model decorator.
- * 
+ *
  * As implemented, all methods simply delegate to the inner model. Subclasses
  * should override selected methods to provide functionality.
  */
@@ -97,7 +97,7 @@ public abstract class AbstractOntModelDecorator implements OntModel {
 		}
 		this.inner = m;
 	}
-	
+
 	@Override
 	public String toString() {
 		return ToString.simpleName(this) + "[" + ToString.hashHex(this) + ", "
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/FilteredResultSet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/FilteredResultSet.java
index 9ebcc8f67..230766d3e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/FilteredResultSet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/FilteredResultSet.java
@@ -15,12 +15,12 @@ public class FilteredResultSet implements ResultSet {
     protected Iterator<QuerySolution> solutIt;
     protected ResultSet originalResultSet;
     protected int rowNum = -1;
-    
+
     public FilteredResultSet (List<QuerySolution> solutions, ResultSet originalResultSet) {
         this.solutIt = solutions.iterator();
         this.originalResultSet = originalResultSet;
     }
-    
+
     @Override
     public void remove() {
         throw new UnsupportedOperationException("Attempt to remove an element");
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java
index e0d8de8d0..903711e52 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java
@@ -35,19 +35,19 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
 
 public class LanguageFilteringRDFService implements RDFService {
-        
+
     private static final Log log = LogFactory.getLog(LanguageFilteringRDFService.class);
     private RDFService s;
     private List<String> langs;
-    
+
     public LanguageFilteringRDFService(RDFService service, List<String> langs) {
         this.s = service;
         this.langs = normalizeLangs(langs);
     }
-    
+
 	private List<String> normalizeLangs(List<String> langs) {
 		log.debug("Preferred languages:" + langs);
-		
+
 		List<String> normalizedLangs = new ArrayList<String>(langs);
 		for (String lang : langs) {
 			String baseLang = lang.split("-")[0];
@@ -55,13 +55,13 @@ public class LanguageFilteringRDFService implements RDFService {
 				normalizedLangs.add(baseLang);
 			}
 		}
-		
+
 		log.debug("Normalized languages:" + normalizedLangs);
 		return normalizedLangs;
 	}
 
     @Override
-    public boolean changeSetUpdate(ChangeSet changeSet) 
+    public boolean changeSetUpdate(ChangeSet changeSet)
             throws RDFServiceException {
         return s.changeSetUpdate(changeSet);
     }
@@ -107,15 +107,15 @@ public class LanguageFilteringRDFService implements RDFService {
             ModelSerializationFormat resultFormat)
             throws RDFServiceException {
         Model m = RDFServiceUtils.parseModel(s.sparqlDescribeQuery(query, resultFormat), resultFormat);
-        return outputModel(filterModel(m), resultFormat);        
+        return outputModel(filterModel(m), resultFormat);
     }
-    
+
     private InputStream outputModel(Model m, ModelSerializationFormat resultFormat) {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         m.write(out, RDFServiceUtils.getSerializationFormatString(resultFormat));
         return new ByteArrayInputStream(out.toByteArray());
     }
-    
+
     private Model filterModel(Model m) {
     	log.debug("filterModel");
         List<Statement> retractions = new ArrayList<Statement>();
@@ -139,7 +139,7 @@ public class LanguageFilteringRDFService implements RDFService {
                         continue;
                     } else if (chuckRemaining) {
                         retractions.add(s);
-                    } 
+                    }
                     String lang = s.getObject().asLiteral().getLanguage();
                     if (langRegister == null) {
                         langRegister = lang;
@@ -149,7 +149,7 @@ public class LanguageFilteringRDFService implements RDFService {
                     }
                 }
             }
-            
+
         }
         m.remove(retractions);
         return m;
@@ -174,7 +174,7 @@ public class LanguageFilteringRDFService implements RDFService {
 
 	@Override
     public InputStream sparqlSelectQuery(String query,
-            ResultFormat resultFormat) throws RDFServiceException {        
+            ResultFormat resultFormat) throws RDFServiceException {
     	log.debug("sparqlSelectQuery: " + query.replaceAll("\\s+", " "));
         ResultSet resultSet = ResultSetFactory.fromJSON(
                 s.sparqlSelectQuery(query, RDFService.ResultFormat.JSON));
@@ -231,7 +231,7 @@ public class LanguageFilteringRDFService implements RDFService {
             }
         }
         ResultSet filtered = new FilteredResultSet(compactedList, resultSet);
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); 
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         switch (resultFormat) {
            case CSV:
               ResultSetFormatter.outputAsCSV(outputStream, filtered);
@@ -245,10 +245,10 @@ public class LanguageFilteringRDFService implements RDFService {
            case XML:
               ResultSetFormatter.outputAsXML(outputStream, filtered);
               break;
-           default: 
+           default:
               throw new RDFServiceException("unrecognized result format");
-        }        
-        return new ByteArrayInputStream(outputStream.toByteArray());       
+        }
+        return new ByteArrayInputStream(outputStream.toByteArray());
     }
 
     @Override
@@ -338,26 +338,26 @@ public class LanguageFilteringRDFService implements RDFService {
 	}
 
 	private class RowIndexedLiteral {
-        
+
         private Literal literal;
         private int index;
-        
+
         public RowIndexedLiteral(Literal literal, int index) {
             this.literal = literal;
             this.index = index;
         }
-        
+
         public Literal getLiteral() {
             return this.literal;
         }
-        
+
         public int getIndex() {
-            return index;   
+            return index;
         }
-        
+
     }
-    
-    private boolean matchesExceptForVar(QuerySolution a, QuerySolution b, 
+
+    private boolean matchesExceptForVar(QuerySolution a, QuerySolution b,
             String varName, List<String> varList) {
         if (varName == null) {
             throw new RuntimeException("expected non-null variable nane");
@@ -384,7 +384,7 @@ public class LanguageFilteringRDFService implements RDFService {
         }
         return true;
     }
-    
+
     private List<QuerySolution> getSolutionList(ResultSet resultSet) {
         List<QuerySolution> solnList = new ArrayList<QuerySolution>();
         while (resultSet.hasNext()) {
@@ -450,7 +450,7 @@ public class LanguageFilteringRDFService implements RDFService {
             throws RDFServiceException {
         s.unregisterListener(changeListener);
     }
-    
+
     @Override
     public void registerJenaModelChangedListener(ModelChangedListener changeListener)
             throws RDFServiceException {
@@ -486,21 +486,21 @@ public class LanguageFilteringRDFService implements RDFService {
 
     @Override
     public void close() {
-        s.close();            
+        s.close();
     }
-       
+
     private class LangSort {
     	// any inexact match is worse than any exact match
     	private int inexactMatchPenalty = langs.size();
     	// no language is worse than any inexact match (if the preferred list does not include "").
-    	private int noLanguage = 2 * inexactMatchPenalty; 
+    	private int noLanguage = 2 * inexactMatchPenalty;
     	// no match is worse than no language.
-    	private int noMatch = noLanguage + 1; 
-        
+    	private int noMatch = noLanguage + 1;
+
         protected int compareLangs(String t1lang, String t2lang) {
         	return languageIndex(t1lang) - languageIndex(t2lang);
         }
-        
+
 		/**
 		 * Return index of exact match, or index of partial match, or
 		 * language-free, or no match.
@@ -532,38 +532,38 @@ public class LanguageFilteringRDFService implements RDFService {
 			return noMatch;
 		}
     }
-    
+
     private class RowIndexedLiteralSortByLang extends LangSort implements Comparator<RowIndexedLiteral> {
-        
+
         public int compare(RowIndexedLiteral rilit1, RowIndexedLiteral rilit2) {
             if (rilit1 == null || rilit2 == null) {
                 return 0;
             }
-            
+
             String t1lang = rilit1.getLiteral().getLanguage();
             String t2lang = rilit2.getLiteral().getLanguage();
-                    
+
             return compareLangs(t1lang, t2lang);
-        }   
+        }
     }
-    
+
     private class StatementSortByLang extends LangSort implements Comparator<Statement> {
-        
+
         public int compare(Statement s1, Statement s2) {
             if (s1 == null || s2 == null) {
                 return 0;
             } else if (!s1.getObject().isLiteral() || !s2.getObject().isLiteral()) {
                 return 0;
             }
-            
+
             String s1lang = s1.getObject().asLiteral().getLanguage();
             String s2lang = s2.getObject().asLiteral().getLanguage();
-                    
+
             return compareLangs(s1lang, s2lang);
         }
     }
-    
+
 }
-    
-    
-    
+
+
+
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java
index 73075259f..5a0336462 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java
@@ -25,7 +25,7 @@ public class LanguageFilteringUtils {
 	 * Take an Enumeration of Locale objects, such as we might get from a
 	 * request, and convert to a List of langauage strings, such as are needed
 	 * by the LanguageFilteringRDFService.
-	 * 
+	 *
 	 * While converting, change all underscores (as in Locale names) to hyphens
 	 * (as in RDF language specifiers).
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/SameAsFilteringRDFServiceFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/SameAsFilteringRDFServiceFactory.java
index 9e6f4c7b1..e585c54aa 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/SameAsFilteringRDFServiceFactory.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/SameAsFilteringRDFServiceFactory.java
@@ -46,7 +46,7 @@ public class SameAsFilteringRDFServiceFactory implements RDFServiceFactory {
             SameAsFilteringRDFServiceFactory.class);
     private RDFServiceFactory f;
     private Model sameAsModel;
-    
+
     public SameAsFilteringRDFServiceFactory(RDFServiceFactory rdfServiceFactory) {
         this.f = rdfServiceFactory;
         try {
@@ -56,50 +56,50 @@ public class SameAsFilteringRDFServiceFactory implements RDFServiceFactory {
             throw new RuntimeException(e);
         }
     }
-    
+
     @Override
     public RDFService getRDFService() {
         return new SameAsFilteringRDFService(f.getRDFService());
     }
-    
+
     @Override
     public RDFService getShortTermRDFService() {
         return new SameAsFilteringRDFService(f.getShortTermRDFService());
     }
-    
+
     @Override
     public void registerListener(ChangeListener changeListener) throws RDFServiceException {
         f.registerListener(changeListener);
     }
-    
+
     @Override
     public void unregisterListener(ChangeListener changeListener) throws RDFServiceException {
         f.registerListener(changeListener);
     }
-    
+
     @Override
     public void registerJenaModelChangedListener(ModelChangedListener changeListener) throws RDFServiceException {
         f.registerJenaModelChangedListener(changeListener);
     }
-    
+
     @Override
     public void unregisterJenaModelChangedListener(ModelChangedListener changeListener) throws RDFServiceException {
         f.registerJenaModelChangedListener(changeListener);
     }
-    
+
     public class SameAsFilteringRDFService extends RDFServiceImpl implements RDFService {
-        
+
         private final Log log = LogFactory.getLog(SameAsFilteringRDFService.class);
-        
+
         private RDFService s;
-        
+
         public SameAsFilteringRDFService(RDFService rdfService) {
             this.s = rdfService;
         }
-        
+
         @Override
-        public InputStream sparqlConstructQuery(String query, 
-                RDFService.ModelSerializationFormat resultFormat) 
+        public InputStream sparqlConstructQuery(String query,
+                RDFService.ModelSerializationFormat resultFormat)
                         throws RDFServiceException {
             Model m = RDFServiceUtils.parseModel(
                     s.sparqlConstructQuery(query, resultFormat), resultFormat);
@@ -133,11 +133,11 @@ public class SameAsFilteringRDFServiceFactory implements RDFServiceFactory {
         }
 
         @Override
-        public InputStream sparqlSelectQuery(String query, ResultFormat resultFormat) 
+        public InputStream sparqlSelectQuery(String query, ResultFormat resultFormat)
                 throws RDFServiceException {
             ResultSet rs = ResultSetFactory.load(
-                    s.sparqlSelectQuery(query, resultFormat), 
-                            RDFServiceUtils.getJenaResultSetFormat(resultFormat));            
+                    s.sparqlSelectQuery(query, resultFormat),
+                            RDFServiceUtils.getJenaResultSetFormat(resultFormat));
             List<QuerySolution> solutions = new ArrayList<QuerySolution>();
             while (rs.hasNext()) {
                 QuerySolution solution = rs.nextSolution();
@@ -146,7 +146,7 @@ public class SameAsFilteringRDFServiceFactory implements RDFServiceFactory {
                 }
             }
             ResultSet resultSet = new FilteredResultSet(solutions, rs);
-            ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); 
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
             switch (resultFormat) {
                case CSV:
                   ResultSetFormatter.outputAsCSV(outputStream,resultSet);
@@ -160,10 +160,10 @@ public class SameAsFilteringRDFServiceFactory implements RDFServiceFactory {
                case XML:
                   ResultSetFormatter.outputAsXML(outputStream, resultSet);
                   break;
-               default: 
+               default:
                   throw new RDFServiceException("unrecognized result format");
-            }              
-            return new ByteArrayInputStream(outputStream.toByteArray());        
+            }
+            return new ByteArrayInputStream(outputStream.toByteArray());
         }
 
         @Override
@@ -184,7 +184,7 @@ public class SameAsFilteringRDFServiceFactory implements RDFServiceFactory {
             List<Resource> sameAsResources = getSameAsResources(s.getSubject());
             if (sameAsResources.size() > 0 && !sameAsResources.get(0).equals(s.getSubject())) {
                 return true;
-            } 
+            }
             if (s.getObject().isLiteral() || s.getObject().isAnon()) {
                 return false;
             }
@@ -194,7 +194,7 @@ public class SameAsFilteringRDFServiceFactory implements RDFServiceFactory {
             }
             return false;
         }
-        
+
         private List<Resource> getSameAsResources(Resource resource) {
             List<Resource> sameAsResources = new ArrayList<Resource>();
             if (resource.isAnon()) {
@@ -263,7 +263,7 @@ public class SameAsFilteringRDFServiceFactory implements RDFServiceFactory {
             ByteArrayOutputStream out = new ByteArrayOutputStream();
             filtered.write(out, RDFServiceUtils.getSerializationFormatString(
                     resultFormat));
-            return new ByteArrayInputStream(out.toByteArray()); 
+            return new ByteArrayInputStream(out.toByteArray());
         }
 
         @Override
@@ -315,9 +315,9 @@ public class SameAsFilteringRDFServiceFactory implements RDFServiceFactory {
         public void close() {
             s.close();
         }
-        
-        
+
+
     }
-    
-    
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/ChangeSetImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/ChangeSetImpl.java
index a3bcb5625..25012e49b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/ChangeSetImpl.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/ChangeSetImpl.java
@@ -12,32 +12,32 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.ModelChange.Operation;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 
 public class ChangeSetImpl implements ChangeSet {
-	
+
 	public ChangeSetImpl() {
 		modelChanges = new ArrayList<ModelChange>();
 	}
-	
+
 	private String preconditionQuery;
 	private RDFService.SPARQLQueryType queryType;
 	private ArrayList<ModelChange> modelChanges = new ArrayList<ModelChange>();
 	private ArrayList<Object> preChangeEvents = new ArrayList<Object>();
 	private ArrayList<Object> postChangeEvents = new ArrayList<Object>();
- 	
+
 	@Override
 	public String getPreconditionQuery() {
-	   return preconditionQuery;	
+	   return preconditionQuery;
 	}
-	
+
 	@Override
 	public void setPreconditionQuery(String preconditionQuery) {
 		this.preconditionQuery = preconditionQuery;
 	}
-	
+
 	@Override
 	public RDFService.SPARQLQueryType getPreconditionQueryType() {
 		return queryType;
 	}
-	
+
 	@Override
 	public void setPreconditionQueryType(RDFService.SPARQLQueryType queryType) {
 		this.queryType = queryType;
@@ -47,20 +47,20 @@ public class ChangeSetImpl implements ChangeSet {
 	public List<ModelChange> getModelChanges() {
 	    	return modelChanges;
 	}
-	
+
 	@Override
 	public void addAddition(InputStream model, RDFService.ModelSerializationFormat format, String graphURI) {
 		modelChanges.add(manufactureModelChange(model,format, ModelChange.Operation.ADD, graphURI));
 	}
-	
+
 	@Override
 	public void addRemoval(InputStream model, RDFService.ModelSerializationFormat format, String graphURI) {
 		modelChanges.add(manufactureModelChange(model, format, ModelChange.Operation.REMOVE, graphURI));
 	}
-	
+
 	@Override
 	public ModelChange manufactureModelChange() {
-		return new ModelChangeImpl(); 
+		return new ModelChangeImpl();
 	}
 
 	@Override
@@ -68,24 +68,24 @@ public class ChangeSetImpl implements ChangeSet {
                                               RDFService.ModelSerializationFormat serializationFormat,
                                               Operation operation,
                                               String graphURI) {
-		return new ModelChangeImpl(serializedModel, serializationFormat, operation, graphURI); 
+		return new ModelChangeImpl(serializedModel, serializationFormat, operation, graphURI);
 	}
-	
-	@Override 
+
+	@Override
 	public void addPreChangeEvent(Object o) {
 	    this.preChangeEvents.add(o);
 	}
-	
-	@Override 
+
+	@Override
     public void addPostChangeEvent(Object o) {
         this.postChangeEvents.add(o);
     }
-	
+
 	@Override
 	public List<Object> getPreChangeEvents() {
 	    return this.preChangeEvents;
 	}
-	
+
 	@Override
     public List<Object> getPostChangeEvents() {
         return this.postChangeEvents;
@@ -97,6 +97,6 @@ public class ChangeSetImpl implements ChangeSet {
 				+ ", queryType=" + queryType + ", modelChanges=" + modelChanges
 				+ ", preChangeEvents=" + preChangeEvents
 				+ ", postChangeEvents=" + postChangeEvents + "]";
-	}	
-	
+	}
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/ModelChangeImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/ModelChangeImpl.java
index d6aec120b..9e97010b9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/ModelChangeImpl.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/ModelChangeImpl.java
@@ -19,12 +19,12 @@ public class ModelChangeImpl implements ModelChange {
 	private String graphURI;
 
 	public ModelChangeImpl() {}
-	
+
 	public ModelChangeImpl(InputStream serializedModel,
                            RDFService.ModelSerializationFormat serializationFormat,
                            Operation operation,
                            String graphURI) {
-		
+
 		this.serializedModel = serializedModel;
 		this.serializationFormat = serializationFormat;
 		this.operation = operation;
@@ -35,27 +35,27 @@ public class ModelChangeImpl implements ModelChange {
 	public InputStream getSerializedModel() {
 		return serializedModel;
 	}
-	
+
 	@Override
 	public void setSerializedModel(InputStream serializedModel) {
 		this.serializedModel = serializedModel;
 	}
-	
+
 	@Override
 	public RDFService.ModelSerializationFormat getSerializationFormat() {
 		return serializationFormat;
 	}
-	
+
 	@Override
 	public void setSerializationFormat(RDFService.ModelSerializationFormat serializationFormat) {
 		this.serializationFormat = serializationFormat;
 	}
-	
+
 	@Override
 	public Operation getOperation() {
 		return operation;
 	}
-	
+
 	@Override
 	public void setOperation(Operation operation) {
 		this.operation = operation;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceFactorySingle.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceFactorySingle.java
index e611bc8fd..f44d2b59f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceFactorySingle.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceFactorySingle.java
@@ -26,45 +26,45 @@ import org.apache.jena.rdf.model.RDFNode;
 public class RDFServiceFactorySingle implements RDFServiceFactory {
 
     private RDFService rdfService;
-    
+
     public RDFServiceFactorySingle(RDFService rdfService) {
         this.rdfService = new UnclosableRDFService(rdfService);
     }
-    
+
     @Override
     public RDFService getRDFService() {
         return this.rdfService;
     }
-    
-    @Override 
+
+    @Override
     public RDFService getShortTermRDFService() {
         return this.rdfService;
     }
-    
+
     @Override
     public void registerListener(ChangeListener listener) throws RDFServiceException {
         this.rdfService.registerListener(listener);
     }
-    
+
     @Override
     public void unregisterListener(ChangeListener listener) throws RDFServiceException {
         this.rdfService.unregisterListener(listener);
     }
-    
+
     @Override
     public void registerJenaModelChangedListener(ModelChangedListener listener) throws RDFServiceException {
         this.rdfService.registerJenaModelChangedListener(listener);
     }
-    
+
     @Override
     public void unregisterJenaModelChangedListener(ModelChangedListener listener) throws RDFServiceException {
         this.rdfService.unregisterJenaModelChangedListener(listener);
     }
-    
+
     public class UnclosableRDFService implements RDFService {
-        
+
         private RDFService s;
-        
+
         public UnclosableRDFService(RDFService rdfService) {
             this.s = rdfService;
         }
@@ -175,7 +175,7 @@ public class RDFServiceFactorySingle implements RDFServiceFactory {
                 throws RDFServiceException {
             s.unregisterListener(changeListener);
         }
-        
+
         @Override
         public void registerJenaModelChangedListener(ModelChangedListener changeListener)
                 throws RDFServiceException {
@@ -212,7 +212,7 @@ public class RDFServiceFactorySingle implements RDFServiceFactory {
         public void close() {
             // Don't close s.  It's being used by everybody.
         }
-        
+
 		@Override
 		public String toString() {
 			return ToString.simpleName(this) + "[" + ToString.hashHex(this)
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java
index 3ea64ea4a..217149283 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java
@@ -42,40 +42,40 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer;
 import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
 
 public abstract class RDFServiceImpl implements RDFService {
-	
+
 	private static final Log log = LogFactory.getLog(RDFServiceImpl.class);
-	protected static final String BNODE_ROOT_QUERY = 
+	protected static final String BNODE_ROOT_QUERY =
 	        "SELECT DISTINCT ?s WHERE { ?s ?p ?o OPTIONAL { ?ss ?pp ?s } FILTER (!isBlank(?s) || !bound(?ss)) }";
-	
+
 	protected String defaultWriteGraphURI;
 	protected List<ChangeListener> registeredListeners = new CopyOnWriteArrayList<ChangeListener>();
 	protected List<ModelChangedListener> registeredJenaListeners = new CopyOnWriteArrayList<ModelChangedListener>();
-    	
+
 	@Override
-	public void newIndividual(String individualURI, 
+	public void newIndividual(String individualURI,
 			                  String individualTypeURI) throws RDFServiceException {
-	
+
        newIndividual(individualURI, individualTypeURI, defaultWriteGraphURI);
 	}
-		
+
     @Override
-    public void newIndividual(String individualURI, 
-                              String individualTypeURI, 
+    public void newIndividual(String individualURI,
+                              String individualTypeURI,
                               String graphURI) throws RDFServiceException {
-    
+
        StringBuilder containsQuery = new StringBuilder("ASK { \n");
        if (graphURI != null) {
            containsQuery.append("  GRAPH <").append(graphURI).append("> { ");
        }
-       containsQuery.append("<");   
+       containsQuery.append("<");
        containsQuery.append(individualURI);
-       containsQuery.append("> ");  
+       containsQuery.append("> ");
        containsQuery.append("?p ?o");
        if (graphURI != null) {
            containsQuery.append(" } \n");
        }
        containsQuery.append("\n}");
-       
+
        if (sparqlAskQuery(containsQuery.toString())) {
             throw new RDFServiceException("individual already exists");
        } else {
@@ -85,26 +85,26 @@ public abstract class RDFServiceImpl implements RDFService {
             cs.addAddition(new ByteArrayInputStream(
                     sparqlTriple(triple).getBytes()), ModelSerializationFormat.N3, graphURI);
             changeSetUpdate(cs);
-       }    
+       }
     }
-	
+
 	@Override
 	public String getDefaultWriteGraphURI() throws RDFServiceException {
         return defaultWriteGraphURI;
 	}
-		
+
 	@Override
 	public synchronized void registerListener(ChangeListener changeListener) throws RDFServiceException {
 		if (!registeredListeners.contains(changeListener)) {
 		   registeredListeners.add(changeListener);
 		}
 	}
-	
+
 	@Override
 	public synchronized void unregisterListener(ChangeListener changeListener) throws RDFServiceException {
 		registeredListeners.remove(changeListener);
 	}
-	
+
 	@Override
 	public synchronized void registerJenaModelChangedListener(ModelChangedListener changeListener) throws RDFServiceException {
 	    if (!registeredJenaListeners.contains(changeListener)) {
@@ -120,15 +120,15 @@ public abstract class RDFServiceImpl implements RDFService {
 	public synchronized List<ChangeListener> getRegisteredListeners() {
 	    return this.registeredListeners;
 	}
-	
+
 	public synchronized List<ModelChangedListener> getRegisteredJenaModelChangedListeners() {
 	    return this.registeredJenaListeners;
 	}
-	
+
 	@Override
 	public ChangeSet manufactureChangeSet() {
 		return new ChangeSetImpl();
-	}    
+	}
 
     protected void notifyListenersOfChanges(ChangeSet changeSet)
             throws IOException {
@@ -139,7 +139,7 @@ public abstract class RDFServiceImpl implements RDFService {
             notifyListeners(modelChange);
         }
     }
-	
+
     protected void notifyListeners(ModelChange modelChange) throws IOException {
         for (ChangeListener listener : registeredListeners) {
             modelChange.getSerializedModel().reset();
@@ -153,24 +153,24 @@ public abstract class RDFServiceImpl implements RDFService {
         Model tempModel = ModelFactory.createDefaultModel();
         Iterator<ModelChangedListener> jenaIter = registeredJenaListeners.iterator();
         while (jenaIter.hasNext()) {
-            ModelChangedListener listener = jenaIter.next(); 
+            ModelChangedListener listener = jenaIter.next();
             log.debug("\t" + listener.getClass().getSimpleName());
             tempModel.register(listener);
         }
         if (Operation.ADD.equals(modelChange.getOperation())) {
             tempModel.read(modelChange.getSerializedModel(), null,
                    RDFServiceUtils.getSerializationFormatString(
-                           modelChange.getSerializationFormat())); 
+                           modelChange.getSerializationFormat()));
         } else if (Operation.REMOVE.equals(modelChange.getOperation())) {
             tempModel.remove(RDFServiceUtils.parseModel(
-                    modelChange.getSerializedModel(), 
+                    modelChange.getSerializedModel(),
                     modelChange.getSerializationFormat()));
         }
         while (jenaIter.hasNext()) {
             tempModel.unregister(jenaIter.next());
         }
     }
-    
+
     public void notifyListenersOfEvent(Object event) {
         for (ChangeListener listener : registeredListeners) {
             // TODO what is the graphURI parameter for?
@@ -179,9 +179,9 @@ public abstract class RDFServiceImpl implements RDFService {
         for (ModelChangedListener listener : registeredJenaListeners) {
             listener.notifyEvent(null, event);
         }
-    }    
-    
-    protected boolean isPreconditionSatisfied(String query, 
+    }
+
+    protected boolean isPreconditionSatisfied(String query,
             RDFService.SPARQLQueryType queryType)
                     throws RDFServiceException {
         Model model = ModelFactory.createDefaultModel();
@@ -197,19 +197,19 @@ public abstract class RDFServiceImpl implements RDFService {
             case ASK:
                 return sparqlAskQuery(query);
             default:
-                throw new RDFServiceException("unrecognized SPARQL query type");  
-        }       
+                throw new RDFServiceException("unrecognized SPARQL query type");
+        }
     }
 
     protected static String getSerializationFormatString(RDFService.ModelSerializationFormat format) {
         switch (format) {
-            case RDFXML: 
+            case RDFXML:
                 return "RDF/XML";
-            case N3: 
+            case N3:
                 return "TTL";
-            case NTRIPLE: 
-                return "N-TRIPLE";    
-            default: 
+            case NTRIPLE:
+                return "N-TRIPLE";
+            default:
                 log.error("unexpected format in getFormatString");
                 return null;
         }
@@ -232,7 +232,7 @@ public abstract class RDFServiceImpl implements RDFService {
         return serializedTriple.toString();
 
     }
-    
+
     protected static String sparqlNodeUpdate(Node node, String varName) {
         if (node.isBlank()) {
             return "_:" + node.getBlankNodeLabel().replaceAll("\\W", "");
@@ -264,7 +264,7 @@ public abstract class RDFServiceImpl implements RDFService {
             return varName;
         }
     }
-       
+
      // see http://www.python.org/doc/2.5.2/ref/strings.html
      // or see jena's n3 grammar jena/src/org.apache/jena/n3/n3.g
     protected static void pyString(StringBuffer sbuff, String s)  {
@@ -277,27 +277,27 @@ public abstract class RDFServiceImpl implements RDFService {
                 sbuff.append('\\') ;
                 sbuff.append(c) ;
                 continue ;
-            }            
+            }
 
-            // Whitespace                        
+            // Whitespace
             if (c == '\n'){ sbuff.append("\\n");continue; }
             if (c == '\t'){ sbuff.append("\\t");continue; }
             if (c == '\r'){ sbuff.append("\\r");continue; }
-            if (c == '\f'){ sbuff.append("\\f");continue; }                            
+            if (c == '\f'){ sbuff.append("\\f");continue; }
             if (c == '\b'){ sbuff.append("\\b");continue; }
             if( c == 7 )  { sbuff.append("\\a");continue; }
-            
+
             // Output as is (subject to UTF-8 encoding on output that is)
             sbuff.append(c) ;
         }
     }
-    
+
     /**
-     * Returns a pair of models.  The first contains any statement containing at 
+     * Returns a pair of models.  The first contains any statement containing at
      * least one blank node.  The second contains all remaining statements.
      * @param gm Jena model
      */
-    
+
     protected Model[] separateStatementsWithBlankNodes(Model gm) {
         Model blankNodeModel = ModelFactory.createDefaultModel();
         Model nonBlankNodeModel = ModelFactory.createDefaultModel();
@@ -315,17 +315,17 @@ public abstract class RDFServiceImpl implements RDFService {
         result[1] = nonBlankNodeModel;
         return result;
     }
-    
+
     protected Query createQuery(String queryString) throws RDFServiceException {
         List<Syntax> syntaxes = Arrays.asList(
-                Syntax.defaultQuerySyntax, Syntax.syntaxSPARQL_11, 
+                Syntax.defaultQuerySyntax, Syntax.syntaxSPARQL_11,
                 Syntax.syntaxSPARQL_10, Syntax.syntaxSPARQL, Syntax.syntaxARQ);
         Query q = null;
-        Iterator<Syntax> syntaxIt = syntaxes.iterator(); 
+        Iterator<Syntax> syntaxIt = syntaxes.iterator();
         while (q == null) {
             Syntax syntax = syntaxIt.next();
             try {
-               q = QueryFactory.create(queryString, syntax);  
+               q = QueryFactory.create(queryString, syntax);
             } catch (QueryParseException e) {
                if (!syntaxIt.hasNext()) {
 					throw new RDFServiceException("Failed to parse query \""
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceUtils.java
index 90b858f16..2043fea05 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceUtils.java
@@ -28,14 +28,14 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.logging.LoggingRDFServic
 
 public class RDFServiceUtils {
 	private static final Log log = LogFactory.getLog(RDFServiceUtils.class);
-	
-    private static final String RDFSERVICEFACTORY_ATTR = 
+
+    private static final String RDFSERVICEFACTORY_ATTR =
             RDFServiceUtils.class.getName() + ".RDFServiceFactory";
-    
+
     public static RDFServiceFactory getRDFServiceFactory(ServletContext context) {
     	return getRDFServiceFactory(context, WhichService.CONTENT);
     }
-    
+
 	/*
 	 * Every factory is wrapped in a logger, so we can dynamically enable or
 	 * disable logging.
@@ -53,18 +53,18 @@ public class RDFServiceUtils {
 							+ attribute + "', but found " + o);
 		}
 	}
-    
-    public static void setRDFServiceFactory(ServletContext context, 
+
+    public static void setRDFServiceFactory(ServletContext context,
     		RDFServiceFactory factory) {
     	setRDFServiceFactory(context, factory, WhichService.CONTENT);
     }
-    
-    public static void setRDFServiceFactory(ServletContext context, 
+
+    public static void setRDFServiceFactory(ServletContext context,
     		RDFServiceFactory factory, WhichService which) {
 		String attribute = RDFSERVICEFACTORY_ATTR + "." + which.name();
     	context.setAttribute(attribute, factory);
     }
-    
+
     public static InputStream toInputStream(String serializedRDF) {
         try {
             return new ByteArrayInputStream(serializedRDF.getBytes("UTF-8"));
@@ -72,14 +72,14 @@ public class RDFServiceUtils {
             throw new RuntimeException(e);
         }
     }
-    
+
     public static Model parseModel(InputStream in, ModelSerializationFormat format) {
         Model model = ModelFactory.createDefaultModel();
         model.read(in, null,
                 getSerializationFormatString(format));
         return model;
     }
-    
+
     public static ResultsFormat getJenaResultSetFormat(ResultFormat resultFormat) {
         switch(resultFormat) {
             case JSON:
@@ -94,34 +94,34 @@ public class RDFServiceUtils {
                 throw new RuntimeException("unsupported ResultFormat");
         }
     }
-    
+
     public static String getSerializationFormatString(RDFService.ModelSerializationFormat format) {
         switch (format) {
-            case RDFXML: 
+            case RDFXML:
                 return "RDF/XML";
-            case N3: 
+            case N3:
                 return "N3";
             case NTRIPLE:
                 return "N-TRIPLE";
-            default: 
+            default:
                 throw new RuntimeException("unexpected format in getSerializationFormatString");
         }
     }
-    
+
     public static ModelSerializationFormat getSerializationFormatFromJenaString(String jenaString) {
-        if ("N3".equals(jenaString) || "TTL".equals(jenaString) 
+        if ("N3".equals(jenaString) || "TTL".equals(jenaString)
                 || "TURTLE".equals(jenaString)) {
             return ModelSerializationFormat.N3;
         } else if ("N-TRIPLE".equals(jenaString)) {
             return ModelSerializationFormat.NTRIPLE;
-        } else if ("RDF/XML".equals(jenaString) 
+        } else if ("RDF/XML".equals(jenaString)
                 || "RDF/XML-ABBREV".equals(jenaString)) {
             return ModelSerializationFormat.RDFXML;
         } else {
             throw new RuntimeException("unrecognized format " + jenaString);
         }
     }
-    
+
     public static RDFService getRDFService(VitroRequest vreq) {
     	return getRDFService(vreq, WhichService.CONTENT);
     }
@@ -130,19 +130,19 @@ public class RDFServiceUtils {
     	return getRDFServiceFactory(
     			vreq.getSession().getServletContext(), which).getRDFService();
     }
-    
+
     public static ResultSet sparqlSelectQuery(String query, RDFService rdfService) {
-    	
+
     	ResultSet resultSet = null;
-    	
+
         try {
             InputStream resultStream = rdfService.sparqlSelectQuery(query, RDFService.ResultFormat.JSON);
             resultSet = ResultSetFactory.fromJSON(resultStream);
             return resultSet;
-        } catch (RDFServiceException e) {        	
+        } catch (RDFServiceException e) {
             log.error("error executing sparql select query: " + e.getMessage());
         }
-        
+
         return resultSet;
-    }    
+    }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java
index ba6704548..dadccfed4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java
@@ -58,7 +58,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.sparql.ResultSetIterators.ResultSe
 public abstract class RDFServiceJena extends RDFServiceImpl implements RDFService {
 
     private final static Log log = LogFactory.getLog(RDFServiceJena.class);
-        
+
     protected abstract DatasetWrapper getDatasetWrapper();
 
     protected volatile boolean rebuildGraphURICache = true;
@@ -66,13 +66,13 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
 
     @Override
 	public abstract boolean changeSetUpdate(ChangeSet changeSet) throws RDFServiceException;
-     
+
     protected void notifyListenersOfPreChangeEvents(ChangeSet changeSet) {
 		for (Object o : changeSet.getPreChangeEvents()) {
 		    this.notifyListenersOfEvent(o);
 		}
 	}
-    
+
     protected void insureThatInputStreamsAreResettable(ChangeSet changeSet) throws IOException {
 		for (ModelChange modelChange: changeSet.getModelChanges()) {
             if (!modelChange.getSerializedModel().markSupported()) {
@@ -87,15 +87,15 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
 		for (ModelChange modelChange: changeSet.getModelChanges()) {
 			dataset.getLock().enterCriticalSection(Lock.WRITE);
 			try {
-				Model model = (modelChange.getGraphURI() == null) ? 
-						dataset.getDefaultModel() : 
+				Model model = (modelChange.getGraphURI() == null) ?
+						dataset.getDefaultModel() :
 						dataset.getNamedModel(modelChange.getGraphURI());
 				operateOnModel(model, modelChange, dataset);
 			} finally {
 				dataset.getLock().leaveCriticalSection();
 			}
 		}
-	}  
+	}
 
     protected void notifyListenersOfPostChangeEvents(ChangeSet changeSet) {
 		for (Object o : changeSet.getPostChangeEvents()) {
@@ -120,12 +120,12 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
                 }
             } else {
                 log.error("unrecognized operation type");
-            } 
+            }
         } finally {
             model.leaveCriticalSection();
         }
     }
-    
+
 	/**
 	 * As a debug statement, log info about the model change operation: add or
 	 * delete, model URI, model class, punctuation count, beginning of the
@@ -179,7 +179,7 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
 	}
 
 	private void removeBlankNodesWithSparqlUpdate(Dataset dataset, Model model, String graphURI) {
-               
+
         List<Statement> blankNodeStatements = new ArrayList<Statement>();
         StmtIterator stmtIt = model.listStatements();
         while (stmtIt.hasNext()) {
@@ -188,22 +188,22 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
                 blankNodeStatements.add(stmt);
             }
         }
-        
+
         if(blankNodeStatements.size() == 0) {
             return;
         }
-        
+
         Model blankNodeModel = ModelFactory.createDefaultModel();
         blankNodeModel.add(blankNodeStatements);
-        
+
         log.debug("removal model size " + model.size());
         log.debug("blank node model size " + blankNodeModel.size());
-                
+
         if (blankNodeModel.size() == 1) {
             log.warn("Deleting single triple with blank node: " + blankNodeModel);
             log.warn("This likely indicates a problem; excessive data may be deleted.");
         }
-        
+
         Query rootFinderQuery = QueryFactory.create(BNODE_ROOT_QUERY);
         QueryExecution qe = QueryExecutionFactory.create(rootFinderQuery, blankNodeModel);
         try {
@@ -223,8 +223,8 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
                     if (graphURI == null) {
                         ds.setDefaultModel(dataset.getDefaultModel());
                     } else {
-                        ds.addNamedModel(graphURI, dataset.getNamedModel(graphURI));    
-                    }  
+                        ds.addNamedModel(graphURI, dataset.getNamedModel(graphURI));
+                    }
                     if (s.isAnon()) {
                         removeUsingSparqlUpdate(ds, tree, graphURI);
                     } else {
@@ -245,11 +245,11 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
                                     qe3.execDescribe(m2);
                                 } finally {
                                     qe3.close();
-                                }    
+                                }
                             }
-                            m2.add(stmt);    
+                            m2.add(stmt);
                             removeUsingSparqlUpdate(ds, m2, graphURI);
-                        }  
+                        }
                     }
                 } finally {
                     qee.close();
@@ -257,9 +257,9 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
             }
         } finally {
             qe.close();
-        }        
+        }
     }
-    
+
     private String makeDescribe(Resource s) {
         StringBuilder query = new StringBuilder("DESCRIBE <") ;
         if (s.isAnon()) {
@@ -270,15 +270,15 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
         query.append(">");
         return query.toString();
     }
-    
-    private void removeUsingSparqlUpdate(Dataset dataset, Model model, String graphURI) {      
+
+    private void removeUsingSparqlUpdate(Dataset dataset, Model model, String graphURI) {
         StmtIterator stmtIt = model.listStatements();
-        
+
         if (!stmtIt.hasNext()) {
             stmtIt.close();
             return;
         }
-        
+
         StringBuffer queryBuff = new StringBuffer();
         queryBuff.append("CONSTRUCT { \n");
         List<Statement> stmts = stmtIt.toList();
@@ -296,9 +296,9 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
             queryBuff.append("    } \n");
         }
         queryBuff.append("} \n");
-        
+
         log.debug(queryBuff.toString());
-        
+
         Query construct = QueryFactory.create(queryBuff.toString());
         // make a plain dataset to force the query to be run in a way that
         // won't overwhelm MySQL with too many joins
@@ -306,21 +306,21 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
         if (graphURI == null) {
             ds.setDefaultModel(dataset.getDefaultModel());
         } else {
-            ds.addNamedModel(graphURI, dataset.getNamedModel(graphURI));            
+            ds.addNamedModel(graphURI, dataset.getNamedModel(graphURI));
         }
         QueryExecution qe = QueryExecutionFactory.create(construct, ds);
         try {
             Model m = qe.execConstruct();
             if (graphURI != null) {
-                dataset.getNamedModel(graphURI).remove(m);    
+                dataset.getNamedModel(graphURI).remove(m);
             } else {
                 dataset.getDefaultModel().remove(m);
             }
         } finally {
             qe.close();
-        }       
+        }
     }
-    
+
     private List<Statement> sort(List<Statement> stmts) {
         List<Statement> output = new ArrayList<Statement>();
         int originalSize = stmts.size();
@@ -350,7 +350,7 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
                     if(stmt.getSubject().equals(subj)) {
                         output.add(stmt);
                         if (stmt.getObject().isResource()) {
-                            subjQueue.add((Resource) stmt.getObject()); 
+                            subjQueue.add((Resource) stmt.getObject());
                         }
                     } else {
                         temp.add(stmt);
@@ -360,14 +360,14 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
             }
         }
         if(output.size() != originalSize) {
-            throw new RuntimeException("original list size was " + originalSize + 
-                    " but sorted size is " + output.size());      
+            throw new RuntimeException("original list size was " + originalSize +
+                    " but sorted size is " + output.size());
         }
         return output;
     }
-    
+
     private static final boolean WHERE_CLAUSE = true;
-    
+
     private void addStatementPatterns(List<Statement> stmts, StringBuffer patternBuff, boolean whereClause) {
         for(Statement stmt : stmts) {
             Triple t = stmt.asTriple();
@@ -387,15 +387,15 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
             }
         }
     }
-    
+
     private Model parseModel(ModelChange modelChange) {
         Model model = ModelFactory.createDefaultModel();
         model.read(modelChange.getSerializedModel(), null,
                 getSerializationFormatString(modelChange.getSerializationFormat()));
         return model;
     }
-    
-    private InputStream getRDFResultStream(String query, boolean construct, 
+
+    private InputStream getRDFResultStream(String query, boolean construct,
             ModelSerializationFormat resultFormat) throws RDFServiceException {
         DatasetWrapper dw = getDatasetWrapper();
         try {
@@ -434,9 +434,9 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
     }
 
     private static final boolean CONSTRUCT = true;
-    
+
     private static final boolean DESCRIBE = false;
-    
+
     @Override
     public InputStream sparqlConstructQuery(String query,
             ModelSerializationFormat resultFormat) throws RDFServiceException {
@@ -466,7 +466,7 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
             QueryExecution qe = createQueryExecution(query, q, d);
             try {
                 ResultSet resultSet = qe.execSelect();
-                ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); 
+                ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
                 switch (resultFormat) {
                    case CSV:
                       ResultSetFormatter.outputAsCSV(outputStream,resultSet);
@@ -480,9 +480,9 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
                    case XML:
                       ResultSetFormatter.outputAsXML(outputStream, resultSet);
                       break;
-                   default: 
+                   default:
                       throw new RDFServiceException("unrecognized result format");
-                }              
+                }
                 InputStream result = new ByteArrayInputStream(outputStream.toByteArray());
                 return result;
             } finally {
@@ -557,7 +557,7 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
     public void getGraphMetadata() throws RDFServiceException {
     	// nothing to do
     }
-    
+
     @Override
 	public void serializeAll(OutputStream outputStream)
 			throws RDFServiceException {
@@ -604,7 +604,7 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
 	 * tripleStore, and ask whether they are isomorphic.
 	 */
 	@Override
-	public boolean isEquivalentGraph(String graphURI, InputStream serializedGraph, 
+	public boolean isEquivalentGraph(String graphURI, InputStream serializedGraph,
 			ModelSerializationFormat serializationFormat) throws RDFServiceException {
 		Model fileModel = RDFServiceUtils.parseModel(serializedGraph, serializationFormat);
 		Model tripleStoreModel = new RDFServiceDataset(this).getNamedModel(graphURI);
@@ -700,7 +700,7 @@ public abstract class RDFServiceJena extends RDFServiceImpl implements RDFServic
     public void close() {
         // nothing
     }
-    
+
     protected QueryExecution createQueryExecution(String queryString, Query q, Dataset d) {
         return QueryExecutionFactory.create(q, d);
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java
index 99a247f14..496928fbc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java
@@ -23,11 +23,11 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.RDFServiceJena;
 public class RDFServiceModel extends RDFServiceJena implements RDFService {
 
     private final static Log log = LogFactory.getLog(RDFServiceModel.class);
-    
+
     private Model model;
     private Dataset dataset;
     private String modelName;
-    
+
     /**
      * Create an RDFService to access a single default graph
      * @param model Jena Model
@@ -35,7 +35,7 @@ public class RDFServiceModel extends RDFServiceJena implements RDFService {
     public RDFServiceModel(Model model) {
         this.model = model;
     }
-    
+
     /**
      * Create an RDFService to access a Jena Dataset
      * @param dataset Jena Dataset
@@ -43,12 +43,12 @@ public class RDFServiceModel extends RDFServiceJena implements RDFService {
     public RDFServiceModel(Dataset dataset) {
         this.dataset = dataset;
     }
-    
+
     @Override
     protected DatasetWrapper getDatasetWrapper() {
       Dataset d = null;
       if (dataset != null)  {
-          d = dataset; 
+          d = dataset;
       } else {
           d = DatasetFactory.createMem();
           if (modelName == null) {
@@ -60,21 +60,21 @@ public class RDFServiceModel extends RDFServiceJena implements RDFService {
       DatasetWrapper datasetWrapper = new DatasetWrapper(d);
       return datasetWrapper;
     }
-    
+
     @Override
     public boolean changeSetUpdate(ChangeSet changeSet)
             throws RDFServiceException {
-             
-        if (changeSet.getPreconditionQuery() != null 
+
+        if (changeSet.getPreconditionQuery() != null
                 && !isPreconditionSatisfied(
-                        changeSet.getPreconditionQuery(), 
+                        changeSet.getPreconditionQuery(),
                                 changeSet.getPreconditionQueryType())) {
             return false;
         }
-            
+
         //Dataset dataset = getDatasetWrapper().getDataset();
-        		        
-        try {                   
+
+        try {
             for (Object o : changeSet.getPreChangeEvents()) {
                 this.notifyListenersOfEvent(o);
             }
@@ -96,7 +96,7 @@ public class RDFServiceModel extends RDFServiceJena implements RDFService {
                 }
                 operateOnModel(m, modelChange, null);
             }
-                        
+
             // notify listeners of triple changes
             notifyListenersOfChanges(changeSet);
 //            csIt = changeSet.getModelChanges().iterator();
@@ -107,16 +107,16 @@ public class RDFServiceModel extends RDFServiceJena implements RDFService {
 //                        new ListeningGraph(modelChange.getGraphURI(), this));
 //                operateOnModel(model, modelChange, null);
 //            }
-            
+
             for (Object o : changeSet.getPostChangeEvents()) {
                 this.notifyListenersOfEvent(o);
             }
-            
+
         } catch (Exception e) {
             log.error(e, e);
             throw new RDFServiceException(e);
-        } 
-        
+        }
+
         return true;
-    }    
+    }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/sdb/RDFServiceFactorySDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/sdb/RDFServiceFactorySDB.java
index fcd97a143..f69a615b4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/sdb/RDFServiceFactorySDB.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/sdb/RDFServiceFactorySDB.java
@@ -18,17 +18,17 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
 public class RDFServiceFactorySDB implements RDFServiceFactory {
 
     private final static Log log = LogFactory.getLog(RDFServiceFactorySDB.class);
-    
+
     private DataSource ds;
     private StoreDesc storeDesc;
     private RDFService longTermRDFService;
-    
+
     public RDFServiceFactorySDB(DataSource dataSource, StoreDesc storeDesc) {
         this.ds = dataSource;
         this.storeDesc = storeDesc;
         this.longTermRDFService = new RDFServiceSDB(dataSource, storeDesc);
     }
-    
+
     @Override
     public RDFService getRDFService() {
         return this.longTermRDFService;
@@ -40,18 +40,18 @@ public class RDFServiceFactorySDB implements RDFServiceFactory {
             RDFService rdfService = new RDFServiceSDB(ds.getConnection(), storeDesc);
             for (ChangeListener cl : ((RDFServiceSDB) longTermRDFService)
                     .getRegisteredListeners() ) {
-                rdfService.registerListener(cl);    
+                rdfService.registerListener(cl);
             }
             for (ModelChangedListener cl : ((RDFServiceSDB) longTermRDFService)
                     .getRegisteredJenaModelChangedListeners() ) {
-                rdfService.registerJenaModelChangedListener(cl);    
+                rdfService.registerJenaModelChangedListener(cl);
             }
             return rdfService;
         } catch (Exception e) {
             log.error(e,e);
             throw new RuntimeException(e);
         }
-    } 
+    }
 
     @Override
     public void registerListener(ChangeListener changeListener)
@@ -64,7 +64,7 @@ public class RDFServiceFactorySDB implements RDFServiceFactory {
             throws RDFServiceException {
         this.longTermRDFService.unregisterListener(changeListener);
     }
-    
+
     @Override
     public void registerJenaModelChangedListener(ModelChangedListener changeListener)
             throws RDFServiceException {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/sdb/RDFServiceSDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/sdb/RDFServiceSDB.java
index e26ef5a6a..d66efc94c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/sdb/RDFServiceSDB.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/sdb/RDFServiceSDB.java
@@ -46,24 +46,24 @@ import org.apache.jena.sdb.store.LayoutType;
 public class RDFServiceSDB extends RDFServiceJena implements RDFService {
 
     private final static Log log = LogFactory.getLog(RDFServiceSDB.class);
-    
+
     private DataSource ds;
     private StoreDesc storeDesc;
     private Connection conn;
     private StaticDatasetFactory staticDatasetFactory;
-    
+
     public RDFServiceSDB(DataSource dataSource, StoreDesc storeDesc) {
         this.ds = dataSource;
         this.storeDesc = storeDesc;
     }
-    
+
     public RDFServiceSDB(Connection conn, StoreDesc storeDesc) {
         this.conn = conn;
         this.storeDesc = storeDesc;
         this.staticDatasetFactory = new StaticDatasetFactory(getDataset(
                 new SDBConnection(conn)));
     }
-    
+
     @Override
     protected DatasetWrapper getDatasetWrapper() {
         try {
@@ -75,21 +75,21 @@ public class RDFServiceSDB extends RDFServiceJena implements RDFService {
         } catch (SQLException sqle) {
             log.error(sqle, sqle);
             throw new RuntimeException(sqle);
-        }     
+        }
     }
-       
+
     @Override
     public boolean changeSetUpdate(ChangeSet changeSet)
             throws RDFServiceException {
-             
-        if (changeSet.getPreconditionQuery() != null 
+
+        if (changeSet.getPreconditionQuery() != null
                 && !isPreconditionSatisfied(
-                        changeSet.getPreconditionQuery(), 
+                        changeSet.getPreconditionQuery(),
                                 changeSet.getPreconditionQueryType())) {
             return false;
         }
-            
-        SDBConnection sdbConn = getSDBConnection();        
+
+        SDBConnection sdbConn = getSDBConnection();
         Dataset dataset = getDataset(sdbConn);
         try {
             insureThatInputStreamsAreResettable(changeSet);
@@ -103,7 +103,7 @@ public class RDFServiceSDB extends RDFServiceJena implements RDFService {
         	applyChangeSetToModel(changeSet, dataset);
             commitTransaction(sdbConn);
             notifyListenersOfChanges(changeSet);
-            notifyListenersOfPostChangeEvents(changeSet);            
+            notifyListenersOfPostChangeEvents(changeSet);
             return true;
         } catch (Exception e) {
             log.error(e, e);
@@ -114,7 +114,7 @@ public class RDFServiceSDB extends RDFServiceJena implements RDFService {
             close(sdbConn);
         }
     }
-    
+
 	private SDBConnection getSDBConnection() throws RDFServiceException  {
 		try {
 			Connection c = (conn != null) ? conn : ds.getConnection();
@@ -122,7 +122,7 @@ public class RDFServiceSDB extends RDFServiceJena implements RDFService {
 		} catch (SQLException sqle) {
 			log.error(sqle, sqle);
 			throw new RDFServiceException(sqle);
-		}        
+		}
     }
 
     private void close(SDBConnection sdbConn) {
@@ -130,13 +130,13 @@ public class RDFServiceSDB extends RDFServiceJena implements RDFService {
             sdbConn.close();
         }
     }
-    
+
     private Dataset getDataset(SDBConnection sdbConn) {
         Store store = SDBFactory.connectStore(sdbConn, storeDesc);
         store.getLoader().setUseThreading(false);
         return SDBFactory.connectDataset(store);
     }
-    
+
 	private void beginTransaction(SDBConnection sdbConn) {
 		if (sdbConn.getTransactionHandler().transactionsSupported()) {
 		    sdbConn.getTransactionHandler().begin();
@@ -148,13 +148,13 @@ public class RDFServiceSDB extends RDFServiceJena implements RDFService {
 			sdbConn.getTransactionHandler().commit();
 		}
 	}
-	
+
 	private void abortTransaction(SDBConnection sdbConn) {
 		if (sdbConn.getTransactionHandler().transactionsSupported()) {
 			sdbConn.getTransactionHandler().abort();
 		}
 	}
-	    
+
     @Override
     protected QueryExecution createQueryExecution(String queryString, Query q, Dataset d) {
         return QueryExecutionFactory.create(q, d);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/tdb/RDFServiceTDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/tdb/RDFServiceTDB.java
index 5533574e4..6b5e4557a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/tdb/RDFServiceTDB.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/tdb/RDFServiceTDB.java
@@ -81,7 +81,7 @@ public class RDFServiceTDB extends RDFServiceJena {
 			} finally {
 				dataset.end();
 			}
-			
+
 			notifyListenersOfChanges(changeSet);
 			notifyListenersOfPostChangeEvents(changeSet);
 			return true;
@@ -93,7 +93,7 @@ public class RDFServiceTDB extends RDFServiceJena {
 		}
 	}
 
-	
+
 	@Override
 	public void close() {
 		if (this.dataset != null) {
@@ -200,7 +200,7 @@ public class RDFServiceTDB extends RDFServiceJena {
 	/**
 	 * TDB has a bug: if given a literal of type xsd:nonNegativeInteger, it
 	 * stores a literal of type xsd:integer.
-	 * 
+	 *
 	 * To determine whether this serialized graph is equivalent to what's in
 	 * TDB, we need to do the same.
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFService.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFService.java
index 861a1384b..5a0189f41 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFService.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFService.java
@@ -19,7 +19,7 @@ import org.apache.jena.rdf.model.RDFNode;
 /**
  * This RDFService wrapper adds instrumentation to the time-consuming methods of
  * the inner RDFService.
- * 
+ *
  * For the other methods, it just delegates to the inner RDFService.
  */
 public class LoggingRDFService implements RDFService {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFServiceFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFServiceFactory.java
index 8a509538a..441713232 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFServiceFactory.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFServiceFactory.java
@@ -53,7 +53,7 @@ public class LoggingRDFServiceFactory implements RDFServiceFactory {
             throws RDFServiceException {
         factory.unregisterJenaModelChangedListener(changeListener);
     }
-    
+
 	@Override
 	public String toString() {
 		return "LoggingRDFServiceFactory[factory=" + factory + "]";
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/RDFServiceLogger.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/RDFServiceLogger.java
index e71ab9fd7..3e8d08c9e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/RDFServiceLogger.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/RDFServiceLogger.java
@@ -17,24 +17,24 @@ import edu.cornell.mannlib.vitro.webapp.utils.developer.loggers.StackTraceUtilit
 
 /**
  * Writes the log message for the LoggingRDFService.
- * 
+ *
  * If not enabled, or if the logging level is insufficient, this does nothing.
- * 
+ *
  * If enabled, it checks for restrictions. If there is a restriction on the call
  * stack (regular expression), then a log message will only be printed if the
  * pattern is found in the concatenated call stack (fully-qualified class names
  * and method names). If there is a restriction on the query string (regular
  * expression) then a log message will only be printed if the pattern is found
  * in the query string.
- * 
+ *
  * If everything passes muster, the constructor will record the time that the
  * instance was created.
- * 
+ *
  * When close() is called, if a start time was recorded, then a log record is
  * produced. This contains the elapsed time, the name of the method, and any
  * arguments passed to the constructor. It may also include a stack trace, if
  * requested.
- * 
+ *
  * The stack trace is abbreviated. It will reach into this class, and will not
  * extend past the first reference to the ApplicationFilterChain. It also omits
  * any Jena classes. Perhaps it should be abbreviated further?
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java
index 1fd9c2442..42aefb920 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparql.java
@@ -187,8 +187,8 @@ public class RDFServiceSparql extends RDFServiceImpl implements RDFService {
 				modelChange.getSerializedModel().mark(Integer.MAX_VALUE);
 				performChange(modelChange);
 			}
-			
-			notifyListenersOfChanges(changeSet);						
+
+			notifyListenersOfChanges(changeSet);
 
 			for (Object o : changeSet.getPostChangeEvents()) {
 				this.notifyListenersOfEvent(o);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparqlHttp.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparqlHttp.java
index 8db031c24..60fb08b91 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparqlHttp.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/sparql/RDFServiceSparqlHttp.java
@@ -20,11 +20,11 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceImpl;
 /**
  * This is a RDFService that passes SPARQL queries to
  * the SPARQL endpoint unaltered and without parsing them.
- * 
+ *
  *  This is useful if the endpoint accepts syntax that does
  *  not pass the ARQ SPARQL 1.1 parser.  The disadvantage
  *  of this is that it currently returns no useful debugging
- *  messages when there is a syntax error. 
+ *  messages when there is a syntax error.
  */
 public class RDFServiceSparqlHttp extends RDFServiceSparql {
 
@@ -41,22 +41,22 @@ public class RDFServiceSparqlHttp extends RDFServiceSparql {
 		super(readEndpointURI, updateEndpointURI, defaultWriteGraphURI);
 	}
 
-	
+
 	/**
 	 * Performs a SPARQL construct query against the knowledge base. The query may have
 	 * an embedded graph identifier.
-	 * 
+	 *
 	 * @param queryStr - the SPARQL query to be executed against the RDF store
 	 * @param resultFormat - type of serialization for RDF result of the SPARQL query
 	 */
 	@Override
 	public InputStream sparqlConstructQuery(String queryStr,
 			                                RDFServiceImpl.ModelSerializationFormat resultFormat) throws RDFServiceException {
-		
+
 		Model model = ModelFactory.createDefaultModel();
 		//Query query = QueryFactory.create(queryStr);
 		//QueryExecution qe = QueryExecutionFactory.sparqlService(readEndpointURI, queryStr);
-		
+
 		QueryEngineHTTP qeh = new QueryEngineHTTP( readEndpointURI, queryStr);
 		try {
 			qeh.execConstruct(model);
@@ -64,7 +64,7 @@ public class RDFServiceSparqlHttp extends RDFServiceSparql {
 			qeh.close();
 		}
 
-		ByteArrayOutputStream serializedModel = new ByteArrayOutputStream(); 
+		ByteArrayOutputStream serializedModel = new ByteArrayOutputStream();
 		model.write(serializedModel,getSerializationFormatString(resultFormat));
 		InputStream result = new ByteArrayInputStream(serializedModel.toByteArray());
 		return result;
@@ -84,27 +84,27 @@ public class RDFServiceSparqlHttp extends RDFServiceSparql {
 	/**
 	 * Performs a SPARQL describe query against the knowledge base. The query may have
 	 * an embedded graph identifier.
-	 * 
+	 *
 	 * @param queryStr - the SPARQL query to be executed against the RDF store
 	 * @param resultFormat - type of serialization for RDF result of the SPARQL query
-	 * 
+	 *
 	 * @return InputStream - the result of the query
-	 * 
+	 *
 	 */
 	@Override
 	public InputStream sparqlDescribeQuery(String queryStr,
 			                               RDFServiceImpl.ModelSerializationFormat resultFormat) throws RDFServiceException {
-		
-		Model model = ModelFactory.createDefaultModel();				
+
+		Model model = ModelFactory.createDefaultModel();
 		QueryEngineHTTP qeh = new QueryEngineHTTP( readEndpointURI, queryStr);
-		
+
 		try {
 			qeh.execDescribe(model);
 		} finally {
 			qeh.close();
 		}
 
-		ByteArrayOutputStream serializedModel = new ByteArrayOutputStream(); 
+		ByteArrayOutputStream serializedModel = new ByteArrayOutputStream();
 		model.write(serializedModel,getSerializationFormatString(resultFormat));
 		InputStream result = new ByteArrayInputStream(serializedModel.toByteArray());
 		return result;
@@ -113,22 +113,22 @@ public class RDFServiceSparqlHttp extends RDFServiceSparql {
 	/**
 	 * Performs a SPARQL select query against the knowledge base. The query may have
 	 * an embedded graph identifier.
-	 * 
+	 *
 	 * @param queryStr - the SPARQL query to be executed against the RDF store
 	 * @param resultFormat - format for the result of the Select query
-	 * 
+	 *
 	 * @return InputStream - the result of the query
-	 * 
+	 *
 	 */
 	@Override
-	public InputStream sparqlSelectQuery(String queryStr, RDFService.ResultFormat resultFormat) throws RDFServiceException {		                
+	public InputStream sparqlSelectQuery(String queryStr, RDFService.ResultFormat resultFormat) throws RDFServiceException {
 
 		QueryEngineHTTP qeh = new QueryEngineHTTP( readEndpointURI, queryStr);
-        
+
         try {
-        	ResultSet resultSet = qeh.execSelect();        	        	
-        	ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); 
-        	
+        	ResultSet resultSet = qeh.execSelect();
+        	ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+
         	switch (resultFormat) {
         	   case CSV:
         		  ResultSetFormatter.outputAsCSV(outputStream,resultSet);
@@ -142,13 +142,13 @@ public class RDFServiceSparqlHttp extends RDFServiceSparql {
         	   case XML:
         		  ResultSetFormatter.outputAsXML(outputStream, resultSet);
         		  break;
-        	   default: 
+        	   default:
         		  throw new RDFServiceException("unrecognized result format");
         	}
-        	
+
         	InputStream result = new ByteArrayInputStream(outputStream.toByteArray());
         	return result;
-        	
+
         } finally {
             qeh.close();
         }
@@ -169,21 +169,21 @@ public class RDFServiceSparqlHttp extends RDFServiceSparql {
 	/**
 	 * Performs a SPARQL ASK query against the knowledge base. The query may have
 	 * an embedded graph identifier.
-	 * 
+	 *
 	 * @param queryStr - the SPARQL query to be executed against the RDF store
-	 * 
-	 * @return  boolean - the result of the SPARQL query 
+	 *
+	 * @return  boolean - the result of the SPARQL query
 	 */
 	@Override
 	public boolean sparqlAskQuery(String queryStr) throws RDFServiceException {
-			    	    
+
 	    QueryEngineHTTP qeh = new QueryEngineHTTP( readEndpointURI, queryStr);
-	    
+
 	    try {
 	         return qeh.execAsk();
 	    } finally {
 	         qeh.close();
 	    }
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/virtuoso/RDFServiceVirtuoso.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/virtuoso/RDFServiceVirtuoso.java
index 1a0eaa4ed..2cc3e6b0c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/virtuoso/RDFServiceVirtuoso.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/virtuoso/RDFServiceVirtuoso.java
@@ -34,21 +34,21 @@ import org.apache.http.util.EntityUtils;
 
 /**
  * For now, at least, it is just like an RDFServiceSparql except:
- * 
+ *
  * A username and password are required. These should refer to a Virtuoso user
  * that posesses the SPARQL_UPDATE role.
- * 
+ *
  * The endpoint URI and the update endpoint URI are derived from the base URI.
  *   You provide: http://localhost:8890
  *   endpoint is: http://localhost:8890/sparql/
  *   update is:   http://localhost:8890/DAV/home/username/rdf_sink/vitro_update
- * 
+ *
  * A change in the syntax of an UPDATE request: "INSERT DATA" becomes "INSERT".
  * This fixes a problem with inserting blank nodes.
- * 
+ *
  * The HTTP request is equipped with the username and password, to answer a
  * challenge for basic authentication.
- * 
+ *
  * Allow for the nonNegativeInteger bug when checking to see whether a graph has
  * changed.
  */
@@ -158,7 +158,7 @@ public class RDFServiceVirtuoso extends RDFServiceSparql {
 	/**
 	 * Virtuoso has a bug which it shares with TDB: if given a literal of type
 	 * xsd:nonNegativeInteger, it stores a literal of type xsd:integer.
-	 * 
+	 *
 	 * To determine whether this serialized graph is equivalent to what is
 	 * already in Virtuoso, we need to do the same.
 	 */
@@ -263,12 +263,12 @@ public class RDFServiceVirtuoso extends RDFServiceSparql {
 	/**
 	 * Convert all of the references to "nonNegativeInteger" to "integer" in
 	 * this serialized graph.
-	 * 
+	 *
 	 * This isn't rigorous: it could fail if another property contained the text
 	 * "nonNegativeInteger" in its name, or if that text were used as part of a
 	 * string literal. If that happens before this Virtuoso bug is fixed, we'll
 	 * need to improve this method.
-	 * 
+	 *
 	 * It also isn't scalable: if we wanted real scalability, we would write to
 	 * a temporary file as we converted.
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ABoxRecomputer.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ABoxRecomputer.java
index 44d44a544..8082a0bac 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ABoxRecomputer.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ABoxRecomputer.java
@@ -81,7 +81,7 @@ public class ABoxRecomputer {
         this.simpleReasoner = simpleReasoner;
         this.searchIndexer = searchIndexer;
         recomputing = false;
-        stopRequested = false;		
+        stopRequested = false;
     }
 
     /**
@@ -123,19 +123,19 @@ public class ABoxRecomputer {
                 searchIndexer.unpause();
             }
             synchronized (lock1) {
-                recomputing = false;                
+                recomputing = false;
             }
         }
     }
-    
+
     /**
-     * Recompute inferences for specified collection of individual URIs, 
+     * Recompute inferences for specified collection of individual URIs,
      * or all URIs if parameter is null
      */
-    public void recompute(Queue<String> individualURIs) {	
+    public void recompute(Queue<String> individualURIs) {
         boolean sizableRecompute = (individualURIs.size() > 20);
         try {
-            if(sizableRecompute && searchIndexer != null) { 
+            if(sizableRecompute && searchIndexer != null) {
                 searchIndexer.pause();
             }
             recomputeIndividuals(individualURIs);
@@ -153,7 +153,7 @@ public class ABoxRecomputer {
     private void recomputeIndividuals(Queue<String> individuals) {
         recomputeIndividuals(individuals, new TypeCaches());
     }
-    
+
     /*
      * Recompute the ABox inference graph for the specified collection of
      * individual URIs
@@ -184,7 +184,7 @@ public class ABoxRecomputer {
                     individualsInBatch.clear();
                 }
                 if (reportingInterval) {
-                    log.info("Still recomputing inferences (" 
+                    log.info("Still recomputing inferences ("
                             + numInds + "/" + size + " individuals)");
                     log.info((System.currentTimeMillis() - start) / numInds + " ms per individual");
                 }
@@ -199,7 +199,7 @@ public class ABoxRecomputer {
         if(additionalInferences.size() > 0) {
             log.debug("Writing additional inferences generated by reasoner plugins.");
             ChangeSet change = rdfService.manufactureChangeSet();
-            change.addAddition(makeN3InputStream(additionalInferences), 
+            change.addAddition(makeN3InputStream(additionalInferences),
                     RDFService.ModelSerializationFormat.N3, ModelNames.ABOX_INFERENCES);
             try {
                 rdfService.changeSetUpdate(change);
@@ -212,8 +212,8 @@ public class ABoxRecomputer {
     private static final boolean RUN_PLUGINS = true;
     private static final boolean SKIP_PLUGINS = !RUN_PLUGINS;
 
-    private Model recomputeIndividual(String individualURI, 
-            Model rebuildModel, TypeCaches caches, Collection<String> individualQueue) 
+    private Model recomputeIndividual(String individualURI,
+            Model rebuildModel, TypeCaches caches, Collection<String> individualQueue)
                     throws RDFServiceException {
         long start = System.currentTimeMillis();
         Model assertions = getAssertions(individualURI);
@@ -227,7 +227,7 @@ public class ABoxRecomputer {
                 rebuildModel.add(
                         rewriteInferences(getAssertions(sameAsInd), individualURI));
                 Resource indRes = ResourceFactory.createResource(individualURI);
-                Resource sameAsIndRes = ResourceFactory.createResource(sameAsInd); 
+                Resource sameAsIndRes = ResourceFactory.createResource(sameAsInd);
                 if(!assertions.contains(indRes, OWL.sameAs, sameAsIndRes)) {
                     if(!rebuildModel.contains(indRes, OWL.sameAs, sameAsIndRes)) {
                         individualQueue.add(sameAsInd);
@@ -248,10 +248,10 @@ public class ABoxRecomputer {
      * Adds inferences to temporary rebuildmodel
      * @param individualURI The individual
      * @param rebuildModel The rebuild model
-     * @return any additional inferences produced by plugins that affect other 
+     * @return any additional inferences produced by plugins that affect other
      *         individuals
      */
-    private Model recomputeIndividual(String individualURI, String aliasURI, 
+    private Model recomputeIndividual(String individualURI, String aliasURI,
             Model assertions, Model rebuildModel, TypeCaches caches, boolean runPlugins)
                     throws RDFServiceException {
 
@@ -372,7 +372,7 @@ public class ABoxRecomputer {
 
     private Model getMostSpecificTypes(Resource individual, Model assertedTypes) {
         String queryStr = "CONSTRUCT { \n" +
-                "    <" + individual.getURI() + "> <" + VitroVocabulary.MOST_SPECIFIC_TYPE + "> ?type \n" + 
+                "    <" + individual.getURI() + "> <" + VitroVocabulary.MOST_SPECIFIC_TYPE + "> ?type \n" +
                 "} WHERE { \n" +
                 "    <" + individual.getURI() + "> a ?type .\n" +
                 "    FILTER (isURI(?type)) \n" +
@@ -442,8 +442,8 @@ public class ABoxRecomputer {
                     (Resource) null, RDF.type, OWL.Class);
             while(classIt.hasNext()) {
                 Statement stmt = classIt.nextStatement();
-                if(stmt.getSubject().isURIResource() 
-                        && stmt.getSubject().getURI() != null 
+                if(stmt.getSubject().isURIResource()
+                        && stmt.getSubject().getURI() != null
                         && !stmt.getSubject().getURI().isEmpty()) {
                     classList.add(stmt.getSubject().getURI());
                 }
@@ -518,7 +518,7 @@ public class ABoxRecomputer {
     /*
      * reconcile a set of inferences into the application inference model
      */
-    protected void updateInferenceModel(Model rebuildModel, 
+    protected void updateInferenceModel(Model rebuildModel,
             Collection<String> individuals) throws RDFServiceException {
         Model existing = ModelFactory.createDefaultModel();
         for (String individualURI : individuals) {
@@ -570,7 +570,7 @@ public class ABoxRecomputer {
                     .append("        } UNION {\n").append("            ?object <").append(OWL.sameAs).append("> <").append(individualUri).append("> .\n")
                     .append("        }\n")
                     .append("    } \n")
-                    .append("    FILTER (?g != <" + ModelNames.ABOX_INFERENCES + ">)\n") 
+                    .append("    FILTER (?g != <" + ModelNames.ABOX_INFERENCES + ">)\n")
                     .append("}\n");
             rdfService.sparqlSelectQuery(builder.toString(), new ResultSetConsumer() {
                 @Override
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/IndividualURIQueue.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/IndividualURIQueue.java
index 8f91c5434..b3ac5f26b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/IndividualURIQueue.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/IndividualURIQueue.java
@@ -12,7 +12,7 @@ public class IndividualURIQueue<E> implements Queue<E> {
 
     private ConcurrentLinkedQueue<E> q = new ConcurrentLinkedQueue<E>();
     private ConcurrentHashMap<E, Boolean> m = new ConcurrentHashMap<E, Boolean>();
-    
+
     @Override
     public synchronized boolean addAll(Collection<? extends E> c) {
         boolean changed = false;
@@ -25,18 +25,18 @@ public class IndividualURIQueue<E> implements Queue<E> {
         }
         return changed;
     }
-    
+
     @Override
     public synchronized void clear() {
         m.clear();
         q.clear();
     }
-    
+
     @Override
     public boolean contains(Object o) {
         return m.containsKey(o);
     }
-    
+
     @Override
     public boolean containsAll(Collection<?> c) {
         boolean contains = true;
@@ -45,23 +45,23 @@ public class IndividualURIQueue<E> implements Queue<E> {
         }
         return contains;
     }
-    
+
     @Override
     public boolean isEmpty() {
         return q.isEmpty();
     }
-    
+
     @Override
     public Iterator<E> iterator() {
         return q.iterator();
     }
-    
+
     @Override
     public synchronized boolean remove(Object o) {
         m.remove(o);
         return q.remove(o);
     }
-    
+
     @Override
     public synchronized boolean removeAll(Collection<?> c) {
         for (Object e : c) {
@@ -69,7 +69,7 @@ public class IndividualURIQueue<E> implements Queue<E> {
         }
         return q.removeAll(c);
     }
-    
+
     @Override
     public synchronized boolean retainAll(Collection<?> c) {
         boolean changed = false;
@@ -82,22 +82,22 @@ public class IndividualURIQueue<E> implements Queue<E> {
         }
         return changed;
     }
-    
+
     @Override
     public int size() {
         return m.size();
     }
-    
+
     @Override
     public Object[] toArray() {
         return q.toArray();
     }
-    
+
     @Override
     public <T> T[] toArray(T[] a) {
         return q.toArray(a);
     }
-    
+
     @Override
     public synchronized boolean add(E e) {
         if(m.containsKey(e)) {
@@ -108,34 +108,34 @@ public class IndividualURIQueue<E> implements Queue<E> {
             return true;
         }
     }
-    
+
     @Override
     public E element() {
         return q.element();
     }
-    
+
     @Override
     public boolean offer(E e) {
         return q.offer(e);
     }
-    
+
     @Override
     public E peek() {
         return q.peek();
     }
-    
+
     @Override
     public synchronized E poll() {
         E e =  q.poll();
         m.remove(e);
         return e;
     }
-    
+
     @Override
     public synchronized E remove() {
         E e = q.remove();
         m.remove(e);
         return e;
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ModelUpdate.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ModelUpdate.java
index 4f438786e..951f1b778 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ModelUpdate.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ModelUpdate.java
@@ -8,14 +8,14 @@ import org.apache.jena.rdf.model.Statement;
 public class ModelUpdate {
 
 	public static enum Operation {ADD, RETRACT};
-	
+
 	private Operation operation;
 	private Statement statement;
 	private String modelURI;
 	//JenaDataSourceSetupBase.JENA_DB_MODEL;
 	//JenaDataSourceSetupBase.JENA_TBOX_ASSERTIONS_MODEL;
-	
-	
+
+
 	public ModelUpdate() {
 
     }
@@ -23,7 +23,7 @@ public class ModelUpdate {
 	public ModelUpdate(Statement statement,
 			           Operation operation,
 	                   String modelURI) {
-		
+
 		this.operation = operation;
 		this.statement = statement;
 		this.modelURI = modelURI;
@@ -52,13 +52,13 @@ public class ModelUpdate {
 	public void setModelURI(String modelURI) {
 		this.modelURI = modelURI;
 	}
-	
+
 	@Override public String toString() {
 		String ret = "operation = " + this.operation + ",";
 		ret += " model = " + this.modelURI + ",";
 		ret += " statement = " + SimpleReasoner.stmtString(statement);
-		
-		
+
+
 		return ret;
 	}
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ReasonerPlugin.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ReasonerPlugin.java
index 2ea9343be..3e4ab84db 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ReasonerPlugin.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ReasonerPlugin.java
@@ -9,22 +9,22 @@ import org.apache.jena.rdf.model.Statement;
 public interface ReasonerPlugin {
 
 	public boolean isInterestedInAddedStatement(Statement stmt);
-	
+
 	public boolean isInterestedInRemovedStatement(Statement stmt);
-	
+
 	public boolean isConfigurationOnlyPlugin();
-	
-	public void addedABoxStatement(Statement stmt, 
-			                       Model aboxAssertionsModel, 
-			                       Model aboxInferencesModel, 
-			                       OntModel TBoxInferencesModel); 
-	
-	public void removedABoxStatement(Statement stmt, 
-			                       Model aboxAssertionsModel, 
-			                       Model aboxInferencesModel, 
+
+	public void addedABoxStatement(Statement stmt,
+			                       Model aboxAssertionsModel,
+			                       Model aboxInferencesModel,
 			                       OntModel TBoxInferencesModel);
-	
+
+	public void removedABoxStatement(Statement stmt,
+			                       Model aboxAssertionsModel,
+			                       Model aboxInferencesModel,
+			                       OntModel TBoxInferencesModel);
+
 	public void setSimpleReasoner(SimpleReasoner simpleReasoner);
-	
+
 	public SimpleReasoner getSimpleReasoner();
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasoner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasoner.java
index ec48483c7..5b669b732 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasoner.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasoner.java
@@ -51,68 +51,68 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.model.RDFServiceMod
 /**
  * Allows for real-time incremental materialization or retraction of RDFS-
  * style class and property subsumption based ABox inferences as statements
- * are added to or removed from the (ABox or TBox) knowledge base. 
+ * are added to or removed from the (ABox or TBox) knowledge base.
  * @author sjm222
  */
 
-public class SimpleReasoner extends StatementListener 
+public class SimpleReasoner extends StatementListener
         implements ModelChangedListener, ChangeListener {
 
 	private static final Log log = LogFactory.getLog(SimpleReasoner.class);
-	
+
 	private final SearchIndexer searchIndexer;
-	
+
 	private OntModel tboxModel;             // asserted and inferred TBox axioms
 	private OntModel aboxModel;             // ABox assertions
 	private Model inferenceModel;           // ABox inferences
-	private OntModel fullModel;             // contains at least the 
+	private OntModel fullModel;             // contains at least the
 	                                        // asserted and inferred ABox
-	
-	private static final String mostSpecificTypePropertyURI = 
-        "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#mostSpecificType";	
+
+	private static final String mostSpecificTypePropertyURI =
+        "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#mostSpecificType";
 	private static final AnnotationProperty mostSpecificType = (
 			VitroModelFactory.createOntologyModel())
 				.createAnnotationProperty(mostSpecificTypePropertyURI);
-	
+
 	private ABoxRecomputer recomputer = null;
-	private List<ReasonerPlugin> pluginList = new CopyOnWriteArrayList<ReasonerPlugin>();   
+	private List<ReasonerPlugin> pluginList = new CopyOnWriteArrayList<ReasonerPlugin>();
     private boolean doSameAs = true;
 
 	/**
 	 * @param tboxModel - input.  This model contains both asserted and inferred TBox axioms
 	 * @param rdfService - input.  An RDF Service
-	 * @param inferenceModel - output. This is the model in which inferred (materialized) 
+	 * @param inferenceModel - output. This is the model in which inferred (materialized)
      *  ABox statements are maintained (added or retracted).
-	 * @param inferenceRebuildModel - output. This the model is temporarily used when the 
+	 * @param inferenceRebuildModel - output. This the model is temporarily used when the
      *  whole ABox inference model is rebuilt
 	 * @param scratchpadModel - output. This the model is temporarily used when
      *  the whole ABox inference model is rebuilt
-     * @param searchIndexer - output. If not null, the indexer will be paused before the 
+     * @param searchIndexer - output. If not null, the indexer will be paused before the
      *  ABox inference model is rebuilt and unpaused when the rebuild is complete.
  	 */
-	public SimpleReasoner(OntModel tboxModel, 
-			              RDFService rdfService, 
+	public SimpleReasoner(OntModel tboxModel,
+			              RDFService rdfService,
 			              Model inferenceModel,
-			              Model inferenceRebuildModel, 
-			              Model scratchpadModel, 
+			              Model inferenceRebuildModel,
+			              Model scratchpadModel,
 			              SearchIndexer searchIndexer) {
-		
+
 		this.searchIndexer = searchIndexer;
 
 		this.tboxModel = tboxModel;
-		
+
 		this.fullModel = VitroModelFactory.createOntologyModel(
                 VitroModelFactory.createModelForGraph(
                         new RDFServiceGraph(rdfService)));
-		
+
         this.aboxModel = VitroModelFactory.createOntologyModel(
                   VitroModelFactory.createModelForGraph(
                         new DifferenceGraph(new DifferenceGraph(new RDFServiceGraph(rdfService),inferenceModel.getGraph()),
                         		tboxModel.getGraph())));
-                        
+
 		this.inferenceModel = inferenceModel;
 		recomputer = new ABoxRecomputer(tboxModel, aboxModel, rdfService, this, searchIndexer);
-		
+
 		if (rdfService == null) {
 		    aboxModel.register(this);
 		} else {
@@ -121,12 +121,12 @@ public class SimpleReasoner extends StatementListener
     		} catch (RDFServiceException e) {
     		    throw new RuntimeException("Unable to register change listener", e);
     		}
-		} 
+		}
 	}
-	
+
 	/**
 	 * This constructor is used for the unit tests only
-	 * 
+	 *
 	 * @param tboxModel - input.  This model contains both asserted and inferred TBox axioms
 	 * @param aboxModel - input.  This model contains asserted ABox statements
 	 * @param inferenceModel - output. This is the model in which inferred (materialized)
@@ -135,22 +135,22 @@ public class SimpleReasoner extends StatementListener
 	public SimpleReasoner(OntModel tboxModel, OntModel aboxModel, Model inferenceModel) {
 		this.searchIndexer = null;
 		this.tboxModel = tboxModel;
-		this.aboxModel = aboxModel; 
+		this.aboxModel = aboxModel;
 		this.inferenceModel = inferenceModel;
-		this.fullModel = VitroModelFactory.createUnion(aboxModel, 
+		this.fullModel = VitroModelFactory.createUnion(aboxModel,
 				VitroModelFactory.createOntologyModel(inferenceModel));
 		Dataset ds = DatasetFactory.createMem();
 		ds.addNamedModel(ModelNames.ABOX_ASSERTIONS, aboxModel);
 		ds.addNamedModel(ModelNames.ABOX_INFERENCES, inferenceModel);
-		ds.addNamedModel(ModelNames.TBOX_ASSERTIONS, tboxModel);	
+		ds.addNamedModel(ModelNames.TBOX_ASSERTIONS, tboxModel);
 		ds.setDefaultModel(ModelFactory.createUnion(fullModel, tboxModel));
 		recomputer = new ABoxRecomputer(tboxModel, aboxModel, new RDFServiceModel(ds), this, searchIndexer);
 	}
-	
+
 	public void setPluginList(List<ReasonerPlugin> pluginList) {
 		this.pluginList = pluginList;
 	}
-	
+
 	public List<ReasonerPlugin> getPluginList() {
 		return this.pluginList;
 	}
@@ -158,18 +158,18 @@ public class SimpleReasoner extends StatementListener
     public void setSameAsEnabled( boolean tf){
         this.doSameAs = tf;
     }
-    
+
     public boolean getSameAsEnabled() {
         return this.doSameAs;
     }
-  
+
     public void notifyModelChange(ModelChange modelChange) {
-        if(isABoxInferenceGraph(modelChange.getGraphURI()) 
+        if(isABoxInferenceGraph(modelChange.getGraphURI())
                 || isTBoxGraph(modelChange.getGraphURI())) {
             return;
         }
         Queue<String> individualURIs = new IndividualURIQueue<String>();
-        Model m = RDFServiceUtils.parseModel(modelChange.getSerializedModel(), 
+        Model m = RDFServiceUtils.parseModel(modelChange.getSerializedModel(),
                 modelChange.getSerializationFormat());
         StmtIterator sit = m.listStatements();
         while(sit.hasNext()) {
@@ -177,7 +177,7 @@ public class SimpleReasoner extends StatementListener
         }
         recomputeIndividuals(individualURIs);
     }
-    
+
     /*
      * Performs incremental ABox reasoning based
      * on the addition of a new statement
@@ -186,16 +186,16 @@ public class SimpleReasoner extends StatementListener
     @Override
     public void addedStatement(Statement stmt) {
         doPlugins(ModelUpdate.Operation.ADD,stmt);
-        listenToStatement(stmt, new IndividualURIQueue<String>());       
+        listenToStatement(stmt, new IndividualURIQueue<String>());
     }
-    
+
     /*
      * Performs incremental ABox reasoning based
      * on the retraction of a statement (aka assertion)
-     * from the ABox. 
+     * from the ABox.
      */
     @Override
-    public void removedStatement(Statement stmt) {  
+    public void removedStatement(Statement stmt) {
         doPlugins(ModelUpdate.Operation.RETRACT,stmt);
         Queue<String> individualURIs = new IndividualURIQueue<String>();
         if(doSameAs && OWL.sameAs.equals(stmt.getPredicate())) {
@@ -209,13 +209,13 @@ public class SimpleReasoner extends StatementListener
             }
         }
         listenToStatement(stmt, individualURIs);
-    }   
-    
+    }
+
     private void listenToStatement(Statement stmt, Queue<String> individualURIs) {
         queueRelevantIndividuals(stmt, individualURIs);
-        recomputeIndividuals(individualURIs); 
+        recomputeIndividuals(individualURIs);
     }
-    
+
     private void queueRelevantIndividuals(Statement stmt, Queue<String> individualURIs) {
         if(stmt.getSubject().isURIResource()) {
             individualURIs.add(stmt.getSubject().getURI());
@@ -230,11 +230,11 @@ public class SimpleReasoner extends StatementListener
         int size = individualURIs.size();
         recomputer.recompute(individualURIs);
         if(size > 2) {
-            log.info((System.currentTimeMillis() - start) + " ms to recompute " 
+            log.info((System.currentTimeMillis() - start) + " ms to recompute "
                     + size + " individuals");
         }
     }
-    
+
     /**
 	 * Performs incremental ABox reasoning based
 	 * on changes to the class hierarchy.
@@ -242,12 +242,12 @@ public class SimpleReasoner extends StatementListener
      * addedTBoxStatement and removedTBoxStatement use the
      * same tests so the are merged into this method.
      *
-	 * Handles rdfs:subclassOf, owl:equivalentClass, and owl:inverseOf 
+	 * Handles rdfs:subclassOf, owl:equivalentClass, and owl:inverseOf
 	 */
     protected void changedTBoxStatement( Statement stmt , boolean add){
-        try {		
-			if (!(stmt.getPredicate().equals(RDFS.subClassOf) 
-                  || stmt.getPredicate().equals(OWL.equivalentClass) 
+        try {
+			if (!(stmt.getPredicate().equals(RDFS.subClassOf)
+                  || stmt.getPredicate().equals(OWL.equivalentClass)
                   || stmt.getPredicate().equals(OWL.inverseOf))) {
 				return;
 			}
@@ -256,35 +256,35 @@ public class SimpleReasoner extends StatementListener
 				log.warn("The object of this assertion is not a resource: " + stmtString(stmt));
 				return;
 			}
-						
-			if (stmt.getPredicate().equals(RDFS.subClassOf) 
+
+			if (stmt.getPredicate().equals(RDFS.subClassOf)
                 || stmt.getPredicate().equals(OWL.equivalentClass)) {
 
 				// ignore anonymous classes
 				if (stmt.getSubject().isAnon() || stmt.getObject().isAnon()) {
 				    return;
 				}
-			
+
 				OntClass subject, object;
 				tboxModel.enterCriticalSection(Lock.READ);
 				try {
     				subject = tboxModel.getOntClass((stmt.getSubject()).getURI());
     				if (subject == null) {
-    					log.debug("didn't find subject class in the tbox: " 
+    					log.debug("didn't find subject class in the tbox: "
                                   + (stmt.getSubject()).getURI());
     					return;
     				}
-    				
-    				object = tboxModel.getOntClass(((Resource)stmt.getObject()).getURI()); 
+
+    				object = tboxModel.getOntClass(((Resource)stmt.getObject()).getURI());
     				if (object == null) {
-    					log.debug("didn't find object class in the tbox: " 
+    					log.debug("didn't find object class in the tbox: "
                                   + ((Resource)stmt.getObject()).getURI());
     					return;
     				}
 				} finally {
 				    tboxModel.leaveCriticalSection();
 				}
-				
+
 				if (stmt.getPredicate().equals(RDFS.subClassOf)) {
                     if( add ){
 					 addedSubClass(subject,object,inferenceModel);
@@ -300,8 +300,8 @@ public class SimpleReasoner extends StatementListener
                         removedSubClass( subject,object,inferenceModel);
                         removedSubClass(object,subject,inferenceModel);
                     }
-				} 
-			} else {	
+				}
+			} else {
 				if ( stmt.getObject().asResource().getURI() == null ) {
 					log.warn("The object of this assertion has a null URI: " + stmtString(stmt));
 					return;
@@ -311,38 +311,38 @@ public class SimpleReasoner extends StatementListener
 					log.warn("The subject of this assertion has a null URI: " + stmtString(stmt));
 					return;
 				}
-				
+
 				OntProperty prop1 = tboxModel.getOntProperty((stmt.getSubject()).getURI());
 				if (prop1 == null) {
-					log.debug("didn't find subject property in the tbox: " 
+					log.debug("didn't find subject property in the tbox: "
                               + (stmt.getSubject()).getURI());
 					return;
 					}
-					
-				OntProperty prop2 = tboxModel.getOntProperty(((Resource)stmt.getObject()).getURI()); 
+
+				OntProperty prop2 = tboxModel.getOntProperty(((Resource)stmt.getObject()).getURI());
 				if (prop2 == null) {
-					log.debug("didn't find object property in the tbox: " 
+					log.debug("didn't find object property in the tbox: "
                               + ((Resource)stmt.getObject()).getURI());
 					return;
 				}
-				
+
                 if( add ){
-                    addedInverseProperty(prop1, prop2, inferenceModel);	
+                    addedInverseProperty(prop1, prop2, inferenceModel);
                 } else {
                     removedInverseProperty(prop1,prop2,inferenceModel);
                 }
 			}
 		} catch (Exception e) { // don't stop the edit if there's an exception
 			log.error("Exception while " + (add?"adding":"removing") + " inference(s)",e);
-		}        
+		}
     }
 
 	/**
 	 * Performs incremental ABox reasoning based
 	 * on changes to the class hierarchy.
-	 * 
+	 *
 	 * Handles rdfs:subclassOf, owl:equivalentClass, and owl:inverseOf
-	 */	
+	 */
 	public void addedTBoxStatement(Statement stmt) {
         changedTBoxStatement( stmt, true);
 	}
@@ -350,13 +350,13 @@ public class SimpleReasoner extends StatementListener
 	/**
 	 * Performs incremental ABox reasoning based
 	 * on changes to the class hierarchy.
-	 * 
-	 * Handles rdfs:subclassOf, owl:equivalentClass, and owl:inverseOf 
+	 *
+	 * Handles rdfs:subclassOf, owl:equivalentClass, and owl:inverseOf
 	 */
-	public void removedTBoxStatement(Statement stmt) {	
+	public void removedTBoxStatement(Statement stmt) {
         changedTBoxStatement(stmt, false);
 	}
-	
+
 	/**
 	 * If it is added that B is a subClass of A, then for each
 	 * individual that is typed as B, either in the ABox or in the
@@ -364,7 +364,7 @@ public class SimpleReasoner extends StatementListener
 	 */
 	protected void addedSubClass(OntClass subClass, OntClass superClass, Model inferenceModel) {
 		//log.debug("subClass = " + subClass.getURI() + " superClass = " + superClass.getURI());
-		OntModel unionModel = VitroModelFactory.createOntologyModel(); 
+		OntModel unionModel = VitroModelFactory.createOntologyModel();
 		unionModel.addSubModel(aboxModel);
 		unionModel.addSubModel(inferenceModel);
 	    List<Resource> subjectList = new ArrayList<Resource>();
@@ -378,10 +378,10 @@ public class SimpleReasoner extends StatementListener
 		} finally {
 			aboxModel.leaveCriticalSection();
 		}
-		
+
 	    for (Resource subject : subjectList) {
-			Statement infStmt = ResourceFactory.createStatement(subject, RDF.type, superClass);	
-		    addInference(infStmt, inferenceModel, true);	
+			Statement infStmt = ResourceFactory.createStatement(subject, RDF.type, superClass);
+		    addInference(infStmt, inferenceModel, true);
 			setMostSpecificTypes(infStmt.getSubject(), inferenceModel, new HashSet<String>());
 	    }
 	}
@@ -390,25 +390,25 @@ public class SimpleReasoner extends StatementListener
 	 * If removed that B is a subclass of A, then for each individual
 	 * that is of type B, either inferred or in the ABox, remove the
 	 * assertion that it is of type A from the inferred model,
-	 * UNLESS the individual is of some type C that is a subClass 
+	 * UNLESS the individual is of some type C that is a subClass
 	 * of A (including A itself)
 	 */
 	protected void removedSubClass(OntClass subClass, OntClass superClass, Model inferenceModel) {
-		OntModel unionModel = VitroModelFactory.createOntologyModel(); 
+		OntModel unionModel = VitroModelFactory.createOntologyModel();
 		unionModel.addSubModel(aboxModel);
 		unionModel.addSubModel(inferenceModel);
 		List<Resource> subjectList = new ArrayList<Resource>();
 	    aboxModel.enterCriticalSection(Lock.READ);
-	    try {		
+	    try {
 		    StmtIterator iter = unionModel.listStatements((Resource) null, RDF.type, subClass);
 		    while (iter.hasNext()) {
 			    Statement stmt = iter.next();
-			    subjectList.add(stmt.getSubject());	
+			    subjectList.add(stmt.getSubject());
 	        }
 	    } finally {
 	        aboxModel.leaveCriticalSection();
 	    }
-	    
+
 	    for (Resource ind : subjectList) {
 			if (entailedType(ind,superClass)) {
 				continue;
@@ -418,12 +418,12 @@ public class SimpleReasoner extends StatementListener
 			try {
 			    if (inferenceModel.contains(infStmt)) {
 				    inferenceModel.remove(infStmt);
-			    } 
-			    
+			    }
+
 	        } finally {
 	            inferenceModel.leaveCriticalSection();
 	        }
-			
+
 			setMostSpecificTypes(ind, inferenceModel, new HashSet<String>());
 		}
 	}
@@ -434,25 +434,25 @@ public class SimpleReasoner extends StatementListener
 	 *     the assertions model add the inverse statement
 	 *     to the inference model if that inverse is
 	 *     in the assertions model.
-	 *      	      
+	 *
 	 *  2. Repeat the same for predicate Q.
-	 *  
+	 *
 	 */
 	protected void addedInverseProperty(OntProperty prop1, OntProperty prop2, Model inferenceModel) {
-		
+
 		if ( !prop1.isObjectProperty() || !prop2.isObjectProperty() ) {
 		   log.warn("The subject and object of the inverseOf statement are not both object properties. No inferencing will be performed. property 1: " + prop1.getURI() + " property 2:" + prop2.getURI());
 		   return;
 		}
-		
-		Model inferences = ModelFactory.createDefaultModel();		
+
+		Model inferences = ModelFactory.createDefaultModel();
 	    inferences.add(generateInverseInferences(prop1, prop2));
 	    inferences.add(generateInverseInferences(prop2, prop1));
-	    
+
 		if (inferences.isEmpty()) return;
-				
+
 		StmtIterator iter = inferences.listStatements();
-		
+
 		while (iter.hasNext()) {
 			Statement infStmt = iter.next();
 			addInference(infStmt, inferenceModel, true);
@@ -461,35 +461,35 @@ public class SimpleReasoner extends StatementListener
 
 	/**
 	 * If it is removed that P is an inverse of Q, then:
-	 *  1. For each statement involving predicate P in 
+	 *  1. For each statement involving predicate P in
 	 *     the abox assertions model remove the inverse
 	 *     statement from the inference model unless
 	 *     that statement is otherwise entailed.
-	 *      	      
+	 *
 	 *  2. Repeat the same for predicate Q.
 	 */
 	protected void removedInverseProperty(OntProperty prop1, OntProperty prop2, Model inferenceModel) {
-		
+
 		if ( !prop1.isObjectProperty() || !prop2.isObjectProperty() ) {
 		   log.warn("The subject and object of the inverseOf statement are not both object properties. No inferencing will be performed. property 1: " + prop1.getURI() + " property 2:" + prop2.getURI());
 		   return;
 		}
-				
+
 		Model inferences = ModelFactory.createDefaultModel();
 	    inferences.add(generateInverseInferences(prop1, prop2));
 	    inferences.add(generateInverseInferences(prop2, prop1));
-				
+
 		if (inferences.isEmpty()) return;
-					
+
 		StmtIterator iter = inferences.listStatements();
-			
+
 		while (iter.hasNext()) {
 			Statement infStmt = iter.next();
-					
+
 			if (entailedStatement(infStmt)) {
 				continue;
 			}
-			
+
 			removeInference(infStmt,inferenceModel);
 		}
 	}
@@ -497,25 +497,25 @@ public class SimpleReasoner extends StatementListener
 	/**
 	 * Get a list of individuals the same as the given individual
 	 */
-	protected List<Resource> getSameIndividuals(Resource ind, Model inferenceModel) {	
+	protected List<Resource> getSameIndividuals(Resource ind, Model inferenceModel) {
 		ArrayList<Resource> sameIndividuals = new ArrayList<Resource>();
 		fullModel.enterCriticalSection(Lock.READ);
 		try {
-			Iterator<Statement> iter = fullModel.listStatements(ind, OWL.sameAs, (RDFNode) null);	
+			Iterator<Statement> iter = fullModel.listStatements(ind, OWL.sameAs, (RDFNode) null);
 			while (iter.hasNext()) {
 				Statement stmt = iter.next();
-				if (stmt.getObject() != null 
-                    && stmt.getObject().isResource() 
+				if (stmt.getObject() != null
+                    && stmt.getObject().isResource()
                     && stmt.getObject().asResource().getURI() != null) {
                     sameIndividuals.add(stmt.getObject().asResource());
                 }
 			}
 		} finally {
 			fullModel.leaveCriticalSection();
-		}		
+		}
 		return sameIndividuals;
 	}
-	
+
 	/**
      * Returns true if it is entailed by class subsumption that
      * subject is of type cls; otherwise returns false.
@@ -523,16 +523,16 @@ public class SimpleReasoner extends StatementListener
 	protected boolean entailedType(Resource subject, Resource cls) {
 	    return entailedType(subject, cls, null);
 	}
-	
+
 	/**
      * Returns true if it is entailed by class subsumption that
 	 * subject is of type cls; otherwise returns false.
-	 * remainingTypeURIs is an optional list of asserted type URIs for the subject 
-	 * resource, and may be null.  Supplying a precompiled list can yield performance 
-	 * improvement when this method is called repeatedly for the same subject. 
+	 * remainingTypeURIs is an optional list of asserted type URIs for the subject
+	 * resource, and may be null.  Supplying a precompiled list can yield performance
+	 * improvement when this method is called repeatedly for the same subject.
      */
 	protected boolean entailedType(Resource subject, Resource cls, List<String> remainingTypeURIs) {
-				
+
 		List<Resource> subClasses = getSubClasses(cls);
 		Set<String> subClassURIs = new HashSet<String>();
 	    for (Resource subClass : subClasses) {
@@ -540,22 +540,22 @@ public class SimpleReasoner extends StatementListener
 	            subClassURIs.add(subClass.getURI());
 	        }
 	    }
-	    
-	    List<String> typeURIs = (remainingTypeURIs == null) ? 
+
+	    List<String> typeURIs = (remainingTypeURIs == null) ?
             getRemainingAssertedTypeURIs(subject) : remainingTypeURIs;
-	    
+
 	    for (String typeURI : typeURIs) {
             if (!typeURI.equals(cls.getURI()) && subClassURIs.contains(typeURI)) {
                 return true;
             }
 	    }
-	    
+
         return false;
-		
+
 	}
-	
+
 	protected List<String> getRemainingAssertedTypeURIs(Resource resource) {
-	    
+
 	    List<String> typeURIs = new ArrayList<String>();
 
 	    List<Resource> sameIndividuals = getSameIndividuals(resource,inferenceModel);
@@ -573,22 +573,22 @@ public class SimpleReasoner extends StatementListener
 					}
 				}
 			}
-	    } finally { 
+	    } finally {
 	        aboxModel.leaveCriticalSection();
-	    }   
-	    
+	    }
+
 	    return typeURIs;
 	}
-	
+
 	protected List<Resource> getSubClasses(Resource cls) {
 		List<Resource> subClasses = new ArrayList<Resource>();
 		tboxModel.enterCriticalSection(Lock.READ);
 		try {
-			Iterator<Statement> iter = 
+			Iterator<Statement> iter =
                 tboxModel.listStatements((Resource) null, RDFS.subClassOf, cls);
 			while (iter.hasNext()) {
 				Statement stmt = iter.next();
-				if (stmt.getSubject() == null 
+				if (stmt.getSubject() == null
                     || stmt.getSubject().asResource().getURI() == null) continue;
 				if (!subClasses.contains(stmt.getSubject())) {
 					subClasses.add(stmt.getSubject());
@@ -607,9 +607,9 @@ public class SimpleReasoner extends StatementListener
 			return subClasses;
 		} finally {
 			tboxModel.leaveCriticalSection();
-		}	
+		}
 	}
-	
+
 	protected List<Resource> getSuperClasses(Resource cls) {
 		List<Resource> superClasses = new ArrayList<Resource>();
 		tboxModel.enterCriticalSection(Lock.READ);
@@ -617,21 +617,21 @@ public class SimpleReasoner extends StatementListener
 			Iterator<Statement> iter = tboxModel.listStatements(cls, RDFS.subClassOf, (RDFNode) null);
 			while (iter.hasNext()) {
 				Statement stmt = iter.next();
-				
+
 				if (stmt.getObject() != null && stmt.getObject().isResource()) {
 					Resource superCls = stmt.getObject().asResource();
-					
+
 					if (superCls.isAnon() || superClasses.contains(superCls)) {
 						continue;
 					}
 					superClasses.add(superCls);
-				}				
+				}
 			}
 
 			iter = tboxModel.listStatements((Resource) null, OWL.equivalentClass, cls);
 			while (iter.hasNext()) {
 				Statement stmt = iter.next();
-				if (stmt.getSubject() == null 
+				if (stmt.getSubject() == null
                     || stmt.getSubject().asResource().getURI() == null) continue;
 				if (!superClasses.contains(stmt.getSubject())) {
 					superClasses.add(stmt.getSubject());
@@ -640,165 +640,165 @@ public class SimpleReasoner extends StatementListener
 			return superClasses;
 		} finally {
 			tboxModel.leaveCriticalSection();
-		}	
+		}
 	}
-	
+
 	/**
      * Returns true if the triple is entailed by inverse property
 	 * reasoning or sameAs reasoning; otherwise returns false.
      */
-	protected boolean entailedStatement(Statement stmt) {	
+	protected boolean entailedStatement(Statement stmt) {
 		//TODO think about checking class subsumption here (for convenience)
 		// Inverse properties
 		List<OntProperty> inverses = getInverseProperties(stmt);
 		Iterator<OntProperty> iIter = inverses.iterator();
 		if (iIter.hasNext()) {
 			aboxModel.enterCriticalSection(Lock.READ);
-			try {						
-				while (iIter.hasNext()) {		
+			try {
+				while (iIter.hasNext()) {
 					Property invProp = iIter.next();
-					Statement invStmt = 
-                        ResourceFactory.createStatement(stmt.getObject().asResource(), 
+					Statement invStmt =
+                        ResourceFactory.createStatement(stmt.getObject().asResource(),
                                                         invProp, stmt.getSubject());
 					if (aboxModel.contains(invStmt)) {
 						return true;
 					}
 				}
-			} finally { 
+			} finally {
 				aboxModel.leaveCriticalSection();
-			}	
+			}
 		}
-		
+
 		// individuals sameAs each other
         if( doSameAs ){
-            List<Resource> sameIndividuals = 
+            List<Resource> sameIndividuals =
                 getSameIndividuals(stmt.getSubject().asResource(),inferenceModel);
             Iterator<Resource> rIter = sameIndividuals.iterator();
             if (rIter.hasNext()) {
                 aboxModel.enterCriticalSection(Lock.READ);
-                try {						
-                    while (rIter.hasNext()) {		
+                try {
+                    while (rIter.hasNext()) {
                         Resource subject = rIter.next();
-	
+
                         if (aboxModel.contains(subject, stmt.getPredicate(), stmt.getObject())) {
                             return true;
                         }
                     }
-                } finally { 
+                } finally {
                     aboxModel.leaveCriticalSection();
-                }	
+                }
             }
         }
-		
+
 		return false;
 	}
-	
+
 	/**
 	 * Returns a list of properties that are inverses of the property
-	 * in the given statement. 
+	 * in the given statement.
 	 */
 	protected List<OntProperty> getInverseProperties(Statement stmt) {
-		
+
 		List<OntProperty> inverses = new ArrayList<OntProperty>();
-		
+
 		if (stmt.getSubject().isAnon() || stmt.getObject().isAnon()) {
 			return inverses;
 		}
-		
+
 		tboxModel.enterCriticalSection(Lock.READ);
 		try {
-			
-			OntProperty prop = tboxModel.getOntProperty(stmt.getPredicate().getURI()); 
-			
-			if (prop != null) {	
+
+			OntProperty prop = tboxModel.getOntProperty(stmt.getPredicate().getURI());
+
+			if (prop != null) {
 				if (!prop.isObjectProperty()) {
 					return inverses;
 				}
-				
+
 				if (!stmt.getObject().isResource()) {
 					log.debug("The predicate of this statement is an object property, "
                               +"but the object is not a resource.");
 					return inverses;
 				}
-				
+
 				// not reasoning on properties in the OWL, RDF or RDFS namespace
-				if ((prop.getNameSpace()).equals(OWL.NS) || 
+				if ((prop.getNameSpace()).equals(OWL.NS) ||
 					(prop.getNameSpace()).equals(RDFS.getURI()) ||
 					(prop.getNameSpace()).equals(RDF.getURI())) {
 					return inverses;
 				}
-			
+
 			    ExtendedIterator <? extends OntProperty> iter = prop.listInverse();
-			
+
 			    while (iter.hasNext()) {
-			       OntProperty invProp = iter.next();		
-			   
-			       if ((invProp.getNameSpace()).equals(OWL.NS) || 
+			       OntProperty invProp = iter.next();
+
+			       if ((invProp.getNameSpace()).equals(OWL.NS) ||
 				       (invProp.getNameSpace()).equals(RDFS.getURI()) ||
 				       (invProp.getNameSpace()).equals(RDF.getURI())) {
 					 continue;
-			       } 
+			       }
 			       inverses.add(invProp);
 			    }
-			}   
+			}
 		 } finally {
 			tboxModel.leaveCriticalSection();
 		 }
-		
+
 		return inverses;
-	}	
+	}
 	protected Model generateInverseInferences(OntProperty prop, OntProperty inverseProp) {
 		Model inferences = ModelFactory.createDefaultModel();
 
 		aboxModel.enterCriticalSection(Lock.READ);
 		try {
 			StmtIterator iter = aboxModel.listStatements((Resource) null, prop, (RDFNode) null);
-			
-			while (iter.hasNext()) {		
-				Statement stmt = iter.next();		
+
+			while (iter.hasNext()) {
+				Statement stmt = iter.next();
 				if (!stmt.getObject().isResource()) continue;
-				Statement infStmt = 
-                    ResourceFactory.createStatement(stmt.getObject().asResource(), 
+				Statement infStmt =
+                    ResourceFactory.createStatement(stmt.getObject().asResource(),
                                                     inverseProp, stmt.getSubject());
 				inferences.add(infStmt);
-			}				
+			}
 	    } finally {
 		    aboxModel.leaveCriticalSection();
 	    }
-		
-	    return inferences;	
+
+	    return inferences;
 	}
 
 	/**
 	 * Add an inference from the inference model
-	 * 
+	 *
 	 * Adds the inference to the inference model if it is not already in
 	 * the inference model and not in the abox model.
 	 */
-	
-	public void addInference(Statement infStmt, Model inferenceModel) {	
+
+	public void addInference(Statement infStmt, Model inferenceModel) {
         addInference(infStmt,inferenceModel,true);
 	}
-	
-	protected void addInference(Statement infStmt, Model inferenceModel, 
+
+	protected void addInference(Statement infStmt, Model inferenceModel,
 	        boolean handleSameAs) {
 	    addInference(infStmt, inferenceModel, handleSameAs, true);
 	}
-	
-	protected void addInference(Statement infStmt, Model inferenceModel, 
+
+	protected void addInference(Statement infStmt, Model inferenceModel,
 	        boolean handleSameAs, boolean checkRedundancy) {
-		
+
 		aboxModel.enterCriticalSection(Lock.READ);
 		try {
 			inferenceModel.enterCriticalSection(Lock.WRITE);
 			try {
-				if (!checkRedundancy 
+				if (!checkRedundancy
 				        || (!inferenceModel.contains(infStmt) && !aboxModel.contains(infStmt)))  {
 					inferenceModel.add(infStmt);
 			    }
-		
+
 				if (handleSameAs) {
-					List<Resource> sameIndividuals = 
+					List<Resource> sameIndividuals =
                         getSameIndividuals(infStmt.getSubject().asResource(), inferenceModel);
 					for (Resource subject : sameIndividuals) {
 						Statement sameStmt =
@@ -813,46 +813,46 @@ public class SimpleReasoner extends StatementListener
 								&& !aboxModel.contains(sameStmt)) {
 							inferenceModel.add(sameStmt);
 						}
-					}				
-				}				
+					}
+				}
 			} finally {
 				inferenceModel.leaveCriticalSection();
 			}
 		} finally {
 			aboxModel.leaveCriticalSection();
-		}	
+		}
 	}
 
 	/**
 	 * Remove an inference from the inference model
-	 * 
+	 *
 	 * Removes the inference if it is not entailed by the abox model
 	 * and if the inference model contains it.
-	 * 
+	 *
 	 * Removes the corresponding inference for each same individual
-	 * if that inference is not entailed by the abox model. 
+	 * if that inference is not entailed by the abox model.
 	 */
 	public void removeInference(Statement infStmt, Model inferenceModel) {
        removeInference(infStmt,inferenceModel,true,true);
 	}
 
 	protected void removeInference(Statement infStmt, Model inferenceModel, boolean handleSameAs, boolean checkEntailment) {
-		
-		inferenceModel.enterCriticalSection(Lock.WRITE);		
-		try {	
-		   if ( (!checkEntailment 
-                 || !entailedStatement(infStmt)) 
+
+		inferenceModel.enterCriticalSection(Lock.WRITE);
+		try {
+		   if ( (!checkEntailment
+                 || !entailedStatement(infStmt))
                 && inferenceModel.contains(infStmt)) {
 			   inferenceModel.remove(infStmt);
-		   } 		   
+		   }
         } finally {
-	       inferenceModel.leaveCriticalSection();	
+	       inferenceModel.leaveCriticalSection();
         }
-		
+
 		if (handleSameAs) {
-			inferenceModel.enterCriticalSection(Lock.WRITE);		
-			try {	
-			    List<Resource> sameIndividuals = 
+			inferenceModel.enterCriticalSection(Lock.WRITE);
+			try {
+			    List<Resource> sameIndividuals =
                     getSameIndividuals(infStmt.getSubject().asResource(), inferenceModel);
 
 				for (Resource sameIndividual : sameIndividuals) {
@@ -868,49 +868,49 @@ public class SimpleReasoner extends StatementListener
 			} finally {
 				inferenceModel.leaveCriticalSection();
 			}
-		}	
+		}
 	}
 
-    
+
 	/**
      * Find the most specific types (classes) of an individual and
      * infer them for the individual with the mostSpecificType
      * annotation.
 	 */
 	protected void setMostSpecificTypes(Resource individual, Model inferenceModel, HashSet<String> unknownTypes) {
-			
+
 		tboxModel.enterCriticalSection(Lock.READ);
 		aboxModel.enterCriticalSection(Lock.READ);
 		inferenceModel.enterCriticalSection(Lock.READ);
 		HashSet<String> typeURIs = new HashSet<String>();
-		
+
 		try {
-			OntModel unionModel = VitroModelFactory.createOntologyModel(); 
+			OntModel unionModel = VitroModelFactory.createOntologyModel();
 			unionModel.addSubModel(aboxModel);
 			unionModel.addSubModel(inferenceModel);
-					
+
 			List<OntClass> types = new ArrayList<OntClass>();
-						
+
 			StmtIterator stmtIter = unionModel.listStatements(individual, RDF.type, (RDFNode) null);
-			
+
 			while (stmtIter.hasNext()) {
-				
+
 				Statement stmt = stmtIter.next();
-				
+
 				if ( !stmt.getObject().isResource() ) {
 					log.warn("The object of this rdf:type assertion is expected to be a resource: " + stmtString(stmt));
 					continue;
 				}
-				
+
 				OntClass ontClass = null;
-				
+
 				if ( (stmt.getObject().asResource()).getURI() != null ) {
-				    ontClass = tboxModel.getOntClass(stmt.getObject().asResource().getURI()); 
+				    ontClass = tboxModel.getOntClass(stmt.getObject().asResource().getURI());
 				} else {
 					log.debug("The object of this rdf:type assertion has a null URI: " + stmtString(stmt));
 					continue;
 				}
-				 
+
 				if (ontClass == null) {
 					if ( !(stmt.getObject().asResource().getNameSpace()).equals(OWL.NS)) {
 						if (!unknownTypes.contains(stmt.getObject().asResource().getURI())) {
@@ -921,12 +921,12 @@ public class SimpleReasoner extends StatementListener
 					}
 					continue;
 				}
-					
+
 				if (ontClass.isAnon()) continue;
-				
-				types.add(ontClass); 
+
+				types.add(ontClass);
 			}
-	
+
 			List<OntClass> types2 = new ArrayList<OntClass>();
 			types2.addAll(types);
 
@@ -969,19 +969,19 @@ public class SimpleReasoner extends StatementListener
 			aboxModel.leaveCriticalSection();
 			tboxModel.leaveCriticalSection();
 		}
-	
+
 		setMostSpecificTypes(individual, typeURIs, inferenceModel);
     }
-	
+
 	protected void setMostSpecificTypes(Resource individual, HashSet<String> typeURIs, Model inferenceModel) {
-		
+
 	    Model retractions = ModelFactory.createDefaultModel();
-	    
+
 		inferenceModel.enterCriticalSection(Lock.READ);
 		try {
 			// remove obsolete mostSpecificType assertions
 			StmtIterator iter = inferenceModel.listStatements(individual, mostSpecificType, (RDFNode) null);
-			
+
 			while (iter.hasNext()) {
 				Statement stmt = iter.next();
 
@@ -989,15 +989,15 @@ public class SimpleReasoner extends StatementListener
 					log.warn("The object of this assertion is expected to be a resource: " + stmtString(stmt));
 					continue;
 				}
-				
+
 				if (!typeURIs.contains(stmt.getObject().asResource().getURI())) {
 					retractions.add(stmt);
 				}
 			}
 		} finally {
 			inferenceModel.leaveCriticalSection();
-		}	
-		
+		}
+
 		Iterator<Statement> rIter = retractions.listStatements();
 		while (rIter.hasNext()) {
 			removeInference(rIter.next(), inferenceModel, true, false);
@@ -1009,11 +1009,11 @@ public class SimpleReasoner extends StatementListener
 		}
 
     }
-	
+
 	protected List<Resource> getParents(Resource cls, OntModel tboxModel) {
-		
+
 		List<Resource> parents = new ArrayList<Resource>();
-			
+
 	    tboxModel.enterCriticalSection(Lock.READ);
 		try {
 			StmtIterator iter = tboxModel.listStatements(cls, RDFS.subClassOf, (RDFNode) null);
@@ -1026,7 +1026,7 @@ public class SimpleReasoner extends StatementListener
 					parents.add(stmt.getObject().asResource());
 				}
 			}
-				
+
 			iter = tboxModel.listStatements(cls, OWL.equivalentClass, (RDFNode) null);
 			while (iter.hasNext()) {
 				Statement stmt = iter.next();
@@ -1042,40 +1042,40 @@ public class SimpleReasoner extends StatementListener
 		} finally {
 			tboxModel.leaveCriticalSection();
 		}
-		
+
 		return parents;
 	}
-	
+
 	// system-configured reasoning modules (plugins)
 	protected boolean isInterestedInRemovedStatement(Statement stmt) {
-		
+
 		if (stmt.getPredicate().equals(RDF.type)) return true;
-	
+
 		for (ReasonerPlugin plugin : getPluginList()) {
 			if (plugin.isInterestedInRemovedStatement(stmt)) return true;
 		}
-		
+
 	    return false;
 	}
 
 	protected void doPlugins(ModelUpdate.Operation op, Statement stmt) {
-		
+
 		for (ReasonerPlugin plugin : getPluginList()) {
 			try {
 				switch (op) {
-				  case ADD: 
+				  case ADD:
 				     if (plugin.isInterestedInAddedStatement(stmt)) {
 					    plugin.addedABoxStatement(stmt, aboxModel, inferenceModel, tboxModel);
 				     }
 				     break;
-				  case RETRACT: 
+				  case RETRACT:
 					     if (plugin.isInterestedInRemovedStatement(stmt)) {
 						    plugin.removedABoxStatement(stmt, aboxModel, inferenceModel, tboxModel);
-					     }	
+					     }
 					     break;
 				}
 			} catch (Exception e) {
-				log.error("Exception while processing " + (op == ModelUpdate.Operation.ADD ? "an added" : "a removed") + 
+				log.error("Exception while processing " + (op == ModelUpdate.Operation.ADD ? "an added" : "a removed") +
 						" statement in SimpleReasoner plugin:" + plugin.getClass().getName() + " -- ", e);
 			}
 		}
@@ -1085,21 +1085,21 @@ public class SimpleReasoner extends StatementListener
 	 * Returns true if the reasoner is in the process of recomputing all
 	 * inferences.
 	 */
-	
+
 	public boolean isRecomputing() {
 		if (recomputer == null) {
 			return false;
 		}
-		
+
 	    return recomputer.isRecomputing();
 	}
-	
+
 	public void recompute() {
 		if (recomputer != null) {
 		    recomputer.recompute();
 		}
 	}
-	
+
 	/**
 	 * This is called when the application shuts down.
 	 */
@@ -1108,44 +1108,44 @@ public class SimpleReasoner extends StatementListener
 	    	recomputer.setStopRequested();
 	    }
 	}
-	  
+
 	/**
-	 * Asynchronous reasoning mode (DeltaComputer) no longer used 
-	 * in the case of batch removals. 
+	 * Asynchronous reasoning mode (DeltaComputer) no longer used
+	 * in the case of batch removals.
 	 */
 	public boolean isABoxReasoningAsynchronous() {
          return false;
 	}
-	
+
     boolean isABoxInferenceGraph(String graphURI) {
         return ModelNames.ABOX_INFERENCES.equals(graphURI);
     }
-    
+
     boolean isTBoxGraph(String graphURI) {
         return ( ModelNames.TBOX_ASSERTIONS.equals(graphURI)
                  || ModelNames.TBOX_INFERENCES.equals(graphURI)
                  || (graphURI != null && graphURI.contains("tbox")) );
     }
-    
-	@Override 
+
+	@Override
 	public void notifyEvent(String string, Object event) {
 	    // don't care
 	}
-	
+
 	@Override
-	public void notifyEvent(Model model, Object event) {	    
+	public void notifyEvent(Model model, Object event) {
 	    // don't care
 	}
-	
+
 	/**
 	 * Utility method for logging
 	 */
     public static String stmtString(Statement statement) {
     	return  " [subject = " + statement.getSubject().getURI() +
     			"] [property = " + statement.getPredicate().getURI() +
-                "] [object = " + (statement.getObject().isLiteral() 
+                "] [object = " + (statement.getObject().isLiteral()
                                   ? ((Literal)statement.getObject()).getLexicalForm() + " (Literal)"
                                   : ((Resource)statement.getObject()).getURI() + " (Resource)") + "]";
-    }  
-    
+    }
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTBoxListener.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTBoxListener.java
index b9fec4c30..a091c90ee 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTBoxListener.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTBoxListener.java
@@ -23,7 +23,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread;
 public class SimpleReasonerTBoxListener extends StatementListener {
 
 	private static final Log log = LogFactory.getLog(SimpleReasonerTBoxListener.class);
-	
+
     private SimpleReasoner simpleReasoner;
     private Thread workerThread;
     private boolean stopRequested;
@@ -46,73 +46,73 @@ public class SimpleReasonerTBoxListener extends StatementListener {
 		this.modelUpdates = new ConcurrentLinkedQueue<ModelUpdate>();
 		this.processingUpdates = false;
 	}
-	
+
 	@Override
 	public void addedStatement(Statement statement) {
-		
+
 		ModelUpdate mu = new ModelUpdate(statement, ModelUpdate.Operation.ADD, ModelNames.TBOX_ASSERTIONS);
 		processUpdate(mu);
 	}
 
 	@Override
 	public void removedStatement(Statement statement) {
-		
-		ModelUpdate mu = new ModelUpdate(statement, ModelUpdate.Operation.RETRACT, ModelNames.TBOX_ASSERTIONS);	
+
+		ModelUpdate mu = new ModelUpdate(statement, ModelUpdate.Operation.RETRACT, ModelNames.TBOX_ASSERTIONS);
 		processUpdate(mu);
 	}
-	
+
 	private synchronized void processUpdate(ModelUpdate mu) {
 		if (!processingUpdates && (modelUpdates.peek() != null)) {
 			log.warn("TBoxProcessor thread was not running and work queue is not empty. size = " + modelUpdates.size() + " The work will be processed now.");
 		}
-		
+
 		modelUpdates.add(mu);
-		
+
 		if (!processingUpdates) {
 			processingUpdates = true;
 			workerThread = new TBoxUpdateProcessor("TBoxUpdateProcessor (" + getName() + ")");
 			workerThread.start();
 		}
 	}
-	      
+
    private synchronized ModelUpdate nextUpdate() {
 	    ModelUpdate mu = modelUpdates.poll();
 	    processingUpdates = (mu != null);
 	    return mu;
    }
-   	
+
    public String getName() {
-		return (name == null) ? "SimpleReasonerTBoxListener" : name;	
+		return (name == null) ? "SimpleReasonerTBoxListener" : name;
    }
 
    public void setStopRequested() {
 	    this.stopRequested = true;
    }
-	
-   private class TBoxUpdateProcessor extends VitroBackgroundThread {      
+
+   private class TBoxUpdateProcessor extends VitroBackgroundThread {
         public TBoxUpdateProcessor(String name) {
         	super(name);
         }
-        
+
         @Override
-        public void run() {  
+        public void run() {
             try {
 	        	 log.debug("starting thread");
 	        	 ModelUpdate mu = nextUpdate();
-	        	 while (mu != null && !stopRequested) {       	   
+	        	 while (mu != null && !stopRequested) {
 	    		    if (mu.getOperation() == ModelUpdate.Operation.ADD) {
-	    				simpleReasoner.addedTBoxStatement(mu.getStatement());	
+	    				simpleReasoner.addedTBoxStatement(mu.getStatement());
 	    		    } else if (mu.getOperation() == ModelUpdate.Operation.RETRACT) {
 	    			    simpleReasoner.removedTBoxStatement(mu.getStatement());
 	    		    } else {
 	    			    log.error("unexpected operation value in ModelUpdate object: " + mu.getOperation());
 	    		    }
 	    		    mu = nextUpdate();
-	        	 }	        	
+	        	 }
             }  finally {
         	     processingUpdates = false;
         	     log.debug("ending thread");
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/DisableSameAs.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/DisableSameAs.java
index 07c69a6ba..a9d123cf4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/DisableSameAs.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/DisableSameAs.java
@@ -16,21 +16,21 @@ import edu.cornell.mannlib.vitro.webapp.reasoner.SimpleReasoner;
  * Disables sameAs in associated SimpleReasoner.
  */
 public class DisableSameAs implements ReasonerPlugin {
-	
+
     private static final Log log = LogFactory.getLog(DisableSameAs.class);
-    	
+
 	private SimpleReasoner simpleReasoner;
 
     public void setSimpleReasoner(SimpleReasoner simpleReasoner) {
     	this.simpleReasoner = simpleReasoner;
         this.simpleReasoner.setSameAsEnabled( false );
         log.info("owl:sameAs disabled in SimpleReasoner.");
-    }	
-	
+    }
+
     public boolean isConfigurationOnlyPlugin() {
         return true;
     }
-    
+
     public SimpleReasoner getSimpleReasoner() {
     	return this.simpleReasoner;
     }
@@ -38,23 +38,23 @@ public class DisableSameAs implements ReasonerPlugin {
 	public boolean isInterestedInAddedStatement(Statement stmt) {
 		return false;
 	}
-	
+
 	public boolean isInterestedInRemovedStatement(Statement stmt) {
 		return false;
 	}
-	
-	public void addedABoxStatement(Statement stmt, 
-            Model aboxAssertionsModel, 
-            Model aboxInferencesModel, 
+
+	public void addedABoxStatement(Statement stmt,
+            Model aboxAssertionsModel,
+            Model aboxInferencesModel,
             OntModel TBoxInferencesModel) {
     }
-	
-	
-    public void removedABoxStatement(Statement stmt, 
-            Model aboxAssertionsModel, 
-            Model aboxInferencesModel, 
+
+
+    public void removedABoxStatement(Statement stmt,
+            Model aboxAssertionsModel,
+            Model aboxInferencesModel,
             OntModel TBoxInferencesModel) {
     }
-	
+
 }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SimpleBridgingRule.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SimpleBridgingRule.java
index eb1113be5..2b455df60 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SimpleBridgingRule.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SimpleBridgingRule.java
@@ -27,56 +27,56 @@ import edu.cornell.mannlib.vitro.webapp.reasoner.SimpleReasoner;
 /**
  * handles rules of the form
  * assertedProp1(?x, ?y) ^ assertedProp2(?y, ?z) -&gt; inferredProp(?x, ?z)
- * 
+ *
  */
 public abstract class SimpleBridgingRule implements ReasonerPlugin {
-	
+
     private static final Log log = LogFactory.getLog(SimpleBridgingRule.class);
-    
+
 	private Property assertedProp1;
 	private Property assertedProp2;
 	private Property inferredProp;
-	
+
 	private String   queryStr;
 	private String   retractionTestString;
-	
+
 	private SimpleReasoner simpleReasoner;
-	
+
 	protected SimpleBridgingRule(String assertedProp1, String assertedProp2, String inferredProp) {
 		this.assertedProp1 = ResourceFactory.createProperty(assertedProp1);
         this.assertedProp2 = ResourceFactory.createProperty(assertedProp2);
         this.inferredProp = ResourceFactory.createProperty(inferredProp);
-        
+
         this.queryStr = "CONSTRUCT { \n" +
                         "  ?x <" + inferredProp + "> ?z \n" +
                         "} WHERE { \n" +
                         "  ?x <" + assertedProp1 + "> ?y . \n" +
                         "  ?y <" + assertedProp2 + "> ?z \n" +
                         "}";
-        
-        this.retractionTestString = 
+
+        this.retractionTestString =
                 "  ASK { \n" +
                 "  ?x <" + assertedProp1 + "> ?y . \n" +
-                "  ?y <" + assertedProp2 + "> ?z \n" +                                 
+                "  ?y <" + assertedProp2 + "> ?z \n" +
                 "  } ";
-        
+
 	}
-	
+
 	public boolean isConfigurationOnlyPlugin() {
 	    return false;
 	}
-	
+
 	public boolean isInterestedInAddedStatement(Statement stmt) {
 		return isRelevantPredicate(stmt);
 	}
-	
+
 	public boolean isInterestedInRemovedStatement(Statement stmt) {
 		return isRelevantPredicate(stmt);
 	}
-	
-	public void addedABoxStatement(Statement stmt, 
-            Model aboxAssertionsModel, 
-            Model aboxInferencesModel, 
+
+	public void addedABoxStatement(Statement stmt,
+            Model aboxAssertionsModel,
+            Model aboxInferencesModel,
             OntModel TBoxInferencesModel) {
 		if (!isInterestedInAddedStatement(stmt) || ignore(stmt)) {
 			return;
@@ -86,15 +86,15 @@ public abstract class SimpleBridgingRule implements ReasonerPlugin {
         while(sit.hasNext()) {
         	Statement s = sit.nextStatement();
         	if (simpleReasoner != null) simpleReasoner.addInference(s,aboxInferencesModel);
-        }     
+        }
 	}
-	
+
 	private boolean ignore(Statement stmt) {
 		return (
 				(stmt.getSubject().isAnon() || stmt.getObject().isAnon())
 			    // can't deal with blank nodes
 		||
-		        (!stmt.getObject().isResource()) 
+		        (!stmt.getObject().isResource())
 			    // don't deal with literal values
 	    );
 	}
@@ -110,7 +110,7 @@ public abstract class SimpleBridgingRule implements ReasonerPlugin {
             queryStr = queryStr.replace(
                     "?y", "<" + stmt.getSubject().getURI() + ">");
             queryStr = queryStr.replace(
-                    "?z", "<" + ((Resource) stmt.getObject()).getURI() + ">");          
+                    "?z", "<" + ((Resource) stmt.getObject()).getURI() + ">");
         } else {
             // should never be here
             return null;
@@ -119,9 +119,9 @@ public abstract class SimpleBridgingRule implements ReasonerPlugin {
             queryStr = queryStr.replace(
                     "?x", "<" + stmt.getSubject().getURI() + ">");
             queryStr = queryStr.replace(
-                    "?z", "<" + ((Resource) stmt.getObject()).getURI() + ">");  
+                    "?z", "<" + ((Resource) stmt.getObject()).getURI() + ">");
         }
-        
+
         if (log.isDebugEnabled()) {
             log.debug(queryStr);
         }
@@ -138,7 +138,7 @@ public abstract class SimpleBridgingRule implements ReasonerPlugin {
         }
         return query;
 	}
-	
+
 	private Model constructInferences(String queryString, Statement stmt, Model aboxAssertionsModel) {
 	    Query query = createQuery(queryString, stmt, null);
 		QueryExecution qe = QueryExecutionFactory.create(query, aboxAssertionsModel);
@@ -147,26 +147,26 @@ public abstract class SimpleBridgingRule implements ReasonerPlugin {
 		} finally {
 			qe.close();
 		}
-		
+
 	}
-	
-    public void removedABoxStatement(Statement stmt, 
-            Model aboxAssertionsModel, 
-            Model aboxInferencesModel, 
+
+    public void removedABoxStatement(Statement stmt,
+            Model aboxAssertionsModel,
+            Model aboxInferencesModel,
             OntModel TBoxInferencesModel) {
 
 		if (!isInterestedInRemovedStatement(stmt) || ignore(stmt)) {
 			return;
 		}
-        
+
         // I initially tried constructing the statements to remove with a single
         // SPARQL CONSTRUCT statement, but that didn't seem to perform very well.
         // So this first retrieves a list of candidate ?x <inferredProp> ?z
         // statements, and then runs an ASK query to determine if there are still
         // statements ?x <assertedProp1> ?y and ?y <assertedProp2> ?z that entail
         // the statement in question.  If not, the statement is removed.
-        
-        // find-based candidate identification        
+
+        // find-based candidate identification
         Resource x = null;
         RDFNode z = null;
         if (stmt.getPredicate().equals(assertedProp1)) {
@@ -190,12 +190,12 @@ public abstract class SimpleBridgingRule implements ReasonerPlugin {
 			}
 		}
     }
-	
+
     private boolean isRelevantPredicate(Statement stmt) {
 		return (assertedProp1.equals(stmt.getPredicate())
 				|| assertedProp2.equals(stmt.getPredicate()));
     }
-    
+
     public void setSimpleReasoner(SimpleReasoner simpleReasoner) {
     	this.simpleReasoner = simpleReasoner;
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SimplePropertyAndTypeRule.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SimplePropertyAndTypeRule.java
index 3d067e861..fb4ede49e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SimplePropertyAndTypeRule.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SimplePropertyAndTypeRule.java
@@ -19,7 +19,7 @@ import edu.cornell.mannlib.vitro.webapp.reasoner.SimpleReasoner;
 /**
  * handles rules of the form
  * assertedProp(?x, ?y) ^ type(?x) -&gt; inferredProp(?x, ?y)
- *	
+ *
  * @author bjl23
  *
  */
@@ -29,28 +29,28 @@ public abstract class SimplePropertyAndTypeRule implements ReasonerPlugin {
 	private Resource TYPE;
 	private Property INFERRED_PROP;
 	private SimpleReasoner simpleReasoner;
-	
+
 	protected SimplePropertyAndTypeRule(String assertedProp, String type, String inferredProp) {
 		TYPE = ResourceFactory.createResource(type);
         ASSERTED_PROP = ResourceFactory.createProperty(assertedProp);
         INFERRED_PROP = ResourceFactory.createProperty(inferredProp);
 	}
-	
+
 	public boolean isConfigurationOnlyPlugin() {
         return false;
     }
-	
+
 	public boolean isInterestedInAddedStatement(Statement stmt) {
 		return (RDF.type.equals(stmt.getPredicate()) || isRelevantPredicate(stmt));
 	}
-	
+
 	public boolean isInterestedInRemovedStatement(Statement stmt) {
 		return (RDF.type.equals(stmt.getPredicate()) || isRelevantPredicate(stmt));
 	}
-	
-	public void addedABoxStatement(Statement stmt, 
-            Model aboxAssertionsModel, 
-            Model aboxInferencesModel, 
+
+	public void addedABoxStatement(Statement stmt,
+            Model aboxAssertionsModel,
+            Model aboxInferencesModel,
             OntModel TBoxInferencesModel) {
 		boolean relevantType = isRelevantType(stmt, TBoxInferencesModel);
 		boolean relevantPredicate = isRelevantPredicate(stmt);
@@ -60,30 +60,30 @@ public abstract class SimplePropertyAndTypeRule implements ReasonerPlugin {
 					stmt.getSubject(), ASSERTED_PROP, (RDFNode)null);
 			while (stmtIt.hasNext()) {
 				Statement s = stmtIt.nextStatement();
-				tryToInfer(stmt.getSubject(), 
-						   INFERRED_PROP, 
-						   s.getObject(), 
-						   aboxAssertionsModel, 
+				tryToInfer(stmt.getSubject(),
+						   INFERRED_PROP,
+						   s.getObject(),
+						   aboxAssertionsModel,
 						   aboxInferencesModel);
 			}
 		} else if (relevantPredicate) {
 			if(aboxAssertionsModel.contains(
-					stmt.getSubject(), RDF.type, TYPE) 
+					stmt.getSubject(), RDF.type, TYPE)
 			  || aboxInferencesModel.contains(
 					  stmt.getSubject(), RDF.type, TYPE)) {
-				tryToInfer(stmt.getSubject(), 
-						   INFERRED_PROP, 
-						   stmt.getObject(), 
-						   aboxAssertionsModel, 
+				tryToInfer(stmt.getSubject(),
+						   INFERRED_PROP,
+						   stmt.getObject(),
+						   aboxAssertionsModel,
 						   aboxInferencesModel);
 			}
 		}
 	}
-	
-	private void tryToInfer(Resource subject, 
-			                Property predicate, 
-			                RDFNode object, 
-			                Model aboxAssertionsModel, 
+
+	private void tryToInfer(Resource subject,
+			                Property predicate,
+			                RDFNode object,
+			                Model aboxAssertionsModel,
 			                Model aboxInferencesModel) {
 		// this should be part of a superclass or some class that provides
 		// reasoning framework functions
@@ -93,11 +93,11 @@ public abstract class SimplePropertyAndTypeRule implements ReasonerPlugin {
 		}
 	}
 
-    public void removedABoxStatement(Statement stmt, 
-            Model aboxAssertionsModel, 
-            Model aboxInferencesModel, 
+    public void removedABoxStatement(Statement stmt,
+            Model aboxAssertionsModel,
+            Model aboxInferencesModel,
             OntModel TBoxInferencesModel) {
-    	
+
     	if (isRelevantPredicate(stmt)) {
 //    		if (aboxAssertionsModel.contains(
 //    				stmt.getSubject(), RDF.type, BIBO_DOCUMENT)
@@ -105,7 +105,7 @@ public abstract class SimplePropertyAndTypeRule implements ReasonerPlugin {
 //    						stmt.getSubject(), RDF.type, BIBO_DOCUMENT)) {
     		    if (simpleReasoner != null) {
     		       simpleReasoner.removeInference(ResourceFactory.createStatement(stmt.getSubject(), INFERRED_PROP, stmt.getObject()), aboxInferencesModel);
-    		    }    
+    		    }
 //    		}
     	} else if (isRelevantType(stmt, TBoxInferencesModel)) {
     		if(!aboxInferencesModel.contains(
@@ -119,23 +119,23 @@ public abstract class SimplePropertyAndTypeRule implements ReasonerPlugin {
     		}
     	}
     }
-    
+
     private boolean isRelevantType(Statement stmt, Model TBoxInferencesModel) {
-		return (RDF.type.equals(stmt.getPredicate()) 
-				&& (TYPE.equals(stmt.getObject()) 
+		return (RDF.type.equals(stmt.getPredicate())
+				&& (TYPE.equals(stmt.getObject())
 						|| TBoxInferencesModel.contains(
 								(Resource) stmt.getObject(), RDFS.subClassOf, TYPE)));
-    }	
-	
+    }
+
     private boolean isRelevantPredicate(Statement stmt) {
 		return (ASSERTED_PROP.equals(stmt.getPredicate()));
     }
-    
+
 	public void setSimpleReasoner(SimpleReasoner simpleReasoner) {
 		this.simpleReasoner = simpleReasoner;
 	}
-	
+
 	public SimpleReasoner getSimpleReasoner() {
-		return this.simpleReasoner;		
+		return this.simpleReasoner;
 	}
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/VitroSearchTermNames.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/VitroSearchTermNames.java
index 98e35ba2f..1469e23cf 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/VitroSearchTermNames.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/VitroSearchTermNames.java
@@ -3,65 +3,65 @@
 package edu.cornell.mannlib.vitro.webapp.search;
 
 public class VitroSearchTermNames {
-    
+
     /** Id of entity, vclass or tab */
     public static final String URI         = "URI";
     /** search document id */
     public static final String DOCID      = "DocId";
-    
+
     /** rdf:type */
     public static final String RDFTYPE    = "type";
     /** classgroups from the individual's rdf:types  */
-    public static final String CLASSGROUP_URI    = "classgroup";    
+    public static final String CLASSGROUP_URI    = "classgroup";
     /** Most specific types for individual*/
     public static final String MOST_SPECIFIC_TYPE_URIS = "mostSpecificTypeURIs";
-    
+
     /** time of index in msec since epoc */
     public static final String INDEXEDTIME= "indexedTime";
-    
+
     /** text for 'full text' search, this is stemmed */
     public static final String ALLTEXT    = "ALLTEXT";
     /** text for 'full text' search, this is unstemmed for
      * use with wildcards and prefix queries */
-    public static final String ALLTEXTUNSTEMMED = "ALLTEXTUNSTEMMED";            
-    
+    public static final String ALLTEXTUNSTEMMED = "ALLTEXTUNSTEMMED";
+
     /** Does the individual have a thumbnail image? 1=yes 0=no */
-    public static final String THUMBNAIL = "THUMBNAIL";        
+    public static final String THUMBNAIL = "THUMBNAIL";
     /** download url location for thumbnail */
     public static final String THUMBNAIL_URL = "THUMBNAIL_URL";
-    
+
     // Fields derived from rdfs:label
     /** Raw rdfs:label: no lowercasing, no tokenizing, no stop words, no stemming **/
-    public static final String NAME_RAW = "nameRaw"; // 
-    
+    public static final String NAME_RAW = "nameRaw"; //
+
     /** rdfs:label lowercased, no tokenizing, no stop words, no stemming **/
-    public static final String NAME_LOWERCASE = "nameLowercase"; // 
+    public static final String NAME_LOWERCASE = "nameLowercase"; //
 
     /** Same as NAME_LOWERCASE, but single-valued so it's sortable. **/
-    // RY Need to control how indexing selects which of multiple values to copy. 
+    // RY Need to control how indexing selects which of multiple values to copy.
     public static final String NAME_LOWERCASE_SINGLE_VALUED = "nameLowercaseSingleValued";
-    
+
     /** rdfs:label lowercased, tokenized, stop words, no stemming **/
-    public static final String NAME_UNSTEMMED = "nameUnstemmed"; 
-    
+    public static final String NAME_UNSTEMMED = "nameUnstemmed";
+
     /** rdfs:label lowercased, tokenized, stop words, stemmed **/
-    public static final String NAME_STEMMED = "nameStemmed"; 
+    public static final String NAME_STEMMED = "nameStemmed";
 
     /** preferred title */
     public static final String PREFERRED_TITLE = "PREFERRED_TITLE";
-    
+
     public static final String NAME_PHONETIC = "NAME_PHONETIC";
-    
+
     /** rdfs:label lowercased, untokenized, edge-n-gram-filtered for autocomplete on people names **/
     public static final String AC_NAME_UNTOKENIZED = "acNameUntokenized";
 
-    /** rdfs:label lowercased, tokenized, stop words, stemmed, edge-n-gram-filtered for autocomplete 
+    /** rdfs:label lowercased, tokenized, stop words, stemmed, edge-n-gram-filtered for autocomplete
      * on non-person labels such as book titles and grant names **/
     public static final String AC_NAME_STEMMED = "acNameStemmed";
-    
-    /* There is currently no use case for an autocomplete search field that is tokenized but not stemmed. 
+
+    /* There is currently no use case for an autocomplete search field that is tokenized but not stemmed.
     public static final String AC_NAME_UNSTEMMED = "acNameUnstemmed";  */
-    
+
     /** Beta values used in weighting **/
     public static final String BETA = "BETA";
 
@@ -70,5 +70,5 @@ public class VitroSearchTermNames {
 
 	/** Source institution name */
 	public static final String SITE_NAME = "siteName";
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java
index 1b253da15..dfc332328 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java
@@ -47,20 +47,20 @@ public class AutocompleteController extends VitroAjaxController {
 
     private static final long serialVersionUID = 1L;
     private static final Log log = LogFactory.getLog(AutocompleteController.class);
-    
+
     //private static final String TEMPLATE_DEFAULT = "autocompleteResults.ftl";
-    
+
     private static final String PARAM_QUERY = "term";
     private static final String PARAM_RDFTYPE = "type";
     private static final String PARAM_MULTIPLE_RDFTYPE = "multipleTypes";
 
 	private boolean hasMultipleTypes = false;
-	
-    String NORESULT_MSG = "";    
+
+    String NORESULT_MSG = "";
     private static final int DEFAULT_MAX_HIT_COUNT = 1000;
 
     public static final int MAX_QUERY_LENGTH = 500;
-    
+
     @Override
     protected AuthorizationRequest requiredActions(VitroRequest vreq) {
     	return SimplePermission.USE_BASIC_AJAX_CONTROLLERS.ACTION;
@@ -90,7 +90,7 @@ public class AutocompleteController extends VitroAjaxController {
 	        	//in this case, it would be useful to show the most specific type of the individual
 	        	hasMultipleTypes = true;
 	        }
-			
+
             SearchQuery query = getQuery(qtxt, vreq);
             if (query == null ) {
                 log.debug("query for '" + qtxt +"' is null.");
@@ -121,11 +121,11 @@ public class AutocompleteController extends VitroAjaxController {
             if ( hitCount < 1 ) {
                 doNoSearchResults(response);
                 return;
-            }  
+            }
 
             List<SearchResult> results = new ArrayList<SearchResult>();
             for (SearchResultDocument doc : docs) {
-                try {                
+                try {
                     String uri = doc.getStringValue(VitroSearchTermNames.URI);
                     String name = doc.getStringValue(VitroSearchTermNames.NAME_RAW);
                     //There may be multiple most specific types, sending them all back
@@ -144,7 +144,7 @@ public class AutocompleteController extends VitroAjaxController {
             }
 			// now that we have the search result, reset this boolean
 			hasMultipleTypes = false;
-			
+
             Collections.sort(results);
 
             ArrayNode jsonArray = JsonNodeFactory.instance.arrayNode();
@@ -171,7 +171,7 @@ public class AutocompleteController extends VitroAjaxController {
                     "query length is " + MAX_QUERY_LENGTH );
             return null;
         }
-          
+
         SearchQuery query = ApplicationUtils.instance().getSearchEngine().createQuery();
         query.setStart(0)
              .setRows(DEFAULT_MAX_HIT_COUNT);
@@ -230,7 +230,7 @@ public class AutocompleteController extends VitroAjaxController {
     }
 
     private void setTokenizedNameQuery(SearchQuery query, String queryStr, HttpServletRequest request) {
- 
+
         /* We currently have no use case for a tokenized, unstemmed autocomplete search field, so the option
          * has been disabled. If needed in the future, will need to add a new field and field type which
          * is like AC_NAME_STEMMED but doesn't include the stemmer.
@@ -267,7 +267,7 @@ public class AutocompleteController extends VitroAjaxController {
 
             acQueryStr = StringUtils.join(terms, " AND ");
         }
-        
+
         log.debug("Tokenized name query string = " + acQueryStr);
         query.setQuery(acQueryStr);
 
@@ -290,7 +290,7 @@ public class AutocompleteController extends VitroAjaxController {
         // The search engine wants whitespace to be escaped with a backslash
         return queryStr.replaceAll("\\s+", "\\\\ ");
     }
-       
+
     private void doNoQuery(HttpServletResponse response) throws IOException  {
         // For now, we are not sending an error message back to the client because
         // with the default autocomplete configuration it chokes.
@@ -298,7 +298,7 @@ public class AutocompleteController extends VitroAjaxController {
     }
 
     private void doSearchError(HttpServletResponse response) throws IOException {
-        // For now, we are not sending an error message back to the client because 
+        // For now, we are not sending an error message back to the client because
         // with the default autocomplete configuration it chokes.
         doNoSearchResults(response);
     }
@@ -323,13 +323,13 @@ public class AutocompleteController extends VitroAjaxController {
 	            this.label = label + " (" + getMsTypeLocalName(msType, vreq) + ")";
 			}
 			else {
-	            this.label = label;				
+	            this.label = label;
 			}
             this.uri = uri;
             this.msType = msType;
             this.allMsTypes = allMsTypes;
         }
-		
+
         public String getLabel() {
             return label;
         }
@@ -341,7 +341,7 @@ public class AutocompleteController extends VitroAjaxController {
         public String getMsType() {
             return msType;
         }
-        
+
         public List<String> getAllMsTypes() {
         	return allMsTypes;
         }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java
index bfb7c16d6..8f53b1158 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java
@@ -37,7 +37,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController;
 /**
  * DataAutocompleteController generates autocomplete content
  * for data properties using sparql queries
- * . 
+ * .
  */
 
 @WebServlet(name = "DataAutocompleteController", urlPatterns = {"/dataautocomplete"} )
@@ -45,27 +45,27 @@ public class DataAutocompleteController extends VitroAjaxController {
 
     private static final long serialVersionUID = 1L;
     private static final Log log = LogFactory.getLog(DataAutocompleteController.class);
-        
+
     private static final String PARAM_QUERY = "term";
     //To get the data property
     private static final String PARAM_PROPERTY = "property";
 
-    
-    String NORESULT_MSG = "";    
-    private static final int DEFAULT_MAX_HIT_COUNT = 1000; 
+
+    String NORESULT_MSG = "";
+    private static final int DEFAULT_MAX_HIT_COUNT = 1000;
 
     public static final int MAX_QUERY_LENGTH = 500;
-    
+
     @Override
     protected AuthorizationRequest requiredActions(VitroRequest vreq) {
     	//used to be basic vitro ajax permission but need to query full model
     	return SimplePermission.QUERY_FULL_MODEL.ACTION;
     }
-    
+
     @Override
     protected void doRequest(VitroRequest vreq, HttpServletResponse response)
         throws IOException, ServletException {
-        
+
         try {
             //This is the literal being searched for
             String qtxt = vreq.getParameter(PARAM_QUERY);
@@ -78,7 +78,7 @@ public class DataAutocompleteController extends VitroAjaxController {
       //      response.sendRedirect(vreq.getContextPath() + "/ajax/sparqlQuery?query=" + encodedQuery);
             //RequestDispatcher dispatcher = vreq.getRequestDispatcher("/ajax/sparqlQuery?query=" + encodedQuery );
             //dispatcher.forward(vreq, response);
-            
+
             //Get Model and execute query
             Model model = getModel(vreq);
             Query query = SparqlUtils.createQuery(sparqlQuery);
@@ -88,11 +88,11 @@ public class DataAutocompleteController extends VitroAjaxController {
 			response.sendError(ex.getStatusCode());
         }
         catch (Throwable e) {
-            log.error(e, e);            
+            log.error(e, e);
             //doSearchError(response);
         }
     }
-    
+
     private void outputResults(HttpServletResponse response, Query query,
 			Model model)     throws IOException{
     	Dataset dataset = DatasetFactory.create(model);
@@ -114,38 +114,38 @@ public class DataAutocompleteController extends VitroAjaxController {
 	        try {
 	        	response.getWriter().write(jsonArray.toString());
 	        } catch (Throwable e) {
-	            log.error(e, e);            
+	            log.error(e, e);
 	            doSearchError(response);
 	        }
 		} finally {
 			qe.close();
 		}
 
-		
+
 	}
 
 	private Model getModel(VitroRequest vreq) throws AjaxControllerException{
     	Model model = vreq.getJenaOntModel();
-	
+
 		if (model == null) {
 			throw new AjaxControllerException(SC_INTERNAL_SERVER_ERROR,
 					"Model '' not found.");
-		}	
+		}
 		return model;
     }
 
 	private String getSparqlQuery(String qtxt, String property) {
 		//"i" denotes case insensitive
 		//Searches for data literals whose string version begins with the text denoted
-		String query = "SELECT DISTINCT ?dataLiteral where {" + 
-		"?s <" + property + "> ?dataLiteral . " + 
+		String query = "SELECT DISTINCT ?dataLiteral where {" +
+		"?s <" + property + "> ?dataLiteral . " +
 		"FILTER(regex(str(?dataLiteral), \"^" + qtxt + "\", \"i\")) } ORDER BY ?dataLiteral";
 		return query;
 	}
-	
-	
+
+
 	 private void doSearchError(HttpServletResponse response) throws IOException {
-	        // For now, we are not sending an error message back to the client because 
+	        // For now, we are not sending an error message back to the client because
 	        // with the default autocomplete configuration it chokes.
 	        doNoSearchResults(response);
 	    }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java
index 52610773b..086f4530d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/IndexController.java
@@ -37,11 +37,11 @@ import edu.cornell.mannlib.vitro.webapp.services.freemarker.FreemarkerProcessing
 /**
  * Accepts requests to display the current status of the search index, or to
  * initiate a rebuild.
- * 
+ *
  * A DISPLAY or REBUILD request is handled like any other FreemarkerHttpServlet.
  * A STATUS is an AJAX request, we override doGet() so we can format the
  * template without enclosing it in a body template.
- * 
+ *
  * When initialized, this servlet adds a listener to the SearchIndexer, so it
  * can maintain a history of activity. This will provide the contents of the
  * display.
@@ -53,7 +53,7 @@ public class IndexController extends FreemarkerHttpServlet {
 	/**
 	 * <pre>
 	 * This request might be:
-	 * DISPLAY (default) -- Send the template that will contain the status display. 
+	 * DISPLAY (default) -- Send the template that will contain the status display.
 	 * STATUS  -- Send the current status and history.
 	 * REBUILD -- Initiate a rebuild. Then act like DISPLAY.
 	 * </pre>
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java
index 09d0aa6e3..6596878b2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java
@@ -63,9 +63,9 @@ public class PagedSearchController extends FreemarkerHttpServlet {
 
     private static final long serialVersionUID = 1L;
     private static final Log log = LogFactory.getLog(PagedSearchController.class);
-    
+
     protected static final int DEFAULT_HITS_PER_PAGE = 25;
-    protected static final int DEFAULT_MAX_HIT_COUNT = 1000;   
+    protected static final int DEFAULT_MAX_HIT_COUNT = 1000;
 
     private static final String PARAM_XML_REQUEST = "xml";
     private static final String PARAM_CSV_REQUEST = "csv";
@@ -77,22 +77,22 @@ public class PagedSearchController extends FreemarkerHttpServlet {
 
     protected static final Map<Format,Map<Result,String>> templateTable;
 
-    protected enum Format { 
-        HTML, XML, CSV; 
+    protected enum Format {
+        HTML, XML, CSV;
     }
-    
+
     protected enum Result {
-        PAGED, ERROR, BAD_QUERY         
+        PAGED, ERROR, BAD_QUERY
     }
-    
+
     static{
         templateTable = setupTemplateTable();
     }
-         
+
     /**
      * Overriding doGet from FreemarkerHttpController to do a page template (as
      * opposed to body template) style output for XML requests.
-     * 
+     *
      * This follows the pattern in AutocompleteController.java.
      */
     @Override
@@ -104,9 +104,9 @@ public class PagedSearchController extends FreemarkerHttpServlet {
         if( !wasXmlRequested && !wasCSVRequested){
             super.doGet(vreq,response);
         }else if (wasXmlRequested){
-            try {                
+            try {
                 ResponseValues rvalues = processRequest(vreq);
-                
+
                 response.setCharacterEncoding("UTF-8");
                 response.setContentType("text/xml;charset=UTF-8");
                 response.setHeader("Content-Disposition", "attachment; filename=search.xml");
@@ -115,9 +115,9 @@ public class PagedSearchController extends FreemarkerHttpServlet {
                 log.error(e, e);
             }
         }else if (wasCSVRequested){
-        	try {                
+        	try {
                 ResponseValues rvalues = processRequest(vreq);
-                
+
                 response.setCharacterEncoding("UTF-8");
                 response.setContentType("text/csv;charset=UTF-8");
                 response.setHeader("Content-Disposition", "attachment; filename=search.csv");
@@ -129,19 +129,19 @@ public class PagedSearchController extends FreemarkerHttpServlet {
     }
 
     @Override
-    protected ResponseValues processRequest(VitroRequest vreq) {    	    	
-    	
+    protected ResponseValues processRequest(VitroRequest vreq) {
+
         //There may be other non-html formats in the future
-        Format format = getFormat(vreq);            
+        Format format = getFormat(vreq);
         boolean wasXmlRequested = Format.XML == format;
         boolean wasCSVRequested = Format.CSV == format;
         log.debug("Requested format was " + (wasXmlRequested ? "xml" : "html"));
-        boolean wasHtmlRequested = ! (wasXmlRequested || wasCSVRequested); 
-        
+        boolean wasHtmlRequested = ! (wasXmlRequested || wasCSVRequested);
+
         try {
-            
-            //make sure an IndividualDao is available 
-            if( vreq.getWebappDaoFactory() == null 
+
+            //make sure an IndividualDao is available
+            if( vreq.getWebappDaoFactory() == null
                     || vreq.getWebappDaoFactory().getIndividualDao() == null ){
                 log.error("Could not get webappDaoFactory or IndividualDao");
                 throw new Exception("Could not access model.");
@@ -149,53 +149,53 @@ public class PagedSearchController extends FreemarkerHttpServlet {
             IndividualDao iDao = vreq.getWebappDaoFactory().getIndividualDao();
             VClassGroupDao grpDao = vreq.getWebappDaoFactory().getVClassGroupDao();
             VClassDao vclassDao = vreq.getWebappDaoFactory().getVClassDao();
-            
-            ApplicationBean appBean = vreq.getAppBean();
-            
-            log.debug("IndividualDao is " + iDao.toString() + " Public classes in the classgroup are " + grpDao.getPublicGroupsWithVClasses().toString());
-            log.debug("VClassDao is "+ vclassDao.toString() );            
-            
-            int startIndex = getStartIndex(vreq);            
-            int hitsPerPage = getHitsPerPage( vreq );           
 
-            String queryText = vreq.getParameter(PARAM_QUERY_TEXT);  
-            log.debug("Query text is \""+ queryText + "\""); 
+            ApplicationBean appBean = vreq.getAppBean();
+
+            log.debug("IndividualDao is " + iDao.toString() + " Public classes in the classgroup are " + grpDao.getPublicGroupsWithVClasses().toString());
+            log.debug("VClassDao is "+ vclassDao.toString() );
+
+            int startIndex = getStartIndex(vreq);
+            int hitsPerPage = getHitsPerPage( vreq );
+
+            String queryText = vreq.getParameter(PARAM_QUERY_TEXT);
+            log.debug("Query text is \""+ queryText + "\"");
 
 
             String badQueryMsg = badQueryText( queryText, vreq );
             if( badQueryMsg != null ){
                 return doFailedSearch(badQueryMsg, queryText, format, vreq);
             }
-                
-            SearchQuery query = getQuery(queryText, hitsPerPage, startIndex, vreq);            
+
+            SearchQuery query = getQuery(queryText, hitsPerPage, startIndex, vreq);
             SearchEngine search = ApplicationUtils.instance().getSearchEngine();
-            SearchResponse response = null;           
-            
+            SearchResponse response = null;
+
             try {
                 response = search.query(query);
-            } catch (Exception ex) {                
+            } catch (Exception ex) {
                 String msg = makeBadSearchMessage(queryText, ex.getMessage(), vreq);
                 log.error("could not run search query",ex);
-                return doFailedSearch(msg, queryText, format, vreq);              
+                return doFailedSearch(msg, queryText, format, vreq);
             }
-            
+
             if (response == null) {
-                log.error("Search response was null");                                
+                log.error("Search response was null");
                 return doFailedSearch(I18n.text(vreq, "error_in_search_request"), queryText, format, vreq);
             }
-            
+
             SearchResultDocumentList docs = response.getResults();
             if (docs == null) {
-                log.error("Document list for a search was null");                
+                log.error("Document list for a search was null");
                 return doFailedSearch(I18n.text(vreq, "error_in_search_request"), queryText,format, vreq);
             }
-                       
+
             long hitCount = docs.getNumFound();
             log.debug("Number of hits = " + hitCount);
-            if ( hitCount < 1 ) {                
+            if ( hitCount < 1 ) {
                 return doNoHits(queryText,format, vreq);
-            }            
-            
+            }
+
             List<Individual> individuals = new ArrayList<Individual>(docs.size());
             for (SearchResultDocument doc : docs) {
                 try {
@@ -208,22 +208,22 @@ public class PagedSearchController extends FreemarkerHttpServlet {
                 } catch (Exception e) {
                     log.error("Problem getting usable individuals from search hits. ", e);
                 }
-            }          
-  
+            }
+
             ParamMap pagingLinkParams = new ParamMap();
             pagingLinkParams.put(PARAM_QUERY_TEXT, queryText);
             pagingLinkParams.put(PARAM_HITS_PER_PAGE, String.valueOf(hitsPerPage));
-            
+
             if( wasXmlRequested ){
-                pagingLinkParams.put(PARAM_XML_REQUEST,"1");                
+                pagingLinkParams.put(PARAM_XML_REQUEST,"1");
             }
-            
+
             /* Compile the data for the templates */
-            
+
             Map<String, Object> body = new HashMap<String, Object>();
-            
-            String classGroupParam = vreq.getParameter(PARAM_CLASSGROUP); 
-            log.debug("ClassGroupParam is \""+ classGroupParam + "\"");   
+
+            String classGroupParam = vreq.getParameter(PARAM_CLASSGROUP);
+            log.debug("ClassGroupParam is \""+ classGroupParam + "\"");
             boolean classGroupFilterRequested = false;
             if (!StringUtils.isEmpty(classGroupParam)) {
                 VClassGroup grp = grpDao.getGroupByURI(classGroupParam);
@@ -231,7 +231,7 @@ public class PagedSearchController extends FreemarkerHttpServlet {
                 if (grp != null && grp.getPublicName() != null)
                     body.put("classGroupName", grp.getPublicName());
             }
-            
+
             String typeParam = vreq.getParameter(PARAM_RDFTYPE);
             boolean typeFilterRequested = false;
             if (!StringUtils.isEmpty(typeParam)) {
@@ -240,23 +240,23 @@ public class PagedSearchController extends FreemarkerHttpServlet {
                 if (type != null && type.getName() != null)
                     body.put("typeName", type.getName());
             }
-            
+
             /* Add ClassGroup and type refinement links to body */
-            if( wasHtmlRequested ){                                
+            if( wasHtmlRequested ){
                 if ( !classGroupFilterRequested && !typeFilterRequested ) {
                     // Search request includes no ClassGroup and no type, so add ClassGroup search refinement links.
-                    body.put("classGroupLinks", getClassGroupsLinks(vreq, grpDao, docs, response, queryText));                            
+                    body.put("classGroupLinks", getClassGroupsLinks(vreq, grpDao, docs, response, queryText));
                 } else if ( classGroupFilterRequested && !typeFilterRequested ) {
                     // Search request is for a ClassGroup, so add rdf:type search refinement links
                     // but try to filter out classes that are subclasses
-                    body.put("classLinks", getVClassLinks(vclassDao, docs, response, queryText));                       
+                    body.put("classLinks", getVClassLinks(vclassDao, docs, response, queryText));
                     pagingLinkParams.put(PARAM_CLASSGROUP, classGroupParam);
 
                 } else {
                     //search request is for a class so there are no more refinements
                     pagingLinkParams.put(PARAM_RDFTYPE, typeParam);
                 }
-            }           
+            }
 
             body.put("individuals", IndividualSearchResult
                     .getIndividualTemplateModels(individuals, vreq));
@@ -264,12 +264,12 @@ public class PagedSearchController extends FreemarkerHttpServlet {
             body.put("querytext", queryText);
             body.put("title", new StringBuilder().append(appBean.getApplicationName()).append(" - ").
                     append(I18n.text(vreq, "search_results_for")).append(" '").append(queryText).append("'").toString());
-            
+
             body.put("hitCount", hitCount);
             body.put("startIndex", startIndex);
-            
-            body.put("pagingLinks", 
-                    getPagingLinks(startIndex, hitsPerPage, hitCount,  
+
+            body.put("pagingLinks",
+                    getPagingLinks(startIndex, hitsPerPage, hitCount,
                                    vreq.getServletPath(),
                                    pagingLinkParams, vreq));
 
@@ -285,11 +285,11 @@ public class PagedSearchController extends FreemarkerHttpServlet {
 	        // VIVO OpenSocial Extension by UCSF
 	        try {
 		        OpenSocialManager openSocialManager = new OpenSocialManager(vreq, "search");
-		        // put list of people found onto pubsub channel 
+		        // put list of people found onto pubsub channel
 	            // only turn this on for a people only search
 	            if ("http://vivoweb.org/ontology#vitroClassGrouppeople".equals(vreq.getParameter(PARAM_CLASSGROUP))) {
 			        List<String> ids = OpenSocialManager.getOpenSocialId(individuals);
-			        openSocialManager.setPubsubData(OpenSocialManager.JSON_PERSONID_CHANNEL, 
+			        openSocialManager.setPubsubData(OpenSocialManager.JSON_PERSONID_CHANNEL,
 			        		OpenSocialManager.buildJSONPersonIds(ids, "" + ids.size() + " people found"));
 	            }
 				// TODO put this in a better place to guarantee that it gets called at the proper time!
@@ -305,32 +305,32 @@ public class PagedSearchController extends FreemarkerHttpServlet {
 	        }
 
 	        String template = templateTable.get(format).get(Result.PAGED);
-            
+
             return new TemplateResponseValues(template, body);
         } catch (Throwable e) {
             return doSearchError(e,format);
-        }        
+        }
     }
 
 
     private int getHitsPerPage(VitroRequest vreq) {
         int hitsPerPage = DEFAULT_HITS_PER_PAGE;
-        try{ 
-            hitsPerPage = Integer.parseInt(vreq.getParameter(PARAM_HITS_PER_PAGE)); 
-        } catch (Throwable e) { 
-            hitsPerPage = DEFAULT_HITS_PER_PAGE; 
-        }                        
-        log.debug("hitsPerPage is " + hitsPerPage);  
+        try{
+            hitsPerPage = Integer.parseInt(vreq.getParameter(PARAM_HITS_PER_PAGE));
+        } catch (Throwable e) {
+            hitsPerPage = DEFAULT_HITS_PER_PAGE;
+        }
+        log.debug("hitsPerPage is " + hitsPerPage);
         return hitsPerPage;
     }
 
     private int getStartIndex(VitroRequest vreq) {
         int startIndex = 0;
-        try{ 
-            startIndex = Integer.parseInt(vreq.getParameter(PARAM_START_INDEX)); 
-        }catch (Throwable e) { 
-            startIndex = 0; 
-        }            
+        try{
+            startIndex = Integer.parseInt(vreq.getParameter(PARAM_START_INDEX));
+        }catch (Throwable e) {
+            startIndex = 0;
+        }
         log.debug("startIndex is " + startIndex);
         return startIndex;
     }
@@ -338,38 +338,38 @@ public class PagedSearchController extends FreemarkerHttpServlet {
     private String badQueryText(String qtxt, VitroRequest vreq) {
         if( qtxt == null || "".equals( qtxt.trim() ) )
         	return I18n.text(vreq, "enter_search_term");
-        
+
         if( qtxt.equals("*:*") )
         	return I18n.text(vreq, "invalid_search_term") ;
-        
+
         return null;
     }
 
     /**
      * Get the class groups represented for the individuals in the documents.
      */
-    private List<VClassGroupSearchLink> getClassGroupsLinks(VitroRequest vreq, VClassGroupDao grpDao, SearchResultDocumentList docs, SearchResponse rsp, String qtxt) {                                 
+    private List<VClassGroupSearchLink> getClassGroupsLinks(VitroRequest vreq, VClassGroupDao grpDao, SearchResultDocumentList docs, SearchResponse rsp, String qtxt) {
         Map<String,Long> cgURItoCount = new HashMap<String,Long>();
-        
+
         List<VClassGroup> classgroups = new ArrayList<VClassGroup>( );
         List<SearchFacetField> ffs = rsp.getFacetFields();
         for(SearchFacetField ff : ffs){
             if(VitroSearchTermNames.CLASSGROUP_URI.equals(ff.getName())){
                 List<Count> counts = ff.getValues();
-                for( Count ct: counts){                    
+                for( Count ct: counts){
                     VClassGroup vcg = grpDao.getGroupByURI( ct.getName() );
                     if( vcg == null ){
                         log.debug("could not get classgroup for URI " + ct.getName());
                     }else{
                         classgroups.add(vcg);
                         cgURItoCount.put(vcg.getURI(),  ct.getCount());
-                    }                    
-                }                
-            }            
+                    }
+                }
+            }
         }
-        
-        grpDao.sortGroupList(classgroups);     
-        
+
+        grpDao.sortGroupList(classgroups);
+
         VClassGroupsForRequest vcgfr = VClassGroupCache.getVClassGroups(vreq);
         List<VClassGroupSearchLink> classGroupLinks = new ArrayList<VClassGroupSearchLink>(classgroups.size());
         for (VClassGroup vcg : classgroups) {
@@ -383,19 +383,19 @@ public class PagedSearchController extends FreemarkerHttpServlet {
         return classGroupLinks;
     }
 
-    private List<VClassSearchLink> getVClassLinks(VClassDao vclassDao, SearchResultDocumentList docs, SearchResponse rsp, String qtxt){        
-        HashSet<String> typesInHits = getVClassUrisForHits(docs);                                
+    private List<VClassSearchLink> getVClassLinks(VClassDao vclassDao, SearchResultDocumentList docs, SearchResponse rsp, String qtxt){
+        HashSet<String> typesInHits = getVClassUrisForHits(docs);
         List<VClass> classes = new ArrayList<VClass>(typesInHits.size());
-        Map<String,Long> typeURItoCount = new HashMap<String,Long>();        
-        
+        Map<String,Long> typeURItoCount = new HashMap<String,Long>();
+
         List<SearchFacetField> ffs = rsp.getFacetFields();
         for(SearchFacetField ff : ffs){
             if(VitroSearchTermNames.RDFTYPE.equals(ff.getName())){
                 List<Count> counts = ff.getValues();
-                for( Count ct: counts){  
+                for( Count ct: counts){
                     String typeUri = ct.getName();
                     long count = ct.getCount();
-                    try{                                                   
+                    try{
                         if( VitroVocabulary.OWL_THING.equals(typeUri) ||
                             count == 0 )
                             continue;
@@ -403,39 +403,39 @@ public class PagedSearchController extends FreemarkerHttpServlet {
                         if( type != null &&
                             ! type.isAnonymous() &&
                               type.getName() != null && !"".equals(type.getName()) &&
-                              type.getGroupURI() != null ){ //don't display classes that aren't in classgroups                                   
+                              type.getGroupURI() != null ){ //don't display classes that aren't in classgroups
                             typeURItoCount.put(typeUri,count);
                             classes.add(type);
                         }
                     }catch(Exception ex){
                         if( log.isDebugEnabled() )
                             log.debug("could not add type " + typeUri, ex);
-                    }                                                
-                }                
-            }            
+                    }
+                }
+            }
         }
-        
-        
+
+
         classes.sort(new Comparator<VClass>() {
             public int compare(VClass o1, VClass o2) {
                 return o1.compareTo(o2);
             }
         });
-        
+
         List<VClassSearchLink> vClassLinks = new ArrayList<VClassSearchLink>(classes.size());
-        for (VClass vc : classes) {                        
+        for (VClass vc : classes) {
             long count = typeURItoCount.get(vc.getURI());
             vClassLinks.add(new VClassSearchLink(qtxt, vc, count ));
         }
-        
+
         return vClassLinks;
-    }       
-        
+    }
+
     private HashSet<String> getVClassUrisForHits(SearchResultDocumentList docs){
-        HashSet<String> typesInHits = new HashSet<String>();  
+        HashSet<String> typesInHits = new HashSet<String>();
         for (SearchResultDocument doc : docs) {
             try {
-                Collection<Object> types = doc.getFieldValues(VitroSearchTermNames.RDFTYPE);     
+                Collection<Object> types = doc.getFieldValues(VitroSearchTermNames.RDFTYPE);
                 if (types != null) {
                     for (Object o : types) {
                         String typeUri = o.toString();
@@ -448,7 +448,7 @@ public class PagedSearchController extends FreemarkerHttpServlet {
         }
         return typesInHits;
     }
-    
+
     private String getSnippet(SearchResultDocument doc, SearchResponse response) {
         String docId = doc.getStringValue(VitroSearchTermNames.DOCID);
         StringBuilder text = new StringBuilder();
@@ -457,87 +457,87 @@ public class PagedSearchController extends FreemarkerHttpServlet {
             List<String> snippets = highlights.get(docId).get(VitroSearchTermNames.ALLTEXT);
             if (snippets != null && snippets.size() > 0) {
                 text.append("... ").append(snippets.get(0)).append(" ...");
-            }       
+            }
         }
         return text.toString();
-    }       
+    }
 
     private SearchQuery getQuery(String queryText, int hitsPerPage, int startIndex, VitroRequest vreq) {
         // Lowercase the search term to support wildcard searches: The search engine applies no text
         // processing to a wildcard search term.
         SearchQuery query = ApplicationUtils.instance().getSearchEngine().createQuery(queryText);
-        
+
         query.setStart( startIndex )
              .setRows(hitsPerPage);
 
         // ClassGroup filtering param
         String classgroupParam = vreq.getParameter(PARAM_CLASSGROUP);
-        
+
         // rdf:type filtering param
         String typeParam = vreq.getParameter(PARAM_RDFTYPE);
-        
+
         if ( ! StringUtils.isBlank(classgroupParam) ) {
             // ClassGroup filtering
             log.debug("Firing classgroup query ");
             log.debug("request.getParameter(classgroup) is "+ classgroupParam);
             query.addFilterQuery(VitroSearchTermNames.CLASSGROUP_URI + ":\"" + classgroupParam + "\"");
-            
+
             //with ClassGroup filtering we want type facets
             query.addFacetFields(VitroSearchTermNames.RDFTYPE).setFacetLimit(-1);
-            
+
         }else if (  ! StringUtils.isBlank(typeParam) ) {
             // rdf:type filtering
             log.debug("Firing type query ");
-            log.debug("request.getParameter(type) is "+ typeParam);   
+            log.debug("request.getParameter(type) is "+ typeParam);
             query.addFilterQuery(VitroSearchTermNames.RDFTYPE + ":\"" + typeParam + "\"");
-            //with type filtering we don't have facets.            
-        }else{ 
+            //with type filtering we don't have facets.
+        }else{
             //When no filtering is set, we want ClassGroup facets
         	query.addFacetFields(VitroSearchTermNames.CLASSGROUP_URI).setFacetLimit(-1);
-        }                        
-        
+        }
+
         log.debug("Query = " + query.toString());
         return query;
-    }   
-    
-    public static class VClassGroupSearchLink extends LinkTemplateModel {        
+    }
+
+    public static class VClassGroupSearchLink extends LinkTemplateModel {
         long count = 0;
         VClassGroupSearchLink(String querytext, VClassGroup classgroup, long count) {
             super(classgroup.getPublicName(), "/search", PARAM_QUERY_TEXT, querytext, PARAM_CLASSGROUP, classgroup.getURI());
             this.count = count;
         }
-        
+
         public String getCount() { return Long.toString(count); }
     }
-    
+
     public static class VClassSearchLink extends LinkTemplateModel {
         long count = 0;
         VClassSearchLink(String querytext, VClass type, long count) {
             super(type.getName(), "/search", PARAM_QUERY_TEXT, querytext, PARAM_RDFTYPE, type.getURI());
             this.count = count;
         }
-        
-        public String getCount() { return Long.toString(count); }               
+
+        public String getCount() { return Long.toString(count); }
     }
-    
+
     protected static List<PagingLink> getPagingLinks(int startIndex, int hitsPerPage, long hitCount, String baseUrl, ParamMap params, VitroRequest vreq) {
 
         List<PagingLink> pagingLinks = new ArrayList<PagingLink>();
-        
+
         // No paging links if only one page of results
         if (hitCount <= hitsPerPage) {
             return pagingLinks;
         }
-        
+
         int maxHitCount = DEFAULT_MAX_HIT_COUNT ;
         if( startIndex >= DEFAULT_MAX_HIT_COUNT  - hitsPerPage )
-            maxHitCount = startIndex + DEFAULT_MAX_HIT_COUNT ;                
-            
+            maxHitCount = startIndex + DEFAULT_MAX_HIT_COUNT ;
+
         for (int i = 0; i < hitCount; i += hitsPerPage) {
             params.put(PARAM_START_INDEX, String.valueOf(i));
             if ( i < maxHitCount - hitsPerPage) {
                 int pageNumber = i/hitsPerPage + 1;
-                boolean iIsCurrentPage = (i >= startIndex && i < (startIndex + hitsPerPage)); 
+                boolean iIsCurrentPage = (i >= startIndex && i < (startIndex + hitsPerPage));
                 if ( iIsCurrentPage ) {
                     pagingLinks.add(new PagingLink(pageNumber));
                 } else {
@@ -547,59 +547,59 @@ public class PagedSearchController extends FreemarkerHttpServlet {
             	pagingLinks.add(new PagingLink(I18n.text(vreq, "paging_link_more"), baseUrl, params));
                 break;
             }
-        }   
-        
+        }
+
         return pagingLinks;
     }
-    
+
     private String getPreviousPageLink(int startIndex, int hitsPerPage, String baseUrl, ParamMap params) {
         params.put(PARAM_START_INDEX, String.valueOf(startIndex-hitsPerPage));
         return UrlBuilder.getUrl(baseUrl, params);
     }
-    
+
     private String getNextPageLink(int startIndex, int hitsPerPage, String baseUrl, ParamMap params) {
         params.put(PARAM_START_INDEX, String.valueOf(startIndex+hitsPerPage));
         return UrlBuilder.getUrl(baseUrl, params);
     }
-    
+
     protected static class PagingLink extends LinkTemplateModel {
-        
+
         PagingLink(int pageNumber, String baseUrl, ParamMap params) {
             super(String.valueOf(pageNumber), baseUrl, params);
         }
-        
+
         // Constructor for current page item: not a link, so no url value.
         PagingLink(int pageNumber) {
             setText(String.valueOf(pageNumber));
         }
-        
+
         // Constructor for "more..." item
         PagingLink(String text, String baseUrl, ParamMap params) {
             super(text, baseUrl, params);
         }
     }
-   
+
     private ExceptionResponseValues doSearchError(Throwable e, Format f) {
         Map<String, Object> body = new HashMap<String, Object>();
-        body.put("message", "Search failed: " + e.getMessage());  
+        body.put("message", "Search failed: " + e.getMessage());
         return new ExceptionResponseValues(getTemplate(f,Result.ERROR), body, e);
-    }   
-    
+    }
+
     private TemplateResponseValues doFailedSearch(String message, String querytext, Format f, VitroRequest vreq) {
-        Map<String, Object> body = new HashMap<String, Object>();       
-        body.put("title", I18n.text(vreq, "search_for", querytext));        
+        Map<String, Object> body = new HashMap<String, Object>();
+        body.put("title", I18n.text(vreq, "search_for", querytext));
         if ( StringUtils.isEmpty(message) ) {
         	message = I18n.text(vreq, "search_failed");
-        }        
+        }
         body.put("message", message);
         return new TemplateResponseValues(getTemplate(f,Result.ERROR), body);
     }
 
     private TemplateResponseValues doNoHits(String querytext, Format f, VitroRequest vreq) {
-        Map<String, Object> body = new HashMap<String, Object>();       
-        body.put("title", I18n.text(vreq, "search_for", querytext));        
-        body.put("message", I18n.text(vreq, "no_matching_results"));     
-        return new TemplateResponseValues(getTemplate(f,Result.ERROR), body);        
+        Map<String, Object> body = new HashMap<String, Object>();
+        body.put("title", I18n.text(vreq, "search_for", querytext));
+        body.put("message", I18n.text(vreq, "no_matching_results"));
+        return new TemplateResponseValues(getTemplate(f,Result.ERROR), body);
     }
 
     /**
@@ -642,7 +642,7 @@ public class PagedSearchController extends FreemarkerHttpServlet {
         }
         return rv;
     }
-    
+
     public static final int MAX_QUERY_LENGTH = 500;
 
     protected boolean isRequestedFormatXml(VitroRequest req){
@@ -653,7 +653,7 @@ public class PagedSearchController extends FreemarkerHttpServlet {
             return false;
         }
     }
-    
+
     protected boolean isRequestedFormatCSV(VitroRequest req){
         if( req != null ){
             String param = req.getParameter(PARAM_CSV_REQUEST);
@@ -668,10 +668,10 @@ public class PagedSearchController extends FreemarkerHttpServlet {
             return Format.XML;
         else if ( req != null && req.getParameter("csv") != null && "1".equals(req.getParameter("csv")))
         	return Format.CSV;
-        else 
+        else
             return Format.HTML;
     }
-    
+
     protected static String getTemplate(Format format, Result result){
         if( format != null && result != null)
             return templateTable.get(format).get(result);
@@ -680,36 +680,36 @@ public class PagedSearchController extends FreemarkerHttpServlet {
             return templateTable.get(Format.HTML).get(Result.ERROR);
         }
     }
-    
+
     protected static Map<Format,Map<Result,String>> setupTemplateTable(){
         Map<Format,Map<Result,String>> table = new HashMap<>();
-        
+
         HashMap<Result,String> resultsToTemplates = new HashMap<Result,String>();
-        
+
         // set up HTML format
         resultsToTemplates.put(Result.PAGED, "search-pagedResults.ftl");
         resultsToTemplates.put(Result.ERROR, "search-error.ftl");
-        // resultsToTemplates.put(Result.BAD_QUERY, "search-badQuery.ftl");        
+        // resultsToTemplates.put(Result.BAD_QUERY, "search-badQuery.ftl");
         table.put(Format.HTML, Collections.unmodifiableMap(resultsToTemplates));
-        
+
         // set up XML format
         resultsToTemplates = new HashMap<Result,String>();
         resultsToTemplates.put(Result.PAGED, "search-xmlResults.ftl");
         resultsToTemplates.put(Result.ERROR, "search-xmlError.ftl");
 
-        // resultsToTemplates.put(Result.BAD_QUERY, "search-xmlBadQuery.ftl");        
+        // resultsToTemplates.put(Result.BAD_QUERY, "search-xmlBadQuery.ftl");
         table.put(Format.XML, Collections.unmodifiableMap(resultsToTemplates));
-        
-        
+
+
         // set up CSV format
         resultsToTemplates = new HashMap<Result,String>();
         resultsToTemplates.put(Result.PAGED, "search-csvResults.ftl");
         resultsToTemplates.put(Result.ERROR, "search-csvError.ftl");
-        
-        // resultsToTemplates.put(Result.BAD_QUERY, "search-xmlBadQuery.ftl");        
+
+        // resultsToTemplates.put(Result.BAD_QUERY, "search-xmlBadQuery.ftl");
         table.put(Format.CSV, Collections.unmodifiableMap(resultsToTemplates));
 
-        
+
         return Collections.unmodifiableMap(table);
     }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchHelpController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchHelpController.java
index 54396b76c..8d0a73ef2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchHelpController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/SearchHelpController.java
@@ -20,19 +20,19 @@ public class SearchHelpController extends FreemarkerHttpServlet {
 
     private static final Log log = LogFactory.getLog(SearchHelpController.class.getName());
     private static final String TEMPLATE_NAME = "search-help.ftl";
-    
+
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
 
         Map<String, Object> body = new HashMap<String, Object>();
 
         String pointOfOrigin = "helpLink";
-        
+
         body.put("origination", pointOfOrigin);
 
         return new TemplateResponseValues(TEMPLATE_NAME, body);
     }
-  
+
 }
 
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/UpdateUrisInIndex.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/UpdateUrisInIndex.java
index 9c75dbb27..41e7be696 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/UpdateUrisInIndex.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/UpdateUrisInIndex.java
@@ -36,7 +36,7 @@ public class UpdateUrisInIndex {
 
 	/**
 	 * Web service for update in search index of a list of URIs.
-	 * 
+	 *
 	 * @throws IOException
 	 */
 	protected int doUpdateUris(HttpServletRequest req, SearchIndexer indexer)
@@ -45,7 +45,7 @@ public class UpdateUrisInIndex {
 		if (map == null) {
 			throw new ServletException("Expected Multipart Content");
 		}
-		
+
 		Charset enc = getEncoding(req);
 
 		int uriCount = 0;
@@ -58,7 +58,7 @@ public class UpdateUrisInIndex {
 		return uriCount;
 	}
 
-	private int processFileItem(SearchIndexer indexer, 
+	private int processFileItem(SearchIndexer indexer,
 			FileItem item, Charset enc) throws IOException {
 		List<String> uris = new ArrayList<>();
 		Reader reader = new InputStreamReader(item.getInputStream(), enc.name());
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchengine/base/BaseSearchInputField.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchengine/base/BaseSearchInputField.java
index 446ea12f5..c53e74a88 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchengine/base/BaseSearchInputField.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchengine/base/BaseSearchInputField.java
@@ -99,10 +99,10 @@ public class BaseSearchInputField implements SearchInputField {
 	/**
 	 * Can't just compare the value lists, because they are considered to be
 	 * equivalent even if the order is differemt.
-	 * 
+	 *
 	 * Can't just convert them to Sets, because either list may contain the same
 	 * object multiple times.
-	 * 
+	 *
 	 * Remove the members of list1 from list2, one at a time. If any member is
 	 * not found, the lists are not equivalent.
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchengine/base/BaseSearchResultDocument.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchengine/base/BaseSearchResultDocument.java
index f72cd6548..844e46578 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchengine/base/BaseSearchResultDocument.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchengine/base/BaseSearchResultDocument.java
@@ -19,7 +19,7 @@ public class BaseSearchResultDocument implements SearchResultDocument {
 
 	public BaseSearchResultDocument(String uniqueId, Map<String, Collection<Object>> fieldValuesMap) {
 		this.uniqueId = uniqueId;
-		
+
 		Map<String, Collection<Object>> map = new HashMap<>();
 		for (String name : fieldValuesMap.keySet()) {
 			map.put(name, Collections.unmodifiableList(new ArrayList<>(
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchengine/solr/SolrSearchResultDocumentList.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchengine/solr/SolrSearchResultDocumentList.java
index ae0bbaffa..8e98a4f58 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchengine/solr/SolrSearchResultDocumentList.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchengine/solr/SolrSearchResultDocumentList.java
@@ -13,7 +13,7 @@ import edu.cornell.mannlib.vitro.webapp.searchengine.base.BaseSearchResultDocume
 
 /**
  * A Solr-based implementation of SearchResultDocumentList.
- * 
+ *
  * It's necessary to use this instead of the base version, so the iterator can
  * convert each document as it is requested.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/IndexingChangeListener.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/IndexingChangeListener.java
index 0cd389526..b7b5bfdf4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/IndexingChangeListener.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/IndexingChangeListener.java
@@ -29,27 +29,27 @@ import edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread;
  * When a change is heard, wait for an interval to see if more changes come in.
  * When changes stop coming in for a specified interval, send what has
  * accumulated.
- * 
+ *
  * When the SearchIndexer pauses, stop sending changes until the SearchIndexer
  * unpauses.
- * 
+ *
  * If the SearchIndexer begins a rebuild, discard any changes that we had
  * accumulated. They will be accomplished by the rebuild.
- * 
+ *
  * -----------------------
- * 
+ *
  * When a changed statement is received, it should not be added to the list of
  * pending changes. The elements of the statement hold references to the model
  * in which they were created, as well as to other structures.
- * 
+ *
  * Thus, an action that produces many changes to the models could become
  * unscalable.
- * 
+ *
  * To avoid this, we use the ResourceFactory to create a "sanitized" statement
  * which is semantically equivalent to the original, and add that to the list
  * instead. The original statement is released.
  */
-public class IndexingChangeListener extends StatementListener 
+public class IndexingChangeListener extends StatementListener
         implements ModelChangedListener, SearchIndexer.Listener {
 	private static final Log log = LogFactory
 			.getLog(IndexingChangeListener.class);
@@ -72,7 +72,7 @@ public class IndexingChangeListener extends StatementListener
 	}
 
 	private synchronized void noteChange(Statement stmt) {
-        changes.add(stmt); 
+        changes.add(stmt);
 		ticker.start();
 	}
 
@@ -167,17 +167,17 @@ public class IndexingChangeListener extends StatementListener
 	/**
 	 * The ticker will ask for a response after two ticks, unless it is started
 	 * again before the second one.
-	 * 
+	 *
 	 * <pre>
 	 * On a call to start():
 	 *    Start the timer unless it is already running.
 	 *    Reset the hasOneTick flag.
-	 *    
+	 *
 	 * When the timer expires:
 	 *    If the timer hasOneTick, we're done: call for a response.
 	 *    Otherwise, record that it hasOneTick, and keep the timer running.
 	 * </pre>
-	 * 
+	 *
 	 * All methods are synchronized on the enclosing IndexingChangeListener.
 	 */
 	private class Ticker {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerImpl.java
index 32cfaab74..c1f1f0a61 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerImpl.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerImpl.java
@@ -71,15 +71,15 @@ import edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread.Work
 
 /**
  * An implementation of the SearchIndexer interface.
- * 
+ *
  * This implementation uses a single-threaded task queue to permit indexing to
  * run one at a time in a "background" thread. The task queue is controlled by a
  * scheduler that allows us to suspend incoming tasks (pause).
- * 
+ *
  * A thread pool is available so the tasks can create small units of work to be
  * run in parallel. Each task should block until all of its work units are
  * complete, to preserve the pattern of running one task at a time.
- * 
+ *
  * The number of threads in the thread pool is specified in the application
  * setup file.
  */
@@ -467,7 +467,7 @@ public class SearchIndexerImpl implements SearchIndexer {
 	/**
 	 * A single-threaded task queue that can tell us the status of the current
 	 * task.
-	 * 
+	 *
 	 * If no current task, it can return a status of IDLE or SHUTDOWN.
 	 */
 	private static class TaskQueue {
@@ -630,15 +630,15 @@ public class SearchIndexerImpl implements SearchIndexer {
 
 	/**
 	 * A thread pool for handling many small units of work submitted by a task.
-	 * 
+	 *
 	 * The task is notified as each unit completes.
-	 * 
+	 *
 	 * If no thread is available for a work unit, the thread of the task itself
 	 * will run it. This provides automatic throttling.
-	 * 
+	 *
 	 * Only one task is active at a time, so the task can simply wait until this
 	 * pool is idle to know that all of its units have completed.
-	 * 
+	 *
 	 * When shutting down, no attempt is made to interrupt the currently
 	 * executing work units, since they are assumed to be small.
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerSetup.java
index ffe8be61f..0f9222d56 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerSetup.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerSetup.java
@@ -24,10 +24,10 @@ import edu.cornell.mannlib.vitro.webapp.utils.developer.listeners.DeveloperDisab
 /**
  * Start the SearchIndexer. Create a listener on the RDFService and link it to
  * the indexer.
- * 
+ *
  * Create a history object as a listener and make it available to the
  * IndexController.
- * 
+ *
  * Create a listener that will call commit() on the SearchEngine every time it
  * hears a progress or completion event.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/DocumentModifier.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/DocumentModifier.java
index f0944b1ef..4d4186b6b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/DocumentModifier.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/DocumentModifier.java
@@ -7,14 +7,14 @@ import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchInputDocument
 
 /**
  * An object that can add to a SearchInputDocument.
- * 
+ *
  * Implementations must be thread-safe.
  */
 public interface DocumentModifier {
 	/**
 	 * Use the rules contained within this class to modify this search document,
 	 * according to the characteristics of this individual.
-	 * 
+	 *
 	 * @param individual
 	 *            The individual that is being indexed. Will not be null.
 	 * @param doc
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/DocumentModifierList.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/DocumentModifierList.java
index 43efd58f8..f77689159 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/DocumentModifierList.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/DocumentModifierList.java
@@ -7,14 +7,14 @@ import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchInputDocument
 
 /**
  * An ordered list of DocumentModifier objects, in a handy package.
- * 
+ *
  * Implementations should make a protective copy of the list of
  * DocumentModifiers. Implementations must be thread-safe.
- * 
+ *
  * The life-cycle is:
- * 
+ *
  * <pre>
- * startIndexing(), 
+ * startIndexing(),
  * 0 or more modifyDocument() by multiple threads,
  * stopIndexing().
  * </pre>
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/DocumentModifierListDeveloper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/DocumentModifierListDeveloper.java
index 093e88ade..ec0a0cd52 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/DocumentModifierListDeveloper.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/DocumentModifierListDeveloper.java
@@ -18,7 +18,7 @@ import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchInputDocument
 /**
  * An implementation that accumulates timing figures for each modifier and
  * writes them to the log.
- * 
+ *
  * Note that this must be thread-safe.
  */
 public class DocumentModifierListDeveloper implements DocumentModifierList {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/SelectQueryDocumentModifier.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/SelectQueryDocumentModifier.java
index 66eecc35c..d4ead0f4a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/SelectQueryDocumentModifier.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/SelectQueryDocumentModifier.java
@@ -28,22 +28,22 @@ import edu.cornell.mannlib.vitro.webapp.utils.sparqlrunner.QueryHolder;
 
 /**
  * Modify the document, adding the results of one or more select queries.
- * 
+ *
  * If the individual qualifies, execute the queries and add the results to the
  * specified search fields.
- * 
+ *
  * If there are no specified search fields, ALLTEXT and ALLTEXTUNSTEMMED are
  * assumed.
- * 
+ *
  * An individual qualifies if it satisfies any of the type restrictions, or if
  * there are no type restrictions.
- * 
+ *
  * Each query should contain a ?uri variable, which will be replaced by the URI
  * of the individual.
- * 
+ *
  * All of the result fields of all result rows of all of the queries will be
  * converted to strings and added to each of the specified search fields.
- * 
+ *
  * A label may be supplied to the instance, for use in logging. If no label is
  * supplied, one will be generated.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURL.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURL.java
index f2f2e1f3f..6ca9cd1ed 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURL.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURL.java
@@ -23,7 +23,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.configuration.ContextModelsUser;
 
 public class ThumbnailImageURL implements DocumentModifier, ContextModelsUser {
 	private static final Log log = LogFactory.getLog(ThumbnailImageURL.class);
-	
+
     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#>  "
@@ -32,19 +32,19 @@ public class ThumbnailImageURL implements DocumentModifier, ContextModelsUser {
         + " prefix rdfs:  <http://www.w3.org/2000/01/rdf-schema#> "
         + " prefix localNav: <http://vitro.mannlib.cornell.edu/ns/localnav#>  "
         + " prefix bibo: <http://purl.org/ontology/bibo/>  ";
-    
+
 	private static final String QUERY_TEMPLATE = PREFIX
 		+ " SELECT (str(?downloadLocation) as ?DownloadLocation) WHERE { "
 		+ " ?uri <http://vitro.mannlib.cornell.edu/ns/vitro/public#mainImage> ?a . "
 		+ " ?a <http://vitro.mannlib.cornell.edu/ns/vitro/public#downloadLocation> ?downloadLocation . } ";
-    
+
     private volatile RDFService rdf;
-    
+
 	@Override
 	public void setContextModels(ContextModelAccess models) {
 		this.rdf = models.getRDFService();
 	}
-	
+
 	@Override
 	public void modifyDocument(Individual individual, SearchInputDocument doc) {
 		// add a field for storing the location of thumbnail for the individual.
@@ -63,7 +63,7 @@ public class ThumbnailImageURL implements DocumentModifier, ContextModelsUser {
                 doc.addField(THUMBNAIL, "0");
         }catch(Exception ex){
             log.debug("could not index thumbnail: " + ex);
-        }        
+        }
     }
 
 	protected String runQueryForThumbnailLocation(Individual individual) {
@@ -84,12 +84,12 @@ public class ThumbnailImageURL implements DocumentModifier, ContextModelsUser {
 						result.append("").append(node.toString());
 					}else{
 						log.info(name + " is null");
-					}                        
+					}
 				}
 			}
-		}catch(Throwable t){                
+		}catch(Throwable t){
 			log.error(t,t);
-		}				
+		}
 		return result.toString();
 	}
 
@@ -99,7 +99,7 @@ public class ThumbnailImageURL implements DocumentModifier, ContextModelsUser {
 	}
 
 	@Override
-	public void shutdown() {		
+	public void shutdown() {
 		// nothing to release.
 	}
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnTypeNamespace.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnTypeNamespace.java
index f5c765830..22a6e0f16 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnTypeNamespace.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnTypeNamespace.java
@@ -13,18 +13,18 @@ import edu.cornell.mannlib.vitro.webapp.utils.configuration.Property;
 import edu.cornell.mannlib.vitro.webapp.utils.configuration.Validation;
 
 /**
- * Exclude individuals based on the namespaces of their types. 
+ * Exclude individuals based on the namespaces of their types.
  */
 public class ExcludeBasedOnTypeNamespace implements SearchIndexExcluder {
 
     private final List<String> namespaces = new ArrayList<>();
-    Pattern nsRegexPattern; 
-    
+    Pattern nsRegexPattern;
+
 	@Property(uri = "http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationSetup#excludes")
 	public void addExcludedNamespace(String uri) {
 		namespaces.add(uri);
 	}
-	
+
 	@Validation
 	public void compileRegexPattern() {
         StringBuilder nsOrPattern = new StringBuilder();
@@ -62,5 +62,5 @@ public class ExcludeBasedOnTypeNamespace implements SearchIndexExcluder {
 	@Override
 	public String toString() {
 		return "ExcludeBasedOnTypeNamespace[namespaces=" + namespaces + "]";
-	}    
+	}
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SearchIndexExcluder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SearchIndexExcluder.java
index d7e555085..78ba4b24d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SearchIndexExcluder.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SearchIndexExcluder.java
@@ -14,8 +14,8 @@ public interface SearchIndexExcluder {
     /**
      * REturn a string message if the individual should
      * be excluded from the index.
-     * 
+     *
      * Return null if ind should not be excluded.
      */
-    public String checkForExclusion(Individual ind); 
+    public String checkForExclusion(Individual ind);
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SearchIndexExcluderList.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SearchIndexExcluderList.java
index 21b3f98aa..45af16437 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SearchIndexExcluderList.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SearchIndexExcluderList.java
@@ -6,15 +6,15 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 
 /**
  * An ordered list of SearxchIndexExcluder objects, in a handy package.
- * 
+ *
  * Implementations should make a protective copy of the list of
  * SearxchIndexExcluders. Implementations must be thread-safe.
- * 
+ *
  * The life-cycle is:
- * 
+ *
  * <pre>
- * startIndexing(), 
- * 0 or more isExcluded() by multiple threads, 
+ * startIndexing(),
+ * 0 or more isExcluded() by multiple threads,
  * stopIndexing().
  * </pre>
  */
@@ -32,7 +32,7 @@ public interface SearchIndexExcluderList {
 
 	/**
 	 * Poll the list of excluders regarding this individual.
-	 * 
+	 *
 	 * If any returns non-null, the individual is excluded. If all return null,
 	 * the individual is not excluded.
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SearchIndexExcluderListDeveloper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SearchIndexExcluderListDeveloper.java
index a2afacffb..48e57844c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SearchIndexExcluderListDeveloper.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SearchIndexExcluderListDeveloper.java
@@ -17,7 +17,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 /**
  * An implementation that accumulates timing figures for each excluder and
  * writes them to the log.
- * 
+ *
  * Note that this must be thread-safe.
  */
 public class SearchIndexExcluderListDeveloper implements
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SyncingExcludeBasedOnType.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SyncingExcludeBasedOnType.java
index 682be8f88..68dc4beb9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SyncingExcludeBasedOnType.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SyncingExcludeBasedOnType.java
@@ -34,17 +34,17 @@ import edu.cornell.mannlib.vitro.webapp.utils.configuration.ContextModelsUser;
 import edu.cornell.mannlib.vitro.webapp.utils.configuration.Validation;
 
 /**
- * This excludes based on types defined as EXCLUDE_CLASS in the 
- * configuration RDF model. 
+ * This excludes based on types defined as EXCLUDE_CLASS in the
+ * configuration RDF model.
  */
 public class SyncingExcludeBasedOnType extends ExcludeBasedOnType implements ModelChangedListener, ContextModelsUser {
-    static final Log log = LogFactory.getLog(SyncingExcludeBasedOnType.class);        
+    static final Log log = LogFactory.getLog(SyncingExcludeBasedOnType.class);
 
-    private static final String queryForProhibitedClasses = 
+    private static final String queryForProhibitedClasses =
         "SELECT ?prohibited WHERE{" +
         "?searchConfig <" + EXCLUDE_CLASS + "> ?prohibited . " +
         "}";
-    
+
     private ContextModelAccess models;
 
     @Override
@@ -57,11 +57,11 @@ public class SyncingExcludeBasedOnType extends ExcludeBasedOnType implements Mod
 		OntModel model = models.getOntModel(ModelNames.DISPLAY);
         this.setExcludedTypes( buildProhibitedClassesList(SEARCH_INDEX_URI, model) );
         log.debug(this);
-    }       
-        
+    }
+
     private List<String> buildProhibitedClassesList( String URI, Model model){
         List<String> newProhibitedClasses = new ArrayList<String>();
-        
+
         QuerySolutionMap initialBinding = new QuerySolutionMap();
         Resource searchConfig = ResourceFactory.createResource(URI);
         initialBinding.add("searchConfig", searchConfig);
@@ -73,7 +73,7 @@ public class SyncingExcludeBasedOnType extends ExcludeBasedOnType implements Mod
             try{
                 ResultSet results = qExec.execSelect();
                 for(;results.hasNext();){
-                    QuerySolution soln = results.nextSolution();                
+                    QuerySolution soln = results.nextSolution();
                     RDFNode n = soln.get("prohibited");
                     if( n.isResource() && !n.isAnon()){
                         newProhibitedClasses.add(((Resource) n).getURI());
@@ -82,22 +82,22 @@ public class SyncingExcludeBasedOnType extends ExcludeBasedOnType implements Mod
                     }
                 }
             }catch(Throwable t){
-                log.error(t,t);         
+                log.error(t,t);
             }finally{ qExec.close(); }
-        }finally{ model.leaveCriticalSection(); }                                
-        
+        }finally{ model.leaveCriticalSection(); }
+
         return newProhibitedClasses;
     }
 
-    
+
     /* ************* Methods for ModelChangeListener *************** */
-    
+
     @Override
     public void addedStatement(Statement s) {
         try{
-            if( isExcludeClassPredicate( s ) && isAboutSearchIndex(s)){             
-                if( s.getObject() != null && s.getObject().isURIResource()){                
-                    String classURI = s.getObject().asResource().getURI();     
+            if( isExcludeClassPredicate( s ) && isAboutSearchIndex(s)){
+                if( s.getObject() != null && s.getObject().isURIResource()){
+                    String classURI = s.getObject().asResource().getURI();
                     this.addTypeToExclude(classURI);
                     log.debug("prohibited classes: " + this);
                 }
@@ -105,15 +105,15 @@ public class SyncingExcludeBasedOnType extends ExcludeBasedOnType implements Mod
         }catch(Exception ex){
             log.error("could not add statement",ex);
         }
-        
+
     }
 
     @Override
-    public void removedStatement(Statement s) { 
+    public void removedStatement(Statement s) {
         try{
-            if( isExcludeClassPredicate( s ) && isAboutSearchIndex(s)){             
-                if( s.getObject() != null && s.getObject().isURIResource()){            
-                    String classURI = s.getObject().asResource().getURI();                            
+            if( isExcludeClassPredicate( s ) && isAboutSearchIndex(s)){
+                if( s.getObject() != null && s.getObject().isURIResource()){
+                    String classURI = s.getObject().asResource().getURI();
                     this.removeTypeToExclude(classURI);
                     log.debug("prohibited classes: " + this);
                 }
@@ -122,13 +122,13 @@ public class SyncingExcludeBasedOnType extends ExcludeBasedOnType implements Mod
             log.error("could not remove statement",ex);
         }
     }
-    
+
     private boolean isExcludeClassPredicate(Statement s){
         return s != null
             && s.getPredicate() != null
-            && EXCLUDE_CLASS.getURI().equals( s.getPredicate().getURI()); 
+            && EXCLUDE_CLASS.getURI().equals( s.getPredicate().getURI());
     }
-    
+
     private boolean isAboutSearchIndex(Statement s){
         if( s.getSubject() != null ){
             String subURI = s.getSubject().getURI() ;
@@ -137,14 +137,14 @@ public class SyncingExcludeBasedOnType extends ExcludeBasedOnType implements Mod
             return false;
         }
     }
-    
+
     @Override
     public void addedStatements(Statement[] stmts) {
         if( stmts != null ){
             for( Statement stmt : stmts){
                 addedStatement(stmt);
             }
-        }        
+        }
     }
 
     @Override
@@ -153,7 +153,7 @@ public class SyncingExcludeBasedOnType extends ExcludeBasedOnType implements Mod
             for( Statement stmt : stmts){
                 addedStatement(stmt);
             }
-        }   
+        }
     }
 
     @Override
@@ -161,7 +161,7 @@ public class SyncingExcludeBasedOnType extends ExcludeBasedOnType implements Mod
         while(it.hasNext()){
             Statement stmt = it.nextStatement();
             addedStatement(stmt);
-        }        
+        }
     }
 
     @Override
@@ -170,12 +170,12 @@ public class SyncingExcludeBasedOnType extends ExcludeBasedOnType implements Mod
 			addedStatements(model.listStatements(
 					model.createResource(SEARCH_INDEX_URI), EXCLUDE_CLASS,
 					(RDFNode) null));
-        }        
+        }
     }
 
     @Override
     public void notifyEvent(Model arg0, Object arg1) {
-        //nothing        
+        //nothing
     }
 
     @Override
@@ -184,7 +184,7 @@ public class SyncingExcludeBasedOnType extends ExcludeBasedOnType implements Mod
             for( Statement stmt : stmts){
                 removedStatement(stmt);
             }
-        }       
+        }
     }
 
     @Override
@@ -193,7 +193,7 @@ public class SyncingExcludeBasedOnType extends ExcludeBasedOnType implements Mod
             for( Statement stmt : stmts){
                 removedStatement(stmt);
             }
-        }       
+        }
     }
 
     @Override
@@ -201,7 +201,7 @@ public class SyncingExcludeBasedOnType extends ExcludeBasedOnType implements Mod
         while(it.hasNext()){
             Statement stmt = it.nextStatement();
             removedStatement(stmt);
-        } 
+        }
     }
 
     @Override
@@ -210,7 +210,7 @@ public class SyncingExcludeBasedOnType extends ExcludeBasedOnType implements Mod
 			removedStatements(model.listStatements(
 					model.createResource(SEARCH_INDEX_URI), EXCLUDE_CLASS,
 					(RDFNode) null));
-        }                
+        }
     }
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForClassGroupChanges.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForClassGroupChanges.java
index 17ba5bf01..915b0d322 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForClassGroupChanges.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForClassGroupChanges.java
@@ -22,12 +22,12 @@ import edu.cornell.mannlib.vitro.webapp.utils.configuration.ContextModelsUser;
  * If a class changes classgroups, then all members of that class
  * will have to be update in the search since the serach include
  * the clasgroup membership of all individuals.
- * 
- * Ex. when a statement like: 
- * sub='http://vivoweb.org/ontology/core#Summer&#39; 
- * pred='http://vitro.mannlib.cornell.edu/ns/vitro/0.7#inClassGroup&#39; 
- * obj='http://vivoweb.org/ontology#vitroClassGrouppeople&#39; 
- * changes, all members of the class core:Summer need to be update so they get the new classgroup values. 
+ *
+ * Ex. when a statement like:
+ * sub='http://vivoweb.org/ontology/core#Summer&#39;
+ * pred='http://vitro.mannlib.cornell.edu/ns/vitro/0.7#inClassGroup&#39;
+ * obj='http://vivoweb.org/ontology#vitroClassGrouppeople&#39;
+ * changes, all members of the class core:Summer need to be update so they get the new classgroup values.
  */
 public class AdditionalURIsForClassGroupChanges implements IndexingUriFinder, ContextModelsUser {
 
@@ -40,10 +40,10 @@ public class AdditionalURIsForClassGroupChanges implements IndexingUriFinder, Co
 
     @Override
     public List<String> findAdditionalURIsToIndex(Statement stmt) {
-        if( stmt != null 
-            && VitroVocabulary.IN_CLASSGROUP.equals( stmt.getPredicate().getURI() ) 
+        if( stmt != null
+            && VitroVocabulary.IN_CLASSGROUP.equals( stmt.getPredicate().getURI() )
             && stmt.getSubject() != null ){
-            // its a classgroup membership change for a class, 
+            // its a classgroup membership change for a class,
             // update all individuals from the class.
             List<String> uris = new ArrayList<String>();
             model.enterCriticalSection(Lock.READ);
@@ -63,7 +63,7 @@ public class AdditionalURIsForClassGroupChanges implements IndexingUriFinder, Co
             return Collections.emptyList();
         }
     }
-    
+
     @Override
     public void startIndexing() { /* nothing to prepare */ }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForObjectProperties.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForObjectProperties.java
index e5dacd4b5..d8b2233fc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForObjectProperties.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForObjectProperties.java
@@ -27,15 +27,15 @@ import edu.cornell.mannlib.vitro.webapp.utils.configuration.ContextModelsUser;
 /**
  * For a given statement, return the URIs that may need to be updated in
  * the search index because of their object property relations to the resources
- * in the statement.    
- * 
+ * in the statement.
+ *
  * Context nodes are not handled here. They are taken care of in AdditionalURIsForContextNodex.
  */
 public class AdditionalURIsForObjectProperties implements IndexingUriFinder, ContextModelsUser {
     protected static final Log log = LogFactory.getLog(AdditionalURIsForObjectProperties.class);
-    
+
     protected RDFService rdfService;
-    
+
     @Override
 	public void setContextModels(ContextModelAccess models) {
     	this.rdfService = models.getRDFService();
@@ -45,10 +45,10 @@ public class AdditionalURIsForObjectProperties implements IndexingUriFinder, Con
     public List<String> findAdditionalURIsToIndex(Statement stmt) {
         if(  stmt == null )
             return Collections.emptyList();
-        
+
         if( stmt.getObject().isLiteral() )
             return doDataPropertyStmt( stmt );
-        else 
+        else
             return doObjectPropertyStmt( stmt );
     }
 
@@ -57,12 +57,12 @@ public class AdditionalURIsForObjectProperties implements IndexingUriFinder, Con
 
     @Override
     public void endIndexing() { /* nothing to do */ }
-    
+
     protected List<String> doObjectPropertyStmt(Statement stmt) {
-        // Only need to consider the object since the subject 
-        // will already be updated in search index as part of 
+        // Only need to consider the object since the subject
+        // will already be updated in search index as part of
         // SearchReindexingListener.
-        
+
         // Also, context nodes are not handled here. They are
         // taken care of in AdditionalURIsForContextNodex.
         if( stmt.getObject().isURIResource() )
@@ -72,7 +72,7 @@ public class AdditionalURIsForObjectProperties implements IndexingUriFinder, Con
     }
 
     protected List<String> doDataPropertyStmt(Statement stmt) {
-        
+
         if( RDFS.label.equals( stmt.getPredicate()  )){
             // If the property is rdfs:labe then we need to update
             // all the individuals related by object properties. This
@@ -80,7 +80,7 @@ public class AdditionalURIsForObjectProperties implements IndexingUriFinder, Con
             // is handled in AdditionalURIsForContextNodex.
             if( stmt.getSubject().isURIResource() ){
                 return allIndividualsRelatedByObjectPropertyStmts( stmt.getSubject().getURI() );
-            }else{ 
+            }else{
                 log.debug("ignored bnode");
                 return Collections.emptyList();
             }
@@ -89,21 +89,21 @@ public class AdditionalURIsForObjectProperties implements IndexingUriFinder, Con
             // is handled in AdditionalURIsForContextNodex.
             return Collections.emptyList();
         }
-        
+
     }
 
     protected List<String> allIndividualsRelatedByObjectPropertyStmts( String uri ) {
         List<String> additionalUris = new ArrayList<String>();
-        
+
         QuerySolutionMap initialBinding = new QuerySolutionMap();
-        Resource uriResource = ResourceFactory.createResource(uri);        
+        Resource uriResource = ResourceFactory.createResource(uri);
         initialBinding.add("uri", uriResource);
-        
+
 		ResultSet results = QueryUtils.getQueryResults(QUERY_FOR_RELATED,
 				initialBinding, rdfService);
 
-        while(results.hasNext()){                    
-            QuerySolution soln = results.nextSolution();                                   
+        while(results.hasNext()){
+            QuerySolution soln = results.nextSolution();
             Iterator<String> iter =  soln.varNames() ;
             while( iter.hasNext()){
                 String name = iter.next();
@@ -112,29 +112,29 @@ public class AdditionalURIsForObjectProperties implements IndexingUriFinder, Con
                     if( node.isURIResource() ){
                         additionalUris.add( node.as( Resource.class ).getURI()  );
                     }else{
-                        log.warn( "value from query for var " + name + "  was not a URIResource, it was " + node);    
+                        log.warn( "value from query for var " + name + "  was not a URIResource, it was " + node);
                     }
                 }else{
                     log.warn("value for query for var " + name + " was null");
-                }                        
+                }
             }
         }
 
         return additionalUris;
     }
 
-    protected static final String prefixs = 
+    protected static final String prefixs =
         "prefix owl:  <http://www.w3.org/2002/07/owl#> \n" +
         "prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>  \n" +
         "prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n";
 
-    protected final String QUERY_FOR_RELATED = 
-        prefixs + 
-        "SELECT ?related WHERE { \n" +        
+    protected final String QUERY_FOR_RELATED =
+        prefixs +
+        "SELECT ?related WHERE { \n" +
         "  ?uri ?p ?related  \n " +
-        "  filter( isURI( ?related ) && ?p != rdf:type )  \n" +                
+        "  filter( isURI( ?related ) && ?p != rdf:type )  \n" +
         "}" ;
-    
+
 	@Override
 	public String toString() {
 		return this.getClass().getSimpleName();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForTypeStatements.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForTypeStatements.java
index 8629a8f67..6f09814ad 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForTypeStatements.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForTypeStatements.java
@@ -11,12 +11,12 @@ import org.apache.jena.vocabulary.RDF;
 import edu.cornell.mannlib.vitro.webapp.searchindex.indexing.IndexingUriFinder;
 
 /**
- * Adds URIs to index for type statement changes on individuals. 
+ * Adds URIs to index for type statement changes on individuals.
  */
 public class AdditionalURIsForTypeStatements implements IndexingUriFinder {
 
     @Override
-    public List<String> findAdditionalURIsToIndex(Statement stmt) {        
+    public List<String> findAdditionalURIsToIndex(Statement stmt) {
         if( stmt != null && RDF.type.getURI().equals( stmt.getPredicate().getURI() )){
             return Collections.singletonList( stmt.getSubject().getURI() );
         }else{
@@ -34,5 +34,5 @@ public class AdditionalURIsForTypeStatements implements IndexingUriFinder {
 	public String toString() {
 		return this.getClass().getSimpleName();
 	}
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinder.java
index ccd801a7c..b6f241539 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinder.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinder.java
@@ -9,13 +9,13 @@ import org.apache.jena.rdf.model.Statement;
 /**
  * Interface to use with IndexBuilder to find more URIs to index given a changed
  * statement. The statement may have been added or removed from the model.
- * 
+ *
  * Implementing classes must be threadsafe, as multiple threads are used to
  * complete the task.
- * 
+ *
  * The life-cycle is as follows: startIndexing(), 0 or more calls to
  * findAdditionalURIsToIndex(), endIndexing().
- * 
+ *
  * Repeat as desired.
  */
 public interface IndexingUriFinder {
@@ -26,7 +26,7 @@ public interface IndexingUriFinder {
 	 * in the list will be updated by the IndexBuilder, which will handle URIs
 	 * of new individuals, URIs of individuals that have changes, and URIs of
 	 * individuals that have been removed from the model.
-	 * 
+	 *
 	 * @return List of URIs. Never return null.
 	 */
 	List<String> findAdditionalURIsToIndex(Statement stmt);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderList.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderList.java
index c8752b9d2..bb4479235 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderList.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderList.java
@@ -8,15 +8,15 @@ import org.apache.jena.rdf.model.Statement;
 
 /**
  * An ordered list of IndexingUriFinder objects, in a handy package.
- * 
+ *
  * Implementations should make a protective copy of the list of
  * IndexingUriFinders. Implementations must be thread-safe.
- * 
+ *
  * The life-cycle is:
- * 
+ *
  * <pre>
- * startIndexing(), 
- * 0 or more findAdditionalUris() by multiple threads, 
+ * startIndexing(),
+ * 0 or more findAdditionalUris() by multiple threads,
  * stopIndexing().
  * </pre>
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderListDeveloper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderListDeveloper.java
index cef45ecff..490a18af0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderListDeveloper.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/IndexingUriFinderListDeveloper.java
@@ -19,7 +19,7 @@ import org.apache.jena.rdf.model.Statement;
 /**
  * An implementation that accumulates timing figures for each finder and writes
  * them to the log.
- * 
+ *
  * Note that this must be thread-safe.
  */
 public class IndexingUriFinderListDeveloper implements IndexingUriFinderList {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/SelectQueryUriFinder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/SelectQueryUriFinder.java
index 03071b87b..22cd094d8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/SelectQueryUriFinder.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/SelectQueryUriFinder.java
@@ -27,21 +27,21 @@ import edu.cornell.mannlib.vitro.webapp.utils.sparqlrunner.QueryHolder;
 
 /**
  * Find URIs based on one or more select queries.
- * 
+ *
  * If the statement qualifies, execute the queries and return the accumulated
  * results.
- * 
+ *
  * A statement qualifies if the predicate matches any of the restrictions, or if
  * there are no restrictions.
- * 
+ *
  * If a query contains a ?subject, ?predicate, or ?object variable, it will be
  * bound to the URI of the subject, predicate, or object of the statement,
  * respectively. If the subject or object has no URI and the query expects one,
  * then the query will be ignored. (Predicates always have URIs.)
- * 
+ *
  * All of the result fields of all result rows of all of the queries will be
  * returned.
- * 
+ *
  * A label may be supplied to the instance, for use in logging. If no label is
  * supplied, one will be generated.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/URIsForClassGroupChange.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/URIsForClassGroupChange.java
index c76c4125d..6c4aa0bc6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/URIsForClassGroupChange.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/URIsForClassGroupChange.java
@@ -15,10 +15,10 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ContextModelAccess;
 import edu.cornell.mannlib.vitro.webapp.utils.configuration.ContextModelsUser;
 
 /**
- * if a class's classgroup changes, reindex all individuals in that class.  
+ * if a class's classgroup changes, reindex all individuals in that class.
  */
 public class URIsForClassGroupChange  implements IndexingUriFinder, ContextModelsUser {
-    
+
     IndividualDao indDao;
 
     @Override
@@ -28,20 +28,20 @@ public class URIsForClassGroupChange  implements IndexingUriFinder, ContextModel
 
 	@Override
     public List<String> findAdditionalURIsToIndex(Statement stmt) {
-        if( stmt == null || stmt.getPredicate() == null) 
+        if( stmt == null || stmt.getPredicate() == null)
             return Collections.emptyList();
-        
+
         //if it is a change in classgroup of a class
         if( VitroVocabulary.IN_CLASSGROUP.equals( stmt.getPredicate().getURI() ) &&
-            stmt.getSubject() != null && 
+            stmt.getSubject() != null &&
             stmt.getSubject().isURIResource() ){
-            
+
             //get individuals in class
-            List<Individual>indsInClass = 
+            List<Individual>indsInClass =
                 indDao.getIndividualsByVClassURI(stmt.getSubject().getURI());
             if( indsInClass == null )
                 return Collections.emptyList();
-            
+
             //convert individuals to list of uris
             List<String> uris = new ArrayList<String>();
             for( Individual ind : indsInClass){
@@ -56,13 +56,13 @@ public class URIsForClassGroupChange  implements IndexingUriFinder, ContextModel
     @Override
     public void startIndexing() {
         // Do nothing
-        
+
     }
 
     @Override
     public void endIndexing() {
         // Do nothing
-        
+
     }
 
 	@Override
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/RebuildIndexTask.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/RebuildIndexTask.java
index 375cbadcf..756f65420 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/RebuildIndexTask.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/RebuildIndexTask.java
@@ -32,7 +32,7 @@ import edu.cornell.mannlib.vitro.webapp.searchindex.exclusions.SearchIndexExclud
 /**
  * Get the URIs of all individuals in the model. Update each of their search
  * documents.
- * 
+ *
  * Delete all search documents that have not been updated since this rebuild
  * began. That removes all obsolete documents from the index.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateStatementsTask.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateStatementsTask.java
index adc5bfb7a..81dca2dc1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateStatementsTask.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateStatementsTask.java
@@ -34,18 +34,18 @@ import edu.cornell.mannlib.vitro.webapp.searchindex.indexing.IndexingUriFinderLi
 /**
  * Receive a collection of statements that have been added to the model, or
  * delete from it.
- * 
+ *
  * Find the URIs of search documents that may have been affected by these
  * changes, and update those documents.
- * 
+ *
  * -------------------
- * 
+ *
  * It would be nice to stream this whole thing, finding the URIs affected by
  * each statement and updating those documents before proceding. However, it is
  * very common for several statements within a group to affect the same
  * document, so that method would result in rebuilding the document several
  * times.
- * 
+ *
  * Instead, we final all of the URIs affected by all statements, store them in a
  * Set to remove duplicates, and then process the URIs in the set.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateUrisTask.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateUrisTask.java
index 8e9a7c363..c7ab443e7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateUrisTask.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/tasks/UpdateUrisTask.java
@@ -37,14 +37,14 @@ import edu.cornell.mannlib.vitro.webapp.searchindex.exclusions.SearchIndexExclud
 /**
  * Given a list of URIs, remove the ones that don't belong in the index and
  * update the ones that do belong.
- * 
+ *
  * A URI doesn't belong in the index if there is no individual with that URI, or
  * if the individual has no VClasses assigned to it, or if the individual is
  * excluded by one of the excluders.
- * 
+ *
  * Deletions are done synchronously, but updates are scheduled to run on the
  * thread pool.
- * 
+ *
  * Commit requests are issued to the SearchEngine at each progress event and
  * again at the end of the task.
  */
@@ -311,4 +311,4 @@ public class UpdateUrisTask implements Task {
             return "Internal: ExcludeIfNoVClasses";
         }
    }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/freemarker/FreemarkerProcessingService.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/freemarker/FreemarkerProcessingService.java
index 5b9c5fe4a..daddf1307 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/freemarker/FreemarkerProcessingService.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/freemarker/FreemarkerProcessingService.java
@@ -9,17 +9,17 @@ import javax.servlet.http.HttpServletRequest;
 /**
  * Provide the ability to process a Freemarker template outside of the context
  * of a FreemarkerHttpServlet.
- * 
+ *
  * The most likely place to use this is when rendering a short view that was
  * invoked through an AJAX call.
  */
 public interface FreemarkerProcessingService {
 	/**
 	 * Is there an accessible template by this name?
-	 * 
+	 *
 	 * The question is asked in the context of the current request, which
 	 * determines the theme directory.
-	 * 
+	 *
 	 * @throws TemplateProcessingException
 	 *             If the template is found, but cannot be parsed.
 	 */
@@ -28,7 +28,7 @@ public interface FreemarkerProcessingService {
 
 	/**
 	 * Process a Freemarker template with a data map, producing string of HTML.
-	 * 
+	 *
 	 * This is done in the context of the current HttpServletRequest, which
 	 * provides a wide range of ancillary information, including (but not
 	 * limited to) theme directory, context path, info on logged-in user,
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java
index 3f3ab97aa..383177cd7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java
@@ -45,10 +45,10 @@ import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter;
  * scan the model to determine what each view consists of (data getter URIs,
  * template names), what context each view applies to, and what classes map to
  * each view.
- * 
+ *
  * Data getters must be SparqlQueryDataGetters, and must be described in the
  * same config file.
- * 
+ *
  * TODO Get rid of this when the Application Ontology is implemented.
  */
 public class FakeApplicationOntologyService {
@@ -71,7 +71,7 @@ public class FakeApplicationOntologyService {
 	/**
 	 * Load the model from the config file, and inspect it for Views and
 	 * mappings.
-	 * 
+	 *
 	 * Keep the model - we'll need it when its time to create the DataGetters
 	 * (on each request).
 	 */
@@ -440,7 +440,7 @@ public class FakeApplicationOntologyService {
 	/**
 	 * A special data getter to support the kluge case of browsing an individual
 	 * that belongs to the People class group.
-	 * 
+	 *
 	 * A SPARQL query data getter that initializes itself from its own private
 	 * "display model". The query finds a preferred title for the individual.
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/ShortViewService.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/ShortViewService.java
index c22c402c1..ae24ced59 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/ShortViewService.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/ShortViewService.java
@@ -19,10 +19,10 @@ public interface ShortViewService {
 	 * Render the short view template that applies to this individual in this
 	 * context. The data in the modelMap can be used to populate the template,
 	 * along with any additional data returned by custom data getters.
-	 * 
+	 *
 	 * If there are any problems, return a dummy piece of text that includes the
 	 * label of the individual. Never return null or empty string.
-	 * 
+	 *
 	 * This method should not be called from within an ongoing Freemarker
 	 * process. In that case, use getShortViewInfo() instead.
 	 */
@@ -32,7 +32,7 @@ public interface ShortViewService {
 	/**
 	 * What template should be used to render the short view of this individual
 	 * in this context? What data is available from custom data getters?
-	 * 
+	 *
 	 * Ask the Application Ontology for short view specifications on each of the
 	 * most specific classes for this individual. If more than one such class
 	 * has an applicable short view, the class with with the first URI
@@ -47,7 +47,7 @@ public interface ShortViewService {
 	public interface TemplateAndSupplementalData {
 		/**
 		 * The name of the template to be used in the short view.
-		 * 
+		 *
 		 * Either the custom view assigned to the individual and context, or the
 		 * default view. Never empty or null, but it might refer to a template
 		 * that can't be located.
@@ -57,7 +57,7 @@ public interface ShortViewService {
 		/**
 		 * The results of any custom data getters were associated with this
 		 * individual in this short view context.
-		 * 
+		 *
 		 * May be empty, but never null.
 		 */
 		Map<String, Object> getSupplementalData();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java
index ad773a129..84e2d6809 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java
@@ -32,31 +32,31 @@ import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 
 /**
  * Sets up the content models, OntModelSelectors and webapp DAO factories.
- * 
+ *
  * Why the firstTimeStartup flag? Because you can't ask a large SDB model
  * whether it is empty. SDB translates  this into a call to size(), which
  * in turn becomes find(null, null, null) and a count, and this gives an
  * OutOfMemoryError because it tries to read the entire model into memory.
  */
-public class ContentModelSetup extends JenaDataSourceSetupBase 
+public class ContentModelSetup extends JenaDataSourceSetupBase
         implements javax.servlet.ServletContextListener {
-    
+
     private static final Log log = LogFactory.getLog(ContentModelSetup.class);
-    
+
     @Override
     public void contextInitialized(ServletContextEvent sce) {
         ServletContext ctx = sce.getServletContext();
         StartupStatus ss = StartupStatus.getBean(ctx);
-        
+
         long begin = System.currentTimeMillis();
         setUpJenaDataSource(ctx);
-        ss.info(this, secondsSince(begin) + " seconds to set up models and DAO factories");  
-    } 
+        ss.info(this, secondsSince(begin) + " seconds to set up models and DAO factories");
+    }
 
     private void setUpJenaDataSource(ServletContext ctx) {
         ContextModelAccess models = ModelAccess.on(ctx);
         boolean firstTimeStartup = false;
-    	
+
     	Model applicationMetadataModel = models.getOntModel(APPLICATION_METADATA);
 		if (applicationMetadataModel.isEmpty()) {
 			firstTimeStartup = true;
@@ -70,7 +70,7 @@ public class ContentModelSetup extends JenaDataSourceSetupBase
         	RDFFilesLoader.loadFirstTimeFiles("abox", baseABoxModel, true);
         }
         RDFFilesLoader.loadEveryTimeFiles("abox", baseABoxModel);
-        
+
         OntModel baseTBoxModel = models.getOntModel(TBOX_ASSERTIONS);
         if (firstTimeStartup) {
         	RDFFilesLoader.loadFirstTimeFiles("tbox", baseTBoxModel, true);
@@ -87,7 +87,7 @@ public class ContentModelSetup extends JenaDataSourceSetupBase
 	/**
 	 * We need to read the RDF files and change the Portal from a blank node to
 	 * one with a URI in the default namespace.
-	 * 
+	 *
 	 * Do this before adding the data to the RDFService-backed model, to avoid
 	 * warnings about editing a blank node.
 	 */
@@ -119,13 +119,13 @@ public class ContentModelSetup extends JenaDataSourceSetupBase
 		} finally {
 			portalResIt.close();
 		}
-		
+
 		if (portalResource != null) {
 			ResourceUtils.renameResource(portalResource, getDefaultNamespace(ctx) + "portal1");
 		}
 	}
 
-	
+
     /**
      * If we find a "portal1" portal (and we should), its URI should use the
      * default namespace.
@@ -137,24 +137,24 @@ public class ContentModelSetup extends JenaDataSourceSetupBase
 
         if(!portals.isEmpty() && noPortalForNamespace(
                 portals, expectedNamespace)) {
-            // There really should be only one portal 1, but if there happen to 
+            // There really should be only one portal 1, but if there happen to
             // be multiple, just arbitrarily pick the first in the list.
-            Resource portal = portals.get(0); 
+            Resource portal = portals.get(0);
             String oldNamespace = portal.getNameSpace();
             renamePortal(portal, expectedNamespace, model);
             StartupStatus ss = StartupStatus.getBean(ctx);
-            ss.warning(this, "\nThe default namespace has been changed \n" +  
-                             "from " + oldNamespace + 
+            ss.warning(this, "\nThe default namespace has been changed \n" +
+                             "from " + oldNamespace +
                              "\nto " + expectedNamespace + ".\n" +
                              "The application will function normally, but " +
-                             "any individuals in the \n" + oldNamespace + " " + 
+                             "any individuals in the \n" + oldNamespace + " " +
                              "namespace will need to have their URIs \n" +
                              "changed in order to be served as linked data. " +
                              "You can use the Ingest Tools \nto change the " +
                              "URIs for a batch of resources.");
         }
     }
-    
+
     private List<Resource> getPortal1s(Model model) {
         List<Resource> portals = new ArrayList<Resource>();
         try {
@@ -172,7 +172,7 @@ public class ContentModelSetup extends JenaDataSourceSetupBase
         }
         return portals;
     }
-    
+
     private boolean noPortalForNamespace(List<Resource> portals, String expectedNamespace) {
         for (Resource portal : portals) {
             if(expectedNamespace.equals(portal.getNameSpace())) {
@@ -190,13 +190,13 @@ public class ContentModelSetup extends JenaDataSourceSetupBase
             model.leaveCriticalSection();
         }
     }
-    
+
     /* ===================================================================== */
-    
+
     @Override
     public void contextDestroyed(ServletContextEvent sce) {
         // Nothing to do.
-    }    
- 
+    }
+
  }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java
index bbe7606de..e49f0e3df 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java
@@ -51,14 +51,14 @@ public class FileGraphSetup implements ServletContextListener {
     private static final String FILEGRAPH = "filegraph";
 
     public static final String FILEGRAPH_URI_ROOT = "http://vitro.mannlib.cornell.edu/filegraph/";
-    
+
     /** Ignore hidden files when looking for filegraph RDF. */
 	private static final DirectoryStream.Filter<Path> REJECT_HIDDEN_FILES = new DirectoryStream.Filter<Path>() {
 		@Override
 		public boolean accept(Path entry) throws IOException {
 			return !Files.isHidden(entry);
 		}
-	};    
+	};
 
     @Override
 	public void contextInitialized(ServletContextEvent sce) {
@@ -67,10 +67,10 @@ public class FileGraphSetup implements ServletContextListener {
         boolean tboxChanged = false; // indicates whether any TBox file graph model has changed
 
         ServletContext ctx = sce.getServletContext();
-        
+
         try {
             OntDocumentManager.getInstance().setProcessImports(true);
-            Dataset dataset = ModelAccess.on(ctx).getDataset(); 
+            Dataset dataset = ModelAccess.on(ctx).getDataset();
 			RDFService rdfService = ModelAccess.on(ctx).getRDFService(CONTENT);
 
             // ABox files
@@ -79,7 +79,7 @@ public class FileGraphSetup implements ServletContextListener {
             cleanupDB(dataset, pathsToURIs(paths, ABOX), ABOX);
 
             // Just update the ABox filegraphs in the DB; don't attach them to a base model.
-            aboxChanged = readGraphs(paths, rdfService, ABOX, /* aboxBaseModel */ null);		
+            aboxChanged = readGraphs(paths, rdfService, ABOX, /* aboxBaseModel */ null);
 
             // TBox files
             paths = getFilegraphPaths(ctx, RDF, TBOX, FILEGRAPH);
@@ -133,10 +133,10 @@ public class FileGraphSetup implements ServletContextListener {
 	}
 
 	/*
-     * Reads the graphs stored as files in sub-directories of 
+     * Reads the graphs stored as files in sub-directories of
      *   1. updates the SDB store to reflect the current contents of the graph.
-     *   2. adds the graph as an in-memory submodel of the base in-memory graph 
-     *      
+     *   2. adds the graph as an in-memory submodel of the base in-memory graph
+     *
      * Note: no connection needs to be maintained between the in-memory copy of the
      * graph and the DB copy.
      */
@@ -154,7 +154,7 @@ public class FileGraphSetup implements ServletContextListener {
             try {
                 FileInputStream fis = new FileInputStream( p.toFile() );
                 try {
-                    OntModel model = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+                    OntModel model = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
                     String fn = p.getFileName().toString().toLowerCase();
                     if ( fn.endsWith(".nt") ) {
                         model.read( fis, null, "N-TRIPLE" );
@@ -173,7 +173,7 @@ public class FileGraphSetup implements ServletContextListener {
                     if ( !model.isEmpty() && baseModel != null ) {
                         baseModel.addSubModel(model);
                         log.debug("Attached file graph as " + type + " submodel " + p.getFileName());
-                    } 
+                    }
 
                     modelChanged = modelChanged | updateGraphInDB(rdfService, model, type, p);
 
@@ -185,15 +185,15 @@ public class FileGraphSetup implements ServletContextListener {
                     fis.close();
                 }
             } catch (FileNotFoundException fnfe) {
-                log.warn(p + " not found. Unable to process file graph" + 
-                        ((fnfe.getLocalizedMessage() != null) ? 
+                log.warn(p + " not found. Unable to process file graph" +
+                        ((fnfe.getLocalizedMessage() != null) ?
                                 fnfe.getLocalizedMessage() : "") );
             } catch (IOException ioe) {
                 // this is for the fis.close() above.
                 log.warn("Exception while trying to close file graph file: " + p,ioe);
             }
         } // end - for
-        
+
 		log.info("Read " + count + " " + type + " file graph" + ((count == 1) ? "" : "s"));
 
         return modelChanged;
@@ -205,13 +205,13 @@ public class FileGraphSetup implements ServletContextListener {
      * Otherwise, if a graph with the given name is in the DB and is not isomorphic with
      * the graph that was read from the file system then replace the graph
      * in the DB with the one read from the file system.
-     * 
+     *
      * Otherwise, if a graph with the given name is in the DB and is isomorphic with
-     * the graph that was read from the files system, then do nothing. 
+     * the graph that was read from the files system, then do nothing.
      */
     public boolean updateGraphInDB(RDFService rdfService, Model fileModel, String type, Path path) throws RDFServiceException {
         String graphURI = pathToURI(path,type);
-        
+
         if (rdfService.isEquivalentGraph(graphURI, fileModel)) {
             return false;
         }
@@ -232,19 +232,19 @@ public class FileGraphSetup implements ServletContextListener {
 
     /*
      * Deletes any file graphs that are  no longer present in the file system
-     * from the DB. 
-     * 
+     * from the DB.
+     *
      * @param uriSet (input)   - a set of graph URIs representing the file
      *                           graphs (of the given type) in the file
      *                           system.
      * @param type (input)     - abox or tbox.
-     * @param kbStore (output) - the SDB store for the application                        
+     * @param kbStore (output) - the SDB store for the application
      */
     public void cleanupDB(Dataset dataset, Set<String> uriSet, String type) {
 
-        Pattern graphURIPat = Pattern.compile("^" + FILEGRAPH_URI_ROOT + type);   
+        Pattern graphURIPat = Pattern.compile("^" + FILEGRAPH_URI_ROOT + type);
 
-        Iterator<String> iter = dataset.listNames();	
+        Iterator<String> iter = dataset.listNames();
 
         while (iter.hasNext()) {
             String graphURI = iter.next();
@@ -256,7 +256,7 @@ public class FileGraphSetup implements ServletContextListener {
                     model.removeAll(); // delete the graph from the DB
                     log.info("Removed " + type + " file graph " + graphURI + " from the DB store because the file no longer exists in the file system");
                 }
-            }            
+            }
         }
 
     }
@@ -273,15 +273,15 @@ public class FileGraphSetup implements ServletContextListener {
 		log.debug("uriSet = " + uriSet);
 		return uriSet;
 	}
-    
+
     /*
      * Takes a path for a file graph and returns the corresponding SDB URI
      * for the graph. The correspondence is by defined convention.
      */
     private String pathToURI(Path path, String type) {
-    		return FILEGRAPH_URI_ROOT + type + "/" + path.getFileName(); 
+    		return FILEGRAPH_URI_ROOT + type + "/" + path.getFileName();
     }
-    
+
     @Override
 	public void contextDestroyed( ServletContextEvent sce ) {
         // nothing to do
@@ -289,6 +289,6 @@ public class FileGraphSetup implements ServletContextListener {
 
     private static boolean isUpdateRequired(ServletContext ctx) {
         return (ctx.getAttribute(UpdateKnowledgeBase.KBM_REQURIED_AT_STARTUP) != null);
-    }    
-    
+    }
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java
index e1d9dbc12..df7c26c76 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java
@@ -13,20 +13,20 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.JenaBaseDaoCon;
 public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
 	private static final Log log = LogFactory.getLog(
 			JenaDataSourceSetupBase.class);
-	
+
     private static final String VITRO_DEFAULT_NAMESPACE = "Vitro.defaultNamespace";
 
-    
+
     private static boolean firstStartup = false;
 
    public static boolean isFirstStartup() {
        return firstStartup;
    }
-   
+
    public static void thisIsFirstStartup(){
        firstStartup = true;
    }
-   
+
     protected String getDefaultNamespace(ServletContext ctx) {
         String dns = ConfigurationProperties.getBean(ctx).getProperty(
                 VITRO_DEFAULT_NAMESPACE);
@@ -37,5 +37,5 @@ public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
                     + "contain a value for '" + VITRO_DEFAULT_NAMESPACE + "'");
         }
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/JvmSmokeTests.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/JvmSmokeTests.java
index a03134a2a..dd7b625e9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/JvmSmokeTests.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/JvmSmokeTests.java
@@ -12,7 +12,7 @@ import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 
 /**
  * Test that the JVM is properly configured.
- * 
+ *
  * For now, we just test the temp directory. Other
  */
 public class JvmSmokeTests implements ServletContextListener {
@@ -45,7 +45,7 @@ public class JvmSmokeTests implements ServletContextListener {
 	/**
 	 * Check the Java temp directory. Make sure that it exists, it is a
 	 * directory, we can read it, we can write to it.
-	 * 
+	 *
 	 * Create a temp file, and delete it.
 	 */
 	private void checkTempDirectory(StartupStatus ss) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/PropertyMaskingSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/PropertyMaskingSetup.java
index 5a4a1ef14..aae0f6acb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/PropertyMaskingSetup.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/PropertyMaskingSetup.java
@@ -24,11 +24,11 @@ public class PropertyMaskingSetup implements ServletContextListener {
 		OntModel jenaOntModel = ModelAccess.on(sce.getServletContext()).getOntModel();
         sce.getServletContext().setAttribute(ENTITY_PROPERTY_LIST_FILTER_ATTR_NAME, new EntityPropertyListFilter(jenaOntModel));
 	}
-	
+
 	public static UnaryFunctor<List<Property>,List<Property>> getEntityPropertyListFilter(ServletContext ctx) {
 		return (UnaryFunctor<List<Property>,List<Property>>) ctx.getAttribute(ENTITY_PROPERTY_LIST_FILTER_ATTR_NAME);
 	}
-	
+
 	public void contextDestroyed(ServletContextEvent sce) {
 		// nothing to worry about
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoader.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoader.java
index 9023f095c..35fdaf54d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoader.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoader.java
@@ -58,10 +58,10 @@ public class RDFFilesLoader {
 
 	/**
 	 * Load the "first time" files if we say it is the first time.
-	 * 
+	 *
 	 * The location is based on the home directory and the model path: "abox",
 	 * "display", etc.
-	 * 
+	 *
 	 * The files from the directory are added to the model.
 	 */
 	public static void loadFirstTimeFiles(String modelPath, Model model,
@@ -81,10 +81,10 @@ public class RDFFilesLoader {
 
 	/**
 	 * Load the "every time" files.
-	 * 
+	 *
 	 * The location is based on the home directory and the model path: "abox",
 	 * "display", etc.
-	 * 
+	 *
 	 * The files from the directory become a sub-model of the model.
 	 */
 	public static void loadEveryTimeFiles(String modelPath, OntModel model) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RunSparqlConstructs.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RunSparqlConstructs.java
index 30dda8842..69175a480 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RunSparqlConstructs.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RunSparqlConstructs.java
@@ -37,29 +37,29 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 public class RunSparqlConstructs implements ServletContextListener {
 
 	private static final Log log = LogFactory.getLog(RunSparqlConstructs.class.getName());
-	
+
 	private static final String DEFAULT_DEFAULT_NAMESPACE = "http://vivo.library.cornell.edu/ns/0.1#individual";
 	private static final String LOCAL_NAME_PREPEND = "individual";
-	
+
 	private static final String SPARQL_DIR = "/WEB-INF/sparqlConstructs";
 	private static Random random = new Random(System.currentTimeMillis());
-	
+
 	public void contextInitialized(ServletContextEvent sce) {
 		try {
 			ServletContext ctx = sce.getServletContext();
 			WebappDaoFactory wadf = ModelAccess.on(ctx).getWebappDaoFactory();
 
-			String namespace = (wadf != null && wadf.getDefaultNamespace() != null) 
+			String namespace = (wadf != null && wadf.getDefaultNamespace() != null)
 				? wadf.getDefaultNamespace() : DEFAULT_DEFAULT_NAMESPACE;
-			
+
 		    OntModel baseOntModel = ModelAccess.on(ctx).getOntModel(FULL_ASSERTIONS);
 			Model anonModel = ModelFactory.createDefaultModel();
 			Model namedModel = ModelFactory.createDefaultModel();
-			
+
 			Set<String> resourcePaths = ctx.getResourcePaths(SPARQL_DIR);
 			for (String path : resourcePaths) {
 				log.debug("Attempting to execute SPARQL at " + path);
-				File file = new File(ctx.getRealPath(path));			
+				File file = new File(ctx.getRealPath(path));
 				try {
 					BufferedReader reader = new BufferedReader(new FileReader(file));
 					StringBuilder fileContents = new StringBuilder();
@@ -84,11 +84,11 @@ public class RunSparqlConstructs implements ServletContextListener {
 					}
 				} catch (FileNotFoundException fnfe) {
 					log.info(path + " not found. Skipping.");
-				}	
+				}
 			}
-			
+
 			namedModel.add(anonModel);
-			
+
 			for ( Iterator<Resource> i = anonModel.listSubjects(); i.hasNext(); ) {
 				Resource s = i.next();
 				if (s.isAnon()) {
@@ -100,7 +100,7 @@ public class RunSparqlConstructs implements ServletContextListener {
 					ResourceUtils.renameResource(t, namespace + LOCAL_NAME_PREPEND + randomInt);
 				}
 			}
-			
+
 			baseOntModel.addSubModel(namedModel);
 			String msg = "Attaching " + namedModel.size() + " statements as a result of SPARQL CONSTRUCTS";
 			log.info(msg);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java
index 1ac5dcdab..43e768773 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java
@@ -37,9 +37,9 @@ import edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread;
 public class SimpleReasonerSetup implements ServletContextListener {
 
     private static final Log log = LogFactory.getLog(SimpleReasonerSetup.class.getName());
-    
+
     public static final String FILE_OF_PLUGINS = "/WEB-INF/resources/reasoner_plugins.txt";
-    
+
     // Models used during a full recompute of the ABox
     public static final String JENA_INF_MODEL_REBUILD = "http://vitro.mannlib.cornell.edu/default/vitro-kb-inf-rebuild";
     public static final String JENA_INF_MODEL_SCRATCHPAD = "http://vitro.mannlib.cornell.edu/default/vitro-kb-inf-scratchpad";
@@ -48,17 +48,17 @@ public class SimpleReasonerSetup implements ServletContextListener {
     public void contextInitialized(ServletContextEvent sce) {
     	ServletContext ctx = sce.getServletContext();
     	SearchIndexer searchIndexer = ApplicationUtils.instance().getSearchIndexer();
-        
-        try {    
+
+        try {
         	OntModel tboxAssertionsModel = ModelAccess.on(ctx).getOntModel(ModelNames.TBOX_ASSERTIONS);
         	OntModel tboxInferencesModel = ModelAccess.on(ctx).getOntModel(ModelNames.TBOX_INFERENCES);
         	OntModel tboxUnionModel = ModelAccess.on(ctx).getOntModel(ModelNames.TBOX_UNION);
 
             // set up simple reasoning for the ABox
-                                
-            RDFService rdfService = ModelAccess.on(ctx).getRDFService();            
+
+            RDFService rdfService = ModelAccess.on(ctx).getRDFService();
             Dataset dataset = ModelAccess.on(ctx).getDataset();
-            
+
             Model rebuildModel = dataset.getNamedModel(JENA_INF_MODEL_REBUILD);
             if(rebuildModel.contains(null, null, (RDFNode) null)) {
                 log.info("Clearing obsolete data from inference rebuild model");
@@ -75,7 +75,7 @@ public class SimpleReasonerSetup implements ServletContextListener {
             SimpleReasoner simpleReasoner = new SimpleReasoner(
                     tboxUnionModel, rdfService, inferenceModel, rebuildModel, scratchModel, searchIndexer);
             sce.getServletContext().setAttribute(SimpleReasoner.class.getName(),simpleReasoner);
-            
+
             StartupStatus ss = StartupStatus.getBean(ctx);
             List<ReasonerPlugin> pluginList = new ArrayList<ReasonerPlugin>();
             List<String> pluginClassnameList = this.readFileOfListeners(ctx);
@@ -88,17 +88,17 @@ public class SimpleReasonerSetup implements ServletContextListener {
                         pluginList.add(plugin);
                         log.info("adding reasoner plugin " + plugin.getClass().getName());
                     }
-                } catch(Throwable t) {              
+                } catch(Throwable t) {
                     ss.info(this, "Could not instantiate reasoner plugin " + classname);
                 }
             }
             simpleReasoner.setPluginList(pluginList);
-            
+
             SimpleReasonerTBoxListener simpleReasonerTBoxListener = new SimpleReasonerTBoxListener(simpleReasoner);
             sce.getServletContext().setAttribute(SimpleReasonerTBoxListener.class.getName(),simpleReasonerTBoxListener);
             tboxAssertionsModel.register(simpleReasonerTBoxListener);
             tboxInferencesModel.register(simpleReasonerTBoxListener);
-            
+
             RecomputeMode mode = getRecomputeRequired(ctx);
             if (RecomputeMode.FOREGROUND.equals(mode)) {
                 log.info("ABox inference recompute required.");
@@ -108,76 +108,76 @@ public class SimpleReasonerSetup implements ServletContextListener {
                 new VitroBackgroundThread(
                         new ABoxRecomputer(
                                 simpleReasoner),"ABoxRecomputer").start();
-            }    
-            
+            }
+
         } catch (Throwable t) {
             t.printStackTrace();
-        }        
+        }
     }
-    
+
     @Override
     public void contextDestroyed(ServletContextEvent sce) {
         log.info("received contextDestroyed notification");
-   
-        SimpleReasoner simpleReasoner = getSimpleReasonerFromServletContext(sce.getServletContext());   
+
+        SimpleReasoner simpleReasoner = getSimpleReasonerFromServletContext(sce.getServletContext());
         if (simpleReasoner != null) {
             log.info("sending stop request to SimpleReasoner");
             simpleReasoner.setStopRequested();
-        } 
-    
-        SimpleReasonerTBoxListener simpleReasonerTBoxListener = getSimpleReasonerTBoxListenerFromContext(sce.getServletContext());   
+        }
+
+        SimpleReasonerTBoxListener simpleReasonerTBoxListener = getSimpleReasonerTBoxListenerFromContext(sce.getServletContext());
         if (simpleReasonerTBoxListener != null) {
             log.info("sending stop request to simpleReasonerTBoxListener");
             simpleReasonerTBoxListener.setStopRequested();
-        } 
-        
+        }
+
     }
-    
+
     public static SimpleReasoner getSimpleReasonerFromServletContext(ServletContext ctx) {
         Object simpleReasoner = ctx.getAttribute(SimpleReasoner.class.getName());
-        
+
         if (simpleReasoner instanceof SimpleReasoner) {
             return (SimpleReasoner) simpleReasoner;
         } else {
             return null;
         }
     }
-    
+
     public static SimpleReasonerTBoxListener getSimpleReasonerTBoxListenerFromContext(ServletContext ctx) {
         Object simpleReasonerTBoxListener = ctx.getAttribute(SimpleReasonerTBoxListener.class.getName());
-        
+
         if (simpleReasonerTBoxListener instanceof SimpleReasonerTBoxListener) {
             return (SimpleReasonerTBoxListener) simpleReasonerTBoxListener;
         } else {
             return null;
         }
     }
-    
+
     public enum RecomputeMode {
         FOREGROUND, BACKGROUND
     }
-    
-    private static final String RECOMPUTE_REQUIRED_ATTR = 
+
+    private static final String RECOMPUTE_REQUIRED_ATTR =
             SimpleReasonerSetup.class.getName() + ".recomputeRequired";
-    
+
     public static void setRecomputeRequired(ServletContext ctx, RecomputeMode mode) {
         ctx.setAttribute(RECOMPUTE_REQUIRED_ATTR, mode);
     }
-    
+
     public static RecomputeMode getRecomputeRequired(ServletContext ctx) {
         return (RecomputeMode) ctx.getAttribute(RECOMPUTE_REQUIRED_ATTR);
     }
-  
+
     /**
      * Read the names of the plugin classes classes.
-     * 
+     *
      * If there is a problem, set a fatal error, and return an empty list.
      */
     private List<String> readFileOfListeners(ServletContext ctx) {
         List<String> list = new ArrayList<String>();
 
         StartupStatus ss = StartupStatus.getBean(ctx);
-        
+
         InputStream is = null;
         BufferedReader br = null;
         try {
@@ -213,11 +213,11 @@ public class SimpleReasonerSetup implements ServletContextListener {
                 }
             }
         }
-        
+
         log.debug("Classnames of reasoner plugins = " + list);
         return list;
     }
-    
+
     private class ABoxRecomputer implements Runnable {
 
         private SimpleReasoner simpleReasoner;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/SolrSmokeTest.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/SolrSmokeTest.java
index 131a79821..812214f0c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/SolrSmokeTest.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/SolrSmokeTest.java
@@ -28,11 +28,11 @@ import org.apache.http.util.EntityUtils;
 
 /**
  * Spin off a thread that will try to connect to Solr.
- * 
+ *
  * We need to do this in a separate thread because if Solr is in the same Tomcat
  * instance as Vitro, it may not be initialized until after Vitro is
  * initialized. Which is to say, after this Listener has run.
- * 
+ *
  * If we can't connect to Solr, add a Warning item to the StartupStatus.
  */
 public class SolrSmokeTest implements ServletContextListener {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java
index 0656407c3..00fdcf1b0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java
@@ -60,15 +60,15 @@ import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 public class UpdateKnowledgeBase {
     public static final String KBM_REQURIED_AT_STARTUP = "KNOWLEDGE_BASE_MIGRATION_REQUIRED_AT_STARTUP";
 	private final static Log log = LogFactory.getLog(UpdateKnowledgeBase.class);
-	
+
 	private final String dataDir;
 	private final ServletContextListener parent;
-	
+
 	public UpdateKnowledgeBase(String dataDir, ServletContextListener parent) {
 		this.dataDir = dataDir;
 		this.parent = parent;
 	}
-	
+
 	private String diffFile() { return dataDir + "diff.tab.txt"; }
 	private String askQueryFile() { return dataDir + "askUpdated.sparql"; }
 	private String successAssertionsFile() { return dataDir + "success.n3"; }
@@ -88,7 +88,7 @@ public class UpdateKnowledgeBase {
 		StartupStatus ss = StartupStatus.getBean(ctx);
 
         boolean migrationChangesMade = false;
-		
+
 		try {
 			UpdateSettings settings = new UpdateSettings();
 			putReportingPathsIntoSettings(ctx, settings);
@@ -99,13 +99,13 @@ public class UpdateKnowledgeBase {
 			} catch (Exception e) {
 				// Should mean that the reasoner is not even started yet.
 			}
-			
+
 			WebappDaoFactory wadf = ModelAccess.on(ctx).getWebappDaoFactory();
 			settings.setDefaultNamespace(wadf.getDefaultNamespace());
 			settings.setAssertionOntModelSelector(ModelAccess.on(ctx).getOntModelSelector(ASSERTIONS_ONLY));
 			settings.setInferenceOntModelSelector(ModelAccess.on(ctx).getOntModelSelector(INFERENCES_ONLY));
 			settings.setUnionOntModelSelector(ModelAccess.on(ctx).getOntModelSelector());
-			
+
 		    Path homeDir = ApplicationUtils.instance().getHomeDirectory().getPath();
 			settings.setDisplayModel(ModelAccess.on(ctx).getOntModel(DISPLAY));
 			OntModel oldTBoxModel = loadModelFromDirectory(ctx.getRealPath(oldTBoxModelDir()));
@@ -120,7 +120,7 @@ public class UpdateKnowledgeBase {
 
 			boolean tryMigrateDisplay = true;
 			try {
-			    //Display model tbox and display metadata 
+			    //Display model tbox and display metadata
 			    //old display model tbox model
 			    OntModel oldDisplayModelTboxModel = loadModelFromFile(ctx.getRealPath(oldDisplayModelTBoxPath()));
 			    settings.setOldDisplayModelTboxModel(oldDisplayModelTboxModel);
@@ -164,35 +164,35 @@ public class UpdateKnowledgeBase {
     			            log.warn("unable to successfully update display model: " + e.getMessage());
     			        }
     			    }
-    			    // reload the display model since the TBoxUpdater may have 
+    			    // reload the display model since the TBoxUpdater may have
     			    // modified it
-    			    new ConfigurationModelsSetup().contextInitialized(sce);				  
+    			    new ConfigurationModelsSetup().contextInitialized(sce);
     			} catch (Exception ioe) {
     			    ss.fatal(parent, "Exception updating knowledge base for ontology changes: ", ioe);
-    			}	
+    			}
 			}
-			
+
 			removeBadRestrictions(settings.getAssertionOntModelSelector().getTBoxModel());
-			
+
             log.info("Simple reasoner connected for the ABox");
-            if(JenaDataSourceSetupBase.isFirstStartup() 
+            if(JenaDataSourceSetupBase.isFirstStartup()
                     || (migrationChangesMade && requiredUpdate)) {
                 SimpleReasonerSetup.setRecomputeRequired(
-                        ctx, SimpleReasonerSetup.RecomputeMode.FOREGROUND);    
+                        ctx, SimpleReasonerSetup.RecomputeMode.FOREGROUND);
             } else if (migrationChangesMade) {
                 SimpleReasonerSetup.setRecomputeRequired(
-                        ctx, SimpleReasonerSetup.RecomputeMode.BACKGROUND);  
+                        ctx, SimpleReasonerSetup.RecomputeMode.BACKGROUND);
             }
-	
+
 		} catch (Throwable t){
 		    ss.fatal(parent, "Exception updating knowledge base for ontology changes: ", t);
 		}
-		
-	}	
+
+	}
+
 
 
 
-	
 	/**
 	 * Set the paths for the files that specify how to perform the update
 	 */
@@ -204,14 +204,14 @@ public class UpdateKnowledgeBase {
         settings.setSuccessAssertionsFile(ctx.getRealPath(successAssertionsFile()));
         settings.setSuccessRDFFormat("N3");
 	}
-	
+
 	/**
-	 * Create the directories where we will report on the update. 
+	 * Create the directories where we will report on the update.
 	 * Put the paths for the directories and files into the settings object.
 	 */
 	private void putReportingPathsIntoSettings(ServletContext ctx, UpdateSettings settings) throws IOException {
 	    Path homeDir = ApplicationUtils.instance().getHomeDirectory().getPath();
-		
+
 		Path dataDir = createDirectory(homeDir, "upgrade", "knowledgeBase");
 		settings.setDataDir(dataDir.toString());
 		StartupStatus.getBean(ctx).info(parent, "Updating knowledge base: reports are in '" + dataDir + "'");
@@ -219,11 +219,11 @@ public class UpdateKnowledgeBase {
 		Path changedDir = createDirectory(dataDir, "changedData");
 		settings.setAddedDataFile(changedDir.resolve(timestampedFileName("addedData", "n3")).toString());
 		settings.setRemovedDataFile(changedDir.resolve(timestampedFileName("removedData", "n3")).toString());
-		
+
 		Path logDir = createDirectory(dataDir, "logs");
 		settings.setLogFile(logDir.resolve(timestampedFileName("knowledgeBaseUpdate", "log")).toString());
 		settings.setErrorLogFile(logDir.resolve(timestampedFileName("knowledgeBaseUpdate.error", "log")).toString());
-		
+
 		Path qualifiedPropertyConfigFile = getFilePath(homeDir, "rdf", "display", "firsttime", "PropertyConfig.n3");
 		settings.setQualifiedPropertyConfigFile(qualifiedPropertyConfigFile.toString());
 	}
@@ -233,9 +233,9 @@ public class UpdateKnowledgeBase {
         for (String child : children) {
             path = path.resolve(child);
         }
-        return path;	    
+        return path;
 	}
-	
+
 	private Path createDirectory(Path parent, String... children) throws IOException {
 		Path dir = parent;
 		for (String child : children) {
@@ -245,7 +245,7 @@ public class UpdateKnowledgeBase {
 		return dir;
 	}
 
-	
+
 	//Multiple changes from 1.4 to 1.5 will occur
 	//update migration model
 	public void migrateDisplayModel(UpdateSettings settings) throws Exception {
@@ -255,7 +255,7 @@ public class UpdateKnowledgeBase {
 		Model removeStatements = ModelFactory.createDefaultModel();
 		//remove old tbox and display metadata statements and add statements from new versions
 		replaceTboxAndDisplayMetadata(displayModel, addStatements, removeStatements,settings);
-		//Update statements for data getter class types that have changed in 1.5 
+		//Update statements for data getter class types that have changed in 1.5
 		updateDataGetterClassNames(displayModel, addStatements, removeStatements);
 		//add cannot delete flags to pages that shouldn't allow deletion on page list
 		addCannotDeleteFlagDisplayModel(displayModel, addStatements, removeStatements);
@@ -265,7 +265,7 @@ public class UpdateKnowledgeBase {
 		addPageListDisplayModel(displayModel, addStatements, removeStatements,settings);
 		//update data getter labels
 		updateDataGetterLabels(displayModel, addStatements, removeStatements,settings);
-		
+
 		displayModel.enterCriticalSection(Lock.WRITE);
 		try {
 			if(log.isDebugEnabled()) {
@@ -286,14 +286,14 @@ public class UpdateKnowledgeBase {
 			displayModel.leaveCriticalSection();
 		}
 	}
-	
-	//replace 
+
+	//replace
 	private void replaceTboxAndDisplayMetadata(OntModel displayModel, Model addStatements, Model removeStatements, UpdateSettings settings) {
-		
+
 		OntModel oldDisplayModelTboxModel = settings.getOldDisplayModelTboxModel();
 		OntModel oldDisplayModelDisplayMetadataModel = settings.getOldDisplayModelDisplayMetadataModel();
 		OntModel newDisplayModelTboxModel = settings.getNewDisplayModelTboxModel();
-		OntModel newDisplayModelDisplayMetadataModel = settings.getNewDisplayModelDisplayMetadataModel();	
+		OntModel newDisplayModelDisplayMetadataModel = settings.getNewDisplayModelDisplayMetadataModel();
 		OntModel loadedAtStartup = settings.getLoadedAtStartupDisplayModel();
 		OntModel oldVivoListView = settings.getVivoListViewConfigDisplayModel();
 		//Remove old display model tbox and display metadata statements from display model
@@ -307,12 +307,12 @@ public class UpdateKnowledgeBase {
 			log.debug("Adding old display tbox model, display metadata model, and oldVivoListView to remove statements.  Remove statements now include:");
 			removeStatements.write(sw, "N3");
 			log.debug(sw.toString());
-			sw.close(); 
+			sw.close();
 		}
 		catch(Exception ex) {
 			log.error("Exception occurred", ex);
 		}
-		//Add statements from new tbox and display metadata 
+		//Add statements from new tbox and display metadata
 		addStatements.add(newDisplayModelTboxModel);
 		addStatements.add(newDisplayModelDisplayMetadataModel);
 		//this should include the list view in addition to other files
@@ -322,13 +322,13 @@ public class UpdateKnowledgeBase {
 			log.debug("Adding new display tbox model, display metadata model, and loaded at startup to add statements.  Add statements now include:");
 			addStatements.write(sw, "N3");
 			log.debug(sw.toString());
-			sw.close(); 	
+			sw.close();
 		} catch(Exception ex) {
 			log.error("Exception occurred in adding new display model tbox/metadata info to add statements ", ex);
 		}
 		log.debug("Adding new display tbox model, display metadata model, and all models loaded at startup");
 	}
-	
+
 	//update statements for data getter classes
 	private void updateDataGetterClassNames(OntModel displayModel, Model addStatements, Model removeStatements) {
 		Resource classGroupOldType = ResourceFactory.createResource("java:edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.ClassGroupPageData");
@@ -339,7 +339,7 @@ public class UpdateKnowledgeBase {
 		Resource browseNewType = ResourceFactory.createResource("java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.BrowseDataGetter");
 		Resource individualsForClassesNewType = ResourceFactory.createResource("java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.IndividualsForClassesDataGetter");
 		Resource internalClassesNewType = ResourceFactory.createResource("java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter");
-		
+
 		//Find statements where type is ClassGroupData
 		updateAddRemoveDataGetterStatements(displayModel, removeStatements, addStatements, classGroupOldType, classGroupNewType);
 		//Find statements where type is BrowseDataGetter
@@ -349,8 +349,8 @@ public class UpdateKnowledgeBase {
 		//Find statements where type is internal class
 		updateAddRemoveDataGetterStatements(displayModel, removeStatements, addStatements, internalClassesOldType, internalClassesNewType);
 	}
-	
-	private void updateAddRemoveDataGetterStatements(OntModel displayModel, 
+
+	private void updateAddRemoveDataGetterStatements(OntModel displayModel,
 			Model removeStatements, Model addStatements,
 			Resource oldType, Resource newType) {
 		log.debug("Old type: " + oldType.getURI() + " - newType: " + newType.getURI());
@@ -376,15 +376,15 @@ public class UpdateKnowledgeBase {
 			log.error("Error occurred in writing out remove and statements for data getter types", ex);
 		}
 	}
-	
+
 	//add cannotDeleteFlag to display model
 	private void addCannotDeleteFlagDisplayModel(OntModel displayModel, Model addStatements, Model removeStatements) {
 		Resource homePage = displayModel.getResource(DisplayVocabulary.HOME_PAGE_URI);
-		addStatements.add(homePage, 
+		addStatements.add(homePage,
 				ResourceFactory.createProperty(DisplayVocabulary.DISPLAY_NS + "cannotDeletePage"),
 				ResourceFactory.createPlainLiteral("true"));
 	}
-		
+
 	//remove requires template
 	private void updatePeoplePageDisplayModel(OntModel displayModel, Model addStatements, Model removeStatements) {
 		Resource peoplePage = displayModel.getResource(DisplayVocabulary.DISPLAY_NS + "People");
@@ -394,7 +394,7 @@ public class UpdateKnowledgeBase {
 		}
 		log.debug("Will remove body template from people page so added that to remove statements ");
 	}
-	
+
 	//add page list sparql query
 	private void addPageListDisplayModel(OntModel displayModel, Model addStatements, Model removeStatements, UpdateSettings settings) {
 		OntModel newDisplayModel = settings.getNewDisplayModelFromFile();
@@ -423,19 +423,19 @@ public class UpdateKnowledgeBase {
 		}catch(Exception ex) {
 			log.error("Exception occurred in writing out new display model", ex);
 		}
-		
+
 		log.debug("Checking: AFTER adding pageList resource, what do we have for pageList page");
 		Resource testResource = ResourceFactory.createResource(DisplayVocabulary.DISPLAY_NS + "pageListPage");
 		StmtIterator testIt = addStatements.listStatements(testResource, null, (RDFNode) null);
 		if(!testIt.hasNext()) {
 			log.debug("Add statements does not have the page list page resource " + testResource.getURI());
 		}
-		
+
 		while(testIt.hasNext()) {
 			log.debug("Statement for page list resource: " + testIt.nextStatement().toString());
 		}
 	}
-	
+
 	//update any new labels
 	private void updateDataGetterLabels(OntModel displayModel, Model addStatements, Model removeStatements, UpdateSettings settings) {
 		log.debug("Checking: BEFORE adding any statements, what do we have for pageList page");
@@ -444,23 +444,23 @@ public class UpdateKnowledgeBase {
 		if(!testIt.hasNext()) {
 			log.debug("Add statements does not have the page list page resource " + testResource.getURI());
 		}
-		
+
 		while(testIt.hasNext()) {
 			log.debug("Statement for page list resource: " + testIt.nextStatement().toString());
 		}
-		
+
 		log.debug("Triple checking -- before this method, the add statements model contains");
 		StringWriter sw = new StringWriter();
 		try {
 			addStatements.write(sw, "N3");
 			log.debug(sw.toString());
 			sw.close();
-		}catch(Exception ex) 
+		}catch(Exception ex)
 		{
 			log.error("Error occurred in adding resource labels ", ex);
 		}
-		
-		
+
+
 		OntModel newDisplayModel = settings.getNewDisplayModelFromFile();
 		List<Resource> resourcesForLabels = new ArrayList<Resource>();
 		resourcesForLabels.add(ResourceFactory.createResource("java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData"));
@@ -478,11 +478,11 @@ public class UpdateKnowledgeBase {
 				addStatements.write(sw, "N3");
 				log.debug(sw.toString());
 				sw.close();
-			}catch(Exception ex) 
+			}catch(Exception ex)
 			{
 				log.error("Error occurred in adding resource labels ", ex);
 			}
-			
+
 		}
 		//Add statements now includes
 		log.debug("AFTER all resources added, Add statements now includes ");
@@ -491,14 +491,14 @@ public class UpdateKnowledgeBase {
 			addStatements.write(sw, "N3");
 			log.debug(sw.toString());
 			sw.close();
-		}catch(Exception ex) 
+		}catch(Exception ex)
 		{
 			log.error("Error occurred in adding resource labels ", ex);
 		}
-		
+
 	}
-	
-  					
+
+
 	private OntModel loadModelFromDirectory(String directoryPath) {
 		log.debug("Loading model from directory " + directoryPath);
 		OntModel om = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
@@ -513,7 +513,7 @@ public class UpdateKnowledgeBase {
 		}
 		return om;
 	}
-	
+
 	//load file from file path
 	private OntModel loadModelFromFile(String filePath) {
 		log.debug("Load model from file " + filePath);
@@ -526,12 +526,12 @@ public class UpdateKnowledgeBase {
 		readFile(file, om, filePath);
 		return om;
 	}
-	
-	
+
+
 	private void readFile(File f, OntModel om, String path) {
 		try {
 			FileInputStream fis = new FileInputStream(f);
-			try {	
+			try {
 				if (f.getName().endsWith(".md")) {
 					// Markdown files are documentation - skip.
 				} else if (f.getName().endsWith(".n3")) {
@@ -540,14 +540,14 @@ public class UpdateKnowledgeBase {
 					om.read(fis, null, "RDF/XML");
 				}
 			} catch (Exception e) {
-				log.error("Unable to load RDF from " + f.getName(), e); 
+				log.error("Unable to load RDF from " + f.getName(), e);
 			}
 		} catch (FileNotFoundException fnfe) {
 			log.error(f.getName() + " not found. Unable to load" +
 					" RDF from this location: " + path);
-		}	
+		}
 	}
-	
+
 	/**
 	 *  Remove restrictions with missing owl:onProperty or obsolete core class
 	 *  This should be worked into the main migration later.
@@ -558,7 +558,7 @@ public class UpdateKnowledgeBase {
 	            "    ?rest ?p ?o . \n" +
 	            "    ?oo ?pp ?rest \n" +
 	            "} WHERE { \n" +
-	            "    ?rest a owl:Restriction . \n" + 
+	            "    ?rest a owl:Restriction . \n" +
 	            "    FILTER NOT EXISTS { ?rest owl:onProperty ?x } \n" +
 	            "    ?rest ?p ?o . \n" +
 	            "    ?oo ?pp ?rest \n" +
@@ -582,7 +582,7 @@ public class UpdateKnowledgeBase {
                 Model bad = qe.execConstruct();
                 tboxModel.remove(bad);
                 if (bad.size() > 0) {
-                    log.info("Deleted " + bad.size() + 
+                    log.info("Deleted " + bad.size() +
                             " triples of syntactically invalid restrictions");
                 }
             } finally {
@@ -592,18 +592,18 @@ public class UpdateKnowledgeBase {
             }
 	    }
 	}
-	
+
 	private static String timestampedFileName(String prefix, String suffix) {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH-mm-sss");
 		return prefix + "." + sdf.format(new Date()) + "." + suffix;
 	}
-	
+
 	private class ModelDirectoryNotFoundException extends RuntimeException {
 		public ModelDirectoryNotFoundException(String msg) {
 			super(msg);
 		}
 	}
-	
+
 	private class ModelFileNotFoundException extends RuntimeException {
 		public ModelFileNotFoundException(String msg) {
 			super(msg);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllClasses.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllClasses.java
index 453acca97..035c1eb52 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllClasses.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllClasses.java
@@ -22,7 +22,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 
 /**
  * This servlet gets all the classes for initizing the sparql query builder.
- * 
+ *
  * @author yuysun
  */
 
@@ -33,9 +33,9 @@ public class GetAllClasses extends BaseEditController {
 
 	/**
 	 * The doGet method of the servlet. <br>
-	 * 
+	 *
 	 * This method is called when a form has its tag value method equals to get.
-	 * 
+	 *
 	 * @param request
 	 *            the request send by the client to the server
 	 * @param response
@@ -51,7 +51,7 @@ public class GetAllClasses extends BaseEditController {
 				SimplePermission.USE_MISCELLANEOUS_PAGES.ACTION)) {
         	return;
 		}
-		
+
 		VitroRequest vreq = new VitroRequest(request);
 
 		// EditProcessObject epo = super.createEpo(request);
@@ -90,10 +90,10 @@ public class GetAllClasses extends BaseEditController {
 
 	/**
 	 * The doPost method of the servlet. <br>
-	 * 
+	 *
 	 * This method is called when a form has its tag value method equals to
 	 * post.
-	 * 
+	 *
 	 * @param request
 	 *            the request send by the client to the server
 	 * @param response
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllPrefix.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllPrefix.java
index f0be9da34..5ba1c7391 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllPrefix.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetAllPrefix.java
@@ -33,7 +33,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 
 /**
  * This servlet gets all the prefix for initizing the sparql query builder.
- * 
+ *
  * @author yuysun
  */
 
@@ -44,9 +44,9 @@ public class GetAllPrefix extends BaseEditController {
 
 	/**
 	 * The doGet method of the servlet. <br>
-	 * 
+	 *
 	 * This method is called when a form has its tag value method equals to get.
-	 * 
+	 *
 	 * @param request
 	 *            the request send by the client to the server
 	 * @param response
@@ -63,9 +63,9 @@ public class GetAllPrefix extends BaseEditController {
         	return;
 		}
 
-		VitroRequest vreq = new VitroRequest(request);	
-		Map<String, String> prefixMap = getPrefixMap(vreq.getUnfilteredWebappDaoFactory());		
-		
+		VitroRequest vreq = new VitroRequest(request);
+		Map<String, String> prefixMap = getPrefixMap(vreq.getUnfilteredWebappDaoFactory());
+
 		response.setContentType("text/xml");
 		response.setCharacterEncoding("UTF-8");
 		PrintWriter out = response.getWriter();
@@ -82,24 +82,24 @@ public class GetAllPrefix extends BaseEditController {
 		out.flush();
 		out.close();
 	}
-	
+
 	/**
-	 * Returns a map of prefixes for use in building queries.  Will manufacture a 
+	 * Returns a map of prefixes for use in building queries.  Will manufacture a
 	 * prefix for any namespace that doesn't have an associated owl:Ontology resource
-	 * with a prefix annotation  
+	 * with a prefix annotation
 	 * @param wadf DAO Factory
 	 * @return map of prefix strings to namespace URIs
 	 */
 	private Map<String, String> getPrefixMap(WebappDaoFactory wadf) {
 	    Map<String, String> prefixMap = new HashMap<String, String>();
-	    
+
 	    OntologyDao oDao = wadf.getOntologyDao();
 	    for(Ontology o : oDao.getAllOntologies()) {
 	        if (o.getPrefix() != null) {
 	            prefixMap.put(o.getPrefix(), o.getURI());
 	        }
 	    }
-	    
+
 	    // add standard namespaces
 	    addPrefixIfNecessary("owl", OWL.getURI(), prefixMap);
 	    addPrefixIfNecessary("rdf", RDF.getURI(), prefixMap);
@@ -109,7 +109,7 @@ public class GetAllPrefix extends BaseEditController {
 	    addPrefixIfNecessary("xsd", XSD.getURI(), prefixMap);
 	    addPrefixIfNecessary("vitro", VitroVocabulary.vitroURI, prefixMap);
 
-	    // we also need to manufacture prefixes for namespaces used by any class or 
+	    // we also need to manufacture prefixes for namespaces used by any class or
 	    // property, regardless of whether there's an associated owl:Ontology.
 	    int newPrefixCount = 0;
 	    List<BaseResourceBean> ontEntityList = new ArrayList<BaseResourceBean>();
@@ -117,24 +117,24 @@ public class GetAllPrefix extends BaseEditController {
 	    ontEntityList.addAll(wadf.getObjectPropertyDao().getAllObjectProperties());
 	    ontEntityList.addAll(wadf.getDataPropertyDao().getAllDataProperties());
 	    for (BaseResourceBean ontEntity : ontEntityList) {
-	        if (!ontEntity.isAnonymous() 
+	        if (!ontEntity.isAnonymous()
 	                && !prefixMap.containsValue(ontEntity.getNamespace())) {
 	            newPrefixCount++;
 	            prefixMap.put("p."  + Integer.toString(
 	                    newPrefixCount), ontEntity.getNamespace());
 	        }
 	    }
-	    
+
 	    return prefixMap;
 	}
-	
-	private void addPrefixIfNecessary(String prefix, String namespace, 
+
+	private void addPrefixIfNecessary(String prefix, String namespace,
 	        Map<String, String> prefixMap) {
 	    if (!prefixMap.containsValue(namespace)) {
 	        prefixMap.put(prefix, namespace);
 	    }
 	}
-	
+
 	/**
 	 * Makes the markup for a prefix option
 	 * @param prefix Prefix
@@ -146,14 +146,14 @@ public class GetAllPrefix extends BaseEditController {
                 + "<value>" + URI + "</value>"
                 + "</option>";
 	}
-	
+
 
 	/**
 	 * The doPost method of the servlet. <br>
-	 * 
+	 *
 	 * This method is called when a form has its tag value method equals to
 	 * post.
-	 * 
+	 *
 	 * @param request
 	 *            the request send by the client to the server
 	 * @param response
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzAllProperties.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzAllProperties.java
index e1a9591fe..1b26eade9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzAllProperties.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzAllProperties.java
@@ -165,10 +165,10 @@ public class GetClazzAllProperties extends BaseEditController {
 
 	/**
 	 * The doPost method of the servlet. <br>
-	 * 
+	 *
 	 * This method is called when a form has its tag value method equals to
 	 * post.
-	 * 
+	 *
 	 * @param request
 	 *            the request send by the client to the server
 	 * @param response
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzDataProperties.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzDataProperties.java
index 00922ffd9..a7a47cf02 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzDataProperties.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzDataProperties.java
@@ -80,10 +80,10 @@ public class GetClazzDataProperties extends BaseEditController {
 
 	/**
 	 * The doPost method of the servlet. <br>
-	 * 
+	 *
 	 * This method is called when a form has its tag value method equals to
 	 * post.
-	 * 
+	 *
 	 * @param request
 	 *            the request send by the client to the server
 	 * @param response
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzObjectProperties.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzObjectProperties.java
index 75011f9ae..8f5375c33 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzObjectProperties.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzObjectProperties.java
@@ -106,10 +106,10 @@ public class GetClazzObjectProperties extends BaseEditController {
 
 	/**
 	 * The doPost method of the servlet. <br>
-	 * 
+	 *
 	 * This method is called when a form has its tag value method equals to
 	 * post.
-	 * 
+	 *
 	 * @param request
 	 *            the request send by the client to the server
 	 * @param response
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetObjectClasses.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetObjectClasses.java
index 42a11b037..92d66575d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetObjectClasses.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetObjectClasses.java
@@ -34,9 +34,9 @@ public class GetObjectClasses extends BaseEditController {
 
 	/**
 	 * The doGet method of the servlet. <br>
-	 * 
+	 *
 	 * This method is called when a form has its tag value method equals to get.
-	 * 
+	 *
 	 * @param request
 	 *            the request send by the client to the server
 	 * @param response
@@ -97,7 +97,7 @@ public class GetObjectClasses extends BaseEditController {
 		 * response.setCharacterEncoding("UTF-8"); PrintWriter out =
 		 * response.getWriter(); String respo =
 		 * "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"; respo += "<options>";
-		 * 
+		 *
 		 * if (clazz != null) { respo += "<option>" + "<key>" +
 		 * clazz.getPickListName() + "</key>" + "<value>" + clazz.getURI() +
 		 * "</value>" + "</option>"; } else{ List classGroups =
@@ -112,7 +112,7 @@ public class GetObjectClasses extends BaseEditController {
 		 * System.out.println(clazz.getPickListName()); respo += "<option>" +
 		 * "<key>" + clazz.getPickListName() + "</key>" + "<value>" +
 		 * clazz.getURI() + "</value>" + "</option>"; } }
-		 * 
+		 *
 		 * }
 		 */
 		respo.append("</options>");
@@ -123,10 +123,10 @@ public class GetObjectClasses extends BaseEditController {
 
 	/**
 	 * The doPost method of the servlet. <br>
-	 * 
+	 *
 	 * This method is called when a form has its tag value method equals to
 	 * post.
-	 * 
+	 *
 	 * @param request
 	 *            the request send by the client to the server
 	 * @param response
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/startup/StartupManager.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/startup/StartupManager.java
index 494bc49dc..aa82b674b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/startup/StartupManager.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/startup/StartupManager.java
@@ -20,10 +20,10 @@ import org.apache.commons.logging.LogFactory;
 /**
  * Instantiate and run the ServletContextListeners for Vitro, while accumulating
  * messages in StartupStatus.
- * 
+ *
  * The startup listeners are stored in a file with one full-qualified class name
  * per line. Blank lines and comment lines (starting with '#') are ignored.
- * 
+ *
  * No exception in the listeners should prevent the successful completion.
  * However, an uncaught exception or a fatal error status will cause the
  * StartupStatusDisplayFilter to disply the problem instead of showing the home
@@ -46,7 +46,7 @@ public class StartupManager implements ServletContextListener {
 	/**
 	 * Build a list of the listeners, and run contextInitialized() on each of
 	 * them, at least until we get a fatal error.
-	 * 
+	 *
 	 * Each step of this should handle its own exceptions, but we'll wrap the
 	 * whole thing in a try/catch just in case.
 	 */
@@ -77,7 +77,7 @@ public class StartupManager implements ServletContextListener {
 
 	/**
 	 * Read the file and instantiate build a list of listener instances.
-	 * 
+	 *
 	 * If there is a problem, it will occur and be handled in a sub-method.
 	 */
 	private void findAndInstantiateListeners() {
@@ -95,7 +95,7 @@ public class StartupManager implements ServletContextListener {
 
 	/**
 	 * Read the names of the listener classes.
-	 * 
+	 *
 	 * If there is a problem, set a fatal error, and return an empty list.
 	 */
 	private List<String> readFileOfListeners() {
@@ -144,7 +144,7 @@ public class StartupManager implements ServletContextListener {
 
 	/**
 	 * Instantiate a context listener from this class name.
-	 * 
+	 *
 	 * If there is a problem, set a fatal error, and return null.
 	 */
 	private ServletContextListener instantiateListener(String className) {
@@ -165,7 +165,7 @@ public class StartupManager implements ServletContextListener {
 
 	/**
 	 * Call contextInitialized() on the listener.
-	 * 
+	 *
 	 * If there is an unexpected exception, set a fatal error.
 	 */
 	private void initialize(ServletContextListener listener,
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/startup/StartupStatus.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/startup/StartupStatus.java
index 896890df7..131a6a3af 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/startup/StartupStatus.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/startup/StartupStatus.java
@@ -16,7 +16,7 @@ import org.apache.commons.logging.LogFactory;
 /**
  * Accumulates a list of messages from the StartupManager, and from the context
  * listeners that the run during startup.
- * 
+ *
  * This is thread-safe, with immutable items in the list and synchronized access
  * to the list.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ConfiguredReasonerListener.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ConfiguredReasonerListener.java
index 3dde721f9..0485f3bf6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ConfiguredReasonerListener.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ConfiguredReasonerListener.java
@@ -26,15 +26,15 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent;
 /**
  * Listens for changes on a model. When a change is announced, it is checked for
  * worthiness. If worthy, it is added to a change set.
- * 
+ *
  * When an ending EditEvent is received, the current change set is passed along
  * to the reasoner driver, and a new change set is begun.
- * 
+ *
  * Among the criteria for deciding on worthiness is the driving pattern set. In
  * the constructor, a map is made from this set, to reduce the number of tests
  * made against each statement. I don't know whether this optimization is
  * justified.
- * 
+ *
  * It is possible to "suspend" the listener, so it will ignore any changes. This
  * is useful when the reasoner itself makes changes to the models, so those
  * changes do not trigger additional reasoning.
@@ -183,7 +183,7 @@ public class ConfiguredReasonerListener implements ModelChangedListener {
 				if (log.isDebugEnabled()) {
 					log.debug("Change set: " + changes);
 				}
-				
+
 				this.reasonerDriver.runSynchronizer(changes);
 			}
 		}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/InferenceModelUpdater.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/InferenceModelUpdater.java
index dda665733..307f0a461 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/InferenceModelUpdater.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/InferenceModelUpdater.java
@@ -57,7 +57,7 @@ public class InferenceModelUpdater {
 	/**
 	 * Synchronize the inferences model with the reasoner model, with this
 	 * proviso:
-	 * 
+	 *
 	 * If a statement exists anywhere in the full TBox, don't bother adding it
 	 * to the inferences model.
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/PatternListBuilder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/PatternListBuilder.java
index 5e96da9c6..970791a7e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/PatternListBuilder.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/PatternListBuilder.java
@@ -17,9 +17,9 @@ import edu.cornell.mannlib.vitro.webapp.tboxreasoner.TBoxReasoner;
 
 /**
  * The list of patterns for filtering the models will include:
- * 
+ *
  * All patterns specified by the ReasonerConfiguration,
- * 
+ *
  * One pattern for each deleted property, to match the use of that property as a
  * predicate.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerConfiguration.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerConfiguration.java
index da523b8dd..7285268be 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerConfiguration.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerConfiguration.java
@@ -10,45 +10,45 @@ import org.apache.jena.vocabulary.RDF;
 import org.apache.jena.vocabulary.RDFS;
 
 public class ReasonerConfiguration {
-	
+
 	public Set<ReasonerStatementPattern> inferenceDrivingPatternAllowSet;
 	public Set<ReasonerStatementPattern> inferenceDrivingPatternDenySet;
 	public Set<ReasonerStatementPattern> inferenceReceivingPatternAllowSet;
-	
+
 	private boolean queryForAllObjectProperties = false;
 	private boolean incrementalReasoningEnabled = true;
-	
+
 	// These are some hamfisted stopgap measures until I add better support for dataproperty reasoning
 	private boolean reasonOnAllDatatypePropertyStatements = false;
 	private boolean queryForAllDatatypeProperties = false;
-	
+
 	/**
 	 * The default reasoner configuration is designed to provide acceptable performance on larger knowledge bases.
 	 * It will classify and realize, and add inferred disjointWith statements.
-	 * It ignores domain and range "axioms," on the assumption that they are not truly axioms but editing constraints.  
+	 * It ignores domain and range "axioms," on the assumption that they are not truly axioms but editing constraints.
 	 */
 	public static ReasonerConfiguration DEFAULT;
-	
+
 	/**
 	 * This configuration will ask Pellet for "all" inferences (calls listStatements(null,null,null)).
 	 * Usually suitable only for smaller ontologies.
 	 */
 	public static ReasonerConfiguration COMPLETE;
-	
+
 	/**
 	 * This configuration will ask Pellet for the default inferences, plus all statements where the predicate
 	 * is a property in the user's ontology(ies).
 	 * Can lead to drastic performance improvements, depending on the ontology.
 	 */
 	public static ReasonerConfiguration PSEUDOCOMPLETE;
-	
+
 	/**
 	 * This configuration will ask Pellet for the default inferences, plus all statements where the predicate
 	 * is an object property in the user's ontology(ies).
 	 */
 	public static ReasonerConfiguration PSEUDOCOMPLETE_IGNORE_DATAPROPERTIES;
-		
-	static {	
+
+	static {
 		//ask the reasoner only to classify, realize, and infer disjointWith statements (based on a somewhat incomplete information)
 		DEFAULT = new ReasonerConfiguration();
 		HashSet<ReasonerStatementPattern> defaultInferenceDrivingPatternAllowSet = new HashSet<>();
@@ -83,56 +83,56 @@ public class ReasonerConfiguration {
         DEFAULT.setQueryForAllObjectProperties(false);
 
 		PSEUDOCOMPLETE = new ReasonerConfiguration();
-		PSEUDOCOMPLETE.setQueryForAllObjectProperties(true); 
+		PSEUDOCOMPLETE.setQueryForAllObjectProperties(true);
 		PSEUDOCOMPLETE.setReasonOnAllDatatypePropertyStatements(true);
 		PSEUDOCOMPLETE.setQueryForAllDatatypeProperties(true);
         PSEUDOCOMPLETE.setInferenceReceivingPatternAllowSet(defaultInferenceReceivingPatternAllowSet);
 
 		PSEUDOCOMPLETE_IGNORE_DATAPROPERTIES = new ReasonerConfiguration();
-		PSEUDOCOMPLETE_IGNORE_DATAPROPERTIES.setQueryForAllObjectProperties(true); 
+		PSEUDOCOMPLETE_IGNORE_DATAPROPERTIES.setQueryForAllObjectProperties(true);
 		PSEUDOCOMPLETE_IGNORE_DATAPROPERTIES.setReasonOnAllDatatypePropertyStatements(false);
 		PSEUDOCOMPLETE_IGNORE_DATAPROPERTIES.setQueryForAllDatatypeProperties(false);
         PSEUDOCOMPLETE_IGNORE_DATAPROPERTIES.setInferenceReceivingPatternAllowSet(defaultInferenceReceivingPatternAllowSet);
-        
+
 		// ask the reasoner for "all" inferred statements
 		// change from earlier version because Pellet seemed to stop including sameAs/differentFrom with listStatements()
 		COMPLETE = new ReasonerConfiguration();
-		COMPLETE.setQueryForAllObjectProperties(true); 
-		COMPLETE.setReasonOnAllDatatypePropertyStatements(true); 
-		COMPLETE.setQueryForAllDatatypeProperties(true); 
-		Set<ReasonerStatementPattern> completeInferenceReceivingPatternAllowSet = new HashSet<>(); 
+		COMPLETE.setQueryForAllObjectProperties(true);
+		COMPLETE.setReasonOnAllDatatypePropertyStatements(true);
+		COMPLETE.setQueryForAllDatatypeProperties(true);
+		Set<ReasonerStatementPattern> completeInferenceReceivingPatternAllowSet = new HashSet<>();
 		completeInferenceReceivingPatternAllowSet.addAll(defaultInferenceReceivingPatternAllowSet);
 		completeInferenceReceivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern(OWL.sameAs));
-		// getting NPEs inside Pellet with differentFrom on 2.0.0-rc7 
+		// getting NPEs inside Pellet with differentFrom on 2.0.0-rc7
         //completeInferenceReceivingPatternAllowSet.add(ReasonerStatementPattern.objectPattern( OWL.differentFrom, null));
         COMPLETE.setInferenceReceivingPatternAllowSet(completeInferenceReceivingPatternAllowSet);
-        
+
 	}
-	
+
 	public Set<ReasonerStatementPattern> getInferenceDrivingPatternAllowSet() {
 		return this.inferenceDrivingPatternAllowSet;
 	}
-	
+
 	public void setInferenceDrivingPatternAllowSet(Set<ReasonerStatementPattern> patternSet) {
 		this.inferenceDrivingPatternAllowSet = patternSet;
 	}
-	
+
 	public Set<ReasonerStatementPattern> getInferenceDrivingPatternDenySet() {
 		return this.inferenceDrivingPatternDenySet;
 	}
-	
+
 	public void setInferenceDrivingPatternDenySet(Set<ReasonerStatementPattern> patternSet) {
 		this.inferenceDrivingPatternDenySet = patternSet;
 	}
-	
+
 	public Set<ReasonerStatementPattern> getInferenceReceivingPatternAllowSet() {
 		return this.inferenceReceivingPatternAllowSet;
 	}
-	
+
 	public void setInferenceReceivingPatternAllowSet(Set<ReasonerStatementPattern> patternSet) {
 		this.inferenceReceivingPatternAllowSet = patternSet;
 	}
-	
+
 	public boolean getQueryForAllObjectProperties() {
 		return queryForAllObjectProperties;
 	}
@@ -140,19 +140,19 @@ public class ReasonerConfiguration {
 	public void setQueryForAllObjectProperties(boolean boole) {
 		this.queryForAllObjectProperties = boole;
 	}
-	
+
 	public boolean getReasonOnAllDatatypePropertyStatements() {
 		return this.reasonOnAllDatatypePropertyStatements;
 	}
-	
+
 	public void setReasonOnAllDatatypePropertyStatements(boolean boole) {
 		this.reasonOnAllDatatypePropertyStatements = boole;
 	}
-	
+
 	public boolean getQueryForAllDatatypeProperties() {
 		return this.queryForAllDatatypeProperties;
 	}
-	
+
 	public void setQueryForAllDatatypeProperties(boolean boole) {
 		this.queryForAllDatatypeProperties = boole;
 	}
@@ -160,10 +160,10 @@ public class ReasonerConfiguration {
 	public boolean isIncrementalReasoningEnabled() {
 		return this.incrementalReasoningEnabled;
 	}
-	
+
 	public void setIncrementalReasongingEnabled(boolean value) {
 		this.incrementalReasoningEnabled = value;
 	}
-	
+
 }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerStatementPattern.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerStatementPattern.java
index 2a23c18b9..dfe500ae8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerStatementPattern.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/ReasonerStatementPattern.java
@@ -12,7 +12,7 @@ import org.apache.jena.shared.Lock;
 
 /**
  * For now, this only models Object Properties.
- * 
+ *
  * It should be easy to add Data Property patterns by making this abstract and
  * creating two concrete subclasses.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxReasoner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxReasoner.java
index f70539d6a..1d543033b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxReasoner.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxReasoner.java
@@ -11,7 +11,7 @@ import org.apache.jena.rdf.model.Statement;
 
 /**
  * The functionality of a TBox reasoner.
- * 
+ *
  * The reasoner will maintain its own TBox model. It will receive updates to
  * that model and perform reasoning on it. It will answer queries about the
  * contents of the model, when reasoning is complete.
@@ -45,17 +45,17 @@ public interface TBoxReasoner {
 	 * reasoning.
 	 */
 	List<Restriction> listRestrictions();
-	
+
 	/**
 	 * List all of the statements that satisfy any of these patterns, after
 	 * updating and reasoning.
 	 */
 	List<Statement> filterResults(List<ReasonerStatementPattern> patternList);
-	
+
 	public static class Status {
 		public static final Status SUCCESS = new Status(true, false, "");
 		public static final Status ERROR = new Status(true, true, "");
-		
+
 		public static final Status inconsistent(String explanation) {
 			return new Status(false, false, explanation);
 		}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxReasonerDriver.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxReasonerDriver.java
index 6781846e3..c2d013962 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxReasonerDriver.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/TBoxReasonerDriver.java
@@ -12,6 +12,6 @@ import edu.cornell.mannlib.vitro.webapp.modules.tboxreasoner.TBoxReasonerStatus;
 public interface TBoxReasonerDriver {
 
 	void runSynchronizer(TBoxChanges changeSet);
-	
+
 	TBoxReasonerStatus getStatus();
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/BasicTBoxReasonerDriver.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/BasicTBoxReasonerDriver.java
index d3921a981..0d9dc6fc7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/BasicTBoxReasonerDriver.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/BasicTBoxReasonerDriver.java
@@ -40,32 +40,32 @@ import edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread;
 /**
  * The basic implementation of the TBoxReasonerDriver. It gets help from a
  * listener, an executor, and a reasoner.
- * 
+ *
  * Create a listener that listens for changes to the TBox, but filters them
  * according to a ReasonerConfiguration object. The listener accumulates the
  * changes it likes, until it detects an ending EditEvent. Then it passes the
  * change set back to the driver.
- * 
+ *
  * Each time a change set is received, a task is created and given to the
  * executor to run. The executor is single-threaded, so the change sets are
  * processed in sequence.
- * 
+ *
  * Processing involves the following steps:
- * 
+ *
  * 1. Telling the reasoner about the changes, so it can update its own internal
  * ontology model.
- * 
+ *
  * 2. Telling the reasoner to re-inference its model. A status is returned.
- * 
+ *
  * 3. Asking the reasoner for the inferences from its model. As with the initial
  * changes, these inferences are filtered according to the
  * ReasonerConfiguration.
- * 
+ *
  * 4. Synchronizing the applications TBox inferences model with the inferences
  * obtained from the reasoner.
- * 
+ *
  * ----------------------
- * 
+ *
  * Possible optimization: if change sets come in quickly enough that the third
  * set is received while the first is still being processed, it would be
  * reasonable to merge the second and third sets into one.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/TBoxInferencesAccumulator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/TBoxInferencesAccumulator.java
index 9474db5ea..789d1ff65 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/TBoxInferencesAccumulator.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/TBoxInferencesAccumulator.java
@@ -22,7 +22,7 @@ import org.apache.jena.rdf.model.Resource;
 /**
  * Build a model of inferred statements by walking through the ontology as
  * represented in the reasoner.
- * 
+ *
  * TODO Get rid of the kluges. Either decide that they are not necessary, or
  * give them full status.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/jfact/JFactTBoxReasoner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/jfact/JFactTBoxReasoner.java
index 3e8f80b53..617f6829b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/jfact/JFactTBoxReasoner.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/jfact/JFactTBoxReasoner.java
@@ -42,19 +42,19 @@ import static org.semanticweb.owlapi.vocab.OWLRDFVocabulary.OWL_AXIOM;
 
 /**
  * An implementation of the JFact reasoner for the TBox.
- * 
+ *
  * It maintains a model of all the assertions it has been given, adding or
  * removing statements as change sets are received.
- * 
+ *
  * Each time a change is received, it will create a fresh ontology from the
  * assertions model, and apply a reasoner to that ontology. A model of
  * inferences is built by querying the reasoner.
- * 
+ *
  * The assertions and inferences are combined into an OntModel, which is kept to
  * answer queries.
- * 
+ *
  * -----------------
- * 
+ *
  * This class it not thread-safe.
  */
 public class JFactTBoxReasoner implements
@@ -84,7 +84,7 @@ public class JFactTBoxReasoner implements
 		filteredAssertionsModel.remove(changes.getRemovedStatements());
 		clearEmptyAxiomStatements();
 	}
-	
+
 	/*Adding this method in case axiom statements are read into the model where the statements
 	are not fully qualified.
 	N3 of the following format [ rdf:type owl:Axiom ;
@@ -95,14 +95,14 @@ public class JFactTBoxReasoner implements
 	] . results in the model containing empty axiom statements = [ rdf:type owl:Axiom .]
 	which causes the OWLManager to return an error.
 	*/
-	
+
 	private void clearEmptyAxiomStatements() {
 		//Check and see if the model has any empty axiom statements and if so, remove them
 		StmtIterator axiomStatements = filteredAssertionsModel.listStatements(null, RDF.type, ResourceFactory.createResource(OWL_AXIOM.toString()));
 		List<Statement> removeStatements = new ArrayList<Statement>();
 		while(axiomStatements.hasNext()) {
 			Statement axiomStatement = axiomStatements.nextStatement();
-			
+
 			List<Statement> axiomSubjectStatements = filteredAssertionsModel.listStatements(
 					axiomStatement.getSubject(), null, (RDFNode) null).toList();
 			//if no statements associated with axiom, then add for removal
@@ -111,7 +111,7 @@ public class JFactTBoxReasoner implements
 				removeStatements.add(axiomStatement);
 			}
 		}
-		
+
 		if(removeStatements.size() > 0) {
 			log.warn("The following statements are empty axiom statements and have been removed" + removeStatements.toString());
 			//Remove the statements from the filtered model
@@ -119,9 +119,9 @@ public class JFactTBoxReasoner implements
 		} else {
 			log.debug("No empty axiom statements were found");
 		}
-		
+
 	}
-	
+
 
 	@Override
 	public Status performReasoning() {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/jfact/JFactTBoxReasonerModule.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/jfact/JFactTBoxReasonerModule.java
index 83468b80a..9461aad79 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/jfact/JFactTBoxReasonerModule.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/tboxreasoner/impl/jfact/JFactTBoxReasonerModule.java
@@ -26,7 +26,7 @@ import edu.cornell.mannlib.vitro.webapp.tboxreasoner.impl.BasicTBoxReasonerDrive
 
 /**
  * Configure a JFact reasoner on the TBox.
- * 
+ *
  * Create a JFactTBoxReasoner and pass it as the strategy to a
  * BasicTBoxReasonerDriver.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/CombinedTripleSource.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/CombinedTripleSource.java
index e6067530d..ce197cffd 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/CombinedTripleSource.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/CombinedTripleSource.java
@@ -14,9 +14,9 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 /**
  * Provides the long-term data structures, and a way to obtain the short-term
  * data structures.
- * 
+ *
  * Repeated calls for the same data structure should yield the same instance.
- * 
+ *
  * Repeated calls for the ShortTermCombinedTripleSource need not yield the
  * same instance, but must yield an instance that will return the same
  * structures as any other instance for the same request.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/ShortTermCombinedTripleSource.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/ShortTermCombinedTripleSource.java
index 64724567a..677d6e27d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/ShortTermCombinedTripleSource.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/ShortTermCombinedTripleSource.java
@@ -10,9 +10,9 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 /**
  * Provide the short-term data structures. Should be closed when no longer
  * needed.
- * 
+ *
  * Repeated calls for the same data structure should yield the same instance.
- * 
+ *
  * Repeated calls for the WebappDaoFactoryConfig need not yield the same
  * instance.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/BasicCombinedTripleSource.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/BasicCombinedTripleSource.java
index 1f69c752b..dff07d6e2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/BasicCombinedTripleSource.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/BasicCombinedTripleSource.java
@@ -38,10 +38,10 @@ import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
 
 /**
  * A simple implementation of CombinedTripleSource.
- * 
+ *
  * Note that we don't bother to cache the RDFServices, RDFServiceFactories, and
  * ModelMakers, since the sources can be expected to cache them.
- * 
+ *
  * We must cache the OntModelCache because it was created here. If we were to
  * recreate it, we would lose any sub-models that had been attached in the
  * meantime.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/BasicShortTermCombinedTripleSource.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/BasicShortTermCombinedTripleSource.java
index 67e419d1c..5d43d04b7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/BasicShortTermCombinedTripleSource.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/BasicShortTermCombinedTripleSource.java
@@ -33,7 +33,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
 
 /**
  * The simple implementation of ShortTermCombinedTripleSource.
- * 
+ *
  * The short-term RDFServices are cached, lest we somehow create duplicates for
  * the same request. Similarly with the short-term OntModels.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sdb/ContentTripleSourceSDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sdb/ContentTripleSourceSDB.java
index 430d539dc..659b73b0a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sdb/ContentTripleSourceSDB.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sdb/ContentTripleSourceSDB.java
@@ -50,7 +50,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
 
 /**
  * Create the connection to the SDB triple-store.
- * 
+ *
  * Do some smoke-tests on the parameters, create the connection pool, and create
  * the RDFServiceFactory.
  */
@@ -198,7 +198,7 @@ public class ContentTripleSourceSDB extends ContentTripleSource {
 	 * Use models from the short-term RDFService, since there is less contention
 	 * for the database connections that way. The exceptions are the
 	 * memory-mapped models. By keeping them, we also keep their sub-models.
-	 * 
+	 *
 	 * Set up the Union models again also, so they will reference the short-term
 	 * models.
 	 */
@@ -270,7 +270,7 @@ public class ContentTripleSourceSDB extends ContentTripleSource {
 	 * The MySQL driver leaves a thread running after it is deregistered.
 	 * Versions after 5.1.23 provide AbandonedConnectionCleanupThread.shutdown()
 	 * to stop this thread.
-	 * 
+	 *
 	 * Using reflection to invoke this method means that we don't have a
 	 * hard-coded dependency to MySQL.
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sdb/SDBConnectionSmokeTests.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sdb/SDBConnectionSmokeTests.java
index 8dc67787a..d3b35576d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sdb/SDBConnectionSmokeTests.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sdb/SDBConnectionSmokeTests.java
@@ -25,14 +25,14 @@ import edu.cornell.mannlib.vitro.webapp.modules.ComponentStartupStatus;
 
 /**
  * Smoke tests for the database connection that SDB will use.
- * 
+ *
  * Confirm that the URL, Username and Password have been specified for the
  * Database connection.
- * 
+ *
  * Confirm that we can load the database driver.
- * 
+ *
  * Confirm that we can connect to the database using those properties.
- * 
+ *
  * Try to confirm that the database connection is configured to use UTF-8
  * encoding. Don't know how well this works.
  */
@@ -52,10 +52,10 @@ public class SDBConnectionSmokeTests {
 					+ PROPERTY_DB_URL + "'");
 			return;
 		}
-		
+
 		// Get the full URL, with options.
 		url = SDBDataSource.getJdbcUrl(props);
-		
+
 		String username = props.getProperty(PROPERTY_DB_USERNAME);
 		if (username == null || username.isEmpty()) {
 			ss.fatal("runtime.properties does not contain a value for '"
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sdb/SDBDataSource.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sdb/SDBDataSource.java
index dcb4899f7..9f80da08d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sdb/SDBDataSource.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sdb/SDBDataSource.java
@@ -38,9 +38,9 @@ import static edu.cornell.mannlib.vitro.webapp.triplesource.impl.sdb.ContentTrip
  */
 public class SDBDataSource {
 	private static final Log log = LogFactory.getLog(SDBDataSource.class);
-	
+
 	private final ConfigurationProperties configProps;
-	
+
 
 	public SDBDataSource(ServletContext ctx) {
 		this.configProps = ConfigurationProperties.getBean(ctx);
@@ -130,10 +130,10 @@ public class SDBDataSource {
 			return defaultValue;
 		}
 	}
-	
+
 	/**
 	 * Get the JDBC URL, perhaps with special MySQL options.
-	 * 
+	 *
 	 * This must be static and package-accessible so SDBConnectionSmokeTests can
 	 * use the same options.
 	 */
@@ -173,6 +173,6 @@ public class SDBDataSource {
 	private static String getDbType(ConfigurationProperties props) {
 		return props.getProperty(PROPERTY_DB_TYPE, DEFAULT_TYPE);
 	}
-	
+
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sparql/ContentTripleSourceSPARQL.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sparql/ContentTripleSourceSPARQL.java
index 9f2386929..6f4dbb696 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sparql/ContentTripleSourceSPARQL.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/sparql/ContentTripleSourceSPARQL.java
@@ -24,11 +24,11 @@ import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
 /**
  * For a SPARQL endpoint, each connection is created as needed by the
  * RDFService, so there is no need to manage connections here.
- * 
+ *
  * As a result, we have a single RDFService, a RDFServiceFactory that always
  * returns that single RDFService, a single instance of the Dataset and the
  * ModelMaker.
- * 
+ *
  * Memory-map the small content models, and add the standard decorators.
  */
 public class ContentTripleSourceSPARQL extends ContentTripleSource {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/tdb/ConfigurationTripleSourceTDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/tdb/ConfigurationTripleSourceTDB.java
index 381d1eedf..fff548a9b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/tdb/ConfigurationTripleSourceTDB.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/tdb/ConfigurationTripleSourceTDB.java
@@ -28,14 +28,14 @@ import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
 /**
  * A TDB triple-store has no concept of connections, so we need not manage them
  * here.
- * 
+ *
  * As a result, we have a single RDFService, a RDFServiceFactory that always
  * returns that single RDFService, a single instance of the Dataset and the
  * ModelMaker.
- * 
+ *
  * We keep a copy of the RDFService wrapped in an Unclosable shell, and hand
  * that out when requested. The inner RDFService is only closed on shutdown().
- * 
+ *
  * Memory-map all of the configuration models, and add the standard decorators.
  */
 public class ConfigurationTripleSourceTDB extends ConfigurationTripleSource {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/tdb/ContentTripleSourceTDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/tdb/ContentTripleSourceTDB.java
index 72dff1b56..abd83e9c9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/tdb/ContentTripleSourceTDB.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/tdb/ContentTripleSourceTDB.java
@@ -29,14 +29,14 @@ import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
 /**
  * A TDB triple-store has no concept of connections, so we need not manage them
  * here.
- * 
+ *
  * As a result, we have a single RDFService, a RDFServiceFactory that always
  * returns that single RDFService, a single instance of the Dataset and the
  * ModelMaker.
- * 
+ *
  * We keep a copy of the RDFService wrapped in an Unclosable shell, and hand
  * that out when requested. The inner RDFService is only closed on shutdown().
- * 
+ *
  * Memory-map the small content models, and add the standard decorators.
  */
 public class ContentTripleSourceTDB extends ContentTripleSource {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ApplicationConfigurationOntologyUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ApplicationConfigurationOntologyUtils.java
index bac3dd389..0cdb8c50d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ApplicationConfigurationOntologyUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/ApplicationConfigurationOntologyUtils.java
@@ -32,14 +32,14 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactoryJena;
 public class ApplicationConfigurationOntologyUtils {
 
     private static final Log log = LogFactory.getLog(ApplicationConfigurationOntologyUtils.class);
-    
+
     public static List<ObjectProperty> getAdditionalFauxSubpropertiesForList(List<ObjectProperty> propList, Individual subject, VitroRequest vreq) {
 		Model displayModel = vreq.getDisplayModel();
         Model tboxModel = vreq.getOntModelSelector().getTBoxModel();
         return getAdditionalFauxSubpropertiesForList(propList, subject, displayModel, tboxModel);
     }
-    
-    public static List<ObjectProperty> getAdditionalFauxSubproperties(ObjectProperty prop, 
+
+    public static List<ObjectProperty> getAdditionalFauxSubproperties(ObjectProperty prop,
                                                                          Individual subject,
                                                                          Model tboxModel,
                                                                          Model union) {
@@ -54,8 +54,8 @@ public class ApplicationConfigurationOntologyUtils {
                 "    ?context config:hasConfiguration ?configuration . \n" +
                 "    ?configuration a config:ObjectPropertyDisplayConfig . \n" +
                 "    OPTIONAL { ?context config:qualifiedByDomain ?domain } \n" +
-                "}"; 
-      
+                "}";
+
         if(prop != null) {
             log.debug("Checking " + prop.getURI() + " for additional properties");
             queryStr = queryStr.replaceAll("For \\?property", "For <" + prop.getURI() + ">");
@@ -83,33 +83,33 @@ public class ApplicationConfigurationOntologyUtils {
                         additionalProps.add(faux);
                     } else {
                         log.error("Could not retrieve " + opURI + " qualified by " +
-                                " domain " + domainURI + " and range " + rangeURI); 
+                                " domain " + domainURI + " and range " + rangeURI);
                     }
                 }
-            }  
+            }
         } finally {
             qe.close();
         }
         return additionalProps;
-    }   
-    
-    
-    
-    public static List<ObjectProperty> getAdditionalFauxSubpropertiesForList(List<ObjectProperty> propList, 
-                                                                         Individual subject, 
-                                                                         Model displayModel, 
+    }
+
+
+
+    public static List<ObjectProperty> getAdditionalFauxSubpropertiesForList(List<ObjectProperty> propList,
+                                                                         Individual subject,
+                                                                         Model displayModel,
                                                                          Model tboxModel) {
-        
+
         List<ObjectProperty> additionalProps = new ArrayList<ObjectProperty>();
         Model union = ModelFactory.createUnion(displayModel, tboxModel);
-        
+
         for (ObjectProperty op : propList) {
             additionalProps.addAll(getAdditionalFauxSubproperties(op, subject, tboxModel, union));
-        }    
+        }
 
         return additionalProps;
     }
-    
+
     private static boolean appropriateDomain(Resource domainRes, Individual subject, Model tboxModel) {
         if (subject == null || domainRes == null) {
             return true;
@@ -125,5 +125,5 @@ public class ApplicationConfigurationOntologyUtils {
         }
         return false;
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Csv2Rdf.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Csv2Rdf.java
index 159d78bbc..ab813cb19 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Csv2Rdf.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Csv2Rdf.java
@@ -31,7 +31,7 @@ public class Csv2Rdf {
 	private String propertyNameBase;
 	private char separatorChar;
     private char quoteChar;
-	
+
     public Csv2Rdf(char quoteChar, String namespace, String tboxNamespace, String typeName) {
     	this.separatorChar = ',';
 		this.quoteChar = quoteChar;
@@ -41,7 +41,7 @@ public class Csv2Rdf {
 		this.individualNameBase = typeName.toLowerCase();
 		this.propertyNameBase = individualNameBase+"_";
 	}
-    
+
 	public Csv2Rdf(char separatorChar, char quoteChar, String namespace, String tboxNamespace, String typeName) {
 		this.separatorChar = separatorChar;
 		this.quoteChar = quoteChar;
@@ -51,11 +51,11 @@ public class Csv2Rdf {
 		this.individualNameBase = typeName.toLowerCase();
 		this.propertyNameBase = individualNameBase+"_";
 	}
-	
+
 	public Model[] convertToRdf(InputStream fis) throws IOException {
 		return convertToRdf(fis, null, null);
 	}
-	
+
 	public Model[] convertToRdf(InputStream fis, WebappDaoFactory wadf, Model destination) throws IOException {
 		OntModel ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		OntModel tboxOntModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
@@ -99,28 +99,28 @@ public class Csv2Rdf {
 
 		cReader.close();
         ontModel.removeSubModel(tboxOntModel);
-		
+
 		Model[] resultModels = new Model[2];
 		resultModels[0] = ontModel;
 		resultModels[1] = tboxOntModel;
 		return resultModels;
 	}
-	
+
 	private interface URIGenerator {
 		public String getNextURI();
 	}
-	
+
 	private class RandomURIGenerator implements URIGenerator {
-		
+
 		private WebappDaoFactory wadf;
 		private Model destination;
 		private Random random = new Random(System.currentTimeMillis());
-		
+
 		public RandomURIGenerator(WebappDaoFactory webappDaoFactory, Model destination) {
 			this.wadf = webappDaoFactory;
 			this.destination = destination;
 		}
-		
+
 		public String getNextURI() {
 			boolean uriIsGood = false;
 			boolean inDestination = false;
@@ -135,22 +135,22 @@ public class Csv2Rdf {
         			if( errMsg != null && !inDestination)
         				uri = null;
         			else
-        				uriIsGood = true;				
+        				uriIsGood = true;
         			attempts++;
         		}
         	}
         	return uri;
 		}
-		
+
 	}
-	
+
 	private class SequentialURIGenerator implements URIGenerator {
 		private int index = 0;
-		
+
 		public String getNextURI() {
 			index++;
-			return namespace + individualNameBase + Integer.toString(index); 
+			return namespace + individualNameBase + Integer.toString(index);
 		}
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/FrontEndEditingUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/FrontEndEditingUtils.java
index 4d79f7775..541e750cd 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/FrontEndEditingUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/FrontEndEditingUtils.java
@@ -13,20 +13,20 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
 
 public class FrontEndEditingUtils {
- 
+
     private static final Log log = LogFactory.getLog(FrontEndEditingUtils.class);
 
     public static enum EditMode {
         ADD, EDIT, REPAIR, ERROR;
     }
-    
+
     /* Determine whether a property editing form is in add, edit, or repair mode. */
     public static EditMode getEditMode(HttpServletRequest request, String relatedPropertyUri) {
-       
+
         Individual obj = (Individual)request.getAttribute("object");
         return getEditMode(request, obj, relatedPropertyUri);
     }
-    
+
     public static EditMode getEditMode(HttpServletRequest request, Individual obj, String relatedPropertyUri) {
     	 EditMode mode = EditMode.ADD;
          if( obj != null){
@@ -41,15 +41,15 @@ public class FrontEndEditingUtils {
                  }else if(stmts.size() == 1 ){
                      mode = EditMode.EDIT; // editing single statement
                      log.debug("Single statement found for property " + relatedPropertyUri + ". Setting edit mode to EDIT.");
-                 } 
+                 }
              } else {
                  log.debug("Statements null for property " + relatedPropertyUri + " . Setting edit mode to ADD.");
              }
          } else {
-             log.debug("No object. Setting edit mode to ADD.");        
+             log.debug("No object. Setting edit mode to ADD.");
          }
          return mode;
     }
- 
-   
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Html2Text.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Html2Text.java
index be6b54444..d97632b37 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Html2Text.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Html2Text.java
@@ -30,9 +30,9 @@ public class Html2Text extends HTMLEditorKit.ParserCallback {
          log.error("could not strip html",e);
      }finally{
          r.close();
-     }     
+     }
  }
- 
+
  public void handleText(char[] text, int pos) {
    s.append(text);
  }
@@ -46,10 +46,10 @@ public class Html2Text extends HTMLEditorKit.ParserCallback {
         parse(in);
     } catch (IOException e) {
         log.debug("could not strip html",e);
-    }     
+    }
      return getText();
  }
- 
- 
+
+
  private static final Log log = LogFactory.getLog(Html2Text.class.getName());
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/IterableAdaptor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/IterableAdaptor.java
index d3e080cf0..d76754adf 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/IterableAdaptor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/IterableAdaptor.java
@@ -8,19 +8,19 @@ import java.util.*;
 public class IterableAdaptor <T> implements Iterable<T> {
     private final Enumeration<T> en;
     private final Iterator<T> it;
-    
+
     /** sometimes you have an Enumeration and you want an Iterable */
     public IterableAdaptor(Enumeration<T> en) {
         this.en = en;
         this.it = null;
     }
-    
+
     /** sometimes you have an Iterator but you want to use a for */
     public IterableAdaptor(Iterator <T> it){
         this.it = it;
         this.en = null;
     }
-    
+
     // return an adaptor for the Enumeration
     public Iterator<T> iterator() {
         if( en != null ){
@@ -39,19 +39,19 @@ public class IterableAdaptor <T> implements Iterable<T> {
             return it;
         } else {
             return new Iterator<T>() {
-                public boolean hasNext() { return false; }                
+                public boolean hasNext() { return false; }
                 public T next() { return null; }
                 public void remove() { throw new UnsupportedOperationException(); }
             };
         }
-        
+
     }
-    
-    
+
+
     public static <T> Iterable<T> adapt(Enumeration<T> enin) {
         return new IterableAdaptor<T>(enin);
     }
-    
+
 
     public static <T> Iterable<T> adapt(Iterator<T> itin) {
         return new IterableAdaptor<T>(itin);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/JsonToFmModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/JsonToFmModel.java
index 5085510f4..1bb7e1a2b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/JsonToFmModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/JsonToFmModel.java
@@ -35,19 +35,19 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 
 /**
  * Utility to convert JSON to Freemarker-compatible data model
- * 
+ *
  * @author janv
  */
 public final class JsonToFmModel
 {
     public static String ROOT_ARRAY = "root";
-    
+
     // note: current format is dependent on ISO8601DateFormat.parser, eg. YYYY-MM-DDThh:mm:ss.sssTZD
 //    private static String REGEXP_ISO8061 = "^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(.([0-9]){3})?(Z|[\\+\\-]([0-9]{2}):([0-9]{2}))$";
 //    private static Pattern matcherISO8601 = Pattern.compile(REGEXP_ISO8061);
-//    
+//
 //    public static boolean autoConvertISO8601 = true;
-    
+
     /**
      * JSONObject is an unordered collection of name/value pairs -&gt; convert to Map (equivalent to Freemarker "hash")
      */
@@ -60,7 +60,7 @@ public final class JsonToFmModel
         while (itr.hasNext())
         {
             String key = (String)itr.next();
-            
+
             Object o = jo.get(key);
             if (o instanceof ObjectNode)
             {
@@ -76,14 +76,14 @@ public final class JsonToFmModel
 //                {
 //                    o = ISO8601DateFormat.parse((String)o);
 //                }
-                
+
                 model.put(key, o);
             }
         }
-       
+
         return model;
     }
-   
+
     /**
      * JSONArray is an ordered sequence of values -&gt; convert to List (equivalent to Freemarker "sequence")
      */
@@ -109,34 +109,34 @@ public final class JsonToFmModel
 //                {
 //                    o = ISO8601DateFormat.parse((String)o);
 //                }
-                
+
                 model.add(o);
             }
         }
-       
+
         return model;
     }
-   
+
     // for debugging only
     public static String toString(Map<String, Object> map)
     {
         return JsonToFmModel.toStringBuffer(map, 0).toString();
     }
-    
+
     @SuppressWarnings("unchecked")
     private static StringBuffer toStringBuffer(Map<String, Object> unsortedMap, int indent)
-    {      
+    {
         StringBuilder tabs = new StringBuilder();
         for (int i = 0; i < indent; i++)
         {
             tabs.append("\t");
         }
-        
+
         StringBuffer sb = new StringBuffer();
-        
+
         SortedMap<String, Object> map = new TreeMap<String, Object>();
         map.putAll(unsortedMap);
-        
+
         for (Map.Entry<String, Object> entry : map.entrySet())
         {
             if (entry.getValue() instanceof Map)
@@ -155,10 +155,10 @@ public final class JsonToFmModel
             }
             else
             {
-                sb.append(tabs).append(entry.getKey()).append(":").append(entry.getValue()).append(":").append((entry.getValue() != null ? entry.getValue().getClass() : "null")).append("\n");         
+                sb.append(tabs).append(entry.getKey()).append(":").append(entry.getValue()).append(":").append((entry.getValue() != null ? entry.getValue().getClass() : "null")).append("\n");
             }
         }
-        
+
         return sb;
     }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/MailUtil.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/MailUtil.java
index ee47090ed..0c3dec198 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/MailUtil.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/MailUtil.java
@@ -20,30 +20,30 @@ import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory;
 public class MailUtil {
 	private static final Log log = LogFactory.getLog(MailUtil.class);
 	private final HttpServletRequest req;
-	
+
 		public MailUtil(HttpServletRequest req) {
 			this.req = req;
 		}
-        
+
         public void sendMessage(String messageText, String subject, String from, String to, List<String> deliverToArray) throws IOException{
-        	
+
             Session s = FreemarkerEmailFactory.getEmailSession(req);
-            
+
             try{
-            	
+
             	int recipientCount = (deliverToArray == null) ? 0 : deliverToArray.size();
                 if (recipientCount == 0) {
                     log.error(
                             "To establish the Contact Us mail capability the system administrators must  "
                             + "specify at least one email address in the current portal.");
                 }
-               
+
                 MimeMessage msg = new MimeMessage( s );
                 // Set the from address
                 msg.setFrom( new InternetAddress( from ));
 
 	            // Set the recipient address
-	            
+
 	            if (recipientCount>0){
 	                InternetAddress[] address=new InternetAddress[recipientCount];
 	                for (int i=0; i<recipientCount; i++){
@@ -65,5 +65,5 @@ public class MailUtil {
             	log.error("Exception sending message :"  + ex.getMessage(), ex);
             }
         }
-        
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/NamespaceMapper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/NamespaceMapper.java
index 2a3c00c9f..5eb6f491b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/NamespaceMapper.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/NamespaceMapper.java
@@ -14,19 +14,19 @@ public interface NamespaceMapper extends ModelChangedListener {
 	 * @param namespace Namespace
 	 */
 	public String getPrefixForNamespace(String namespace);
-	
+
 	/**
 	 * Returns a list of abbreviations that have been used to
 	 * represent a given namespace.
 	 * @param namespace Namespace
 	 */
 	public List<String> getPrefixesForNamespace(String namespace);
-	
+
 	/**
 	 * Returns the full namespace URI represented by a given
 	 * abbreviation, or null if not found.
 	 * @param prefix Prefix
 	 */
 	public String getNamespaceForPrefix(String prefix);
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/NamespaceMapperFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/NamespaceMapperFactory.java
index a1cd7d984..2eec16d40 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/NamespaceMapperFactory.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/NamespaceMapperFactory.java
@@ -9,5 +9,5 @@ public class NamespaceMapperFactory {
 	public static NamespaceMapper getNamespaceMapper(ServletContext servletContext) {
 		return (NamespaceMapper) servletContext.getAttribute("NamespaceMapper");
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/SimpleStemmer.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/SimpleStemmer.java
index 33f015957..69a4e208c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/SimpleStemmer.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/SimpleStemmer.java
@@ -6,11 +6,11 @@ package edu.cornell.mannlib.vitro.webapp.utils;
  * A class for non-static access to the stemmer via reflection in the ingest tools
  */
 public class SimpleStemmer {
-	   
+
    private int MAX_LENGTH = 32; // value used elsewhere in Vitro
-   
+
    public String stemString(String str) {
-	   return Stemmer.StemString(str,MAX_LENGTH); 
-   }		   
+	   return Stemmer.StemString(str,MAX_LENGTH);
+   }
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryRunner.java
index 36e3f34e0..c8561853d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryRunner.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/SparqlQueryRunner.java
@@ -19,7 +19,7 @@ import org.apache.jena.rdf.model.RDFNode;
 
 /**
  * Execute SPARQL queries against a model.
- * 
+ *
  * Take the model in the constructor. Then execute as many queries as desired,
  * with the query contained in a String. Exceptions are handled in a tidy
  * manner, and the query environment is closed properly in any case.
@@ -136,7 +136,7 @@ public class SparqlQueryRunner {
 		}
 
 	}
-	
+
 	public static String bindValues(String rawString, VariableValue... values) {
 		String queryString = rawString;
 		for (VariableValue value: values) {
@@ -144,7 +144,7 @@ public class SparqlQueryRunner {
 		}
 		return queryString;
 	}
-	
+
 	public static UriValue uriValue(String name, String uri) {
 		return new UriValue(name, uri);
 	}
@@ -152,11 +152,11 @@ public class SparqlQueryRunner {
 	public interface VariableValue {
 		String bind(String rawString);
 	}
-	
+
 	private static class UriValue implements VariableValue {
 		private final String name;
 		private final String uri;
-		
+
 		public UriValue(String name, String uri) {
 			this.name = name;
 			this.uri = uri;
@@ -166,6 +166,6 @@ public class SparqlQueryRunner {
 		public String bind(String rawString) {
 			return rawString.replaceAll("\\?" + name + "\\b", "<" + uri + ">");
 		}
-		
+
 	}
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Stemmer.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Stemmer.java
index ad5bf7be9..6ea342e8d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Stemmer.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Stemmer.java
@@ -59,7 +59,7 @@ public class Stemmer
       i = 0;
       i_end = 0;
    }
-   
+
    private static final Log log = LogFactory.getLog(Stemmer.class.getName());
 
    /**
@@ -552,6 +552,6 @@ public class Stemmer
            log.trace(StemString(arg, 100));
        }
    }
-  
-   
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderException.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderException.java
index 90bd3a366..49858bedd 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderException.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderException.java
@@ -13,4 +13,4 @@ public class ConfigurationBeanLoaderException extends Exception {
 	public ConfigurationBeanLoaderException(String message, Throwable cause) {
 		super(message, cause);
 	}
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationRdf.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationRdf.java
index 633b1310c..36a863ebf 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationRdf.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationRdf.java
@@ -26,4 +26,4 @@ public class ConfigurationRdf<T> {
 	public Set<PropertyStatement> getPropertyStatements() {
 		return new HashSet<>(properties);
 	}
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/PropertyType.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/PropertyType.java
index fbc53ac85..7bae32b36 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/PropertyType.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/PropertyType.java
@@ -17,7 +17,7 @@ import org.apache.jena.rdf.model.Statement;
 /**
  * An enumeration of the types of properties that the ConfigurationBeanLoader
  * will support.
- * 
+ *
  * Also, classes that represent the Java methods and RDF statements associated
  * with those types.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/Validation.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/Validation.java
index 040301050..514f142f2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/Validation.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/Validation.java
@@ -10,7 +10,7 @@ import java.lang.annotation.Target;
 /**
  * The annotated method should be called after the bean is instantiated, to
  * confirm that the bean is correctly formed.
- * 
+ *
  * If the bean is not correctly formed, throw a runtime exception.
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/WrappedInstance.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/WrappedInstance.java
index ba4a2ab75..5133bf2a4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/WrappedInstance.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/WrappedInstance.java
@@ -37,7 +37,7 @@ public class WrappedInstance<T> {
 
 	/**
 	 * The loader calls this as soon as the instance is created.
-	 * 
+	 *
 	 * If the loader did not have access to a request object, then req will be
 	 * null. If the instance expects request models, an exception will be
 	 * thrown.
@@ -172,4 +172,4 @@ public class WrappedInstance<T> {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/BrowseDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/BrowseDataGetter.java
index 7e4e83bcb..f3da32e09 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/BrowseDataGetter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/BrowseDataGetter.java
@@ -44,31 +44,31 @@ public class BrowseDataGetter extends DataGetterBase implements DataGetter {
      */
     public BrowseDataGetter(VitroRequest vreq, Model displayModel, String dataGetterURI){
         this.configure(vreq, displayModel,dataGetterURI);
-    }   
-    
+    }
+
     /**
      * Configure this instance based on the URI and display model.
      */
     protected void configure(VitroRequest vreq, Model displayModel, String dataGetterURI) {
-    	if( vreq == null ) 
+    	if( vreq == null )
     		throw new IllegalArgumentException("VitroRequest  may not be null.");
-	   if( displayModel == null ) 
+	   if( displayModel == null )
            throw new IllegalArgumentException("Display Model may not be null.");
        if( dataGetterURI == null )
            throw new IllegalArgumentException("PageUri may not be null.");
-               
+
        this.vreq = vreq;
        this.context = vreq.getSession().getServletContext();
        this.dataGetterURI = dataGetterURI;
     }
-    
+
     @Override
-    public Map<String, Object> getData(Map<String, Object> pageData) { 
-        try{            
+    public Map<String, Object> getData(Map<String, Object> pageData) {
+        try{
             Map params = vreq.getParameterMap();
-            
+
             Mode mode = getMode( vreq, params );
-            switch( mode ){          
+            switch( mode ){
                 case VCLASS_ALPHA:
                     return doClassAlphaDisplay(params,vreq,context);
                 case CLASS_GROUP:
@@ -86,10 +86,10 @@ public class BrowseDataGetter extends DataGetterBase implements DataGetter {
             }
     }
 
-    public String getType() { 
+    public String getType() {
         return DisplayVocabulary.HOME_PAGE_TYPE;
     }
-    
+
   //Get data servuice
     public String getDataServiceUrl() {
     	return UrlBuilder.getUrl("/dataservice?getSearchIndividualsByVClass=1&vclassId=");
@@ -97,50 +97,50 @@ public class BrowseDataGetter extends DataGetterBase implements DataGetter {
     private Map<String, Object> doClassAlphaDisplay( Map params, VitroRequest request, ServletContext context) throws Exception {
         Map<String,Object> body = new HashMap<String,Object>();
         body.putAll(getCommonValues(context, request));
-        body.putAll(getClassAlphaValues(params,request,context));        
+        body.putAll(getClassAlphaValues(params,request,context));
         return body;
     }
 
     private Map<String,Object> getClassAlphaValues( Map params, VitroRequest request, ServletContext context) throws Exception{
         Map<String,Object> map= new HashMap<String,Object>();
-        
+
         String classUri = getParam(Mode.VCLASS, request, params);
         VitroRequest vreq = new VitroRequest(request);
         VClass vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(classUri);
         map.put("class", new VClassTemplateModel(vclass));
-        
+
         ObjectNode vclassRes = JsonServlet.getSearchIndividualsByVClass(vclass.getURI(), request);
         map.put("totalCount", JsonToFmModel.convertJSONObjectToMap( (ObjectNode) vclassRes.get("totalCount") ));
         map.put("alpha", JsonToFmModel.convertJSONObjectToMap( (ObjectNode) vclassRes.get("alpha") ));
         map.put("individuals", JsonToFmModel.convertJSONArrayToList( (ArrayNode) vclassRes.get("individuals") ));
         map.put("pages", JsonToFmModel.convertJSONArrayToList( (ArrayNode) vclassRes.get("pages") ));
         map.put("letters", JsonToFmModel.convertJSONArrayToList( (ArrayNode) vclassRes.get("letters") ));
-        
+
         return map;
     }
-    
+
     private Map<String,Object> getCommonValues( ServletContext context, VitroRequest vreq){
-        Map<String,Object> values = new HashMap<String,Object>();              
-                
+        Map<String,Object> values = new HashMap<String,Object>();
+
         VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
-        List<VClassGroup> cgList = vcgc.getGroups();        
+        List<VClassGroup> cgList = vcgc.getGroups();
         LinkedList<VClassGroupTemplateModel> cgtmList = new LinkedList<VClassGroupTemplateModel>();
         for( VClassGroup classGroup : cgList){
             cgtmList.add( new VClassGroupTemplateModel( classGroup ));
         }
         values.put("vClassGroups",cgtmList);
-        
+
         return values;
     }
-    
-    protected Map<String, Object> doAllClassGroupsDisplay( Map params, VitroRequest request, ServletContext context) {        
+
+    protected Map<String, Object> doAllClassGroupsDisplay( Map params, VitroRequest request, ServletContext context) {
         Map<String,Object> body = new HashMap<String,Object>();
-        body.putAll(getCommonValues(context,request));        
+        body.putAll(getCommonValues(context,request));
         body.putAll(getAllClassGroupData(request, params, context));
-                        
+
         return body;
     }
-   
+
     /**
      * Gets a list of all VClassGroups with vclasses with individual counts.
      * @param request current VitroRequest
@@ -148,33 +148,33 @@ public class BrowseDataGetter extends DataGetterBase implements DataGetter {
      * @param context current servlet context
      */
     protected Map<String,Object> getAllClassGroupData(VitroRequest request, Map params, ServletContext context){
-        Map<String,Object> map = new HashMap<String,Object>();                  
+        Map<String,Object> map = new HashMap<String,Object>();
         return map;
     }
-    
+
     protected Map<String, Object> doClassDisplay( Map params,
-            VitroRequest request, ServletContext context) {                
+            VitroRequest request, ServletContext context) {
         Map<String,Object> body = new HashMap<String,Object>();
-        
-        body.putAll(getCommonValues(context,request));        
+
+        body.putAll(getCommonValues(context,request));
         body.putAll(getClassData(request,params,context));
-            
+
         return body;
     }
 
     private Map<String, Object> getClassData(VitroRequest request, Map params, ServletContext context) {
         Map<String,Object> map = new HashMap<String,Object>();
-        
+
         map.putAll(getClassGroupData(request, params,context));
-        
+
         String classUri = getParam(Mode.VCLASS, request, params);
         VitroRequest vreq = new VitroRequest(request);
         VClass vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(classUri);
         map.put("class", new VClassTemplateModel(vclass));
-        
+
         List<Individual> inds = vreq.getWebappDaoFactory().getIndividualDao()
             .getIndividualsByVClass(vclass);
-        
+
         List<ListedIndividual> tInds = new ArrayList<ListedIndividual>(inds.size());
         for( Individual ind : inds){
             tInds.add(ListedIndividualBuilder.build(ind, vreq));
@@ -186,46 +186,46 @@ public class BrowseDataGetter extends DataGetterBase implements DataGetter {
 
     protected Map<String, Object> doClassGroupDisplay(Map params, VitroRequest request, ServletContext context) {
         Map<String,Object> body = new HashMap<String,Object>();
-        body.putAll(getCommonValues(context,request));        
+        body.putAll(getCommonValues(context,request));
         body.putAll( getClassGroupData(request,params, context));
-   
+
         return body;
-    } 
-        
+    }
+
     protected Map<String, Object> getClassGroupData(VitroRequest request, Map params, ServletContext context) {
         Map<String,Object> map = new HashMap<String,Object>();
-        
+
         String vcgUri = getParam(Mode.CLASS_GROUP, request, params);
-        VitroRequest vreq = new VitroRequest(request);        
-        
+        VitroRequest vreq = new VitroRequest(request);
+
         VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(request);
-        VClassGroup vcg = vcgc.getGroup(vcgUri);        
-        
+        VClassGroup vcg = vcgc.getGroup(vcgUri);
+
         ArrayList<VClassTemplateModel> classes = new ArrayList<VClassTemplateModel>(vcg.size());
         for( VClass vc : vcg){
             classes.add(new VClassTemplateModel(vc));
         }
         map.put("classes", classes);
-        
+
         map.put("classGroup", new VClassGroupTemplateModel(vcg));
-        
+
         return map;
     }
-    
-        
+
+
     enum Mode{
         VCLASS_ALPHA("vclassAlpha"),
         VCLASS("vclassUri"),
         CLASS_GROUP("classgroupUri"),
-        ALL_CLASS_GROUPS("all");                                
+        ALL_CLASS_GROUPS("all");
         String param;
-        Mode(String param){        
+        Mode(String param){
             this.param = param;
         }
     }
-    
+
     protected final static Mode DEFAULT_MODE = Mode.ALL_CLASS_GROUPS;
-    
+
     protected Mode getMode(VitroRequest request, Map<String, Object> params){
         for( Mode mode : Mode.values()){
             String queryParam = request.getParameter( mode.param );
@@ -237,10 +237,10 @@ public class BrowseDataGetter extends DataGetterBase implements DataGetter {
             if( param != null && !param.isEmpty() ){
                 return mode;
             }
-        }                
-        return DEFAULT_MODE;        
+        }
+        return DEFAULT_MODE;
     }
-    
+
     public static String getParam(Mode mode, VitroRequest request, Map params){
         if( request.getParameter(mode.param) != null )
             return request.getParameter(mode.param);
@@ -249,7 +249,7 @@ public class BrowseDataGetter extends DataGetterBase implements DataGetter {
         else
             return null;
     }
-    
+
     /**
      * For processig of JSONObject
      */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ClassGroupPageData.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ClassGroupPageData.java
index e678f012e..88f2a49be 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ClassGroupPageData.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ClassGroupPageData.java
@@ -26,10 +26,10 @@ import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassGroupTemplateMo
 /**
  * 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.     
+ * vClassGroup: a data structure that is the classgroup associated with this page.
  */
 public class ClassGroupPageData extends DataGetterBase implements DataGetter{
-	
+
     private static final Log log = LogFactory.getLog(ClassGroupPageData.class);
     String dataGetterURI;
     String classGroupUri;
@@ -41,28 +41,28 @@ public class ClassGroupPageData extends DataGetterBase implements DataGetter{
      */
     public ClassGroupPageData(VitroRequest vreq, Model displayModel, String dataGetterURI){
         this.configure(vreq, displayModel,dataGetterURI);
-    }        
-    
+    }
+
     /**
      * Configure this instance based on the URI and display model.
      */
     protected void configure(VitroRequest vreq, Model displayModel, String dataGetterURI) {
-    	if( vreq == null ) 
+    	if( vreq == null )
     		throw new IllegalArgumentException("VitroRequest  may not be null.");
-        if( displayModel == null ) 
+        if( displayModel == null )
             throw new IllegalArgumentException("Display Model may not be null.");
         if( dataGetterURI == null )
             throw new IllegalArgumentException("PageUri may not be null.");
-                
+
         this.vreq = vreq;
         this.context = vreq.getSession().getServletContext();
-        this.dataGetterURI = dataGetterURI;        
+        this.dataGetterURI = dataGetterURI;
         this.classGroupUri = 	DataGetterUtils.getClassGroupForDataGetter(displayModel, dataGetterURI);
     }
-    
-    
+
+
     @Override
-    public Map<String, Object> getData(Map<String, Object> pageData) { 
+    public Map<String, Object> getData(Map<String, Object> pageData) {
     	  HashMap<String, Object> data = new HashMap<String,Object>();
           data.put("classGroupUri", this.classGroupUri);
 
@@ -75,7 +75,7 @@ public class ClassGroupPageData extends DataGetterBase implements DataGetter{
                   break;
               }
           }
-          if( classGroupUri != null && !classGroupUri.isEmpty() && group == null ){ 
+          if( classGroupUri != null && !classGroupUri.isEmpty() && group == null ){
               /*This could be for two reasons: one is that the classgroup doesn't exist
                * The other is that there are no individuals in any of the classgroup's classes */
               group = vreq.getWebappDaoFactory().getVClassGroupDao().getGroupByURI(classGroupUri);
@@ -86,9 +86,9 @@ public class ClassGroupPageData extends DataGetterBase implements DataGetter{
                       if( classGroupUri.equals(vcg.getURI()) ){
                           group = vcg;
                           break;
-                      }                                
+                      }
                   }
-                  
+
                   setAllClassCountsToZero(group);
 
                   log.debug("Retrieved class group " + group.getURI()
@@ -99,27 +99,27 @@ public class ClassGroupPageData extends DataGetterBase implements DataGetter{
                         log.debug("Class " + v.getName() + " - " + v.getURI()
                                 + " has " + v.getEntityCount() + " entities");
                       }
-                  }               
+                  }
               }else{
                   throw new RuntimeException("classgroup " + classGroupUri + " does not exist in the system");
-              }              
-          }          
-         
+              }
+          }
+
           data.put("vClassGroup", group);  //may put null
-          
+
           //This page level data getters tries to set its own template,
           // not all of the data getters need to do this.
           data.put("bodyTemplate", "page-classgroup.ftl");
-          
+
           //Also add data service url
           //Hardcoding for now, need a more dynamic way of doing this
           data.put("dataServiceUrlIndividualsByVClass", this.getDataServiceUrl());
           return data;
     }
-     
-    
+
+
     public static VClassGroupTemplateModel getClassGroup(String classGroupUri, ServletContext context, VitroRequest vreq){
-        
+
         VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
         List<VClassGroup> vcgList = vcgc.getGroups();
         VClassGroup group = null;
@@ -129,8 +129,8 @@ public class ClassGroupPageData extends DataGetterBase implements DataGetter{
                 break;
             }
         }
-        
-        if( classGroupUri != null && !classGroupUri.isEmpty() && group == null ){ 
+
+        if( classGroupUri != null && !classGroupUri.isEmpty() && group == null ){
             /*This could be for two reasons: one is that the classgroup doesn't exist
              * The other is that there are no individuals in any of the classgroup's classes */
             group = vreq.getWebappDaoFactory().getVClassGroupDao().getGroupByURI(classGroupUri);
@@ -141,7 +141,7 @@ public class ClassGroupPageData extends DataGetterBase implements DataGetter{
                     if( classGroupUri.equals(vcg.getURI()) ){
                         group = vcg;
                         break;
-                    }                                
+                    }
                 }
                 if( group == null ){
                     log.error("Cannot get classgroup '" + classGroupUri + "'");
@@ -152,17 +152,17 @@ public class ClassGroupPageData extends DataGetterBase implements DataGetter{
             }else{
                 log.error("classgroup " + classGroupUri + " does not exist in the system");
                 return null;
-            }            
+            }
         }
-        
+
         return new VClassGroupTemplateModel(group);
     }
-    
+
   //Get data servuice
     public String getDataServiceUrl() {
     	return UrlBuilder.getUrl("/dataservice?getRenderedSearchIndividualsByVClass=1&vclassId=");
     }
-    
+
     /**
      * Query to get the definition of the ClassGroupDataGetter for a given data getter URI - specifically
      * the class group uri
@@ -172,10 +172,10 @@ public class ClassGroupPageData extends DataGetterBase implements DataGetter{
         "PREFIX display: <" + DisplayVocabulary.DISPLAY_NS +"> \n" +
         "SELECT ?classGroupUri WHERE { \n" +
         "  ?dataGetterUri "+forClassGroupURI+" ?classGroupUri . \n" +
-        "}";      
+        "}";
+
+
 
-    
-    
     /**
      * For processing of JSONObject
      */
@@ -188,4 +188,4 @@ public class ClassGroupPageData extends DataGetterBase implements DataGetter{
             vc.setEntityCount(0);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetter.java
index 1c8c9bd79..39ea8683a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetter.java
@@ -5,38 +5,38 @@ import java.util.Map;
 
 /**
  * A class to get data based on configurations in RDF. These are useful for pages bug not specific to pages.
- * Consider using this interface when you need data based on RDF configuration.  
- * 
- * Instances should be short-lived, and only used on a single HTTP request. The getData method accepts only 
- * a value map, so if stat is required from the request (or the servlet context), the request should be 
+ * Consider using this interface when you need data based on RDF configuration.
+ *
+ * Instances should be short-lived, and only used on a single HTTP request. The getData method accepts only
+ * a value map, so if stat is required from the request (or the servlet context), the request should be
  * passed to the constructor.
- * 
- * Constructors:  Objects that implement this interface will be constructed by reflection with the following 
+ *
+ * Constructors:  Objects that implement this interface will be constructed by reflection with the following
  * constructor signatures in the following order:
  *  DataGetter( VitroRequest vreq, Model displayModel, String dataGetterURI )
  *  DataGetter( Model displayModel, String dataGetterURI )
  *  DataGetter( VitroRequest vreq )
  *  DataGetter()
- *  
- * The main difference between this and PageDataGetter is that these are configured not based on page URI 
- * but on DataGetter URI.  This allows a configuration of a DataGetter to be used in multiple situations. 
+ *
+ * The main difference between this and PageDataGetter is that these are configured not based on page URI
+ * but on DataGetter URI.  This allows a configuration of a DataGetter to be used in multiple situations.
  * The DataGetter is not passed information about what page it might be associated with.
- * 
- * Using this interface is preferred over PageDataGetter because then the DataGetter can be associated with 
- * things other than pages. 
- * 
+ *
+ * Using this interface is preferred over PageDataGetter because then the DataGetter can be associated with
+ * things other than pages.
+ *
  */
 public interface DataGetter {
 
 	/**
 	 * Get data. Throwing an Exception is acceptable.
-	 * 
+	 *
 	 * @param valueMap
-	 *            any values already generated by data getters or the controller. 
+	 *            any values already generated by data getters or the controller.
 	 *            Might be immutable, and should not be modified within the method.
-	 * 
+	 *
 	 * @return data to add to valueMap. Might be empty, but should not be null.
 	 */
-    Map<String,Object> getData( Map<String, Object> valueMap );       
+    Map<String,Object> getData( Map<String, Object> valueMap );
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterBase.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterBase.java
index a42c909ff..e8bb0b876 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterBase.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterBase.java
@@ -14,8 +14,8 @@ import edu.cornell.mannlib.vitro.webapp.controller.jena.JenaIngestController;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 
 public abstract class DataGetterBase implements DataGetter {
-   
-    /** 
+
+    /**
      * Get the model to use based on a model URI.
      */
     protected Model getModel(ServletContext context, VitroRequest vreq , String modelName) {
@@ -25,23 +25,23 @@ public abstract class DataGetterBase implements DataGetter {
         }else if(REQUEST_DISPLAY_MODEL.equals(modelName)){
             return vreq.getDisplayModel();
         }else if( REQUEST_JENA_ONT_MODEL.equals(modelName)){
-            return vreq.getJenaOntModel();            
+            return vreq.getJenaOntModel();
         }else if( CONTEXT_DISPLAY_MODEL.equals(modelName)){
         	return ModelAccess.on(context).getOntModel(DISPLAY);
-        }else if( ! StringUtils.isEmpty( modelName)){           
+        }else if( ! StringUtils.isEmpty( modelName)){
             Model model = JenaIngestController.getModel( modelName, vreq);
             if( model == null )
                 throw new IllegalAccessError("Cannot get model <" + modelName +"> for DataGetter.");
             else
                 return model;
-        }else{                    
+        }else{
             //default is just the JeanOntModel from the vreq.
             return vreq.getJenaOntModel();
         }
     }
 
-   public final static String REQUEST_DISPLAY_MODEL = "vitro:requestDisplayModel";   
+   public final static String REQUEST_DISPLAY_MODEL = "vitro:requestDisplayModel";
    public final static String REQUEST_JENA_ONT_MODEL = "vitro:requestJenaOntModel";
    public final static String CONTEXT_DISPLAY_MODEL =  "vitro:contextDisplayModel";
-   
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtils.java
index 85d1ca55c..2fc1a35ee 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtils.java
@@ -42,20 +42,20 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache;
 
 
 public class DataGetterUtils {
-    
+
     final static Log log = LogFactory.getLog(DataGetterUtils.class);
-    
+
     /**
      * Attribute name in request for DataGetters
      */
     public final static String DATA_GETTERS_FOR_PAGE = "data_getters_for_page";
-    
+
     /**
      * Get a list of DataGetter objects that are associated with a page.
-     * This should not return PageDataGetters and should not throw an 
-     * exception if a page has PageDataGetters.  
+     * This should not return PageDataGetters and should not throw an
+     * exception if a page has PageDataGetters.
      */
-	public static List<DataGetter> getDataGettersForPage(VitroRequest vreq, Model displayModel, String pageURI) 
+	public static List<DataGetter> getDataGettersForPage(VitroRequest vreq, Model displayModel, String pageURI)
 			throws InstantiationException, IllegalAccessException, ClassNotFoundException, IllegalArgumentException, SecurityException, InvocationTargetException {
 
 	    if( vreq.getAttribute(DATA_GETTERS_FOR_PAGE) != null){
@@ -68,12 +68,12 @@ public class DataGetterUtils {
     		return dgList;
 	    }
 	}
-    
+
     /**
      * Get a list of DataGetter objects that are associated with a Vitro VClass.
-     * This allows the individual profile for an individual of a specific class to be returned .  
+     * This allows the individual profile for an individual of a specific class to be returned .
      */
-    public static List<DataGetter> getDataGettersForClass( VitroRequest vreq, Model displayModel, String classURI) 
+    public static List<DataGetter> getDataGettersForClass( VitroRequest vreq, Model displayModel, String classURI)
             throws InstantiationException, IllegalAccessException, ClassNotFoundException, IllegalArgumentException, SecurityException, InvocationTargetException {
         List<String> dgUris = getDataGetterURIsForAssociatedURI( displayModel, classURI);
         List<DataGetter> dgList = dataGettersForURIs(vreq, displayModel, dgUris);
@@ -85,7 +85,7 @@ public class DataGetterUtils {
      * Get a list of DataGetter objects that are associated with a Freemarker template.
      * @param templateName a filename like "index.ftl", which will be used as a URI like "freemarker:index.ftl".
      */
-    public static List<DataGetter> getDataGettersForTemplate( VitroRequest vreq, Model displayModel, String templateName) 
+    public static List<DataGetter> getDataGettersForTemplate( VitroRequest vreq, Model displayModel, String templateName)
     		throws InstantiationException, IllegalAccessException, ClassNotFoundException, IllegalArgumentException, SecurityException, InvocationTargetException {
     	String templateUri = "freemarker:" + templateName;
     	List<String> dgUris = getDataGetterURIsForAssociatedURI( displayModel, templateUri);
@@ -93,14 +93,14 @@ public class DataGetterUtils {
     	log.debug("getDataGettersForTemplate '" + templateName + "': " + dgList);
     	return dgList;
     }
-    
+
 	/**
 	 * Return a list of DataGetters from the list of URIs. Each DataGetter will be configured from information
 	 * in the displayModel.
-	 * 
+	 *
 	 * Problems instantiating and configuring a particular DataGetter may result in an exception,
 	 * or may just mean that there will be no entry in the result for that URI.
-	 * 
+	 *
 	 * May return an empty list, but will not return null.
 	 */
 	private static List<DataGetter> dataGettersForURIs(VitroRequest vreq, Model displayModel, List<String> dgUris)
@@ -109,41 +109,41 @@ public class DataGetterUtils {
 		for( String dgURI: dgUris){
 		    DataGetter dg =dataGetterForURI(vreq, displayModel, dgURI) ;
 		    if( dg != null )
-		        dgList.add(dg); 
+		        dgList.add(dg);
 		}
 		return dgList;
 	}
 
     /**
-     * Returns a DataGetter using information in the 
+     * Returns a DataGetter using information in the
      * displayModel for the individual with the URI given by dataGetterURI
-     * to configure it. 
-     * 
+     * to configure it.
+     *
      * May return null.
      * This should not throw an exception if the URI exists and has a type
      * that does not implement the DataGetter interface.
      */
-    public static DataGetter dataGetterForURI(VitroRequest vreq, Model displayModel, String dataGetterURI) 
-    throws InstantiationException, IllegalAccessException, ClassNotFoundException, IllegalArgumentException, InvocationTargetException, SecurityException 
+    public static DataGetter dataGetterForURI(VitroRequest vreq, Model displayModel, String dataGetterURI)
+    throws InstantiationException, IllegalAccessException, ClassNotFoundException, IllegalArgumentException, InvocationTargetException, SecurityException
     {
         //get java class for dataGetterURI
         String dgClassName = getJClassForDataGetterURI(displayModel, dataGetterURI);
-        
+
         //figure out if it implements interface DataGetter
         Class<?> clz = Class.forName(dgClassName);
         if( ! DataGetter.class.isAssignableFrom(clz) ){
     		log.debug("Class doesn't implement DataGetter: '" + dgClassName + "'");
             return null;
         }
-        
+
         // we want a constructor that will work for one of these argument lists (in this order)
         Object[][] argLists = new Object[][] {
-        		{ vreq, displayModel, dataGetterURI }, 
-        		{ displayModel, dataGetterURI }, 
-        		{ vreq }, 
+        		{ vreq, displayModel, dataGetterURI },
+        		{ displayModel, dataGetterURI },
+        		{ vreq },
         		{}
         	};
-        
+
         // look through the available constructors for the best fit
         for (Object[] argList: argLists) {
         	for (Constructor<?> ct: clz.getConstructors()) {
@@ -153,11 +153,11 @@ public class DataGetterUtils {
         		}
         	}
         }
-        
+
 		log.debug("Didn't find a suitable constructor for '" + dgClassName + "'");
         return null;
     }
-    
+
     private static boolean isConstructorSuitableForArguments(Constructor<?> ct, Object[] args) {
 		Class<?>[] parameterTypes = ct.getParameterTypes();
 		if (args.length != parameterTypes.length) {
@@ -176,16 +176,16 @@ public class DataGetterUtils {
         String query = prefixes +
         "SELECT ?type WHERE { ?dgURI rdf:type ?type } ";
         Query dgTypeQuery = QueryFactory.create(query);
-        
+
         QuerySolutionMap initialBindings = new QuerySolutionMap();
         initialBindings.add("dgURI", ResourceFactory.createResource( dataGetterURI ));
-        
-        List<String> types = new ArrayList<String>();         
+
+        List<String> types = new ArrayList<String>();
         displayModel.enterCriticalSection(false);
         try{
             QueryExecution qexec = QueryExecutionFactory.create(dgTypeQuery,displayModel,initialBindings );
-            try{                                                    
-                ResultSet results = qexec.execSelect();                
+            try{
+                ResultSet results = qexec.execSelect();
                 while (results.hasNext()) {
                     QuerySolution soln = results.nextSolution();
                     Resource type = soln.getResource("type");
@@ -195,26 +195,26 @@ public class DataGetterUtils {
                 }
             }finally{ qexec.close(); }
         }finally{ displayModel.leaveCriticalSection(); }
-        
-        
+
+
         return chooseType( types, dataGetterURI);
     }
-    
-    
+
+
     private static List<String> getDataGetterURIsForAssociatedURI(Model displayModel, String associatedURI) {
-        String query = prefixes + 
+        String query = prefixes +
              "SELECT ?dataGetter WHERE { ?associatedURI display:hasDataGetter ?dataGetter }";
         Query dgForUriQuery = QueryFactory.create(query);
-        
+
         QuerySolutionMap initialBindings = new QuerySolutionMap();
         initialBindings.add("associatedURI", ResourceFactory.createResource( associatedURI ));
-        
+
         List<String> dgURIs = new ArrayList<String>();
         displayModel.enterCriticalSection(false);
         try{
             QueryExecution qexec = QueryExecutionFactory.create(dgForUriQuery,displayModel,initialBindings );
-            try{                                                    
-                ResultSet results = qexec.execSelect();                
+            try{
+                ResultSet results = qexec.execSelect();
                 while (results.hasNext()) {
                     QuerySolution soln = results.nextSolution();
                     Resource dg = soln.getResource("dataGetter");
@@ -224,18 +224,18 @@ public class DataGetterUtils {
                 }
             }finally{ qexec.close(); }
         }finally{ displayModel.leaveCriticalSection(); }
-                
+
 		log.debug("Found " + dgURIs.size() +" DataGetter URIs for '" + associatedURI + "': " + dgURIs);
         return dgURIs;
     }
-    
+
     private static String chooseType(List<String> types, String dataGetterURI) throws IllegalAccessException {
         //currently just get the first one that is not owl:Thing
         for(String type : types){
             if( ! StringUtils.isEmpty( type ) && !type.equals( OWL.Thing.getURI() ))
                 return type;
         }
-        throw new IllegalAccessException("No useful type defined for <" + dataGetterURI + ">");        
+        throw new IllegalAccessException("No useful type defined for <" + dataGetterURI + ">");
     }
     //Copied from PageDaoJena
     static protected String nodeToString( RDFNode node ){
@@ -247,17 +247,17 @@ public class DataGetterUtils {
         }else if( node.isURIResource() ){
             Resource resource = node.asResource();
             return resource.getURI();
-        }else if( node.isAnon() ){  
+        }else if( node.isAnon() ){
             Resource resource = node.asResource();
             return resource.getId().getLabelString(); //get b-node id
         }else{
             return "";
         }
     }
-    
-    static final String prefixes = 
+
+    static final String prefixes =
         "PREFIX rdf:   <" + VitroVocabulary.RDF +"> \n" +
-        "PREFIX rdfs:  <" + VitroVocabulary.RDFS +"> \n" + 
+        "PREFIX rdfs:  <" + VitroVocabulary.RDFS +"> \n" +
         "PREFIX xsd:  <http://www.w3.org/2001/XMLSchema#> \n" +
         "PREFIX display: <" + DisplayVocabulary.DISPLAY_NS +"> \n";
 
@@ -265,52 +265,52 @@ public class DataGetterUtils {
     public static String generateDataGetterTypeURI(String dataGetterClassName) {
     	return "java:" + dataGetterClassName;
     }
-    
+
     public static final String getClassGroupForDataGetter(Model displayModel, String dataGetterURI) {
-    	String classGroupUri = null; 
+    	String classGroupUri = null;
     	QuerySolutionMap initBindings = new QuerySolutionMap();
          initBindings.add("dataGetterURI", ResourceFactory.createResource(dataGetterURI));
-         
+
          int count = 0;
          //Get the class group
-         Query dataGetterConfigurationQuery = QueryFactory.create(classGroupForDataGetterQuery) ;               
+         Query dataGetterConfigurationQuery = QueryFactory.create(classGroupForDataGetterQuery) ;
          displayModel.enterCriticalSection(Lock.READ);
          try{
              QueryExecution qexec = QueryExecutionFactory.create(
-                     dataGetterConfigurationQuery, displayModel, initBindings) ;        
+                     dataGetterConfigurationQuery, displayModel, initBindings) ;
              ResultSet res = qexec.execSelect();
-             try{                
+             try{
                  while( res.hasNext() ){
                      count++;
                      QuerySolution soln = res.next();
-                     
-                      
-                     
+
+
+
                      //model is OPTIONAL
                      RDFNode node = soln.getResource("classGroupUri");
                      if( node != null && node.isURIResource() ){
-                         classGroupUri = node.asResource().getURI();                        
+                         classGroupUri = node.asResource().getURI();
                      }else{
                          classGroupUri = null;
                      }
-                       
+
                  }
              }finally{ qexec.close(); }
          }finally{ displayModel.leaveCriticalSection(); }
          return classGroupUri;
     }
-    
+
     private static final String forClassGroupURI = "<" + DisplayVocabulary.FOR_CLASSGROUP + ">";
 
     private static final String classGroupForDataGetterQuery =
         "PREFIX display: <" + DisplayVocabulary.DISPLAY_NS +"> \n" +
         "SELECT ?classGroupUri WHERE { \n" +
         "  ?dataGetterURI "+forClassGroupURI+" ?classGroupUri . \n" +
-        "}";      
-    
-    
+        "}";
+
+
     /**
-     * 
+     *
      * Convert data to JSON for page uri based on type and related datagetters
      * TODO: How to handle different data getters?  Will this replace json fields or add to them?
      */
@@ -326,7 +326,7 @@ public class DataGetterUtils {
 	            	 /*
 	                 typeObj = getter.convertToJSON(data, vreq);
 	                 if( typeObj != null) {
-	                     //Copy over everything from this type Obj to 
+	                     //Copy over everything from this type Obj to
 	                     //TODO: Review how to handle duplicate keys, etc.
 	                     if(rObj != null) {
 	                         //For now, just nests as separate entry
@@ -334,47 +334,47 @@ public class DataGetterUtils {
 	                     } else {
 	                         rObj = typeObj;
 	                     }
-	                 } */     
-	        	
+	                 } */
+
 	            } catch(Throwable th){
 	                log.error(th,th);
 	            }
-	        }     
+	        }
         } catch(Throwable th) {
         	log.error(th, th);
         }
         return rObj;
     }
-    
-    
+
+
     /***
      * For the page, get the actual Data Getters to be employed.
      */
     /*
     public static List<PageDataGetter> DataGetterObjects(VitroRequest vreq, String pageUri) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
     	List<PageDataGetter> dataGetterObjects = new ArrayList<PageDataGetter>();
-    	
+
     	List<String> dataGetterClassNames = vreq.getWebappDaoFactory().getPageDao().getDataGetterClass(pageUri);
     	if( dataGetterClassNames == null )
     	    return Collections.emptyList();
-    	
+
     	for(String dgClassName: dataGetterClassNames) {
     		String className = getClassNameFromUri(dgClassName);
     		Class clz =  Class.forName(className);
-    		
-    		if( DataGetterUtils.isInstanceOfInterface(clz, PageDataGetter.class)){    		        		
+
+    		if( DataGetterUtils.isInstanceOfInterface(clz, PageDataGetter.class)){
     		    Object obj = clz.newInstance();
     		    if(obj != null && obj instanceof PageDataGetter) {
     		        PageDataGetter pg = (PageDataGetter) obj;
     		        dataGetterObjects.add(pg);
-    		    }	    		
+    		    }
     		}// else skip if class does not implement PageDataGetter
-    	} 
-	        
+    	}
+
     	return dataGetterObjects;
     }
     */
-    
+
     //Class URIs returned include "java:" and to instantiate object need to remove java: portion
     public static String getClassNameFromUri(String dataGetterClassUri) {
     	if( !StringUtils.isEmpty(dataGetterClassUri) && dataGetterClassUri.contains("java:")) {
@@ -385,9 +385,9 @@ public class DataGetterUtils {
     	}
     	return dataGetterClassUri;
     }
-    
 
-    
+
+
     /*
      * Copied from JSONServlet as expect this to be related to VitroClassGroup
      */
@@ -402,22 +402,22 @@ public class DataGetterUtils {
                 vcObj.put("entityCount", vc.getEntityCount());
                 classes.add(vcObj);
             }
-            map.put("classes", classes);                
+            map.put("classes", classes);
             map.put("classGroupName", vcg.getPublicName());
             map.put("classGroupUri", vcg.getURI());
-        
+
         } catch(Exception ex) {
             log.error("Error occurred in processing VClass group ", ex);
         }
-        return map;        
+        return map;
     }
-    
-	
+
+
     //Get All VClass Groups information
     //Used within menu management and processing
     //TODO: Check if more appropriate location possible
     public static List<HashMap<String, String>> getClassGroups(HttpServletRequest req) {
-    	//Wanted this to be 
+    	//Wanted this to be
     	VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(req);
         List<VClassGroup> vcgList = vcgc.getGroups();
         //For now encoding as hashmap with label and URI as trying to retrieve class group
@@ -431,8 +431,8 @@ public class DataGetterUtils {
         }
         return classGroups;
     }
-    
-    
+
+
    //TODO: Check whether this needs to be put here or elsewhere, as this is data getter specific
     //with respect to class groups
   //Need to use VClassGroupCache to retrieve class group information - this is the information returned from "for class group"
@@ -447,8 +447,8 @@ public class DataGetterUtils {
 		templateData.put("associatedPage", group.getPublicName());
 		templateData.put("associatedPageURI", group.getURI());
     }
-    
-	
-	
-    
+
+
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ExecuteDataRetrieval.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ExecuteDataRetrieval.java
index 6148a89ba..82c87251c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ExecuteDataRetrieval.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ExecuteDataRetrieval.java
@@ -17,7 +17,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 
 
 public class ExecuteDataRetrieval {
-    
+
     final static Log log = LogFactory.getLog(ExecuteDataRetrieval.class);
     Individual individual = null;
     VitroRequest vreq = null;
@@ -31,8 +31,8 @@ public class ExecuteDataRetrieval {
     	this.individual = individual;
     	this.vreq = vreq;
     	this.displayModel = displayModel;
-    }   
-    
+    }
+
     public List<DataGetter> retrieveDataGetters() {
     	//Using a hashset to prevent duplicates
     	//Would this work with interfaces? In this case, all of them would be interfaces?
@@ -45,7 +45,7 @@ public class ExecuteDataRetrieval {
 	    		String classURI = v.getURI();
 	    		//How to handle duplicates?
 	    		dataGetters.addAll(DataGetterUtils.getDataGettersForClass(vreq, displayModel, classURI));
-	    	} 
+	    	}
 	    }
     	catch(Exception ex) {
     		log.error("Error occurred in retrieving datagetters for vclasses", ex);
@@ -53,23 +53,23 @@ public class ExecuteDataRetrieval {
     	List<DataGetter> dgList = new ArrayList<DataGetter>(dataGetters);
     	return dgList;
     }
-    
+
     //retrieve data getters for the classes that apply to this individual
     //execute the data getters, and return the data in a map
-    public void executeDataGetters(Map<String, Object> mapForTemplate) 
+    public void executeDataGetters(Map<String, Object> mapForTemplate)
     throws Exception {
         List<DataGetter> dgList = retrieveDataGetters();
-        //Put in individual URI in map for template - e.g. sparql query can then use that information and add bindings    
+        //Put in individual URI in map for template - e.g. sparql query can then use that information and add bindings
         mapForTemplate.put("individualURI", this.individual.getURI());
-        for( DataGetter dg : dgList){            
-            Map<String,Object> moreData = dg.getData(mapForTemplate);            
+        for( DataGetter dg : dgList){
+            Map<String,Object> moreData = dg.getData(mapForTemplate);
             if( moreData != null ){
                 mapForTemplate.putAll(moreData);
             }
-        }                       
+        }
     }
-    
-	
-	
-    
+
+
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/FixedHTMLDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/FixedHTMLDataGetter.java
index 6723beb19..33d7afd3b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/FixedHTMLDataGetter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/FixedHTMLDataGetter.java
@@ -24,28 +24,28 @@ import org.apache.jena.shared.Lock;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
 
-public class FixedHTMLDataGetter extends DataGetterBase implements DataGetter{    
+public class FixedHTMLDataGetter extends DataGetterBase implements DataGetter{
     String dataGetterURI;
     String htmlValue;
     String saveToVar;
     VitroRequest vreq;
     ServletContext context;
     private final static String defaultTemplate = "menupage--defaultFixedHtml.ftl";
-    
+
     final static Log log = LogFactory.getLog(FixedHTMLDataGetter.class);
-    
+
     /**
      * Constructor with display model and data getter URI that will be called by reflection.
      */
     public FixedHTMLDataGetter(VitroRequest vreq, Model displayModel, String dataGetterURI){
         this.configure(vreq, displayModel,dataGetterURI);
-    }        
-    
+    }
+
     @Override
-    public Map<String, Object> getData(Map<String, Object> pageData) {     
+    public Map<String, Object> getData(Map<String, Object> pageData) {
     	 Map<String, Object> rmap = new HashMap<String,Object>();
     	 rmap.put("variableName", this.saveToVar);
-         rmap.put(this.saveToVar, this.htmlValue); 
+         rmap.put(this.saveToVar, this.htmlValue);
          //this is the default template set here - overridden by page level template if there is one
          rmap.put("bodyTemplate", defaultTemplate);
          return rmap;
@@ -55,59 +55,59 @@ public class FixedHTMLDataGetter extends DataGetterBase implements DataGetter{
      * Configure this instance based on the URI and display model.
      */
     protected void configure(VitroRequest vreq, Model displayModel, String dataGetterURI) {
-    	if( vreq == null ) 
+    	if( vreq == null )
     		throw new IllegalArgumentException("VitroRequest  may not be null.");
-        if( displayModel == null ) 
+        if( displayModel == null )
             throw new IllegalArgumentException("Display Model may not be null.");
         if( dataGetterURI == null )
             throw new IllegalArgumentException("PageUri may not be null.");
-                
+
         this.vreq = vreq;
         this.context = vreq.getSession().getServletContext();
-        this.dataGetterURI = dataGetterURI;        
-        
+        this.dataGetterURI = dataGetterURI;
+
         QuerySolutionMap initBindings = new QuerySolutionMap();
         initBindings.add("dataGetterURI", ResourceFactory.createResource(this.dataGetterURI));
-        
+
         int count = 0;
-        Query dataGetterConfigurationQuery = QueryFactory.create(dataGetterQuery) ;               
+        Query dataGetterConfigurationQuery = QueryFactory.create(dataGetterQuery) ;
         displayModel.enterCriticalSection(Lock.READ);
         try{
             QueryExecution qexec = QueryExecutionFactory.create(
-                    dataGetterConfigurationQuery, displayModel, initBindings) ;        
+                    dataGetterConfigurationQuery, displayModel, initBindings) ;
             ResultSet res = qexec.execSelect();
-            try{                
+            try{
                 while( res.hasNext() ){
                     count++;
                     QuerySolution soln = res.next();
-                    
+
                     // is NOT OPTIONAL
                     Literal value = soln.getLiteral("htmlValue");
                     if( dataGetterConfigurationQuery == null )
                         log.error("no html value defined for page " + this.dataGetterURI);
                     else
-                        this.htmlValue = value.getLexicalForm();                    
-                    
-                        
+                        this.htmlValue = value.getLexicalForm();
+
+
                     //saveToVar is OPTIONAL
                     Literal saveTo = soln.getLiteral("saveToVar");
                     if( saveTo != null && saveTo.isLiteral() ){
-                        this.saveToVar = saveTo.asLiteral().getLexicalForm();                        
+                        this.saveToVar = saveTo.asLiteral().getLexicalForm();
                     }else{
                         this.saveToVar = defaultVarNameForResults;
                     }
                 }
             }finally{ qexec.close(); }
-        }finally{ displayModel.leaveCriticalSection(); }                
+        }finally{ displayModel.leaveCriticalSection(); }
     }
-    
-    
+
+
 
         private static final String saveToVarPropertyURI= "<" + DisplayVocabulary.SAVE_TO_VAR+ ">";
     private static final String htmlValuePropertyURI= "<" + DisplayVocabulary.FIXED_HTML_VALUE+ ">";
 
     public static final String defaultVarNameForResults = "results";
-    
+
     /**
      * Query to get the definition of the SparqlDataGetter for a given URI.
      */
@@ -116,7 +116,7 @@ public class FixedHTMLDataGetter extends DataGetterBase implements DataGetter{
         "SELECT ?saveToVar ?htmlValue WHERE { \n" +
         "  ?dataGetterURI "+saveToVarPropertyURI+" ?saveToVar . \n" +
         "  ?dataGetterURI "+htmlValuePropertyURI+" ?htmlValue . \n" +
-        "}";      
+        "}";
+
 
-   
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/IndividualsForClassesDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/IndividualsForClassesDataGetter.java
index 1be0d1d08..a1bebd3a1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/IndividualsForClassesDataGetter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/IndividualsForClassesDataGetter.java
@@ -39,7 +39,7 @@ import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassGroupTemplateMo
 /**
  * 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.     
+ * vClassGroup: a data structure that is the classgroup associated with this page.
  */
 public class IndividualsForClassesDataGetter extends DataGetterBase implements DataGetter{
     private static final Log log = LogFactory.getLog(IndividualsForClassesDataGetter.class);
@@ -56,26 +56,26 @@ public class IndividualsForClassesDataGetter extends DataGetterBase implements D
      */
     public IndividualsForClassesDataGetter(VitroRequest vreq, Model displayModel, String dataGetterURI){
         this.configure(vreq,displayModel,dataGetterURI);
-    }   
-    
+    }
+
     /**
      * Configure this instance based on the URI and display model.
      */
     protected void configure(VitroRequest vreq, Model displayModel, String dataGetterURI) {
-    	if( vreq == null ) 
+    	if( vreq == null )
     		throw new IllegalArgumentException("VitroRequest  may not be null.");
-        if( displayModel == null ) 
+        if( displayModel == null )
             throw new IllegalArgumentException("Display Model may not be null.");
         if( dataGetterURI == null )
             throw new IllegalArgumentException("PageUri may not be null.");
-                
+
         this.vreq = vreq;
         this.context = vreq.getSession().getServletContext();
-        this.dataGetterURI = dataGetterURI;   
+        this.dataGetterURI = dataGetterURI;
         this.classGroupURI = DataGetterUtils.getClassGroupForDataGetter(displayModel, dataGetterURI);
         this.classIntersectionsMap = getClassIntersectionsMap(displayModel);
     }
-    
+
     /**
      * Get the classes and classes to restrict by - if any
      */
@@ -92,7 +92,7 @@ public class IndividualsForClassesDataGetter extends DataGetterBase implements D
 	          try{
 	              List<String>  restrictClasses = new ArrayList<String>();
 	              HashMap<String, String> restrictClassesPresentMap = new HashMap<String, String>();
-	              ResultSet resultSet = qexec.execSelect();        
+	              ResultSet resultSet = qexec.execSelect();
 	              while(resultSet.hasNext()){
 	                  QuerySolution soln = resultSet.next();
 	                  classes.add(DataGetterUtils.nodeToString(soln.get("class")));
@@ -102,12 +102,12 @@ public class IndividualsForClassesDataGetter extends DataGetterBase implements D
 	                  	restrictClassesPresentMap.put(restrictClass, "true");
 	                  }
 	              }
-	              
+
 	              if( classes.size() == 0 ){
 	                  log.debug("No classes  defined in display model for "+ this.dataGetterURI);
 	                  this.classIntersectionsMap =  null;
 	              }
-	              classesAndRestrictions.put("classes", classes);  
+	              classesAndRestrictions.put("classes", classes);
 	              classesAndRestrictions.put("restrictClasses", restrictClasses);
 	              return classesAndRestrictions;
 
@@ -117,14 +117,14 @@ public class IndividualsForClassesDataGetter extends DataGetterBase implements D
 	      }finally{
 	          displayModel.leaveCriticalSection();
 	      }
-               
+
     }
-    
+
     @Override
-    public Map<String, Object> getData(Map<String, Object> pageData) { 
+    public Map<String, Object> getData(Map<String, Object> pageData) {
         this.setTemplateName();
     	HashMap<String, Object> data = new HashMap<String,Object>();
-        
+
         try{
         	List<String> classes = retrieveClasses(context, classIntersectionsMap);
         	List<String> restrictClasses = retrieveRestrictClasses(context, classIntersectionsMap);
@@ -140,35 +140,35 @@ public class IndividualsForClassesDataGetter extends DataGetterBase implements D
         } catch(Exception ex) {
         	log.error("An error occurred retrieving Vclass Intersection individuals", ex);
         }
-             
+
         return data;
-    }        
-   
+    }
+
     protected void setTemplateName() {
     	this.restrictClassesTemplateName = "restricted";
     }
-    
-    
+
+
     protected List<String> retrieveClasses(
 			ServletContext context, Map<String, Object> classIntersectionsMap) {
     	List<String> restrictClasses = (List<String>) classIntersectionsMap.get("classes");
 		return restrictClasses;
-	}    
-    
+	}
+
     protected List<String> retrieveRestrictClasses(
 			ServletContext context, Map<String, Object> classIntersectionsMap) {
     	List<String> restrictClasses = (List<String>) classIntersectionsMap.get("restrictClasses");
 		return restrictClasses;
-	}        
-    
-    protected void processClassesAndRestrictions(VitroRequest vreq, ServletContext context, 
+	}
+
+    protected void processClassesAndRestrictions(VitroRequest vreq, ServletContext context,
     		HashMap<String, Object> data, List<String> classes, List<String> restrictClasses ) {
     	processClassesForDisplay(vreq, context, data, classes);
     	processRestrictionClasses(vreq, data, restrictClasses);
     	processIntersections(vreq, context, data);
-    	
+
     }
-    
+
 
 
 	//At this point, data specifices whether or not intersections included
@@ -190,7 +190,7 @@ public class IndividualsForClassesDataGetter extends DataGetterBase implements D
     			if(oldCount != count) {
     				log.debug("Old count was " + v.getEntityCount() + " and New count for " + v.getURI() + " is " + count);
     				copyVClass.setEntityCount(count);
-    			} 
+    			}
     			newVClassList.add(copyVClass);
     		}
     		classesGroup.setVitroClassList(newVClassList);
@@ -208,7 +208,7 @@ public class IndividualsForClassesDataGetter extends DataGetterBase implements D
 		copyVClass.setEntityCount(v.getEntityCount());
 		return copyVClass;
     }
-    
+
     //update class count based on restrict classes
 	private int retrieveCount(VitroRequest vreq, ServletContext context, VClass v, List<VClass> restrictClasses) {
 		//Execute search query that returns only count of individuals
@@ -229,7 +229,7 @@ public class IndividualsForClassesDataGetter extends DataGetterBase implements D
     	classesGroup.setURI("displayClasses");
     	log.debug("Processing classes that will be displayed");
     	List<VClass> vClasses = new ArrayList<VClass>();
-  
+
     	VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
     	for(String classUri: classes) {
     		//Retrieve vclass from cache to get the count
@@ -254,16 +254,16 @@ public class IndividualsForClassesDataGetter extends DataGetterBase implements D
     	log.debug("Returning vitro class list in data for template");
     	//Set vclass group
     	data.put("vClassGroup", classesGroup);
-    }	
-    
-    private void processRestrictionClasses(VitroRequest vreq, 
+    }
+
+    private void processRestrictionClasses(VitroRequest vreq,
     		HashMap<String, Object> data, List<String> restrictClasses) {
     	try {
 	    	VClassGroup restrictClassesGroup = new VClassGroup();
 	    	restrictClassesGroup.setURI("restrictClasses");
-	    	
+
 	    	List<VClass> restrictVClasses = new ArrayList<VClass>();
-	    	
+
 	    	List<String> urlEncodedRestrictClasses = new ArrayList<String>();
 	    	VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
 
@@ -287,15 +287,15 @@ public class IndividualsForClassesDataGetter extends DataGetterBase implements D
 	        		//Assuming utf-8?
 	        		urlEncodedRestrictClasses.add(URLEncoder.encode(restrictClassUri, "UTF-8"));
 	    		}
-	    	
+
 	    		restrictClassesGroup.setVitroClassList(restrictVClasses);
 	    		restrictClassesGroup.setIndividualCount(restrictVClasses.size());
 	    	} else {
-	    		
+
 	    	}
 	    	String[] restrictClassesArray = new String[urlEncodedRestrictClasses.size()];
 	    	restrictClassesArray = urlEncodedRestrictClasses.toArray(restrictClassesArray);
-	    	
+
 	    	//In case just want uris
 	    	log.debug("Variable name for including restriction classes " +  getRestrictClassesTemplateName());
 	    	data.put(getRestrictClassesTemplateName(), StringUtils.join(restrictClassesArray, ","));
@@ -306,9 +306,9 @@ public class IndividualsForClassesDataGetter extends DataGetterBase implements D
     		log.error("An error occurred in processing restriction classes ", ex);
     	}
     }
-    
+
     public static VClassGroupTemplateModel getClassGroup(String classGroupUri, VitroRequest vreq){
-        
+
         VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
         List<VClassGroup> vcgList = vcgc.getGroups();
         VClassGroup group = null;
@@ -318,8 +318,8 @@ public class IndividualsForClassesDataGetter extends DataGetterBase implements D
                 break;
             }
         }
-        
-        if( classGroupUri != null && !classGroupUri.isEmpty() && group == null ){ 
+
+        if( classGroupUri != null && !classGroupUri.isEmpty() && group == null ){
             /*This could be for two reasons: one is that the classgroup doesn't exist
              * The other is that there are no individuals in any of the classgroup's classes */
             group = vreq.getWebappDaoFactory().getVClassGroupDao().getGroupByURI(classGroupUri);
@@ -330,7 +330,7 @@ public class IndividualsForClassesDataGetter extends DataGetterBase implements D
                     if( classGroupUri.equals(vcg.getURI()) ){
                         group = vcg;
                         break;
-                    }                                
+                    }
                 }
                 if( group == null ){
                     log.error("Cannot get classgroup '" + classGroupUri + "'");
@@ -341,21 +341,21 @@ public class IndividualsForClassesDataGetter extends DataGetterBase implements D
             }else{
                 log.error("classgroup " + classGroupUri + " does not exist in the system");
                 return null;
-            }            
+            }
         }
-        
+
         return new VClassGroupTemplateModel(group);
     }
-    
+
     public String getType(){
         return DataGetterUtils.generateDataGetterTypeURI(IndividualsForClassesDataGetter.class.getName());
-    } 
-    
+    }
+
     //Get data servuice
     public String getDataServiceUrl() {
     	return UrlBuilder.getUrl("/dataservice?getRenderedSearchIndividualsByVClass=1&vclassId=");
     }
-    
+
     /**
      * For processig of JSONObject
      */
@@ -368,41 +368,41 @@ public class IndividualsForClassesDataGetter extends DataGetterBase implements D
             vc.setEntityCount(0);
         }
     }
-    
+
     protected static String getAlphaParameter(VitroRequest request){
         return request.getParameter("alpha");
     }
-    
+
     protected static int getPageParameter(VitroRequest request) {
         String pageStr = request.getParameter("page");
         if( pageStr != null ){
             try{
-                return Integer.parseInt(pageStr);                
+                return Integer.parseInt(pageStr);
             }catch(NumberFormatException nfe){
                 log.debug("could not parse page parameter");
                 return 1;
-            }                
-        }else{                   
+            }
+        }else{
             return 1;
         }
     }
-    
+
     //Get template parameter
     private static String getRestrictClassesTemplateName() {
     	return restrictClassesTemplateName;
 
     }
-    
-    private static final String prefixes = 
+
+    private static final String prefixes =
         "PREFIX rdf:   <" + VitroVocabulary.RDF +"> \n" +
-        "PREFIX rdfs:  <" + VitroVocabulary.RDFS +"> \n" + 
+        "PREFIX rdfs:  <" + VitroVocabulary.RDFS +"> \n" +
         "PREFIX xsd:  <http://www.w3.org/2001/XMLSchema#> \n" +
         "PREFIX display: <" + DisplayVocabulary.DISPLAY_NS +"> \n";
-    
-    private static final String dataGetterQuery = 
-    	prefixes + "\n" + 
+
+    private static final String dataGetterQuery =
+    	prefixes + "\n" +
    	 "SELECT ?class ?restrictClass WHERE {\n" +
         " ?dataGetterUri <" + DisplayVocabulary.GETINDIVIDUALS_FOR_CLASS + "> ?class . \n" +
-        "    OPTIONAL {?dg <"+ DisplayVocabulary.RESTRICT_RESULTS_BY + "> ?restrictClass } .\n" +    
+        "    OPTIONAL {?dg <"+ DisplayVocabulary.RESTRICT_RESULTS_BY + "> ?restrictClass } .\n" +
         "} \n" ;
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SearchIndividualsDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SearchIndividualsDataGetter.java
index 4b1bbc6e9..9e30fc51d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SearchIndividualsDataGetter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SearchIndividualsDataGetter.java
@@ -38,36 +38,36 @@ import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
 import edu.cornell.mannlib.vitro.webapp.utils.searchengine.SearchQueryUtils;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividual;
 
-public class SearchIndividualsDataGetter extends DataGetterBase implements DataGetter{    
+public class SearchIndividualsDataGetter extends DataGetterBase implements DataGetter{
     String dataGetterURI;
     List<String> vclassUris = null;
     String saveToVar;
     VitroRequest vreq;
     ServletContext context;
-    
-    
+
+
     final static Log log = LogFactory.getLog(SearchIndividualsDataGetter.class);
     //default template
     private final static String defaultTemplate = "menupage--defaultSearchIndividuals.ftl";
-    
+
     /**
      * Constructor with display model and data getter URI that will be called by reflection.
      */
     public SearchIndividualsDataGetter(VitroRequest vreq, Model displayModel, String dataGetterURI){
         this.configure(vreq, displayModel,dataGetterURI);
-    }        
-    
+    }
+
     //For now, vClassURI should be passed in within model
     //We are also including ability to pass as parameter
     @Override
-    public Map<String, Object> getData(Map<String, Object> pageData) { 
+    public Map<String, Object> getData(Map<String, Object> pageData) {
     	// Merge the pageData with the request parameters. PageData overrides
     	Map<String, String[]> merged = new HashMap<String, String[]>();
     	merged.putAll(vreq.getParameterMap());
     	for (String key: pageData.keySet()) {
     		merged.put(key, new String[] {String.valueOf(pageData.get(key))});
     	}
-    	
+
         return doSearchQuery( merged);
     }
 
@@ -75,55 +75,55 @@ public class SearchIndividualsDataGetter extends DataGetterBase implements DataG
      * Configure this instance based on the URI and display model.
      */
     protected void configure(VitroRequest vreq, Model displayModel, String dataGetterURI) {
-    	if( vreq == null ) 
+    	if( vreq == null )
     		throw new IllegalArgumentException("VitroRequest  may not be null.");
-        if( displayModel == null ) 
+        if( displayModel == null )
             throw new IllegalArgumentException("Display Model may not be null.");
         if( dataGetterURI == null )
             throw new IllegalArgumentException("PageUri may not be null.");
-                
+
         this.vreq = vreq;
         this.context = vreq.getSession().getServletContext();
-        this.dataGetterURI = dataGetterURI;        
+        this.dataGetterURI = dataGetterURI;
         this.vclassUris = new ArrayList<String>();
         QuerySolutionMap initBindings = new QuerySolutionMap();
         initBindings.add("dataGetterURI", ResourceFactory.createResource(this.dataGetterURI));
-        
+
         int count = 0;
-        Query dataGetterConfigurationQuery = QueryFactory.create(dataGetterQuery) ;               
+        Query dataGetterConfigurationQuery = QueryFactory.create(dataGetterQuery) ;
         displayModel.enterCriticalSection(Lock.READ);
         try{
             QueryExecution qexec = QueryExecutionFactory.create(
-                    dataGetterConfigurationQuery, displayModel, initBindings) ;        
+                    dataGetterConfigurationQuery, displayModel, initBindings) ;
             ResultSet res = qexec.execSelect();
-            try{                
+            try{
                 while( res.hasNext() ){
                     count++;
                     QuerySolution soln = res.next();
-                                
+
                     //saveToVar is OPTIONAL
                     Literal saveTo = soln.getLiteral("saveToVar");
                     if( saveTo != null && saveTo.isLiteral() ){
-                        this.saveToVar = saveTo.asLiteral().getLexicalForm();                        
+                        this.saveToVar = saveTo.asLiteral().getLexicalForm();
                     }else{
                         this.saveToVar = defaultVarNameForResults;
                     }
-                    
+
                   //vclass uri is OPTIONAL
                     //Right now, only anticipating one but will need to change this if this is in fact a list
                     String vclassUriStr = null;
                     Resource vclassUri = soln.getResource("vclassUri");
                     if( vclassUri != null && vclassUri.isResource() ){
-                        vclassUriStr = vclassUri.getURI();                        
+                        vclassUriStr = vclassUri.getURI();
                     }
                     if(vclassUriStr != null) {
                     	this.vclassUris.add(vclassUriStr);
                     }
                 }
             }finally{ qexec.close(); }
-        }finally{ displayModel.leaveCriticalSection(); }                
+        }finally{ displayModel.leaveCriticalSection(); }
     }
-    
+
 
     //Partially copied from IndividualListController
     private  Map<String, Object> doSearchQuery( Map<String, String[]> merged) {
@@ -134,7 +134,7 @@ public class SearchIndividualsDataGetter extends DataGetterBase implements DataG
     			log.error("No vclass uri found.  Search query will not work");
     		}
     	}
-    	
+
     	Map<String, Object> body = new HashMap<String, Object>();
 
     	//Right now, just getting the first vclass uri, but will have to review how to get intersections or multiple classes
@@ -143,16 +143,16 @@ public class SearchIndividualsDataGetter extends DataGetterBase implements DataG
 	    	//First, get the vclass object
 	    	 VClass vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(vClassURI);
 	         if (vclass == null) {
-	             log.error("Couldn't retrieve vclass " + vClassURI);   
+	             log.error("Couldn't retrieve vclass " + vClassURI);
 	         }
-	         
+
 	        String vclassUri = vclass.getURI();
          	body.put("vclassId", vclassUri);
          	vreq.setAttribute("displayType", vclassUri); // used by the template model object
          	//Am not sure why an attribute is used here instead of just sending this in as data to the template?
-	         
-	      // Set title and subtitle. 
-             VClassGroup classGroup = vclass.getGroup();  
+
+	      // Set title and subtitle.
+             VClassGroup classGroup = vclass.getGroup();
              String title;
              if (classGroup == null) {
                  title = vclass.getName();
@@ -174,12 +174,12 @@ public class SearchIndividualsDataGetter extends DataGetterBase implements DataG
 	    	String alpha = SearchQueryUtils.getAlphaParameter(vreq);
 	        int page = SearchQueryUtils.getPageParameter(vreq);
 	        IndividualListResults vcResults = IndividualListController.getResultsForVClass(
-	                vclass.getURI(), 
-	                page, 
-	                alpha, 
-	                vreq);                                
+	                vclass.getURI(),
+	                page,
+	                alpha,
+	                vreq);
 	        body.putAll(vcResults.asFreemarkerMap());
-	
+
 	        List<Individual> inds = vcResults.getEntities();
 	        List<ListedIndividual> indsTm = new ArrayList<ListedIndividual>();
 	        if (inds != null) {
@@ -187,8 +187,8 @@ public class SearchIndividualsDataGetter extends DataGetterBase implements DataG
 	                indsTm.add(ListedIndividualBuilder.build(ind,vreq));
 	            }
 	        }
-	        body.put("individuals", indsTm);    
-	        body.put("rdfUrl", UrlBuilder.getUrl("/listrdf", "vclass", vclass.getURI())); 
+	        body.put("individuals", indsTm);
+	        body.put("rdfUrl", UrlBuilder.getUrl("/listrdf", "vclass", vclass.getURI()));
         } catch (SearchException ex) {
             log.error("Error retrieving results for display.", ex);
         }
@@ -202,7 +202,7 @@ public class SearchIndividualsDataGetter extends DataGetterBase implements DataG
 
 
     public static final String defaultVarNameForResults = "results";
-    
+
     /**
      * Query to get the definition of the search individuals data getter for a given URI.
      */
@@ -211,7 +211,7 @@ public class SearchIndividualsDataGetter extends DataGetterBase implements DataG
         "SELECT ?vclassUri ?saveToVar WHERE { \n" +
         "  OPTIONAL{ ?dataGetterURI "+saveToVarPropertyURI+" ?saveToVar } \n " +
         "  OPTIONAL{ ?dataGetterURI "+vclassIdPropertyURI+" ?vclassUri } \n " +
-        "}";      
+        "}";
+
 
-   
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java
index a0a4c2c93..7c1da263e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java
@@ -33,7 +33,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils;
 
 public class SparqlQueryDataGetter extends DataGetterBase implements DataGetter{
 	private final static Log log = LogFactory.getLog(SparqlQueryDataGetter.class);
-	
+
     private static final String queryPropertyURI = "<" + DisplayVocabulary.QUERY + ">";
     private static final String saveToVarPropertyURI= "<" + DisplayVocabulary.SAVE_TO_VAR+ ">";
     private static final String queryModelPropertyURI= "<" + DisplayVocabulary.QUERY_MODEL+ ">";
@@ -47,72 +47,72 @@ public class SparqlQueryDataGetter extends DataGetterBase implements DataGetter{
     String modelURI;
     VitroRequest vreq;
     ServletContext context;
-    
+
     /**
      * Constructor with display model and data getter URI that will be called by reflection.
      */
     public SparqlQueryDataGetter(VitroRequest vreq, Model displayModel, String dataGetterURI){
         this.configure(vreq, displayModel,dataGetterURI);
-    }        
-    
+    }
+
 	/**
      * Configure this instance based on the URI and display model.
      */
     @SuppressWarnings("hiding")
 	protected void configure(VitroRequest vreq, Model displayModel, String dataGetterURI) {
-    	if( vreq == null ) 
+    	if( vreq == null )
     		throw new IllegalArgumentException("VitroRequest  may not be null.");
-        if( displayModel == null ) 
+        if( displayModel == null )
             throw new IllegalArgumentException("Display Model may not be null.");
         if( dataGetterURI == null )
             throw new IllegalArgumentException("PageUri may not be null.");
-                
+
         this.vreq = vreq;
         this.context = vreq.getSession().getServletContext();
-        this.dataGetterURI = dataGetterURI;        
-        
+        this.dataGetterURI = dataGetterURI;
+
         QuerySolutionMap initBindings = new QuerySolutionMap();
         initBindings.add("dataGetterURI", ResourceFactory.createResource(this.dataGetterURI));
-        
-        Query dataGetterConfigurationQuery = QueryFactory.create(dataGetterQuery) ;               
+
+        Query dataGetterConfigurationQuery = QueryFactory.create(dataGetterQuery) ;
         displayModel.enterCriticalSection(Lock.READ);
         try{
             QueryExecution qexec = QueryExecutionFactory.create(
-                    dataGetterConfigurationQuery, displayModel, initBindings) ;        
+                    dataGetterConfigurationQuery, displayModel, initBindings) ;
             ResultSet res = qexec.execSelect();
-            try{                
+            try{
                 while( res.hasNext() ){
                     QuerySolution soln = res.next();
-                    
+
                     //query is NOT OPTIONAL
                     Literal value = soln.getLiteral("query");
                     if( dataGetterConfigurationQuery == null )
                         log.error("no query defined for page " + this.dataGetterURI);
                     else
-                        this.queryText = value.getLexicalForm();                    
-                    
-                    //model is OPTIONAL                    
+                        this.queryText = value.getLexicalForm();
+
+                    //model is OPTIONAL
                     RDFNode node = soln.get("queryModel");
                     if( node != null && node.isURIResource() ){
-                        this.modelURI = node.asResource().getURI();                        
+                        this.modelURI = node.asResource().getURI();
                     }else if( node != null && node.isLiteral() ){
-                        this.modelURI = node.asLiteral().getLexicalForm();                        
+                        this.modelURI = node.asLiteral().getLexicalForm();
                     }else{
                         this.modelURI = null;
                     }
-                        
+
                     //saveToVar is OPTIONAL
                     Literal saveTo = soln.getLiteral("saveToVar");
                     if( saveTo != null && saveTo.isLiteral() ){
-                        this.saveToVar = saveTo.asLiteral().getLexicalForm();                        
+                        this.saveToVar = saveTo.asLiteral().getLexicalForm();
                     }else{
                         this.saveToVar = defaultVarNameForResults;
                     }
                 }
             }finally{ qexec.close(); }
-        }finally{ displayModel.leaveCriticalSection(); }                
+        }finally{ displayModel.leaveCriticalSection(); }
     }
-    
+
     /**
      * Query to get the definition of the SparqlDataGetter for a given URI.
      */
@@ -122,13 +122,13 @@ public class SparqlQueryDataGetter extends DataGetterBase implements DataGetter{
         "  ?dataGetterURI "+queryPropertyURI+" ?query . \n" +
         "  OPTIONAL{ ?dataGetterURI "+saveToVarPropertyURI+" ?saveToVar } \n " +
         "  OPTIONAL{ ?dataGetterURI "+queryModelPropertyURI+" ?queryModel } \n" +
-        "}";      
+        "}";
+
 
-   
     @Override
-    public Map<String, Object> getData(Map<String, Object> pageData) { 
+    public Map<String, Object> getData(Map<String, Object> pageData) {
     	Map<String, String> merged = mergeParameters(vreq.getParameterMap(), pageData);
-    	
+
     	String boundQueryText = bindParameters(queryText, merged);
 
     	if (modelURI != null) {
@@ -158,7 +158,7 @@ public class SparqlQueryDataGetter extends DataGetterBase implements DataGetter{
 	/**
 	 * InitialBindings don't always work, and besides, RDFService doesn't accept
 	 * them. So do a text-based substitution.
-	 * 
+	 *
 	 * This assumes that every parameter is a URI. What if we want to substitute
 	 * a string value?
 	 */
@@ -199,10 +199,10 @@ public class SparqlQueryDataGetter extends DataGetterBase implements DataGetter{
     	if (query == null) {
             return Collections.emptyMap();
         }
-        
+
         return assembleMap(executeQuery( query, queryModel));
     }
-    
+
 	private Query makeQuery(String q) {
 		try {
 			return QueryFactory.create(q);
@@ -213,11 +213,11 @@ public class SparqlQueryDataGetter extends DataGetterBase implements DataGetter{
 	}
 
 	private List<Map<String, String>> executeQuery(Query query, Model model) {
-        model.enterCriticalSection(Lock.READ);        
-        try{            
+        model.enterCriticalSection(Lock.READ);
+        try{
             QueryExecution qexec= QueryExecutionFactory.create(query, model );
             ResultSet results = qexec.execSelect();
-            try{                
+            try{
             	return parseResults(results);
             }finally{ qexec.close(); }
         }finally{ model.leaveCriticalSection(); }
@@ -231,23 +231,23 @@ public class SparqlQueryDataGetter extends DataGetterBase implements DataGetter{
         while (results.hasNext()) {
             QuerySolution soln = results.nextSolution();
             rows.add( toRow( soln ) );
-        }                   
-        return rows;        
+        }
+        return rows;
 	}
 
 	/**
-     * Converts a row from a QuerySolution to a Map<String,String> 
+     * Converts a row from a QuerySolution to a Map<String,String>
      */
     private Map<String, String> toRow(QuerySolution soln) {
-        HashMap<String,String> row = new HashMap<String,String>();        
+        HashMap<String,String> row = new HashMap<String,String>();
         Iterator<String> varNames = soln.varNames();
         while( varNames.hasNext()){
-            String varname = varNames.next();            
-            row.put(varname, toCell( soln.get(varname)));            
+            String varname = varNames.next();
+            row.put(varname, toCell( soln.get(varname)));
         }
         return row;
     }
-    
+
     private String toCell(RDFNode rdfNode) {
         if( rdfNode == null){
             return "";
@@ -259,23 +259,23 @@ public class SparqlQueryDataGetter extends DataGetterBase implements DataGetter{
                 return resource.getURI();
             }else{
                 return resource.getId().getLabelString();
-            }                
+            }
         }else{
             return rdfNode.toString();
-        }   
+        }
     }
 
 	private Map<String, Object> assembleMap(List<Map<String, String>> results) {
 		Map<String, Object> rmap = new HashMap<String,Object>();
-        
+
         //put results in page data
-        rmap.put(this.saveToVar, results);  
+        rmap.put(this.saveToVar, results);
         //also store the variable name within which results will be returned
         rmap.put("variableName", this.saveToVar);
         //This will be overridden at page level in display model if template specified there
         rmap.put("bodyTemplate", defaultTemplate);
-        
-        return rmap;        
+
+        return rmap;
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/DeveloperSettings.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/DeveloperSettings.java
index f35deb1e7..b030db008 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/DeveloperSettings.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/DeveloperSettings.java
@@ -25,23 +25,23 @@ import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 
 /**
  * A singleton holder for the developer settings.
- * 
+ *
  * Start with an empty settings map.
- * 
+ *
  * The Setup class will read "developer.properties" from the "config"
  * sub-directory of the Vitro home directory, and load its settings. If the file
  * doesn't exist, or doesn't contain values for certain properties, those
  * properties will keep their default values.
- * 
+ *
  * An AJAX request can be used to update the properties. If the request has
  * multiple values for a property, the first value will be used. If the request
  * does not contain a value for a property, that property will keep its current
  * value.
- * 
+ *
  * The property names in "developer.properties" are not suitable as fields in
  * the HTML panel, because they contain periods. For the HTML panel, we
  * translate those periods to underscores.
- * 
+ *
  * If the ENABLED flag is not set, then getBinary() will return false for all
  * keys, and getString() will return the empty string. This simplifies the logic
  * in the client code. Use getRawSettingsMap() to display the actual values in
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/DeveloperSettingsServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/DeveloperSettingsServlet.java
index b28b2d568..147e3655c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/DeveloperSettingsServlet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/DeveloperSettingsServlet.java
@@ -26,12 +26,12 @@ import edu.cornell.mannlib.vitro.webapp.services.freemarker.FreemarkerProcessing
  * Accept an AJAX request to update the developer settings. Return an HTML
  * representation of the developer panel from the settings and a Freemarker
  * template.
- * 
+ *
  * If developer mode is not enabled, the HTML response is empty.
- * 
+ *
  * You may only control the panel if you are logged in with sufficient
  * authorization, or if anonymous control is permitted by the settings.
- * 
+ *
  * If you are not allowed to control the panel, then the HTML response
  * is only a statement that developer mode is enabled. Otherwise, it
  * is a full panel (collapsed at first).
@@ -74,7 +74,7 @@ public class DeveloperSettingsServlet extends VitroAjaxController {
 		Map<String, Object> settingsMap = new HashMap<>();
 		settingsMap.putAll(settings.getRawSettingsMap());
 		settingsMap.put("mayControl", authorized);
-		
+
 		Map<String, Object> bodyMap = new HashMap<>();
 		bodyMap.put("settings", settingsMap);
 		return bodyMap;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/Key.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/Key.java
index 6f4db67c6..4414c1b8d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/Key.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/Key.java
@@ -7,13 +7,13 @@ import org.apache.commons.logging.LogFactory;
 
 /**
  * Keys for the DeveloperSettings. Each key holds these values:
- * 
+ *
  * A property name, which specifies the key in developer.properties, like
  * "this.thatThing"
- * 
+ *
  * A flag to say whether this key controls a boolean value. If false, then the
  * value is a string.
- * 
+ *
  * We can derive the element ID for each key by replacing the periods in the
  * property name with underscores.
  */
@@ -235,4 +235,4 @@ public enum Key {
 		return null;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/listeners/DeveloperDisabledChangeListener.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/listeners/DeveloperDisabledChangeListener.java
index 8bd42952a..579294ac4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/listeners/DeveloperDisabledChangeListener.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/listeners/DeveloperDisabledChangeListener.java
@@ -12,10 +12,10 @@ import edu.cornell.mannlib.vitro.webapp.utils.developer.Key;
 
 /**
  * If a particular developer flag is NOT set to true, this is transparent.
- * 
+ *
  * Set the flag and this becomes opaque, passing no events through.
  */
-public class DeveloperDisabledChangeListener extends StatementListener 
+public class DeveloperDisabledChangeListener extends StatementListener
         implements ModelChangedListener {
 	private final ModelChangedListener inner;
 	private final Key disablingKey;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/listeners/DeveloperDisabledModelChangeListener.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/listeners/DeveloperDisabledModelChangeListener.java
index 18a27e5bc..3686aa5f3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/listeners/DeveloperDisabledModelChangeListener.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/listeners/DeveloperDisabledModelChangeListener.java
@@ -14,7 +14,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.developer.Key;
 
 /**
  * If a particular developer flag is NOT set to true, this is transparent.
- * 
+ *
  * Set the flag and this becomes opaque, passing no events through.
  */
 public class DeveloperDisabledModelChangeListener implements
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/loggers/StackTraceUtility.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/loggers/StackTraceUtility.java
index 839c83d0a..b771bdf0f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/loggers/StackTraceUtility.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/developer/loggers/StackTraceUtility.java
@@ -16,7 +16,7 @@ import org.apache.commons.logging.LogFactory;
 /**
  * Records and process the stack trace so a developer's logger can (1) test
  * against it, and (2) display it.
- * 
+ *
  * If the "enabled" flag is not set, no processing is done, and the stack trace
  * is empty. That way, there is essentially no overhead in creating a disabled
  * instance.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/fields/FieldUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/fields/FieldUtils.java
index aa72e298e..94760b10e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/fields/FieldUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/fields/FieldUtils.java
@@ -12,13 +12,13 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
 
 public class FieldUtils {
-    
+
     private static final Log log = LogFactory.getLog(FieldUtils.class);
-    
+
 
     // copied from OptionsForPropertyTag.java in the thought that class may be deprecated
     public static List<Individual> removeIndividualsAlreadyInRange(List<Individual> individuals,
-            List<ObjectPropertyStatement> stmts, String predicateUri, String objectUriBeingEdited){        
+            List<ObjectPropertyStatement> stmts, String predicateUri, String objectUriBeingEdited){
         HashSet<String>  range = new HashSet<String>();
 
         for(ObjectPropertyStatement ops : stmts){
@@ -35,10 +35,10 @@ public class FieldUtils {
                 ++removeCount;
             }
         }
-        
+
         return individuals;
     }
-    
- 
-    
+
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/generators/EditModeUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/generators/EditModeUtils.java
index 89e6be64e..7e2c747d4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/generators/EditModeUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/generators/EditModeUtils.java
@@ -16,13 +16,13 @@ import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode;
 public class EditModeUtils {
 	private static Log log = LogFactory.getLog(EditModeUtils.class);
 
-    
+
     /* *************** Static utility methods used in role-based generators *********** */
 	public static EditMode getEditMode(VitroRequest vreq, List<String> possiblePredicates) {
     	//We're making some assumptions here: That there is only one role objec tot one activity object
     	//pairing, i.e. the same role object can't be related to a different activity object
     	//That said, there should only be one role to Activity predicate linking a role to an activity
-    	//So if 
+    	//So if
     	Individual object = EditConfigurationUtils.getObjectIndividual(vreq);
     	boolean foundErrorMode = false;
     	int numberEditModes = 0;
@@ -45,14 +45,14 @@ public class EditModeUtils {
     			log.debug("Edit mode is REPAIR for " + predicate);
     			numberRepairModes++;
     		}
-    		
+
     	}
     	log.debug("Number of edit editModes " + numberEditModes);
     	log.debug("Number of repair editModes " + numberRepairModes);
     	log.debug("Found error mode: " + foundErrorMode);
     	//if found an error or if more than one edit mode returned, incorrect
 
-    	if(foundErrorMode || numberEditModes > 1) 
+    	if(foundErrorMode || numberEditModes > 1)
     	{
     		return EditMode.ERROR;
     	}
@@ -65,19 +65,19 @@ public class EditModeUtils {
     	//which is incorrect
     	if(numberRepairModes == numberPredicates) {
     		mode = EditMode.REPAIR;
-    	}    	
+    	}
     	//otherwise all the modes are Add and Add will be returned
     	return mode;
 	}
-	
+
 	public static boolean isAddMode(EditMode mode) {
     	return (mode == EditMode.ADD);
     }
-    
+
     public static boolean isEditMode(EditMode mode) {
     	return (mode == EditMode.EDIT);
     }
-    
+
    public static boolean isRepairMode(EditMode mode) {
     	return (mode == EditMode.REPAIR);
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/http/ContentTypeUtil.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/http/ContentTypeUtil.java
index bab721dd0..cd889bfe5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/http/ContentTypeUtil.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/http/ContentTypeUtil.java
@@ -15,13 +15,13 @@ import org.apache.http.message.BasicHeaderValueParser;
 
 /**
  * A utility for selecting content types, in the context of the Accept header.
- * 
+ *
  * -------------------
- * 
+ *
  * This does not support matching against content types with extensions, like
  * "level=1", as illustrated in RFC-2616:
  * http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
- * 
+ *
  * However, as long as we don't offer such extensions on our available types,
  * the use of extensions in the Accept header is moot.
  */
@@ -30,9 +30,9 @@ public class ContentTypeUtil {
 	/**
 	 * Given an Accept header value and a list of available type names, decide
 	 * which type is the best fit.
-	 * 
+	 *
 	 * If there is no fit, throw a NotAcceptableException
-	 * 
+	 *
 	 * The only thing to do is to match all available against all acceptable,
 	 * and pick the best match. Try to do as little work as possible inside the
 	 * nested loop.
@@ -43,7 +43,7 @@ public class ContentTypeUtil {
 		if (availableTypeNames == null) {
 			throw new NotAcceptableException("availableTypeNames may not be null.");
 		}
-		
+
 		Set<AcceptableType> acceptableTypes = parseAcceptHeader(acceptHeader);
 		List<MatchCriteria> availableTypes = convertToMatchCriteria(availableTypeNames);
 
@@ -73,7 +73,7 @@ public class ContentTypeUtil {
 	/**
 	 * The order of items in the Accept header is not important. We rely on the
 	 * specificity of the match and the "q" factor, in that order.
-	 * 
+	 *
 	 * Since q ranges between 1.0 and 0.001, we add a specificity offset of 2, 3
 	 * or 4. That way, matches with equal specificity are decided by q factor.
 	 */
@@ -110,7 +110,7 @@ public class ContentTypeUtil {
 
 	/**
 	 * Parsing the Accept header returns a set of these.
-	 * 
+	 *
 	 * Package access to permit unit testing.
 	 */
 	static class AcceptableType {
@@ -126,7 +126,7 @@ public class ContentTypeUtil {
 		private float parseQValue(String qString)
 				throws AcceptHeaderParsingException {
 			float qValue = 0.0F;
-			
+
 			if (qString == null || qString.trim().isEmpty()) {
 				qString = "1";
 			}
@@ -167,7 +167,7 @@ public class ContentTypeUtil {
 	/**
 	 * Parse the available type names into a list of these, so we only do the
 	 * substring operations once.
-	 * 
+	 *
 	 * Package access to permit unit testing.
 	 */
 	static class MatchCriteria {
@@ -200,13 +200,13 @@ public class ContentTypeUtil {
 
 		/**
 		 * If one of the types is a wild-card, it's a weak match.
-		 * 
+		 *
 		 * Otherwise, if the types match and one of the subtypes is a wild-card,
 		 * it's a medium match.
-		 * 
+		 *
 		 * Otherwise, if the types match and the subtypes match, it's a strong
 		 * match.
-		 * 
+		 *
 		 * Otherwise, it is no match.
 		 */
 		public int matchQuality(MatchCriteria that) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/DedupAndExtract.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/DedupAndExtract.java
index d703117b4..34541494c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/DedupAndExtract.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/DedupAndExtract.java
@@ -23,11 +23,11 @@ public class DedupAndExtract {
 	 * @param preferredNamespace Preferred namespace
 	 */
 	public Model dedupAndExtract( Model model, String preferredNamespace ) {
-		
+
 		Model extractsModel = ModelFactory.createDefaultModel();
-		
+
 		HashMap<String, String> rewriteURIUsing = new HashMap<String, String>();
-		
+
 		Iterator haveSameAsIt = model.listSubjectsWithProperty(OWL.sameAs);
 		while (haveSameAsIt.hasNext()) {
 			String preferredURI = null;
@@ -57,13 +57,13 @@ public class DedupAndExtract {
 				}
 			}
 		}
-		
+
 		StmtIterator modelStmtIt = model.listStatements();
 		while (modelStmtIt.hasNext()) {
 			Statement origStmt = modelStmtIt.nextStatement();
 			Resource newSubj = null;
 			RDFNode newObj = null;
-			if (!origStmt.getSubject().isAnon()) { 
+			if (!origStmt.getSubject().isAnon()) {
 				String rewriteURI = rewriteURIUsing.get(origStmt.getSubject().getURI());
 				if (rewriteURI != null) {
 					newSubj = extractsModel.getResource(rewriteURI);
@@ -83,9 +83,9 @@ public class DedupAndExtract {
 			}
 			extractsModel.add(newSubj, origStmt.getPredicate(), newObj);
 		}
-		
+
 		return extractsModel;
-		
+
 	}
-	
-}
\ No newline at end of file
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/ExtendedLinkedDataUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/ExtendedLinkedDataUtils.java
index b22b00ed1..bd5eefcc4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/ExtendedLinkedDataUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/ExtendedLinkedDataUtils.java
@@ -23,27 +23,27 @@ import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
 
 public class ExtendedLinkedDataUtils {
-	
+
 	private static final Log log = LogFactory.getLog(ExtendedLinkedDataUtils.class.getName());
-	
+
 	public static Model createModelFromQueries(ServletContext sc, String rootDir, OntModel sourceModel, String subject) {
 		log.debug("Exploring queries in directory '" + rootDir + "'");
-		
-		Model model = ModelFactory.createDefaultModel(); 
-		
+
+		Model model = ModelFactory.createDefaultModel();
+
 		@SuppressWarnings("unchecked")
 		Set<String> pathSet = sc.getResourcePaths(rootDir);
-		
+
 		if (pathSet == null) {
 		  log.warn(rootDir + " not found.");
 		  return model;
 		}
-		
+
 		for ( String path : pathSet ) {
-            File file = new File(sc.getRealPath(path));	
-            if (file.isDirectory()) {           	
+            File file = new File(sc.getRealPath(path));
+            if (file.isDirectory()) {
             	model.add(createModelFromQueries(sc, path, sourceModel, subject));
-            } else if (file.isFile()) { 
+            } else if (file.isFile()) {
     			if (!path.endsWith(".sparql")) {
     				log.warn("Ignoring file " + path + " because the file extension is not sparql.");
     				continue;
@@ -55,30 +55,30 @@ public class ExtendedLinkedDataUtils {
             	log.warn("path is neither a directory nor a file " + path);
             }
 		} // end - for
-				
+
 		return model;
-	}	
-	
+	}
+
 	public static Model createModelFromQuery(File sparqlFile, OntModel sourceModel, String subject) {
-		
-		Model model = ModelFactory.createDefaultModel(); 
-						
+
+		Model model = ModelFactory.createDefaultModel();
+
 		BufferedReader reader = null;
-		
+
 		try {
 			try {
 				reader = new BufferedReader(new FileReader(sparqlFile));
 				StringBuilder fileContents = new StringBuilder();
 				String ln;
-			
+
 				while ( (ln = reader.readLine()) != null) {
 					fileContents.append(ln).append('\n');
-				}		
-						
+				}
+
 				String query = fileContents.toString();
 				String subjectString = "<" + subject + ">";
 				query = query.replaceAll("PERSON_URI", subjectString);
-				
+
 				Query q = QueryFactory.create(query, Syntax.syntaxARQ);
 				QueryExecution qe = QueryExecutionFactory.create(q, sourceModel);
 				qe.execConstruct(model);
@@ -92,8 +92,8 @@ public class ExtendedLinkedDataUtils {
 		} catch (IOException ioe) {
 			// this is for the reader.close above
 			log.warn("Exception while trying to close file: " + sparqlFile.getAbsolutePath(), ioe);
-		}			
-				
+		}
+
 		return model;
-	}	
+	}
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java
index e836ed50f..bdb4f5462 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java
@@ -53,13 +53,13 @@ public class JenaIngestUtils {
      * @param inModel input Jena Model
      * @param namespaceEtc Namespace
      */
-    public Model renameBNodes(Model inModel, String namespaceEtc) {    
+    public Model renameBNodes(Model inModel, String namespaceEtc) {
         return renameBNodes(inModel, namespaceEtc, null);
     }
 
     /**
      * Returns a new copy of the input model with blank nodes renamed with namespaceEtc plus a random int.
-     * Will prevent URI collisions with supplied dedupModel 
+     * Will prevent URI collisions with supplied dedupModel
      * @param inModel input Jena Model
      * @param namespaceEtc Namespace
      */
@@ -70,7 +70,7 @@ public class JenaIngestUtils {
         if (dedupModel != null) {
             dedupUnionModel.addSubModel(dedupModel);
         }
-        // the dedupUnionModel is so we can guard against reusing a URI in an 
+        // the dedupUnionModel is so we can guard against reusing a URI in an
         // existing model, as well as in the course of running this process
         inModel.enterCriticalSection(Lock.READ);
         Set<AnonId> doneSet = new HashSet<AnonId>();
@@ -143,7 +143,7 @@ public class JenaIngestUtils {
         if (dedupModel != null) {
             dedupUnionModel.addSubModel(dedupModel);
         }
-        // the dedupUnionModel is so we can guard against reusing a URI in an 
+        // the dedupUnionModel is so we can guard against reusing a URI in an
         // existing model, as well as in the course of running this process
         inModel.enterCriticalSection(Lock.READ);
         Set<AnonId> doneSet = new HashSet<AnonId>();
@@ -169,7 +169,7 @@ public class JenaIngestUtils {
                             Resource outRes = stmt.getSubject();
                             if(stmt.getObject().isLiteral()){
                                 String value = ((Literal) stmt.getObject()).getLexicalForm();
-                                String suffix = (pattern.contains("$$$")) 
+                                String suffix = (pattern.contains("$$$"))
                                         ? pattern.replace("$$$", value)
                                                 : pattern + value;
                                         ResourceUtils.renameResource(outRes, namespaceEtc + suffix);
@@ -205,14 +205,14 @@ public class JenaIngestUtils {
                         if(!stmt.getObject().isResource()){
                             if(propertyMap.containsKey(stmt.getPredicate().getURI())){
                                 LinkedList linkList = propertyMap.get(stmt.getPredicate().getURI());
-                                linkList.add(stmt.getObject().toString());        
+                                linkList.add(stmt.getObject().toString());
                             }
                             else{
                                 propertyMap.put(stmt.getPredicate().getURI(), new LinkedList());
                                 LinkedList linkList = propertyMap.get(stmt.getPredicate().getURI());
-                                linkList.add(stmt.getObject().toString());                        
-                            }                                    
-                        }                                
+                                linkList.add(stmt.getObject().toString());
+                            }
+                        }
                     }
                 }
             }
@@ -229,12 +229,12 @@ public class JenaIngestUtils {
                             if(!stmt.getObject().isResource()){
                                 if(propertyMap.containsKey(stmt.getPredicate().getURI())){
                                     LinkedList linkList = propertyMap.get(stmt.getPredicate().getURI());
-                                    linkList.add(stmt.getObject().toString());                    
+                                    linkList.add(stmt.getObject().toString());
                                 }
                                 else{
                                     propertyMap.put(stmt.getPredicate().getURI(), new LinkedList());
                                     LinkedList linkList = propertyMap.get(stmt.getPredicate().getURI());
-                                    linkList.add(stmt.getObject().toString());    
+                                    linkList.add(stmt.getObject().toString());
                                 }
                             }
                         }
@@ -275,7 +275,7 @@ public class JenaIngestUtils {
         return nextURI;
     }
 
-    public void processPropertyValueStrings(Model source, Model destination, Model additions, Model retractions, 
+    public void processPropertyValueStrings(Model source, Model destination, Model additions, Model retractions,
             String processorClass, String processorMethod, String originalPropertyURI, String newPropertyURI) {
         Model additionsModel = ModelFactory.createDefaultModel();
         Model retractionsModel = ModelFactory.createDefaultModel();
@@ -304,7 +304,7 @@ public class JenaIngestUtils {
                     Object[] args = {lex};
                     String newLex = null;
                     try {
-                        if (log.isDebugEnabled()) { 
+                        if (log.isDebugEnabled()) {
                             log.debug("invoking string processor method on ["+lex.substring(0,lex.length()>50 ? 50 : lex.length())+"...");
                         }
                         newLex = (String) meth.invoke(processor,args);
@@ -313,7 +313,7 @@ public class JenaIngestUtils {
                         return;
                     }
                     if (!newLex.equals(lex)) {
-                        retractionsModel.add(stmt);    
+                        retractionsModel.add(stmt);
                         Literal newLit = null;
                         if (lit.getLanguage()!=null && lit.getLanguage().length()>0) {
                             newLit = additionsModel.createLiteral(newLex,lit.getLanguage());
@@ -353,11 +353,11 @@ public class JenaIngestUtils {
             }
         } finally {
             source.leaveCriticalSection();
-        } 
+        }
     }
 
     /**
-     * Splits values for a given data property URI on a supplied regex and 
+     * Splits values for a given data property URI on a supplied regex and
      * asserts each value using newPropertyURI.  New statements returned in
      * a Jena Model.  Split values may be optionally trim()ed.
      * @param inModel Input Jena model
@@ -410,17 +410,17 @@ public class JenaIngestUtils {
             }
         } finally {
             inModel.leaveCriticalSection();
-        }    
+        }
         return outModel;
     }
 
     /**
-     * A simple resource smusher based on a supplied inverse-functional property.  
+     * A simple resource smusher based on a supplied inverse-functional property.
      * A new model containing only resources about the smushed statements is returned.
      * @param inModel Input Jena model
      * @param prop Property
      */
-    public Model smushResources(Model inModel, Property prop) { 
+    public Model smushResources(Model inModel, Property prop) {
         Model outModel = ModelFactory.createDefaultModel();
         outModel.add(inModel);
         inModel.enterCriticalSection(Lock.READ);
@@ -521,7 +521,7 @@ public class JenaIngestUtils {
             Statement origStmt = modelStmtIt.nextStatement();
             Resource newSubj = null;
             RDFNode newObj = null;
-            if (!origStmt.getSubject().isAnon()) { 
+            if (!origStmt.getSubject().isAnon()) {
                 String rewriteURI = rewriteURIUsing.get(origStmt.getSubject().getURI());
                 if (rewriteURI != null) {
                     newSubj = extractsModel.getResource(rewriteURI);
@@ -609,7 +609,7 @@ public class JenaIngestUtils {
 
         public Model getLeftoverModel() {
             return this.leftoverModel;
-        }    
+        }
     }
 
     /**
@@ -620,19 +620,19 @@ public class JenaIngestUtils {
      * @param tboxOntModel The model containing class and property data
      * @param usePrimaryLabelOnly If true, discard rdfs:labels from uri2.  Otherwise retain.
      */
-    public MergeResult doMerge(String uri1, String uri2, OntModel baseOntModel, 
+    public MergeResult doMerge(String uri1, String uri2, OntModel baseOntModel,
             OntModel tboxOntModel, boolean usePrimaryLabelOnly){
 
         boolean functionalPresent = false;
 
         Resource res1 = baseOntModel.getResource(uri1); // primary resource
-        Model res1Model = ModelFactory.createDefaultModel();        
+        Model res1Model = ModelFactory.createDefaultModel();
         Resource res2 = baseOntModel.getResource(uri2); // secondary resource
         Model res2Model = ModelFactory.createDefaultModel();
 
         // get statements of both the resources
         baseOntModel.enterCriticalSection(Lock.READ);
-        try {        
+        try {
             res1Model.add(
                     baseOntModel.listStatements(res1, (Property)null, (RDFNode)null));
             res2Model.add(
@@ -656,20 +656,20 @@ public class JenaIngestUtils {
 
         // Iterate through statements of secondary resource
         StmtIterator stmtItr2 = res2Model.listStatements(
-                res2, (Property) null, (RDFNode) null);            
+                res2, (Property) null, (RDFNode) null);
         while(stmtItr2.hasNext()){
-            Statement stmt = stmtItr2.nextStatement();            
+            Statement stmt = stmtItr2.nextStatement();
             if(isFunctional(stmt.getPredicate(), tboxOntModel)) {
-                // if the property is null or functional then dump the statement into 
-                // the leftover model, else add it to base, ont and inf models as a 
+                // if the property is null or functional then dump the statement into
+                // the leftover model, else add it to base, ont and inf models as a
                 // part of the primary resource.
                 leftoverModel.add(res2, stmt.getPredicate(), stmt.getObject());
                 functionalPresent = true;
             } else if (stmt.getPredicate().equals(RDFS.label) && usePrimaryLabelOnly) {
-                // if the checkbox is checked, use primary resource rdfs:labels only  
+                // if the checkbox is checked, use primary resource rdfs:labels only
                 // and dump secondary resource rdfs:labels into leftoverModel
                 leftoverModel.add(res2, stmt.getPredicate(), stmt.getObject());
-                functionalPresent = true;        
+                functionalPresent = true;
             } else {
                 baseOntModel.enterCriticalSection(Lock.WRITE);
                 try {
@@ -681,7 +681,7 @@ public class JenaIngestUtils {
             }
         }
 
-        // replace secondary resource with primary resource in all the statements 
+        // replace secondary resource with primary resource in all the statements
         // where secondary resource is present as an object.
         StmtIterator stmtItr3 = res2Model.listStatements(
                 (Resource) null, (Property) null, res2);
@@ -698,7 +698,7 @@ public class JenaIngestUtils {
             }
         }
 
-        // Remove all the statements of secondary resource 
+        // Remove all the statements of secondary resource
         baseOntModel.enterCriticalSection(Lock.WRITE);
         try {
             baseOntModel.remove(res2Model);
@@ -708,21 +708,21 @@ public class JenaIngestUtils {
 
         MergeResult result = new MergeResult();
         if (!leftoverModel.isEmpty()) {
-            result.setLeftoverModel(leftoverModel);   
+            result.setLeftoverModel(leftoverModel);
         }
 
         if (counter > 0 && functionalPresent) {
-            result.setResultText("merged " + counter + 
+            result.setResultText("merged " + counter +
                     " statements. Some statements could not be merged.");
         } else if(counter>0 && !functionalPresent) {
-            result.setResultText("merged " + counter + " statements.");    
+            result.setResultText("merged " + counter + " statements.");
         } else if (counter==0) {
             result.setResultText("No statements merged");
         }
         return result;
 
     }
-    
+
     private boolean isFunctional(Property property, OntModel tboxOntModel) {
         tboxOntModel.enterCriticalSection(Lock.READ);
         try {
@@ -734,13 +734,13 @@ public class JenaIngestUtils {
     }
 
     public void doPermanentURI(String oldModel, String newModel, String oldNamespace,
-            String newNamespace, ModelMaker maker, 
+            String newNamespace, ModelMaker maker,
             VitroRequest vreq) {
 
         if(newNamespace.isEmpty()){
             throw new RuntimeException("new namespace must be specified");
         }
-        
+
         WebappDaoFactory wdf = vreq.getUnfilteredWebappDaoFactory();
         Model m = maker.getModel(oldModel);
         Model saveModel = maker.getModel(newModel);
@@ -756,10 +756,10 @@ public class JenaIngestUtils {
             }
             rsItr = tempModel.listResourcesWithProperty((Property)null);
         } else{
-            rsItr = m.listResourcesWithProperty((Property)null); 
+            rsItr = m.listResourcesWithProperty((Property)null);
         }
 
-        String uri = null;  
+        String uri = null;
         while(rsItr.hasNext()){
             Resource res = rsItr.next();
             if(res.getNameSpace().equals(oldNamespace)){
@@ -771,7 +771,7 @@ public class JenaIngestUtils {
                     }
                 }while(!urlFound);
                 urlFound = false;
-                ResourceUtils.renameResource(res, uri);                    
+                ResourceUtils.renameResource(res, uri);
             }
 
         }
@@ -792,13 +792,13 @@ public class JenaIngestUtils {
                     if(oRes.getNameSpace().equals(newNamespace) && !statementDone){
                         saveModel.add(stmt);
                         statementDone = true;
-                    }    
+                    }
                 } catch(Exception e){
                     continue;
                 }
             }
         }
-    }    
+    }
 
     public String getUnusedURI(String newNamespace,WebappDaoFactory wdf){
         String uri = null;
@@ -808,14 +808,14 @@ public class JenaIngestUtils {
         int attempts = 0;
 
         while(!uriIsGood && attempts < 30 ){
-            uri = newNamespace + "n" + random.nextInt( Math.min(Integer.MAX_VALUE,(int)Math.pow(2,attempts + 13)) );            
+            uri = newNamespace + "n" + random.nextInt( Math.min(Integer.MAX_VALUE,(int)Math.pow(2,attempts + 13)) );
             errMsg = wdf.checkURI(uri);
             if(  errMsg != null)
                 uri = null;
             else
-                uriIsGood = true;                
+                uriIsGood = true;
             attempts++;
-        }   
+        }
 
         return uri;
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestWorkflowProcessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestWorkflowProcessor.java
index e6bbe7848..0d724ddaf 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestWorkflowProcessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestWorkflowProcessor.java
@@ -30,7 +30,7 @@ import org.apache.jena.rdf.model.ResourceFactory;
 import org.apache.jena.shared.Lock;
 
 public class JenaIngestWorkflowProcessor {
-    
+
     private static final Log log = LogFactory.getLog(JenaIngestWorkflowProcessor.class.getName());
 
 	private Individual workflowInd;
@@ -38,7 +38,7 @@ public class JenaIngestWorkflowProcessor {
 	private Map<String,Literal> varMap;
 	private List<ActionHandler> actionHandlerList;
 	private JenaIngestUtils utils;
-	
+
 	public JenaIngestWorkflowProcessor(Individual workflowInd, ModelMaker modelMaker) {
 		this.varMap = new HashMap<String,Literal>();
 		this.workflowInd = workflowInd;
@@ -54,11 +54,11 @@ public class JenaIngestWorkflowProcessor {
 		actionHandlerList.add(new NameBlankNodesAction());
 		this.utils = new JenaIngestUtils();
 	}
-	
+
 	public void run() {
 		run(null);
 	}
-	
+
 	/**
 	 * Runs the workflow
 	 */
@@ -74,7 +74,7 @@ public class JenaIngestWorkflowProcessor {
 			}
 		}
 	}
-	
+
 	/*
 	 * returns the Action related to the supplied WorkflowStep
 	 */
@@ -86,7 +86,7 @@ public class JenaIngestWorkflowProcessor {
 		}
 		return null;
 	}
-	
+
 	public List<Individual> getWorkflowSteps(Individual startingWorkflowStep) {
 		List<Individual> workflowSteps = new LinkedList<Individual>();
 		Individual currentInd = (startingWorkflowStep == null) ? getWorkflowStep(workflowInd.getPropertyValue(WorkflowOntology.firstStep)) : startingWorkflowStep;
@@ -96,7 +96,7 @@ public class JenaIngestWorkflowProcessor {
 		}
 		return workflowSteps;
 	}
-	
+
 	private Individual getWorkflowStep(RDFNode stepNode) {
 		if (stepNode == null) {
 			return null;
@@ -105,11 +105,11 @@ public class JenaIngestWorkflowProcessor {
 			Individual nextStepInd = (Individual) stepNode.as(Individual.class);
 			if (instanceOf(nextStepInd,WorkflowOntology.WorkflowStep)) {
 				return nextStepInd;
-			} 
+			}
 		}
 		return null;
 	}
-	
+
 	private boolean instanceOf(Individual ind, Resource type) {
 		for ( Resource typeRes : (List<Resource>) ind.listRDFTypes(false).toList() ) {
 			if (!typeRes.isAnon() && typeRes.getURI().equals(type.getURI())) {
@@ -118,11 +118,11 @@ public class JenaIngestWorkflowProcessor {
 		}
 		return false;
 	}
-	
+
 	/*
 	 * gets the appropriate Jena Literal for a Value individual in the model,
 	 * depending on whether the Value is a Variable or a Literal
-	 * At some point 
+	 * At some point
 	 */
 	private Literal getValue(RDFNode valueIndNode) {
 		Individual valueInd = (Individual) valueIndNode.as(Individual.class);
@@ -139,7 +139,7 @@ public class JenaIngestWorkflowProcessor {
 		}
 		return null;
 	}
-	
+
 	/*
 	 * returns the model represented by the given Node, which is expected to be an Individual of type Model
 	 */
@@ -149,24 +149,24 @@ public class JenaIngestWorkflowProcessor {
 	    }
 		Individual modelInd = (Individual) modelNode.as(Individual.class);
 		String modelNameStr = ((Literal)modelInd.getPropertyValue(WorkflowOntology.modelName).as(Literal.class)).getLexicalForm();
-		// false = strict mode off, i.e., 
+		// false = strict mode off, i.e.,
 		// if a model already exists of the given name, return it.  Otherwise, create a new one.
 		return modelMaker.createModel(modelNameStr,false);
 	}
-	
+
 	private interface ActionResult {}
 	private class ActionResultImpl implements ActionResult {}
-	
+
 	private interface ActionHandler {
 		public ActionResult handleAction(Individual actionInd);
 	}
-	
+
 	// ALL THE DIFFERENT ACTION HANDLERS
-	
-	private class ClearModelAction implements ActionHandler { 
+
+	private class ClearModelAction implements ActionHandler {
 		public ActionResult handleAction(Individual actionInd) {
 			if (instanceOf(actionInd,WorkflowOntology.ClearModelAction)) {
-				Model sourceModel = getModel(actionInd.getPropertyValue(WorkflowOntology.sourceModel)); 
+				Model sourceModel = getModel(actionInd.getPropertyValue(WorkflowOntology.sourceModel));
 				sourceModel.enterCriticalSection(Lock.WRITE);
 				try{
 					// this method is used so that any listeners can see each statement removed
@@ -177,16 +177,16 @@ public class JenaIngestWorkflowProcessor {
 				return new ActionResultImpl();
 			} else {
 				return null;
-			}		
+			}
 		}
 	}
-	
-	private class AddModelsAction implements ActionHandler { 
+
+	private class AddModelsAction implements ActionHandler {
 		public ActionResult handleAction(Individual actionInd) {
 			if (instanceOf(actionInd,WorkflowOntology.AddModelAction)) {
-				Model sourceModel = getModel(actionInd.getPropertyValue(WorkflowOntology.sourceModel)); 
+				Model sourceModel = getModel(actionInd.getPropertyValue(WorkflowOntology.sourceModel));
 				Model modelToAdd = getModel(actionInd.getPropertyValue(WorkflowOntology.modelToAdd));
-				Model destinationModel = getModel(actionInd.getPropertyValue(WorkflowOntology.destinationModel)); 
+				Model destinationModel = getModel(actionInd.getPropertyValue(WorkflowOntology.destinationModel));
 				Boolean applyChangesDirectlyToSource = false;
 				RDFNode valueNode = actionInd.getPropertyValue(WorkflowOntology.applyChangesDirectlyToSource);
 				if ((valueNode != null) && (valueNode.isLiteral())) {
@@ -217,16 +217,16 @@ public class JenaIngestWorkflowProcessor {
 				return new ActionResultImpl();
 			} else {
 				return null;
-			}		
+			}
 		}
 	}
-	
-	private class SubtractModelsAction implements ActionHandler { 
+
+	private class SubtractModelsAction implements ActionHandler {
 		public ActionResult handleAction(Individual actionInd) {
 			if (instanceOf(actionInd,WorkflowOntology.SubtractModelAction)) {
-				Model sourceModel = getModel(actionInd.getPropertyValue(WorkflowOntology.sourceModel)); 
+				Model sourceModel = getModel(actionInd.getPropertyValue(WorkflowOntology.sourceModel));
 				Model modelToSubtract = getModel(actionInd.getPropertyValue(WorkflowOntology.modelToSubtract));
-				Model destinationModel = getModel(actionInd.getPropertyValue(WorkflowOntology.destinationModel)); 
+				Model destinationModel = getModel(actionInd.getPropertyValue(WorkflowOntology.destinationModel));
 				Boolean applyChangesDirectlyToSource = false;
 				RDFNode valueNode = actionInd.getPropertyValue(WorkflowOntology.applyChangesDirectlyToSource);
 				if ((valueNode != null) && (valueNode.isLiteral())) {
@@ -256,14 +256,14 @@ public class JenaIngestWorkflowProcessor {
 				return new ActionResultImpl();
 			} else {
 				return null;
-			}		
+			}
 		}
 	}
-	
+
 	private class ExecuteSparqlConstructAction implements ActionHandler {
-		
+
 		private static final String QUERY_STR_PROPERTY = "http://vitro.mannlib.cornell.edu/ns/vitro/0.7/sparql#queryStr";
-			
+
 		public ActionResult handleAction(Individual actionInd) {
 			if (instanceOf(actionInd,WorkflowOntology.SPARQLCONSTRUCTAction)) {
 				OntModel sourceModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
@@ -289,7 +289,7 @@ public class JenaIngestWorkflowProcessor {
 			return null;
 		}
 	}
-	
+
 	private class SmushResourcesAction implements ActionHandler {
 		public ActionResult handleAction(Individual actionInd) {
 			if (instanceOf(actionInd,WorkflowOntology.SmushResourcesAction)) {
@@ -310,7 +310,7 @@ public class JenaIngestWorkflowProcessor {
 			return null;
 		}
 	}
-	
+
 	private class NameBlankNodesAction implements ActionHandler {
 		public ActionResult handleAction(Individual actionInd) {
 			if (instanceOf(actionInd,WorkflowOntology.NameBlankNodesAction)) {
@@ -326,8 +326,8 @@ public class JenaIngestWorkflowProcessor {
 			return null;
 		}
 	}
-	
-	private class SplitPropertyValuesAction implements ActionHandler { 
+
+	private class SplitPropertyValuesAction implements ActionHandler {
 		public ActionResult handleAction(Individual actionInd) {
 			if (instanceOf(actionInd,WorkflowOntology.SplitPropertyValuesAction)) {
 				// We use an OntModel here because this API supports submodels
@@ -352,11 +352,11 @@ public class JenaIngestWorkflowProcessor {
 				return new ActionResultImpl();
 			} else {
 				return null;
-			}		
+			}
 		}
-	}	
-	
-	private class ProcessPropertyValueStringsAction implements ActionHandler { 
+	}
+
+	private class ProcessPropertyValueStringsAction implements ActionHandler {
 		public ActionResult handleAction(Individual actionInd) {
 			if (instanceOf(actionInd,WorkflowOntology.ProcessPropertyValueStringsAction)) {
 				// We use an OntModel here because this API supports submodels
@@ -392,9 +392,9 @@ public class JenaIngestWorkflowProcessor {
 				return new ActionResultImpl();
 			} else {
 				return null;
-			}		
+			}
 		}
-	}	
-	
-	
+	}
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaOutputUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaOutputUtils.java
index ba682a604..53f6886db 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaOutputUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaOutputUtils.java
@@ -16,16 +16,16 @@ import edu.cornell.mannlib.vitro.webapp.beans.Ontology;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 
 public class JenaOutputUtils {
-	
+
 	private static final Log log = LogFactory.getLog(JenaOutputUtils.class.getName());
-		
+
 	public static void setNameSpacePrefixes(Model model, WebappDaoFactory wadf) {
-		
+
 		if (model == null) {
 			log.warn("input model is null");
 			return;
 		}
-		
+
 		Map<String,String> prefixes = new HashMap<String,String>();
 		List<Ontology> ontologies = wadf.getOntologyDao().getAllOntologies();
 		// apparently this is null if empty
@@ -35,26 +35,26 @@ public class JenaOutputUtils {
 		Iterator<Ontology> iter = ontologies.iterator();
 		String namespace = null;
 		String prefix = null;
-		
+
 		prefixes.put("vitro", "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#");
 		while (iter.hasNext()) {
 			Ontology ontology = iter.next();
-            			
+
 			namespace = ontology.getURI(); // this method returns the namespace
             if (namespace == null || namespace.isEmpty()) {
             	log.warn("ontology with empty namespace found");
             	continue;
             }
-            
+
             prefix = ontology.getPrefix();
             if (prefix == null || prefix.isEmpty()) {
             	log.debug("no prefix found for namespace: " + namespace);
             	continue;
             }
-            
+
 			prefixes.put(prefix,namespace);
 		}
-	    
+
 		model.setNsPrefixes(prefixes);
     }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/NamespaceMapperJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/NamespaceMapperJena.java
index 971e14269..088cffa3f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/NamespaceMapperJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/NamespaceMapperJena.java
@@ -28,51 +28,51 @@ import edu.cornell.mannlib.vitro.webapp.utils.NamespaceMapper;
 
 public class NamespaceMapperJena extends StatementListener implements
 		NamespaceMapper {
-	
+
     private static final Log log = LogFactory.getLog(NamespaceMapperJena.class);
-    
+
 	private HashMap<String,String> prefixToNamespaceMap;
 	private HashMap<String,List<String>> namespaceToPrefixMap;
-	
+
 	private HashSet<String> knownNamespaces;
-	
+
 	private OntModel metadataModel;
 	private OntModel dataModel;
-	
+
 	private boolean pipeOpen = true;
-	
+
 	private String namespaceForNamespaceObjects;
 
 	private HashSet<String> propertyURIsToListenFor;
-	
+
 	public NamespaceMapperJena(OntModel dataModel, OntModel metadataModel, String namespaceForNamespaceObjects) {
 		prefixToNamespaceMap = new HashMap<String,String>();
 		namespaceToPrefixMap = new HashMap<String,List<String>>();
-		
+
 		knownNamespaces = new HashSet<String>();
-		
+
 		this.dataModel = dataModel;
 		dataModel.getBaseModel().register(this);
 		this.metadataModel = metadataModel;
-		this.namespaceForNamespaceObjects = namespaceForNamespaceObjects; 
-		
+		this.namespaceForNamespaceObjects = namespaceForNamespaceObjects;
+
 		propertyURIsToListenFor = new HashSet<String>();
 		propertyURIsToListenFor.add(VitroVocabulary.NAMESPACE_HASPREFIXMAPPING);
 		propertyURIsToListenFor.add(VitroVocabulary.NAMESPACE_ISCURRENTPREFIXMAPPING);
 		propertyURIsToListenFor.add(VitroVocabulary.NAMESPACE_PREFIX);
-		
+
 		rebuildNamespaceCache();
-		
+
 	}
-	
+
 	private static int LARGE_NS = 200;
-	
+
 	private void rebuildNamespaceCache() {
 		HashMap<String,String> tempPrefixToNamespaceMap = new HashMap<String,String>();
 		HashMap<String,List<String>> tempNamespaceToPrefixMap = new HashMap<String,List<String>>();
 		metadataModel.enterCriticalSection(Lock.READ);
 		int nsCount = 0;
-		try {	
+		try {
 			// Iterate through all the namespace objects
 			ClosableIterator closeIt = metadataModel.listIndividuals(metadataModel.getResource(VitroVocabulary.NAMESPACE));
 			try {
@@ -105,7 +105,7 @@ public class NamespaceMapperJena extends StatementListener implements
 									RDFNode isCurrentValue = namespacePrefixMappingInd.getPropertyValue(metadataModel.getProperty(VitroVocabulary.NAMESPACE_ISCURRENTPREFIXMAPPING));
 									if ( (isCurrentValue != null) && (isCurrentValue.isLiteral()) ) {
 										isCurrent = ((Literal)isCurrentValue).getBoolean();
-									} 
+									}
 									// if it's the current prefix, we want to put it at the head of the list
 									if (isCurrent) {
 										prefixList.add(0, prefix);
@@ -130,7 +130,7 @@ public class NamespaceMapperJena extends StatementListener implements
 		namespaceToPrefixMap = tempNamespaceToPrefixMap;
 		prefixToNamespaceMap = tempPrefixToNamespaceMap;
 	}
-	
+
 	private void makeNewNamespaces(Statement s) {
 		List<String> namespacesToCheck = new LinkedList<String>();
 		Resource subj = s.getSubject();
@@ -139,7 +139,7 @@ public class NamespaceMapperJena extends StatementListener implements
 		}
 		Property pred = s.getPredicate();
 		if (pred.getNameSpace() != null) {
-			namespacesToCheck.add(pred.getNameSpace());		
+			namespacesToCheck.add(pred.getNameSpace());
 		}
 		if ( s.getObject().isResource() ) {
 			if ( ((Resource)s.getObject()).getNameSpace() != null ) {
@@ -148,7 +148,7 @@ public class NamespaceMapperJena extends StatementListener implements
 		}
 		processPossibleNewNamespaces(namespacesToCheck);
 	}
-	
+
 	private void processPossibleNewNamespaces(List<String> namespaceList) {
 		Set<String> newNamespaces = new HashSet<String>();
 		for (String namespace : namespaceList) {
@@ -167,7 +167,7 @@ public class NamespaceMapperJena extends StatementListener implements
 			createNewNamespaceObjects(newNamespaceList);
 		}
 	}
-	
+
 	private void createNewNamespaceObjects(List<String> newNamespaces) {
 		for (String newNamespace : newNamespaces) {
 			metadataModel.enterCriticalSection(Lock.WRITE);
@@ -185,7 +185,7 @@ public class NamespaceMapperJena extends StatementListener implements
 			}
 		}
 	}
-	
+
 	@Override
 	public void addedStatement(Statement s) {
 		if (!pipeOpen) return;
@@ -222,7 +222,7 @@ public class NamespaceMapperJena extends StatementListener implements
 	public List<String> getPrefixesForNamespace(String namespace) {
 		return namespaceToPrefixMap.get(namespace);
 	}
-	
+
 	public String toString(){
 	    return namespaceToPrefixMap.toString();
 	}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/WorkflowOntology.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/WorkflowOntology.java
index eb0a7e485..284e84da9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/WorkflowOntology.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/WorkflowOntology.java
@@ -5,133 +5,133 @@ package edu.cornell.mannlib.vitro.webapp.utils.jena;
 import org.apache.jena.rdf.model.*;
 import org.apache.jena.ontology.*;
 /**
- * Vocabulary definitions from workflowOntology.rdf 
- * @author Auto-generated by schemagen on 12 Aug 2008 11:27 
+ * Vocabulary definitions from workflowOntology.rdf
+ * @author Auto-generated by schemagen on 12 Aug 2008 11:27
  */
 public class WorkflowOntology {
     /** <p>The ontology model that holds the vocabulary terms</p> */
     private static OntModel m_model = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM, null );
-    
+
     /** <p>The namespace of the vocabulary as a string</p> */
     public static final String NS = "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#";
-    
+
     /** <p>The namespace of the vocabulary as a string</p>
      *  @see #NS */
     public static String getURI() {return NS;}
-    
+
     /** <p>The namespace of the vocabulary as a resource</p> */
     public static final Resource NAMESPACE = m_model.createResource( NS );
-    
+
     public static final ObjectProperty retractionsModel = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#retractionsModel" );
-    
+
     public static final ObjectProperty processorMethod = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#processorMethod" );
-    
+
     public static final ObjectProperty originalPropertyOf = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#originalPropertyOf" );
-    
+
     public static final ObjectProperty firstStepOf = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#firstStepOf" );
-    
+
     public static final ObjectProperty additionsModel = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#additionsModel" );
-    
+
     public static final ObjectProperty originalProperty = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#originalProperty" );
-    
+
     public static final ObjectProperty newPropertyOf = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#newPropertyOf" );
-    
+
     public static final ObjectProperty processorClassOf = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#processorClassOf" );
-    
+
     public static final ObjectProperty retractionsModelOf = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#retractionsModelOf" );
-    
+
     public static final ObjectProperty firstStep = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#firstStep" );
-    
+
     public static final ObjectProperty modelToAdd = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#modelToAdd" );
-    
+
     public static final ObjectProperty modelToSubtract = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#modelToSubtract" );
-    
+
     public static final ObjectProperty smushedOnInAction = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#smushedOnInAction" );
-    
+
     public static final ObjectProperty actionOf = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#actionOf" );
-    
+
     public static final ObjectProperty newProperty = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#newProperty" );
-    
+
     public static final ObjectProperty splitRegex = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#splitRegex" );
-    
+
     public static final ObjectProperty processorClass = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#processorClass" );
-    
+
     public static final ObjectProperty sourceModelFor = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#sourceModelFor" );
-    
+
     public static final ObjectProperty destinationModelFor = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#destinationModelFor" );
-    
+
     public static final ObjectProperty splitRegexOf = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#splitRegexOf" );
-    
+
     public static final ObjectProperty trimValueFor = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#trimValueFor" );
-    
+
     public static final ObjectProperty uriPrefix = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#uriPrefix" );
-    
+
     public static final ObjectProperty action = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#action" );
-    
+
     public static final ObjectProperty destinationModel = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#destinationModel" );
-    
+
     public static final ObjectProperty processorMethodOf = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#processorMethodOf" );
-    
+
     public static final ObjectProperty sourceModel = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#sourceModel" );
-    
+
     public static final ObjectProperty uriPrefixForAction = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#uriPrefixForAction" );
-    
+
     public static final ObjectProperty smushOnProperty = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#smushOnProperty" );
 
     public static final ObjectProperty sparqlQuery = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#sparqlQuery" );
-    
+
     public static final ObjectProperty previousStep = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#previousStep" );
-    
+
     public static final ObjectProperty addedInAction = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#addedInAction" );
-    
+
     public static final ObjectProperty subtractedInAction = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#subtractedInAction" );
-    
+
     public static final ObjectProperty nextStep = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#nextStep" );
-    
+
     public static final ObjectProperty trim = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#trim" );
-    
+
     public static final ObjectProperty additionsModelOf = m_model.createObjectProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#additionsModelOf" );
-    
+
     public static final DatatypeProperty applyChangesDirectlyToSource = m_model.createDatatypeProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#applyChangesDirectlyToSource" );
-    
+
     public static final DatatypeProperty modelName = m_model.createDatatypeProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#modelName" );
-    
+
     public static final DatatypeProperty literalValue = m_model.createDatatypeProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#literalValue" );
 
-    public static final DatatypeProperty variableName = m_model.createDatatypeProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#variableName" ); 
-    
+    public static final DatatypeProperty variableName = m_model.createDatatypeProperty( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#variableName" );
+
     public static final OntClass Action = m_model.createClass( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#Action" );
-    
+
     public static final OntClass ProcessPropertyValueStringsAction = m_model.createClass( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#ProcessPropertyValueStringsAction" );
-    
+
     public static final OntClass Workflow = m_model.createClass( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#Workflow" );
-    
+
     public static final OntClass WorkflowStep = m_model.createClass( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#WorkflowStep" );
-    
+
     public static final OntClass Value = m_model.createClass( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#Value" );
-    
+
     public static final OntClass SPARQLCONSTRUCTAction = m_model.createClass( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#SPARQLCONSTRUCTAction" );
-    
+
     public static final OntClass Model = m_model.createClass( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#Model" );
-    
+
     public static final OntClass Literal = m_model.createClass( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#Literal" );
-    
+
     public static final OntClass CreateModelAction = m_model.createClass( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#CreateModelAction" );
-    
+
     public static final OntClass AddModelAction = m_model.createClass( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#AddModelAction" );
-    
+
     public static final OntClass SubtractModelAction = m_model.createClass( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#SubtractModelAction" );
-    
+
     public static final OntClass SplitPropertyValuesAction = m_model.createClass( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#SplitPropertyValuesAction" );
-    
+
     public static final OntClass NameBlankNodesAction = m_model.createClass( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#NameBlankNodesAction" );
-    
+
     public static final OntClass Variable = m_model.createClass( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#Variable" );
-    
+
     public static final OntClass ClearModelAction = m_model.createClass( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#ClearModelAction" );
-    
+
     public static final OntClass PropertyValueProcessingAction = m_model.createClass( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#PropertyValueProcessingAction" );
-    
+
     public static final OntClass SmushResourcesAction = m_model.createClass( "http://vitro.mannlib.cornell.edu/ns/vitro/rdfIngestWorkflow#SmushResourcesAction" );
-    
-}
\ No newline at end of file
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockableModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockableModel.java
index 9df6d07b9..60a9ad5ff 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockableModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockableModel.java
@@ -11,9 +11,9 @@ import org.apache.jena.shared.Lock;
  * Makes it easy to use a Jena Model in a try-with-resources block. At the end
  * of the block, the close() method will not close the model, but will merely
  * release the lock.
- * 
+ *
  * Wraps around a bare Model. Cannot be used without locking.
- * 
+ *
  * <pre>
  * try (LockedModel m = new LockableModel(model).read()) {
  *    ...
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockableOntModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockableOntModel.java
index 136ddc2a7..834d5ffd2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockableOntModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockableOntModel.java
@@ -11,18 +11,18 @@ import org.apache.jena.shared.Lock;
  * Makes it easy to use a Jena OntModel in a try-with-resources block. At the
  * end of the block, the close() method will not close the model, but will
  * merely release the lock.
- * 
+ *
  * Returned by the LockableOntModelSelector, or it can be wrapped around a bare
  * OntModel. Cannot be used without locking.
- * 
+ *
  * <pre>
  * try (LockedOntModel m = lockableOms.getDisplayModel.read()) {
  *    ...
  * }
  * </pre>
- * 
+ *
  * or
- * 
+ *
  * <pre>
  * try (LockedOntModel m = new LockableOntModel(ontModel).read()) {
  *    ...
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockableOntModelSelector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockableOntModelSelector.java
index d3641cea3..8d27ddbfe 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockableOntModelSelector.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockableOntModelSelector.java
@@ -10,10 +10,10 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
  * Makes it easy to use a Jena OntModel with a try-with-resources block. If you
  * have access to an OntModelSelector, you can wrap it and then use it obtain
  * LockableOntModels.
- * 
+ *
  * <pre>
  * LockableOntModelSelector lockableOms = new LockableOntModelSelector(oms);
- *  
+ *
  * try (LockedOntModel m = lockableOms.getDisplayModel.read()) {
  *    ...
  * }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockedModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockedModel.java
index 896b85494..398da5e00 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockedModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/criticalsection/LockedModel.java
@@ -9,13 +9,13 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.adapters.AbstractModelDecorat
 /**
  * A model that is easy to use in a try-with-resources code block. It can only
  * be created by locking a LockableModel.
- * 
+ *
  * <pre>
  * try (LockedModel m = lockableModel.read()) {
  *    ...
  * }
  * </pre>
- * 
+ *
  * The close method has been hijacked to simply release the lock, and not to
  * actually close the wrapped model.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/json/JacksonUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/json/JacksonUtils.java
index 3ebc23857..cc2269631 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/json/JacksonUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/json/JacksonUtils.java
@@ -46,9 +46,9 @@ public class JacksonUtils {
 	/**
 	 * net.sf.json provided this method (assuming that 'values' is an array of
 	 * JSON objects that contain Strings.
-	 * 
+	 *
 	 * literalValues = (List<String>) JSONSerializer.toJava(values);
-	 * 
+	 *
 	 * So here is a replacement for that.
 	 */
 	public static List<String> jsonArrayToStrings(ArrayNode values) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/logging/ComplexStringFormatter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/logging/ComplexStringFormatter.java
index 717386c9d..760f10e14 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/logging/ComplexStringFormatter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/logging/ComplexStringFormatter.java
@@ -7,12 +7,12 @@ import java.util.Stack;
 /**
  * <pre>
  * The string form of a data structure might look like this:
- * HolderOfSeveralComponents[@1023948fe, 
+ * HolderOfSeveralComponents[@1023948fe,
  *     AComponentThing[@dc0048ba],
  *     AThingWithSurprisingFormatting,
  *     ThingWithOneComponent[@120985093,
  *         HoldsNoComponents[@99999999]
- *         ], 
+ *         ],
  *     ThingWithNoHashCodeAndAMap[
  *         map={
  *             one,
@@ -22,7 +22,7 @@ import java.util.Stack;
  *         ],
  *     AnotherThingWithSurprisingFormatting
  *     ]
- *    
+ *
  * Created by following these rules:
  *    create stack holding line number: size of stack is indent level
  *    on [ or { -- write "[" or "{", add line number to stack. If next character is not @, } or ], line-break.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/logging/StackTraceLayout.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/logging/StackTraceLayout.java
index d8eba9a2a..f67f3ffa2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/logging/StackTraceLayout.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/logging/StackTraceLayout.java
@@ -8,16 +8,16 @@ import org.apache.log4j.spi.LoggingEvent;
 /**
  * This is a nasty Layout that prints a full stack trace for every logging
  * event.
- * 
+ *
  * Here is an example of how to use this to show full stack traces every time we
  * get a log message from org.apache.jena.riot.
- * 
+ *
  * <pre>
- * log4j.appender.RiotAppender=org.apache.log4j.RollingFileAppender 
+ * log4j.appender.RiotAppender=org.apache.log4j.RollingFileAppender
  * log4j.appender.RiotAppender.File= $${catalina.base}/logs/${webapp.name}.riot.log
- * log4j.appender.RiotAppender.MaxFileSize=10MB 
- * log4j.appender.RiotAppender.MaxBackupIndex=10 
- * log4j.appender.RiotAppender.layout=edu.cornell.mannlib.vitro.webapp.utils.logging.StackTraceLayout 
+ * log4j.appender.RiotAppender.MaxFileSize=10MB
+ * log4j.appender.RiotAppender.MaxBackupIndex=10
+ * log4j.appender.RiotAppender.layout=edu.cornell.mannlib.vitro.webapp.utils.logging.StackTraceLayout
  * log4j.logger.org.apache.jena.riot=INFO, RiotAppender
  * </pre>
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/logging/ToString.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/logging/ToString.java
index d34be92b5..970328c19 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/logging/ToString.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/logging/ToString.java
@@ -94,9 +94,9 @@ public class ToString {
 
 	/**
 	 * If the string is found in ModelNames, return the name of the constant.
-	 * 
+	 *
 	 * If the name is a filegraph, convert it to filegraph:[suffix]
-	 * 
+	 *
 	 * Otherwise, return the string itself.
 	 */
 	public static String modelName(String name) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/MenuManagementDataUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/MenuManagementDataUtils.java
index d4a4df7fd..8533fa009 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/MenuManagementDataUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/MenuManagementDataUtils.java
@@ -10,7 +10,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /*
- * This class includes methods that help in selecting a data getter based on 
+ * 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 MenuManagementDataUtils {
@@ -29,10 +29,10 @@ public class MenuManagementDataUtils {
     public static void setImplementation(IMenuManagementDataUtils impl) {
         MenuManagementDataUtils.impl = impl;
     }
-    
+
 
     public interface IMenuManagementDataUtils {
         public void includeRequiredSystemData(ServletContext context, Map<String, Object> templateData);
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessClassGroup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessClassGroup.java
index dcdf76ae1..efe158989 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessClassGroup.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessClassGroup.java
@@ -30,25 +30,25 @@ public class ProcessClassGroup implements ProcessDataGetter{
 	//page data is data retrieved from data getter
     @Override
 	public void populateTemplate(HttpServletRequest req, Map<String, Object> pageData, Map<String, Object> templateData) {
-		//This is a class group page so 
+		//This is a class group page so
 		templateData.put("isClassGroupPage", true);
 		templateData.put("includeAllClasses", true);
-		
+
 		//Get the class group from VClassGroup
 		DataGetterUtils.getClassGroupForDataGetter(req, pageData, templateData);
 	}
-    
-    
+
+
     //Process submission
-    
+
     @Override
 	public  Model processSubmission(VitroRequest vreq, Resource dataGetterResource) {
 		Model dgModel = ModelFactory.createDefaultModel();
 		String dataGetterTypeUri = DataGetterUtils.generateDataGetterTypeURI(ClassGroupPageData.class.getName());
-		dgModel.add(dgModel.createStatement(dataGetterResource, 
-				RDF.type, 
+		dgModel.add(dgModel.createStatement(dataGetterResource,
+				RDF.type,
 				ResourceFactory.createResource(dataGetterTypeUri)));
 		return dgModel;
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessDataGetter.java
index 113a133c0..a1d91cd37 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessDataGetter.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessDataGetter.java
@@ -15,6 +15,6 @@ public interface ProcessDataGetter{
     public void populateTemplate(HttpServletRequest req, Map<String, Object> pageData, Map<String, Object> templateData);
 
     public  Model processSubmission(VitroRequest vreq, Resource dataGetterResource);
-    
-    
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessIndividualsForClasses.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessIndividualsForClasses.java
index eb4594fa3..14b23f14d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessIndividualsForClasses.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessIndividualsForClasses.java
@@ -32,7 +32,7 @@ public class ProcessIndividualsForClasses implements ProcessDataGetter {
     private static final Log log = LogFactory.getLog(ProcessIndividualsForClasses.class);
 
    /**Retrieve and populate**/
-    
+
   //Based on institutional internal page and not general individualsForClasses
     @Override
 	public void populateTemplate(HttpServletRequest req, Map<String, Object> pageData, Map<String, Object> templateData) {
@@ -40,27 +40,27 @@ public class ProcessIndividualsForClasses implements ProcessDataGetter {
 		populateIncludedClasses(pageData, templateData);
 		populateRestrictedClasses(pageData, templateData);
 		//Also save the class group for display
-		DataGetterUtils.getClassGroupForDataGetter(req, pageData, templateData); 
+		DataGetterUtils.getClassGroupForDataGetter(req, pageData, templateData);
 
 	}
-    
+
     protected void initTemplateData(Map<String,Object> templateData) {
     	templateData.put("isIndividualsForClassesPage", true);
 		templateData.put("isClassGroupPage", false);
 		templateData.put("includeAllClasses", false);
     }
-    
+
     protected void populateIncludedClasses(Map<String, Object> pageData, Map<String, Object> templateData) {
 		//what classes are to be included on page, note this should be a list of string uris
 		VClassGroup includedClasses = (VClassGroup) pageData.get("vClassGroup");
 		templateData.put("includeClasses", getClassUrisAsList(includedClasses));
     }
-    
+
     protected void populateRestrictedClasses(Map<String, Object> pageData, Map<String, Object> templateData) {
 		VClassGroup restrictedClasses = (VClassGroup) pageData.get("restrictVClassGroup");
 		templateData.put("restricted", getClassUrisAsList(restrictedClasses));
     }
-    
+
     protected List<String> getClassUrisAsList(VClassGroup includedClasses) {
 		List<String> classUris = new ArrayList<String>();
 		List<VClass> classList = includedClasses.getVitroClassList();
@@ -69,7 +69,7 @@ public class ProcessIndividualsForClasses implements ProcessDataGetter {
 		}
 		return classUris;
 	}
-    
+
 	/**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
@@ -82,16 +82,16 @@ public class ProcessIndividualsForClasses implements ProcessDataGetter {
 		String[] selectedClasses = vreq.getParameterValues("classInClassGroup");
 		String dataGetterTypeUri = DataGetterUtils.generateDataGetterTypeURI(IndividualsForClassesDataGetter.class.getName());
 		Model dgModel = ModelFactory.createDefaultModel();
-		dgModel.add(dgModel.createStatement(dataGetterResource, 
-				RDF.type, 
+		dgModel.add(dgModel.createStatement(dataGetterResource,
+				RDF.type,
 				ResourceFactory.createResource(dataGetterTypeUri)));
 		for(String classUri: selectedClasses) {
 			dgModel.add(dgModel.createStatement(
-					dataGetterResource, 
+					dataGetterResource,
 					ResourceFactory.createProperty(DisplayVocabulary.GETINDIVIDUALS_FOR_CLASS),
 					ResourceFactory.createResource(classUri)));
 		}
-		
+
 		//This code can be uncommented when the form includes inputs for restricted class uris
 		//At that time, use the input that returns the uris for restriction classes and replace below
 		/*
@@ -99,19 +99,19 @@ public class ProcessIndividualsForClasses implements ProcessDataGetter {
 			String[] restrictedClasses = vreq.getParameterValues("restrictedClassUris");
 			for(String restrictedClassUri: restrictedClasses) {
 				dgModel.add(dgModel.createStatement(
-						dataGetterResource, 
+						dataGetterResource,
 						ResourceFactory.createProperty(DisplayVocabulary.RESTRICT_RESULTS_BY),
 						dgModel.createLiteral(restrictedClassUri)));
 			}
 		}*/
 		return dgModel;
 	}
-	
+
 	private  boolean allClassesSelected(VitroRequest vreq) {
 			String allClasses = vreq.getParameter("allSelected");
 			return (allClasses != null && !allClasses.isEmpty());
 	}
-		
+
 	//This code can be uncommented when the form includes inputs for restricted class uris
 	//At that time, use the input that returns the uris for restriction classes and replace below
 	/*
@@ -119,6 +119,6 @@ public class ProcessIndividualsForClasses implements ProcessDataGetter {
 	   String restrictedClasses = vreq.getParameter("restrictedClassUri");
 		return (restrictedClasses != null && !restrictedClasses.isEmpty());
 	}
-	*/		
-		
-}
\ No newline at end of file
+	*/
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/searchengine/AutoCompleteWords.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/searchengine/AutoCompleteWords.java
index fb9160b51..c16d3468c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/searchengine/AutoCompleteWords.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/searchengine/AutoCompleteWords.java
@@ -12,7 +12,7 @@ import org.apache.commons.logging.LogFactory;
 
 /**
  * A helper class for use with an Auto-complete query.
- * 
+ *
  * Any word that is followed by a delimiter is considered to be complete, and
  * should be matched exactly in the query. If there is a word on the end that is
  * not followed by a delimiter, it is incomplete, and should act like a
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/searchengine/FieldMap.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/searchengine/FieldMap.java
index 957755825..5ee2a83f3 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/searchengine/FieldMap.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/searchengine/FieldMap.java
@@ -8,11 +8,11 @@ import java.util.Map;
 /**
  * A builder object that can assemble a map of search result field names to JSON
  * field names.
- * 
+ *
  * Use like this:
- * 
+ *
  * m = SearchQueryUtils.fieldMap().put("this", "that").put("2nd", "row").map();
- * 
+ *
  */
 public class FieldMap {
 	private final Map<String, String> m = new HashMap<String, String>();
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/searchengine/SearchQueryUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/searchengine/SearchQueryUtils.java
index 8dad2ef46..a9a03e6e9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/searchengine/SearchQueryUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/searchengine/SearchQueryUtils.java
@@ -54,7 +54,7 @@ public class SearchQueryUtils {
 
 	/**
 	 * Parse a response into a list of maps, one map for each document.
-	 * 
+	 *
 	 * The search result field names in the document are replaced by json field
 	 * names in the result, according to the fieldMap.
 	 */
@@ -66,7 +66,7 @@ public class SearchQueryUtils {
 	/**
 	 * Parse a response into a list of maps, accepting only those maps that pass
 	 * a filter, and only up to a maximum number of records.
-	 * 
+	 *
 	 * The search result field names in the document are replaced by json field
 	 * names in the result, according to the fieldMap.
 	 */
@@ -110,45 +110,45 @@ public class SearchQueryUtils {
 	private static String buildTerm(String fieldName, String word) {
 		return fieldName + ":\"" + word + "\"";
 	}
-	
+
 	/**
 	 * Methods that can be used in multiple places, such as
 	 * IndividualListController and SearchIndividualsDataGetter
 	 */
-	
+
 	public static String getAlphaParameter(VitroRequest request){
         return request.getParameter("alpha");
     }
-    
+
     public static int getPageParameter(VitroRequest request) {
         String pageStr = request.getParameter("page");
         if( pageStr != null ){
             try{
-                return Integer.parseInt(pageStr);                
+                return Integer.parseInt(pageStr);
             }catch(NumberFormatException nfe){
                 log.debug("could not parse page parameter");
                 return 1;
-            }                
-        }else{                   
+            }
+        }else{
             return 1;
         }
     }
-	
+
 	//Get count of individuals without actually getting the results
-    public static long getIndividualCount(List<String> vclassUris) {    	    	       
+    public static long getIndividualCount(List<String> vclassUris) {
        SearchEngine search = ApplicationUtils.instance().getSearchEngine();
        SearchQuery query = search.createQuery(makeMultiClassQuery(vclassUris));
        query.setRows(0);
-    	try {    	              
-            SearchResponse response = null;                      
-            response = search.query(query);            
-            return response.getResults().getNumFound();                        
+    	try {
+            SearchResponse response = null;
+            response = search.query(query);
+            return response.getResults().getNumFound();
     	} catch(Exception ex) {
     		log.error("An error occured in retrieving individual count", ex);
     	}
     	return 0;
     }
-	
+
 	/**
      * builds a query with a type clause for each type in vclassUris, NAME_LOWERCASE filetred by
      * alpha, and just the hits for the page for pageSize.
@@ -156,66 +156,66 @@ public class SearchQueryUtils {
     public static SearchQuery getQuery(List<String> vclassUris, String alpha, int page, int pageSize){
         String queryText = "";
         SearchEngine searchEngine = ApplicationUtils.instance().getSearchEngine();
-        
-        try {            
+
+        try {
             queryText = makeMultiClassQuery(vclassUris);
-            
+
         	 // Add alpha filter if applicable
-            if ( alpha != null && !"".equals(alpha) && alpha.length() == 1) {      
+            if ( alpha != null && !"".equals(alpha) && alpha.length() == 1) {
                 queryText += VitroSearchTermNames.NAME_LOWERCASE + ":" + alpha.toLowerCase() + "*";
-            }     
-            
+            }
+
             SearchQuery query = searchEngine.createQuery(queryText);
 
             //page count starts at 1, row count starts at 0
-            int startRow = (page-1) * pageSize ;            
+            int startRow = (page-1) * pageSize ;
             query.setStart( startRow ).setRows( pageSize );
-            
+
             // Need a single-valued field for sorting
             query.addSortField(VitroSearchTermNames.NAME_LOWERCASE_SINGLE_VALUED, Order.ASC);
 
             log.debug("Query is " + query.toString());
             return query;
-            
+
         } catch (Exception ex){
             log.error("Could not make the search query",ex);
-            return searchEngine.createQuery();        
-        }      
-    }    
+            return searchEngine.createQuery();
+        }
+    }
 
     public static SearchQuery getRandomQuery(List<String> vclassUris, int page, int pageSize){
         String queryText = "";
         SearchEngine searchEngine = ApplicationUtils.instance().getSearchEngine();
-        
-		try {            
+
+		try {
             queryText = makeMultiClassQuery(vclassUris);
             log.debug("queryText is " + queryText);
             SearchQuery query = searchEngine.createQuery(queryText);
 
             //page count starts at 1, row count starts at 0
             query.setStart( page ).setRows( pageSize );
-            
+
             log.debug("Query is " + query.toString());
             return query;
-            
+
         } catch (Exception ex){
             log.error("Could not make the search query",ex);
-            return searchEngine.createQuery();        
-        }      
-    }    
+            return searchEngine.createQuery();
+        }
+    }
 
     public static String makeMultiClassQuery( List<String> vclassUris){
-        List<String> queryTypes = new ArrayList<String>();  
-        try {            
+        List<String> queryTypes = new ArrayList<String>();
+        try {
             // query term for rdf:type - multiple types possible
             for(String vclassUri: vclassUris) {
                 queryTypes.add(VitroSearchTermNames.RDFTYPE + ":\"" + vclassUri + "\" ");
-            }           
+            }
 			return StringUtils.join(queryTypes, " AND ");
         } catch (Exception ex){
             log.error("Could not make the search query",ex);
             return "";
-        }            
+        }
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/searchengine/SearchResultsParser.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/searchengine/SearchResultsParser.java
index 65cd8e350..c7ec50bbb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/searchengine/SearchResultsParser.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/searchengine/SearchResultsParser.java
@@ -16,7 +16,7 @@ import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchResultDocumen
 
 /**
  * Parse this search response, creating a map of values for each document.
- * 
+ *
  * The search response field names in the document are replaced by json field
  * names in the parsed results, according to the fieldMap.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparql/SparqlQueryUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparql/SparqlQueryUtils.java
index 826d06b26..f44348191 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparql/SparqlQueryUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparql/SparqlQueryUtils.java
@@ -21,20 +21,20 @@ public class SparqlQueryUtils {
 	 */
 	private static final char[] REGEX_SPECIAL_CHARACTERS = "[\\^$.|?*+()]"
 			.toCharArray();
-	
+
 	/**
 	 * A list of SPARQL syntaxes to try when parsing queries
 	 */
-    public static final List<Syntax> SUPPORTED_SYNTAXES = Arrays.asList( 
+    public static final List<Syntax> SUPPORTED_SYNTAXES = Arrays.asList(
             Syntax.syntaxARQ , Syntax.syntaxSPARQL_11);
 
 	/**
 	 * Escape any regex special characters in the string.
-	 * 
+	 *
 	 * Note that the SPARQL parser requires two backslashes, in order to pass a
 	 * single backslash to the REGEX function.
-	 * 
-	 * Also escape a single quote ('), but only with a single backslash, since 
+	 *
+	 * Also escape a single quote ('), but only with a single backslash, since
 	 * this one is for the SPARQL parser itself (single quote is not a special
 	 * character to REGEX).
 	 */
@@ -45,7 +45,7 @@ public class SparqlQueryUtils {
 				if (c == special) {
 					clean.append('\\').append('\\').append(c);
 					continue outer;
-				} 
+				}
 			}
 			if (c == '\'') {
 				clean.append('\\').append(c);
@@ -55,7 +55,7 @@ public class SparqlQueryUtils {
 		}
 		return clean.toString();
 	}
-	
+
 	/**
 	 * A convenience method to attempt parsing a query string with various syntaxes
 	 * @param queryString Query String
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/ModelSelectQueryContext.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/ModelSelectQueryContext.java
index c185c32b2..eead274ef 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/ModelSelectQueryContext.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/ModelSelectQueryContext.java
@@ -23,7 +23,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.sparqlrunner.SparqlQueryRunner.Sel
 
 /**
  * An implementation of QueryContext based on a Model.
- * 
+ *
  * Package access. Instances should be created only by SparqlQueryRunner, or by
  * a method on this class.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/QueryHolder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/QueryHolder.java
index b0a452354..063f1af48 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/QueryHolder.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/QueryHolder.java
@@ -8,7 +8,7 @@ import java.util.regex.Pattern;
 /**
  * Holds the text of a SPARQL query, and allows you to perform some lexical
  * operations on it.
- * 
+ *
  * This is immutable, so don't forget to get the result of the operations.
  */
 public class QueryHolder {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/RdfServiceSelectQueryContext.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/RdfServiceSelectQueryContext.java
index f87785658..1d42259b6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/RdfServiceSelectQueryContext.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/RdfServiceSelectQueryContext.java
@@ -22,7 +22,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.sparqlrunner.SparqlQueryRunner.Sel
 
 /**
  * An implementation of QueryContext based on an RDFService.
- * 
+ *
  * Package access. Instances should be created only by SparqlQueryRunner, or by
  * a method on this class.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/SparqlQueryRunner.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/SparqlQueryRunner.java
index 31fb5d1a2..9f0b8c0e8 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/SparqlQueryRunner.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/SparqlQueryRunner.java
@@ -12,7 +12,7 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 
 /**
  * A conversational tool for handling SPARQL queries.
- * 
+ *
  * <pre>
  * Examples:
  *   List<String> values = createSelectQueryContext(rdfService, queryString)
@@ -20,22 +20,22 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
  * 				               .execute()
  * 				               .toStringFields("partner")
  * 				               .flatten();
- * 
+ *
  *   QueryHolder qh = queryHolder(queryString)
  *                             .bindToUri("uri", uri));
  *   List<Map<String, String> map = createSelectQueryContext(model, qh)
  *                             .execute()
  *                             .toStringFields();
  * </pre>
- * 
+ *
  * The query context can come from either an RDFService or a Model.
- * 
+ *
  * The execute() method does not actually execute the query: it merely sets it
  * up syntactically.
- * 
+ *
  * If you don't supply any field names to toStringFields(), you get all of
  * them.
- * 
+ *
  * Any string value that returns a blank or empty string is omitted from the
  * results. Any row that returns no values is omitted from the results.
  */
@@ -51,7 +51,7 @@ public final class SparqlQueryRunner {
 	}
 
 	// ------------- SELECT ----------- //
-	
+
 	public static SelectQueryContext createSelectQueryContext(RDFService rdfService,
 			String queryString) {
 		return createSelectQueryContext(rdfService, queryHolder(queryString));
@@ -80,48 +80,48 @@ public final class SparqlQueryRunner {
 
 		public ExecutingSelectQueryContext execute();
 	}
-	
+
 	public static interface ExecutingSelectQueryContext {
 		public StringResultsMapping toStringFields(String... fieldNames);
-		
+
 		public <T> T parse(ResultSetParser<T> parser);
-		
+
 		public void writeToOutput(OutputStream output);
 	}
-	
+
 	// ------------- CONSTRUCT ----------- //
-	
+
 	public static ConstructQueryContext createConstructQueryContext(RDFService rdfService,
 			String queryString) {
 		return createConstructQueryContext(rdfService, queryHolder(queryString));
 	}
-	
+
 	public static ConstructQueryContext createConstructQueryContext(RDFService rdfService,
 			QueryHolder query) {
 		return new RdfServiceConstructQueryContext(rdfService, query);
 	}
-	
+
 	public static ConstructQueryContext createConstructQueryContext(Model model,
 			String queryString) {
 		return createConstructQueryContext(model, queryHolder(queryString));
 	}
-	
+
 	public static ConstructQueryContext createConstructQueryContext(Model model,
 			QueryHolder query) {
 		return new ModelConstructQueryContext(model, query);
 	}
-	
+
 	public static interface ConstructQueryContext{
 		public ConstructQueryContext bindVariableToUri(String name, String uri);
 
 		public ConstructQueryContext bindVariableToPlainLiteral(String name,
 				String value);
-		
+
 		public ExecutingConstructQueryContext execute();
 	}
-	
+
 	public static interface ExecutingConstructQueryContext {
 		public Model toModel();
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/StringResultsMapping.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/StringResultsMapping.java
index 9e6812a53..4999ea57e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/StringResultsMapping.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/sparqlrunner/StringResultsMapping.java
@@ -79,7 +79,7 @@ public class StringResultsMapping {
 		}
 		return list;
 	}
-	
+
 	public List<String> flatten() {
 		List<String> flat = new ArrayList<>();
 		for (Map<String, String> map : listOfMaps) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/threads/VitroBackgroundThread.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/threads/VitroBackgroundThread.java
index 7915136db..d0ff197f7 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/threads/VitroBackgroundThread.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/threads/VitroBackgroundThread.java
@@ -81,7 +81,7 @@ public class VitroBackgroundThread extends Thread {
 	/**
 	 * An immutable object that holds both the current work level and the time
 	 * that it was set.
-	 * 
+	 *
 	 * Particular threads may want to assign additional state using zero or more
 	 * "flags".
 	 */
@@ -108,7 +108,7 @@ public class VitroBackgroundThread extends Thread {
 			return flags;
 		}
 	}
-	
+
 	/**
 	 * A factory class, for use in Executors, that creates threads with
 	 * successive names.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/AntiScript.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/AntiScript.java
index e8f216d5b..072733b12 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/AntiScript.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/AntiScript.java
@@ -15,35 +15,35 @@ import org.owasp.validator.html.ScanException;
 
 /**
  * This is a class to provide methods to strip bad HTML from user input.
- * The primary goal of this is to avoid XSS attacks.  
+ * The primary goal of this is to avoid XSS attacks.
  */
 public class AntiScript {
 
     private static final Log log = LogFactory.getLog(AntiScript.class);
-    
+
     private static Policy policy;
     private static AntiSamy antiSamy;
-        
+
     private static final String ANTI_SCRIPT_SCANNER = "ANTI_SCRIPT_SCANNER";
     private static String ANTI_SCRIPT_POLICY_FILE = "/edu/cornell/mannlib/vitro/webapp/web/antisamy-vitro-1.4.4.xml";
 
     /**
      * This will attempt to return HTML that has been cleaned up according
-     * to the policy.  
-     * 
+     * to the policy.
+     *
      * If there is any error during the scan, an error message
      * will be returned instead of the HTML.  This might not be ideal so
      * consider changing it once we see how this works. Other options include
-     * returning an empty string or some other error message.  Returning 
+     * returning an empty string or some other error message.  Returning
      * the un-scanned HTML is not a secure option as it may contain scripts.
-     * 
+     *
      * This will return null if dirtyInput is null.
      */
     public static String cleanText( String dirtyInput ){
         if( dirtyInput == null )
             return null;
-        
-        AntiSamy as = getAntiSamyScanner();        
+
+        AntiSamy as = getAntiSamyScanner();
         CleanResults cr;
         try {
             cr = as.scan(dirtyInput);
@@ -53,24 +53,24 @@ public class AntiScript {
         }
         return "AntiScript: HTML caused scan error.";
     }
-    
+
     /**
-     * Method to clean a URL or URI.  
+     * Method to clean a URL or URI.
      */
     public static String cleanURI( String dirtyInput ){
         return cleanText(dirtyInput);
     }
-    
+
     /**
      * Method to clean all of the values in a map where the values are of
      * type String.
      */
     public static <T> void cleanMapValues( Map<T,String> map ){
-        for( T key : map.keySet() ){            
+        for( T key : map.keySet() ){
             map.put(key, cleanText(map.get(key)) );
-        }        
+        }
     }
-    
+
     /**
      * Try to get the static policy, if none exists, create a new one.
      * This is a anti-script policy for use with OWASP AntiSamy, not a vivo auth Policy.
@@ -81,32 +81,32 @@ public class AntiScript {
         if( policy == null ){
             Policy newPolicy;
             try {
-                String url = ANTI_SCRIPT_POLICY_FILE;                
-                URL policyFile= AntiScript.class.getResource( url );                                                             
-                newPolicy = Policy.getInstance( policyFile );                
+                String url = ANTI_SCRIPT_POLICY_FILE;
+                URL policyFile= AntiScript.class.getResource( url );
+                newPolicy = Policy.getInstance( policyFile );
                 log.debug("anti-script policy loaded successfully");
                 policy = newPolicy;
             } catch (Throwable e) {
                 log.error("Anti-Script policy not setup.", e);
                 return null;
-            }           
+            }
         }
-        
-        return policy;                              
+
+        return policy;
     }
-    
+
     /**
      * Try to get a static AntiSamy HTML scanner object that is shared the
      * whole application. This may return a scanner with a null
      * policy if the policy is not setup correctly.
      */
     public static AntiSamy getAntiSamyScanner(  ){
-        
+
         if( antiSamy == null ){
-            antiSamy = new AntiSamy( getAntiScriptPolicy() );            
-            log.debug("anti-script scanner loaded successfully");                       
+            antiSamy = new AntiSamy( getAntiScriptPolicy() );
+            log.debug("anti-script scanner loaded successfully");
         }
-         
-        return antiSamy;                       
-    }     
+
+        return antiSamy;
+    }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/ContentType.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/ContentType.java
index 7e036cf92..17675235b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/ContentType.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/ContentType.java
@@ -19,9 +19,9 @@ package edu.cornell.mannlib.vitro.webapp.web;
  * THIS CODE HAS BEEN MODIFIED:
  * The members of the Vitro/VIVO project have modified this code.  It has
  * been modified from the version produced by Google Inc.
- * 
+ *
  * The code in this file is from the Google data API project 1.40.3 on 2010-03-08.
- * See full license from gdata at bottom of this file.  
+ * See full license from gdata at bottom of this file.
  */
 
 import java.io.Serializable;
@@ -36,7 +36,7 @@ import java.util.regex.Pattern;
 * Simple class for parsing and generating Content-Type header values, per
 * RFC 2045 (MIME) and 2616 (HTTP 1.1).
 *
-* 
+*
 */
 public class ContentType implements Serializable {
 
@@ -129,7 +129,7 @@ public class ContentType implements Serializable {
  public static ContentType getAtomFeed() {
    // Use the unqualified type for v1, the qualified one for later versions
    //return Service.getVersion().isCompatible(Service.Versions.V1) ?
-   //    ATOM : ATOM_FEED;	 
+   //    ATOM : ATOM_FEED;
 	 return ATOM_FEED;
  }
 
@@ -156,7 +156,7 @@ public class ContentType implements Serializable {
   */
  public static final ContentType JSON_LD =
 		 new ContentType("application/ld+json;" + DEFAULT_CHARSET).lock();
- 
+
  /**
   * A ContentType constant that describes the Javascript content type.
   */
@@ -192,7 +192,7 @@ public class ContentType implements Serializable {
   */
  public static final ContentType OPENSEARCH =
      new ContentType("application/opensearchdescription+xml").lock();
- 
+
 
  /**
   * A ContentType constant that describes the MIME multipart/related content
@@ -200,45 +200,45 @@ public class ContentType implements Serializable {
   */
  public static final ContentType MULTIPART_RELATED =
      new ContentType("multipart/related").lock();
- 
+
  /**
   * A ContentType constant that describes the application/xml content
   * type.
   */
  public static final ContentType APPLICATION_XML =
      new ContentType("application/xml").lock();
- 
+
  /**
   * A ContentType constant that indicates that the body contains an
   * encapsulated message, with the syntax of an RFC 822 email message.
   */
  public static final ContentType MESSAGE_RFC822 =
      new ContentType("message/rfc822").lock();
- 
+
  /**
   * Wildcard content type that will match any MIME type
   */
  public static final ContentType ANY = new ContentType("*/*").lock();
 
- 
+
 
  /**
   * A ContetType that describes RDF/XML.
   * Added by Brian Caruso for VIVO.
   */
  public final static ContentType RDFXML = new ContentType("application/rdf+xml").lock();
- 
+
  /**
   * A ContetType that describes N3 RDF, this is unofficial and unregistered
   * Added by Brian Caruso for VIVO.
   */
- public final static ContentType N3 = new ContentType("text/n3").lock(); 
- 
+ public final static ContentType N3 = new ContentType("text/n3").lock();
+
  /**
   * A ContetType that describes turtle RDF, this is unofficial and unregistered
   * Added by Brian Caruso for VIVO.
   */
- public final static ContentType TURTLE = new ContentType("text/turtle").lock(); 
+ public final static ContentType TURTLE = new ContentType("text/turtle").lock();
 
  /**
   * Determines the best "Content-Type" header to use in a servlet response
@@ -327,11 +327,11 @@ public class ContentType implements Serializable {
  }
 
 /**
- * Gets the best content type based weighted q from client accept header and 
+ * Gets the best content type based weighted q from client accept header and
  * the server weighted q of the extent that the type conveys the resource.
- * 
+ *
  * From suggestions by Tim Berners-Lee at http://www.w3.org/DesignIssues/Conneg
- * 
+ *
  * @param clientAcceptsTypes types the client can accept with Q weights.
  * @param serverTypes types the server can provide with Q weights.
  * @return returns content type of best match or null if no match.
@@ -348,13 +348,13 @@ public class ContentType implements Serializable {
              maxQ = (serverQ * clientQ);
              type = serverType;
          }
-     }     
+     }
      return type;
  }
- 
+
  /**
   * This method was added by Brian Caruso of the VIVO project. March 15 2011.
-  * 
+  *
   * @param acceptHeader Accept header
   * @return the types and the q values from the accept header
   */
@@ -392,15 +392,15 @@ public class ContentType implements Serializable {
          // ignore exception
          continue;
        }
-       
+
        if( acceptedContentType != null ){
            qcMap.put(acceptedContentType.getMediaType(), curQ);
        }
      }
-     
+
      return qcMap;
  }
- 
+
 /**
   * Constructs a new instance with default media type
   */
@@ -482,17 +482,17 @@ public class ContentType implements Serializable {
 
  private String type;
  public String getType() { return type; }
- public void setType(String type) { 
+ public void setType(String type) {
    assertNotLocked();
-   this.type = type; 
+   this.type = type;
  }
 
 
  private String subType;
  public String getSubType() { return subType; }
- public void setSubType(String subType) { 
+ public void setSubType(String subType) {
    assertNotLocked();
-   this.subType = subType; 
+   this.subType = subType;
  }
 
  /** Returns the full media type */
@@ -508,7 +508,7 @@ public class ContentType implements Serializable {
  }
 
  private Float q=1.0f;
- 
+
  private HashMap<String, String> attributes = new HashMap<String, String>();
 
  /**
@@ -531,11 +531,11 @@ public class ContentType implements Serializable {
  /**
   * Returns the additional attributes of the content type.
   */
- public Map<String, String> getAttributes() { 
+ public Map<String, String> getAttributes() {
    if (locked) {
      return Collections.unmodifiableMap(attributes);
-   } 
-   return attributes; 
+   }
+   return attributes;
  }
 
  /**
@@ -548,16 +548,16 @@ public class ContentType implements Serializable {
  }
 
  /**
-  * returns q associated with content type. 
+  * returns q associated with content type.
   */
  public float getQ(){
      return q;
  }
- 
+
  public void setQ(float q){
      this.q = q;
  }
- 
+
  /*
   * Returns the charset attribute of the content type or null if the
   * attribute has not been set.
@@ -584,8 +584,8 @@ public class ContentType implements Serializable {
  public boolean match(ContentType acceptedContentType) {
    String acceptedType = acceptedContentType.getType();
    String acceptedSubType = acceptedContentType.getSubType();
-   return STAR.equals(acceptedType) || type.equals(acceptedType) 
-       && (STAR.equals(acceptedSubType) || subType.equals(acceptedSubType)) 
+   return STAR.equals(acceptedType) || type.equals(acceptedType)
+       && (STAR.equals(acceptedSubType) || subType.equals(acceptedSubType))
        && (!isAtom() || matchAtom(acceptedContentType));
  }
 
@@ -594,7 +594,7 @@ public class ContentType implements Serializable {
    return "application".equals(type) && "atom+xml".equals(subType);
  }
 
- /** 
+ /**
   * Compares the optional 'type' attribute of two content types.
   *
   * <p>This method accepts atom content type without the 'type' attribute
@@ -864,4 +864,4 @@ 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.
- */
\ No newline at end of file
+ */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/MiscWebUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/MiscWebUtils.java
index b5024c273..29f3caa5a 100755
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/MiscWebUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/MiscWebUtils.java
@@ -31,9 +31,9 @@ public class MiscWebUtils {
          * a key of a property in properties, and updates the value in current.
          *
          */
-	
+
 	private static final Log log = LogFactory.getLog(MiscWebUtils.class.getName());
-	
+
         public static Properties loadPropertiesFromRequest(Properties current, ServletRequest req){
             if(req == null || current == null){
                 log.error("UtilBean.loadPropertiesFromRequest() exiting because of null input");
@@ -60,7 +60,7 @@ public class MiscWebUtils {
             }
             return current;
         }
-        
+
     /**
      * Gets an attribute from the request, if it is not null, and of Class String
      * print it to req.out, otherwise throw an exception.
@@ -80,14 +80,14 @@ public class MiscWebUtils {
         return (String) contentObj;
     }
 
-	public static String getCustomShortView(HttpServletRequest request) {	
+	public static String getCustomShortView(HttpServletRequest request) {
 		Individual object = ((ObjectPropertyStatement) request
 				.getAttribute("opStmt")).getObject();
 		return getCustomShortView(object, request);
 	}
 
 	// Get custom short view from either the object's class or one of its
-    // superclasses. This is needed because the inference update happens asynchronously, 
+    // superclasses. This is needed because the inference update happens asynchronously,
     // so when a new property has been added and the page is reloaded, the custom short view
     // from a superclass may not have been inferred yet.
 
@@ -95,14 +95,14 @@ public class MiscWebUtils {
 	if( individual == null ) return null;
 
         VitroRequest vreq = new VitroRequest(request);
-        VClassDao vcDao = vreq.getWebappDaoFactory().getVClassDao();	
-       log.debug("searching for custom short view for " + individual.getURI()); 
+        VClassDao vcDao = vreq.getWebappDaoFactory().getVClassDao();
+       log.debug("searching for custom short view for " + individual.getURI());
 
 	String customShortView = null;
         List<VClass> vclasses = individual.getVClasses(true); // get directly
         // asserted vclasses
         Set<String> superClasses = new HashSet<String>();
-        
+
         // First try directly asserted classes, there is no useful decision
         // mechanism for the case where two directly asserted classes
         // have a custom short view.
@@ -121,7 +121,7 @@ public class MiscWebUtils {
             String vclassUri = vclass.getURI();
             superClasses.addAll(vcDao.getAllSuperClassURIs(vclassUri));
         }
-        
+
         // Next try super classes. There is no useful decision mechanism for
         // the case where two super classes have a custom short view.
 	log.debug("checking superclasses for custom short view");
@@ -135,9 +135,9 @@ public class MiscWebUtils {
             }
         }
 
-        return null;	    
+        return null;
 	}
-	
+
     /**
      * returns a table of the req attributes
      * @param req Servlet Request
@@ -152,7 +152,7 @@ public class MiscWebUtils {
             try{
                 Object obj = req.getAttribute(name);
                 value = (obj instanceof Model || obj instanceof ModelCom) ? "[Jena model object]" :
-                	(obj == null) ? "[null]" : 
+                	(obj == null) ? "[null]" :
                 		StringEscapeUtils.ESCAPE_HTML4.translate(obj.toString());
             } catch (Throwable th){
                 value = "unable to get value";
@@ -172,7 +172,7 @@ public class MiscWebUtils {
             String value = null;
             try{
                 Object obj = req.getParameter(name);
-                value = (obj == null) ? "[null]" : 
+                value = (obj == null) ? "[null]" :
                 	StringEscapeUtils.ESCAPE_HTML4.translate(obj.toString());
             } catch (Throwable th){
                 value = "unable to get value";
@@ -192,7 +192,7 @@ public class MiscWebUtils {
             try{
                 Object obj = req.getSession().getAttribute(name);
                 value = (obj instanceof Model || obj instanceof ModelCom) ? "[Jena model object]" :
-                	(obj == null) ? "[null]" : 
+                	(obj == null) ? "[null]" :
                 		StringEscapeUtils.ESCAPE_HTML4.translate(obj.toString());
             } catch (Throwable th){
                 value = "unable to get value";
@@ -233,17 +233,17 @@ public class MiscWebUtils {
 	    	log.debug("    " + value);
 	    	Enumeration values = req.getHeaders(name);
 	    	if( values == null ){
-	    		log.debug("    enumeration was null");            		
+	    		log.debug("    enumeration was null");
 	    	}else{
 	    		log.debug("    enumeration values");
 	    		while( values.hasMoreElements() ){
 	    			String val = (String) values.nextElement();
 	    			log.debug("    " + value);
 	    		}
-	    	}            
+	    	}
 	    }
     }
-    
+
     /**
         This isfrom org.json.simple.JSONObject
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/URLEncoder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/URLEncoder.java
index c7c748eb8..8df29de83 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/URLEncoder.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/URLEncoder.java
@@ -6,7 +6,7 @@ import java.io.UnsupportedEncodingException;
 
 /**
  * A convenience class that uses UTF-8 encoding to encode URLs
- * and rethrows the unlikely UnsupportedEncodingException as an 
+ * and rethrows the unlikely UnsupportedEncodingException as an
  * unchecked exception.
  * @author bjl23
  *
@@ -20,5 +20,5 @@ public class URLEncoder {
 			throw new RuntimeException(e);
 		}
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/ViewFinder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/ViewFinder.java
index 4fd1fa247..e61d5ca4d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/ViewFinder.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/ViewFinder.java
@@ -17,47 +17,47 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
  *
  */
 public class ViewFinder {
-    
+
     private static final Log log = LogFactory.getLog(ViewFinder.class);
-    
-    public enum ClassView { 
+
+    public enum ClassView {
         DISPLAY("getCustomDisplayView", "view-display-default.ftl"),
         // NB this is not the value currently used for custom forms - we use the value on the object property.
         // This value is specifiable from the backend editor, however.
-        FORM("getCustomEntryForm", "form-default.ftl"), 
+        FORM("getCustomEntryForm", "form-default.ftl"),
         SEARCH("getCustomSearchView", "view-search-default.ftl");
-        
+
         private Method method = null;
         private String defaultTemplate = null;
-        
+
         ClassView(String methodName, String defaultTemplate) {
             Class<VClass> vc = VClass.class;
             this.defaultTemplate = defaultTemplate;
             try {
                 method = vc.getMethod(methodName);
             } catch (SecurityException e) {
-                log.error("Access denied to method " + methodName + " or class " + vc.getName());   
+                log.error("Access denied to method " + methodName + " or class " + vc.getName());
             } catch (NoSuchMethodException e) {
                 log.error("Method " + methodName + " not defined for class " + vc.getName());
             }
         }
-        
+
         protected Method getMethod() {
             return method;
         }
-        
+
         protected String getDefaultTemplate() {
             return defaultTemplate;
-        }        
+        }
 
     }
-    
+
     private ClassView view;
-    
+
     public ViewFinder(ClassView view) {
         this.view = view;
     }
-    
+
     public String findClassView(Individual individual, VitroRequest vreq) {
         String templateName = view.getDefaultTemplate();
         String customTemplate = findCustomTemplateByVClasses(individual, vreq);
@@ -67,9 +67,9 @@ public class ViewFinder {
         log.debug("Using template " + templateName + " for individual " + individual.getName());
         return templateName;
     }
-    
+
     private String findCustomTemplateByVClasses(Individual individual, VitroRequest vreq) {
-//        
+//
 //        Method method = view.getMethod();
 //        TemplateLoader templateLoader = FreemarkerConfigurationLoader.getConfig(vreq).getTemplateLoader();
 //
@@ -79,15 +79,15 @@ public class ViewFinder {
 //         * specific custom view applicable to the individual.
 //         * The logic is complex because individuals can belong
 //         * to multiple classes, and classes can subclass multiple
-//         * classes. If there are two competing custom views at the 
+//         * classes. If there are two competing custom views at the
 //         * same level of specificity, what should we do? Also, if we
 //         * are displaying a list of individuals belonging to a certain
-//         * class, we may want to use only a custom view defined for that 
-//         * class and NOT a more specific one. See NIHVIVO-568. Similarly 
+//         * class, we may want to use only a custom view defined for that
+//         * class and NOT a more specific one. See NIHVIVO-568. Similarly
 //         * when we're displaying an object property: if we are displaying
 //         * #hasPrincipalInvestigatorRole, the object should be displayed
 //         * as a PrincipalInvestigatorRole object rather than some other type.
-//         * 
+//         *
 //         * For now, iterate first through asserted classes, and if no custom view
 //         * found there, iterate through inferred classes. Modeled on MiscWebUtils.getCustomShortView().
 //         */
@@ -112,7 +112,7 @@ public class ViewFinder {
 //            String vclassUri = vclass.getURI();
 //            superClasses.addAll(vcDao.getAllSuperClassURIs(vclassUri));
 //        }
-//        
+//
 //        // Next try superclasses. There is no useful decision mechanism for
 //        // the case where two superclasses have a custom template defined.
 //        for (String superClassUri : superClasses) {
@@ -124,13 +124,13 @@ public class ViewFinder {
 //        }
 
         return null;
-        
+
     }
-    
+
 //    private String findCustomTemplateForVClass(VClass vclass, Method method, TemplateLoader templateLoader) {
 //        String customTemplate = null;
 //        String vClassCustomTemplate = null;
-//        
+//
 //        try {
 //            vClassCustomTemplate = (String) method.invoke(vclass);
 //        } catch (IllegalArgumentException e) {
@@ -140,7 +140,7 @@ public class ViewFinder {
 //        } catch (InvocationTargetException e) {
 //            log.error("Exception thrown by method " + method.getName() + " in findCustomTemplateForVClass().");
 //        }
-//        
+//
 //        if (!StringUtils.isEmpty(vClassCustomTemplate)) {
 //            log.debug("Custom template " + vClassCustomTemplate + " defined for class " + vclass.getName());
 //            try {
@@ -153,9 +153,9 @@ public class ViewFinder {
 //                }
 //            } catch (IOException e) {
 //                log.error("IOException looking for source for template " + vClassCustomTemplate);
-//            }                   
+//            }
 //        }
-//        
+//
 //        if (log.isDebugEnabled()) {
 //            if (customTemplate != null) {
 //                log.debug("Using custom template " + customTemplate + " for class " + vclass.getName());
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/beanswrappers/ReadOnlyBeansWrapper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/beanswrappers/ReadOnlyBeansWrapper.java
index 459789a3f..08bdcb4bc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/beanswrappers/ReadOnlyBeansWrapper.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/beanswrappers/ReadOnlyBeansWrapper.java
@@ -16,14 +16,14 @@ import freemarker.ext.beans.BeansWrapper.MethodAppearanceDecision;
  * purpose as a method that returns void, or whose name
  * starts with "set". It also hides built-in methods of Java
  * utility classes like Map.put(), etc.
- * 
+ *
  * @author rjy7
  *
  */
 public class ReadOnlyBeansWrapper extends BeansWrapper {
 
     private static final Log log = LogFactory.getLog(ReadOnlyBeansWrapper.class);
-    
+
     public ReadOnlyBeansWrapper() {
         // Start by exposing all safe methods.
         setExposureLevel(EXPOSE_SAFE);
@@ -67,5 +67,5 @@ public class ReadOnlyBeansWrapper extends BeansWrapper {
 //            log.error(e, e);
 //        }
 //    }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/BaseTemplateDirectiveModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/BaseTemplateDirectiveModel.java
index 0ac90899c..b9c2e2021 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/BaseTemplateDirectiveModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/BaseTemplateDirectiveModel.java
@@ -19,9 +19,9 @@ import freemarker.template.TemplateModelException;
 public abstract class BaseTemplateDirectiveModel implements TemplateDirectiveModel {
 
     private static final Log log = LogFactory.getLog(BaseTemplateDirectiveModel.class);
-    
+
     public abstract Map<String, Object> help(String name);
-    
+
     public static String processTemplateToString(String templateName, Map<String, Object> map, Environment env) {
         Template template = getTemplate(templateName, env);
         StringWriter sw = new StringWriter();
@@ -32,9 +32,9 @@ public abstract class BaseTemplateDirectiveModel implements TemplateDirectiveMod
         } catch (IOException e) {
             log.error("IOException creating processing environment", e);
         }
-        return sw.toString();        
+        return sw.toString();
     }
-    
+
     private static Template getTemplate(String templateName, Environment env) {
         Template template = null;
         try {
@@ -42,10 +42,10 @@ public abstract class BaseTemplateDirectiveModel implements TemplateDirectiveMod
         } catch (IOException e) {
             // RY Should probably throw this error instead.
             log.error("Cannot get template " + templateName, e);
-        }  
-        return template;        
+        }
+        return template;
     }
-    
+
     // ----------------------------------------------------------------------
 	// Convenience methods for parsing the parameter map
 	// ----------------------------------------------------------------------
@@ -82,5 +82,5 @@ public abstract class BaseTemplateDirectiveModel implements TemplateDirectiveMod
 
 		return o.toString();
 	}
-	
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/EmailDirective.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/EmailDirective.java
index b6a783d00..4b31d7d77 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/EmailDirective.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/EmailDirective.java
@@ -21,7 +21,7 @@ import freemarker.template.TemplateModelException;
 
 /**
  * Process the inputs for a FreemarkerEmailMessage.
- * 
+ *
  * @see FreemarkerEmailMessage
  */
 public class EmailDirective extends BaseTemplateDirectiveModel {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/IndividualShortViewDirective.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/IndividualShortViewDirective.java
index 9e02c1ff6..ffb9350f2 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/IndividualShortViewDirective.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/IndividualShortViewDirective.java
@@ -86,7 +86,7 @@ public class IndividualShortViewDirective extends BaseTemplateDirectiveModel {
 			log.warn("ShortViewService was not initialized properly.");
 			return;
 		}
-		
+
 		TemplateAndSupplementalData svInfo = svs.getShortViewInfo(individual,
 				svContext, new VitroRequest(request));
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/UrlDirective.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/UrlDirective.java
index 951a24fe9..4c9060b5b 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/UrlDirective.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/UrlDirective.java
@@ -21,8 +21,8 @@ import freemarker.template.TemplateException;
 import freemarker.template.TemplateModel;
 import freemarker.template.TemplateModelException;
 
-/** 
- * Template directive to be used to get image src values. 
+/**
+ * Template directive to be used to get image src values.
  * Parameters are not needed, therefore not supported.
  * @author rjy7
  *
@@ -30,7 +30,7 @@ import freemarker.template.TemplateModelException;
 public class UrlDirective extends BaseTemplateDirectiveModel {
 
     private static final Log log = LogFactory.getLog(UrlDirective.class);
-    
+
     @Override
     public void execute(Environment env, Map params, TemplateModel[] loopVars,
             TemplateDirectiveBody body) throws TemplateException, IOException {
@@ -39,30 +39,30 @@ public class UrlDirective extends BaseTemplateDirectiveModel {
             throw new TemplateModelException(
                 "The url directive doesn't allow loop variables.");
         }
-        
+
         if (body != null) {
             throw new TemplateModelException(
                 "The url directive doesn't allow nested content.");
-        } 
-        
+        }
+
         Object o = params.get("path");
         if (o == null) {
             throw new TemplateModelException(
                 "The url directive requires a value for parameter 'path'.");
         }
-        
+
         if (! ( o instanceof SimpleScalar)) {
             throw new TemplateModelException(
                 "The url directive requires a string value for parameter 'path'.");
         }
-        
+
         String path = o.toString();
-        
+
         if (!path.startsWith("/")) {
             throw new TemplateModelException(
                 "The url directive requires that the value of parameter 'path' is an absolute path starting with '/'.");
         }
-        
+
         String url = UrlBuilder.getUrl(path);
         Writer out = env.getOut();
         out.write(url);
@@ -73,18 +73,18 @@ public class UrlDirective extends BaseTemplateDirectiveModel {
         Map<String, Object> map = new LinkedHashMap<String, Object>();
 
         map.put("effect", "Generate a full url from a path by prepending the servlet context path. Use for generating src attribute of image tags, href attribute of anchor tags, etc.");
-        
+
         map.put("comments", "The path should be an absolute path, starting with \"/\".");
-        
+
         Map<String, String> params = new HashMap<String, String>();
         params.put("path", "path");
         map.put("parameters", params);
-        
+
         List<String> examples = new ArrayList<String>();
         examples.add("&lt;img src=\"<@url path=\"/images/placeholders/person.thumbnail.jpg\" />\" /&gt;" );
         map.put("examples", examples);
-        
+
         return map;
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/WidgetDirective.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/WidgetDirective.java
index 701ce797b..6ba4ade83 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/WidgetDirective.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/directives/WidgetDirective.java
@@ -28,7 +28,7 @@ public class WidgetDirective extends BaseTemplateDirectiveModel {
 
     private static final Log log = LogFactory.getLog(WidgetDirective.class);
     private static final String WIDGET_PACKAGE = "edu.cornell.mannlib.vitro.webapp.web.widgets";
-    
+
     @Override
     public void execute(Environment env, Map params, TemplateModel[] loopVars,
             TemplateDirectiveBody body) throws TemplateException, IOException {
@@ -41,18 +41,18 @@ public class WidgetDirective extends BaseTemplateDirectiveModel {
             throw new TemplateModelException(
                 "The dump directive doesn't allow nested content.");
         }
-        
+
         Object nameParam = params.get("name");
         if ( !(nameParam instanceof SimpleScalar)) {
             throw new TemplateModelException(
-               "Value of parameter 'name' must be a string.");     
+               "Value of parameter 'name' must be a string.");
         }
         String widgetName = nameParam.toString();
 
         // Optional param
         Object includeParam = params.get("include");
         String methodName;
-        // If include param is missing, or something other than "assets", 
+        // If include param is missing, or something other than "assets",
         // assign default value "markup"
         if (includeParam == null) {
             methodName = "markup";
@@ -63,13 +63,13 @@ public class WidgetDirective extends BaseTemplateDirectiveModel {
             }
         }
         methodName = "do" + StringUtils.capitalize(methodName);
-        
-        try {       
+
+        try {
             String widgetClassName = WIDGET_PACKAGE + "." + StringUtils.capitalize(widgetName) + "Widget";
-            Class<?> widgetClass = Class.forName(widgetClassName); 
-            Widget widget = (Widget) widgetClass.newInstance();             
+            Class<?> widgetClass = Class.forName(widgetClassName);
+            Widget widget = (Widget) widgetClass.newInstance();
             Method method = widgetClass.getMethod(methodName, Environment.class, Map.class);
-            
+
             // Right now it seems to me that we will always be producing a string for the widget calls. If we need greater
             // flexibility, we can return a ResponseValues object and deal with different types here.
             String output = (String) method.invoke(widget, env, params);
@@ -80,18 +80,18 @@ public class WidgetDirective extends BaseTemplateDirectiveModel {
             if ("doMarkup".equals(methodName) && FreemarkerHttpServlet.BODY_TEMPLATE_TYPE.equals(templateType)) {
                 output += widgetClass.getMethod("doAssets", Environment.class, Map.class).invoke(widget, env, params);
             }
-              
+
             Writer out = env.getOut();
             out.write(output);
-            
+
         } catch  (ClassNotFoundException e) {
             log.error("Widget " + widgetName + " not found.");
         } catch (IOException e) {
-                log.error("Error writing output for widget " + widgetName, e);  
+                log.error("Error writing output for widget " + widgetName, e);
         } catch (Exception e) {
             log.error("Error invoking widget " + widgetName, e);
         }
-        
+
     }
 
     @Override
@@ -99,24 +99,24 @@ public class WidgetDirective extends BaseTemplateDirectiveModel {
         Map<String, Object> map = new LinkedHashMap<String, Object>();
 
         map.put("effect", "Add a reuseable block of markup and functionality to the template, with associated scripts and stylesheets injected into the page &lt;head&gt; element.");
-        
+
         map.put("comments", "From a body template, insert widget directive in desired location with no include value or include=\"markup\". Both assets and markup will be included. " +
                             "From a page template, insert widget directive at top of template with include=\"assets\". Insert widget directive in desired location " +
                             "with no include value or include=\"markup\".");
-        
+
         Map<String, String> params = new HashMap<String, String>();
         params.put("name", "name of widget");
         params.put("include", "values: \"assets\" to include scripts and stylesheets associated with the widget; \"markup\" to include the markup. " +
                               "\"markup\" is default value, so does not need to be specified.");
         map.put("parameters", params);
-        
+
         List<String> examples = new ArrayList<String>();
         examples.add("<@" + name + " name=\"login\" /> (use in body and page templates where markup should be inserted)");
         examples.add("<@" + name + " name=\"login\" include=\"markup\" /> (same as example 1)");
         examples.add("<@" + name + " name=\"login\" include=\"assets\" /> (use at top of page template to get scripts and stylesheets inserted into the &lt;head&gt; element)");
-        
+
         map.put("examples", examples);
-        
+
         return map;
     }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/images/PlaceholderUtil.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/images/PlaceholderUtil.java
index 0a8fe43c5..459fe8a88 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/images/PlaceholderUtil.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/images/PlaceholderUtil.java
@@ -26,7 +26,7 @@ import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 
 /**
  * A utility for finding the URL of the correct Placeholder image.
- * 
+ *
  * The mapping of image URLs to classes is created at startup, and stored in the
  * ServletContext.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/ConfirmAuthorization.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/ConfirmAuthorization.java
index ace696739..12aa5df72 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/ConfirmAuthorization.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/ConfirmAuthorization.java
@@ -20,7 +20,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
 
 /**
  * Confirm that the user is authorized to perform each of the RequestedActions.
- * 
+ *
  * The user specifies the actions as the "requestedActions" attribute of the
  * HTTP request. The attribute must contain either a RequestedAction or an array
  * of RequestedActions.
@@ -54,7 +54,7 @@ public class ConfirmAuthorization extends BodyTagSupport {
 
 	/**
 	 * The attribute may be either a single RequestedAction or an array of
-	 * RequestedActions. 
+	 * RequestedActions.
 	 *
 	 * When we are done, clear the attribute, so any included or forwarded page
 	 * will not see it.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/OptionsForClassTag.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/OptionsForClassTag.java
index 810c721aa..b2f0e63a6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/OptionsForClassTag.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/OptionsForClassTag.java
@@ -72,4 +72,4 @@ public class OptionsForClassTag extends TagSupport {
     public int doEndTag(){
 	  return EVAL_PAGE;
 	}
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/OptionsForPropertyTag.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/OptionsForPropertyTag.java
index 520f31904..b324d35d1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/OptionsForPropertyTag.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/OptionsForPropertyTag.java
@@ -34,7 +34,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
  * Time: 12:16:29 PM
  */
 public class OptionsForPropertyTag extends TagSupport {
-	
+
 	private static final Log log = LogFactory.getLog(OptionsForPropertyTag.class.getName());
     private String subjectUri, predicateUri, selectedUri;
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/StringProcessorTag.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/StringProcessorTag.java
index f3be9ba2e..9b8c53eb0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/StringProcessorTag.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/StringProcessorTag.java
@@ -19,27 +19,27 @@ import net.sf.jga.fn.UnaryFunctor;
  */
 
 public class StringProcessorTag extends BodyTagSupport {
-    
+
     public void setPageContext(PageContext pageContext){
         this.pageContext = pageContext;
     }
-    
+
     @Override
     public int doStartTag(){
         Object obj =  pageContext.getRequest().getAttribute(STRING_PROCESSOR) ;
-        if( obj == null || !(obj instanceof UnaryFunctor) )                   
+        if( obj == null || !(obj instanceof UnaryFunctor) )
             return EVAL_BODY_INCLUDE;
         else
-            return EVAL_BODY_BUFFERED;        
+            return EVAL_BODY_BUFFERED;
     }
-    
+
     @Override
     public int doAfterBody() throws JspException{
         Object obj =  pageContext.getRequest().getAttribute(STRING_PROCESSOR) ;
-        if( obj == null || !(obj instanceof UnaryFunctor) )               
+        if( obj == null || !(obj instanceof UnaryFunctor) )
             return EVAL_PAGE;
-        
-        UnaryFunctor<String,String> functor = (UnaryFunctor<String,String>)obj;        
+
+        UnaryFunctor<String,String> functor = (UnaryFunctor<String,String>)obj;
         BodyContent bc = getBodyContent();
         JspWriter out = getPreviousOut();
         try{
@@ -50,15 +50,15 @@ public class StringProcessorTag extends BodyTagSupport {
 
     public static void putStringProcessorInRequest(HttpServletRequest request, UnaryFunctor<String,String>processor){
         if( request==null || processor==null) return;
-        
+
         Object obj =  request.getAttribute(STRING_PROCESSOR) ;
-        if( obj == null )               
+        if( obj == null )
             request.setAttribute(STRING_PROCESSOR, processor);
-        else{            
+        else{
             UnaryFunctor<String,String> functor = (UnaryFunctor<String,String>)obj;
             request.setAttribute(STRING_PROCESSOR,processor.compose(functor));
         }
     }
-    
+
    public static String STRING_PROCESSOR = "StringProcessor";
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/Value.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/Value.java
index 822c04e82..d5e0aae06 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/Value.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/jsptags/Value.java
@@ -26,7 +26,7 @@ public class Value extends TagSupport {
 
 
     public int doStartTag() {
-    
+
             throw new Error("Value tag is no longer supported, Use InputElementFormating ");
 
 
@@ -36,4 +36,4 @@ public class Value extends TagSupport {
     public int doEndTag(){
 	  return EVAL_PAGE;
 	}
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/methods/BaseTemplateMethodModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/methods/BaseTemplateMethodModel.java
index 734ecd483..0de4c3710 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/methods/BaseTemplateMethodModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/methods/BaseTemplateMethodModel.java
@@ -17,13 +17,13 @@ import freemarker.template.TemplateMethodModel;
 public abstract class BaseTemplateMethodModel implements TemplateMethodModel {
 
     private static final Log log = LogFactory.getLog(BaseTemplateMethodModel.class);
-    
+
     public abstract Map<String, Object> help(String name);
-    
+
     protected String mergeToHelpTemplate(Map<String, Object> map, Environment env) {
-        return processTemplateToString("help-method.ftl", map, env);        
+        return processTemplateToString("help-method.ftl", map, env);
     }
-    
+
     public static String processTemplateToString(String templateName, Map<String, Object> map, Environment env) {
         Template template = getTemplate(templateName, env);
         StringWriter sw = new StringWriter();
@@ -34,9 +34,9 @@ public abstract class BaseTemplateMethodModel implements TemplateMethodModel {
         } catch (IOException e) {
             log.error("IOException creating processing environment", e);
         }
-        return sw.toString();        
+        return sw.toString();
     }
-    
+
     private static Template getTemplate(String templateName, Environment env) {
         Template template = null;
         try {
@@ -44,8 +44,8 @@ public abstract class BaseTemplateMethodModel implements TemplateMethodModel {
         } catch (IOException e) {
             // RY Should probably throw this error instead.
             log.error("Cannot get template " + templateName, e);
-        }  
-        return template;        
+        }
+        return template;
     }
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/methods/IndividualLocalNameMethod.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/methods/IndividualLocalNameMethod.java
index e0269769c..9b81ac635 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/methods/IndividualLocalNameMethod.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/methods/IndividualLocalNameMethod.java
@@ -25,7 +25,7 @@ public class IndividualLocalNameMethod extends BaseTemplateMethodModel {
             throw new TemplateModelException("Wrong number of arguments");
         }
 
-        String uri = (String) args.get(0);        
+        String uri = (String) args.get(0);
         Environment env = Environment.getCurrentEnvironment();
         HttpServletRequest request = (HttpServletRequest) env.getCustomAttribute("request");
         VitroRequest vreq = new VitroRequest(request);
@@ -44,12 +44,12 @@ public class IndividualLocalNameMethod extends BaseTemplateMethodModel {
         List<String>params = new ArrayList<String>();
         params.add("Uri of individual");
         map.put("parameters", params);
-        
+
         List<String> examples = new ArrayList<String>();
         examples.add(name + "(individual.uri)");
         map.put("examples", examples);
-        
+
         return map;
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/methods/IndividualPlaceholderImageUrlMethod.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/methods/IndividualPlaceholderImageUrlMethod.java
index c72c7fc15..697f669bb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/methods/IndividualPlaceholderImageUrlMethod.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/methods/IndividualPlaceholderImageUrlMethod.java
@@ -16,7 +16,7 @@ import freemarker.core.Environment;
 import freemarker.template.TemplateModelException;
 
 /**
- * Get a URL for the placeholder image for this Individual, based on the VClass 
+ * Get a URL for the placeholder image for this Individual, based on the VClass
  * that the Individual belongs to.
  */
 public class IndividualPlaceholderImageUrlMethod extends BaseTemplateMethodModel {
@@ -28,7 +28,7 @@ public class IndividualPlaceholderImageUrlMethod extends BaseTemplateMethodModel
             throw new TemplateModelException("Wrong number of arguments");
         }
 
-        String uri = (String) args.get(0);        
+        String uri = (String) args.get(0);
         Environment env = Environment.getCurrentEnvironment();
         HttpServletRequest request = (HttpServletRequest) env.getCustomAttribute("request");
         VitroRequest vreq = new VitroRequest(request);
@@ -46,12 +46,12 @@ public class IndividualPlaceholderImageUrlMethod extends BaseTemplateMethodModel
         List<String>params = new ArrayList<String>();
         params.add("Uri of individual");
         map.put("parameters", params);
-        
+
         List<String> examples = new ArrayList<String>();
         examples.add(name + "(individual.uri)");
         map.put("examples", examples);
-        
+
         return map;
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/methods/IndividualProfileUrlMethod.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/methods/IndividualProfileUrlMethod.java
index e433237ec..a14decc03 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/methods/IndividualProfileUrlMethod.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/methods/IndividualProfileUrlMethod.java
@@ -22,7 +22,7 @@ public class IndividualProfileUrlMethod extends BaseTemplateMethodModel {
             throw new TemplateModelException("Wrong number of arguments");
         }
 
-        String uri = (String) args.get(0);      
+        String uri = (String) args.get(0);
         uri = UrlBuilder.urlDecode(uri); // decode in case it's encoded
         Environment env = Environment.getCurrentEnvironment();
         HttpServletRequest request = (HttpServletRequest) env.getCustomAttribute("request");
@@ -40,11 +40,11 @@ public class IndividualProfileUrlMethod extends BaseTemplateMethodModel {
         List<String>params = new ArrayList<String>();
         params.add("Uri of individual");
         map.put("parameters", params);
-        
+
         List<String> examples = new ArrayList<String>();
         examples.add(name + "(individual.uri)");
         map.put("examples", examples);
-        
+
         return map;
     }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/BaseTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/BaseTemplateModel.java
index 3714cff59..3ee27994e 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/BaseTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/BaseTemplateModel.java
@@ -15,9 +15,9 @@ public abstract class BaseTemplateModel {
 
     private static final Log log = LogFactory.getLog(BaseTemplateModel.class);
 
-	private static final String URI_CHARACTERS = 
+	private static final String URI_CHARACTERS =
 			"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~:/?#[]@!$&%'()*+,;=";
-    
+
     // Convenience method so subclasses can call getUrl(path)
     protected String getUrl(String path) {
         return UrlBuilder.getUrl(path);
@@ -27,23 +27,23 @@ public abstract class BaseTemplateModel {
     protected String getUrl(String path, ParamMap params) {
         return UrlBuilder.getUrl(path, params);
     }
-    
+
     // Convenience method so subclasses can call getUrl(path, params)
     protected String getUrl(String path, String... params) {
         return UrlBuilder.getUrl(path, params);
     }
 
     /**
-     * Used to do any processing for display of URIs or URLs.  
-     * 
+     * Used to do any processing for display of URIs or URLs.
+     *
      * If we used AntiSami on a URI it would escape any ampersands as &amp;
-     * and perhaps do other nastiness as well. Instead we delete any character 
+     * and perhaps do other nastiness as well. Instead we delete any character
      * that shouldn't be in a URI.
      */
     protected String cleanURIForDisplay( String dirty ){
         if( dirty == null )
             return null;
-        
+
     	StringBuilder clean = new StringBuilder(dirty.length());
     	for (char ch: dirty.toCharArray()) {
     		if (URI_CHARACTERS.indexOf(ch) != -1) {
@@ -52,18 +52,18 @@ public abstract class BaseTemplateModel {
     	}
         return clean.toString();
     }
-    
+
     /**
-     * Used to do any processing for display of general text.  
+     * Used to do any processing for display of general text.
      * Currently this only checks for XSS exploits.
      */
     protected String cleanTextForDisplay( String dirty){
         return simpleScriptStripper(dirty);
     }
-    
+
     /**
      * Used to do any processing for display of values in
-     * a map.  Map may be modified. 
+     * a map.  Map may be modified.
      */
     protected <T> void cleanMapValuesForDisplay( Map<T,String> map){
         for( T key : map.keySet() ){
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/LinkTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/LinkTemplateModel.java
index 0dd71a0ca..e0a3c1048 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/LinkTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/LinkTemplateModel.java
@@ -8,22 +8,22 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap;
 
 public class LinkTemplateModel extends BaseTemplateModel {
-    
+
     private String url;
     private String text;
-    
+
     public LinkTemplateModel() { }
-    
+
     public LinkTemplateModel(String text, String path) {
         setText(text);
         setUrl(path);
     }
-    
+
     public LinkTemplateModel(String text, String path, String...params) {
         setText(text);
         setUrl(path, params);
     }
-    
+
     public LinkTemplateModel(String text, String path, ParamMap params) {
         setText(text);
         setUrl(path, params);
@@ -32,11 +32,11 @@ public class LinkTemplateModel extends BaseTemplateModel {
     protected void setUrl(String path) {
         url = UrlBuilder.getUrl(path);
     }
-    
+
     protected void setUrl(String path, String... params) {
         url = UrlBuilder.getUrl(path, params);
     }
-    
+
     protected void setUrl(String path, ParamMap params) {
         url = UrlBuilder.getUrl(path, params);
     }
@@ -44,12 +44,12 @@ public class LinkTemplateModel extends BaseTemplateModel {
     protected void setText(String text) {
         this.text = StringEscapeUtils.ESCAPE_HTML4.translate(text);
     }
-    
+
     /* Template properties */
-    
+
     public String getUrl() {
         return cleanTextForDisplay( url );
-    }    
+    }
 
     public String getText() {
         return cleanTextForDisplay(text);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/Tags.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/Tags.java
index d89ed61ef..b7c096dfd 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/Tags.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/Tags.java
@@ -24,13 +24,13 @@ import freemarker.template.TemplateModelException;
 /**
  * Provides a mechanism for Freemarker templates (main or included, parent or
  * child) to add to the lists of scripts and style sheets for the current page.
- * 
+ *
  * Each page uses 3 instances of Tags, exposed as ${scripts}, ${headScripts} and
  * ${stylesheets}. A template may add a complete &lt;script/$gt; element (for
  * scripts or headScripts) or a &lt;link&gt; tag (for stylesheets), and these
  * elements will appear at the proper location in the rendered HTML for the
  * page.
- * 
+ *
  * VIVO-1405: This process is augmented by the TagVersionInfo inner class, which
  * attempts to add a "version=" query string to the URL in the supplied element.
  * The version number is derived from the last-modified date of the specified
@@ -65,7 +65,7 @@ public class Tags extends BaseTemplateModel {
 	 * that exposes certain write methods, instead of the configuration's object
 	 * wrapper, which doesn't. The templates can then add stylesheets and
 	 * scripts to the lists by calling their add() methods.
-	 * 
+	 *
 	 * @param Tags
 	 *            tags
 	 * @return TemplateModel
@@ -74,7 +74,7 @@ public class Tags extends BaseTemplateModel {
 
 		public TagsWrapper() {
 			super(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS);
-			
+
 			// Start by exposing all safe methods.
 			setExposureLevel(EXPOSE_SAFE);
 		}
@@ -119,12 +119,12 @@ public class Tags extends BaseTemplateModel {
 
 	/**
 	 * Find the value of "href" or "src".
-	 * 
+	 *
 	 * If there is such a value, and it doesn't have a query string already, and
 	 * it represents a local URL, and we can locate the file that is served by
 	 * the URL and get the last modified date, then we have found a "version
 	 * number" that we can add to the attribute value.
-	 * 
+	 *
 	 * Reference for parsing attributes:
 	 * https://www.w3.org/TR/html/syntax.html#elements-attributes
 	 */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/User.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/User.java
index 2c2ee469e..82f4aa6eb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/User.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/User.java
@@ -20,75 +20,75 @@ public class User extends BaseTemplateModel {
     private final VitroRequest vreq;
     private final UserAccount currentUser;
     private final String profileUrl;
-    
+
     public User(VitroRequest vreq) {
         this.vreq = vreq;
         this.currentUser = LoginStatusBean.getCurrentUser(vreq);
         this.profileUrl = figureAssociatedProfileUrl();
     }
-    
+
 	private String figureAssociatedProfileUrl() {
         IdentifierBundle ids = RequestIdentifiers.getIdBundleForRequest(vreq);
 		Collection<String> uris = HasProfile.getProfileUris(ids);
         if (uris.isEmpty()) {
         	return "";
         }
-        
+
         String uri = uris.iterator().next();
         String url = UrlBuilder.getIndividualProfileUrl(uri, vreq);
         if (url == null) {
         	return "";
         }
-        
+
         return url;
 	}
-	
+
 	/* Template properties */
 
 	public boolean isLoggedIn() {
         return currentUser != null;
     }
-    
+
     public String getEmailAddress() {
 		return (currentUser == null) ? "" : currentUser.getEmailAddress();
     }
-    
+
     public String getLoginName() {
     	if (currentUser == null) {
     		return "";
-    	} 
+    	}
 
     	if (currentUser.getFirstName().isEmpty()) {
     		return currentUser.getEmailAddress();
     	}
-    	
+
     	return currentUser.getFirstName();
     }
-    
+
     public String getFirstName() {
         return currentUser == null ? "" : currentUser.getFirstName();
     }
-    
+
     public String getLastName() {
         return currentUser == null ? "" : currentUser.getLastName();
     }
-    
+
     public boolean getHasSiteAdminAccess() {
     	return PolicyHelper.isAuthorizedForActions(vreq, SiteAdminController.REQUIRED_ACTIONS);
     }
-    
+
     public boolean getHasRevisionInfoAccess() {
     	return PolicyHelper.isAuthorizedForActions(vreq, RevisionInfoController.REQUIRED_ACTIONS);
     }
-    
+
     public boolean isAuthorizedToRebuildSearchIndex() {
         return PolicyHelper.isAuthorizedForActions(vreq, IndexController.REQUIRED_ACTIONS);
     }
-    
+
     public boolean getHasProfile() {
     	return !profileUrl.isEmpty();
     }
-    
+
     public String getProfileUrl() {
     	return profileUrl;
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassGroupTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassGroupTemplateModel.java
index c578a0266..b8ed85137 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassGroupTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassGroupTemplateModel.java
@@ -15,10 +15,10 @@ import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
 public class VClassGroupTemplateModel extends BaseTemplateModel {
 
 	private static final Log log = LogFactory.getLog(VClassGroupTemplateModel.class.getName());
-	
+
     private final VClassGroup vClassGroup;
     private List<VClassTemplateModel> classes;
-    
+
     public VClassGroupTemplateModel(VClassGroup vClassGroup) {
         this.vClassGroup = vClassGroup;
     }
@@ -26,15 +26,15 @@ public class VClassGroupTemplateModel extends BaseTemplateModel {
     public int getDisplayRank() {
         return vClassGroup.getDisplayRank();
     }
-    
+
     public String getUri() {
     	return vClassGroup.getURI();
     }
-    
+
     public String getNamespace() {
     	return vClassGroup.getNamespace();
     }
-    
+
     public String getLocalName() {
     	return vClassGroup.getLocalName();
     }
@@ -42,7 +42,7 @@ public class VClassGroupTemplateModel extends BaseTemplateModel {
     public String getPublicName() {
     	return vClassGroup.getPublicName();
     }
-    
+
     // Protect the template against a group without a name.
     public String getDisplayName() {
         String displayName = getPublicName();
@@ -51,7 +51,7 @@ public class VClassGroupTemplateModel extends BaseTemplateModel {
         }
         return displayName;
     }
-    
+
     public List<VClassTemplateModel> getClasses() {
         if (classes == null) {
             List<VClass> classList = vClassGroup.getVitroClassList();
@@ -60,19 +60,19 @@ public class VClassGroupTemplateModel extends BaseTemplateModel {
                 classes.add(new VClassTemplateModel(vc));
             }
         }
-        
+
         return classes;
     }
-    
+
     public int getIndividualCount(){
         if( vClassGroup.isIndividualCountSet() )
             return vClassGroup.getIndividualCount();
         else
             return 0;
     }
-    
+
     public boolean isIndividualCountSet(){
         return vClassGroup.isIndividualCountSet();
-    }    
-    
+    }
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassTemplateModel.java
index 87c55a9c1..2a19f4cf4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassTemplateModel.java
@@ -11,12 +11,12 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMa
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route;
 
 public class VClassTemplateModel extends BaseTemplateModel {
-    
+
     private static final Log log = LogFactory.getLog(VClassTemplateModel.class);
     private static final String PATH = Route.INDIVIDUAL_LIST.path();
-    
+
     private final VClass vclass;
-    
+
     public VClassTemplateModel(VClass vclass) {
         this.vclass = vclass;
     }
@@ -24,15 +24,15 @@ public class VClassTemplateModel extends BaseTemplateModel {
     public String getUri(){
         return vclass.getURI();
     }
-    
+
     public String getName() {
         return vclass.getName();
     }
-    
+
     public String getUrl() {
         return getUrl(PATH, new ParamMap("vclassId", vclass.getURI()));
     }
-    
+
     public int getIndividualCount() {
         return vclass.getEntityCount();
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFile.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFile.java
index 56aae2bd2..081690415 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFile.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFile.java
@@ -34,18 +34,18 @@ import org.xml.sax.SAXException;
 /**
  * Parses a configuration file for a custom list view, and makes the information
  * readily accessible.
- * 
+ *
  * If not editing the page, include clauses that will filter out statements with
  * missing linked individual or other critical information missing (e.g., anchor
  * and url on a link). If editing, omit those clauses so the incomplete
  * statements will show, and can be edited or removed.
- * 
+ *
  * We might want to refine this based on whether the user can edit the statement
  * in question, but that would require a completely different approach: include
  * the statement in the query results, and then during the postprocessing phase,
  * check the editing policy, and remove the statement if it's not editable. We
  * would not preprocess the query, as here.
- * 
+ *
  * If not collating by subgroup, omit clauses that only involve subgroups.
  */
 public class CustomListViewConfigFile {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/DataPropertyListConfig.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/DataPropertyListConfig.java
index 3e5e9d5d1..aec21d8a6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/DataPropertyListConfig.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/DataPropertyListConfig.java
@@ -19,20 +19,20 @@ import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.DataProper
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.DataPropertyTemplateModel.ConfigError;
 import freemarker.cache.TemplateLoader;
 
-public class DataPropertyListConfig {  
+public class DataPropertyListConfig {
     private static final Log log = LogFactory.getLog(DataPropertyListConfig.class);
-	
-	
+
+
     private static final String CONFIG_FILE_PATH = "/config/";
     private static final String DEFAULT_CONFIG_FILE_NAME = "listViewConfig-dataDefault.xml";
-    
+
     /* NB The default post-processor is not the same as the post-processor for the default view. The latter
      * actually defines its own post-processor, whereas the default post-processor is used for custom views
      * that don't define a post-processor, to ensure that the standard post-processing applies.
-     * 
+     *
      * edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.DefaultObjectPropertyDataPostProcessor
      */
-    
+
     // TODO Lump these together into the PropertyListConfigContext
     private final DataPropertyTemplateModel dptm;
     private final VitroRequest vreq;
@@ -43,8 +43,8 @@ public class DataPropertyListConfig {
     private String selectQuery;
     private String templateName;
 
-    public DataPropertyListConfig(DataPropertyTemplateModel dptm, TemplateLoader templateLoader, VitroRequest vreq, 
-    		DataProperty dp, boolean editing) 
+    public DataPropertyListConfig(DataPropertyTemplateModel dptm, TemplateLoader templateLoader, VitroRequest vreq,
+    		DataProperty dp, boolean editing)
         throws InvalidConfigurationException {
     	this.dptm = dptm;
     	this.vreq = vreq;
@@ -57,42 +57,42 @@ public class DataPropertyListConfig {
             configFileName = DEFAULT_CONFIG_FILE_NAME;
         }
         log.debug("Using list view config file " + configFileName + " for data property " + dp.getURI());
-        
+
         String configFilePath = getConfigFilePath(configFileName);
-        
+
         try {
-            File config = new File(configFilePath);            
+            File config = new File(configFilePath);
             if ( ! isDefaultConfig(configFileName) && ! config.exists() ) {
                 log.warn("Can't find config file " + configFilePath + " for data property " + dp.getURI() + "\n" +
                         ". Using default config file instead.");
                 configFilePath = getConfigFilePath(DEFAULT_CONFIG_FILE_NAME);
                 // Should we test for the existence of the default, and throw an error if it doesn't exist?
-            }                   
-            setValuesFromConfigFile(configFilePath, wadf, editing);           
+            }
+            setValuesFromConfigFile(configFilePath, wadf, editing);
 
         } catch (Exception e) {
             log.error("Error processing config file " + configFilePath + " for data property " + dp.getURI(), e);
             // What should we do here?
         }
-        
+
         if ( ! isDefaultConfig(configFileName) ) {
             ConfigError configError = checkConfiguration();
             if ( configError != null ) { // the configuration contains an error
-                log.warn("Invalid list view config for data property " + dp.getURI() + 
-                        " in " + configFilePath + ":\n" +                            
+                log.warn("Invalid list view config for data property " + dp.getURI() +
+                        " in " + configFilePath + ":\n" +
                         configError + " Using default config instead.");
                 configFilePath = getConfigFilePath(DEFAULT_CONFIG_FILE_NAME);
-                setValuesFromConfigFile(configFilePath, wadf, editing);                    
+                setValuesFromConfigFile(configFilePath, wadf, editing);
             }
         }
-        
+
         isDefaultConfig = isDefaultConfig(configFileName);
     }
-    
+
     private boolean isDefaultConfig(String configFileName) {
         return configFileName.equals(DEFAULT_CONFIG_FILE_NAME);
     }
-    
+
     private ConfigError checkConfiguration() {
 
         ConfigError error = dptm.checkQuery(selectQuery);
@@ -118,13 +118,13 @@ public class DataPropertyListConfig {
 
         return null;
     }
-    
-    private void setValuesFromConfigFile(String configFilePath, WebappDaoFactory wdf, 
+
+    private void setValuesFromConfigFile(String configFilePath, WebappDaoFactory wdf,
             boolean editing) {
 		try {
 			FileReader reader = new FileReader(configFilePath);
 			CustomListViewConfigFile configFileContents = new CustomListViewConfigFile(reader);
-			
+
 			selectQuery = configFileContents.getSelectQuery(false, editing, ListConfigUtils.getUsePreciseSubquery(vreq));
 			templateName = configFileContents.getTemplateName();
 			constructQueries = configFileContents.getConstructQueries();
@@ -133,7 +133,7 @@ public class DataPropertyListConfig {
 			log.error("Error processing config file " + configFilePath, e);
 		}
     }
-    
+
     private String getConfigFilePath(String filename) {
         return vreq.getSession().getServletContext().getRealPath(CONFIG_FILE_PATH + filename);
     }
@@ -154,4 +154,4 @@ public class DataPropertyListConfig {
 		return this.isDefaultConfig;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/PropertyListConfig.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/PropertyListConfig.java
index a5889825c..98591a806 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/PropertyListConfig.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/PropertyListConfig.java
@@ -23,20 +23,20 @@ import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.ObjectProp
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.ObjectPropertyTemplateModel.ConfigError;
 import freemarker.cache.TemplateLoader;
 
-public class PropertyListConfig {  
+public class PropertyListConfig {
     private static final Log log = LogFactory.getLog(PropertyListConfig.class);
-	
-	
+
+
     private static final String CONFIG_FILE_PATH = "/config/";
     private static final String DEFAULT_CONFIG_FILE_NAME = "listViewConfig-default.xml";
-    
+
     /* NB The default post-processor is not the same as the post-processor for the default view. The latter
      * actually defines its own post-processor, whereas the default post-processor is used for custom views
      * that don't define a post-processor, to ensure that the standard post-processing applies.
-     * 
+     *
      * edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.DefaultObjectPropertyDataPostProcessor
      */
-    
+
     // TODO Lump these together into the PropertyListConfigContext
     private final ObjectPropertyTemplateModel optm;
     private final VitroRequest vreq;
@@ -48,10 +48,10 @@ public class PropertyListConfig {
     private String templateName;
     private ObjectPropertyDataPostProcessor postprocessor; // never null
 
-    public PropertyListConfig(ObjectPropertyTemplateModel optm, TemplateLoader templateLoader, VitroRequest vreq, 
-    		ObjectProperty op, boolean editing) 
+    public PropertyListConfig(ObjectPropertyTemplateModel optm, TemplateLoader templateLoader, VitroRequest vreq,
+    		ObjectProperty op, boolean editing)
         throws InvalidConfigurationException {
-    	
+
     	this.optm = optm;
     	this.vreq = vreq;
     	WebappDaoFactory wadf = vreq.getWebappDaoFactory();
@@ -65,48 +65,48 @@ public class PropertyListConfig {
         	CustomListViewLogger.log(op, configFileName);
         }
         log.debug("Using list view config file " + configFileName + " for object property " + op.getURI());
-        
+
         String configFilePath = getConfigFilePath(configFileName);
-        
+
         try {
-            File config = new File(configFilePath);            
+            File config = new File(configFilePath);
             if ( ! isDefaultConfig(configFileName) && ! config.exists() ) {
                 log.warn("Can't find config file " + configFilePath + " for object property " + op.getURI() + "\n" +
                         ". Using default config file instead.");
                 configFilePath = getConfigFilePath(DEFAULT_CONFIG_FILE_NAME);
                 // Should we test for the existence of the default, and throw an error if it doesn't exist?
-            }                   
-            setValuesFromConfigFile(configFilePath, wadf, editing);           
+            }
+            setValuesFromConfigFile(configFilePath, wadf, editing);
 
         } catch (Exception e) {
             log.error("Error processing config file " + configFilePath + " for object property " + op.getURI(), e);
             // What should we do here?
         }
-        
+
         if ( ! isDefaultConfig(configFileName) ) {
             ConfigError configError = checkConfiguration();
             if ( configError != null ) { // the configuration contains an error
-                // If this is a collated property, throw an error: this results in creating an 
+                // If this is a collated property, throw an error: this results in creating an
                 // UncollatedPropertyTemplateModel instead.
                 if (optm instanceof CollatedObjectPropertyTemplateModel) {
                     throw new InvalidConfigurationException(configError.getMessage());
                 }
                 // Otherwise, switch to the default config
-                log.warn("Invalid list view config for object property " + op.getURI() + 
-                        " in " + configFilePath + ":\n" +                            
+                log.warn("Invalid list view config for object property " + op.getURI() +
+                        " in " + configFilePath + ":\n" +
                         configError + " Using default config instead.");
                 configFilePath = getConfigFilePath(DEFAULT_CONFIG_FILE_NAME);
-                setValuesFromConfigFile(configFilePath, wadf, editing);                    
+                setValuesFromConfigFile(configFilePath, wadf, editing);
             }
         }
-        
+
         isDefaultConfig = isDefaultConfig(configFileName);
     }
-    
+
     private boolean isDefaultConfig(String configFileName) {
         return configFileName.equals(DEFAULT_CONFIG_FILE_NAME);
     }
-    
+
     private ConfigError checkConfiguration() {
 
         ConfigError error = optm.checkQuery(selectQuery);
@@ -132,13 +132,13 @@ public class PropertyListConfig {
 
         return null;
     }
-    
-    private void setValuesFromConfigFile(String configFilePath, WebappDaoFactory wdf, 
+
+    private void setValuesFromConfigFile(String configFilePath, WebappDaoFactory wdf,
             boolean editing) {
 		try {
 			FileReader reader = new FileReader(configFilePath);
 			CustomListViewConfigFile configFileContents = new CustomListViewConfigFile(reader);
-			
+
 			boolean collated = optm instanceof CollatedObjectPropertyTemplateModel;
 
 			selectQuery = configFileContents.getSelectQuery(collated, editing, ListConfigUtils.getUsePreciseSubquery(vreq));
@@ -151,7 +151,7 @@ public class PropertyListConfig {
 			log.error("Error processing config file " + configFilePath, e);
 		}
     }
-    
+
 	private ObjectPropertyDataPostProcessor getPostProcessor(
 			String className,
 			ObjectPropertyTemplateModel optm,
@@ -160,7 +160,7 @@ public class PropertyListConfig {
 			if (StringUtils.isBlank(className)) {
 				return new DefaultObjectPropertyDataPostProcessor(optm, wdf);
 			}
-			
+
 			Class<?> clazz = Class.forName(className);
 			Constructor<?> constructor = clazz.getConstructor(ObjectPropertyTemplateModel.class, WebappDaoFactory.class);
 			return (ObjectPropertyDataPostProcessor) constructor.newInstance(optm, wdf);
@@ -187,7 +187,7 @@ public class PropertyListConfig {
 					+ "': can't create postprocessor instance of class '"
 					+ className + "'. " + "Using default postprocessor.", e);
 			return new DefaultObjectPropertyDataPostProcessor(optm, wdf);
-		}           
+		}
 	}
 
     private String getConfigFilePath(String filename) {
@@ -213,4 +213,4 @@ public class PropertyListConfig {
 	public ObjectPropertyDataPostProcessor getPostprocessor() {
 		return this.postprocessor;
 	}
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java
index 3df3d6ab2..7f88848ec 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java
@@ -59,30 +59,30 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
 		this.i18n = I18n.bundle(vreq);
         //get additional data that may be required to generate template
         this.retrieveEditData();
-    }    
-    
+    }
+
     public String getEditKey(){
         return editConfig.getEditKey();
     }
-    
+
     public boolean isUpdate(){
         return editConfig.isObjectPropertyUpdate();
     }
-    
+
     public String getSubmitToUrl(){
         return  getUrl( editConfig.getSubmitToUrl() );
     }
-   
+
     /*
      * Used to calculate/retrieve/extract additional form-specific data
-     * Such as options for a drop-down etc. 
+     * Such as options for a drop-down etc.
      */
-    
+
     private void retrieveEditData() throws Exception {
     	//Get vitro request attributes for
     	setFormTitle();
     	setSubmitLabel();
-    	
+
     	//Get the form specific data
     	HashMap<String, Object> formSpecificData = editConfig.getFormSpecificData();
     	if( formSpecificData != null)
@@ -91,27 +91,27 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
     	//populate html with edit element where appropriate
     	populateGeneratedHtml();
     }
-   
+
 
     //Based on certain pre-set fields/variables, look for what
     //drop-downs need to be populated
 	private void populateDropdowns() throws Exception {
-		
+
 		//For each field with an optionType defined, create the options
 		WebappDaoFactory wdf = vreq.getWebappDaoFactory();
 		for(String fieldName: editConfig.getFields().keySet()){
 		    FieldVTwo field = editConfig.getField(fieldName);
 		    //TODO: Check if we even need empty options if field options do not exist
-		    if( field.getFieldOptions() == null ){ 
+		    if( field.getFieldOptions() == null ){
 		    	//empty options
 		    	field.setOptions(new ConstantFieldOptions());
 		    }
-		    Map<String, String> optionsMap = SelectListGeneratorVTwo.getOptions(editConfig, fieldName, wdf);	
+		    Map<String, String> optionsMap = SelectListGeneratorVTwo.getOptions(editConfig, fieldName, wdf);
 		    optionsMap = SelectListGeneratorVTwo.getSortedMap(optionsMap, field.getFieldOptions().getCustomComparator(), vreq);
 		    if(pageData.containsKey(fieldName)) {
 		    	log.error("Check the edit configuration setup as pageData already contains " + fieldName + " and this will be overwritten now with empty collection");
 		    }
-		    pageData.put(fieldName, optionsMap);		       
+		    pageData.put(fieldName, optionsMap);
 		}
 	}
 
@@ -128,7 +128,7 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
 		}
 		return selectedValue;
 	}
-    
+
 	private void setFormTitle() {
 		String predicateUri = editConfig.getPredicateUri();
 		if(predicateUri != null) {
@@ -139,17 +139,17 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
 			}
 		}
 	}
-	
+
     private void setDataFormTitle() {
-		String formTitle = "";		
+		String formTitle = "";
 	    DataProperty  prop = EditConfigurationUtils.getDataProperty(vreq);
 	    if(prop != null) {
 	        if( editConfig.isDataPropertyUpdate() ) {
-	            formTitle   = i18n.text("change_text_for") + " " + prop.getPublicName();		        
+	            formTitle   = i18n.text("change_text_for") + " " + prop.getPublicName();
 	        } else {
 	            formTitle   = i18n.text("add_new_entry_for") + " " + prop.getPublicName();
 	        }
-	    }		
+	    }
 		pageData.put("formTitle", formTitle);
 	}
 
@@ -166,17 +166,17 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
     		formTitle = i18n.text("change_entry_for") + " " + propertyTitle ;
     	}  else {
             if ( prop.getOfferCreateNewOption() ) {
-            	
+
                 log.debug("property set to offer \"create new\" option; custom form: ["+prop.getCustomEntryForm()+"]");
                 formTitle   = i18n.text("add_an_entry_to") + " " + propertyTitle + " " + i18n.text("for") + " " + subject.getName();
-               
+
             } else {
                 formTitle   = i18n.text("add_an_entry_to") + " " + propertyTitle ;
             }
         }
     	pageData.put("formTitle", formTitle);
     }
-    
+
     //Also used above and can be used in object auto complete form
     public String getObjectPropertyNameForDisplay() {
         // TODO modify this to get prop/class combo
@@ -194,13 +194,13 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
            	  	VClass classOfObjectFillers = null;
            	  	if (rangeClass != null) {
            	  	    classOfObjectFillers = rangeClass;
-           	  	} else if( prop.getRangeVClassURI() == null ) {    	
-    		    	// If property has no explicit range, try to get classes 
+           	  	} else if( prop.getRangeVClassURI() == null ) {
+    		    	// If property has no explicit range, try to get classes
     		    	List<VClass> classes = wdf.getVClassDao().getVClassesForProperty(subject.getVClassURI(), prop.getURI());
-    		    	if( classes == null || classes.size() == 0 || classes.get(0) == null ){	    	
+    		    	if( classes == null || classes.size() == 0 || classes.get(0) == null ){
     			    	// If property has no explicit range, we will use e.g. owl:Thing.
-    			    	// Typically an allValuesFrom restriction will come into play later.	    	
-    			    	classOfObjectFillers = wdf.getVClassDao().getTopConcept();	    	
+    			    	// Typically an allValuesFrom restriction will come into play later.
+    			    	classOfObjectFillers = wdf.getVClassDao().getTopConcept();
     		    	} else {
     		    		if( classes.size() > 1 )
     		    			log.debug("Found multiple classes when attempting to get range vclass.");
@@ -212,15 +212,15 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
     		    		classOfObjectFillers = wdf.getVClassDao().getTopConcept();
     		    }
                 propertyTitle   = classOfObjectFillers.getName();
-               
+
             } else {
                 propertyTitle   = prop.getDomainPublic();
             }
         }
     	return propertyTitle;
     }
-    
-    
+
+
     private void setSubmitLabel() {
     	String submitLabel = null;
     	String predicateUri = editConfig.getPredicateUri();
@@ -228,7 +228,7 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
 			if(EditConfigurationUtils.isObjectProperty(editConfig.getPredicateUri(), vreq)) {
 		    	Individual objectIndividual = EditConfigurationUtils.getObjectIndividual(vreq);
 		    	ObjectProperty prop = EditConfigurationUtils.getObjectProperty(vreq);
-		    	
+
 		    	if(objectIndividual != null) {
 		    		submitLabel = i18n.text("save_changes");
 		    	}  else {
@@ -247,34 +247,34 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
 			}
     	}
     	pageData.put("submitLabel", submitLabel);
-    	
+
     }
-    
-    
+
+
     public String getFormTitle() {
     	return (String) pageData.get("formTitle");
     }
-    
+
     public String getSubmitLabel() {
     	return (String) pageData.get("submitLabel");
     }
-    
+
     /*
     public Map<String, String> getRangeOptions() {
     	Map<String, String> rangeOptions = (Map<String, String>) pageData.get("rangeOptions");
     	return rangeOptions;
     }*/
-    
+
     //Get literals in scope, i.e. variable names with values assigned
     public Map<String, List<Literal>> getLiteralValues() {
     	return editConfig.getLiteralsInScope();
     }
-    
+
     //variables names with URIs assigned
     public Map<String, List<String>> getObjectUris() {
     	return editConfig.getUrisInScope();
     }
-    
+
     public List<String> getLiteralStringValue(String key) {
     	List<String> literalValues = new ArrayList<String>();
     	Map<String, List<Literal>> literalsInScope = editConfig.getLiteralsInScope();
@@ -286,19 +286,19 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
     	}
     	return literalValues;
     }
-    
+
 
     //Check if possible to send in particular parameter
     public String dataLiteralValueFor(String dataLiteralName) {
     	List<String> literalValues = getLiteralStringValue(dataLiteralName);
     	return StringUtils.join(literalValues, ",");
     }
-    
+
     public String testMethod(String testValue) {
     	return testValue + "test";
     }
-    
-    
+
+
     public String getDataLiteralValuesAsString() {
     	List<String> values = getDataLiteralValues();
     	return StringUtils.join(values, ",");
@@ -309,7 +309,7 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
     	List<String> literalValues = getLiteralStringValue(dataLiteral);
     	return literalValues;
     }
-    
+
     private String literalToString(Literal lit){
         if( lit == null || lit.getValue() == null) return "";
         String value = lit.getValue().toString();
@@ -323,7 +323,7 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
         }
         return value;
 }
-    
+
     //Get predicate
     //What if this is a data property instead?
     public Property getPredicateProperty() {
@@ -338,17 +338,17 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
     	}
     	return null;
     }
-    
+
     public ObjectProperty getObjectPredicateProperty() {
     	//explore usuing EditConfigurationUtils.getObjectProperty(this.vreq)
     	//return this.vreq.getWebappDaoFactory().getObjectPropertyDao().getObjectPropertyByURI(getPredicateUri());
     	return EditConfigurationUtils.getObjectPropertyForPredicate(this.vreq, getPredicateUri());
     }
-    
+
     public DataProperty getDataPredicateProperty() {
     	return EditConfigurationUtils.getDataPropertyForPredicate(this.vreq, getPredicateUri());
     }
-    
+
     public String getDataPredicatePublicDescription() {
     	DataProperty dp = getDataPredicateProperty();
     	return dp.getPublicDescription();
@@ -356,34 +356,34 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
     public String getPredicateUri() {
     	return editConfig.getPredicateUri();
     }
-    
+
     public String getSubjectUri() {
     	return editConfig.getSubjectUri();
     }
-    
+
     public String getSubjectName() {
-    	
+
     	Individual subject = EditConfigurationUtils.getIndividual(vreq, getSubjectUri());
     	return subject.getName();
     }
-    
+
     public String getObjectUri() {
     	return editConfig.getObject();
     }
-    
+
     public String getDomainUri() {
         return EditConfigurationUtils.getDomainUri(vreq);
     }
-    
+
     public String getRangeUri() {
         return EditConfigurationUtils.getRangeUri(vreq);
     }
-    
-    
+
+
     //data literal
     //Thus would depend on the literals on the form
     //Here we are assuming there is only one data literal but there may be more than one
-    //TODO: Support multiple data literals AND/or leaving the data literal to the 
+    //TODO: Support multiple data literals AND/or leaving the data literal to the
     public String getDataLiteral() {
     	List<String> literalsOnForm = editConfig.getLiteralsOnForm();
     	String dataLiteralName = null;
@@ -392,41 +392,41 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
     	}
     	return dataLiteralName;
     }
-    
+
     public String getVarNameForObject() {
         return editConfig.getVarNameForObject();
     }
-    
+
     //Get data property key
-    
+
     //public description only appears visible for object property
     public String getPropertyPublicDescription() {
     	return getObjectPredicateProperty().getPublicDescription();
     }
-    
+
     //properties queried on the main object property
     public boolean getPropertySelectFromExisting() {
     	return getObjectPredicateProperty().getSelectFromExisting();
     }
-    
+
     //used for form title for object properties
     //TODO: update because assumes domain public
     public String getPropertyPublicDomainTitle() {
     	ObjectProperty prop = EditConfigurationUtils.getObjectProperty(vreq);
     	return  prop.getDomainPublic();
     }
-    
+
     //used for form title for data properties
     //TODO: Update b/c assumes data property
     public String getPropertyPublicName() {
     	DataProperty  prop = EditConfigurationUtils.getDataProperty(vreq);
 		return prop.getPublicName();
     }
-    
+
     public boolean getPropertyOfferCreateNewOption() {
     	return getObjectPredicateProperty().getOfferCreateNewOption();
     }
-    
+
     public String getPropertyName() {
     	if(isObjectProperty()) {
     		return getPropertyPublicDomainTitle().toLowerCase();
@@ -436,14 +436,14 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
     	}
     	return null;
     }
-    
+
     //TODO: Implement statement display
     public TemplateModel getObjectStatementDisplay() throws TemplateModelException {
     	Map<String, String> statementDisplay = new HashMap<String, String>();
     	String subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
 		String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
     	String objectUri = EditConfigurationUtils.getObjectUri(vreq);
-		
+
 		//Set data map
 		Map params = vreq.getParameterMap();
 		for (Object key : params.keySet()) {
@@ -454,31 +454,31 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
 	            statementDisplay.put(keyString, value);
 	        }
 	    }
-		
-		
+
+
 		//If no statement parameters being sent back, then just pass back null
 		if(statementDisplay.size() == 0) {
 			return null;
 		}
-		
+
 		//ObjectPropertyStatementTemplate Model should pass the object key as part of the delete url
 		String objectKey = vreq.getParameter("objectKey");
 		statementDisplay.put(objectKey, objectUri);
-		
+
 		ObjectProperty predicate = new ObjectProperty();
 		predicate.setURI(predicateUri);
-		
+
 		//Using object property statement template model here
 		ObjectPropertyStatementTemplateModel osm = new ObjectPropertyStatementTemplateModel(
-				subjectUri, 
-				predicate, 
-				objectKey, 
-		        statementDisplay, 
+				subjectUri,
+				predicate,
+				objectKey,
+		        statementDisplay,
 		        null, vreq);
 		ReadOnlyBeansWrapper wrapper = new ReadOnlyBeansWrapper();
 		return wrapper.wrap(osm);
     }
-    
+
     //HasEditor and HasReviewer Roles also expect the Property template model to be passed
     public TemplateModel getObjectPropertyStatementDisplayPropertyModel() throws TemplateModelException {
     	Individual subject = EditConfigurationUtils.getSubjectIndividual(vreq);
@@ -489,12 +489,12 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
 		ReadOnlyBeansWrapper wrapper = new ReadOnlyBeansWrapper();
 		return wrapper.wrap(otm);
     }
-    
+
     public String getDataStatementDisplay() {
     	//Just return the value of the data property
     	return getDataLiteralValuesFromParameter();
     }
-    
+
     //Get a custom object uri for deletion if one exists, i.e. not the object uri for the property
     public String getCustomDeleteObjectUri() {
     	return (String) vreq.getParameter("deleteObjectUri");
@@ -507,37 +507,37 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
     	}
     	return templateName;
     }
-    
+
     //Retrieves data propkey from parameter and gets appropriate data value
     private String getDataLiteralValuesFromParameter() {
     	String dataValue = null;
 		//Get data hash
 		int dataHash = EditConfigurationUtils.getDataHash(vreq);
-		DataPropertyStatement dps = EditConfigurationUtils.getDataPropertyStatement(vreq, 
-				vreq.getSession(), 
-				dataHash, 
+		DataPropertyStatement dps = EditConfigurationUtils.getDataPropertyStatement(vreq,
+				vreq.getSession(),
+				dataHash,
 				EditConfigurationUtils.getPredicateUri(vreq));
 		if(dps != null) {
 			dataValue = dps.getData().trim();
 		}
 		return dataValue;
-		
+
 	}
-    
-   
+
+
 
 	//TODO:Check where this logic should actually go, copied from input element formatting tag
     //Updating to enable multiple vclasses applicable to subject to be analyzed to understand possible range of types
     public Map<String, String> getOfferTypesCreateNew() {
 		WebappDaoFactory wdf = vreq.getWebappDaoFactory();
-    	ObjectProperty op = 
+    	ObjectProperty op =
     		wdf.getObjectPropertyDao().getObjectPropertyByURI(editConfig.getPredicateUri());
 
-    	Individual sub = 
+    	Individual sub =
     		wdf.getIndividualDao().getIndividualByURI(editConfig.getSubjectUri());
-    	
+
     	VClass rangeClass = EditConfigurationUtils.getRangeVClass(vreq);
-    	
+
     	List<VClass> vclasses = null;
     	List<VClass> subjectVClasses = sub.getVClasses();
     	if( subjectVClasses == null ) {
@@ -545,12 +545,12 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
     	} else if (rangeClass != null) {
     	    List<VClass> rangeVClasses = new ArrayList<VClass>();
     	    vclasses = new ArrayList<VClass>();
-    	    if (!rangeClass.isUnion()) {    	        
+    	    if (!rangeClass.isUnion()) {
     	        rangeVClasses.add(rangeClass);
     	    } else {
     	        rangeVClasses.addAll(rangeClass.getUnionComponents());
     	    }
-            for(VClass rangeVClass : rangeVClasses) {	
+            for(VClass rangeVClass : rangeVClasses) {
             	if(rangeVClass.getGroupURI() != null) {
             		vclasses.add(rangeVClass);
             	}
@@ -593,8 +593,8 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
     			}
     		}
     	}
-    	
-    	
+
+
     	HashMap<String,String> types = new HashMap<String, String>();
     	for( VClass vclass : vclasses ){
     		String name = null;
@@ -608,11 +608,11 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
     		if( name != null && name.length() > 0)
     			types.put(vclass.getURI(),name);
     	}
-    	
+
     	//Unlike input element formatting tag, including sorting logic here
     	return  getSortedMap(types);
     }
-    
+
     public Map<String,String> getSortedMap(Map<String,String> hmap){
         // first make temporary list of String arrays holding both the key and its corresponding value, so that the list can be sorted with a decent comparator
         List<String[]> objectsToSort = new ArrayList<String[]>(hmap.size());
@@ -630,7 +630,7 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
         }
         return map;
     }
-    
+
     private class MapComparator implements Comparator<String[]> {
         public int compare (String[] s1, String[] s2) {
             Collator collator = Collator.getInstance();
@@ -654,9 +654,9 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
             }
         }
     }
-    
-    
-    
+
+
+
     //booleans for checking whether predicate is data or object
     public boolean isDataProperty() {
     	return EditConfigurationUtils.isDataProperty(getPredicateUri(), vreq);
@@ -664,12 +664,12 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
     public boolean isObjectProperty() {
     	return EditConfigurationUtils.isObjectProperty(getPredicateUri(), vreq);
     }
-    
+
     //Additional methods that were originally in edit request dispatch controller
     //to be employed here instead
-    
-    public String getUrlToReturnTo() {               
-        if(   editConfig.getEntityToReturnTo() != null && 
+
+    public String getUrlToReturnTo() {
+        if(   editConfig.getEntityToReturnTo() != null &&
             ! editConfig.getEntityToReturnTo().trim().isEmpty()) {
             ParamMap params = new ParamMap();
             params.put("uri", editConfig.getEntityToReturnTo());
@@ -677,18 +677,18 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
         }else if( vreq.getParameter("urlPattern") != null ){
             return vreq.getParameter("urlPattern");
         }else{
-            return UrlBuilder.Route.INDIVIDUAL.path(); 
+            return UrlBuilder.Route.INDIVIDUAL.path();
         }
     }
-    
+
     public String getCurrentUrl() {
     	return EditConfigurationUtils.getEditUrl(vreq) + "?" + vreq.getQueryString();
     }
-    
+
     public String getMainEditUrl() {
     	return EditConfigurationUtils.getEditUrl(vreq);
     }
-    
+
     //this url is for canceling
     public String getCancelUrl() {
     	String editKey = editConfig.getEditKey();
@@ -700,45 +700,45 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
     	}
     	return cancelURL;
     }
-    
+
     //Get confirm deletion url
     public String getDeleteProcessingUrl() {
     	return vreq.getContextPath() + "/deletePropertyController";
     }
-    
+
     //TODO: Check if this logic is correct and delete prohibited does not expect a specific value
     public boolean isDeleteProhibited() {
     	String deleteProhibited = vreq.getParameter("deleteProhibited");
     	return (deleteProhibited != null && !deleteProhibited.isEmpty());
     }
-    
+
     public String getDatapropKey() {
         if( editConfig.getDatapropKey() == null )
             return null;
         else
             return editConfig.getDatapropKey().toString();
     }
-    
+
     public DataPropertyStatement getDataPropertyStatement() {
     	int dataHash = EditConfigurationUtils.getDataHash(vreq);
     	String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
-    	return EditConfigurationUtils.getDataPropertyStatement(vreq, 
-    			vreq.getSession(), 
-    			dataHash, 
+    	return EditConfigurationUtils.getDataPropertyStatement(vreq,
+    			vreq.getSession(),
+    			dataHash,
     			predicateUri);
     }
-    
+
     //Check whether deletion form should be included for default object property
     public boolean getIncludeDeletionForm() {
-    	if( isDeleteProhibited() ) 
+    	if( isDeleteProhibited() )
     		return false;
     	if( isObjectProperty() ) {
     	    return editConfig.isObjectPropertyUpdate();
     	} else {
-    	    return  editConfig.isDataPropertyUpdate();     	        
+    	    return  editConfig.isDataPropertyUpdate();
     	}
      }
-    
+
     public String getVitroNsProperty() {
     	String vitroNsProp =  vreq.getParameter("vitroNsProp");
     	if(vitroNsProp == null) {
@@ -746,24 +746,24 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
     	}
     	return vitroNsProp;
     }
-    
+
     //Additional data to be returned
     public HashMap<String, Object> getPageData() {
     	return pageData;
     }
-    
+
     //Literals in scope and uris in scope are the values
     //that currently exist for any of the fields/values
-    
+
   //Get literals in scope returned as string values
     public Map<String, List<String>> getExistingLiteralValues() {
     	return EditConfigurationUtils.getExistingLiteralValues(vreq, editConfig);
     }
-    
+
     public Map<String, List<String>> getExistingUriValues() {
     	return editConfig.getUrisInScope();
     }
-    
+
     //Get editElements with html
     public void populateGeneratedHtml() {
     	Map<String, String> generatedHtml = new HashMap<String, String>();
@@ -778,11 +778,11 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
     			generatedHtml.put(fieldName, EditConfigurationUtils.generateHTMLForElement(vreq, fieldName, editConfig));
     		}
     	}
-    	
+
     	//Put in pageData
     	pageData.put("htmlForElements", generatedHtml);
     }
-   
-  
-   
+
+
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/MultiValueEditSubmissionTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/MultiValueEditSubmissionTemplateModel.java
index 360484c92..dc072fd29 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/MultiValueEditSubmissionTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/MultiValueEditSubmissionTemplateModel.java
@@ -9,13 +9,13 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUti
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
 
 public class MultiValueEditSubmissionTemplateModel {
-    
+
     private final MultiValueEditSubmission editSub;
 
     public MultiValueEditSubmissionTemplateModel(MultiValueEditSubmission editSub){
         this.editSub = editSub;
     }
-    
+
     public Map<String, List<String>> getLiteralsFromForm() {
     	if(editSub == null)
     		return null;
@@ -23,7 +23,7 @@ public class MultiValueEditSubmissionTemplateModel {
         return EditConfigurationUtils.transformLiteralMap(editSub.getLiteralsFromForm());
     }
 
-   
+
     public Map<String, String> getValidationErrors() {
     	if(editSub ==  null)
     		return null;
@@ -35,7 +35,7 @@ public class MultiValueEditSubmissionTemplateModel {
     		return null;
         return editSub.getUrisFromForm();
     }
-    
+
     public boolean getSubmissionExists() {
     	return (this.editSub != null);
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java
index 773597382..8c25395ff 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java
@@ -35,33 +35,33 @@ import edu.cornell.mannlib.vitro.webapp.reasoner.SimpleReasoner;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel;
 
 public abstract class BaseIndividualTemplateModel extends BaseTemplateModel {
-    
+
     private static final Log log = LogFactory.getLog(BaseIndividualTemplateModel.class);
-    
+
     protected final Individual individual;
     protected final LoginStatusBean loginStatusBean;
     protected final VitroRequest vreq;
     private final ServletContext ctx;
     private final boolean editing;
-    
+
     protected GroupedPropertyList propertyList;
-    
+
     public BaseIndividualTemplateModel(Individual individual, VitroRequest vreq) {
         this.vreq = vreq;
         this.ctx = vreq.getSession().getServletContext();
         this.individual = individual;
         this.loginStatusBean = LoginStatusBean.getBean(vreq);
         // Needed for getting portal-sensitive urls. Remove if multi-portal support is removed.
-        
+
         this.editing = isEditable();
     }
-    
+
     protected boolean isVClass(String vClassUri) {
-        boolean isVClass = individual.isVClass(vClassUri);  
-        // If reasoning is asynchronous, this inference may not have been made yet. 
+        boolean isVClass = individual.isVClass(vClassUri);
+        // If reasoning is asynchronous, this inference may not have been made yet.
         // Check the superclasses of the individual's vclass.
         SimpleReasoner simpleReasoner = (SimpleReasoner) ctx.getAttribute(SimpleReasoner.class.getName());
-        if (!isVClass && simpleReasoner != null && simpleReasoner.isABoxReasoningAsynchronous()) { 
+        if (!isVClass && simpleReasoner != null && simpleReasoner.isABoxReasoningAsynchronous()) {
             log.debug("Checking superclasses to see if individual is a " + vClassUri + " because reasoning is asynchronous");
             List<VClass> directVClasses = individual.getVClasses(true);
             for (VClass directVClass : directVClasses) {
@@ -75,11 +75,11 @@ public abstract class BaseIndividualTemplateModel extends BaseTemplateModel {
         }
         return isVClass;
     }
-    
+
     /* Template properties */
-    
+
     public String getProfileUrl() {
-        return UrlBuilder.getIndividualProfileUrl(individual, vreq);        
+        return UrlBuilder.getIndividualProfileUrl(individual, vreq);
     }
 
     public String getImageUrl() {
@@ -90,11 +90,11 @@ public abstract class BaseIndividualTemplateModel extends BaseTemplateModel {
     public String getThumbUrl() {
         String thumbUrl = individual.getThumbUrl();
         return thumbUrl == null ? null : getUrl(thumbUrl);
-    } 
+    }
 
     // Used to create a link to generate the individual's rdf.
     public String getRdfUrl() {
-        
+
         String individualUri = getUri();
         String profileUrl = getProfileUrl();
         if (UrlBuilder.isUriInDefaultNamespace(individualUri, vreq)) {
@@ -110,7 +110,7 @@ public abstract class BaseIndividualTemplateModel extends BaseTemplateModel {
         }
         return propertyList;
     }
-    
+
 	/**
 	 * This page is editable if the user is authorized to add a data property or
 	 * an object property to the Individual being shown.
@@ -124,110 +124,110 @@ public abstract class BaseIndividualTemplateModel extends BaseTemplateModel {
 				SOME_PREDICATE, SOME_URI);
     	return PolicyHelper.isAuthorizedForActions(vreq, adps.or(aops));
     }
-    
+
     public boolean getShowAdminPanel() {
 		return PolicyHelper.isAuthorizedForActions(vreq,
 				SimplePermission.SEE_INDVIDUAL_EDITING_PANEL.ACTION);
     }
- 
-    /* rdfs:label needs special treatment, because it is not possible to construct a 
+
+    /* rdfs:label needs special treatment, because it is not possible to construct a
      * DataProperty from it. It cannot be handled the way the vitro links and vitro public image
      * are handled like ordinary ObjectProperty instances.
      */
     public NameStatementTemplateModel getNameStatement() {
         return new NameStatementTemplateModel(getUri(), vreq);
     }
-    
-    /* These methods simply forward to the methods of the wrapped individual. It would be desirable to 
-     * implement a scheme for proxying or delegation so that the methods don't need to be simply listed here. 
-     * A Ruby-style method missing method would be ideal. 
+
+    /* These methods simply forward to the methods of the wrapped individual. It would be desirable to
+     * implement a scheme for proxying or delegation so that the methods don't need to be simply listed here.
+     * A Ruby-style method missing method would be ideal.
      * Update: DynamicProxy doesn't work because the proxied object is of type Individual, so we cannot
-     * declare new methods here that are not declared in the Individual interface. 
+     * declare new methods here that are not declared in the Individual interface.
      */
-    
-    public String getName() {           
+
+    public String getName() {
         return individual.getName();
     }
 
     public Collection<String> getMostSpecificTypes() {
         ObjectPropertyStatementDao opsDao = vreq.getWebappDaoFactory().getObjectPropertyStatementDao();
-        Map<String, String> types = opsDao.getMostSpecificTypesInClassgroupsForIndividual(getUri()); 
+        Map<String, String> types = opsDao.getMostSpecificTypesInClassgroupsForIndividual(getUri());
         return types.values();
     }
 
     public String getUri() {
         return individual.getURI();
     }
-    
+
     public String getLocalName() {
         return individual.getLocalName();
-    }   
-   
+    }
+
 // For testing dump
 //    // Properties
 //    public String getANullString() {
 //        return null;
-//    }    
+//    }
 //    public String getAnEmptyString() {
 //        return "";
-//    }    
+//    }
 //    public String[] getANullArray() {
 //        return null;
-//    }    
+//    }
 //    public String[] getAnEmptyArray() {
 //        String[] a = {};
 //        return a;
-//    }    
+//    }
 //    public List<String> getANullList() {
 //        return null;
-//    }    
+//    }
 //    public List<String> getAnEmptyList() {
 //        return Collections.emptyList();
-//    }    
+//    }
 //    public Map<String, String> getANullMap() {
 //        return null;
-//    }    
+//    }
 //    public Map<String, String> getAnEmptyMap() {
 //        return Collections.emptyMap();
-//    }    
-//    
+//    }
+//
 //    // Methods
 //    public String nullString() {
 //        return null;
-//    }    
+//    }
 //    public String emptyString() {
 //        return "";
-//    }    
+//    }
 //    public String[] nullArray() {
 //        return null;
-//    }    
+//    }
 //    public String[] emptyArray() {
 //        String[] a = {};
 //        return a;
-//    }    
+//    }
 //    public List<String> nullList() {
 //        return null;
-//    }    
+//    }
 //    public List<String> emptyList() {
 //        return Collections.emptyList();
-//    }   
+//    }
 //    public Map<String, String> nullMap() {
 //        return null;
-//    }    
+//    }
 //    public Map<String, String> emptyMap() {
 //        return Collections.emptyMap();
 //    }
-    
-    
+
+
     /* Template methods */
- 
+
     public String selfEditingId() {
         String id = null;
-        String idMatchingProperty = 
+        String idMatchingProperty =
             ConfigurationProperties.getBean(ctx).getProperty("selfEditing.idMatchingProperty");
         if (! StringUtils.isBlank(idMatchingProperty)) {
             WebappDaoFactory wdf = vreq.getUnfilteredWebappDaoFactory();
-            Collection<DataPropertyStatement> ids = 
+            Collection<DataPropertyStatement> ids =
                 wdf.getDataPropertyStatementDao().getDataPropertyStatementsForIndividualByDataPropertyURI(individual, idMatchingProperty);
             if (ids.size() > 0) {
                 id = ids.iterator().next().getData();
@@ -235,9 +235,9 @@ public abstract class BaseIndividualTemplateModel extends BaseTemplateModel {
         }
         return id;
     }
-    
+
     public String controlPanelUrl() {
         return UrlBuilder.getUrl(Route.INDIVIDUAL_EDIT, "uri", getUri());
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseObjectPropertyDataPostProcessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseObjectPropertyDataPostProcessor.java
index e90522ec4..2c28cfb33 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseObjectPropertyDataPostProcessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseObjectPropertyDataPostProcessor.java
@@ -13,39 +13,39 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 public abstract class BaseObjectPropertyDataPostProcessor implements
         ObjectPropertyDataPostProcessor {
 
-    private static final Log log = LogFactory.getLog(BaseObjectPropertyDataPostProcessor.class); 
-    
+    private static final Log log = LogFactory.getLog(BaseObjectPropertyDataPostProcessor.class);
+
     protected final ObjectPropertyTemplateModel objectPropertyTemplateModel;
     protected final WebappDaoFactory wdf;
-    
+
     public BaseObjectPropertyDataPostProcessor(ObjectPropertyTemplateModel optm, WebappDaoFactory wdf) {
         this.objectPropertyTemplateModel = optm;
         this.wdf = wdf;
     }
-        
+
     @Override
     public void process(List<Map<String, String>> data) {
-        
+
         if (data.isEmpty()) {
             log.debug("No data to postprocess for property " + objectPropertyTemplateModel.getUri());
             return;
         }
-        
+
         processList(data);
 
         for (Map<String, String> map : data) {
-            process(map);           
+            process(map);
         }
     }
-    
+
     /** Postprocessing that applies to the list as a whole - reordering, removing duplicates, etc. */
     protected void processList(List<Map<String, String>> data) {
         objectPropertyTemplateModel.removeDuplicates(data);
     }
-    
+
     /** Postprocessing that applies to individual list items */
     protected abstract void process(Map<String, String> map);
-    
+
 
     /* Postprocessor methods callable from any postprocessor */
 
@@ -59,7 +59,7 @@ public abstract class BaseObjectPropertyDataPostProcessor implements
             }
         }
     }
-    
+
     protected Individual getIndividual(String uri) {
         return wdf.getIndividualDao().getIndividualByURI(uri);
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
index 776c07555..49be8168f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
@@ -158,7 +158,7 @@ public class CollatedObjectPropertyTemplateModel extends
 					dataForThisObject.add(innerMap);
 				}
 			}
-			
+
 			if(log.isDebugEnabled()) {
 				log.debug("Object URI " + objectUri + " has number of statements = " + dataForThisObject.size());
 			}
@@ -198,7 +198,7 @@ public class CollatedObjectPropertyTemplateModel extends
 		}
 	}
 
-	
+
 
 	// Collate the statements by subclass.
 	private List<SubclassTemplateModel> collate(String subjectUri,
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyStatementTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyStatementTemplateModel.java
index 09a0037ed..0040aed23 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyStatementTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyStatementTemplateModel.java
@@ -22,8 +22,8 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.RdfLiteralHash;
 
 
 public class DataPropertyStatementTemplateModel extends PropertyStatementTemplateModel {
-    private static final Log log = LogFactory.getLog(DataPropertyStatementTemplateModel.class); 
-    
+    private static final Log log = LogFactory.getLog(DataPropertyStatementTemplateModel.class);
+
     private final Literal literalValue;
     private final String deleteUrl;
     private final String editUrl;
@@ -32,17 +32,17 @@ public class DataPropertyStatementTemplateModel extends PropertyStatementTemplat
     //Extended to include vitro request to check for special parameters
     public DataPropertyStatementTemplateModel(String subjectUri, Property property, Literal literal,
             String templateName, VitroRequest vreq) {
-        
+
         super(subjectUri, property, vreq);
-        
+
         this.literalValue = literal;
         this.templateName = templateName;
 
         // Do delete url first, since used in building edit url
-        this.deleteUrl = makeDeleteUrl();            
-        this.editUrl = makeEditUrl();       
+        this.deleteUrl = makeDeleteUrl();
+        this.editUrl = makeEditUrl();
     }
-    
+
 	private String makeDeleteUrl() {
         // Determine whether the statement can be deleted
 		DataPropertyStatement dps = makeStatement();
@@ -50,47 +50,47 @@ public class DataPropertyStatementTemplateModel extends PropertyStatementTemplat
         if ( ! PolicyHelper.isAuthorizedForActions(vreq, action) ) {
             return "";
         }
-        
+
         ParamMap params = new ParamMap(
                 "subjectUri", subjectUri,
                 "predicateUri", property.getURI(),
                 "datapropKey", makeHash(dps),
                 "cmd", "delete");
-        
+
         params.put("templateName", templateName);
         params.putAll(UrlBuilder.getModelParams(vreq));
-        
+
         return UrlBuilder.getUrl(EDIT_PATH, params);
 	}
 
 	private String makeEditUrl() {
-        // vitro:moniker is deprecated. We display existing data values so editors can 
+        // vitro:moniker is deprecated. We display existing data values so editors can
         // move them to other properties and delete, but don't allow editing.
         if ( VitroVocabulary.MONIKER.equals(property.getURI()) ) {
-            return "";           
+            return "";
         }
-        
+
         // Determine whether the statement can be edited
 		DataPropertyStatement dps = makeStatement();
         RequestedAction action = new EditDataPropertyStatement(vreq.getJenaOntModel(), dps);
         if ( ! PolicyHelper.isAuthorizedForActions(vreq, action) ) {
             return "";
         }
-        
+
         ParamMap params = new ParamMap(
                 "subjectUri", subjectUri,
                 "predicateUri", property.getURI(),
                 "datapropKey", makeHash(dps));
-        
+
         if ( deleteUrl.isEmpty() ) {
             params.put("deleteProhibited", "prohibited");
         }
-        
+
         params.putAll(UrlBuilder.getModelParams(vreq));
-        
-        return UrlBuilder.getUrl(EDIT_PATH, params);             
+
+        return UrlBuilder.getUrl(EDIT_PATH, params);
 	}
-        
+
 	private DataPropertyStatement makeStatement() {
 		DataPropertyStatement dps = new DataPropertyStatementImpl(subjectUri, property.getURI(), literalValue.getLexicalForm());
 		// Language and datatype are needed to get the correct hash value
@@ -105,7 +105,7 @@ public class DataPropertyStatementTemplateModel extends PropertyStatementTemplat
 	}
 
     /* Template properties */
-    
+
     public String getValue() {
         //attempt to strip any odd HTML
         return cleanTextForDisplay( literalValue.getLexicalForm() );
@@ -115,7 +115,7 @@ public class DataPropertyStatementTemplateModel extends PropertyStatementTemplat
 	public String getDeleteUrl() {
 		return deleteUrl;
 	}
-    
+
     @Override
 	public String getEditUrl() {
 		return editUrl;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java
index cc8b6ac44..34858eab1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java
@@ -32,11 +32,11 @@ import freemarker.cache.TemplateLoader;
 
 public class DataPropertyTemplateModel extends PropertyTemplateModel {
 
-    private static final Log log = LogFactory.getLog(DataPropertyTemplateModel.class);  
-    
+    private static final Log log = LogFactory.getLog(DataPropertyTemplateModel.class);
+
     private static final String TYPE = "data";
-    private static final String EDIT_PATH = "editRequestDispatch";  
-    
+    private static final String EDIT_PATH = "editRequestDispatch";
+
     private final List<DataPropertyStatementTemplateModel> statements;
     private static final String KEY_SUBJECT = "subject";
     private static final String KEY_PROPERTY = "property";
@@ -45,32 +45,32 @@ public class DataPropertyTemplateModel extends PropertyTemplateModel {
         NO_SELECT_QUERY("Missing select query specification"),
         NO_TEMPLATE("Missing template specification"),
         TEMPLATE_NOT_FOUND("Specified template does not exist");
-        
+
         String message;
-        
+
         ConfigError(String message) {
             this.message = message;
         }
-        
+
         public String getMessage() {
             return message;
         }
-        
+
         public String toString() {
             return getMessage();
         }
     }
-    
+
     private DataPropertyListConfig config;
-    private String objectKey;   
+    private String objectKey;
     private String queryString;
     private String rangeDatatypeURI;
     private Set<String> constructQueries;
     private int displayLimit;
-    
-    DataPropertyTemplateModel(DataProperty dp, Individual subject, VitroRequest vreq, 
+
+    DataPropertyTemplateModel(DataProperty dp, Individual subject, VitroRequest vreq,
             boolean editing, List<DataProperty> populatedDataPropertyList) {
-        
+
         super(dp, subject, vreq, dp.getPublicName());
 
         // Get the config for this data property
@@ -79,7 +79,7 @@ public class DataPropertyTemplateModel extends PropertyTemplateModel {
         } catch (Exception e) {
             log.error(e, e);
         }
-        
+
         queryString = getSelectQuery();
         constructQueries = getConstructQueries();
 
@@ -90,29 +90,29 @@ public class DataPropertyTemplateModel extends PropertyTemplateModel {
         if (populatedDataPropertyList.contains(dp)) {
             log.debug("Getting data for populated data property " + getUri());
             DataPropertyStatementDao dpDao = vreq.getWebappDaoFactory().getDataPropertyStatementDao();
-            List<Literal> values = dpDao.getDataPropertyValuesForIndividualByProperty(subject, dp, queryString, constructQueries);            
+            List<Literal> values = dpDao.getDataPropertyValuesForIndividualByProperty(subject, dp, queryString, constructQueries);
             for (Literal value : values) {
                 statements.add(new DataPropertyStatementTemplateModel(subjectUri, dp, value, getTemplateName(), vreq));
             }
         } else {
             log.debug("Data property " + getUri() + " is unpopulated.");
-        }        
-        
+        }
+
         if ( editing ) {
         	setAddUrl(dp);
         }
     }
 
     protected void setAddUrl(Property property) {
-           
-        DataProperty dp = (DataProperty) property;        
+
+        DataProperty dp = (DataProperty) property;
         // NIHVIVO-2790 vitro:moniker now included in the display, but don't allow new statements
         if (dp.getURI().equals(VitroVocabulary.MONIKER)) {
             return;
         }
-        
+
 /*       If the display limit has already been reached, we can't add a new statement.
-         NB This appears to be a misuse of a value called "display limit". Note that it's 
+         NB This appears to be a misuse of a value called "display limit". Note that it's
          not used to limit display, either, so should be renamed.
         int displayLimit = dp.getDisplayLimit();
          Display limit of -1 (default value for new property) means no display limit
@@ -127,33 +127,33 @@ public class DataPropertyTemplateModel extends PropertyTemplateModel {
 		if ( functional && statements.size() >= 1 ) {
 			return;
 		}
-          
+
         // Determine whether a new statement can be added
 		RequestedAction action = new AddDataPropertyStatement(
 				vreq.getJenaOntModel(), subjectUri, propertyUri, SOME_LITERAL);
         if ( ! PolicyHelper.isAuthorizedForActions(vreq, action) ) {
             return;
         }
-        
+
         ParamMap params = new ParamMap(
                 "subjectUri", subjectUri,
                 "predicateUri", propertyUri);
-        
+
         params.putAll(UrlBuilder.getModelParams(vreq));
-        
-        addUrl = UrlBuilder.getUrl(EDIT_PATH, params);       
+
+        addUrl = UrlBuilder.getUrl(EDIT_PATH, params);
     }
-    
+
 	protected TemplateLoader getFreemarkerTemplateLoader() {
 		return FreemarkerConfiguration.getConfig(vreq).getTemplateLoader();
 	}
-    
-    @Override 
+
+    @Override
     protected int getPropertyDisplayTier(Property p) {
         return ((DataProperty)p).getDisplayTier();
     }
 
-    @Override 
+    @Override
     protected Route getPropertyEditRoute() {
         return Route.DATA_PROPERTY_EDIT;
     }
@@ -161,12 +161,12 @@ public class DataPropertyTemplateModel extends PropertyTemplateModel {
 	@Override
 	public int getDisplayLimit() {
 			return displayLimit;
-	}	
-    
+	}
+
 //	@Override
 	public String getRangeDatatypeURI() {
 			return rangeDatatypeURI;
-	}	
+	}
 
     public ConfigError checkQuery(String queryString) {
         if (StringUtils.isBlank(queryString)) {
@@ -174,15 +174,15 @@ public class DataPropertyTemplateModel extends PropertyTemplateModel {
         }
         return null;
     }
-      
+
     private String getSelectQuery() {
         return config.getSelectQuery();
     }
-    
+
     private Set<String> getConstructQueries() {
         return config.getConstructQueries();
     }
-    
+
     protected String getTemplateName() {
         return config.getTemplateName();
     }
@@ -190,7 +190,7 @@ public class DataPropertyTemplateModel extends PropertyTemplateModel {
     protected boolean hasDefaultListView() {
         return config.isDefaultListView();
     }
-    
+
     protected String getObjectKey() {
         return objectKey;
     }
@@ -200,7 +200,7 @@ public class DataPropertyTemplateModel extends PropertyTemplateModel {
     }
 
     /* Template properties */
-    
+
     public String getType() {
         return TYPE;
     }
@@ -208,21 +208,21 @@ public class DataPropertyTemplateModel extends PropertyTemplateModel {
     public List<DataPropertyStatementTemplateModel> getStatements() {
         return statements;
     }
-    
+
     public String getTemplate() {
         return getTemplateName();
     }
 
-    
+
     /* Template methods */
-    
+
     public DataPropertyStatementTemplateModel first() {
         return ( (statements == null || statements.isEmpty()) ) ? null : statements.get(0);
     }
-    
+
     public String firstValue() {
         DataPropertyStatementTemplateModel first = first();
         return first == null ? null : first.getValue();
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DefaultListViewDataPostProcessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DefaultListViewDataPostProcessor.java
index 7059db5a7..709fb9207 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DefaultListViewDataPostProcessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DefaultListViewDataPostProcessor.java
@@ -13,11 +13,11 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 public class DefaultListViewDataPostProcessor extends
         BaseObjectPropertyDataPostProcessor {
 
-    private static final Log log = LogFactory.getLog(DefaultListViewDataPostProcessor.class); 
-    
+    private static final Log log = LogFactory.getLog(DefaultListViewDataPostProcessor.class);
+
     private static final String KEY_NAME = "name";
     private static final String KEY_OBJECT = "object";
-    
+
     public DefaultListViewDataPostProcessor(ObjectPropertyTemplateModel optm, WebappDaoFactory wdf) {
         super(optm, wdf);
     }
@@ -27,5 +27,5 @@ public class DefaultListViewDataPostProcessor extends
     protected void process(Map<String, String> map) {
         addName(map, KEY_NAME, KEY_OBJECT);
     }
- 
-}
\ No newline at end of file
+
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DefaultObjectPropertyDataPostProcessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DefaultObjectPropertyDataPostProcessor.java
index bbc60bb15..4e32b23c0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DefaultObjectPropertyDataPostProcessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DefaultObjectPropertyDataPostProcessor.java
@@ -12,8 +12,8 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 /** The object property data postprocessor that is used if the view does not specify another postprocessor */
 public class DefaultObjectPropertyDataPostProcessor extends BaseObjectPropertyDataPostProcessor {
 
-    private static final Log log = LogFactory.getLog(DefaultObjectPropertyDataPostProcessor.class);   
-    
+    private static final Log log = LogFactory.getLog(DefaultObjectPropertyDataPostProcessor.class);
+
     public DefaultObjectPropertyDataPostProcessor(ObjectPropertyTemplateModel optm,
             WebappDaoFactory wdf) {
         super(optm, wdf);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/FauxObjectPropertyWrapper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/FauxObjectPropertyWrapper.java
index 80ecc3afd..713350f1c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/FauxObjectPropertyWrapper.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/FauxObjectPropertyWrapper.java
@@ -14,7 +14,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 
 /**
  * An ObjectProperty that has some of its values overridden by a FauxProperty.
- * 
+ *
  * TODO This is a horrible kluge that should be discarded as soon as we can
  * rewrite GroupedPropertyList.
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
index 67915c57a..586603165 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
@@ -83,48 +83,48 @@ public class GroupedPropertyList extends BaseTemplateModel {
         // so we cannot just rely on getting that list.
         List<ObjectProperty> populatedObjectPropertyList = subject
                 .getPopulatedObjectPropertyList();
-         
+
         Map<String, List<String>> populatedObjTypes = makePopulatedObjTypeMap(
                 populatedObjectPropertyList);
-        
-        // save applicable ranges before deduping to filter later 
+
+        // save applicable ranges before deduping to filter later
         populatedObjectPropertyList = dedupe(populatedObjectPropertyList);
-                
+
         Collection<ObjectProperty> additions = ApplicationConfigurationOntologyUtils
                 .getAdditionalFauxSubpropertiesForList(
                         populatedObjectPropertyList, subject, vreq);
-        
+
         additions = filterAdditions(additions, populatedObjTypes);
-         
+
         if (log.isDebugEnabled()) {
             for (ObjectProperty t : additions) {
                 log.debug("addition: " + t);
             }
-            log.debug("Added " + additions.size() + 
+            log.debug("Added " + additions.size() +
                     " properties due to application configuration ontology");
         }
-        
+
         populatedObjectPropertyList.addAll(additions);
-        
+
         propertyList.addAll(populatedObjectPropertyList);
-        
+
         // If editing this page, merge in object properties applicable to the individual that are currently
         // unpopulated, so the properties are displayed to allow statements to be added to these properties.
         // RY In future, we should limit this to properties that the user has permission to add properties to.
         if (editing) {
             propertyList = mergeAllPossibleObjectProperties(populatedObjectPropertyList, propertyList);
         }
-        
-        // Now do much the same with data properties: get the list of populated data properties, then add in placeholders for missing ones 
+
+        // Now do much the same with data properties: get the list of populated data properties, then add in placeholders for missing ones
         // rjy7 Currently we are getting the list of properties in one sparql query, then doing a separate query
-        // to get values for each property. This could be optimized by doing a single query to get a map of properties to 
+        // to get values for each property. This could be optimized by doing a single query to get a map of properties to
         // DataPropertyStatements. Note that this does not apply to object properties, because the queries
         // can be customized and thus differ from property to property. So it's easier for now to keep the
         // two working in parallel.
         List<DataProperty> populatedDataPropertyList = subject
                 .getPopulatedDataPropertyList();
         propertyList.addAll(populatedDataPropertyList);
-        
+
         if (editing) {
             mergeAllPossibleDataProperties(propertyList);
         }
@@ -132,7 +132,7 @@ public class GroupedPropertyList extends BaseTemplateModel {
 
         // Put the list into groups
         List<PropertyGroup> propertyGroupList = addPropertiesToGroups(propertyList);
-        
+
         // Build the template data model from the groupList
         groups = new ArrayList<PropertyGroupTemplateModel>(
                 propertyGroupList.size());
@@ -141,13 +141,13 @@ public class GroupedPropertyList extends BaseTemplateModel {
                     subject, editing, populatedDataPropertyList,
                     populatedObjectPropertyList));
         }
-        
+
         if (!editing) {
             pruneEmptyProperties();
         }
 
     }
-    
+
     private Map<String, List<String>> makePopulatedObjTypeMap(List<ObjectProperty> props) {
         Map<String, List<String>> map = new HashMap<String, List<String>>();
         for (ObjectProperty prop : props) {
@@ -156,30 +156,30 @@ public class GroupedPropertyList extends BaseTemplateModel {
                 if(typeList == null) {
                     typeList = new ArrayList<String>();
                     map.put(prop.getURI(), typeList);
-                } 
-                typeList.add(prop.getRangeVClassURI());                
+                }
+                typeList.add(prop.getRangeVClassURI());
             }
         }
         return map;
     }
-    
-    private List<ObjectProperty> filterAdditions(Collection<ObjectProperty> additions, 
+
+    private List<ObjectProperty> filterAdditions(Collection<ObjectProperty> additions,
             Map<String, List<String>> populatedObjTypes) {
         List<ObjectProperty> filteredAdditions = new ArrayList<ObjectProperty>();
         for (ObjectProperty prop : additions) {
             List<String> allowedTypes = populatedObjTypes.get(prop.getURI());
-            if(allowedTypes != null && (allowedTypes.contains(prop.getRangeVClassURI()) 
+            if(allowedTypes != null && (allowedTypes.contains(prop.getRangeVClassURI())
                     || allowedTypes.contains(prop.getRangeEntityURI()) ) ) {
                 filteredAdditions.add(prop);
             }
         }
         return filteredAdditions;
     }
-    
+
     // It's possible that an object property retrieved in the call to getPopulatedObjectPropertyList()
     // is now empty of statements, because if not editing, some statements without a linked individual
     // are not retrieved by the query. (See <linked-individual-required> elements in queries.)
-    // Remove these properties, and also remove any groups with no remaining properties. 
+    // Remove these properties, and also remove any groups with no remaining properties.
     private void pruneEmptyProperties() {
         Iterator<PropertyGroupTemplateModel> iGroups = groups.iterator();
         while (iGroups.hasNext()) {
@@ -203,8 +203,8 @@ public class GroupedPropertyList extends BaseTemplateModel {
             }
         }
     }
-    
-    //assumes sorted list 
+
+    //assumes sorted list
     protected List<ObjectProperty> dedupe(List<ObjectProperty> propList) {
         List<ObjectProperty> dedupedList = new ArrayList<ObjectProperty>();
         String uriRegister = "";
@@ -230,15 +230,15 @@ public class GroupedPropertyList extends BaseTemplateModel {
             List<ObjectProperty> populatedObjectPropertyList,
             List<Property> propertyList) {
 
-        // There is no ObjectPropertyDao.getAllPossibleObjectPropertiesForIndividual() parallel to 
+        // There is no ObjectPropertyDao.getAllPossibleObjectPropertiesForIndividual() parallel to
         // DataPropertyDao.getAllPossibleDatapropsForIndividual(). The comparable method for object properties
         // is defined using PropertyInstance rather than ObjectProperty.
-        
-        // Getting Language-neutral WebappDaoFactory because the language-filtering 
+
+        // Getting Language-neutral WebappDaoFactory because the language-filtering
     	// breaks blank node structures in the restrictions that determine applicable properties.
         WebappDaoFactory wadf = vreq.getLanguageNeutralWebappDaoFactory();
         PropertyInstanceDao piDao = wadf.getPropertyInstanceDao();
-        
+
         Collection<PropertyInstance> allPossiblePI = piDao
                 .getAllPossiblePropInstForIndividual(subject.getURI());
         if (allPossiblePI != null) {
@@ -257,7 +257,7 @@ public class GroupedPropertyList extends BaseTemplateModel {
                     	}
                     }
                     if(addToList) {
-                        propertyList.add(possibleOP);         
+                        propertyList.add(possibleOP);
                     }
                 } else {
                     log.error("a property instance in the Collection created by PropertyInstanceDao.getAllPossiblePropInstForIndividual() is unexpectedly null");
@@ -275,7 +275,7 @@ public class GroupedPropertyList extends BaseTemplateModel {
                 addObjectPropertyToPropertyList(propertyUri, null, null, propertyList);
             }
         }
-        
+
         return propertyList;
     }
 
@@ -284,7 +284,7 @@ public class GroupedPropertyList extends BaseTemplateModel {
 				LANGUAGE_NEUTRAL, POLICY_NEUTRAL);
 		ObjectPropertyDao opDao = rawWadf.getObjectPropertyDao();
 		FauxPropertyDao fpDao = rawWadf.getFauxPropertyDao();
-		
+
 		String base = pi.getPropertyURI();
 		String domain = pi.getDomainClassURI();
 		String range = pi.getRangeClassURI();
@@ -300,17 +300,17 @@ public class GroupedPropertyList extends BaseTemplateModel {
 		}
 		return op;
 	}
-    
+
 	/**
-	* Don't know what the real problem is with VIVO-976, but somehow we have the same property 
+	* Don't know what the real problem is with VIVO-976, but somehow we have the same property
 	* showing up once with a blank node as a domain, and once with null or OWL:Thing as a domain.
-	* 
+	*
 	* Similarly, don't know the real problem with VIVO-989, except that the ranges are both
 	* blank nodes - probably the same blank node but on two different reads.
-	* 
-	* For VIVO-1015, if op2 (the unpopulated property) is a Faux property, it will appear to 
+	*
+	* For VIVO-1015, if op2 (the unpopulated property) is a Faux property, it will appear to
 	* be not redundant because of the range difference, and that's what we want. But if op2
-	* (the unpopulated property) has a different range than op1 because of a restriction, 
+	* (the unpopulated property) has a different range than op1 because of a restriction,
 	* then we want to ignore that difference, so it appears to be redundant.
 	*/
 	private boolean redundant(ObjectProperty populatedOP, ObjectProperty possibleOP) {
@@ -318,18 +318,18 @@ public class GroupedPropertyList extends BaseTemplateModel {
 			new FullPropertyKey((Property)possibleOP))) {
 			return true;
 		} else if (
-			new FullPropertyKey(fudgeBlankNodeInDomain(populatedOP.getDomainVClassURI()), 
+			new FullPropertyKey(fudgeBlankNodeInDomain(populatedOP.getDomainVClassURI()),
 								populatedOP.getURI(),
 								populatedOP.getRangeVClassURI()).equals(
-			new FullPropertyKey(fudgeBlankNodeInDomain(possibleOP.getDomainVClassURI()), 
+			new FullPropertyKey(fudgeBlankNodeInDomain(possibleOP.getDomainVClassURI()),
 								possibleOP.getURI(),
 								possibleOP.getRangeVClassURI()))) {
 			return true;
 		} else if (
-			new FullPropertyKey(populatedOP.getDomainVClassURI(), 
+			new FullPropertyKey(populatedOP.getDomainVClassURI(),
 								populatedOP.getURI(),
 								fudgeBlankNodeInRange(populatedOP.getRangeVClassURI())).equals(
-			new FullPropertyKey(possibleOP.getDomainVClassURI(), 
+			new FullPropertyKey(possibleOP.getDomainVClassURI(),
 								possibleOP.getURI(),
 								fudgeBlankNodeInRange(possibleOP.getRangeVClassURI())))) {
 			return true;
@@ -337,7 +337,7 @@ public class GroupedPropertyList extends BaseTemplateModel {
             return !(possibleOP instanceof FauxObjectPropertyWrapper) &&
                     populatedOP.getURI().equals(possibleOP.getURI());
     }
-	
+
 	private String fudgeBlankNodeInDomain(String rawDomainUri) {
 		if (rawDomainUri == null) {
 			return null;
@@ -357,7 +357,7 @@ public class GroupedPropertyList extends BaseTemplateModel {
 			return rawRangeUri;
 		}
 	}
-	
+
     private void addObjectPropertyToPropertyList(String propertyUri, String domainUri, String rangeUri,
             List<Property> propertyList) {
         ObjectPropertyDao opDao = wdf.getObjectPropertyDao();
@@ -449,7 +449,7 @@ public class GroupedPropertyList extends BaseTemplateModel {
          */
         PropertyGroup groupForUnassignedProperties = pgDao
                 .createDummyPropertyGroup("", MAX_GROUP_DISPLAY_RANK);
-                
+
         if (groupCount > 1) {
             try {
                 Collections.sort(groupList);
@@ -479,7 +479,7 @@ public class GroupedPropertyList extends BaseTemplateModel {
         // group list.
         if (groupForUnassignedProperties.getPropertyList().size() > 0) {
             groupList.add(groupForUnassignedProperties);
-            // If no real property groups are populated, the groupForUnassignedProperties 
+            // If no real property groups are populated, the groupForUnassignedProperties
             // moves from case 2 to case 1 above, so change the name to null
             // to signal to the templates that there are no real groups.
             if (groupCount == 0) {
@@ -519,7 +519,7 @@ public class GroupedPropertyList extends BaseTemplateModel {
                             pg.getPropertyList().add(p);
                             assignedToGroup = true;
                             break;
-                        }     
+                        }
                     }
                 }
 
@@ -570,7 +570,7 @@ public class GroupedPropertyList extends BaseTemplateModel {
         }
     }
 
-    // Since we're now including some vitro properties in the property list, 
+    // Since we're now including some vitro properties in the property list,
     // which don't have labels, use their local name instead.
     private String getLabel(Property property) {
         String label = property.getLabel();
@@ -585,8 +585,8 @@ public class GroupedPropertyList extends BaseTemplateModel {
     public List<PropertyGroupTemplateModel> getAll() {
         return groups;
     }
-    
-    
+
+
     /* Template methods */
 
     public PropertyTemplateModel getProperty(String propertyUri) {
@@ -618,13 +618,13 @@ public class GroupedPropertyList extends BaseTemplateModel {
     public PropertyTemplateModel pullProperty(String propertyUri) {
         return pullProperty(propertyUri, null);
     }
-    
+
     public PropertyTemplateModel pullProperty(String propertyUri, String rangeUri) {
 
         for (PropertyGroupTemplateModel pgtm : groups) {
             List<PropertyTemplateModel> properties = pgtm.getProperties();
             for (PropertyTemplateModel ptm : properties) {
-                if (propertyUri.equals(ptm.getUri()) && 
+                if (propertyUri.equals(ptm.getUri()) &&
                         (rangeUri == null || rangeUri.equals(ptm.getRangeUri()))) {
                     // Remove the property from the group.
                     // NB Works with a for-each loop instead of an iterator,
@@ -642,7 +642,7 @@ public class GroupedPropertyList extends BaseTemplateModel {
         }
         return null;
     }
-    
+
     public PropertyGroupTemplateModel pullPropertyGroup(String groupName) {
         for (PropertyGroupTemplateModel group : groups) {
             if (groupName.equals(group.getName())) {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java
index 6e4fd935e..1ff516544 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java
@@ -11,7 +11,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 public class IndividualTemplateModel extends BaseIndividualTemplateModel {
 
     private static final Log log = LogFactory.getLog(IndividualTemplateModel.class);
-    
+
     IndividualTemplateModel(Individual individual, VitroRequest vreq) {
         super(individual, vreq);
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModelBuilder.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModelBuilder.java
index 60a426ecf..a543972c4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModelBuilder.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModelBuilder.java
@@ -10,7 +10,7 @@ public class IndividualTemplateModelBuilder {
         if (customBuilder != null) {
             return customBuilder.build(individual, vreq);
         }
-        
+
         return new IndividualTemplateModel(individual, vreq);
     }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/MaintainDuplicatesObjectPropertyDataPostProcessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/MaintainDuplicatesObjectPropertyDataPostProcessor.java
index cba390dbf..24569ff29 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/MaintainDuplicatesObjectPropertyDataPostProcessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/MaintainDuplicatesObjectPropertyDataPostProcessor.java
@@ -13,8 +13,8 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 /** The object property data postprocessor that is used if the view does not specify another postprocessor */
 public class MaintainDuplicatesObjectPropertyDataPostProcessor extends BaseObjectPropertyDataPostProcessor {
 
-    private static final Log log = LogFactory.getLog(DefaultObjectPropertyDataPostProcessor.class);   
-    
+    private static final Log log = LogFactory.getLog(DefaultObjectPropertyDataPostProcessor.class);
+
     public MaintainDuplicatesObjectPropertyDataPostProcessor(ObjectPropertyTemplateModel optm,
             WebappDaoFactory wdf) {
         super(optm, wdf);
@@ -24,18 +24,18 @@ public class MaintainDuplicatesObjectPropertyDataPostProcessor extends BaseObjec
     protected void process(Map<String, String> map) {
         // no default data postprocessing defined yet
     }
-    
+
     @Override
     public void process(List<Map<String, String>> data) {
     	 if (data.isEmpty()) {
              log.debug("No data to postprocess for property " + objectPropertyTemplateModel.getUri());
              return;
          }
-         
+
          //Process list is not called as it removes duplicates
 
          for (Map<String, String> map : data) {
-             process(map);           
+             process(map);
          }
     }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/NameStatementTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/NameStatementTemplateModel.java
index da3b57ed5..dca279628 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/NameStatementTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/NameStatementTemplateModel.java
@@ -27,26 +27,26 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.RdfLiteralHash;
 /**
  * This allows the template to treat an rdfs:label like a data property statement, and thus
  * have an editing link.
- * 
+ *
  * This has the same accessor methods as a DataPropertyStatementTemplateModel, but it is never
- * part of the GroupedPropertyList, and it never has a deleteUrl. 
+ * part of the GroupedPropertyList, and it never has a deleteUrl.
  */
 public class NameStatementTemplateModel extends PropertyStatementTemplateModel {
     private static final Log log = LogFactory.getLog(NameStatementTemplateModel.class);
-    
+
     private final String stringValue;
     private final String editUrl;
 
     NameStatementTemplateModel(String subjectUri, VitroRequest vreq) {
         super(subjectUri, new Property(VitroVocabulary.LABEL), vreq);
 
-        // NIHVIVO-2466 Use the same methods to get the label that are used elsewhere in the 
+        // NIHVIVO-2466 Use the same methods to get the label that are used elsewhere in the
         // application, to guarantee consistent results for individuals with multiple labels
-        // across the application. 
+        // across the application.
         WebappDaoFactory wdf = vreq.getWebappDaoFactory();
         IndividualDao iDao = wdf.getIndividualDao();
         EditLiteral literal = iDao.getLabelEditLiteral(subjectUri);
-        
+
         if (literal == null) {
         	// If the individual has no rdfs:label, use the local name. It will not be editable. (This replicates previous behavior;
         	// perhaps we would want to allow a label to be added. But such individuals do not usually have their profiles viewed or
@@ -56,10 +56,10 @@ public class NameStatementTemplateModel extends PropertyStatementTemplateModel {
         	this.editUrl = "";
         } else {
             this.stringValue = cleanTextForDisplay( literal.getLexicalForm() );
-            this.editUrl = makeEditUrl(literal);       
+            this.editUrl = makeEditUrl(literal);
         }
     }
- 
+
 	private String makeEditUrl(Literal literal) {
         // Determine whether the statement can be edited
         DataPropertyStatement dps = makeStatement(literal);
@@ -67,18 +67,18 @@ public class NameStatementTemplateModel extends PropertyStatementTemplateModel {
         if ( ! PolicyHelper.isAuthorizedForActions(vreq, action) ) {
             return "";
         }
-        
+
         ParamMap params = new ParamMap(
                 "subjectUri", subjectUri,
                 "predicateUri", property.getURI(),
                 "datapropKey", makeHash(dps),
                 "deleteProhibited", "prohibited");
-        
+
         params.putAll(UrlBuilder.getModelParams(vreq));
-        
-        return UrlBuilder.getUrl(EDIT_PATH, params);             
+
+        return UrlBuilder.getUrl(EDIT_PATH, params);
 	}
-        
+
 	private DataPropertyStatement makeStatement(Literal literalValue) {
 		DataPropertyStatement dps = new DataPropertyStatementImpl(subjectUri,
 				property.getURI(), literalValue.getLexicalForm());
@@ -94,7 +94,7 @@ public class NameStatementTemplateModel extends PropertyStatementTemplateModel {
 	}
 
     /* Template properties */
-    
+
     public String getValue() {
     	return stringValue;
     }
@@ -103,7 +103,7 @@ public class NameStatementTemplateModel extends PropertyStatementTemplateModel {
 	public String getDeleteUrl() {
 		return "";
 	}
-    
+
     @Override
 	public String getEditUrl() {
 		return editUrl;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyDataPostProcessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyDataPostProcessor.java
index 12e26628d..1b18a3edb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyDataPostProcessor.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyDataPostProcessor.java
@@ -5,10 +5,10 @@ package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual;
 import java.util.List;
 import java.util.Map;
 
-/** 
- * These postprocessors take a list of object property statement data returned from a 
+/**
+ * These postprocessors take a list of object property statement data returned from a
  * SPARQL query and prepare it for insertion into the template data model.
- * 
+ *
  * @author rjy7
  *
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyStatementTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyStatementTemplateModel.java
index f65fc2496..9eb91b8c0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyStatementTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyStatementTemplateModel.java
@@ -20,26 +20,26 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMa
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 
 public class ObjectPropertyStatementTemplateModel extends PropertyStatementTemplateModel {
-    private static final Log log = LogFactory.getLog(ObjectPropertyStatementTemplateModel.class); 
-    
+    private static final Log log = LogFactory.getLog(ObjectPropertyStatementTemplateModel.class);
+
     private final Map<String, String> data;
-    
+
     private final String objectUri;
     private final String templateName;
     private final String objectKey;
     private final String editUrl;
     private final String deleteUrl;
-    
-    public ObjectPropertyStatementTemplateModel(String subjectUri, ObjectProperty property, String objectKey, 
+
+    public ObjectPropertyStatementTemplateModel(String subjectUri, ObjectProperty property, String objectKey,
             Map<String, String> data, String templateName, VitroRequest vreq) {
         super(subjectUri, property, vreq);
 
         this.data = Collections.unmodifiableMap(new HashMap<String, String>(data));
-        this.objectUri = data.get(objectKey);        
+        this.objectUri = data.get(objectKey);
         this.templateName = templateName;
         //to keep track of later
         this.objectKey = objectKey;
-        
+
         // Do delete url first, since it is used in building edit url
         this.deleteUrl = makeDeleteUrl();
         this.editUrl = makeEditUrl();
@@ -50,47 +50,47 @@ public class ObjectPropertyStatementTemplateModel extends PropertyStatementTempl
     	if (property.isDeleteLinkSuppressed()) {
     		return "";
     	}
-        
+
         // Determine whether the statement can be deleted
 		RequestedAction action = new DropObjectPropertyStatement(
 				vreq.getJenaOntModel(), subjectUri, property, objectUri);
         if ( ! PolicyHelper.isAuthorizedForActions(vreq, action) ) {
             return "";
         }
-        
+
         if (VitroVocabulary.IND_MAIN_IMAGE.equals(property.getURI())) {
             return ObjectPropertyTemplateModel.getImageUploadUrl(subjectUri, "delete");
-        } 
-        
+        }
+
         ParamMap params = new ParamMap(
                 "subjectUri", subjectUri,
                 "predicateUri", property.getURI(),
                 "objectUri", objectUri,
                 "cmd", "delete",
                 "objectKey", objectKey);
-            
+
         for ( String key : data.keySet() ) {
             String value = data.get(key);
             // Remove an entry with a null value instead of letting it get passed
             // as a param with an empty value, in order to align with behavior on
-            // profile page. E.g., if statement.moniker is null, a test for 
-            // statement.moniker?? will yield different results if null on the 
+            // profile page. E.g., if statement.moniker is null, a test for
+            // statement.moniker?? will yield different results if null on the
             // profile page but an empty string on the deletion page.
             if (value != null) {
                 params.put("statement_" + key, data.get(key));
             }
         }
-        
+
         if (property!= null && property.getDomainVClassURI() != null) {
             params.put("domainUri", property.getDomainVClassURI());
         }
         if (property!= null && property.getRangeVClassURI() != null) {
             params.put("rangeUri", property.getRangeVClassURI());
         }
-        
+
         params.put("templateName", templateName);
         params.putAll(UrlBuilder.getModelParams(vreq));
-        
+
         return UrlBuilder.getUrl(EDIT_PATH, params);
 	}
 
@@ -99,48 +99,48 @@ public class ObjectPropertyStatementTemplateModel extends PropertyStatementTempl
     	if (property.isEditLinkSuppressed()) {
     		return "";
     	}
-        
+
        // Determine whether the statement can be edited
         RequestedAction action =  new EditObjectPropertyStatement(vreq.getJenaOntModel(), subjectUri, property, objectUri);
         if ( ! PolicyHelper.isAuthorizedForActions(vreq, action) ) {
             return "";
         }
-        
+
         if (VitroVocabulary.IND_MAIN_IMAGE.equals(property.getURI())) {
             return ObjectPropertyTemplateModel.getImageUploadUrl(subjectUri, "edit");
-        } 
+        }
 
         ParamMap params = new ParamMap(
                 "subjectUri", subjectUri,
                 "predicateUri", property.getURI(),
                 "objectUri", objectUri);
-        
+
         if ( deleteUrl.isEmpty() ) {
             params.put("deleteProhibited", "prohibited");
         }
-        
+
         if (property!= null && property.getDomainVClassURI() != null) {
             params.put("domainUri", property.getDomainVClassURI());
         }
         if (property!= null && property.getRangeVClassURI() != null) {
             params.put("rangeUri", property.getRangeVClassURI());
         }
-        
+
         params.putAll(UrlBuilder.getModelParams(vreq));
-        
+
         return UrlBuilder.getUrl(EDIT_PATH, params);
 	}
-    
+
     /* Template methods */
 
     public Object get(String key) {
         return cleanTextForDisplay( data.get(key) );
     }
-  
+
     public String uri(String key) {
     	return cleanURIForDisplay(data.get(key));
     }
-    
+
     //Adding this method to enable retrieval of the entire data map
     public Map<String, String> getAllData() {
     	return data;
@@ -150,7 +150,7 @@ public class ObjectPropertyStatementTemplateModel extends PropertyStatementTempl
 	public String getDeleteUrl() {
 		return deleteUrl;
 	}
-  
+
 	@Override
 	public String getEditUrl() {
 		return editUrl;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
index e830c2846..12864d28c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
@@ -34,62 +34,62 @@ import edu.cornell.mannlib.vitro.webapp.web.templatemodels.customlistview.Proper
 import freemarker.cache.TemplateLoader;
 
 public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel {
-    
-    private static final Log log = LogFactory.getLog(ObjectPropertyTemplateModel.class);      
+
+    private static final Log log = LogFactory.getLog(ObjectPropertyTemplateModel.class);
     private static final String TYPE = "object";
     private static final String EDIT_PATH = "editRequestDispatch";
     private static final String IMAGE_UPLOAD_PATH = "/uploadImages";
-    
+
     private static final String END_DATE_TIME_VARIABLE = "dateTimeEnd";
-    private static final Pattern ORDER_BY_END_DATE_TIME_PATTERN = 
+    private static final Pattern ORDER_BY_END_DATE_TIME_PATTERN =
         /* ORDER BY DESC(?dateTimeEnd)
          * ORDER BY ?subclass ?dateTimeEnd
          * ORDER BY DESC(?subclass) DESC(?dateTimeEnd)
          */
-        Pattern.compile("ORDER\\s+BY\\s+((DESC\\()?\\?subclass\\)?\\s+)?DESC\\s*\\(\\s*\\?" + 
+        Pattern.compile("ORDER\\s+BY\\s+((DESC\\()?\\?subclass\\)?\\s+)?DESC\\s*\\(\\s*\\?" +
                 END_DATE_TIME_VARIABLE + "\\)", Pattern.CASE_INSENSITIVE);
 
     private static final String KEY_SUBJECT = "subject";
     private static final String KEY_PROPERTY = "property";
     private static final String DEFAULT_LIST_VIEW_QUERY_OBJECT_VARIABLE_NAME = "object";
-    private static final Pattern SUBJECT_PROPERTY_OBJECT_PATTERN = 
+    private static final Pattern SUBJECT_PROPERTY_OBJECT_PATTERN =
         // ?subject ?property ?\w+
         Pattern.compile("\\?" + KEY_SUBJECT + "\\s+\\?" + KEY_PROPERTY + "\\s+\\?(\\w+)");
-    
+
     public static enum ConfigError {
         NO_SELECT_QUERY("Missing select query specification"),
         NO_SUBCLASS_SELECT("Query does not select a subclass variable"),
         NO_SUBCLASS_ORDER_BY("Query does not sort first by subclass variable"),
         NO_TEMPLATE("Missing template specification"),
         TEMPLATE_NOT_FOUND("Specified template does not exist");
-        
+
         String message;
-        
+
         ConfigError(String message) {
             this.message = message;
         }
-        
+
         public String getMessage() {
             return message;
         }
-        
+
         public String toString() {
             return getMessage();
         }
     }
-    
+
     private PropertyListConfig config;
-    private String objectKey;    
+    private String objectKey;
     private String sortDirection;
     private String publicDescription;
 	private int displayLimit;
-    
-    ObjectPropertyTemplateModel(ObjectProperty op, Individual subject, VitroRequest vreq, 
+
+    ObjectPropertyTemplateModel(ObjectProperty op, Individual subject, VitroRequest vreq,
             boolean editing)
         throws InvalidConfigurationException {
-        
+
         super(op, subject, vreq, op.getDomainPublic());
-        
+
         sortDirection = op.getDomainEntitySortDirection();
         domainUri = op.getDomainVClassURI();
         rangeUri = op.getRangeVClassURI();
@@ -104,9 +104,9 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
         } catch (Exception e) {
             log.error(e, e);
         }
-        
+
         objectKey = getQueryObjectVariableName();
-        
+
         if (editing) {
         	setAddUrl(op);
         }
@@ -117,42 +117,42 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
     	if (property.isAddLinkSuppressed()) {
     		return;
     	}
-        
+
         // Determine whether a new statement can be added
 		RequestedAction action = new AddObjectPropertyStatement(
 				vreq.getJenaOntModel(), subjectUri, property, SOME_URI);
         if ( ! PolicyHelper.isAuthorizedForActions(vreq, action) ) {
             return;
         }
-        
-        String rangeUri = (property instanceof ObjectProperty) 
+
+        String rangeUri = (property instanceof ObjectProperty)
                 ? ((ObjectProperty) property).getRangeVClassURI()
                 : "data";
-         
+
         if (propertyUri.equals(VitroVocabulary.IND_MAIN_IMAGE)) {
             addUrl = getImageUploadUrl(subjectUri, "add");
         } else {
             ParamMap params = new ParamMap(
                     "subjectUri", subjectUri,
                     "predicateUri", propertyUri);
-            
+
             if (domainUri != null) {
                 params.put("domainUri", domainUri);
             }
             if (rangeUri != null) {
                 params.put("rangeUri", rangeUri);
             }
-            
+
             params.putAll(UrlBuilder.getModelParams(vreq));
 
-            addUrl = UrlBuilder.getUrl(EDIT_PATH, params);  
+            addUrl = UrlBuilder.getUrl(EDIT_PATH, params);
         }
     }
-    
+
     /**
      * Pull this into a protected method so we can stub it out in the unit tests.
-     * Other options: 
-     * 1) receive a TemplateLoader into the constructor of ObjectPropertyTemplateModel, 
+     * Other options:
+     * 1) receive a TemplateLoader into the constructor of ObjectPropertyTemplateModel,
      * 2) provide a service that will check to see whether a given template name is valid,
      * 3) skip the test for valid template name until we try to use the thing.
      * This will do for now.
@@ -160,21 +160,21 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
 	protected TemplateLoader getFreemarkerTemplateLoader() {
 		return FreemarkerConfiguration.getConfig(vreq).getTemplateLoader();
 	}
-    
+
     protected List<Map<String, String>> getStatementData() {
         ObjectPropertyStatementDao opDao = vreq.getWebappDaoFactory().getObjectPropertyStatementDao();
         return opDao.getObjectPropertyStatementsForIndividualByProperty(subjectUri, propertyUri, objectKey, domainUri, rangeUri, getSelectQuery(), getConstructQueries(), sortDirection);
     }
-    
+
     protected abstract boolean isEmpty();
-    
-    @Override 
+
+    @Override
     protected int getPropertyDisplayTier(Property p) {
-    	Integer displayTier = ((ObjectProperty)p).getDomainDisplayTier(); 
+    	Integer displayTier = ((ObjectProperty)p).getDomainDisplayTier();
         return (displayTier != null) ? displayTier : -1;
     }
 
-    @Override 
+    @Override
     protected Route getPropertyEditRoute() {
         return Route.OBJECT_PROPERTY_EDIT;
     }
@@ -182,11 +182,11 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
 	@Override
 	public int getDisplayLimit() {
 			return displayLimit;
-	}	
+	}
 
 	public String getPublicDescription() {
 			return publicDescription;
-	}	
+	}
 
     public ConfigError checkQuery(String queryString) {
         if (StringUtils.isBlank(queryString)) {
@@ -194,15 +194,15 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
         }
         return null;
     }
-      
+
     private String getSelectQuery() {
         return config.getSelectQuery();
     }
-    
+
     private Set<String> getConstructQueries() {
         return config.getConstructQueries();
     }
-    
+
     protected String getTemplateName() {
         return config.getTemplateName();
     }
@@ -210,24 +210,24 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
     protected boolean hasDefaultListView() {
         return config.isDefaultListView();
     }
-    
+
     protected static String getImageUploadUrl(String subjectUri, String action) {
         ParamMap params = new ParamMap(
                 "entityUri", subjectUri,
-                "action", action);                              
-        return UrlBuilder.getUrl(IMAGE_UPLOAD_PATH, params);        
+                "action", action);
+        return UrlBuilder.getUrl(IMAGE_UPLOAD_PATH, params);
     }
 
     /** Return the name of the primary object variable of the query by inspecting the query string.
      * The primary object is the X in the assertion "?subject ?property ?X".
      */
     private String getQueryObjectVariableName() {
-        
+
         String object = null;
-        
+
         if (hasDefaultListView()) {
             object = DEFAULT_LIST_VIEW_QUERY_OBJECT_VARIABLE_NAME;
-            log.debug("Using default list view for property " + propertyUri + 
+            log.debug("Using default list view for property " + propertyUri +
                       ", so query object = '" + object + "'");
         } else {
             String queryString = getSelectQuery();
@@ -237,21 +237,21 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
                 log.debug("Query object for property " + propertyUri + " = '" + object + "'");
             }
         }
-        
+
         return object;
     }
-     
-    public static ObjectPropertyTemplateModel getObjectPropertyTemplateModel(ObjectProperty op, 
-            Individual subject, VitroRequest vreq, boolean editing, 
+
+    public static ObjectPropertyTemplateModel getObjectPropertyTemplateModel(ObjectProperty op,
+            Individual subject, VitroRequest vreq, boolean editing,
             List<ObjectProperty> populatedObjectPropertyList) {
         if (op.getCollateBySubclass()) {
             try {
                 return new CollatedObjectPropertyTemplateModel(op, subject, vreq, editing, populatedObjectPropertyList);
             } catch (InvalidConfigurationException e) {
-                log.warn(e.getMessage());     
+                log.warn(e.getMessage());
                 // If the collated config is invalid, instantiate an UncollatedObjectPropertyTemplateModel instead.
             }
-        } 
+        }
         try {
             return new UncollatedObjectPropertyTemplateModel(op, subject, vreq, editing, populatedObjectPropertyList);
         } catch (InvalidConfigurationException e) {
@@ -259,27 +259,27 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
             return null;
         }
     }
-    
+
     /** Apply post-processing to query results to prepare for template */
     protected void postprocess(List<Map<String, String>> data) {
-        
+
         if (log.isDebugEnabled()) {
             log.debug("Data for property " + getUri() + " before postprocessing");
             logData(data);
         }
-        
+
         ObjectPropertyDataPostProcessor postprocessor = config.getPostprocessor();
         log.debug("Using postprocessor " + postprocessor.getClass().getName() + " for property " + getUri());
         postprocessor.process(data);
-        
+
         if (log.isDebugEnabled()) {
             log.debug("Data for property " + getUri() + " after postprocessing");
             logData(data);
-        }               
+        }
     }
-    
+
     protected void logData(List<Map<String, String>> data) {
-        
+
         if (log.isDebugEnabled()) {
             int count = 1;
             for (Map<String, String> map : data) {
@@ -289,10 +289,10 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
                    log.debug(key + ": " + map.get(key));
                }
             }
-        }        
+        }
     }
-    
-    /** The SPARQL query results may contain duplicate rows for a single object, if there are multiple solutions 
+
+    /** The SPARQL query results may contain duplicate rows for a single object, if there are multiple solutions
      * to the entire query. Remove duplicates here by arbitrarily selecting only the first row returned.
      * @param data The data to deduplicate
      */
@@ -316,21 +316,21 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
             }
         }
     }
-    
+
     /* Post-processing that must occur after collation, because it does reordering on collated subclass
      * lists rather than on the entire list. This should ideally be configurable in the config file
      * like the pre-collation post-processing, but for now due to time constraints it applies to all views.
      */
-    protected void postprocessStatementList(List<ObjectPropertyStatementTemplateModel> statements) {        
-        moveNullEndDateTimesToTop(statements);        
+    protected void postprocessStatementList(List<ObjectPropertyStatementTemplateModel> statements) {
+        moveNullEndDateTimesToTop(statements);
     }
-    
+
     /* SPARQL ORDER BY gives null values the lowest value, so null datetimes occur at the end
      * of a list in descending sort order. Generally we assume that a null end datetime means the
      * activity is  ongoing in the present, so we want to display those at the top of the list.
      * Application of this method should be configurable in the config file, but for now due to
      * time constraints it applies to all views that sort by DESC(?dateTimeEnd), and the variable
-     * name is hard-coded here. (Note, therefore, that using a different variable name  
+     * name is hard-coded here. (Note, therefore, that using a different variable name
      * effectively turns off this post-processing.)
      */
     protected void moveNullEndDateTimesToTop(List<ObjectPropertyStatementTemplateModel> statements) {
@@ -339,7 +339,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
         if ( ! m.find() ) {
             return;
         }
-        
+
         // Store the statements with null end datetimes in a temporary list, remove them from the original list,
         // and move them back to the top of the original list.
         List<ObjectPropertyStatementTemplateModel> tempList = new ArrayList<ObjectPropertyStatementTemplateModel>();
@@ -352,22 +352,22 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
                 // so there is nothing to reorder.
                 if (statements.indexOf(stmt) == 0) {
                     break;
-                }               
-                tempList.add(stmt); 
-                iterator.remove(); 
+                }
+                tempList.add(stmt);
+                iterator.remove();
             }
         }
         // Put all the statements with null end datetimes at the top of the list, preserving their original order.
         statements.addAll(0, tempList);
-    
+
     }
-    
+
     protected String getObjectKey() {
         return objectKey;
     }
-    
+
     /* Template properties */
-    
+
     public String getType() {
         return TYPE;
     }
@@ -375,7 +375,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
     public String getTemplate() {
         return getTemplateName();
     }
-    
+
     public abstract boolean isCollatedBySubclass();
 
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyGroupTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyGroupTemplateModel.java
index d3288dcc5..5c8ec1d2a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyGroupTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyGroupTemplateModel.java
@@ -28,23 +28,23 @@ import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel;
 
 public class PropertyGroupTemplateModel extends BaseTemplateModel {
 
-    private static final Log log = LogFactory.getLog(PropertyGroupTemplateModel.class); 
-    
+    private static final Log log = LogFactory.getLog(PropertyGroupTemplateModel.class);
+
     private final String name;
     private final List<PropertyTemplateModel> properties;
 
 
 
-    PropertyGroupTemplateModel(VitroRequest vreq, PropertyGroup group, 
-            Individual subject, boolean editing, 
-            List<DataProperty> populatedDataPropertyList, 
+    PropertyGroupTemplateModel(VitroRequest vreq, PropertyGroup group,
+            Individual subject, boolean editing,
+            List<DataProperty> populatedDataPropertyList,
             List<ObjectProperty> populatedObjectPropertyList) {
 
         this.name = group.getName();
-        
+
         List<Property> propertyList = group.getPropertyList();
         properties = new ArrayList<PropertyTemplateModel>(propertyList.size());
-        
+
         for (Property p : propertyList)  {
             if (p instanceof ObjectProperty) {
                 ObjectProperty op = (ObjectProperty) p;
@@ -54,7 +54,7 @@ public class PropertyGroupTemplateModel extends BaseTemplateModel {
                 ObjectPropertyTemplateModel tm = ObjectPropertyTemplateModel.getObjectPropertyTemplateModel(
                         op, subject, vreq, editing, populatedObjectPropertyList);
                 if (!tm.isEmpty() || (editing && !tm.getAddUrl().isEmpty())) {
-                    properties.add(tm);                    
+                    properties.add(tm);
                 }
 
             } else if (p instanceof DataProperty){
@@ -79,7 +79,7 @@ public class PropertyGroupTemplateModel extends BaseTemplateModel {
 		if (PolicyHelper.isAuthorizedForActions(vreq, dop)) {
 			return true;
 		}
-	
+
 		RequestedAction dops = new DisplayObjectPropertyStatement(
 				subject.getURI(), op, SOME_URI);
         return PolicyHelper.isAuthorizedForActions(vreq, dops);
@@ -107,11 +107,11 @@ public class PropertyGroupTemplateModel extends BaseTemplateModel {
 	protected boolean isEmpty() {
         return properties.isEmpty();
     }
-    
+
     protected void remove(PropertyTemplateModel ptm) {
         properties.remove(ptm);
     }
-    
+
 
     @Override
 	public String toString(){
@@ -123,14 +123,14 @@ public class PropertyGroupTemplateModel extends BaseTemplateModel {
         }
         return String.format("\nPropertyGroupTemplateModel %s[%s] ",name, ptmStr.toString());
     }
-    
+
     /* Accessor methods for templates */
     // Add this so it's included in dumps for debugging. The templates will want to display
     // name using getName(String)
     public String getName() {
         return name;
     }
-    
+
     public String getName(String otherGroupName) {
         if (name == null || name.isEmpty()) {
             return otherGroupName;
@@ -138,8 +138,8 @@ public class PropertyGroupTemplateModel extends BaseTemplateModel {
             return name;
         }
     }
-    
+
     public List<PropertyTemplateModel> getProperties() {
         return properties;
-    }    
+    }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyStatementTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyStatementTemplateModel.java
index 84a00b7bb..6ca8296ed 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyStatementTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyStatementTemplateModel.java
@@ -7,20 +7,20 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel;
 
 public abstract class PropertyStatementTemplateModel extends BaseTemplateModel {
-	protected static final String EDIT_PATH = "editRequestDispatch";  
+	protected static final String EDIT_PATH = "editRequestDispatch";
 
     protected final VitroRequest vreq;
     protected final String subjectUri;
     protected final Property property;
-    
+
     PropertyStatementTemplateModel(String subjectUri, Property property, VitroRequest vreq) {
-        this.vreq = vreq;        
+        this.vreq = vreq;
         this.subjectUri = subjectUri;
-        this.property = property;              
+        this.property = property;
     }
-    
+
     /* Template properties */
-    
+
     public abstract String getEditUrl();
     public abstract String getDeleteUrl();
     public boolean isEditable() {
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
index bd0816eb9..c7424e287 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
@@ -21,13 +21,13 @@ import edu.cornell.mannlib.vitro.webapp.dao.FauxPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel;
 
-/** 
+/**
  * Represents the property statement list for a single property of an individual.
  */
 public abstract class PropertyTemplateModel extends BaseTemplateModel {
 
-    private static final Log log = LogFactory.getLog(PropertyTemplateModel.class); 
-    
+    private static final Log log = LogFactory.getLog(PropertyTemplateModel.class);
+
     protected final VitroRequest vreq;
     protected final String subjectUri;
     protected final Property property;
@@ -38,20 +38,20 @@ public abstract class PropertyTemplateModel extends BaseTemplateModel {
 
     protected Map<String, Object> verboseDisplay;
     protected String addUrl;
-    
+
     private String name;
     private FauxProperty fauxProperty;
     private int displayLimit;
-       
+
     PropertyTemplateModel(Property property, Individual subject, VitroRequest vreq, String name) {
         this.vreq = vreq;
-        subjectUri = subject.getURI(); 
+        subjectUri = subject.getURI();
         this.property = property;
         propertyUri = property.getURI();
         localName = property.getLocalName();
         this.name = name;
         addUrl = "";
-        
+
         fauxProperty = isFauxProperty(property);
         if (fauxProperty != null) {
         	this.name = fauxProperty.getDisplayName();
@@ -59,67 +59,67 @@ public abstract class PropertyTemplateModel extends BaseTemplateModel {
         }
         setVerboseDisplayValues(property);
     }
-    
-    protected void setVerboseDisplayValues(Property property) {  
-        
+
+    protected void setVerboseDisplayValues(Property property) {
+
         // No verbose display for vitro and vitro public properties.
-        // This models previous behavior. In theory the verbose display can be provided, 
+        // This models previous behavior. In theory the verbose display can be provided,
         // but we may not want to give anyone access to these properties, since the
         // application is dependent on them.
-        String namespace = property.getNamespace();        
-        if (VitroVocabulary.vitroURI.equals(namespace) 
+        String namespace = property.getNamespace();
+        if (VitroVocabulary.vitroURI.equals(namespace)
             || VitroVocabulary.VITRO_PUBLIC.equals(namespace)) {
             return;
         }
-        
-        Boolean verboseDisplayValue = 
+
+        Boolean verboseDisplayValue =
             (Boolean) vreq.getSession().getAttribute("verbosePropertyDisplay");
 
         if ( ! Boolean.TRUE.equals(verboseDisplayValue))  {
             return;
         }
-        
+
 		if (!PolicyHelper.isAuthorizedForActions(vreq,
 				SimplePermission.SEE_VERBOSE_PROPERTY_INFORMATION.ACTION)) {
             return;
         }
-        
+
         verboseDisplay = new HashMap<String, Object>();
-        
+
         RoleLevel roleLevel = property.getHiddenFromDisplayBelowRoleLevel();
         String roleLevelLabel = roleLevel != null ? roleLevel.getDisplayLabel() : "";
         verboseDisplay.put("displayLevel", roleLevelLabel);
 
         roleLevel = property.getProhibitedFromUpdateBelowRoleLevel();
         roleLevelLabel = roleLevel != null ? roleLevel.getUpdateLabel() : "";
-        verboseDisplay.put("updateLevel", roleLevelLabel);   
-        
+        verboseDisplay.put("updateLevel", roleLevelLabel);
+
         roleLevel = property.getHiddenFromPublishBelowRoleLevel();
         roleLevelLabel = roleLevel != null ? roleLevel.getDisplayLabel() : "";
-        verboseDisplay.put("publishLevel", roleLevelLabel);   
-        
+        verboseDisplay.put("publishLevel", roleLevelLabel);
+
         verboseDisplay.put("localName", property.getLocalNameWithPrefix());
         verboseDisplay.put("displayRank", getPropertyDisplayTier(property));
-       
+
         String editUrl = UrlBuilder.getUrl(getPropertyEditRoute(), "uri", property.getURI());
         verboseDisplay.put("propertyEditUrl", editUrl);
-        
+
         if (fauxProperty != null) {
         	verboseDisplay.put("fauxProperty", assembleFauxPropertyValues(fauxProperty));
-        } 
+        }
     }
 
 	private FauxProperty isFauxProperty(Property prop) {
 		FauxPropertyDao fpDao = vreq.getUnfilteredWebappDaoFactory().getFauxPropertyDao();
 		return fpDao.getFauxPropertyByUris(prop.getDomainVClassURI(), prop.getURI(), prop.getRangeVClassURI());
 	}
-    
+
 	private Map<String, Object> assembleFauxPropertyValues(FauxProperty fp) {
 		Map<String, Object> map = new HashMap<>();
-		String editUrl = UrlBuilder.getUrl("/editForm", 
-				"controller", "FauxProperty", 
-				"baseUri", fp.getBaseURI(), 
-				"domainUri", fp.getDomainURI(), 
+		String editUrl = UrlBuilder.getUrl("/editForm",
+				"controller", "FauxProperty",
+				"baseUri", fp.getBaseURI(),
+				"domainUri", fp.getDomainURI(),
 				"rangeUri", fp.getRangeURI());
 		map.put("propertyEditUrl", editUrl);
 		map.put("displayName", fp.getDisplayName());
@@ -128,7 +128,7 @@ public abstract class PropertyTemplateModel extends BaseTemplateModel {
 
 	protected abstract int getPropertyDisplayTier(Property p);
     protected abstract Route getPropertyEditRoute();
-    
+
     public String toString() {
         return String.format("%s on %s",
                              propertyUri != null ? propertyUri : "null Prop URI",
@@ -136,9 +136,9 @@ public abstract class PropertyTemplateModel extends BaseTemplateModel {
     }
 
     /* Template properties */
-    
+
     public abstract String getType();
-    
+
     public String getName() {
         return name;
     }
@@ -150,29 +150,29 @@ public abstract class PropertyTemplateModel extends BaseTemplateModel {
     public String getLocalName() {
         return localName;
     }
-    
+
     public String getUri() {
         return propertyUri;
     }
-    
+
     public String getRangeUri() {
         return rangeUri;
     }
-    
+
     public String getDomainUri() {
         return domainUri;
     }
-    
+
     public String getAddUrl() {
         //log.info("addUrl=" + addUrl);
         return (addUrl != null) ? addUrl : "";
     }
-    
+
     //check to see whether or not this property represents a faux property
     public boolean getIsFauxProperty() {
     	return (fauxProperty != null);
     }
     public Map<String, Object> getVerboseDisplay() {
         return verboseDisplay;
-    } 
+    }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/SubclassTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/SubclassTemplateModel.java
index 9705443f9..02d6db460 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/SubclassTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/SubclassTemplateModel.java
@@ -7,25 +7,25 @@ import java.util.List;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel;
 
-public class SubclassTemplateModel extends BaseTemplateModel implements Comparable<SubclassTemplateModel> { 
-    
+public class SubclassTemplateModel extends BaseTemplateModel implements Comparable<SubclassTemplateModel> {
+
     private final VClass vclass;
     private final List<ObjectPropertyStatementTemplateModel> statements;
-    
+
     SubclassTemplateModel(VClass vclass, List<ObjectPropertyStatementTemplateModel> statements) {
         // NB vclass may be null. If the statements don't belong to any subclass, a dummy SubclassTemplateModel
         // is created with a null vclass, so that the data can be presented in a uniform way to the template.
-        this.vclass = vclass; 
+        this.vclass = vclass;
         this.statements = statements;
     }
 
     @Override
     public int compareTo(SubclassTemplateModel other) {
-        
+
         if (other == null) {
             return -1;
         }
-        
+
         VClass vclassOther = other.getVClass();
         if (vclass == null) {
             return vclassOther == null ? 0 : 1;
@@ -33,50 +33,50 @@ public class SubclassTemplateModel extends BaseTemplateModel implements Comparab
         if (vclassOther == null) {
             return -1;
         }
-        
+
         int rank = vclass.getDisplayRank();
         int rankOther = vclassOther.getDisplayRank();
-        
+
         int intCompare = 0;
         // Values < 1 are undefined and go at end, not beginning
         if (rank < 1) {
             intCompare = rankOther < 1 ? 0 : 1;
         } else if (rankOther < 1) {
             intCompare = -1;
-        } else {           
+        } else {
             intCompare = Integer.compare(rank, rankOther);
         }
 
         if (intCompare != 0) {
-            return intCompare;        
+            return intCompare;
         }
-        
-        // If display ranks are equal, sort by name     
+
+        // If display ranks are equal, sort by name
         String name = getName();
         String nameOther = vclassOther.getName();
-               
+
         if (name == null) {
             return nameOther == null ? 0 : 1;
-        } 
+        }
         if (nameOther == null) {
             return -1;
         }
         return name.compareToIgnoreCase(nameOther);
 
     }
-    
+
     protected VClass getVClass() {
         return vclass;
     }
-    
+
     /* Accessor methods for templates */
-    
+
     public String getName() {
         return vclass == null ? "" : vclass.getName();
     }
-    
+
     public List<ObjectPropertyStatementTemplateModel> getStatements() {
         return statements;
     }
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/UncollatedObjectPropertyTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/UncollatedObjectPropertyTemplateModel.java
index 4e132fd4d..06bdb8fa5 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/UncollatedObjectPropertyTemplateModel.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/UncollatedObjectPropertyTemplateModel.java
@@ -16,58 +16,58 @@ import edu.cornell.mannlib.vitro.webapp.web.templatemodels.customlistview.Invali
 
 public class UncollatedObjectPropertyTemplateModel extends ObjectPropertyTemplateModel {
 
-    private static final Log log = LogFactory.getLog(UncollatedObjectPropertyTemplateModel.class);  
-    
+    private static final Log log = LogFactory.getLog(UncollatedObjectPropertyTemplateModel.class);
+
     private final List<ObjectPropertyStatementTemplateModel> statements;
-    
-    UncollatedObjectPropertyTemplateModel(ObjectProperty op, Individual subject, 
-            VitroRequest vreq, boolean editing, 
+
+    UncollatedObjectPropertyTemplateModel(ObjectProperty op, Individual subject,
+            VitroRequest vreq, boolean editing,
             List<ObjectProperty> populatedObjectPropertyList)
         throws InvalidConfigurationException {
-        
+
         super(op, subject, vreq, editing);
         statements = new ArrayList<ObjectPropertyStatementTemplateModel>();
-        
+
         if (populatedObjectPropertyList.contains(op)) {
             log.debug("Getting data for populated object property " + op.getURI());
-            
+
             /* Get the data */
             List<Map<String, String>> statementData = getStatementData();
-            
+
             /* Apply postprocessing */
             postprocess(statementData);
-            
-            /* Put into data structure to send to template */            
+
+            /* Put into data structure to send to template */
             String objectKey = getObjectKey();
             for (Map<String, String> map : statementData) {
-                statements.add(new ObjectPropertyStatementTemplateModel(subjectUri, 
+                statements.add(new ObjectPropertyStatementTemplateModel(subjectUri,
                         op, objectKey, map, getTemplateName(), vreq));
             }
-            
+
             postprocessStatementList(statements);
         } else {
             log.debug("Object property " + getUri() + " is unpopulated.");
         }
     }
-    
+
     @Override
     protected boolean isEmpty() {
         return statements.isEmpty();
     }
-    
+
     /* Template properties */
 
     public List<ObjectPropertyStatementTemplateModel> getStatements() {
         return statements;
     }
-    
+
     @Override
     public boolean isCollatedBySubclass() {
         return false;
     }
-    
+
     /* Template methods */
-    
+
     public ObjectPropertyStatementTemplateModel first() {
         return ( (statements == null || statements.isEmpty()) ) ? null : statements.get(0);
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/BaseListedIndividual.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/BaseListedIndividual.java
index 227cf4cd5..1adfb2100 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/BaseListedIndividual.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/BaseListedIndividual.java
@@ -19,49 +19,49 @@ public abstract class BaseListedIndividual extends BaseTemplateModel {
 
     private static final Log log = LogFactory.getLog(BaseListedIndividual.class);
 
-    protected final Individual individual;  
+    protected final Individual individual;
     protected final VitroRequest vreq;
-    
+
     public BaseListedIndividual(Individual individual, VitroRequest vreq) {
         this.vreq = vreq;
         this.individual = individual;
     }
-    
+
     public static List<ListedIndividual> getIndividualTemplateModels(List<Individual> individuals, VitroRequest vreq) {
         List<ListedIndividual> models = new ArrayList<ListedIndividual>(individuals.size());
         for (Individual individual : individuals) {
           models.add(ListedIndividualBuilder.build(individual, vreq));
-        }  
+        }
         return models;
     }
-    
+
     /* Template properties */
-    
+
     public String getProfileUrl() {
         return cleanURIForDisplay( UrlBuilder.getIndividualProfileUrl(individual, vreq) );
-    }    
+    }
 
     public String getImageUrl() {
         String imageUrl = individual.getImageUrl();
         return imageUrl == null ? null : getUrl(imageUrl);
     }
-    
+
     public String getThumbUrl() {
         String thumbUrl = individual.getThumbUrl();
         return thumbUrl == null ? null : getUrl(thumbUrl);
-    } 
-    
-    public String getName() {           
+    }
+
+    public String getName() {
         return cleanTextForDisplay( individual.getName() );
     }
 
     public String getUri() {
         return cleanURIForDisplay( individual.getURI() );
-    }  
-    
+    }
+
     public List<String> getMostSpecificTypes() {
         ObjectPropertyStatementDao opsDao = vreq.getWebappDaoFactory().getObjectPropertyStatementDao();
-        Map<String, String> types = opsDao.getMostSpecificTypesInClassgroupsForIndividual(individual.getURI()); 
+        Map<String, String> types = opsDao.getMostSpecificTypesInClassgroupsForIndividual(individual.getURI());
         List<String> typeLabels = new ArrayList<String>(types.size());
         String displayedType = (String) vreq.getAttribute("displayType");
         for (String type : types.keySet()) {
@@ -73,5 +73,5 @@ public abstract class BaseListedIndividual extends BaseTemplateModel {
         return typeLabels;
     }
 
-    
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/ListedIndividual.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/ListedIndividual.java
index da4a25252..3c15f3411 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/ListedIndividual.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individuallist/ListedIndividual.java
@@ -11,7 +11,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 public class ListedIndividual extends BaseListedIndividual {
 
     private static final Log log = LogFactory.getLog(ListedIndividual.class);
-    
+
     ListedIndividual(Individual individual, VitroRequest vreq) {
         super(individual, vreq);
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/menu/MainMenu.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/menu/MainMenu.java
index 4619b32b7..c8342b84f 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/menu/MainMenu.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/menu/MainMenu.java
@@ -8,7 +8,7 @@ import org.apache.commons.logging.LogFactory;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 
 /** A menu that can indicate the active item.
- * 
+ *
  * @author rjy7
  *
  */
@@ -16,11 +16,11 @@ public class MainMenu extends Menu {
 
     private static final long serialVersionUID = 1L;
     private static final Log log = LogFactory.getLog(MainMenu.class);
-    
+
     protected VitroRequest vreq;
-    
+
     public MainMenu() { }
-    
+
     public MainMenu(VitroRequest vreq) {
         this.vreq = vreq;
     }
@@ -28,14 +28,14 @@ public class MainMenu extends Menu {
     public void addItem(String text, String path) {
         boolean isActive = isActiveItem(path);
         addItem(text, path, isActive);
-    }  
+    }
 
     public void addItem(String text, String path, boolean isActive) {
         MainMenuItem i = new MainMenuItem(text, path, isActive);
         items.add(i);
     }
-    
+
     protected boolean isActiveItem(String path) {
-        return  vreq != null && vreq.getServletPath().equals(path);                    
+        return  vreq != null && vreq.getServletPath().equals(path);
     }
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/menu/MainMenuItem.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/menu/MainMenuItem.java
index 6777a7dfc..70f1cb4aa 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/menu/MainMenuItem.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/menu/MainMenuItem.java
@@ -6,23 +6,23 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /** A menu item that indicates whether it is the active item or not.
- * 
+ *
  * @author rjy7
  *
  */
 public class MainMenuItem extends MenuItem {
-    
+
     private static final Log log = LogFactory.getLog(MainMenuItem.class.getName());
 
     private boolean active;
-    
+
     public MainMenuItem(String linkText, String path, boolean active) {
         super(linkText, path);
         this.active = active;
     }
-     
+
     /* Template properties */
-    
+
     public boolean isActive() {
         return active;
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/menu/Menu.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/menu/Menu.java
index 51ca29a0b..4461a7cf4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/menu/Menu.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/menu/Menu.java
@@ -16,19 +16,19 @@ public class Menu extends BaseTemplateModel {
     private static final Log log = LogFactory.getLog(Menu.class.getName());
 
     protected List<MenuItem> items;
-    
-    public Menu() {  
+
+    public Menu() {
         items = new ArrayList<MenuItem>();
     }
-    
+
     public void addItem(String text, String path) {
         items.add(new MenuItem(text, path));
     }
-    
+
     /* Template properties */
-    
+
     public List<MenuItem> getItems() {
         return items;
-    }  
-    
+    }
+
 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/menu/MenuItem.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/menu/MenuItem.java
index f4dbc2333..cbe723e77 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/menu/MenuItem.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/menu/MenuItem.java
@@ -10,32 +10,32 @@ import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel;
 public class MenuItem extends BaseTemplateModel {
 
     private static final Log log = LogFactory.getLog(MenuItem.class.getName());
-    
+
     private final String text;
     private final String path;
     private boolean active;
-    
+
     public MenuItem(String linkText, String path) {
         text = linkText;
         this.path = path;
     }
-    
+
     public MenuItem(String linkText, String path, boolean active){
         this.text = linkText;
         this.path = path;
         this.active = active;
     }
-    
+
     /* Template properties */
-    
+
     public String getLinkText() {
-        return text; 
+        return text;
     }
-    
+
     public String getUrl() {
         return getUrl(path);
-    } 
-    
+    }
+
     public boolean getActive(){
         return active;
     }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/IndividualSearchResult.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/IndividualSearchResult.java
index 40813410f..df25eba9c 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/IndividualSearchResult.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/searchresult/IndividualSearchResult.java
@@ -82,4 +82,4 @@ public class IndividualSearchResult extends BaseTemplateModel {
             resultClass = clazz;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java
index 4a0ccf77b..239ee981a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java
@@ -32,22 +32,22 @@ import freemarker.core.Environment;
 import freemarker.template.TemplateModelException;
 
 /**
- * This is a widget to display a classgroups, 
+ * This is a widget to display a classgroups,
  * classes in classgroup, and indviduals in class.
- *  
+ *
  * @author bdc34
  *
  */
 public class BrowseWidget extends Widget {
     final static Log log = LogFactory.getLog(BrowseWidget.class);
-    
+
     @Override
     protected WidgetTemplateValues process(Environment env, Map params,
-            HttpServletRequest request, ServletContext context) throws Exception 
+            HttpServletRequest request, ServletContext context) throws Exception
     {
         try{
         Mode mode = getMode( request, params );
-        switch( mode ){          
+        switch( mode ){
             case VCLASS_ALPHA:
                 return doClassAlphaDisplay(env,params,request,context);
             case CLASS_GROUP:
@@ -65,72 +65,72 @@ public class BrowseWidget extends Widget {
             return null;
         }
     }
-    
+
     private WidgetTemplateValues doClassAlphaDisplay(Environment env,
             Map params, HttpServletRequest request, ServletContext context) throws Exception {
         Map<String,Object> body = new HashMap<String,Object>();
         body.putAll(getCommonValues(env,context));
         body.putAll(getClassAlphaValues(env,params,request,context));
-        
+
         String macroName = Mode.VCLASS_ALPHA.macroName;
         return new WidgetTemplateValues(macroName, body);
     }
 
     private Map<String,Object> getClassAlphaValues(Environment env, Map params, HttpServletRequest request, ServletContext context) throws Exception{
         Map<String,Object> map= new HashMap<String,Object>();
-        
+
         String classUri = getParam(Mode.VCLASS, request, params);
         VitroRequest vreq = new VitroRequest(request);
         VClass vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(classUri);
         map.put("class", new VClassTemplateModel(vclass));
-        
+
         ObjectNode vclassRes = JsonServlet.getSearchIndividualsByVClass(vclass.getURI(), request);
         map.put("totalCount", JsonToFmModel.convertJSONObjectToMap( (ObjectNode) vclassRes.get("totalCount") ));
         map.put("alpha", JsonToFmModel.convertJSONObjectToMap( (ObjectNode) vclassRes.get("alpha") ));
         map.put("individuals", JsonToFmModel.convertJSONArrayToList( (ArrayNode) vclassRes.get("individuals") ));
         map.put("pages", JsonToFmModel.convertJSONArrayToList( (ArrayNode) vclassRes.get("pages") ));
         map.put("letters", JsonToFmModel.convertJSONArrayToList( (ArrayNode) vclassRes.get("letters") ));
-        
+
         return map;
     }
-    
+
     private Map<String,Object> getCommonValues(Environment env, ServletContext context){
         Map<String,Object> values = new HashMap<String,Object>();
         //values.putAll(VitroFreemarkerConfiguration.getDirectives());
         try {
             values.put("urls",env.getDataModel().get("urls"));
-            values.put("currentServlet", env.getDataModel().get("currentServlet"));            
+            values.put("currentServlet", env.getDataModel().get("currentServlet"));
         } catch (TemplateModelException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
         }
         return values;
     }
-    
+
     protected WidgetTemplateValues doAllClassGroupsDisplay(Environment env, Map params,
-            HttpServletRequest request, ServletContext context) {        
+            HttpServletRequest request, ServletContext context) {
         Map<String,Object> body = new HashMap<String,Object>();
-        body.putAll(getCommonValues(env,context));        
+        body.putAll(getCommonValues(env,context));
         body.putAll(getAllClassGroupData(request, params, context));
-                
+
         String macroName = Mode.ALL_CLASS_GROUPS.macroName;
         return new WidgetTemplateValues(macroName, body);
     }
-   
+
     /**
      * Gets a list of all VClassGroups with vclasses with individual counts.
      */
     protected Map<String,Object> getAllClassGroupData(HttpServletRequest request, Map params, ServletContext context){
         Map<String,Object> map = new HashMap<String,Object>();
-                
+
         VitroRequest vreq = new VitroRequest(request);
-        
+
         VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(request);
         List<VClassGroup> cgList = vcgc.getGroups();
-        
+
 //        List<VClassGroup> classGroups =
 //            vreq.getWebappDaoFactory().getVClassGroupDao().getPublicGroupsWithVClasses();
-//        
+//
         LinkedList<VClassGroupTemplateModel> cgtmList = new LinkedList<VClassGroupTemplateModel>();
         for( VClassGroup classGroup : cgList){
             cgtmList.add( new VClassGroupTemplateModel( classGroup ));
@@ -138,30 +138,30 @@ public class BrowseWidget extends Widget {
         map.put("vclassGroupList",cgtmList);
         return map;
     }
-    
+
     protected WidgetTemplateValues doClassDisplay(Environment env, Map params,
-            HttpServletRequest request, ServletContext context) {                
+            HttpServletRequest request, ServletContext context) {
         Map<String,Object> body = new HashMap<String,Object>();
-        body.putAll(getCommonValues(env,context));        
+        body.putAll(getCommonValues(env,context));
         body.putAll(getClassData(request,params,context));
-            
+
         String macroName = Mode.VCLASS.macroName;
         return new WidgetTemplateValues(macroName, body);
     }
 
     private Map<String, Object> getClassData(HttpServletRequest request, Map params, ServletContext context) {
         Map<String,Object> map = new HashMap<String,Object>();
-        
+
         map.putAll(getClassGroupData(request, params,context));
-        
+
         String classUri = getParam(Mode.VCLASS, request, params);
         VitroRequest vreq = new VitroRequest(request);
         VClass vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(classUri);
         map.put("class", new VClassTemplateModel(vclass));
-        
+
         List<Individual> inds = vreq.getWebappDaoFactory().getIndividualDao()
             .getIndividualsByVClass(vclass);
-        
+
         List<ListedIndividual> tInds = new ArrayList<ListedIndividual>(inds.size());
         for( Individual ind : inds){
             tInds.add(ListedIndividualBuilder.build(ind, vreq));
@@ -174,43 +174,43 @@ public class BrowseWidget extends Widget {
     protected WidgetTemplateValues doClassGroupDisplay(Environment env,
             Map params, HttpServletRequest request, ServletContext context) {
         Map<String,Object> body = new HashMap<String,Object>();
-        body.putAll(getCommonValues(env,context));        
+        body.putAll(getCommonValues(env,context));
         body.putAll( getClassGroupData(request,params, context));
-   
+
         String macroName = Mode.CLASS_GROUP.macroName;
         return new WidgetTemplateValues(macroName, body);
-    } 
-        
+    }
+
     protected Map<String, Object> getClassGroupData(HttpServletRequest request, Map params, ServletContext context) {
         Map<String,Object> map = new HashMap<String,Object>();
-        
+
         String vcgUri = getParam(Mode.CLASS_GROUP, request, params);
-        VitroRequest vreq = new VitroRequest(request);        
+        VitroRequest vreq = new VitroRequest(request);
         //VClassGroup vcg = vreq.getWebappDaoFactory().getVClassGroupDao().getGroupByURI(vcgUri);
-        
+
         VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(request);
-        VClassGroup vcg = vcgc.getGroup(vcgUri);        
-        
+        VClassGroup vcg = vcgc.getGroup(vcgUri);
+
         //vreq.getWebappDaoFactory().getVClassDao().addVClassesToGroup(vcg, false, true);
         ArrayList<VClassTemplateModel> classes = new ArrayList<VClassTemplateModel>(vcg.size());
         for( VClass vc : vcg){
             classes.add(new VClassTemplateModel(vc));
         }
         map.put("classes", classes);
-        
+
         map.put("classGroup", new VClassGroupTemplateModel(vcg));
         map.put("classGroupName", vcg.getPublicName());
         map.put("classGroupUri", vcg.getURI());
-        
+
         return map;
     }
-    
+
     enum Mode{
         VCLASS_ALPHA("vclassAlpha","vclassAlpha"),
         VCLASS("vclass","vclassUri"),
         CLASS_GROUP("classGroup","classgroupUri"),
-        ALL_CLASS_GROUPS("allClassGroups","all");                
-        
+        ALL_CLASS_GROUPS("allClassGroups","all");
+
         String macroName;
         String param;
         Mode(String macroName, String param){
@@ -218,9 +218,9 @@ public class BrowseWidget extends Widget {
             this.param = param;
         }
     }
-    
+
     protected final static Mode DEFAULT_MODE = Mode.ALL_CLASS_GROUPS;
-    
+
     protected Mode getMode(HttpServletRequest request, Map params){
         for( Mode mode : Mode.values()){
             String queryParam = request.getParameter( mode.param );
@@ -232,10 +232,10 @@ public class BrowseWidget extends Widget {
             if( param != null && !param.isEmpty() ){
                 return mode;
             }
-        }                
-        return DEFAULT_MODE;        
+        }
+        return DEFAULT_MODE;
     }
-    
+
     protected String getParam(Mode mode, HttpServletRequest request, Map params){
         if( request.getParameter(mode.param) != null )
             return request.getParameter(mode.param);
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/widgets/DateTimeWidget.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/widgets/DateTimeWidget.java
index 52243c248..c91df7db4 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/widgets/DateTimeWidget.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/widgets/DateTimeWidget.java
@@ -12,9 +12,9 @@ import freemarker.core.Environment;
 /**
  * This widget is intended to assist in dealing with xsd:dateTime values from
  * Literals.
- * 
+ *
  *  It is intended to be used like this:
- *  
+ *
  *  {@code
  *  <@widget name="DateTime" dateTime="2010-11-23T11:03:23" >
  *    The year is ${year}
@@ -22,10 +22,10 @@ import freemarker.core.Environment;
  *    The day is ${day}
  *    The hour is ${hour}
  *    The second is ${second}
- *    precision of date entered: ${precisionUri}    
+ *    precision of date entered: ${precisionUri}
  *  </@widget>
  *  }
- *  
+ *
  * @author bdc34
  *
  */
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java
index 5b6d1d882..bca4731b6 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java
@@ -35,9 +35,9 @@ public class LoginWidget extends Widget {
         FORCE_PASSWORD_CHANGE("forcePasswordChange"),
         ALREADY_LOGGED_IN("alreadyLoggedIn"),
         SERVER_ERROR("error");
-        
+
         private final String macroName;
-        
+
         Macro(String macroName) {
             this.macroName = macroName;
         }
@@ -46,7 +46,7 @@ public class LoginWidget extends Widget {
 		public String toString() {
             return macroName;
         }
-        
+
     }
 
     private static enum TemplateVariable {
@@ -62,7 +62,7 @@ public class LoginWidget extends Widget {
     	MAXIMUM_PASSWORD_LENGTH("maximumPasswordLength");
 
         private final String variableName;
-        
+
         TemplateVariable(String variableName) {
             this.variableName = variableName;
         }
@@ -71,22 +71,22 @@ public class LoginWidget extends Widget {
 		public String toString() {
             return variableName;
         }
-        
+
     }
 
     @Override
     protected WidgetTemplateValues process(Environment env, Map params,
             HttpServletRequest request, ServletContext context) {
-        
+
         WidgetTemplateValues values = null;
-  
+
         try {
-           
+
             State state = getCurrentLoginState(request);
             log.debug("State on exit: " + state);
-            
+
             TemplateHashModel dataModel = env.getDataModel();
-            
+
             switch (state) {
             case LOGGED_IN:
                 // On the login page itself, show a message that the user is already logged in.
@@ -104,22 +104,22 @@ public class LoginWidget extends Widget {
             default:
                 values = showLoginScreen(request, dataModel.get("siteName").toString());
             }
-            
+
             values.put("urls", dataModel.get("urls"));
             values.put("currentServlet", dataModel.get("currentServlet"));
-            
+
             @SuppressWarnings("unchecked")
-            Map<String, Object> dm = (Map<String, Object>) DeepUnwrap.permissiveUnwrap(dataModel);     
-            User user =  (User) dm.get("user");   
-            values.put("user", user); 
-            
+            Map<String, Object> dm = (Map<String, Object>) DeepUnwrap.permissiveUnwrap(dataModel);
+            User user =  (User) dm.get("user");
+            values.put("user", user);
+
         } catch (Exception e) {
             log.error(e, e);
             // This widget should display an error message rather than throwing the exception
             // up to the doMarkup() method, which would result in no display.
             values = showError(e);
-        } 
-        
+        }
+
         return values;
 
     }
@@ -134,7 +134,7 @@ public class LoginWidget extends Widget {
         WidgetTemplateValues values = new WidgetTemplateValues(Macro.LOGIN.toString());
         values.put(TemplateVariable.FORM_ACTION.toString(), getAuthenticateUrl(request));
         values.put(TemplateVariable.LOGIN_NAME.toString(), bean.getUsername());
-        
+
 		boolean showExternalAuth = StringUtils.isNotBlank(
 				ConfigurationProperties.getBean(request).getProperty(
 						"externalAuth.netIdHeaderName"));
@@ -151,12 +151,12 @@ public class LoginWidget extends Widget {
         if (!errorMessage.isEmpty()) {
             values.put(TemplateVariable.ERROR_MESSAGE.toString(), errorMessage);
         }
-        
+
         values.put(TemplateVariable.SITE_NAME.toString(), siteName);
 
         return values;
     }
-    
+
     private WidgetTemplateValues showMessageToLoggedInUser(HttpServletRequest request) {
         return new WidgetTemplateValues(Macro.ALREADY_LOGGED_IN.toString());
     }
@@ -196,7 +196,7 @@ public class LoginWidget extends Widget {
     private State getCurrentLoginState(HttpServletRequest request) {
         if (LoginStatusBean.getBean(request).isLoggedIn()) {
             return State.LOGGED_IN;
-        } 
+        }
         if (isOutdatedLoginProcessBean(request)) {
         	LoginProcessBean.removeBean(request);
         }
@@ -205,8 +205,8 @@ public class LoginWidget extends Widget {
 
 	/**
 	 * A LoginProcessBean is outdated unless the the "in-process" flag is set in the
-	 * session. 
-	 * 
+	 * session.
+	 *
 	 * Each time we hit Authenticate, the flag is set, and each time
 	 * we draw the widget it is reset.
 	 */
@@ -215,13 +215,13 @@ public class LoginWidget extends Widget {
 		if (!inProcess) {
 			log.debug("The process bean is outdated. Discard it.");
 		}
-		
+
 		return !inProcess;
 	}
 
 	/** What's the URL for this servlet? */
     private String getAuthenticateUrl(HttpServletRequest request) {
-        String contextPath = request.getContextPath();   
+        String contextPath = request.getContextPath();
         return contextPath + "/authenticate";
     }
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/widgets/Widget.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/widgets/Widget.java
index 37297e39d..7daf6fcbc 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/widgets/Widget.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/widgets/Widget.java
@@ -25,24 +25,24 @@ import freemarker.template.TemplateModelException;
 public abstract class Widget {
 
     private static final Log log = LogFactory.getLog(Widget.class);
-    
-    /* Widget implementations don't get any state when they get constructed so that they 
+
+    /* Widget implementations don't get any state when they get constructed so that they
      * can be reused. */
     public Widget() { }
-    
+
     public String doAssets(Environment env, Map params) {
         String widgetName = params.get("name").toString(); //getWidgetName();
         Macro assetsMacro = getMacroFromTemplate(getAssetsMacroName(), widgetName, env);
-        
+
         // Allow there to be no assets macro in the template
         if (assetsMacro == null) {
             return "";
         }
-        TemplateHashModel dataModel = env.getDataModel();  
-        Map<String, Object> map = new HashMap<String, Object>(); 
-        
+        TemplateHashModel dataModel = env.getDataModel();
+        Map<String, Object> map = new HashMap<String, Object>();
+
         try {
-            // Once we remove portals, we can define these as Configuration shared variables. Then the 
+            // Once we remove portals, we can define these as Configuration shared variables. Then the
             // templates will automatically get these and we don't have to add them to the data model.
             map.put("stylesheets", dataModel.get("stylesheets"));
             map.put("scripts", dataModel.get("scripts"));
@@ -52,22 +52,22 @@ public abstract class Widget {
         } catch (TemplateModelException e) {
             log.error("Error getting asset values from data model.");
         }
-        
-        return processMacroToString(env, widgetName, assetsMacro, map); 
+
+        return processMacroToString(env, widgetName, assetsMacro, map);
     }
-    
+
     public String doMarkup(Environment env, Map params) {
         HttpServletRequest request = (HttpServletRequest) env.getCustomAttribute("request");
         ServletContext context = request.getSession().getServletContext();
-        
+
         WidgetTemplateValues values = null;
-        
+
         try {
-            values = process(env, params, request, context); 
+            values = process(env, params, request, context);
         } catch (Exception e) {
             log.error(e, e);
         }
-        
+
         // The widget process() method may determine that nothing should display for the widget:
         // for example, the login widget doesn't display if the user is already logged in. This also
         // applies if process() threw an error.
@@ -82,12 +82,12 @@ public abstract class Widget {
     protected String getTemplateName(String widgetName) {
         return "widget-" + widgetName + ".ftl";
     }
-    
+
     // Default assets macro name. Can be overridden by subclasses.
     protected String getAssetsMacroName() {
         return "assets";
     }
-    
+
     // Default markup macro name. Can be overridden by subclasses, or
     // subclass process() method can select from various markup macros
     // based on widget state. For example, the login widget markup macro will
@@ -95,7 +95,7 @@ public abstract class Widget {
     protected String getMarkupMacroName() {
         return "markup";
     }
- 
+
 //    private String getWidgetName() {
 //        String name = this.getClass().getName();
 //        name= name.replaceAll(".*\\.", "");
@@ -104,12 +104,12 @@ public abstract class Widget {
 //        return name;
 //    }
 
-    protected abstract WidgetTemplateValues process(Environment env, Map params, 
+    protected abstract WidgetTemplateValues process(Environment env, Map params,
             HttpServletRequest request, ServletContext context) throws Exception;
-    
-    private String processMacroToString(Environment env, String widgetName, Macro macro, Map<String, Object> map) {   
+
+    private String processMacroToString(Environment env, String widgetName, Macro macro, Map<String, Object> map) {
         StringWriter out = new StringWriter();
-        
+
         try {
             String templateString = macro.getChildNodes().get(0).toString();
             // NB Using this method of creating a template from a string does not allow the widget template to import
@@ -118,27 +118,27 @@ public abstract class Widget {
             // The problem is that the StringTemplateLoader has to be added to the config's MultiTemplateLoader.
             // Then to support multi-threading, we can't just add the widget here to the StringTemplateLoader with
             // the same key, e.g., "widgetTemplate", since one putTemplate() call will clobber a previous one.
-            // We need to give each widget macro template a unique key in the StringTemplateLoader, and check 
+            // We need to give each widget macro template a unique key in the StringTemplateLoader, and check
             // if it's already there or else add it. Leave this for later.
             Template template = new Template("widget", new StringReader(templateString), env.getConfiguration());
             template.process(map, out);
         } catch (Exception e) {
             log.error("Could not process widget " + widgetName, e);
         }
-        String output = out.toString(); 
+        String output = out.toString();
         log.debug("Macro output: " + output);
-        return output;       
+        return output;
     }
-    
+
     private String processMacroToString(Environment env, String widgetName, String macroName, Map<String, Object> map) {
         Macro macro = getMacroFromTemplate(macroName, widgetName, env);
         return processMacroToString(env, widgetName, macro, map);
     }
-    
+
     private String processMacroToString(Environment env, String widgetName, WidgetTemplateValues values) {
         return processMacroToString(env, widgetName, values.getMacroName(), values.getMap());
     }
-    
+
     private Macro getMacroFromTemplate(String macroName, String widgetName, Environment env) {
         String templateName = getTemplateName(widgetName);
         Template template = null;
@@ -148,19 +148,19 @@ public abstract class Widget {
             macro = (Macro)template.getMacros().get(macroName);
         } catch (IOException e) {
             log.error("Cannot get template " + templateName);
-        }  
+        }
         return macro;
     }
-    
+
     protected static class WidgetTemplateValues {
         private final String macroName;
         private final Map<String, Object> map;
 
         public WidgetTemplateValues(String macroName) {
             this.macroName = macroName;
-            this.map = new HashMap<String, Object>();            
+            this.map = new HashMap<String, Object>();
         }
-        
+
         public WidgetTemplateValues(String macroName, Map<String, Object> map) {
             this.macroName = macroName;
             this.map = map;
@@ -177,9 +177,9 @@ public abstract class Widget {
 
         public String getMacroName() {
             return this.macroName;
-        } 
+        }
     }
-    
+
     protected class WidgetProcessingException extends Exception {
         WidgetProcessingException(String message) {
             super(message);
diff --git a/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetController.java b/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetController.java
index d0155fb92..8c690453c 100644
--- a/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetController.java
+++ b/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetController.java
@@ -20,10 +20,10 @@ import javax.servlet.annotation.WebServlet;
 
 @WebServlet(name = "GadgetController", urlPatterns = {"/orng/*"})
 public class GadgetController extends FreemarkerHttpServlet {
-	
+
     private static final long serialVersionUID = 1L;
     private static final Log log = LogFactory.getLog(GadgetController.class);
-	
+
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) {
     	if ("/clearcache".equalsIgnoreCase(vreq.getPathInfo())) {
@@ -41,13 +41,13 @@ public class GadgetController extends FreemarkerHttpServlet {
     	else {
     		return processGadgetDetails(vreq);
     	}
-    }    	
+    }
 
     protected ResponseValues processGadgetDetails(VitroRequest vreq) {
     	try {
 	        Map<String, Object> body = new HashMap<String, Object>();
 
-            body.put("title", "Gadget Details");            
+            body.put("title", "Gadget Details");
 	        // VIVO OpenSocial Extension by UCSF
 	        try {
 		        OpenSocialManager openSocialManager = new OpenSocialManager(vreq, "gadgetDetails");
@@ -59,20 +59,20 @@ public class GadgetController extends FreemarkerHttpServlet {
 	            log.error("IOException in doTemplate()", e);
 	        } catch (SQLException e) {
 	            log.error("SQLException in doTemplate()", e);
-	        }	               
-	        
+	        }
+
 	        return new TemplateResponseValues("gadgetDetails.ftl", body);
-        
+
 	    } catch (Throwable e) {
 	        log.error(e, e);
 	        return new ExceptionResponseValues(e);
 	    }
     }
-    
+
     @Override
     protected String getTitle(String siteName, VitroRequest vreq) {
     	return "Gadget Details";
-    }    
+    }
 
     protected ResponseValues processGadgetSandbox(VitroRequest vreq) {
     	if ("POST".equalsIgnoreCase(vreq.getMethod())) {
@@ -81,10 +81,10 @@ public class GadgetController extends FreemarkerHttpServlet {
 			vreq.getSession().setAttribute(OpenSocialManager.OPENSOCIAL_NOCACHE, vreq.getParameter("useCache") == null);
 			return new RedirectResponseValues("/");
     	}
-    	
+
         Map<String, Object> body = new HashMap<String, Object>();
-        body.put("title", "Gadget Sandbox");            
-        
+        body.put("title", "Gadget Sandbox");
+
         try {
 	        OpenSocialManager openSocialManager = new OpenSocialManager(vreq, "gadgetSandbox");
 	        StringBuilder gadgetURLS = new StringBuilder();
@@ -98,9 +98,9 @@ public class GadgetController extends FreemarkerHttpServlet {
             log.error("IOException in doTemplate()", e);
         } catch (SQLException e) {
             log.error("SQLException in doTemplate()", e);
-        }	               
-	        
-        
+        }
+
+
         return new TemplateResponseValues("gadgetLogin.ftl", body);
     }
 
diff --git a/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetSpec.java b/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetSpec.java
index 7534d2c14..43ab5d47e 100644
--- a/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetSpec.java
+++ b/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetSpec.java
@@ -133,13 +133,13 @@ public class GadgetSpec {
 	public boolean isEnabled() {
 		return enabled;
 	}
-	
+
 	// who sees it? Return the viewerReq for the ProfileDetails page
 	public char getVisibleScope() {
 		GadgetViewRequirements req = getGadgetViewRequirements("/display");
 		return req != null ? req.getViewerReq() : ' ';
 	}
-	
+
 	public String toString() {
 		return "" + this.appId + ":" + this.name + ":" + this.openSocialGadgetURL;
 	}
diff --git a/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialManager.java b/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialManager.java
index 15bd13630..3b4466afe 100644
--- a/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialManager.java
+++ b/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialManager.java
@@ -35,7 +35,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.individual.IndividualRequestI
 
 public class OpenSocialManager {
 	public static final String SHINDIG_URL_PROP = "OpenSocial.shindigURL";
-	
+
 	public static final String OPENSOCIAL_DEBUG = "OPENSOCIAL_DEBUG";
 	public static final String OPENSOCIAL_NOCACHE = "OPENSOCIAL_NOCACHE";
 	public static final String OPENSOCIAL_GADGETS = "OPENSOCIAL_GADGETS";
@@ -45,12 +45,12 @@ public class OpenSocialManager {
 	public static final String TAG_NAME = "openSocial";
 
 	private static final String DEFAULT_DRIVER = "com.mysql.jdbc.Driver";
-	
-    private static final Log log = LogFactory.getLog(OpenSocialManager.class);	
+
+    private static final Log log = LogFactory.getLog(OpenSocialManager.class);
 
 	// for performance
 	private static Map<String, GadgetSpec> gadgetCache;
-	
+
 	private List<PreparedGadget> gadgets = new ArrayList<PreparedGadget>();
 	private Map<String, String> pubsubdata = new HashMap<String, String>();
 	private String viewerId = null;
@@ -65,7 +65,7 @@ public class OpenSocialManager {
 	public OpenSocialManager(VitroRequest vreq, String pageName) throws SQLException, IOException {
 		this(vreq, pageName, false);
 	}
-	
+
 	public OpenSocialManager(VitroRequest vreq, String pageName, boolean editMode) throws SQLException, IOException {
 		this.isDebug = vreq.getSession() != null
 				&& Boolean.TRUE.equals(vreq.getSession().getAttribute(OPENSOCIAL_DEBUG));
@@ -101,7 +101,7 @@ public class OpenSocialManager {
 				this.viewerId = null;
 			}
 		}
-		
+
 		String requestAppId = vreq.getParameter("appId");
 
 		dataSource = new BasicDataSource();
@@ -117,19 +117,19 @@ public class OpenSocialManager {
 		Map<String, GadgetSpec> allDBGadgets = getAllDBGadgets(!noCache);
 
 		// Add sandbox gadgets if they are present
-		if (vreq.getSession() != null && vreq.getSession().getAttribute(OPENSOCIAL_GADGETS) != null) {		
+		if (vreq.getSession() != null && vreq.getSession().getAttribute(OPENSOCIAL_GADGETS) != null) {
 			gadgets = getSandboxGadgets(vreq, allDBGadgets, requestAppId);
 		}
-		else { 		
+		else {
 			// if no manual one were added, use the ones from the DB
 			for (GadgetSpec gadgetSpec : allDBGadgets.values()) {
 				// only add ones that are visible in this context!
 				int moduleId = 0;
 				if (
 						(
-								(requestAppId == null && gadgetSpec.isEnabled()) || 
+								(requestAppId == null && gadgetSpec.isEnabled()) ||
 								(requestAppId != null && gadgetSpec.getAppId() ==  Integer.parseInt(requestAppId))
-						) && 
+						) &&
 						gadgetSpec.show(viewerId, ownerId, pageName, dataSource)
 						) {
 					String securityToken = socketSendReceive(viewerId, ownerId, "" + gadgetSpec.getAppId());
@@ -141,7 +141,7 @@ public class OpenSocialManager {
 		// sort the gadgets
 		Collections.sort(gadgets);
 	}
-	
+
 	public static void clearCache() {
 		gadgetCache = null;
 	}
@@ -153,7 +153,7 @@ public class OpenSocialManager {
 		Individual owner = requestInfo.getIndividual();
 		return owner != null ? owner.getURI() : null;
 	}
-	
+
 	private String getGadgetFileNameFromURL(String url) {
 		String[] urlbits = url.split("/");
 		return urlbits[urlbits.length - 1];
@@ -202,7 +202,7 @@ public class OpenSocialManager {
 		json.put("personIds", persons);
 		return json.toString();
 	}
-	
+
 	public static String buildJSONPersonIds(String personId, String message) {
 		List<String> personIds = new ArrayList<String>();
 		personIds.add(personId);
@@ -296,7 +296,7 @@ public class OpenSocialManager {
 			String xtraId1Type, String xtraId1Value) throws SQLException {
 		String sqlCommand = "INSERT INTO orng_activity (userId, activity, xtraId1Type, xtraId1Value) VALUES ('"
 				+ userId +  "','<activity xmlns=\"http://ns.opensocial.org/2008/opensocial\"><postedTime>"
-				+ System.currentTimeMillis() + "</postedTime><title>" + title + "</title>" 
+				+ System.currentTimeMillis() + "</postedTime><title>" + title + "</title>"
 				+ (body != null ? "<body>" + body + "</body>" : "") + "</activity>','"
 				+ xtraId1Type + "','" + xtraId1Value + "');";
 
@@ -314,7 +314,7 @@ public class OpenSocialManager {
 		// Shindig
 		String[] tokenService = configuration.getProperty(
 				"OpenSocial.tokenService").split(":");
-		String request = "c=default" + (viewer != null ? "&v=" + URLEncoder.encode(viewer, "UTF-8") : "") + 
+		String request = "c=default" + (viewer != null ? "&v=" + URLEncoder.encode(viewer, "UTF-8") : "") +
 				(owner != null ? "&o=" + URLEncoder.encode(owner, "UTF-8") : "") + "&g=" + gadget + "\r\n";
 
 		// Create a socket connection with the specified server and port.
@@ -336,7 +336,7 @@ public class OpenSocialManager {
 
 		return page.toString();
 	}
-	
+
 	public String getContainerJavascriptSrc() {
 		return configuration.getProperty(SHINDIG_URL_PROP)
 				+ "/gadgets/js/core:dynamic-height:osapi:pubsub:rpc:views:rdf:shindig-container.js?c=1"
@@ -369,12 +369,12 @@ public class OpenSocialManager {
 
 		return gadgetScriptText.toString();
 	}
-	
-	Map<String, GadgetSpec> getAllDBGadgets(boolean useCache) throws SQLException 
+
+	Map<String, GadgetSpec> getAllDBGadgets(boolean useCache) throws SQLException
 	{
 		// great place to add cache
         // check cache first
-		Map<String, GadgetSpec> allDBGadgets = useCache ? gadgetCache : null;		
+		Map<String, GadgetSpec> allDBGadgets = useCache ? gadgetCache : null;
 		if (allDBGadgets == null) {
 			allDBGadgets = new HashMap<String, GadgetSpec>();
 			String sqlCommand = "select appId, name, url, channels, enabled from orng_apps";
@@ -402,10 +402,10 @@ public class OpenSocialManager {
 
 		return allDBGadgets;
 	}
-	
+
 	private List<PreparedGadget> getSandboxGadgets(VitroRequest vreq, Map<String, GadgetSpec> allDBGadgets, String requestAppId) throws SQLException, IOException {
 		List<PreparedGadget> sandboxGadgets = new ArrayList<PreparedGadget>();
-		// Note that this block of code only gets executed after someone fills in the 
+		// Note that this block of code only gets executed after someone fills in the
 		// gadget/sandbox form!
 		String openSocialGadgetURLS = (String) vreq.getSession()
 				.getAttribute(OPENSOCIAL_GADGETS);
@@ -446,6 +446,6 @@ public class OpenSocialManager {
 			}
 		}
 		return sandboxGadgets;
-		
+
 	}
 }
diff --git a/api/src/main/java/freemarker/ext/beans/WrapperExtractor.java b/api/src/main/java/freemarker/ext/beans/WrapperExtractor.java
index f35914141..041a3b33b 100644
--- a/api/src/main/java/freemarker/ext/beans/WrapperExtractor.java
+++ b/api/src/main/java/freemarker/ext/beans/WrapperExtractor.java
@@ -3,16 +3,16 @@
 package freemarker.ext.beans;
 
 /**
- * Class to extract wrapper used to wrap an object into a template model object. 
+ * Class to extract wrapper used to wrap an object into a template model object.
  * Used as workaround to gap in Freemarker template model API (can't get wrapper
  * for an arbitrary template model object).
  */
 public class WrapperExtractor {
-    
+
     public static BeansWrapper getWrapper(BeanModel model) {
         return model.wrapper;
     }
-    
+
     public static int getWrapperExposureLevel(BeanModel model) {
         return model.wrapper.getExposureLevel();
     }
diff --git a/api/src/main/java/freemarker/ext/dump/BaseDumpDirective.java b/api/src/main/java/freemarker/ext/dump/BaseDumpDirective.java
index 38b09dc13..3b061fbec 100644
--- a/api/src/main/java/freemarker/ext/dump/BaseDumpDirective.java
+++ b/api/src/main/java/freemarker/ext/dump/BaseDumpDirective.java
@@ -55,12 +55,12 @@ import freemarker.template.utility.DeepUnwrap;
 public abstract class BaseDumpDirective implements TemplateDirectiveModel {
 
     private static final Log log = LogFactory.getLog(BaseDumpDirective.class);
-    
-    private static final String TEMPLATE_DEFAULT = "dump.ftl";  // change to dump.ftl when old dump is removed  
+
+    private static final String TEMPLATE_DEFAULT = "dump.ftl";  // change to dump.ftl when old dump is removed
     private static final Pattern PROPERTY_NAME_PATTERN = Pattern.compile("^(get|is)\\w");
-    
+
     private ObjectWrapper defaultWrapper;
-    
+
     enum Key {
         CLASS("class"),
         DATE_TYPE("dateType"),
@@ -69,13 +69,13 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
         PROPERTIES("properties"),
         TYPE("type"),
         VALUE("value");
-    
+
         private final String key;
-        
+
         Key(String key) {
             this.key = key;
         }
-        
+
         public String toString() {
             return key;
         }
@@ -84,18 +84,18 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
     enum Value {
         NULL("[null]"),
         UNDEFINED("[undefined]");
-    
+
         private final String value;
-        
+
         Value(String value) {
             this.value = value;
         }
-        
+
         public String toString() {
             return value;
         }
     }
-    
+
     enum Type {
         BOOLEAN("Boolean"),
         COLLECTION("Collection"),
@@ -104,57 +104,57 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
         HASH("Hash"),
         // Technically it's a HashEx, but for the templates call it a Hash
         HASH_EX("Hash"), // ("HashEx")
-        METHOD("Method"),        
+        METHOD("Method"),
         NUMBER("Number"),
         SEQUENCE("Sequence"),
         STRING("String");
-        
+
         private final String type;
-        
+
         Type(String type) {
             this.type = type;
-        }        
-        
+        }
+
         public String toString() {
             return type;
-        }        
+        }
     }
-    
+
     enum DateType {
         DATE("Date"),
         DATETIME("DateTime"),
         TIME("Time"),
         UNKNOWN("Unknown");
-        
+
         private final String type;
-        
+
         DateType(String type) {
             this.type = type;
         }
 
         public String toString() {
             return type;
-        } 
+        }
     }
-    
-    protected Map<String, Object> getTemplateVariableDump(String varName, Environment env) 
+
+    protected Map<String, Object> getTemplateVariableDump(String varName, Environment env)
     throws TemplateModelException {
 
         defaultWrapper = env.getObjectWrapper();
         if (defaultWrapper == null) {
             defaultWrapper = env.getConfiguration().getObjectWrapper();
         }
-        
-        TemplateHashModel dataModel = env.getDataModel();       
+
+        TemplateHashModel dataModel = env.getDataModel();
         TemplateModel valueToDump = dataModel.get(varName);
         return getTemplateVariableDump(varName, valueToDump);
     }
 
-    protected Map<String, Object> getTemplateVariableDump(String varName, TemplateModel valueToDump) 
+    protected Map<String, Object> getTemplateVariableDump(String varName, TemplateModel valueToDump)
     throws TemplateModelException {
 
         Map<String, Object> value = new HashMap<String, Object>();
-        
+
         if (valueToDump == null) {
             value.put(Key.VALUE.toString(), Value.UNDEFINED.toString());
 
@@ -162,45 +162,45 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
         // included in the data model at the top level.
         } else if (valueToDump instanceof TemplateMethodModel) {
             value.putAll( getTemplateModelDump( ( TemplateMethodModel)valueToDump, varName ) );
-            
+
         } else if (valueToDump instanceof TemplateDirectiveModel) {
             value.putAll( getTemplateModelDump( ( TemplateDirectiveModel)valueToDump, varName ) );
-            
+
         } else {
             value.putAll(getDump(valueToDump));
         }
 
         Map<String, Object> dump = new HashMap<String, Object>();
         dump.put(varName, value);
-        return dump;        
+        return dump;
     }
 
     private Map<String, Object> getDump(TemplateModel valueToDump) throws TemplateModelException {
-        
+
         Map<String, Object> map = new HashMap<String, Object>();
-        
+
         // Don't return null if model == null. We still want to send the map to the template.
         if (valueToDump != null) {
-            
+
             if ( valueToDump instanceof TemplateSequenceModel ) {
                 if (valueToDump instanceof CollectionModel && ! ((CollectionModel)valueToDump).getSupportsIndexedAccess()) {
-                    map.putAll( getTemplateModelDump( (TemplateCollectionModel)valueToDump ) );                   
+                    map.putAll( getTemplateModelDump( (TemplateCollectionModel)valueToDump ) );
                 } else {
                     map.putAll( getTemplateModelDump( (TemplateSequenceModel)valueToDump ) );
                 }
-                
+
             } else if ( valueToDump instanceof TemplateNumberModel ) {
                 map.putAll( getTemplateModelDump( (TemplateNumberModel)valueToDump ) );
-                
+
             } else if ( valueToDump instanceof TemplateBooleanModel ) {
                 map.putAll( getTemplateModelDump( (TemplateBooleanModel)valueToDump ) );
 
-            } else if ( valueToDump instanceof TemplateDateModel ) { 
+            } else if ( valueToDump instanceof TemplateDateModel ) {
                 map.putAll( getTemplateModelDump( (TemplateDateModel)valueToDump ) );
 
             } else if ( valueToDump instanceof TemplateCollectionModel ) {
                 map.putAll( getTemplateModelDump( (TemplateCollectionModel)valueToDump ) );
-                
+
             } else if ( valueToDump instanceof StringModel ) {
                 // A StringModel can wrap either a String or a plain Java object.
                 // Unwrap it to figure out what to do.
@@ -211,18 +211,18 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
                 } else {
                     map.putAll( getTemplateModelDump( (TemplateHashModelEx)valueToDump ) );
                 }
-             
+
             } else if ( valueToDump instanceof TemplateScalarModel ) {
                     map.putAll( getTemplateModelDump( (TemplateScalarModel)valueToDump ) );
 
             } else if ( valueToDump instanceof TemplateHashModelEx ) {
                 map.putAll( getTemplateModelDump( (TemplateHashModelEx)valueToDump ) );
-                
+
             } else if  (valueToDump instanceof TemplateHashModel ) {
                 map.putAll( getTemplateModelDump( (TemplateHashModel)valueToDump ) );
 
-            // Nodes and transforms not included here     
-                
+            // Nodes and transforms not included here
+
             } else {
                 // We shouldn't get here; provide as a safety net.
                 map.putAll( getTemplateModelDump( (TemplateModel)valueToDump ) );
@@ -230,17 +230,17 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
         } else {
             map.put(Key.VALUE.toString(), Value.NULL.toString());
         }
-        
+
         return map;
-    }    
-    
+    }
+
     private Map<String, Object> getTemplateModelDump(TemplateScalarModel model) throws TemplateModelException {
         Map<String, Object> map = new HashMap<String, Object>();
         map.put(Key.TYPE.toString(), Type.STRING);
         map.put(Key.VALUE.toString(), model.getAsString());
         return map;
     }
-    
+
     private Map<String, Object> getTemplateModelDump(TemplateBooleanModel model) throws TemplateModelException {
         Map<String, Object> map = new HashMap<String, Object>();
         map.put(Key.TYPE.toString(), Type.BOOLEAN);
@@ -254,7 +254,7 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
         map.put(Key.VALUE.toString(), model.getAsNumber());
         return map;
     }
-    
+
     private Map<String, Object> getTemplateModelDump(TemplateDateModel model) throws TemplateModelException {
         Map<String, Object> map = new HashMap<String, Object>();
         map.put(Key.TYPE.toString(), Type.DATE);
@@ -262,7 +262,7 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
 
         DateType type;
         switch (dateType) {
-        case TemplateDateModel.DATE: 
+        case TemplateDateModel.DATE:
             type = DateType.DATE;
             break;
         case TemplateDateModel.DATETIME:
@@ -275,7 +275,7 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
             type = DateType.UNKNOWN;
         }
         map.put(Key.DATE_TYPE.toString(), type);
-        
+
         map.put(Key.VALUE.toString(), model.getAsDate());
         return map;
     }
@@ -301,7 +301,7 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
         map.put(Key.VALUE.toString(), items);
         return map;
     }
-    
+
     private Map<String, Object> getTemplateModelDump(TemplateHashModelEx model) throws TemplateModelException {
         Object unwrappedModel = DeepUnwrap.permissiveUnwrap(model);
         // This seems to be the most reliable way of distinguishing a wrapped map from a wrapped object.
@@ -310,13 +310,13 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
         if ( unwrappedModel instanceof Map ) {
             return getMapDump(model);
         }
-        
+
          // Java objects are wrapped as TemplateHashModelEx-s.
         return getObjectDump(model, unwrappedModel);
     }
-    
-    private Map<String, Object> getMapDump(TemplateHashModelEx model) throws TemplateModelException {        
-        Map<String, Object> map = new HashMap<String, Object>();        
+
+    private Map<String, Object> getMapDump(TemplateHashModelEx model) throws TemplateModelException {
+        Map<String, Object> map = new HashMap<String, Object>();
         map.put(Key.TYPE.toString(), Type.HASH_EX);
         SortedMap<String, Object> items = new TreeMap<String, Object>();
         TemplateCollectionModel keys = model.keys();
@@ -324,7 +324,7 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
         while (iModel.hasNext()) {
             String key = iModel.next().toString();
             // Work around this oddity: model.object does not contain
-            // values for "empty" and "keys", but model.keys() does. 
+            // values for "empty" and "keys", but model.keys() does.
             if ("class".equals(key) || "empty".equals(key)) {
                 continue;
             }
@@ -335,74 +335,74 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
             // the dump should also expose them. I'm guessing that in most cases these
             // methods are not relevant to template authors.
             if (! (value instanceof TemplateMethodModel)) {
-                items.put(key, getDump(value)); 
-            } 
-            
-        }   
-        map.put(Key.VALUE.toString(), items);  
+                items.put(key, getDump(value));
+            }
+
+        }
+        map.put(Key.VALUE.toString(), items);
         return map;
     }
-    
+
     private Map<String, Object> getObjectDump(TemplateHashModelEx model, Object object) throws TemplateModelException {
         Map<String, Object> map = new HashMap<String, Object>();
         map.put(Key.TYPE.toString(), object.getClass().getName());
-        
+
         if( object instanceof java.lang.reflect.Method)
-            return map;                   
-        
+            return map;
+
         // Compile the collections of properties and methods available to the template
         SortedMap<String, Object> properties = new TreeMap<String, Object>();
         SortedMap<String, Object> methods = new TreeMap<String, Object>();
-        
+
         // keys() gets only values visible to template based on the BeansWrapper used.
         // Note: if the BeansWrapper exposure level > BeansWrapper.EXPOSE_PROPERTIES_ONLY,
         // keys() returns both method and property name for any available method with no
         // parameters: e.g., both name and getName(). We are going to eliminate the latter.
         TemplateCollectionModel keys = model.keys();
         TemplateModelIterator iModel = keys.iterator();
-        
+
         // Create a Set from keys so we can use the Set API.
         Set<String> keySet = new HashSet<String>();
         while (iModel.hasNext()) {
             String key = iModel.next().toString();
             keySet.add(key);
         }
-        
+
         if (keySet.size() > 0) {
-            
+
             Class<?> cls = object.getClass();
-            Method[] classMethods = cls.getMethods(); 
-    
+            Method[] classMethods = cls.getMethods();
+
             // Iterate through the methods rather than the keys, so that we can remove
             // some keys based on reflection on the methods. We also want to remove duplicates
             // like name/getName - we'll keep only the first form.
             for ( Method method : classMethods ) {
-    
-                if( "declaringClass".equals( method.getName() )) 
+
+                if( "declaringClass".equals( method.getName() ))
                         continue;
-                
+
                 // Eliminate methods declared on Object
                 // and other unusual places that can cause problems.
                 Class<?> c = method.getDeclaringClass();
-                
-                if (c == null || 
+
+                if (c == null ||
                     c.equals(java.lang.Object.class) ||
                     c.equals(java.lang.reflect.Constructor.class) ||
-                    c.equals(java.lang.reflect.Field.class )    ) 
+                    c.equals(java.lang.reflect.Field.class )    )
                     continue;
-                if( 
+                if(
                     c.getPackage().getName().startsWith("sun.") ||
                     c.getPackage().getName().startsWith("java.lang") ||
                     c.getPackage().getName().startsWith("java.security") )
-                    continue;                                
-                
+                    continue;
+
                 // Eliminate deprecated methods
                 if (method.isAnnotationPresent(Deprecated.class)) {
                     continue;
                 }
 
                 // Include only methods included in keys(). This factors in visibility
-                // defined by the model's BeansWrapper.                 
+                // defined by the model's BeansWrapper.
                 String methodName = method.getName();
 
                 Matcher matcher = PROPERTY_NAME_PATTERN.matcher(methodName);
@@ -410,9 +410,9 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
                 // as a property
                 if (matcher.find()) {
                     String propertyName = getPropertyName(methodName);
-                    
+
                     // The method is available as a property
-                    if (keySet.contains(propertyName)) {   
+                    if (keySet.contains(propertyName)) {
                         try{
                             TemplateModel value = model.get(propertyName);
                             properties.put(propertyName, getDump(value));
@@ -423,13 +423,13 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
                         continue;
                     }
                 }
-                
+
                 // Else look for the entire methodName in the key set, to include
-                // those that are exposed as methods rather than properties. 
-                if (keySet.contains(methodName)) {               
-                    String methodDisplayName = getMethodDisplayName(method);  
+                // those that are exposed as methods rather than properties.
+                if (keySet.contains(methodName)) {
+                    String methodDisplayName = getMethodDisplayName(method);
                     // If no arguments, invoke the method to get the result
-                    if ( methodDisplayName.endsWith("()") ) {                     
+                    if ( methodDisplayName.endsWith("()") ) {
                         SimpleMethodModel methodModel = (SimpleMethodModel)model.get(methodName);
                         try {
                             Object result = methodModel.exec(null);
@@ -437,7 +437,7 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
                             TemplateModel wrappedResult = wrapper.wrap(result);
                             methods.put(methodDisplayName, getDump(wrappedResult));
                         } catch (Exception e) {
-                            log.error(e, e);    
+                            log.error(e, e);
                         }
                     // Else display method name, parameter types, and return type
                     } else {
@@ -446,25 +446,25 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
                         if ( ! returnTypeName.equals("void") ) {
                             methodValue.put(Key.TYPE.toString(), returnTypeName);
                         }
-                        methods.put(methodDisplayName, methodValue);                           
-                    }                    
+                        methods.put(methodDisplayName, methodValue);
+                    }
                 }
-            }           
+            }
         }
-        
+
         Map<String, Object> objectValue = new HashMap<String, Object>(2);
         objectValue.put(Key.PROPERTIES.toString(), properties);
         objectValue.put(Key.METHODS.toString(), methods);
-    
+
         map.put(Key.VALUE.toString(), objectValue);
         return map;
     }
-    
+
     private ObjectWrapper getWrapper(TemplateHashModelEx model) {
         // Attempt to find the wrapper that this template model object was wrapped with.
         if (model instanceof BeanModel) {
             return WrapperExtractor.getWrapper((BeanModel)model);
-        // Otherwise return the wrapper defined for the Environment or Configuration, 
+        // Otherwise return the wrapper defined for the Environment or Configuration,
         // if there is one. Why can't we get the wrapper for any type of TemplateModel??
         } else if (defaultWrapper != null) {
             return defaultWrapper;
@@ -472,20 +472,20 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
             return new BeansWrapper();
         }
     }
-    
+
     private String getMethodDisplayName(Method method) {
         String methodName = method.getName();
         Class<?>[] paramTypes = method.getParameterTypes();
         List<String> paramTypeList = new ArrayList<String>(paramTypes.length);
-        if (paramTypes.length > 0) {           
+        if (paramTypes.length > 0) {
             for (Class<?> cls : paramTypes) {
                 paramTypeList.add(getSimpleTypeName(cls));
-            }            
-        } 
+            }
+        }
         methodName += "(" + StringUtils.join(paramTypeList, ", ") + ")";
-        return methodName;               
-    }    
-    
+        return methodName;
+    }
+
     private String getReturnTypeName(Method method) {
         Class<?> cls = method.getReturnType();
         Package pkg = cls.getPackage();
@@ -494,10 +494,10 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
             if (packageName.startsWith("java")) {
                 return getSimpleTypeName(cls);
             }
-        } 
+        }
         return cls.getName();
     }
-    
+
     private String getSimpleTypeName(Class<?> cls) {
         return cls.getSimpleName().replace("[]", "s");
     }
@@ -505,9 +505,9 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
     // Return the method name as it is represented in TemplateHashModelEx.keys()
     private String getPropertyName(String methodName) {
         String keyName = methodName.replaceAll("^(get|is)", "");
-        return StringUtils.uncapitalize(keyName);        
+        return StringUtils.uncapitalize(keyName);
     }
-    
+
     private Map<String, Object> getTemplateModelDump(TemplateCollectionModel model) throws TemplateModelException {
         Map<String, Object> map = new HashMap<String, Object>();
         map.put(Key.TYPE.toString(), Type.COLLECTION);
@@ -517,18 +517,18 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
             TemplateModel m = iModel.next();
             items.add(getDump(m));
         }
-        map.put(Key.VALUE.toString(), items);  
+        map.put(Key.VALUE.toString(), items);
         return map;
     }
-    
+
     private Map<String, Object> getTemplateModelDump(TemplateMethodModel model, String varName) throws TemplateModelException {
         Map<String, Object> map = new HashMap<String, Object>();
         map.put(Key.TYPE.toString(), Type.METHOD);
         map.put(Key.CLASS.toString(), model.getClass().getName());
-        map.put(Key.HELP.toString(), getHelp(model, varName));       
+        map.put(Key.HELP.toString(), getHelp(model, varName));
         return map;
     }
-    
+
     private Map<String, Object> getTemplateModelDump(TemplateDirectiveModel model, String varName) throws TemplateModelException {
         Map<String, Object> map = new HashMap<String, Object>();
         map.put(Key.TYPE.toString(), Type.DIRECTIVE);
@@ -536,7 +536,7 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
         map.put(Key.HELP.toString(), getHelp(model, varName));
         return map;
     }
-    
+
     @SuppressWarnings("unchecked")
     private Map<String, Object> getHelp(TemplateModel model, String varName) {
         if ( model instanceof TemplateMethodModel || model instanceof TemplateDirectiveModel ) {
@@ -552,7 +552,7 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
                 } catch (Exception e) {
                     log.error("Error invoking method help() on " + modelClass + " of class " + cls.getName());
                     return null;
-                } 
+                }
             } catch (NoSuchMethodException e) {
                 log.info("No help() method defined for " + modelClass + " of class " + cls.getName());
                 return null;
@@ -562,74 +562,74 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
             }
         }
         return null;
-    }   
-    
+    }
+
     private Map<String, Object> getTemplateModelDump(TemplateModel model) throws TemplateModelException {
         // One of the more specific cases should have applied. Track whether this actually occurs.
-        log.debug("Found template model of type " + model.getClass().getName()); 
+        log.debug("Found template model of type " + model.getClass().getName());
         Map<String, Object> map = new HashMap<String, Object>();
         Object unwrappedModel = DeepUnwrap.permissiveUnwrap(model);
         map.put(Key.TYPE.toString(), unwrappedModel.getClass().getName());
         map.put(Key.VALUE.toString(), unwrappedModel.toString());
-        return map;        
+        return map;
     }
-    
-    protected void dump(Map<String, Object> dump, Environment env, String title) 
+
+    protected void dump(Map<String, Object> dump, Environment env, String title)
     throws TemplateException, IOException {
         dump(dump, env, title, TEMPLATE_DEFAULT);
     }
-    
-    protected void dump(Map<String, Object> dump, Environment env, String title, String templateName) 
+
+    protected void dump(Map<String, Object> dump, Environment env, String title, String templateName)
     throws TemplateException, IOException {
-        
+
         // Wrap the dump in another map so the template has a handle to iterate through
         // the values: <#list dump?keys as key>...</#list>
         Map<String, Object> map = new HashMap<String, Object>();
-        
+
         //put the TemplateModel to be dumped at 'dumpValue'
         map.put("dumpValue", dump);
         map.put("title", title);
-        writeDump(map, env, templateName);      
+        writeDump(map, env, templateName);
     }
-    
-    protected void writeDump(Map<String, Object> map, Environment env, String templateName) 
-    throws TemplateException, IOException {        
-        
-        //bdc34: not sure what to do there to 
+
+    protected void writeDump(Map<String, Object> map, Environment env, String templateName)
+    throws TemplateException, IOException {
+
+        //bdc34: not sure what to do there to
         //get the scope from the env to this dump template, trying an ugly copy
-        map.putAll( toMap( env.getDataModel() )); 
-        
+        map.putAll( toMap( env.getDataModel() ));
+
         Template template = env.getConfiguration().getTemplate(templateName);
         StringWriter sw = new StringWriter();
-        template.process(map, sw);        
+        template.process(map, sw);
         Writer out = env.getOut();
         out.write(sw.toString());
-        
+
     }
 
     public Map<String, Object> help(String name) {
         return new HashMap<String, Object>();
     }
-    
+
     /**
      * Convert a Freemarker TemplateObject to a usable map.
-     * @throws TemplateModelException 
+     * @throws TemplateModelException
      */
     protected Map<? extends String, ? extends Object> toMap( Object hash ) throws TemplateModelException{
         Map<String,Object> outMap = new HashMap<String,Object>();
-        
+
         if( hash instanceof TemplateHashModelEx ){
             TemplateHashModelEx thme = (TemplateHashModelEx) hash;
-            for( String key : junkToStrings( thme.keys() )){                
+            for( String key : junkToStrings( thme.keys() )){
                 outMap.put(key, thme.get(key));
             }
         }else{
             log.error("Freemarker is passing odd objects to method toMap(): " + hash.getClass().getName());
         }
-        
+
         return outMap;
     }
-    
+
     protected List<String> junkToStrings( TemplateCollectionModel junk ){
         List<String> keys = new ArrayList<String>();
         try{
@@ -637,12 +637,12 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
             while( it.hasNext() ){
                 Object obj = it.next();
                 if( obj instanceof StringModel){
-                    keys.add( ((StringModel)obj).getAsString() ); 
+                    keys.add( ((StringModel)obj).getAsString() );
                 }else if( obj instanceof SimpleScalar ){
                     keys.add( ((SimpleScalar)obj).getAsString());
-                }else{                
+                }else{
                     log.error("Freemarker is setting keys to hashes as non-strings: " + obj.getClass().getName());
-                }                
+                }
             }
         }catch(Exception ex){
             log.error("Freemarker is messing with us",ex);
diff --git a/api/src/main/java/freemarker/ext/dump/DumpAllDirective.java b/api/src/main/java/freemarker/ext/dump/DumpAllDirective.java
index 88eaadd97..05ad6cc59 100644
--- a/api/src/main/java/freemarker/ext/dump/DumpAllDirective.java
+++ b/api/src/main/java/freemarker/ext/dump/DumpAllDirective.java
@@ -25,7 +25,7 @@ public class DumpAllDirective extends BaseDumpDirective {
 
     @SuppressWarnings("unused")
     private static final Log log = LogFactory.getLog(DumpDirective.class);
-    
+
     @SuppressWarnings("rawtypes")
     @Override
     public void execute(Environment env, Map params, TemplateModel[] loopVars,
@@ -34,13 +34,13 @@ public class DumpAllDirective extends BaseDumpDirective {
         if (params.size() != 0) {
             throw new TemplateModelException(
                 "The dumpAll directive doesn't allow parameters.");
-        }    
-        
+        }
+
         if (loopVars.length != 0) {
             throw new TemplateModelException(
                 "The dump directive doesn't allow loop variables.");
         }
-        
+
         if (body != null) {
             throw new TemplateModelException(
                 "The dump directive doesn't allow nested content.");
@@ -50,21 +50,21 @@ public class DumpAllDirective extends BaseDumpDirective {
         String title = "Template data model dump for " + env.getTemplate().getName();
         dump(dump, env, title);
     }
-    
+
     SortedMap<String, Object> getDataModelDump(Environment env) throws TemplateModelException {
         SortedMap<String, Object> dump = new TreeMap<String, Object>();
-        TemplateHashModel dataModel = env.getDataModel();  
+        TemplateHashModel dataModel = env.getDataModel();
         // Need to unwrap in order to iterate through the variables
         @SuppressWarnings("unchecked")
-        Map<String, Object> unwrappedDataModel = (Map<String, Object>) DeepUnwrap.permissiveUnwrap(dataModel);        
-        List<String> varNames = new ArrayList<String>(unwrappedDataModel.keySet());  
+        Map<String, Object> unwrappedDataModel = (Map<String, Object>) DeepUnwrap.permissiveUnwrap(dataModel);
+        List<String> varNames = new ArrayList<String>(unwrappedDataModel.keySet());
 
         for (String varName : varNames) {
             dump.putAll(getTemplateVariableDump(varName, dataModel.get(varName)));
         }
-        
+
         return dump;
-        
+
     }
 
     @Override
@@ -76,7 +76,7 @@ public class DumpAllDirective extends BaseDumpDirective {
         List<String> examples = new ArrayList<String>();
         examples.add("<@" + name + " />");
         map.put("examples", examples);
-        
+
         return map;
     }
 }
diff --git a/api/src/main/java/freemarker/ext/dump/DumpDirective.java b/api/src/main/java/freemarker/ext/dump/DumpDirective.java
index 6ff00ce55..a6af42cac 100644
--- a/api/src/main/java/freemarker/ext/dump/DumpDirective.java
+++ b/api/src/main/java/freemarker/ext/dump/DumpDirective.java
@@ -23,7 +23,7 @@ public class DumpDirective extends BaseDumpDirective {
 
     @SuppressWarnings("unused")
     private static final Log log = LogFactory.getLog(DumpDirective.class);
-    
+
     @SuppressWarnings("rawtypes")
     @Override
     public void execute(Environment env, Map params, TemplateModel[] loopVars,
@@ -37,39 +37,39 @@ public class DumpDirective extends BaseDumpDirective {
             throw new TemplateModelException(
                 "The dump directive doesn't allow nested content.");
         }
-        
+
         Object o = params.get("var");
-        
+
         if ( o == null) {
             throw new TemplateModelException(
                 "Must specify 'var' argument.");
-        }     
-        
+        }
+
         if ( !(o instanceof SimpleScalar)) {
             throw new TemplateModelException(
-               "Value of parameter 'var' must be a string.");     
+               "Value of parameter 'var' must be a string.");
         }
-        
-        String varName = o.toString(); //((SimpleScalar)o).getAsString();   
-        Map<String, Object> map = getTemplateVariableDump(varName, env); 
+
+        String varName = o.toString(); //((SimpleScalar)o).getAsString();
+        Map<String, Object> map = getTemplateVariableDump(varName, env);
         String title = "Template variable dump";
-        dump(map, env, title);   
+        dump(map, env, title);
     }
-    
+
     @Override
     public Map<String, Object> help(String name) {
         Map<String, Object> map = new LinkedHashMap<String, Object>();
-        
+
         map.put("effect", "Dumps the contents of a template variable.");
 
         Map<String, String> params = new HashMap<String, String>();
         params.put("var", "name of variable to dump");
         map.put("parameters", params);
-        
+
         List<String> examples = new ArrayList<String>();
         examples.add("<@" + name + " var=\"urls\" />");
         map.put("examples", examples);
-        
+
         return map;
 
     }
diff --git a/api/src/main/java/freemarker/ext/dump/HelpDirective.java b/api/src/main/java/freemarker/ext/dump/HelpDirective.java
index 27a2632d2..050487675 100644
--- a/api/src/main/java/freemarker/ext/dump/HelpDirective.java
+++ b/api/src/main/java/freemarker/ext/dump/HelpDirective.java
@@ -33,50 +33,50 @@ public class HelpDirective extends BaseDumpDirective {
             throw new TemplateModelException(
                 "The help directive doesn't allow nested content.");
         }
-        
+
         Object o = params.get("for");
-        
+
         if ( o == null) {
             throw new TemplateModelException(
                 "Must specify 'for' argument.");
         }
-        
+
         if ( !(o instanceof SimpleScalar)) {
             throw new TemplateModelException(
-               "Value of parameter 'for' must be a string.");     
+               "Value of parameter 'for' must be a string.");
         }
-        
-        String varName = o.toString(); //((SimpleScalar)o).getAsString();  
-        TemplateHashModel dataModel = env.getDataModel();    
+
+        String varName = o.toString(); //((SimpleScalar)o).getAsString();
+        TemplateHashModel dataModel = env.getDataModel();
         Object templateModel = dataModel.get(varName);
 
         if (! (templateModel instanceof TemplateMethodModel || templateModel instanceof TemplateDirectiveModel)) {
             throw new TemplateModelException(
-                "Value of parameter '" + varName + "' must be the name of a directive or method");            
+                "Value of parameter '" + varName + "' must be the name of a directive or method");
         }
 
         Map<String, Object> map = getTemplateVariableDump(varName, env);
-        
+
         String type = templateModel instanceof TemplateMethodModel ? "method" : "directive";
         String title = "Template " + type + " help";
-        dump(map, env, title);         
+        dump(map, env, title);
     }
-    
+
     @Override
     public Map<String, Object> help(String name) {
         Map<String, Object> map = new LinkedHashMap<String, Object>();
-        
+
         map.put("effect", "Outputs help for a directive or method.");
 
         Map<String, String> params = new HashMap<String, String>();
         params.put("for", "name of directive or method");
         map.put("parameters", params);
-        
+
         List<String> examples = new ArrayList<String>();
         examples.add("<@" + name + " for=\"dump\" />");
         examples.add("<@" + name + " for=\"profileUrl\" />");
         map.put("examples", examples);
-        
+
         return map;
     }
 
diff --git a/api/src/main/java/org/linkeddatafragments/config/ConfigReader.java b/api/src/main/java/org/linkeddatafragments/config/ConfigReader.java
index 3398965f0..385d31458 100644
--- a/api/src/main/java/org/linkeddatafragments/config/ConfigReader.java
+++ b/api/src/main/java/org/linkeddatafragments/config/ConfigReader.java
@@ -64,7 +64,7 @@ public class ConfigReader {
     /**
      * Gets the data source types.
      *
-     * @return a mapping of names of data source types to these types  
+     * @return a mapping of names of data source types to these types
      */
     public Map<String, IDataSourceType> getDataSourceTypes() {
         return dataSourceTypes;
@@ -90,7 +90,7 @@ public class ConfigReader {
 
     /**
      * Gets the base URL
-     * 
+     *
      * @return the base URL
      */
     public String getBaseURL() {
@@ -99,7 +99,7 @@ public class ConfigReader {
 
     /**
      * Loads a certain {@link IDataSourceType} class at runtime
-     * 
+     *
      * @param className IDataSourceType class
      * @return the created IDataSourceType object
      */
@@ -107,7 +107,7 @@ public class ConfigReader {
     {
         final Class<?> c;
         try {
-            c = Class.forName( className ); 
+            c = Class.forName( className );
         }
         catch ( ClassNotFoundException e ) {
             throw new IllegalArgumentException( "Class not found: " + className,
diff --git a/api/src/main/java/org/linkeddatafragments/datasource/AbstractRequestProcessor.java b/api/src/main/java/org/linkeddatafragments/datasource/AbstractRequestProcessor.java
index 6cfa14ef8..a046953f3 100644
--- a/api/src/main/java/org/linkeddatafragments/datasource/AbstractRequestProcessor.java
+++ b/api/src/main/java/org/linkeddatafragments/datasource/AbstractRequestProcessor.java
@@ -10,7 +10,7 @@ import org.linkeddatafragments.fragments.ILinkedDataFragmentRequest;
  */
 abstract public class AbstractRequestProcessor
     implements IFragmentRequestProcessor
-{ 
+{
     @Override
     public void close() {}
 
@@ -42,7 +42,7 @@ abstract public class AbstractRequestProcessor
 
     /**
      * Processes {@link ILinkedDataFragmentRequest}s
-     * 
+     *
      */
     abstract static protected class Worker
     {
@@ -51,10 +51,10 @@ abstract public class AbstractRequestProcessor
          * The  {@link ILinkedDataFragmentRequest} to process
          */
         public final ILinkedDataFragmentRequest request;
-        
+
         /**
          * Create a Worker
-         * 
+         *
          * @param request
          */
         public Worker( final ILinkedDataFragmentRequest request )
@@ -64,7 +64,7 @@ abstract public class AbstractRequestProcessor
 
         /**
          * Create the requested {@link ILinkedDataFragment}
-         * 
+         *
          * @return The ILinkedDataFragment
          * @throws IllegalArgumentException
          */
diff --git a/api/src/main/java/org/linkeddatafragments/datasource/AbstractRequestProcessorForTriplePatterns.java b/api/src/main/java/org/linkeddatafragments/datasource/AbstractRequestProcessorForTriplePatterns.java
index de8070b7d..579e8c5b8 100644
--- a/api/src/main/java/org/linkeddatafragments/datasource/AbstractRequestProcessorForTriplePatterns.java
+++ b/api/src/main/java/org/linkeddatafragments/datasource/AbstractRequestProcessorForTriplePatterns.java
@@ -67,7 +67,7 @@ public abstract class
      */
     abstract static protected class Worker<CTT,NVT,AVT>
         extends AbstractRequestProcessor.Worker
-    {        
+    {
 
         /**
          *
diff --git a/api/src/main/java/org/linkeddatafragments/datasource/DataSourceBase.java b/api/src/main/java/org/linkeddatafragments/datasource/DataSourceBase.java
index 45b669f6a..9fe34eed3 100644
--- a/api/src/main/java/org/linkeddatafragments/datasource/DataSourceBase.java
+++ b/api/src/main/java/org/linkeddatafragments/datasource/DataSourceBase.java
@@ -16,8 +16,8 @@ public abstract class DataSourceBase implements IDataSource {
     /**
      * Get the datasource description
      */
-    protected String description; 
-    
+    protected String description;
+
     /**
      * Create a base for a {@link IDataSource}
      *
@@ -31,7 +31,7 @@ public abstract class DataSourceBase implements IDataSource {
 
     /**
      * Get the datasource description
-     * 
+     *
      * @return
      */
     @Override
@@ -41,7 +41,7 @@ public abstract class DataSourceBase implements IDataSource {
 
     /**
      * Get the datasource title
-     * 
+     *
      * @return
      */
     @Override
diff --git a/api/src/main/java/org/linkeddatafragments/datasource/DataSourceFactory.java b/api/src/main/java/org/linkeddatafragments/datasource/DataSourceFactory.java
index 933cb707e..008c276cb 100644
--- a/api/src/main/java/org/linkeddatafragments/datasource/DataSourceFactory.java
+++ b/api/src/main/java/org/linkeddatafragments/datasource/DataSourceFactory.java
@@ -13,16 +13,16 @@ import org.linkeddatafragments.exceptions.UnknownDataSourceTypeException;
 public class DataSourceFactory {
     /**
      * Create a datasource using a JSON config
-     * 
+     *
      * @param config
      * @return datasource interface
-     * @throws DataSourceCreationException 
+     * @throws DataSourceCreationException
      */
     public static IDataSource create(JsonNode config) throws DataSourceCreationException {
         String title = config.get("title").asText();
         String description = config.get("description").asText();
         String typeName = config.get("type").asText();
-        
+
         JsonNode settings = config.get("settings");
 
         final IDataSourceType type = DataSourceTypesRegistry.getType(typeName);
diff --git a/api/src/main/java/org/linkeddatafragments/datasource/IDataSource.java b/api/src/main/java/org/linkeddatafragments/datasource/IDataSource.java
index 971e18422..11a6f5728 100644
--- a/api/src/main/java/org/linkeddatafragments/datasource/IDataSource.java
+++ b/api/src/main/java/org/linkeddatafragments/datasource/IDataSource.java
@@ -17,7 +17,7 @@ public interface IDataSource extends Closeable {
      * @return
      */
     public String getTitle();
-        
+
     /**
      *
      * @return
@@ -26,13 +26,13 @@ public interface IDataSource extends Closeable {
 
     /**
      * Returns a data source specific {@link IFragmentRequestParser}.
-     * @return 
+     * @return
      */
     IFragmentRequestParser getRequestParser();
 
     /**
      * Returns a data source specific {@link IFragmentRequestProcessor}.
-     * @return 
+     * @return
      */
     IFragmentRequestProcessor getRequestProcessor();
 }
diff --git a/api/src/main/java/org/linkeddatafragments/datasource/IDataSourceType.java b/api/src/main/java/org/linkeddatafragments/datasource/IDataSourceType.java
index 18a265ec4..51f46e4a6 100644
--- a/api/src/main/java/org/linkeddatafragments/datasource/IDataSourceType.java
+++ b/api/src/main/java/org/linkeddatafragments/datasource/IDataSourceType.java
@@ -13,17 +13,17 @@ public interface IDataSourceType
 {
     /**
      * Creates a data source of this type.
-     * 
+     *
      * @param title
      *        The title of the data source (as given in the config file).
-     * 
+     *
      * @param description
      *        The description of the data source (as given in the config file).
      *
      * @param settings
      *        The properties of the data source to be created; usually, these
-     *        properties are given in the config file of the LDF server. 
-     * @return  
+     *        properties are given in the config file of the LDF server.
+     * @return
      * @throws org.linkeddatafragments.exceptions.DataSourceCreationException
      */
     IDataSource createDataSource(final String title,
diff --git a/api/src/main/java/org/linkeddatafragments/datasource/index/IndexDataSource.java b/api/src/main/java/org/linkeddatafragments/datasource/index/IndexDataSource.java
index 90536702e..addc67e21 100644
--- a/api/src/main/java/org/linkeddatafragments/datasource/index/IndexDataSource.java
+++ b/api/src/main/java/org/linkeddatafragments/datasource/index/IndexDataSource.java
@@ -18,7 +18,7 @@ public class IndexDataSource extends DataSourceBase {
 
     /**
      * The request processor
-     * 
+     *
      */
     protected final IndexRequestProcessorForTPFs requestProcessor;
 
diff --git a/api/src/main/java/org/linkeddatafragments/datasource/index/IndexRequestProcessorForTPFs.java b/api/src/main/java/org/linkeddatafragments/datasource/index/IndexRequestProcessorForTPFs.java
index 35e632ab1..bcb50d5b1 100644
--- a/api/src/main/java/org/linkeddatafragments/datasource/index/IndexRequestProcessorForTPFs.java
+++ b/api/src/main/java/org/linkeddatafragments/datasource/index/IndexRequestProcessorForTPFs.java
@@ -85,7 +85,7 @@ public class IndexRequestProcessorForTPFs
 
         /**
          * Creates a Worker for the datasource index
-         * 
+         *
          * @param req
          */
         public Worker(
diff --git a/api/src/main/java/org/linkeddatafragments/datasource/tdb/JenaTDBDataSource.java b/api/src/main/java/org/linkeddatafragments/datasource/tdb/JenaTDBDataSource.java
index 58e35b3ae..fab13037a 100644
--- a/api/src/main/java/org/linkeddatafragments/datasource/tdb/JenaTDBDataSource.java
+++ b/api/src/main/java/org/linkeddatafragments/datasource/tdb/JenaTDBDataSource.java
@@ -17,7 +17,7 @@ public class JenaTDBDataSource extends DataSourceBase {
 
     /**
      * The request processor
-     * 
+     *
      */
     protected final JenaTDBBasedRequestProcessorForTPFs requestProcessor;
 
diff --git a/api/src/main/java/org/linkeddatafragments/exceptions/DataSourceCreationException.java b/api/src/main/java/org/linkeddatafragments/exceptions/DataSourceCreationException.java
index ea4924ecf..a576f8ed4 100644
--- a/api/src/main/java/org/linkeddatafragments/exceptions/DataSourceCreationException.java
+++ b/api/src/main/java/org/linkeddatafragments/exceptions/DataSourceCreationException.java
@@ -21,5 +21,5 @@ public class DataSourceCreationException extends DataSourceException {
      */
     public DataSourceCreationException(String datasourceName, String message) {
         super(datasourceName, "Could not create DataSource - " + message);
-    }  
+    }
 }
diff --git a/api/src/main/java/org/linkeddatafragments/exceptions/DataSourceException.java b/api/src/main/java/org/linkeddatafragments/exceptions/DataSourceException.java
index 2f5973de7..83713d05d 100644
--- a/api/src/main/java/org/linkeddatafragments/exceptions/DataSourceException.java
+++ b/api/src/main/java/org/linkeddatafragments/exceptions/DataSourceException.java
@@ -24,7 +24,7 @@ abstract public class DataSourceException extends Exception {
     public DataSourceException(String datasourceName, String message) {
         super("Error for datasource '" + datasourceName + "': " + message);
     }
-    
+
     /**
      *
      * @param datasource
@@ -33,5 +33,5 @@ abstract public class DataSourceException extends Exception {
     public DataSourceException(IDataSource datasource, String message) {
         this(datasource.getTitle(), message);
     }
-    
+
 }
diff --git a/api/src/main/java/org/linkeddatafragments/exceptions/DataSourceNotFoundException.java b/api/src/main/java/org/linkeddatafragments/exceptions/DataSourceNotFoundException.java
index 08dca003c..72604b3f3 100644
--- a/api/src/main/java/org/linkeddatafragments/exceptions/DataSourceNotFoundException.java
+++ b/api/src/main/java/org/linkeddatafragments/exceptions/DataSourceNotFoundException.java
@@ -12,5 +12,5 @@ public class DataSourceNotFoundException extends DataSourceException {
      */
     public DataSourceNotFoundException(String dataSourceName) {
         super(dataSourceName, "Datasource not found.");
-    }  
+    }
 }
diff --git a/api/src/main/java/org/linkeddatafragments/exceptions/NoRegisteredMimeTypesException.java b/api/src/main/java/org/linkeddatafragments/exceptions/NoRegisteredMimeTypesException.java
index ad278a64c..382bf23d4 100644
--- a/api/src/main/java/org/linkeddatafragments/exceptions/NoRegisteredMimeTypesException.java
+++ b/api/src/main/java/org/linkeddatafragments/exceptions/NoRegisteredMimeTypesException.java
@@ -2,7 +2,7 @@ package org.linkeddatafragments.exceptions;
 
 /**
  * Exception thrown when no mimeTypes are known to the system
- * 
+ *
  * @author Miel Vander Sande
  */
 public class NoRegisteredMimeTypesException extends Exception {
@@ -13,5 +13,5 @@ public class NoRegisteredMimeTypesException extends Exception {
     public NoRegisteredMimeTypesException() {
         super("List of supported mimeTypes is empty.");
     }
-    
+
 }
diff --git a/api/src/main/java/org/linkeddatafragments/exceptions/UnknownDataSourceTypeException.java b/api/src/main/java/org/linkeddatafragments/exceptions/UnknownDataSourceTypeException.java
index 1b631a09d..bccdde625 100644
--- a/api/src/main/java/org/linkeddatafragments/exceptions/UnknownDataSourceTypeException.java
+++ b/api/src/main/java/org/linkeddatafragments/exceptions/UnknownDataSourceTypeException.java
@@ -5,12 +5,12 @@ package org.linkeddatafragments.exceptions;
  * @author Miel Vander Sande
  */
 public class UnknownDataSourceTypeException extends DataSourceCreationException {
-    
+
     /**
      *
      * @param type
      */
     public UnknownDataSourceTypeException(String type) {
         super("", "Type " + type + " does not exist.");
-    } 
+    }
 }
diff --git a/api/src/main/java/org/linkeddatafragments/fragments/FragmentRequestParserBase.java b/api/src/main/java/org/linkeddatafragments/fragments/FragmentRequestParserBase.java
index 7d6c8b8c0..597465b20 100644
--- a/api/src/main/java/org/linkeddatafragments/fragments/FragmentRequestParserBase.java
+++ b/api/src/main/java/org/linkeddatafragments/fragments/FragmentRequestParserBase.java
@@ -56,7 +56,7 @@ abstract public class FragmentRequestParserBase implements IFragmentRequestParse
          *
          */
         public final long pageNumber;
-        
+
         /**
          *
          * @param request
@@ -67,7 +67,7 @@ abstract public class FragmentRequestParserBase implements IFragmentRequestParse
         {
             this.request = request;
             this.config = config;
-            
+
             final String givenPageNumber = request.getParameter(
                               ILinkedDataFragmentRequest.PARAMETERNAME_PAGE );
             if ( givenPageNumber != null ) {
@@ -123,7 +123,7 @@ abstract public class FragmentRequestParserBase implements IFragmentRequestParse
      * @param config
      * @return
      */
-    
+
     public static String extractBaseURL( final HttpServletRequest request,
                                          final ConfigReader config ) {
         if (config.getBaseURL() != null) {
diff --git a/api/src/main/java/org/linkeddatafragments/fragments/IFragmentRequestParser.java b/api/src/main/java/org/linkeddatafragments/fragments/IFragmentRequestParser.java
index 113621076..56c2a7ce2 100644
--- a/api/src/main/java/org/linkeddatafragments/fragments/IFragmentRequestParser.java
+++ b/api/src/main/java/org/linkeddatafragments/fragments/IFragmentRequestParser.java
@@ -17,10 +17,10 @@ public interface IFragmentRequestParser
      *
      * @param httpRequest
      * @param config
-     * @return 
+     * @return
      * @throws IllegalArgumentException
      *         If the given HTTP request cannot be interpreted (perhaps due to
-     *         missing request parameters).  
+     *         missing request parameters).
      */
     ILinkedDataFragmentRequest parseIntoFragmentRequest(
             final HttpServletRequest httpRequest,
diff --git a/api/src/main/java/org/linkeddatafragments/fragments/ILinkedDataFragment.java b/api/src/main/java/org/linkeddatafragments/fragments/ILinkedDataFragment.java
index 5fa14aa98..f97bc6e5c 100644
--- a/api/src/main/java/org/linkeddatafragments/fragments/ILinkedDataFragment.java
+++ b/api/src/main/java/org/linkeddatafragments/fragments/ILinkedDataFragment.java
@@ -14,7 +14,7 @@ public interface ILinkedDataFragment extends Closeable
     /**
      * Returns an iterator over the RDF data of this fragment (possibly only
      * partial if the data is paged, as indicated by {@link #isPageOnly()}).
-     * @return 
+     * @return
      */
     StmtIterator getTriples();
 
@@ -22,7 +22,7 @@ public interface ILinkedDataFragment extends Closeable
      * Returns true if {@link #getTriples()} returns a page of data only.
      * In this case, {@link #getPageNumber()} can be used to obtain the
      * corresponding page number.
-     * @return 
+     * @return
      */
     boolean isPageOnly();
 
@@ -32,9 +32,9 @@ public interface ILinkedDataFragment extends Closeable
      *
      * If the data is not paged, this method throws an exception.
      *
-     * @return 
+     * @return
      * @throws UnsupportedOperationException
-     *         If the data of this fragment is not paged. 
+     *         If the data of this fragment is not paged.
      */
     long getPageNumber() throws UnsupportedOperationException;
 
@@ -45,9 +45,9 @@ public interface ILinkedDataFragment extends Closeable
      * If the data is not paged (i.e., if {@link #isPageOnly()} returns false),
      * this method throws an exception.
      *
-     * @return 
+     * @return
      * @throws UnsupportedOperationException
-     *         If the data of this fragment is not paged. 
+     *         If the data of this fragment is not paged.
      */
     boolean isLastPage() throws UnsupportedOperationException;
 
@@ -58,22 +58,22 @@ public interface ILinkedDataFragment extends Closeable
      *
      * If the data is not paged, this method throws an exception.
      *
-     * @return 
+     * @return
      * @throws UnsupportedOperationException
-     *         If the data of this fragment is not paged. 
+     *         If the data of this fragment is not paged.
      */
     long getMaxPageSize() throws UnsupportedOperationException;
 
     /**
      * Returns an iterator over the metadata of this fragment.
-     * @return 
+     * @return
      */
     StmtIterator getMetadata();
 
     /**
      * Returns an iterator over an RDF description of the controls associated
      * with this fragment.
-     * @return 
+     * @return
      */
     StmtIterator getControls();
 }
diff --git a/api/src/main/java/org/linkeddatafragments/fragments/ILinkedDataFragmentRequest.java b/api/src/main/java/org/linkeddatafragments/fragments/ILinkedDataFragmentRequest.java
index ed9aa5df5..e658d17cd 100644
--- a/api/src/main/java/org/linkeddatafragments/fragments/ILinkedDataFragmentRequest.java
+++ b/api/src/main/java/org/linkeddatafragments/fragments/ILinkedDataFragmentRequest.java
@@ -20,13 +20,13 @@ public interface ILinkedDataFragmentRequest
 
     /**
      * Returns the URL of the requested LDF.
-     * @return 
+     * @return
      */
     String getFragmentURL();
 
     /**
      * Returns the URL of the dataset to which the requested LDF belongs.
-     * @return 
+     * @return
      */
     String getDatasetURL();
 
@@ -34,15 +34,15 @@ public interface ILinkedDataFragmentRequest
      * Returns true if the request is for a specific page of the requested
      * fragment. In this case, {@link #getPageNumber()} can be used to obtain
      * the requested page number.
-     * @return 
+     * @return
      */
     boolean isPageRequest();
 
     /**
      * Returns the number of the page requested for the LDF; if this is not a
      * page-based request (that is, if {@link #isPageRequest()} returns true),
-     * then this method returns 1. 
-     * @return 
+     * then this method returns 1.
+     * @return
      */
     long getPageNumber();
 }
diff --git a/api/src/main/java/org/linkeddatafragments/fragments/LinkedDataFragmentBase.java b/api/src/main/java/org/linkeddatafragments/fragments/LinkedDataFragmentBase.java
index 9ac16bd9b..693a01292 100644
--- a/api/src/main/java/org/linkeddatafragments/fragments/LinkedDataFragmentBase.java
+++ b/api/src/main/java/org/linkeddatafragments/fragments/LinkedDataFragmentBase.java
@@ -88,8 +88,8 @@ public abstract class LinkedDataFragmentBase implements ILinkedDataFragment
 
     /**
      * This implementation uses {@link #addMetadata(Model)}, which should be
-     * overridden in subclasses (instead of overriding this method). 
-     * @return 
+     * overridden in subclasses (instead of overriding this method).
+     * @return
      */
     @Override
     public StmtIterator getMetadata()
@@ -101,8 +101,8 @@ public abstract class LinkedDataFragmentBase implements ILinkedDataFragment
 
     /**
      * This implementation uses {@link #addControls(Model)}, which should be
-     * overridden in subclasses (instead of overriding this method). 
-     * @return 
+     * overridden in subclasses (instead of overriding this method).
+     * @return
      */
     @Override
     public StmtIterator getControls()
@@ -125,7 +125,7 @@ public abstract class LinkedDataFragmentBase implements ILinkedDataFragment
         datasetId.addProperty( CommonResources.RDF_TYPE, CommonResources.VOID_DATASET );
         datasetId.addProperty( CommonResources.RDF_TYPE, CommonResources.HYDRA_COLLECTION );
         datasetId.addProperty( CommonResources.VOID_SUBSET, fragmentId );
-        
+
         Literal itemsPerPage = model.createTypedLiteral(this.getMaxPageSize());
         datasetId.addProperty( CommonResources.HYDRA_ITEMSPERPAGE, itemsPerPage);
 
diff --git a/api/src/main/java/org/linkeddatafragments/fragments/LinkedDataFragmentRequestBase.java b/api/src/main/java/org/linkeddatafragments/fragments/LinkedDataFragmentRequestBase.java
index c53ae5a45..484f9d148 100644
--- a/api/src/main/java/org/linkeddatafragments/fragments/LinkedDataFragmentRequestBase.java
+++ b/api/src/main/java/org/linkeddatafragments/fragments/LinkedDataFragmentRequestBase.java
@@ -28,7 +28,7 @@ public abstract class LinkedDataFragmentRequestBase
      *
      */
     public final long pageNumber;
-    
+
     /**
      *
      * @param fragmentURL
diff --git a/api/src/main/java/org/linkeddatafragments/fragments/tpf/ITriplePatternElement.java b/api/src/main/java/org/linkeddatafragments/fragments/tpf/ITriplePatternElement.java
index 6c6d928aa..aa1c8a7fa 100644
--- a/api/src/main/java/org/linkeddatafragments/fragments/tpf/ITriplePatternElement.java
+++ b/api/src/main/java/org/linkeddatafragments/fragments/tpf/ITriplePatternElement.java
@@ -1,7 +1,7 @@
 package org.linkeddatafragments.fragments.tpf;
 
 /**
- * Represents an element of a triple pattern (i.e., subject, predicate, object). 
+ * Represents an element of a triple pattern (i.e., subject, predicate, object).
  *
  * @param <ConstantTermType> type for representing constants in triple patterns
  *                           (i.e., URIs and literals)
@@ -15,7 +15,7 @@ public interface ITriplePatternElement<ConstantTermType,NamedVarType,AnonVarType
 {
     /**
      * Returns true if this element is a variable (specific or unspecified).
-     * @return 
+     * @return
      */
     boolean isVariable();
 
@@ -25,7 +25,7 @@ public interface ITriplePatternElement<ConstantTermType,NamedVarType,AnonVarType
      * is not specified. The latter (unspecified variables) is possible because
      * when a client requests a triple pattern fragment, it may omit triple
      * pattern related parameters.
-     * @return 
+     * @return
      */
     boolean isSpecificVariable();
 
@@ -38,7 +38,7 @@ public interface ITriplePatternElement<ConstantTermType,NamedVarType,AnonVarType
      * If this element is a specific variable that has a name (that is, this
      * method returns true), the named variable can be obtained by the method
      * {@link #asNamedVariable()}.
-     * @return 
+     * @return
      */
     boolean isNamedVariable();
 
@@ -46,7 +46,7 @@ public interface ITriplePatternElement<ConstantTermType,NamedVarType,AnonVarType
      * Returns a representation of this element as a named variable (assuming
      * it is a specific variable that has a name).
      *
-     * @return 
+     * @return
      * @throws UnsupportedOperationException
      *         If this element is not a specific variable that has a name
      *         (i.e., if {@link #isNamedVariable()} returns false).
@@ -61,7 +61,7 @@ public interface ITriplePatternElement<ConstantTermType,NamedVarType,AnonVarType
      * If this element is a specific variable denoted by a blank node (that is,
      * this method returns true), the blank node can be obtained by the method
      * {@link #asAnonymousVariable()}.
-     * @return 
+     * @return
      */
     boolean isAnonymousVariable();
 
@@ -69,7 +69,7 @@ public interface ITriplePatternElement<ConstantTermType,NamedVarType,AnonVarType
      * Returns a representation of this element as a blank node (assuming
      * it is a specific, but non-named variable).
      *
-     * @return 
+     * @return
      * @throws UnsupportedOperationException
      *         If this element is not a specific anonymous variable (i.e.,
      *         if {@link #isAnonymousVariable()} returns false).
@@ -80,7 +80,7 @@ public interface ITriplePatternElement<ConstantTermType,NamedVarType,AnonVarType
      * Returns a representation of this element as a constant RDF term (i.e.,
      * a URI or a literal).
      *
-     * @return 
+     * @return
      * @throws UnsupportedOperationException
      *         If this element is not a constant RDF term but a variable
      *         (i.e., if {@link #isVariable()} returns true).
diff --git a/api/src/main/java/org/linkeddatafragments/fragments/tpf/ITriplePatternFragmentRequest.java b/api/src/main/java/org/linkeddatafragments/fragments/tpf/ITriplePatternFragmentRequest.java
index ae6d15107..139e61902 100644
--- a/api/src/main/java/org/linkeddatafragments/fragments/tpf/ITriplePatternFragmentRequest.java
+++ b/api/src/main/java/org/linkeddatafragments/fragments/tpf/ITriplePatternFragmentRequest.java
@@ -34,19 +34,19 @@ public interface ITriplePatternFragmentRequest<ConstantTermType,NamedVarType,Ano
 
     /**
      * Returns the subject position of the requested triple pattern.
-     * @return 
+     * @return
      */
     ITriplePatternElement<ConstantTermType,NamedVarType,AnonVarType> getSubject();
 
     /**
      * Returns the predicate position of the requested triple pattern.
-     * @return 
+     * @return
      */
     ITriplePatternElement<ConstantTermType,NamedVarType,AnonVarType> getPredicate();
 
     /**
      * Returns the object position of the requested triple pattern.
-     * @return 
+     * @return
      */
     ITriplePatternElement<ConstantTermType,NamedVarType,AnonVarType> getObject();
 }
diff --git a/api/src/main/java/org/linkeddatafragments/fragments/tpf/TPFRequestParser.java b/api/src/main/java/org/linkeddatafragments/fragments/tpf/TPFRequestParser.java
index 55270f251..c3df8f2fe 100644
--- a/api/src/main/java/org/linkeddatafragments/fragments/tpf/TPFRequestParser.java
+++ b/api/src/main/java/org/linkeddatafragments/fragments/tpf/TPFRequestParser.java
@@ -51,7 +51,7 @@ public class TPFRequestParser<ConstantTermType,NamedVarType,AnonVarType>
      *
      */
     protected class Worker extends FragmentRequestParserBase.Worker
-    {   
+    {
 
         /**
          *
diff --git a/api/src/main/java/org/linkeddatafragments/fragments/tpf/TriplePatternFragmentBase.java b/api/src/main/java/org/linkeddatafragments/fragments/tpf/TriplePatternFragmentBase.java
index 132e8ed98..8f66410c9 100644
--- a/api/src/main/java/org/linkeddatafragments/fragments/tpf/TriplePatternFragmentBase.java
+++ b/api/src/main/java/org/linkeddatafragments/fragments/tpf/TriplePatternFragmentBase.java
@@ -125,7 +125,7 @@ abstract public class TriplePatternFragmentBase extends LinkedDataFragmentBase
 
         predicateMapping.addProperty( CommonResources.HYDRA_VARIABLE, ITriplePatternFragmentRequest.PARAMETERNAME_PRED );
         predicateMapping.addProperty( CommonResources.HYDRA_PROPERTY, CommonResources.RDF_PREDICATE );
-        
+
         objectMapping.addProperty( CommonResources.HYDRA_VARIABLE, ITriplePatternFragmentRequest.PARAMETERNAME_OBJ );
         objectMapping.addProperty( CommonResources.HYDRA_PROPERTY, CommonResources.RDF_OBJECT );
     }
diff --git a/api/src/main/java/org/linkeddatafragments/servlet/LinkedDataFragmentServlet.java b/api/src/main/java/org/linkeddatafragments/servlet/LinkedDataFragmentServlet.java
index 3e7a27430..ef7785009 100644
--- a/api/src/main/java/org/linkeddatafragments/servlet/LinkedDataFragmentServlet.java
+++ b/api/src/main/java/org/linkeddatafragments/servlet/LinkedDataFragmentServlet.java
@@ -117,7 +117,7 @@ public class LinkedDataFragmentServlet extends HttpServlet {
             catch( Exception e ) {
                 // ignore
             }
-        }   
+        }
     }
 
     /**
@@ -165,12 +165,12 @@ public class LinkedDataFragmentServlet extends HttpServlet {
             response.setHeader("Server", "Linked Data Fragments Server");
             response.setContentType(bestMatch);
             response.setCharacterEncoding("utf-8");
-            
+
             // create a writer depending on the best matching mimeType
             ILinkedDataFragmentWriter writer = LinkedDataFragmentWriterFactory.create(config.getPrefixes(), dataSources, bestMatch);
-            
+
             try {
-            
+
                 final IDataSource dataSource = getDataSource( request );
 
                 final ILinkedDataFragmentRequest ldfRequest =
@@ -181,7 +181,7 @@ public class LinkedDataFragmentServlet extends HttpServlet {
                                   .createRequestedFragment( ldfRequest );
 
                 writer.writeFragment(response.getOutputStream(), dataSource, fragment, ldfRequest);
-            
+
             } catch (DataSourceNotFoundException ex) {
                 try {
                     response.setStatus(404);
@@ -193,7 +193,7 @@ public class LinkedDataFragmentServlet extends HttpServlet {
                 response.setStatus(500);
                 writer.writeError(response.getOutputStream(), e);
             }
-          
+
         } catch (Exception e) {
             throw new ServletException(e);
         }
diff --git a/api/src/main/java/org/linkeddatafragments/util/MIMEParse.java b/api/src/main/java/org/linkeddatafragments/util/MIMEParse.java
index a5fa7fcaa..1bbd4f934 100644
--- a/api/src/main/java/org/linkeddatafragments/util/MIMEParse.java
+++ b/api/src/main/java/org/linkeddatafragments/util/MIMEParse.java
@@ -14,33 +14,33 @@ import java.util.Map;
 
 /**
  * MIME-Type Parser
- * 
+ *
  * This class provides basic functions for handling mime-types. It can handle
  * matching mime-types against a list of media-ranges. See section 14.1 of the
  * HTTP specification [RFC 2616] for a complete explanation.
- * 
+ *
  * http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
- * 
+ *
  * A port to Java of Joe Gregorio's MIME-Type Parser:
- * 
+ *
  * http://code.google.com/p/mimeparse/
- * 
+ *
  * Ported by <a href="mailto:tzellman@gmail.com">Tom Zellman</a>.
  * Extended by <a href="mailto:miel.vandersande@ugent.be">Miel Vander Sande</a>
- * 
+ *
  */
 public final class MIMEParse
 {
     private final static List<String> mimeTypes = new ArrayList<>();
-    
+
     /**
      * Register mimeType in collection
-     * @param mimeType 
+     * @param mimeType
      */
     public static void register(String mimeType) {
         mimeTypes.add(mimeType);
     }
-    
+
 
     /**
      * Parse results container
@@ -67,13 +67,13 @@ public final class MIMEParse
 
     /**
      * Carves up a mime-type and returns a ParseResults object
-     * 
+     *
      * For example, the media range 'application/xhtml;q=0.5' would get parsed
      * into:
-     * 
+     *
      * ('application', 'xhtml', {'q', '0.5'})
      * @param mimeType
-     * @return 
+     * @return
      */
     protected static ParseResults parseMimeType(String mimeType)
     {
@@ -102,17 +102,17 @@ public final class MIMEParse
 
     /**
      * Carves up a media range and returns a ParseResults.
-     * 
+     *
      * For example, the media range 'application/*;q=0.5' would get parsed into:
-     * 
+     *
      * ('application', '*', {'q', '0.5'})
-     * 
+     *
      * In addition this function also guarantees that there is a value for 'q'
      * in the params dictionary, filling it in with a proper default if
      * necessary.
-     * 
+     *
      * @param range
-     * @return 
+     * @return
      */
     protected static ParseResults parseMediaRange(String range)
     {
@@ -167,10 +167,10 @@ public final class MIMEParse
      * tuple of the fitness value and the value of the 'q' quality parameter of
      * the best match, or (-1, 0) if no match was found. Just as for
      * quality_parsed(), 'parsed_ranges' must be a list of parsed media ranges.
-     * 
+     *
      * @param mimeType
      * @param parsedRanges
-     * @return 
+     * @return
      */
     protected static FitnessAndQuality fitnessAndQualityParsed(String mimeType,
             Collection<ParseResults> parsedRanges)
@@ -216,7 +216,7 @@ public final class MIMEParse
      * parameter of the best match, 0 if no match was found. This function
      * bahaves the same as quality() except that 'parsed_ranges' must be a list
      * of parsed media ranges.
-     * 
+     *
      * @param mimeType
      * @param parsedRanges
      * @return
@@ -230,10 +230,10 @@ public final class MIMEParse
     /**
      * Returns the quality 'q' of a mime-type when compared against the
      * mediaRanges in ranges. For example:
-     * 
+     *
      * @param mimeType
      * @param ranges
-     * @return 
+     * @return
      */
     public static float quality(String mimeType, String ranges)
     {
@@ -248,10 +248,10 @@ public final class MIMEParse
      * media-ranges listed in header. The value of header must be a string that
      * conforms to the format of the HTTP Accept: header. The value of
      * 'supported' is a list of mime-types.
-     * 
+     *
      * MimeParse.bestMatch(Arrays.asList(new String[]{"application/xbel+xml",
      * "text/xml"}), "text/*;q=0.5,*; q=0.1") 'text/xml'
-     * 
+     *
      * @param supported
      * @param header
      * @return
@@ -261,7 +261,7 @@ public final class MIMEParse
     {
         if (supported.isEmpty())
             throw new NoRegisteredMimeTypesException();
-        
+
         List<ParseResults> parseResults = new LinkedList<ParseResults>();
         List<FitnessAndQuality> weightedMatches = new LinkedList<FitnessAndQuality>();
         for (String r : StringUtils.split(header, ','))
@@ -280,7 +280,7 @@ public final class MIMEParse
                 .get(weightedMatches.size() - 1);
         return Float.compare(lastOne.quality, 0.0f) != 0 ? lastOne.mimeType : supported.get(0);
     }
-    
+
     /**
      *
      * @param header
diff --git a/api/src/main/java/org/linkeddatafragments/util/RDFTermParser.java b/api/src/main/java/org/linkeddatafragments/util/RDFTermParser.java
index eafa401b5..71258589d 100644
--- a/api/src/main/java/org/linkeddatafragments/util/RDFTermParser.java
+++ b/api/src/main/java/org/linkeddatafragments/util/RDFTermParser.java
@@ -4,7 +4,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
- * Parses strings (as obtained from HTTP request parameters) into RDF terms. 
+ * Parses strings (as obtained from HTTP request parameters) into RDF terms.
  *
  * @param <TermType> type for representing RDF terms
  *
diff --git a/api/src/main/java/org/linkeddatafragments/util/TriplePatternElementParser.java b/api/src/main/java/org/linkeddatafragments/util/TriplePatternElementParser.java
index 9621bab09..3c51d0f0a 100644
--- a/api/src/main/java/org/linkeddatafragments/util/TriplePatternElementParser.java
+++ b/api/src/main/java/org/linkeddatafragments/util/TriplePatternElementParser.java
@@ -5,7 +5,7 @@ import org.linkeddatafragments.fragments.tpf.TriplePatternElementFactory;
 
 /**
  * Parses strings (as obtained from HTTP request parameters) into
- * {@link ITriplePatternElement}s. 
+ * {@link ITriplePatternElement}s.
  *
  * @param <ConstantTermType> type for representing constants in triple patterns
  *                           (i.e., URIs and literals)
diff --git a/api/src/main/java/org/linkeddatafragments/views/HtmlTriplePatternFragmentWriterImpl.java b/api/src/main/java/org/linkeddatafragments/views/HtmlTriplePatternFragmentWriterImpl.java
index da5ba7abe..bb99eb53a 100644
--- a/api/src/main/java/org/linkeddatafragments/views/HtmlTriplePatternFragmentWriterImpl.java
+++ b/api/src/main/java/org/linkeddatafragments/views/HtmlTriplePatternFragmentWriterImpl.java
@@ -31,14 +31,14 @@ import java.util.Map;
  */
 public class HtmlTriplePatternFragmentWriterImpl extends TriplePatternFragmentWriterBase implements ILinkedDataFragmentWriter {
     private final Configuration cfg;
-    
+
     private final Template indexTemplate;
     private final Template datasourceTemplate;
     private final Template notfoundTemplate;
     private final Template errorTemplate;
-    
-    private final String HYDRA = "http://www.w3.org/ns/hydra/core#"; 
-    
+
+    private final String HYDRA = "http://www.w3.org/ns/hydra/core#";
+
     /**
      *
      * @param prefixes
@@ -47,18 +47,18 @@ public class HtmlTriplePatternFragmentWriterImpl extends TriplePatternFragmentWr
      */
     public HtmlTriplePatternFragmentWriterImpl(Map<String, String> prefixes, HashMap<String, IDataSource> datasources) throws IOException {
         super(prefixes, datasources);
-        
+
         cfg = new Configuration(Configuration.VERSION_2_3_22);
         cfg.setClassForTemplateLoading(getClass(), "/views");
         cfg.setDefaultEncoding("UTF-8");
         cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
-        
+
         indexTemplate = cfg.getTemplate("index.ftl.html");
         datasourceTemplate = cfg.getTemplate("datasource.ftl.html");
         notfoundTemplate = cfg.getTemplate("notfound.ftl.html");
         errorTemplate = cfg.getTemplate("error.ftl.html");
     }
-    
+
     /**
      *
      * @param outputStream
@@ -71,21 +71,21 @@ public class HtmlTriplePatternFragmentWriterImpl extends TriplePatternFragmentWr
     @Override
     public void writeFragment(ServletOutputStream outputStream, IDataSource datasource, ITriplePatternFragment fragment, ITriplePatternFragmentRequest tpfRequest) throws IOException, TemplateException{
         Map data = new HashMap();
-        
+
         // base.ftl.html
         data.put("assetsPath", "assets/");
         data.put("header", datasource.getTitle());
         data.put("date", new Date());
-        
+
         // fragment.ftl.html
         data.put("datasourceUrl", tpfRequest.getDatasetURL());
         data.put("datasource", datasource);
-        
+
         // Parse controls to template variables
         StmtIterator controls = fragment.getControls();
         while (controls.hasNext()) {
             Statement control = controls.next();
-            
+
             String predicate = control.getPredicate().getURI();
             RDFNode object = control.getObject();
             if (!object.isAnon()) {
@@ -93,28 +93,28 @@ public class HtmlTriplePatternFragmentWriterImpl extends TriplePatternFragmentWr
                 data.put(predicate.replaceFirst(HYDRA, ""), value);
             }
         }
-        
+
         // Add metadata
         data.put("totalEstimate", fragment.getTotalSize());
         data.put("itemsPerPage", fragment.getMaxPageSize());
-        
+
         // Add triples and datasources
         List<Statement> triples = fragment.getTriples().toList();
         data.put("triples", triples);
         data.put("datasources", getDatasources());
-        
+
         // Calculate start and end triple number
         Long start = ((tpfRequest.getPageNumber() - 1) * fragment.getMaxPageSize()) + 1;
         data.put("start", start);
         data.put("end", (start - 1) + (triples.size() < fragment.getMaxPageSize() ? triples.size() : fragment.getMaxPageSize()));
-        
+
         // Compose query object
         Map query = new HashMap();
         query.put("subject", !tpfRequest.getSubject().isVariable() ? tpfRequest.getSubject().asConstantTerm() : "");
         query.put("predicate", !tpfRequest.getPredicate().isVariable() ? tpfRequest.getPredicate().asConstantTerm() : "");
         query.put("object", !tpfRequest.getObject().isVariable() ? tpfRequest.getObject().asConstantTerm() : "");
         data.put("query", query);
-       
+
         // Get the template (uses cache internally)
         Template temp = datasource instanceof IndexDataSource ? indexTemplate : datasourceTemplate;
 
@@ -129,7 +129,7 @@ public class HtmlTriplePatternFragmentWriterImpl extends TriplePatternFragmentWr
         data.put("datasources", getDatasources());
         data.put("date", new Date());
         data.put("url", request.getRequestURL().toString());
-        
+
         notfoundTemplate.process(data, new OutputStreamWriter(outputStream));
     }
 
diff --git a/api/src/main/java/org/linkeddatafragments/views/ILinkedDataFragmentWriter.java b/api/src/main/java/org/linkeddatafragments/views/ILinkedDataFragmentWriter.java
index adaf9cbda..04004debb 100644
--- a/api/src/main/java/org/linkeddatafragments/views/ILinkedDataFragmentWriter.java
+++ b/api/src/main/java/org/linkeddatafragments/views/ILinkedDataFragmentWriter.java
@@ -9,31 +9,31 @@ import javax.servlet.http.HttpServletRequest;
 
 /**
  * Represents a possible writer to serialize an {@link ILinkedDataFragment} object
- * 
+ *
  * @author Miel Vander Sande
  */
 public interface ILinkedDataFragmentWriter {
     /**
      * Writes a 404 Not Found error
-     * 
+     *
      * @param outputStream The response stream to write to
      * @param request Request that is unable to answer
      * @throws Exception Error that occurs while serializing
      */
     public void writeNotFound(ServletOutputStream outputStream, HttpServletRequest request) throws Exception;
-    
+
     /**
      * Writes a 5XX error
-     * 
+     *
      * @param outputStream The response stream to write to
      * @param ex Exception that occurred
      * @throws Exception Error that occurs while serializing
      */
     public void writeError(ServletOutputStream outputStream, Exception ex) throws Exception;
-    
+
     /**
      * Serializes and writes a {@link ILinkedDataFragment}
-     * 
+     *
      * @param outputStream The response stream to write to
      * @param datasource
      * @param fragment
diff --git a/api/src/main/java/org/linkeddatafragments/views/LinkedDataFragmentWriterFactory.java b/api/src/main/java/org/linkeddatafragments/views/LinkedDataFragmentWriterFactory.java
index efc868cc5..fbf94f50f 100644
--- a/api/src/main/java/org/linkeddatafragments/views/LinkedDataFragmentWriterFactory.java
+++ b/api/src/main/java/org/linkeddatafragments/views/LinkedDataFragmentWriterFactory.java
@@ -8,21 +8,21 @@ import java.util.Map;
 
 /**
  * A factory for {@link ILinkedDataFragmentWriter}s.
- * 
+ *
  * @author Miel Vander Sande
  */
 public class LinkedDataFragmentWriterFactory {
-    
+
     private final static String HTML = "text/html";
-    
+
     /**
      * Creates {@link ILinkedDataFragmentWriter} for a given mimeType
-     * 
+     *
      * @param prefixes Configured prefixes to be used in serialization
      * @param datasources Configured datasources
      * @param mimeType mimeType to create writer for
      * @return created writer
-     * @throws IOException 
+     * @throws IOException
      */
     public static ILinkedDataFragmentWriter create(Map <String, String> prefixes, HashMap<String, IDataSource> datasources, String mimeType) throws IOException {
         switch (mimeType) {
diff --git a/api/src/main/java/org/linkeddatafragments/views/RdfWriterImpl.java b/api/src/main/java/org/linkeddatafragments/views/RdfWriterImpl.java
index f355fdb75..d41fc7ba5 100644
--- a/api/src/main/java/org/linkeddatafragments/views/RdfWriterImpl.java
+++ b/api/src/main/java/org/linkeddatafragments/views/RdfWriterImpl.java
@@ -17,7 +17,7 @@ import java.util.Map;
 
 /**
  *  Serializes an {@link ILinkedDataFragment} to an RDF format
- * 
+ *
  * @author Miel Vander Sande
  */
 public class RdfWriterImpl extends LinkedDataFragmentWriterBase implements ILinkedDataFragmentWriter {
diff --git a/api/src/main/java/org/linkeddatafragments/views/TriplePatternFragmentWriterBase.java b/api/src/main/java/org/linkeddatafragments/views/TriplePatternFragmentWriterBase.java
index 43ebc3e3b..c892dc067 100644
--- a/api/src/main/java/org/linkeddatafragments/views/TriplePatternFragmentWriterBase.java
+++ b/api/src/main/java/org/linkeddatafragments/views/TriplePatternFragmentWriterBase.java
@@ -14,7 +14,7 @@ import java.util.Map;
 
 /**
  * Base class of any implementation for ITriplePatternFragment.
- * 
+ *
  * @author Miel Vander Sande
  */
 public abstract class TriplePatternFragmentWriterBase extends LinkedDataFragmentWriterBase implements ILinkedDataFragmentWriter {
@@ -27,12 +27,12 @@ public abstract class TriplePatternFragmentWriterBase extends LinkedDataFragment
     public TriplePatternFragmentWriterBase(Map<String, String> prefixes, HashMap<String, IDataSource> datasources) {
         super(prefixes, datasources);
     }
-    
+
     @Override
     public void writeFragment(ServletOutputStream outputStream, IDataSource datasource, ILinkedDataFragment fragment, ILinkedDataFragmentRequest ldfRequest) throws Exception {
         writeFragment(outputStream, datasource, (ITriplePatternFragment) fragment, (ITriplePatternFragmentRequest) ldfRequest);
     }
-    
+
     /**
      *
      * @param outputStream
diff --git a/api/src/main/java/org/vivoweb/linkeddatafragments/datasource/rdfservice/RDFServiceDataSource.java b/api/src/main/java/org/vivoweb/linkeddatafragments/datasource/rdfservice/RDFServiceDataSource.java
index c54e810a3..b1c25c674 100644
--- a/api/src/main/java/org/vivoweb/linkeddatafragments/datasource/rdfservice/RDFServiceDataSource.java
+++ b/api/src/main/java/org/vivoweb/linkeddatafragments/datasource/rdfservice/RDFServiceDataSource.java
@@ -15,7 +15,7 @@ public class RDFServiceDataSource extends DataSourceBase {
 
     /**
      * The request processor
-     * 
+     *
      */
     protected final RDFServiceBasedRequestProcessorForTPFs requestProcessor;
 
diff --git a/api/src/main/java/org/vivoweb/linkeddatafragments/servlet/VitroLinkedDataFragmentServlet.java b/api/src/main/java/org/vivoweb/linkeddatafragments/servlet/VitroLinkedDataFragmentServlet.java
index 7f5f7dddf..fe265022c 100644
--- a/api/src/main/java/org/vivoweb/linkeddatafragments/servlet/VitroLinkedDataFragmentServlet.java
+++ b/api/src/main/java/org/vivoweb/linkeddatafragments/servlet/VitroLinkedDataFragmentServlet.java
@@ -117,7 +117,7 @@ public class VitroLinkedDataFragmentServlet extends VitroHttpServlet {
             catch( Exception e ) {
                 // ignore
             }
-        }   
+        }
     }
 
     private IDataSource getDataSource(HttpServletRequest request) throws DataSourceNotFoundException {
@@ -170,12 +170,12 @@ public class VitroLinkedDataFragmentServlet extends VitroHttpServlet {
             response.setHeader("Server", "Linked Data Fragments Server");
             response.setContentType(bestMatch);
             response.setCharacterEncoding("utf-8");
-            
+
             // create a writer depending on the best matching mimeType
             ILinkedDataFragmentWriter writer = LinkedDataFragmentWriterFactory.create(config.getPrefixes(), dataSources, bestMatch);
-            
+
             try {
-            
+
                 final IDataSource dataSource = getDataSource( request );
 
                 final ILinkedDataFragmentRequest ldfRequest =
@@ -187,7 +187,7 @@ public class VitroLinkedDataFragmentServlet extends VitroHttpServlet {
 
                 response.setHeader("Access-Control-Allow-Origin", "*");
                 writer.writeFragment(response.getOutputStream(), dataSource, fragment, ldfRequest);
-            
+
             } catch (DataSourceNotFoundException ex) {
                 try {
                     response.setStatus(404);
@@ -199,7 +199,7 @@ public class VitroLinkedDataFragmentServlet extends VitroHttpServlet {
                 response.setStatus(500);
                 writer.writeError(response.getOutputStream(), e);
             }
-          
+
         } catch (Exception e) {
             throw new ServletException(e);
         }
diff --git a/api/src/main/java/org/vivoweb/linkeddatafragments/views/HtmlTriplePatternFragmentWriterImpl.java b/api/src/main/java/org/vivoweb/linkeddatafragments/views/HtmlTriplePatternFragmentWriterImpl.java
index 16a58e16a..b9c417e3d 100644
--- a/api/src/main/java/org/vivoweb/linkeddatafragments/views/HtmlTriplePatternFragmentWriterImpl.java
+++ b/api/src/main/java/org/vivoweb/linkeddatafragments/views/HtmlTriplePatternFragmentWriterImpl.java
@@ -39,12 +39,12 @@ import java.util.Map;
  */
 public class HtmlTriplePatternFragmentWriterImpl extends TriplePatternFragmentWriterBase implements ILinkedDataFragmentWriter {
     private final Configuration cfg;
-    
+
     private final Template indexTemplate;
     private final Template datasourceTemplate;
     private final Template notfoundTemplate;
     private final Template errorTemplate;
-    
+
     private final String HYDRA = "http://www.w3.org/ns/hydra/core#";
 
     private static String contextPath;
@@ -55,7 +55,7 @@ public class HtmlTriplePatternFragmentWriterImpl extends TriplePatternFragmentWr
             contextPath += "/";
         }
     }
-    
+
     /**
      *
      * @param prefixes
@@ -64,18 +64,18 @@ public class HtmlTriplePatternFragmentWriterImpl extends TriplePatternFragmentWr
      */
     public HtmlTriplePatternFragmentWriterImpl(Map<String, String> prefixes, HashMap<String, IDataSource> datasources) throws IOException {
         super(prefixes, datasources);
-        
+
         cfg = new Configuration(Configuration.VERSION_2_3_23);
         cfg.setClassForTemplateLoading(getClass(), "/tpf");
         cfg.setDefaultEncoding("UTF-8");
         cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
-        
+
         indexTemplate = cfg.getTemplate("index.ftl.html");
         datasourceTemplate = cfg.getTemplate("datasource.ftl.html");
         notfoundTemplate = cfg.getTemplate("notfound.ftl.html");
         errorTemplate = cfg.getTemplate("error.ftl.html");
     }
-    
+
     /**
      *
      * @param outputStream
@@ -88,22 +88,22 @@ public class HtmlTriplePatternFragmentWriterImpl extends TriplePatternFragmentWr
     @Override
     public void writeFragment(ServletOutputStream outputStream, IDataSource datasource, ITriplePatternFragment fragment, ITriplePatternFragmentRequest tpfRequest) throws IOException, TemplateException{
         Map data = new HashMap();
-        
+
         // base.ftl.html
         data.put("homePath", (contextPath != null ? contextPath : "") + "tpf");
         data.put("assetsPath", (contextPath != null ? contextPath : "") + "tpf/assets/");
         data.put("header", datasource.getTitle());
         data.put("date", new Date());
-        
+
         // fragment.ftl.html
         data.put("datasourceUrl", tpfRequest.getDatasetURL());
         data.put("datasource", datasource);
-        
+
         // Parse controls to template variables
         StmtIterator controls = fragment.getControls();
         while (controls.hasNext()) {
             Statement control = controls.next();
-            
+
             String predicate = control.getPredicate().getURI();
             RDFNode object = control.getObject();
             if (!object.isAnon()) {
@@ -111,21 +111,21 @@ public class HtmlTriplePatternFragmentWriterImpl extends TriplePatternFragmentWr
                 data.put(predicate.replaceFirst(HYDRA, ""), value);
             }
         }
-        
+
         // Add metadata
         data.put("totalEstimate", fragment.getTotalSize());
         data.put("itemsPerPage", fragment.getMaxPageSize());
-        
+
         // Add triples and datasources
         List<Statement> triples = fragment.getTriples().toList();
         data.put("triples", triples);
         data.put("datasources", getDatasources());
-        
+
         // Calculate start and end triple number
         Long start = ((tpfRequest.getPageNumber() - 1) * fragment.getMaxPageSize()) + 1;
         data.put("start", start);
         data.put("end", (start - 1) + (triples.size() < fragment.getMaxPageSize() ? triples.size() : fragment.getMaxPageSize()));
-        
+
         // Compose query object
         Map query = new HashMap();
         query.put("subject", !tpfRequest.getSubject().isVariable() ? handleCT(tpfRequest.getSubject().asConstantTerm()) : "");
@@ -204,7 +204,7 @@ public class HtmlTriplePatternFragmentWriterImpl extends TriplePatternFragmentWr
         data.put("datasources", getDatasources());
         data.put("date", new Date());
         data.put("url", request.getRequestURL().toString());
-        
+
         notfoundTemplate.process(data, new OutputStreamWriter(outputStream));
     }
 
diff --git a/api/src/main/java/org/vivoweb/linkeddatafragments/views/LinkedDataFragmentWriterFactory.java b/api/src/main/java/org/vivoweb/linkeddatafragments/views/LinkedDataFragmentWriterFactory.java
index ebc933f9f..b72a31a70 100644
--- a/api/src/main/java/org/vivoweb/linkeddatafragments/views/LinkedDataFragmentWriterFactory.java
+++ b/api/src/main/java/org/vivoweb/linkeddatafragments/views/LinkedDataFragmentWriterFactory.java
@@ -10,16 +10,16 @@ import java.util.Map;
 
 /**
  * A factory for {@link ILinkedDataFragmentWriter}s.
- * 
+ *
  * @author Miel Vander Sande
  */
 public class LinkedDataFragmentWriterFactory {
-    
+
     private final static String HTML = "text/html";
-    
+
     /**
      * Creates {@link ILinkedDataFragmentWriter} for a given mimeType
-     * 
+     *
      * @param prefixes Configured prefixes to be used in serialization
      * @param datasources Configured datasources
      * @param mimeType mimeType to create writer for
diff --git a/api/src/main/resources/edu/cornell/mannlib/vitro/webapp/web/antisamy-vitro-1.4.4.xml b/api/src/main/resources/edu/cornell/mannlib/vitro/webapp/web/antisamy-vitro-1.4.4.xml
index 6071f68f0..80d38bf37 100644
--- a/api/src/main/resources/edu/cornell/mannlib/vitro/webapp/web/antisamy-vitro-1.4.4.xml
+++ b/api/src/main/resources/edu/cornell/mannlib/vitro/webapp/web/antisamy-vitro-1.4.4.xml
@@ -181,7 +181,7 @@ http://www.w3.org/TR/html401/struct/global.html
             <regexp-list>
                 <regexp value="[a-zA-Z0-9,\-\s]+"/>
             </regexp-list>
-            
+
             <literal-list>
                 <literal value="screen"/>
 
diff --git a/api/src/main/resources/org/vivoweb/linkeddatafragments/servlet/ldf-client-ui-packaged.js b/api/src/main/resources/org/vivoweb/linkeddatafragments/servlet/ldf-client-ui-packaged.js
index 2f2c5776c..c741cd101 100644
--- a/api/src/main/resources/org/vivoweb/linkeddatafragments/servlet/ldf-client-ui-packaged.js
+++ b/api/src/main/resources/org/vivoweb/linkeddatafragments/servlet/ldf-client-ui-packaged.js
@@ -61,4 +61,4 @@
     function(e){function t(t,n){this.element=t,this.options=e.extend({},this.options,n);var i=this;this._queryWorker=new Worker(ldfAssetsPath + "ldf-client-worker.js"),this._queryWorker.onmessage=function(e){var t=e.data;switch(t.type){case"queryInfo":return i._initResults(t.queryType);case"result":return i._addResult(t.result);case"end":return i._endResults();case"log":return i._logAppender(t.log);case"error":return this.onerror(t.error)}},this._queryWorker.onerror=function(t){i._queryWorker.onerror=e.noop,i._stopExecution(t)}}function n(e){function t(){s="",e.empty(),o=50,clearTimeout(a)}function n(t){o>0?(e.append(i(t)),0===--o&&(a=setTimeout(r,l))):s+=t}function r(){clearTimeout(a),a=null,s?(e.append(i(s)),s="",a=setTimeout(r,l)):o=1}var s,o,a,l=1e3;return t(),n.clear=t,n.flush=r,n}function i(e){return(e+"").replace(/(<)|(>)|(&)|http(s?:\/\/[^\s<>]+)/g,r)}function r(e,t,n,r,s){return t&&"&lt;"||n&&"&gt;"||r&&"&amp;"||(s="http"+i(s))&&'<a href="'+s+'" target=_blank>'+s+"</a>"}function s(e){return e.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&")}function o(e){for(var t={},n=e?e.length:0,i=0;i<n;i++)t[e[i]]=!1;return t}function a(e){if(e)try{return new Date(Date.parse(e))}catch(e){}}function l(t,n){return n=n||e("<div>",{class:"result"}).append(e("<dl>"))[0],e(n.firstChild).empty().append(e.map(t,function(t,n){return[e("<dt>",{text:n}),e("<dd>",{html:i(t)})]})),n}e.fn.queryui=function(n,i,r){"string"!=typeof n&&(r=i,i=n,n="init");for(var s=this,o=0;o<this.length&&s===this;o++){var a=e(this[o]),l=a.data("queryui");switch(n){case"init":l||(a.data("queryui",l=new t(a,i)),l._create());break;case"option":if(!l)throw new Error("Query UI not activated on this element");void 0===i?s=l.options:void 0===r?s=l.options[r]:l._setOption(i,r)}}return s},t.prototype={options:{datasources:[],queries:[],prefixes:[]},_create:function(){var t=this,i=this.options,r=this.element,s=this.$stop=e(".stop",r),o=this.$start=e(".start",r),a=this.$query=e(".queryText",r),c=this.$queries=e(".query",r),u=e(".log",r),h=e(".results",r),d=e("<div>",{class:"text"}),f=this.$datasources=e(".datasources",r),p=this.$datetime=e(".datetime",r),_=this.$details=e(".details",r),g=this.$showDetails=e(".details-toggle",r);f.length||(f=this.$datasources=e("<select>")),h.length||(h=e("<div>")),u.length||(u=e("<div>")),f.chosen({create_option:!0,persistent_create_option:!0,skip_no_results:!0,search_contains:!0,display_selected_options:!1,placeholder_text:" ",create_option_text:"Add datasource"}),f.change(function(){t._setOption("selectedDatasources",f.val())}),a.edited=""!==a.val(),a.change(function(){i.query=a.val(),a.edited=!0}),c.chosen({skip_no_results:!0,placeholder_text:" "}),c.change(function(e){(e=c.val())&&(a.val(i.query=e).edited=!1)}),p.change(function(){t._setOption("datetime",p.val())}),o.click(this._startExecution.bind(this)),s.click(this._stopExecution.bind(this)),g.click(function(){_.is(":visible")?t._hideDetails():t._showDetails()}),h.append(d),this._resultsScroller=new FastScroller(h,l),this._resultAppender=n(d),this._logAppender=n(u),this.$timing=e(".timing",r);for(var m in i)this._setOption(m,i[m],!0)},_setOption:function(t,n,i){var r=this.options;if(i||r[t]!==n){r[t]=n;var a=this,l=this.$datasources,c=this.$queries;switch(t){case"datasources":l.empty().append((n||[]).map(function(t,n){return e("<option>",{text:t.name,value:t.url})})),this._setOption("selectedDatasources",r.selectedDatasources,!0);break;case"selectedDatasources":var u=l.children();!i||n&&n.length||!u.length||(r[t]=n=[u.val()]);var h=o(n);u.each(function(t){var n=e(this),i=e(this).val();n.attr("selected",i in h),h[i]=!0}),l.append(e.map(h,function(t,n){return t?null:e("<option>",{text:n,value:n,selected:!0})})).trigger("chosen:updated"),this._loadQueries(n);break;case"query":this.$query.val(n).change();break;case"queries":n.forEach(function(e){e.datasourceMatcher=new RegExp("^(?:"+e.datasources.map(s).join("|").replace(/\\\*|^$/g,".*")+")$")}),this._loadQueries(r.selectedDatasources);break;case"datetime":n&&this._showDetails(),this.$datetime.val(n).change();break;case"relevantQueries":n=n||[],this.$query.edited||n.some(function(e){return e.sparql===r.query})||n[0]&&this._setOption("query",n[0].sparql),c.empty().append(e("<option>"),n.map(function(t){return e("<option>",{text:t.name,value:t.sparql,selected:r.query===t.sparql})})).trigger("chosen:updated").change();break;case"settings":e.getJSON(n,function(e){for(var t in e)a._setOption(t,e[t])})}}},_loadQueries:function(e){var t=(this.options.queries||[]).filter(function(t,n){return t.id=n,!e||e.some(function(e){return t.datasourceMatcher.test(e)})}),n=t.map(function(e){return e.id}).join();this._querySetId!==n&&(this._querySetId=n,this._setOption("relevantQueries",t),this.element.trigger("changeQuerySet"))},_startExecution:function(){var t=this.$datasources.val();return t&&t.length?(this.$stop.show(),this.$start.hide(),this._resultsScroller.removeAll(),this._resultAppender.clear(),this._logAppender.clear(),e("html,body").animate({scrollTop:this.$stop.offset().top}),this._resultCount=0,this._startTimer(),void this._queryWorker.postMessage({type:"query",query:this.$query.val(),datasources:t,prefixes:this.options.prefixes,datetime:a(this.options.datetime)})):alert("Please choose a datasource to execute the query.")},_stopExecution:function(e){this._queryWorker.postMessage({type:"stop"}),this._stopTimer(),this.$stop.hide(),this.$start.show(),e&&e.message&&this._resultAppender(e.message),this._resultAppender.flush(),this._logAppender.flush(),this._writeResult=this._writeEnd=null},_initResults:function(t){var n=this._resultAppender;switch(t){case"SELECT":this._writeResult=function(e){this._resultsScroller.addContent([e])},this._writeEnd=function(){this._resultCount||n("This query has no results.")};break;case"CONSTRUCT":case"DESCRIBE":var i=new N3.Writer({write:function(e,t,i){n(e),i&&i()}},this.options);this._writeResult=function(e){i.addTriple(e)},this._writeEnd=function(){i.end()};break;case"ASK":this._writeResult=function(e){n(e)},this._writeEnd=e.noop;break;default:n(t+" queries are unsupported.")}},_addResult:function(e){this._writeResult&&(this._resultCount++,this._writeResult(e))},_endResults:function(){this._writeEnd&&(this._writeEnd(),this._stopExecution())},_startTimer:function(){this._startTime=new Date,this._stopTimer(),this._updateTimer(),this._updateTimerHandle=setInterval(this._updateTimer.bind(this),100)},_updateTimer:function(){this.$timing.text(this._resultCount.toLocaleString()+" result"+(1===this._resultCount?"":"s")+" in "+((new Date-this._startTime)/1e3).toFixed(1)+"s")},_stopTimer:function(){this._updateTimerHandle&&(this._updateTimer(),clearInterval(this._updateTimerHandle),this._updateTimerHandle=0)},_showDetails:function(){this.$details.slideDown(150),this.$showDetails.addClass("enabled")},_hideDetails:function(){this._setOption("datetime",""),this.$details.slideUp(150),this.$showDetails.removeClass("enabled")}}}(jQuery),/*! @license MIT ©2014–2016 Ruben Verborgh, Ghent University – imec */
     /** Loads and stores state of the Triple Pattern Fragments widget using the URL. */
     jQuery(function(e){function t(){var e=location.hash.substr(1).split("&").reduce(function(e,t){var n=t.match(/^([^=]+)=(.*)/);return n&&(e[decodeURIComponent(n[1])]=decodeURIComponent(n[2])),e},{});(e.datasources=e.datasources||e.startFragment)&&i.queryui("option","selectedDatasources",e.datasources.split(/[ ,;]+/)),e.query&&i.queryui("option","query",e.query),e.datetime&&i.queryui("option","datetime",e.datetime)}function n(){var e=[],t=i.queryui("option"),n=t.selectedDatasources||[],r=(t.datasources[0]||{}).url,s=t.query===(t.queries[0]||{}).sparql,o=0===n.length||1===n.length&&n[0]===r;o||e.push("datasources="+n.map(encodeURIComponent).join(";")),s||e.push("query="+encodeURIComponent(t.query||"")),t.datetime&&e.push("datetime="+encodeURIComponent(t.datetime)),e=e.length?"#"+e.join("&"):"",history.replaceState(null,null,location.href.replace(/(?:#.*)?$/,e))}var i=e(".ldf-client").one("changeQuerySet",function(){t(),e(window).on("popstate",t),history.replaceState&&i.on("change",n)})});
-//# sourceMappingURL=ldf-client-ui-packaged.js.map
\ No newline at end of file
+//# sourceMappingURL=ldf-client-ui-packaged.js.map
diff --git a/api/src/main/resources/org/vivoweb/linkeddatafragments/servlet/ldf-client-worker.js b/api/src/main/resources/org/vivoweb/linkeddatafragments/servlet/ldf-client-worker.js
index a09fca4e2..971e5af89 100644
--- a/api/src/main/resources/org/vivoweb/linkeddatafragments/servlet/ldf-client-worker.js
+++ b/api/src/main/resources/org/vivoweb/linkeddatafragments/servlet/ldf-client-worker.js
@@ -180,4 +180,4 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
     var O=/%[sdj%]/g;r.format=function(t){if(!b(t)){for(var e=[],r=0;r<arguments.length;r++)e.push(i(arguments[r]));return e.join(" ")}for(var r=1,n=arguments,s=n.length,a=String(t).replace(O,function(t){if("%%"===t)return"%";if(r>=s)return t;switch(t){case"%s":return String(n[r++]);case"%d":return Number(n[r++]);case"%j":try{return JSON.stringify(n[r++])}catch(t){return"[Circular]"}default:return t}}),o=n[r];r<s;o=n[++r])a+=g(o)||!E(o)?" "+o:" "+i(o);return a},r.deprecate=function(t,i){function s(){if(!a){if(e.throwDeprecation)throw new Error(i);e.traceDeprecation?console.trace(i):console.error(i),a=!0}return t.apply(this,arguments)}if(x(n.process))return function(){return r.deprecate(t,i).apply(this,arguments)};if(e.noDeprecation===!0)return t;var a=!1;return s};var D,N={};r.debuglog=function(t){if(x(D)&&(D=e.env.NODE_DEBUG||""),t=t.toUpperCase(),!N[t])if(new RegExp("\\b"+t+"\\b","i").test(D)){var n=e.pid;N[t]=function(){var e=r.format.apply(r,arguments);console.error("%s %d: %s",t,n,e)}}else N[t]=function(){};return N[t]},r.inspect=i,i.colors={bold:[1,22],italic:[3,23],underline:[4,24],inverse:[7,27],white:[37,39],grey:[90,39],black:[30,39],blue:[34,39],cyan:[36,39],green:[32,39],magenta:[35,39],red:[31,39],yellow:[33,39]},i.styles={special:"cyan",number:"yellow",boolean:"yellow",undefined:"grey",null:"bold",string:"green",date:"magenta",regexp:"red"},r.isArray=d,r.isBoolean=_,r.isNull=g,r.isNullOrUndefined=y,r.isNumber=v,r.isString=b,r.isSymbol=m,r.isUndefined=x,r.isRegExp=w,r.isObject=E,r.isDate=F,r.isError=T,r.isFunction=k,r.isPrimitive=I,r.isBuffer=t("./support/isBuffer");var L=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];r.log=function(){console.log("%s - %s",A(),r.format.apply(r,arguments))},r.inherits=t("inherits"),r._extend=function(t,e){if(!e||!E(e))return t;for(var r=Object.keys(e),n=r.length;n--;)t[r[n]]=e[r[n]];return t}}).call(this,t("_process"),"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./support/isBuffer":61,_process:46,inherits:60}],63:[function(t,e,r){function n(){for(var t={},e=0;e<arguments.length;e++){var r=arguments[e];for(var n in r)i.call(r,n)&&(t[n]=r[n])}return t}e.exports=n;var i=Object.prototype.hasOwnProperty},{}],64:[function(t,e,r){function n(t){var e=this;if(e instanceof n||(e=new n),e.tail=null,e.head=null,e.length=0,t&&"function"==typeof t.forEach)t.forEach(function(t){e.push(t)});else if(arguments.length>0)for(var r=0,i=arguments.length;r<i;r++)e.push(arguments[r]);return e}function i(t,e){t.tail=new a(e,t.tail,null,t),t.head||(t.head=t.tail),t.length++}function s(t,e){t.head=new a(e,null,t.head,t),t.tail||(t.tail=t.head),t.length++}function a(t,e,r,n){return this instanceof a?(this.list=n,this.value=t,e?(e.next=this,this.prev=e):this.prev=null,void(r?(r.prev=this,this.next=r):this.next=null)):new a(t,e,r,n)}e.exports=n,n.Node=a,n.create=n,n.prototype.removeNode=function(t){if(t.list!==this)throw new Error("removing node which does not belong to this list");var e=t.next,r=t.prev;e&&(e.prev=r),r&&(r.next=e),t===this.head&&(this.head=e),t===this.tail&&(this.tail=r),t.list.length--,t.next=null,t.prev=null,t.list=null},n.prototype.unshiftNode=function(t){if(t!==this.head){t.list&&t.list.removeNode(t);var e=this.head;t.list=this,t.next=e,e&&(e.prev=t),this.head=t,this.tail||(this.tail=t),this.length++}},n.prototype.pushNode=function(t){if(t!==this.tail){t.list&&t.list.removeNode(t);var e=this.tail;t.list=this,t.prev=e,e&&(e.next=t),this.tail=t,this.head||(this.head=t),this.length++}},n.prototype.push=function(){for(var t=0,e=arguments.length;t<e;t++)i(this,arguments[t]);return this.length},n.prototype.unshift=function(){for(var t=0,e=arguments.length;t<e;t++)s(this,arguments[t]);return this.length},n.prototype.pop=function(){if(this.tail){var t=this.tail.value;return this.tail=this.tail.prev,this.tail.next=null,this.length--,t}},n.prototype.shift=function(){if(this.head){var t=this.head.value;return this.head=this.head.next,this.head.prev=null,this.length--,t}},n.prototype.forEach=function(t,e){e=e||this;for(var r=this.head,n=0;null!==r;n++)t.call(e,r.value,n,this),r=r.next},n.prototype.forEachReverse=function(t,e){e=e||this;for(var r=this.tail,n=this.length-1;null!==r;n--)t.call(e,r.value,n,this),r=r.prev},n.prototype.get=function(t){for(var e=0,r=this.head;null!==r&&e<t;e++)r=r.next;if(e===t&&null!==r)return r.value},n.prototype.getReverse=function(t){for(var e=0,r=this.tail;null!==r&&e<t;e++)r=r.prev;if(e===t&&null!==r)return r.value},n.prototype.map=function(t,e){e=e||this;for(var r=new n,i=this.head;null!==i;)r.push(t.call(e,i.value,this)),i=i.next;return r},n.prototype.mapReverse=function(t,e){e=e||this;for(var r=new n,i=this.tail;null!==i;)r.push(t.call(e,i.value,this)),i=i.prev;return r},n.prototype.reduce=function(t,e){var r,n=this.head;if(arguments.length>1)r=e;else{if(!this.head)throw new TypeError("Reduce of empty list with no initial value");n=this.head.next,r=this.head.value}for(var i=0;null!==n;i++)r=t(r,n.value,i),n=n.next;return r},n.prototype.reduceReverse=function(t,e){var r,n=this.tail;if(arguments.length>1)r=e;else{if(!this.tail)throw new TypeError("Reduce of empty list with no initial value");n=this.tail.prev,r=this.tail.value}for(var i=this.length-1;null!==n;i--)r=t(r,n.value,i),n=n.prev;return r},n.prototype.toArray=function(){for(var t=new Array(this.length),e=0,r=this.head;null!==r;e++)t[e]=r.value,r=r.next;return t},n.prototype.toArrayReverse=function(){for(var t=new Array(this.length),e=0,r=this.tail;null!==r;e++)t[e]=r.value,r=r.prev;return t},n.prototype.slice=function(t,e){e=e||this.length,e<0&&(e+=this.length),t=t||0,t<0&&(t+=this.length);var r=new n;if(e<t||e<0)return r;t<0&&(t=0),e>this.length&&(e=this.length);for(var i=0,s=this.head;null!==s&&i<t;i++)s=s.next;for(;null!==s&&i<e;i++,s=s.next)r.push(s.value);return r},n.prototype.sliceReverse=function(t,e){e=e||this.length,e<0&&(e+=this.length),t=t||0,t<0&&(t+=this.length);var r=new n;if(e<t||e<0)return r;t<0&&(t=0),e>this.length&&(e=this.length);for(var i=this.length,s=this.tail;null!==s&&i>e;i--)s=s.prev;for(;null!==s&&i>t;i--,s=s.prev)r.push(s.value);return r},n.prototype.reverse=function(){for(var t=this.head,e=this.tail,r=t;null!==r;r=r.prev){var n=r.prev;r.prev=r.next,r.next=n}return this.head=e,this.tail=t,this}},{}]},{},[34])(34)});var fragmentsClient,resultsIterator,logger=new ldf.Logger;ldf.Logger.setLevel("info"),logger._print=function(t){postMessage({type:"log",log:t.slice(2).join(" ").trim()+"\n"})};var handlers={query:function(t){t.logger=logger,t.fragmentsClient=fragmentsClient=new ldf.FragmentsClient(t.datasources,t);try{resultsIterator=new ldf.SparqlIterator(t.query,t)}catch(t){return postMessage({type:"error",error:t})}postMessage({type:"queryInfo",queryType:resultsIterator.queryType}),resultsIterator.on("data",function(t){postMessage({type:"result",result:t})}),resultsIterator.on("end",function(){postMessage({type:"end"})}),resultsIterator.on("error",function(t){t={message:t.message||t.toString()},postMessage({type:"error",error:t})})},stop:function(){resultsIterator&&(resultsIterator.removeAllListeners(),resultsIterator=null),fragmentsClient&&(fragmentsClient.abortAll(),fragmentsClient=null)}};self.onmessage=function(t){handlers[t.data.type](t.data)};
-//# sourceMappingURL=ldf-client-worker.js.map
\ No newline at end of file
+//# sourceMappingURL=ldf-client-worker.js.map
diff --git a/api/src/main/resources/org/vivoweb/linkeddatafragments/servlet/ldf-client.css b/api/src/main/resources/org/vivoweb/linkeddatafragments/servlet/ldf-client.css
index bcbecf9f2..2cd9b6f8c 100644
--- a/api/src/main/resources/org/vivoweb/linkeddatafragments/servlet/ldf-client.css
+++ b/api/src/main/resources/org/vivoweb/linkeddatafragments/servlet/ldf-client.css
@@ -546,4 +546,4 @@ li.search-choice-focus .search-choice-close {
 
 .results {
     line-height: 1.5em;
-}
\ No newline at end of file
+}
diff --git a/api/src/main/resources/tpf/base.ftl.html b/api/src/main/resources/tpf/base.ftl.html
index 8952ccf1c..ef90760c1 100644
--- a/api/src/main/resources/tpf/base.ftl.html
+++ b/api/src/main/resources/tpf/base.ftl.html
@@ -27,4 +27,4 @@
   </footer>
 </body>
 </html>
-</#macro>
\ No newline at end of file
+</#macro>
diff --git a/api/src/main/resources/tpf/error.ftl.html b/api/src/main/resources/tpf/error.ftl.html
index 84ce65876..956ea0234 100644
--- a/api/src/main/resources/tpf/error.ftl.html
+++ b/api/src/main/resources/tpf/error.ftl.html
@@ -8,4 +8,4 @@
 <h3>Error details</h3>
 <p><#if error??>${(error.getMessage())!error!""}</#if><p>
 </#macro>
-<@display_page/>
\ No newline at end of file
+<@display_page/>
diff --git a/api/src/main/resources/tpf/fragment.ftl.html b/api/src/main/resources/tpf/fragment.ftl.html
index 32ce716bf..e407b4b7f 100644
--- a/api/src/main/resources/tpf/fragment.ftl.html
+++ b/api/src/main/resources/tpf/fragment.ftl.html
@@ -80,4 +80,4 @@
    <li><a href="${ nextPage }" rel="next" property="hydra:nextPage">next</a></li>
    </#if>
  </ul>
-</#macro>
\ No newline at end of file
+</#macro>
diff --git a/api/src/main/resources/tpf/index.ftl.html b/api/src/main/resources/tpf/index.ftl.html
index 3e8d1cac4..5610c1ac6 100644
--- a/api/src/main/resources/tpf/index.ftl.html
+++ b/api/src/main/resources/tpf/index.ftl.html
@@ -17,4 +17,4 @@
 <#include "client.ftl.html">
 </#macro>
 
-<@display_page/>
\ No newline at end of file
+<@display_page/>
diff --git a/api/src/main/resources/tpf/notfound.ftl.html b/api/src/main/resources/tpf/notfound.ftl.html
index 363b8abd9..b0c2183d0 100644
--- a/api/src/main/resources/tpf/notfound.ftl.html
+++ b/api/src/main/resources/tpf/notfound.ftl.html
@@ -13,4 +13,4 @@
 </#list>
 </ul>
 </#macro>
-<@display_page/>
\ No newline at end of file
+<@display_page/>
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/testing/AbstractTestClass.java b/api/src/test/java/edu/cornell/mannlib/vitro/testing/AbstractTestClass.java
index 98412084f..fa5e4fe01 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/testing/AbstractTestClass.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/testing/AbstractTestClass.java
@@ -67,7 +67,7 @@ import org.apache.jena.rdf.model.ModelFactory;
  * <li>Create URLs from Strings without throwing checked exceptions.</li>
  * <li>Compare the contents of XML documents.</li>
  * </ul>
- * 
+ *
  * @author jeb228
  */
 public abstract class AbstractTestClass {
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/testing/RecordingProxy.java b/api/src/test/java/edu/cornell/mannlib/vitro/testing/RecordingProxy.java
index 0a245465b..4cd98c2a8 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/testing/RecordingProxy.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/testing/RecordingProxy.java
@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * The create() method creates a dynamic Proxy that wraps your inner object, and
  * implements your interfaze.
- * 
+ *
  * It also implements the MethodCallRecorder interface (although you will need
  * to cast it), so you can find out what methods were called on the proxy.
  */
@@ -113,4 +113,4 @@ public class RecordingProxy {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/IsRootUserFactoryTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/IsRootUserFactoryTest.java
index eff900437..3c0d0814d 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/IsRootUserFactoryTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/IsRootUserFactoryTest.java
@@ -44,15 +44,15 @@ public class IsRootUserFactoryTest extends AbstractTestClass {
 	public void setup() {
 		UserAccount plainUser = new UserAccount();
 		plainUser.setUri(PLAIN_USER_URI);
-		
+
 		UserAccount rootUser = new UserAccount();
 		rootUser.setUri(ROOT_USER_URI);
 		rootUser.setRootUser(true);
-		
+
 		uaDao = new UserAccountsDaoStub();
 		uaDao.addUser(plainUser);
 		uaDao.addUser(rootUser);
-		
+
 		wdf = new WebappDaoFactoryStub();
 		wdf.setUserAccountsDao(uaDao);
 
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_ModelsTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_ModelsTest.java
index f6c2f4eef..17621a2b8 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_ModelsTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_ModelsTest.java
@@ -42,15 +42,15 @@ import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AbstractPr
 /**
  * Test the function of PolicyHelper in authorizing models of additions and
  * retractions.
- * 
+ *
  * It is vital that these methods work even if the statements are presented in
  * the "wrong" order: one statement being authorized by a statement that appears
  * later in the list.
- * 
+ *
  * In order to test that, we need to create a Model that will list the
  * statements in an order that we can predict, vis. the order in which they were
  * added.
- * 
+ *
  * To avoid creating a SortedModel that implements dozens of methods, we instead
  * create a Proxy class that keeps the statements in order and lists them on
  * demand.
@@ -258,7 +258,7 @@ public class PolicyHelper_ModelsTest extends AbstractTestClass {
 	/**
 	 * A model Proxy object built around this will list statements in the order
 	 * they were added.
-	 * 
+	 *
 	 * This only works if the statements were added by a call to
 	 * add(Statement[]), and if they are listed by a call to listStatements().
 	 * If the test used other methods to add statements, or if the PolicyHelper
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java
index 201cbe22c..68b0ab4cd 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java
@@ -79,7 +79,7 @@ public class SelfEditingPolicyTest extends AbstractTestClass {
 		ind.setURI(SELFEDITOR_URI);
 
 		ids = new ArrayIdentifierBundle(new HasProfile(SELFEDITOR_URI));
-		
+
 		ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 	}
 
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java
index c9158788b..044318139 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java
@@ -73,7 +73,7 @@ public class SelfEditingPolicy_2_Test extends AbstractTestClass {
 	 */
 	private OntModel ontModel;
 
-	
+
 	@Before
 	public void setUp() throws Exception {
 		ServletContextStub ctx = new ServletContextStub();
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImplTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImplTest.java
index 067ded4a6..e3ac5fe00 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImplTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanImplTest.java
@@ -34,14 +34,14 @@ import edu.cornell.mannlib.vitro.webapp.dao.PropertyDao.FullPropertyKey;
 /**
  * If we believe that authorization will succeed regardless of user role, check
  * that it succeeds with the lowest role.
- * 
+ *
  * If we believe that authorization will fail regardless of user role, check
  * that it fails with the highest role.
- * 
+ *
  * If we believe that authorization depends on the user role, it should pass if
  * the user role is higher than or equal to the threshold, and fail if the user
  * role is less than the threshold.
- * 
+ *
  * Note that we can't set a threshold to be tested to either the lowest or
  * highest role, or the attempt to test with higher or lower role will throw an
  * exception.
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoSetupTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoSetupTest.java
index 93b7b80f3..cd2a96026 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoSetupTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoSetupTest.java
@@ -59,7 +59,7 @@ public class RevisionInfoSetupTest extends AbstractTestClass {
 	public void suppressMessagesFromStartupStatus() {
 		setLoggerLevel(StartupStatus.class, Level.OFF);
 	}
-	
+
 	@Test
 	public void noResourceFile() {
 		setLoggerLevel(RevisionInfoSetup.class, Level.OFF);
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.java
index 129442d44..88ce1208a 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.java
@@ -249,7 +249,7 @@ public class UserAccountsSelectorTest extends AbstractTestClass {
 		// user06 has no login count: reads as 0.
 		assertSelectedUris(10, "user07", "user03", "user06");
 	}
-	
+
 	@Test
 	public void sortByLastLoginTimeDescending() {
 		UserAccountsOrdering orderBy = new UserAccountsOrdering(
@@ -257,7 +257,7 @@ public class UserAccountsSelectorTest extends AbstractTestClass {
 		selectOnCriteria(3, 1, orderBy, "", "");
 		assertSelectedUris(10, "user08", "user10", "user09");
 	}
-	
+
 	// ----------------------------------------------------------------------
 	// filtering tests
 	// ----------------------------------------------------------------------
@@ -274,7 +274,7 @@ public class UserAccountsSelectorTest extends AbstractTestClass {
 		selectOnCriteria(20, 1, DEFAULT_ORDERING, NS_MINE + "role2", "");
 		assertSelectedUris(2, "user03", "user10");
 	}
-	
+
 	@Test
 	public void filterAgainstNoSuchRole() {
 		selectOnCriteria(20, 1, DEFAULT_ORDERING, "BogusRole", "");
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectorTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectorTest.java
index fd79b3b6b..fd6c1259a 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectorTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectorTest.java
@@ -220,13 +220,13 @@ public class ProxyRelationshipSelectorTest extends AbstractTestClass {
 
 	/**
 	 * test plan:
-	 * 
+	 *
 	 * <pre>
 	 * search tests: (repeat both views)
 	 *   some results
 	 *   no results
 	 *   special REGEX characters
-	 *   
+	 *
 	 *   profile w/no proxies
 	 * profile w/proxies
 	 * 	no associated profile
@@ -234,7 +234,7 @@ public class ProxyRelationshipSelectorTest extends AbstractTestClass {
 	 * 	profile w/no imageUrl
 	 * 	profile w/neither
 	 * 	profile w/both
-	 * 	
+	 *
 	 * proxy w/no profiles
 	 * proxy w profiles:
 	 * 	no classLabel
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiTest.java
index 31cfb5433..8fde7a742 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiTest.java
@@ -30,24 +30,24 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.model.RDFServiceMod
  */
 public class SparqlUpdateApiTest extends AbstractTestClass {
 
-    private final String GRAPH_URI = "http://example.org/graph"; 
-    
-    private final String updateStr1 = 
+    private final String GRAPH_URI = "http://example.org/graph";
+
+    private final String updateStr1 =
         "INSERT DATA { GRAPH <" + GRAPH_URI + "> { \n" +
-        "    <http://here.edu/n1> a <http://here.edu/Class1> . \n" +        
+        "    <http://here.edu/n1> a <http://here.edu/Class1> . \n" +
         "} } ; \n" +
         "INSERT { GRAPH <" + GRAPH_URI + "> { \n " +
-        "     ?x a <http://here.edu/Class2> . \n " +  
+        "     ?x a <http://here.edu/Class2> . \n " +
         "} } WHERE { \n" +
-        "    GRAPH <" + GRAPH_URI + "> { ?x a <http://here.edu/Class1> } \n " + 
+        "    GRAPH <" + GRAPH_URI + "> { ?x a <http://here.edu/Class1> } \n " +
         "}";
 
-    private final String result1 = 
+    private final String result1 =
         "<http://here.edu/n1> a <http://here.edu/Class1> . \n" +
         "<http://here.edu/n1> a <http://here.edu/Class2> ." ;
-    
+
     // look at how the SimpleReasoner is set up.
-    
+
     private Model model;
     private RDFService rdfService;
 
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java
index c6d011c8f..f15e05567 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java
@@ -160,7 +160,7 @@ public class AuthenticateTest extends AbstractTestClass {
 		adminPermissionSet.setUri(URI_DBA);
 		adminPermissionSet.setPermissionUris(Collections
 				.singleton(SimplePermission.SEE_SITE_ADMIN_PAGE.getUri()));
-		
+
 		userAccountsDao = new UserAccountsDaoStub();
 		userAccountsDao.addPermissionSet(adminPermissionSet);
 		for (UserAccount account : userAccounts) {
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEditTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEditTest.java
index 7be6885e6..806a295cb 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEditTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEditTest.java
@@ -16,44 +16,44 @@ import org.apache.jena.rdf.model.ModelFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 
 public class PrimitiveRdfEditTest {
-    
+
     OntModel testModel;
     WebappDaoFactory wdf;
 
-	private String testN3a = 
+	private String testN3a =
 		"<http://example.com/motorcycles/honda/vtl1000> <http://example.com/engines/displacement> \"1000cm3\" ." +
 		"<http://example.com/motorcycles/honda/919> <http://example.com/engines/displacement> \"919cm3\" ." ;
-	
-	private String testN3b = 
+
+	private String testN3b =
 		"<http://example.com/motorcycles/honda/919> <http://example.com/motorcycles/relatedTo> <http://exmaple.com/motorcycle/honda/599> ." ;
-	
-	
+
+
 	@Before
 	public void setUp() throws Exception { }
 
 	@Test
 	public void testProcessChanges() throws Exception {
 		OntModel writeModel = ModelFactory.createOntologyModel();
-        
+
 		int totalStmts = 3;
-		
+
 		PrimitiveRdfEdit pre = new PrimitiveRdfEdit();
 		String params[] = { testN3a, testN3b };
 		Set<Model> models = pre.parseRdfParam(params, "N3");
 		Assert.assertNotNull(models);
 		Assert.assertTrue( models.size() == 2);
-				
+
 		Assert.assertNotNull( writeModel );
 		long size = writeModel.size();
 		pre.processChanges("uri:fakeEditorUri", writeModel,
 				pre.mergeModels(models), ModelFactory.createDefaultModel());
 		Assert.assertEquals(size+totalStmts, writeModel.size());
-				
+
 		String params3[] = { testN3b };
-		Set<Model> retracts = pre.parseRdfParam( params3, "N3");		
-		pre.processChanges("uri:fakeEditorUri", writeModel, 
+		Set<Model> retracts = pre.parseRdfParam( params3, "N3");
+		pre.processChanges("uri:fakeEditorUri", writeModel,
 				ModelFactory.createDefaultModel(), pre.mergeModels(retracts));
-		Assert.assertEquals(size+totalStmts-1, writeModel.size());		
+		Assert.assertEquals(size+totalStmts-1, writeModel.size());
 	}
 
 	@Test
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsControllerTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsControllerTest.java
index 8521d5374..4dba1089e 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsControllerTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListClassGroupsControllerTest.java
@@ -21,33 +21,33 @@ import java.util.Collections;
 /**
  * Not a well-formed set of unit tests. But it's a pretty good exercise of the
  * different possibilities in the output stage.
- * 
+ *
  * Test plan:
- * 
+ *
  * <pre>
  * No data - roots is null -- NONSENSICAL
  * No data - roots is empty
- * 
+ *
  * name
  * no name
- * 
+ *
  * displayRank
  * no displayRank
- * 
+ *
  * no child classes
  * child classes
- * 
+ *
  * child class has name
  * child class has no name
- * 
+ *
  * child class has shortDef
  * child class has no shortDef
- * 
+ *
  * G1 no name, displayRank, no classes
  * G2 name, no displayRank, classes
  * G2C1 no name, no shortDef
- * G2C2 name, shortdef 
- * 
+ * G2C2 name, shortdef
+ *
  * Try once with no data
  * Try with all data
  * </pre>
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListControllerTestBase.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListControllerTestBase.java
index b17571957..5441cf349 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListControllerTestBase.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListControllerTestBase.java
@@ -23,7 +23,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem
 /**
  * Some useful methods for assembling JSON structures that will match the test
  * results.
- * 
+ *
  * Also, some methods for running the tests, with and without kluging the
  * results.
  */
@@ -136,7 +136,7 @@ public class ListControllerTestBase extends AbstractTestClass {
 	 * That jsonTree would be an standard JSON array, except that it is missing
 	 * the enclosing brackets, so we need to add them before comparing to the
 	 * expected value.
-	 * 
+	 *
 	 * Add the brackets, read the strings, and compare.
 	 */
 	protected static void assertMatchingJson(FreemarkerHttpServlet controller,
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesControllerTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesControllerTest.java
index 30bd1ccde..97a5e22a4 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesControllerTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesControllerTest.java
@@ -29,46 +29,46 @@ import stubs.javax.servlet.http.HttpServletRequestStub;
 /**
  * Not a well-formed set of unit tests. But it's a pretty good exercise of the
  * different possibilities in the output stage.
- * 
+ *
  * Test plan:
- * 
+ *
  * <pre>
  * No data - roots is null -- NONSENSICAL
  * No data - roots is empty
- * 
+ *
  * Ontology is not specified
  * Ontology is specified and matches
  * Ontology is specified and does not match
  * DataProperty does not match Ontology, but has child properties that do.
- * 
+ *
  * Name from picklistName
  * Name from getName
  * Name from getUri
  * Name no URL? -- NONSENSICAL
- * 
+ *
  * InternalName from picklistName
  * InternalName missing.
- * 
+ *
  * Domain class no class URI
  * Domain class no class for URI
  * Domain class get picklistName from Language Aware DAO
  * Domain class use picklistName from Language Neutral DAO
- * 
+ *
  * Range no range URI
  * Range no datatype for URI
  * Range datatype has no name
  * Range has a name
- * 
+ *
  * Group no group URI
  * Group no group for URI
  * Group no name
  * Group has a name
- * 
+ *
  * DP1 Ont1, no name, no picklistName, no domainClass, no RangeClass, no GroupURI
  * DP2 Ont2, name, no picklistName, no domain class for URI, no range datatype for URI, no group for GroupURI
  * DP3 Ont1, picklistname, domainclass no picklistname, range datatype with no name, group has no name
  * DP4 Ont1, picklistname, domainclass w/picklistname, range datatype with name, group with name
- * 
+ *
  * Try once with no data
  * Try with all data and no ontology specified
  * Try with all data and Ont1, Ont2, Ont3
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyGroupsControllerTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyGroupsControllerTest.java
index 6e6bb3310..77529f8b4 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyGroupsControllerTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyGroupsControllerTest.java
@@ -24,35 +24,35 @@ import stubs.javax.servlet.http.HttpServletRequestStub;
 /**
  * Not a well-formed set of unit tests. But it's a pretty good exercise of the
  * different possibilities in the output stage.
- * 
+ *
  * Test plan:
- * 
+ *
  * <pre>
  * No data - roots is null -- NONSENSICAL
  * No data - roots is empty
- * 
+ *
  * name
  * no name - (unnamed group)
- * 
+ *
  * display rank
  * no display rank
- * 
+ *
  * no child properties
  * child property is data property
  * child properti is object property
- * 
+ *
  * child data property has no name
  * child data property has name
  * child object property has no domainPublic
  * child object property has domainPublic
- * 
+ *
  * G1 no name, displayRank, no classes
  * G2 name, no displayRank, classes
  * G2DP1 no name, no shortDef
- * G2DP2 name, shortdef 
+ * G2DP2 name, shortdef
  * G2OP1 no domainPublic, no shortDef
- * G2OP2 domainPublic, shortdef 
- * 
+ * G2OP2 domainPublic, shortdef
+ *
  * Try once with no data
  * Try with all data
  * </pre>
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsControllerTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsControllerTest.java
index 773616d5b..738634e35 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsControllerTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsControllerTest.java
@@ -30,44 +30,44 @@ import stubs.javax.servlet.http.HttpServletRequestStub;
 /**
  * Not a well-formed set of unit tests. But it's a pretty good exercise of the
  * different possibilities in the output stage.
- * 
+ *
  * Test plan:
- * 
+ *
  * <pre>
  * No data - roots is null -- NONSENSICAL
  * No data - roots is empty
- * 
+ *
  * Ontology is not specified
  * Ontology is specified and matches
  * Ontology is specified and does not match
  * DataProperty does not match Ontology, but has child properties that do.
- * 
+ *
  * Name from picklistName
  * Name from getUri
  * Name no URL? -- NONSENSICAL
- * 
+ *
  * InternalName from localNameWithPrefix
  * InternalName from localName
  * InternalName from URI
- * 
+ *
  * Domain class no class URI
  * Domain class no class for URI
  * Domain class use picklistName
- * 
+ *
  * Range class no class URI
  * Range class no class for URI
  * Range class use picklistName
- * 
+ *
  * Group no group URI
  * Group no group for URI
  * Group no name
  * Group has a name
- * 
+ *
  * OP1 Ont1, no picklistName, no localNameWithPrefix, no domainClass, no rangeClass, no GroupURI
  * OP2 Ont2, picklistName, no localNameWithPrefix, no domain class for URI, no range class for URI, no group for GroupURI
  * OP3 Ont1, picklistName, localNameWithPrefix, domainclass no picklistname, range class no picklistname, group has no name
  * OP4 Ont1, picklistName, localNameWithPrefix, domainclass w/picklistname, range class w/picklistname, group with name
- * 
+ *
  * Try once with no data
  * Try with all data and no ontology specified
  * Try with all data and Ont1, Ont2, Ont3
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsControllerTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsControllerTest.java
index 6df219b9f..26ebc5e4a 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsControllerTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsControllerTest.java
@@ -25,38 +25,38 @@ import stubs.javax.servlet.http.HttpServletRequestStub;
 /**
  * Not a well-formed set of unit tests. But it's a pretty good exercise of the
  * different possibilities in the output stage.
- * 
+ *
  * Test plan:
- * 
+ *
  * <pre>
- * 
+ *
  * Ontology is not specified
  * Ontology is specified and matches
  * Ontology is specified and does not match
- * 
+ *
  * classes = empty
  * classes = null -- UNREALISTIC
- * 
+ *
  * no pickListName
  * pickListName
- * 
+ *
  * shortDef
  * no shortDef
- * 
+ *
  * no group uri
  * no group for uri
  * no name for group
  * group with name
- * 
+ *
  * ontology not found
  * ontology no name
  * ontology with name
- * 
+ *
  * VC1 - Ont1, no pickListName, no shortDef, no GroupURI, no matching Ontology
  * VC2 - Ont2, pickListName, shortDef, no group for GroupURI, ontology has no name
  * VC3 - Ont2, pickListName, shortDef, group has no name, ontology with name
  * VC4 - Ont1, pickListName, shortDef, group with name, no matching Ontology
- * 
+ *
  * Try once with no data
  * Try with all data and no ontology specified
  * Try with all data and Ont1, Ont2, Ont3
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyControllerTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyControllerTest.java
index d64362f67..0c611433b 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyControllerTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowClassHierarchyControllerTest.java
@@ -27,38 +27,38 @@ import stubs.javax.servlet.http.HttpServletRequestStub;
 /**
  * Not a well-formed set of unit tests. But it's a pretty good exercise of the
  * different possibilities in the output stage.
- * 
+ *
  * Test plan:
- * 
+ *
  * <pre>
  * No data - roots is null -- NONSENSICAL
  * No data - roots is empty
- * 
+ *
  * Ontology is not specified
  * Ontology is specified and matches
  * Ontology is specified and does not match
  * VClass does not match Ontology, but has child properties that do.
- * 
+ *
  * pickListName
  * no pickListName
- * 
+ *
  * shortDef
  * no shortDef
- * 
+ *
  * Group no group URI
  * Group no group for URI
  * Group no name
  * Group has a name
- * 
+ *
  * No ontology for namespace
  * Ontology but no name
  * Ontology with name
- * 
+ *
  * DP_1A Ont1, no pickListName, no shortDef, no GroupURI, no matching Ontology
  * DP_1B Ont2, pickListName, shortDef, no group for GroupURI, ontology has no name
  * DP_1B2A Ont3, pickListName, shortDef, group has no name, ontology with name
  * DP_1B2B Ont1, pickListName, shortDef, group with name, no matching Ontology
- * 
+ *
  * Try once with no data
  * Try with all data and no ontology specified
  * Try with all data and Ont1, Ont2, Ont3
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyControllerTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyControllerTest.java
index af7bb0eee..aae0a30a4 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyControllerTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowDataPropertyHierarchyControllerTest.java
@@ -29,49 +29,49 @@ import stubs.javax.servlet.http.HttpServletRequestStub;
 /**
  * Not a well-formed set of unit tests. But it's a pretty good exercise of the
  * different possibilities in the output stage.
- * 
+ *
  * Test plan:
- * 
+ *
  * <pre>
  * No data - roots is null -- NONSENSICAL
  * No data - roots is empty
- * 
+ *
  * Ontology is not specified
  * Ontology is specified and matches
  * Ontology is specified and does not match
  * DataProperty does not match Ontology, but has child properties that do.
- * 
+ *
  * Name from picklistName
  * Name from getName
  * Name from getUri
  * Name no URL? -- NONSENSICAL
- * 
+ *
  * InternalName from picklistName
  * InternalName missing.
- * 
+ *
  * Domain class no class URI
  * Domain class no class for URI
  * Domain class get picklistName from Language Aware DAO
  * Domain class use picklistName from Language Neutral DAO
- * 
+ *
  * Range no range URI
  * Range no datatype for URI
  * Range datatype has no name
  * Range has a name
- * 
+ *
  * Group no group URI
  * Group no group for URI
  * Group no name
  * Group has a name
- * 
+ *
  * Children no children
  * Children sorted by picklist
- * 
+ *
  * DP_1A Ont1, no name, no picklistName, no domainClass, no RangeClass, no GroupURI
  * DP_1B Ont2, name, no picklistName, no domain class for URI, no range datatype for URI, no group for GroupURI
  * DP_1B2A Ont1, picklistname, domainclass no picklistname, range datatype with no name, group has no name
  * DP_1B2B Ont1, picklistname(less than 1B2A), domainclass w/picklistname, range datatype with name, group with name
- * 
+ *
  * Try once with no data
  * Try with all data and no ontology specified
  * Try with all data and Ont1, Ont2, Ont3
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyControllerTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyControllerTest.java
index c5acb6871..0a52906c5 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyControllerTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ShowObjectPropertyHierarchyControllerTest.java
@@ -29,48 +29,48 @@ import stubs.javax.servlet.http.HttpServletRequestStub;
 /**
  * Not a well-formed set of unit tests. But it's a pretty good exercise of the
  * different possibilities in the output stage.
- * 
+ *
  * Test plan:
- * 
+ *
  * <pre>
  * No data - roots is null -- NONSENSICAL
  * No data - roots is empty
- * 
+ *
  * Ontology is not specified
  * Ontology is specified and matches
  * Ontology is specified and does not match
  * ObjectProperty does not match Ontology, but has child properties that do.
- * 
+ *
  * Name from picklistName
  * Name from getLocalName
  * Name no URL? -- NONSENSICAL
- * 
+ *
  * InternalName from localNameWithPrefix
  * InternalName from localName
- * 
+ *
  * Domain class no class URI
  * Domain class no class for URI
  * Domain class get picklistName from Language Aware DAO
  * Domain class use picklistName from Language Neutral DAO
- * 
+ *
  * Range class no class URI
  * Range class no class for URI
  * Range class get picklistName from Language Aware DAO
  * Range class use picklistName from Language Neutral DAO
- * 
+ *
  * Group no group URI
  * Group no group for URI
  * Group no name
  * Group has a name
- * 
+ *
  * Children no children
  * Children sorted by picklist
- * 
+ *
  * DP_1A Ont1, no name, no localnamewithprefix, no picklistName, no domainClass, no RangeClass, no GroupURI
  * DP_1B Ont2, name, no localnamewithprefix, no picklistName, no domain class for URI, no range clqss for URI, no group for GroupURI
  * DP_1B2A Ont1, name, localnamewithprefix, picklistname, domainclass no picklistname, range class with no picklistname, group has no name
  * DP_1B2B Ont1, name, localnamewithprefix, picklistname(less than 1B2A), domain class w/picklistname, range class w/picklistname, group with name
- * 
+ *
  * Try once with no data
  * Try with all data and no ontology specified
  * Try with all data and Ont1, Ont2, Ont3
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilderTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilderTest.java
index 99ef83de6..e7872e6d1 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilderTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilderTest.java
@@ -20,26 +20,26 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.web.URLEncoder;
 
 public class UrlBuilderTest extends AbstractTestClass {
-    
+
     @Test
     public void testGetUrl() {
         UrlBuilder.contextPath = "/vivo";
-        
+
         String path1 = "/individual";
         Assert.assertEquals("/vivo/individual", UrlBuilder.getUrl(path1));
-        
+
         int portalId = 1;
         String path2 = "/individual?home=" + portalId;
         Assert.assertEquals("/vivo/individual?home=1", UrlBuilder.getUrl(path2));
     }
-    
+
     @Test
     public void testGetUrlWithEmptyContext() {
         UrlBuilder.contextPath = "";
         String path = "/individual";
         Assert.assertEquals(path, UrlBuilder.getUrl(path));
     }
-    
+
     @Test
     public void testGetUrlWithParams() {
         UrlBuilder.contextPath = "/vivo";
@@ -58,16 +58,16 @@ public class UrlBuilderTest extends AbstractTestClass {
         ParamMap params = new ParamMap();
         String vClassUri = "http://vivoweb.org/ontology/core#FacultyMember";
         params.put("vclassId", vClassUri);
-        Assert.assertEquals("/vivo/individuallist?vclassId=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23FacultyMember", UrlBuilder.getUrl(path, params));    
+        Assert.assertEquals("/vivo/individuallist?vclassId=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23FacultyMember", UrlBuilder.getUrl(path, params));
     }
-    
+
     @Test
     public void testDecodeUrl() {
         String vClassUri = "http://vivoweb.org/ontology/core#FacultyMember";
         String vClassUriEncoded = "http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23FacultyMember";
-        Assert.assertEquals(vClassUri, UrlBuilder.urlDecode(vClassUriEncoded));          
+        Assert.assertEquals(vClassUri, UrlBuilder.urlDecode(vClassUriEncoded));
     }
-    
+
 
     @Test
     public void testUtf8Encode(){
@@ -83,43 +83,43 @@ public class UrlBuilderTest extends AbstractTestClass {
     public void testDecodeUtf8Url() {
         String vClassUri = "http://vivoweb.org/ontology/core#FacultyMember\u2605"; // \u2605 is Unicode for a five-pointed star.
         String vClassUriEncoded = "http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23FacultyMember%E2%98%85";
-        Assert.assertEquals(vClassUri, UrlBuilder.urlDecode(vClassUriEncoded));          
+        Assert.assertEquals(vClassUri, UrlBuilder.urlDecode(vClassUriEncoded));
     }
 
-    
-    @Test 
+
+    @Test
     public void testGetIndividualProfileURI(){
         VitroRequest vreq = makeMockVitroRequest( "http://example.com/individual/");
         UrlBuilder.contextPath = "http://example.com";
-        
+
         String uri = "http://example.com/individual/n2343";
         String url = UrlBuilder.getIndividualProfileUrl(uri, vreq);
         Assert.assertEquals("http://example.com/display/n2343", url);
-                
-        uri = "http://example.com/individual/bob";                
+
+        uri = "http://example.com/individual/bob";
         url = UrlBuilder.getIndividualProfileUrl(uri, vreq);
         Assert.assertEquals("http://example.com/display/bob",url);
-        
-        uri = "http://nondefaultNS.com/individual/n2343";                
+
+        uri = "http://nondefaultNS.com/individual/n2343";
         url = UrlBuilder.getIndividualProfileUrl(uri, vreq);
         Assert.assertEquals("http://example.com/individual?uri=" + URLEncoder.encode(uri), url);
-        
-        uri = "http://example.com/individual#n2343";                
+
+        uri = "http://example.com/individual#n2343";
         url = UrlBuilder.getIndividualProfileUrl(uri, vreq);
         Assert.assertEquals("http://example.com/individual?uri=" + URLEncoder.encode(uri), url);
-        
-        uri = "http://example.com/individual/5LNCannotStartWithNumber";                
+
+        uri = "http://example.com/individual/5LNCannotStartWithNumber";
         url = UrlBuilder.getIndividualProfileUrl(uri, vreq);
-        Assert.assertEquals("http://example.com/individual?uri=" + URLEncoder.encode(uri), url);        
+        Assert.assertEquals("http://example.com/individual?uri=" + URLEncoder.encode(uri), url);
     }
-    
-    protected VitroRequest makeMockVitroRequest( final String defaultNS){        
-        HttpServletRequest req = createMock( HttpServletRequest.class );        
+
+    protected VitroRequest makeMockVitroRequest( final String defaultNS){
+        HttpServletRequest req = createMock( HttpServletRequest.class );
         return new VitroRequest(req){
-            
+
             @Override
             public String getParameter(String key){ return null; }
-            
+
             @Override
             public WebappDaoFactory getWebappDaoFactory(){
                 return makeMockWDF(defaultNS);
@@ -131,34 +131,34 @@ public class UrlBuilderTest extends AbstractTestClass {
         wdf.setDefaultNamespace("http://example.com/individual/");
         ApplicationDaoStub aDao = new ApplicationDaoStub(){
             @Override
-            public boolean isExternallyLinkedNamespace(String ns){                
+            public boolean isExternallyLinkedNamespace(String ns){
                 return false;
             }
-        };        
+        };
         wdf.setApplicationDao( aDao );
         return wdf;
     }
-    
+
     @Test
-    public void testIsUriInDefaultNamespace(){        
+    public void testIsUriInDefaultNamespace(){
         String[][] examples = {
                 { "http://example.com/individual/n3234", "http://example.com/individual/"},
                 { "http://example.com/individual#n3234", "http://example.com/individual#"},
                 { "http://example.com:8080/individual/n3234", "http://example.com:8080/individual/"},
-                { "http://example.com:8080/individual#n3234", "http://example.com:8080/individual#"}                
+                { "http://example.com:8080/individual#n3234", "http://example.com:8080/individual#"}
         };
 
         for( String[] example : examples ){
             Assert.assertTrue("expected '"+ example[0] + "' to be in the default NS of '"+example[1]+"'",
-                    UrlBuilder.isUriInDefaultNamespace(example[0], example[1]));    
-        }            
-        
-        String[][] counterExamples = {                
+                    UrlBuilder.isUriInDefaultNamespace(example[0], example[1]));
+        }
+
+        String[][] counterExamples = {
                 { "http://example.com/individual/5LNCannotStartWithNumber", "http://example.com/individual/" }
         };
         for( String[] example : counterExamples ){
             Assert.assertFalse("expected '"+ example[0] + "' to NOT be in the default NS of '"+example[1]+"'",
-                    UrlBuilder.isUriInDefaultNamespace(example[0], example[1]));    
+                    UrlBuilder.isUriInDefaultNamespace(example[0], example[1]));
         }
     }
 
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServletTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServletTest.java
index 2e3b96f17..249e94bc4 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServletTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServletTest.java
@@ -37,14 +37,14 @@ public class JSONReconcileServletTest extends AbstractTestClass {
 	@Before
 	public void setup() throws Exception {
 		ApplicationStub.setup(new ServletContextStub(), new SearchEngineStub());
-		
+
 		request = new HttpServletRequestStub();
 		request.setRequestUrl(new URL("http://vivo.this.that/reconcile"));
 		request.setMethod("POST");
 		response = new HttpServletResponseStub();
 		reconcile = new JSONReconcileServlet();
 	}
-	
+
 	@Test
 	public void getMetadata() {
 		int serverPort = 8080;
@@ -62,7 +62,7 @@ public class JSONReconcileServletTest extends AbstractTestClass {
 		Assert.assertNotNull("output should not be null", jsonResult);
 		Assert.assertEquals("schemaSpaceOutput", defaultNamespace, schemaSpaceOutput);
 	}
-	
+
 	@Test
 	public void getQuery() {
 		// contruct query
@@ -85,7 +85,7 @@ public class JSONReconcileServletTest extends AbstractTestClass {
 		testAssertTrue(messagePrefix + orgType, orgType, searchQuery.toString());
 		testAssertTrue(messagePrefix + nameType, orgType, searchQuery.toString());
 	}
-	
+
 	private void testAssertTrue(String message, String inputStr, String resultStr) {
 		try {
 		    Pattern regex = Pattern.compile(inputStr, Pattern.CASE_INSENSITIVE);
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServletTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServletTest.java
index dbbc82ab2..9337835df 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServletTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServletTest.java
@@ -44,14 +44,14 @@ public class JsonServletTest extends AbstractTestClass {
 
 	/**
 	 * Test plan
-	 * 
+	 *
 	 * <pre>
-	 * 
+	 *
 	 * GetEntitiesByVClass, GetEntitiesByVClassContinuation
 	 * 	from ents_edit.js
 	 * 		ents_edit_head.jsp
 	 *  (there is an ents_edit.jsp, invoked from EntityEditController, which does not seem to invoke ents_edit.js)
-	 * 
+	 *
 	 * GetSearchIndividualsByVClass
 	 * 	Mock out search engine and IndividualDao
 	 *  invoked by BrowseDataGetter.java
@@ -59,7 +59,7 @@ public class JsonServletTest extends AbstractTestClass {
 	 *  invoked by ClassGroupPageData.java
 	 *  	>>>> Bring up "People" tab.
 	 *  invoked by BrowseWidget.java
-	 * 
+	 *
 	 * GetSearchIndividualsByVClasses
 	 * 	Mock out search engine and IndividualDao
 	 *  invoked by IndividualsForClassesDataGetter.java
@@ -70,7 +70,7 @@ public class JsonServletTest extends AbstractTestClass {
 	 *  		MenuManagementEdit.java
 	 *  		MenuManagementController.java
 	 *  	extended in vivo by InternalClassesDataGetter, also invoked by SelectDataGetterUtils
-	 * 
+	 *
 	 * GetDataForPage
 	 * 	Mock out PageDao
 	 * </pre>
@@ -142,7 +142,7 @@ public class JsonServletTest extends AbstractTestClass {
 	 * concrete class instead of an interface, so we can't replace the instance
 	 * with one we like better. Furthermore, VClassGroupCache has a private
 	 * constructor, so we can't change its behavior at all.
-	 * 
+	 *
 	 * Also test: success but no VClasses found, success with one VClass,
 	 * success with multiple VClasses. In each case, confirm proper status,
 	 * character encoding, and content type on the response.
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitroTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitroTest.java
index b296f1d75..84513a9a1 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitroTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitroTest.java
@@ -33,71 +33,71 @@ public class NewURIMakerVitroTest extends AbstractTestClass{
 		newResources.put("page", null);
 		newResources.put("menuItem", null);
 		newResources.put("dataGetter", null);
-		
+
 		//Setup webappdaofactory
 		WebappDaoFactoryJena wadf = this.setupWebappDaoFactory();
 		NewURIMakerVitro nv = new NewURIMakerVitro(wadf);
-		
+
 		//Now test for new URI
-		HashMap<String,String> varToNewURIs = new HashMap<String,String>();       
+		HashMap<String,String> varToNewURIs = new HashMap<String,String>();
 		try {
 			for (String key : newResources.keySet()) {
 	           String prefix = newResources.get(key);
-	           String uri = nv.getUnusedNewURI(prefix);                        
-	           varToNewURIs.put(key, uri);  
-			}  
+	           String uri = nv.getUnusedNewURI(prefix);
+	           varToNewURIs.put(key, uri);
+			}
 		} catch(Exception ex) {
 			System.out.println("Error occurred " + ex);
 		}
-		
+
 		//Ensure that URIs are not included more than once
 		List<String> values = new ArrayList<String>(varToNewURIs.values());
 		Set<String> valuesSet = new HashSet<String>(varToNewURIs.values());
 		assertTrue(valuesSet.size() == values.size());
 
 	}
-	
+
 	@Test
 	public void testNonNullNamespace() {
 		//Three items needs new URIs assigned in the default namespace
 		//Var name to namespace, in this case null to denote default namespace
 		Map<String,String> newResources = new HashMap<String, String>();
 		newResources.put("page", "http://displayOntology/test/n12");
-	
-		
+
+
 		//Setup webappdaofactory
 		WebappDaoFactoryJena wadf = this.setupWebappDaoFactory();
 		NewURIMakerVitro nv = new NewURIMakerVitro(wadf);
-		
+
 		//Now test for new URI
-		HashMap<String,String> varToNewURIs = new HashMap<String,String>();       
+		HashMap<String,String> varToNewURIs = new HashMap<String,String>();
 		try {
 			for (String key : newResources.keySet()) {
 	           String prefix = newResources.get(key);
-	           String uri = nv.getUnusedNewURI(prefix);                        
-	           varToNewURIs.put(key, uri);  
-			}  
+	           String uri = nv.getUnusedNewURI(prefix);
+	           varToNewURIs.put(key, uri);
+			}
 		} catch(Exception ex) {
 			System.out.println("Error occurred " + ex);
 		}
-		
+
 		//Ensure that URIs are not included more than once
 		List<String> values = new ArrayList<String>(varToNewURIs.values());
 		Set<String> valuesSet = new HashSet<String>(varToNewURIs.values());
 		assertTrue(valuesSet.size() == values.size());
 	}
-	
+
 	private WebappDaoFactoryJena setupWebappDaoFactory() {
 		String defaultNamespace= "http://vivo.mannlib.cornell.edu/individual/";
 		String testNamespace = "http://displayOntology/test/";
-		OntModel ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		ontModel.add(
 				ontModel.createResource(defaultNamespace + "n234"),
-				RDF.type, 
+				RDF.type,
 				OWL.Thing);
 		ontModel.add(
 				ontModel.createResource(testNamespace + "n234"),
-				RDF.type, 
+				RDF.type,
 				OWL.Thing);
 		OntModelSelector selector = new SimpleOntModelSelector(ontModel);
 		//Set up default namespace somewhere?
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFilteringByStatementTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFilteringByStatementTest.java
index ac6a270fe..757276465 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFilteringByStatementTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFilteringByStatementTest.java
@@ -36,7 +36,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
  * Test that the IndividualFiltering class filters by statements as much as
  * possible. That way the filter can consider the subject of the statement as
  * well as the predicate, when deciding whether to authorize the request.
- * 
+ *
  * <pre>
  * Start with six properties and a filter that recognizes them.
  *    DATA_HIDDEN -- never approved
@@ -44,13 +44,13 @@ import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
  *    DATA_MAYBE -- only approved in statements with subject of SPECIAL URI.
  *    OBJECT_HIDDEN -- never approved
  *    OBJECT_VISIBLE -- always approved
- *    OBJECT_MAYBE -- only approved in statements with subject or object of SPECIAL URI. 
- * 
- * Test all of the filtering methods on two filtered individuals. 
+ *    OBJECT_MAYBE -- only approved in statements with subject or object of SPECIAL URI.
+ *
+ * Test all of the filtering methods on two filtered individuals.
  *    One is SPECIAL_URI, and should see the MAYBE properties.
  *    One is ordinary, and should not see the MAYBE properties.
  * </pre>
- * 
+ *
  * This is a simplification of a "self-editing" filter, which shows some
  * properties, hides others, and allows some of the hidden ones in statements,
  * depending on the subject and/or object of the statement.
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFiltersFactoryTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFiltersFactoryTest.java
index 39e24cff7..90568965c 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFiltersFactoryTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/VitroFiltersFactoryTest.java
@@ -21,77 +21,77 @@ public class VitroFiltersFactoryTest {
 
 //    @Test
 //    public void testSunsetWindowFilterOnListOfEnts() {
-//        DateTime easyDate = new org.joda.time.DateTime(2005,1,1,0,0,0,0); //2005-01-01        
+//        DateTime easyDate = new org.joda.time.DateTime(2005,1,1,0,0,0,0); //2005-01-01
 //        Date givenDate = easyDate.toDate();
-//        
+//
 //        VitroFilters vf = FiltersForTabs.getSunsetWindowFilter(givenDate);
 //        Assert.assertNotNull(vf);
 //        checkFilterForNull(vf);
-//        
+//
 //        List<Individual> ents = new LinkedList();
 //        for( int i = 0; i< 10; i++){
 //            Individual ent = new IndividualImpl();
 //            ent.setSunrise( null );
 //            ent.setSunset(  null );
-//            ents.add(ent);        
+//            ents.add(ent);
 //        }
-//        
+//
 //        BaseFiltering bf = new BaseFiltering();
 //        List filtered = bf.filter(ents,vf.getIndividualFilter());
 //        Assert.assertNotNull(filtered);
-//        Assert.assertTrue("expcted to filter no entities, filtered out " + (10-filtered.size()), 
+//        Assert.assertTrue("expcted to filter no entities, filtered out " + (10-filtered.size()),
 //                filtered.size() == 10);
-//        
+//
 //        Individual ent = new IndividualImpl();
 //        ent.setSunrise( easyDate.minusDays(3).toDate() );
 //        ent.setSunset( easyDate.plusDays(3).toDate() );
 //        ents.add(ent);
-//        
+//
 //        filtered = bf.filter(ents,vf.getIndividualFilter());
 //        Assert.assertNotNull(filtered);
-//        Assert.assertTrue("expcted to filter no entities, filtered out " + (11-filtered.size()), 
+//        Assert.assertTrue("expcted to filter no entities, filtered out " + (11-filtered.size()),
 //                filtered.size() == 11);
-//        
+//
 //        ent = new IndividualImpl();
 //        ent.setSunrise( easyDate.minusDays(100).toDate() );
 //        ent.setSunset( easyDate.minusDays(110).toDate() );
 //        ents.add(ent);
-//        
+//
 //        filtered = bf.filter(ents,vf.getIndividualFilter());
 //        Assert.assertNotNull(filtered);
-//        Assert.assertTrue("expcted to filter one entity, filtered out " + (12-filtered.size()), 
+//        Assert.assertTrue("expcted to filter one entity, filtered out " + (12-filtered.size()),
 //                filtered.size() == 11);
-//        
+//
 //        long count = Summarize.count(ents,vf.getIndividualFilter());
 //        Assert.assertTrue("expected 12, got " + ents.size(), ents.size() == 12);
 //        Assert.assertTrue("expected count of 11, got " + count , count == 11);
-//        
+//
 //        long a = 20000;
 //        int b = (int)a;
 //        Assert.assertTrue( b == 20000);
 //    }
-    
+
 //    @Test
 //    public void testGetSunsetWindowFilter() {
-//        DateTime easyDate = new org.joda.time.DateTime(2005,1,1,0,0,0,0); //2005-01-01        
+//        DateTime easyDate = new org.joda.time.DateTime(2005,1,1,0,0,0,0); //2005-01-01
 //        Date givenDate = easyDate.toDate();
-//        
+//
 //        VitroFilters vf = FiltersForTabs.getSunsetWindowFilter(givenDate);
 //        Assert.assertNotNull(vf);
 //        checkFilterForNull(vf);
-//        
+//
 //        Individual ent = new IndividualImpl();
 //        ent.setSunrise( easyDate.minusDays(3).toDate() );
 //        ent.setSunset( easyDate.plusDays(3).toDate() );
 //        Assert.assertTrue(vf.getIndividualFilter().fn( ent ) );
-//                
+//
 //        ent.setSunrise( easyDate.toDate() );
 //        Assert.assertTrue("items should be not filtered on first sunrise day", vf.getIndividualFilter().fn(ent));
-//        
+//
 //        ent.setSunrise( easyDate.minusDays(3).toDate() );
 //        ent.setSunset( easyDate.minusDays( 2 ).toDate() );
 //        Assert.assertFalse("should be sunset and filtered out", vf.getIndividualFilter().fn( ent ));
-//        
+//
 //        ent.setSunrise( easyDate.plusDays(3).toDate() );
 //        ent.setSunset( easyDate.plusDays( 10 ).toDate() );
 //        Assert.assertFalse("should not yet be sunrised and filtered out", vf.getIndividualFilter().fn( ent ));
@@ -99,20 +99,20 @@ public class VitroFiltersFactoryTest {
 //        ent.setSunrise( null  );
 //        ent.setSunset( null  );
 //        Assert.assertTrue("nulls should not throw exceptions and and not be filtered out", vf.getIndividualFilter().fn( ent ));
-//        
+//
 //        //should work with webapp too
 //        Individual entwa = new IndividualImpl();
 //        entwa.setSunrise( easyDate.minusDays(3).toDate() );
 //        entwa.setSunset( easyDate.plusDays(3).toDate() );
 //        Assert.assertTrue(vf.getIndividualFilter().fn( entwa ) );
-//                
+//
 //        entwa.setSunrise( easyDate.toDate() );
 //        Assert.assertTrue("items should be not filtered on first sunrise day", vf.getIndividualFilter().fn(entwa));
-//        
+//
 //        entwa.setSunrise( easyDate.minusDays(3).toDate() );
 //        entwa.setSunset( easyDate.minusDays( 2 ).toDate() );
 //        Assert.assertFalse("should be sunset and filtered out", vf.getIndividualFilter().fn( entwa ));
-//        
+//
 //        entwa.setSunrise( easyDate.plusDays(3).toDate() );
 //        entwa.setSunset( easyDate.plusDays( 10 ).toDate() );
 //        Assert.assertFalse("should not yet be sunrised and filtered out", vf.getIndividualFilter().fn( entwa ));
@@ -124,18 +124,18 @@ public class VitroFiltersFactoryTest {
 //        //ObjectPropertyStatements
 //        ObjectPropertyStatement ops = new ObjectPropertyStatementImpl();
 //        ops.setObject(entwa);
-//                
+//
 //        entwa.setSunrise( easyDate.minusDays(3).toDate() );
 //        entwa.setSunset( easyDate.plusDays(3).toDate() );
 //        Assert.assertTrue(vf.getIndividualFilter().fn( entwa ) );
-//                
+//
 //        entwa.setSunrise( easyDate.toDate() );
 //        Assert.assertTrue("items should be not filtered on first sunrise day", vf.getObjectPropertyStatementFilter().fn(ops));
-//        
+//
 //        entwa.setSunrise( easyDate.minusDays(3).toDate() );
 //        entwa.setSunset( easyDate.minusDays( 2 ).toDate() );
 //        Assert.assertFalse("should be sunset and filtered out", vf.getObjectPropertyStatementFilter().fn(ops));
-//        
+//
 //        entwa.setSunrise( easyDate.plusDays(3).toDate() );
 //        entwa.setSunset( easyDate.plusDays( 10 ).toDate() );
 //        Assert.assertFalse("should not yet be sunrised and filtered out", vf.getObjectPropertyStatementFilter().fn(ops));
@@ -143,10 +143,10 @@ public class VitroFiltersFactoryTest {
 //        entwa.setSunrise( null  );
 //        entwa.setSunset( null );
 //        Assert.assertTrue("null should not throw exceptions and should not be filtered out", vf.getObjectPropertyStatementFilter().fn(ops));
-//        
+//
 //        ops.setSunrise( null );
 //        ops.setSunset(  null );
-//        Assert.assertTrue("null should not throw exceptions and should not be filtered out", vf.getObjectPropertyStatementFilter().fn( ops ) );                       
+//        Assert.assertTrue("null should not throw exceptions and should not be filtered out", vf.getObjectPropertyStatementFilter().fn( ops ) );
 //
 //        //DataPropertyStatements
 //        DataPropertyStatement dps = new DataPropertyStatementImpl();
@@ -160,7 +160,7 @@ public class VitroFiltersFactoryTest {
 //
 //        dps.setSunrise( null );
 //        dps.setSunset(  null );
-//        Assert.assertTrue("should be not throw exceptions and should not be filtered out", vf.getDataPropertyStatementFilter().fn( dps ) );                       
+//        Assert.assertTrue("should be not throw exceptions and should not be filtered out", vf.getDataPropertyStatementFilter().fn( dps ) );
 //
 //    }
 
@@ -169,20 +169,20 @@ public class VitroFiltersFactoryTest {
         VitroFilters vf = VitroFilterUtils.getTestFilter();
         checkFilterForNull(vf);
         ArrayList<Individual> ents = new ArrayList<Individual>();
-        
+
         String[] names = {"Greg", "gary", "bob", "Sue", "jim" };
         for( String name : names){
             Individual ent = new IndividualImpl();
             ent.setName(name);
-            ents.add(ent);            
+            ents.add(ent);
         }
-        
+
         BaseFiltering bf = new BaseFiltering();
         List<Individual> filteredEnts = bf.filter(ents,vf.getIndividualFilter());
         Assert.assertNotNull(filteredEnts);
-        Assert.assertEquals("did not filter correctly", 2, filteredEnts.size());        
-    }         
-    
+        Assert.assertEquals("did not filter correctly", 2, filteredEnts.size());
+    }
+
     public void checkFilterForNull(VitroFilters vf){
         Assert.assertNotNull("filter was null", vf);
         Assert.assertNotNull("getClassFilter was null", vf.getClassFilter());
@@ -193,14 +193,14 @@ public class VitroFiltersFactoryTest {
         Assert.assertNotNull("getIndividualFilter was null", vf.getIndividualFilter());
         Assert.assertNotNull("getVClassGroupFilter was null", vf.getVClassGroupFilter());
     }
-    
-    @Test 
+
+    @Test
     public void testRoleLevelFilter(){
-        
+
     }
-    
-    
+
+
     private boolean ACCEPT= true;
     private boolean REJECT= false;
-    
+
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJenaTest.java
index 431c251b4..8548ea76d 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJenaTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJenaTest.java
@@ -20,48 +20,48 @@ import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 
 /**
- * 
- * 
+ *
+ *
  */
 
 public class DataPropertyDaoJenaTest extends AbstractTestClass {
-    
+
 	@Test
-	// Test that the DataPropertyDaoJena::updateDataProperty method will only update the jena model for 
+	// Test that the DataPropertyDaoJena::updateDataProperty method will only update the jena model for
 	// those properties in DataProperty that have a different value from what is already in the
-	// jena model for that property. 
-	//	
+	// jena model for that property.
+	//
 	// Specifically, updateDataProperty method should not remove a statement from the model and
 	// then add the same statement back in. The reason for this is that in vitro the "immutable" properties
 	// are stored in a sub-model and the user-editable properties are stored in a super-model and
-	// all updates are performed against the super-model, so removing and then re-adding 
-	// the same statement may result in a change of state (if the statement was in the sub-model 
+	// all updates are performed against the super-model, so removing and then re-adding
+	// the same statement may result in a change of state (if the statement was in the sub-model
 	// it will migrate to the super-model) because of the way jena handles additions and
 	// deletions with respect to super and sub models. This migration of statements may cause
 	// undesirable behavior in the vitro application.
-	
+
 	public void minimalUpdates(){
-	
+
 		// 1. create two models and attach one as a sub-model of the other
 		// 2. populate the sub-model with one statement for each of the 13 properties represented in DataProperty
 		// 3. save the state of both the sub-model and the super-model
 		// 4. populate a DataProperty object with the data in the (combined) model and call the updateDataProperty
 		//    (having made no changes to the DataProperty object)
 		// 5. verify that both the sub-model and the super-model are unchanged
-		
+
 		String propertyURI = "http://vivoweb.org/ontology/core#addressCity";
 
 		OntModel superModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); // this simulates the user-editable ontology in vivo
 		OntModel subModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);   // this simulates the core ontology in vivo
 		superModel.addSubModel(subModel);
-		
+
 		String rdfsLabel = "this is the rdfs label";
 		String lang = "en-US";
-		
+
 		// populate sub-model
-		DatatypeProperty property1 = subModel.createDatatypeProperty(propertyURI); 
-		
-		property1.setLabel(rdfsLabel,lang);  
+		DatatypeProperty property1 = subModel.createDatatypeProperty(propertyURI);
+
+		property1.setLabel(rdfsLabel,lang);
 		property1.setPropertyValue(RDFS.domain, subModel.createResource("http://thisIsTheDomainClassURI"));
 		property1.setPropertyValue(RDFS.range, subModel.createResource("http://thisIsTheRangeClassURI"));
 		property1.addProperty(RDF.type, OWL.FunctionalProperty);
@@ -74,37 +74,37 @@ public class DataPropertyDaoJenaTest extends AbstractTestClass {
 		property1.setPropertyValue(subModel.createProperty(VitroVocabulary.PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT), subModel.createResource("http://vitro.mannlib.cornell.edu/ns/vitro/role#selfEditor"));
 		property1.setPropertyValue(subModel.createProperty(VitroVocabulary.HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT), subModel.createResource("http://vitro.mannlib.cornell.edu/ns/vitro/role#editor"));
 		property1.setPropertyValue(subModel.createProperty(VitroVocabulary.PROPERTY_INPROPERTYGROUPANNOT), subModel.createResource("http://thisIsTheInPropertyGroupURI"));
-		property1.setPropertyValue(subModel.createProperty(VitroVocabulary.PROPERTY_CUSTOMENTRYFORMANNOT), subModel.createResource("http://thisIsTheCustomFormEntryURI"));		
-		
+		property1.setPropertyValue(subModel.createProperty(VitroVocabulary.PROPERTY_CUSTOMENTRYFORMANNOT), subModel.createResource("http://thisIsTheCustomFormEntryURI"));
+
 		// Save copies of sub-model and super-model
-		
+
 		// uncommment the next two lines to debug failures
-		//System.out.println("**Before updating data property:");		
+		//System.out.println("**Before updating data property:");
 		//printModels(superModel, subModel);
-		
+
 		superModel.removeSubModel(subModel);
-		
-		OntModel origSubModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+
+		OntModel origSubModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		origSubModel.add(subModel);
-		OntModel origSuperModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel origSuperModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		origSuperModel.add(superModel);
-		
+
 		superModel.addSubModel(subModel);
-		
+
 		// Populate the DataProperty with the data in the sub-model and then update the combined model
 		// (from the unchanged object).
 		WebappDaoFactoryJena wdfj = new WebappDaoFactoryJena(superModel);
 		DataPropertyDaoJena dpdj = (DataPropertyDaoJena) wdfj.getDataPropertyDao();
-		DataProperty dataProperty = dpdj.getDataPropertyByURI(propertyURI); // the DataProperty will be populated 
-		                                                                    // with the information already in 
+		DataProperty dataProperty = dpdj.getDataPropertyByURI(propertyURI); // the DataProperty will be populated
+		                                                                    // with the information already in
 		                                                                    // the jena model.
-		
-		
-		Assert.assertEquals(dataProperty.getPublicName(), property1.getLabel(lang));  
-			
-        dpdj.updateDataProperty(dataProperty);       // we haven't changed any values here, so 
+
+
+		Assert.assertEquals(dataProperty.getPublicName(), property1.getLabel(lang));
+
+        dpdj.updateDataProperty(dataProperty);       // we haven't changed any values here, so
                                                      // the models should be unchanged.
- 
+
         // Verify that the sub-model and super-model are both unchanged
 
         // uncommment the next two lines to debug failures
@@ -112,26 +112,26 @@ public class DataPropertyDaoJenaTest extends AbstractTestClass {
         //printModels(superModel,subModel);
 
         superModel.removeSubModel(subModel);
-        
+
 		//modtime affects the diff but we don't care about that difference
 		wipeOutModTime(origSubModel);
 		wipeOutModTime(origSuperModel);
 		wipeOutModTime(subModel);
 		wipeOutModTime(superModel);
-		
-		Assert.assertTrue(subModel.isIsomorphicWith(origSubModel));	
-	    Assert.assertTrue(superModel.isIsomorphicWith(origSuperModel));	
-        
+
+		Assert.assertTrue(subModel.isIsomorphicWith(origSubModel));
+	    Assert.assertTrue(superModel.isIsomorphicWith(origSuperModel));
+
 	}
-	
-	
+
+
 	void printModels(OntModel superModel, OntModel subModel) {
 
 		// Detach the submodel for printing to get an accurate
 		// account of what is in each.
-		
+
 	    superModel.removeSubModel(subModel);
-	    
+
 		System.out.println("\nThe sub-model has " + subModel.size() + " statements:");
 		System.out.println("---------------------------------------------------");
 		subModel.writeAll(System.out,"N3",null);
@@ -139,14 +139,14 @@ public class DataPropertyDaoJenaTest extends AbstractTestClass {
 		System.out.println("\nThe super-model has " + superModel.size() + " statements:");
 		System.out.println("---------------------------------------------------");
 	    superModel.write(System.out,"N3",null);
-		
+
 	    superModel.addSubModel(subModel);
-		
+
 	}
-	
+
 
 	void wipeOutModTime(Model model){
 		model.removeAll(null, model.createProperty(VitroVocabulary.MODTIME), null);
 	}
-	
+
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJenaTest.java
index 838d0f2da..2428b56de 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJenaTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJenaTest.java
@@ -19,143 +19,143 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 public class DependentResourceDeleteJenaTest {
 	String isDependentRelation =
 		" <"+VitroVocabulary.PROPERTY_STUBOBJECTPROPERTYANNOT+"> \"true\"^^xsd:boolean .\n" ;
-	
-	String nosePropIsDependentRel = 
+
+	String nosePropIsDependentRel =
 	"<"+VitroVocabulary.PROPERTY_STUBOBJECTPROPERTYANNOT+"> rdf:type owl:AnnotationProperty .\n" +
     " ex:hasNose " + isDependentRelation;
-	
-    String prefixesN3 = 
+
+    String prefixesN3 =
         "@prefix vitro: <" + VitroVocabulary.vitroURI + "> . \n" +
         "@prefix xsd: <" + XSD.getURI() + "> . \n " +
-        "@prefix ex: <http://example.com/> . \n" +            
+        "@prefix ex: <http://example.com/> . \n" +
         "@prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . \n"+
         "@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . \n"+
         "@prefix owl:  <http://www.w3.org/2002/07/owl#> . \n";
 
-	
+
     void printModels(Model expected, Model result){
     	System.out.println("Expected:");
     	expected.write(System.out);
     	System.out.println("Result:");
-    	result.write(System.out);    
+    	result.write(System.out);
     }
-    
+
     @org.junit.Test
     public void testStmtNormalDelete() {
-        String n3 = 
+        String n3 =
             prefixesN3 +
-            " ex:bob ex:hasNose ex:nose1 .  " ;            
-                        
-        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");                                                             
-        
+            " ex:bob ex:hasNose ex:nose1 .  " ;
+
+        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
+
         List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(
         		model.createStatement(
         				model.createResource("http://example.com/bob"),
         				model.createProperty("http://example.com/hasNose"),
         				model.createResource("http://example.com/nose1")),
         		model);
-        
+
         Model resultModel = ModelFactory.createDefaultModel();
         resultModel.add(deletes);
-        
-        //all statements should be deleted        
+
+        //all statements should be deleted
         Assert.assertTrue(resultModel.isIsomorphicWith( model ));
     }
-    
+
     @org.junit.Test
     public void testStmtSimpleForceDelete() {
-        String n3= 
-            prefixesN3 + 
+        String n3=
+            prefixesN3 +
             nosePropIsDependentRel +
-            "ex:hasHair " + isDependentRelation + 
+            "ex:hasHair " + isDependentRelation +
             " ex:bob ex:hasNose ex:nose1 .   \n" +
         	" ex:nose1 ex:hasHair ex:hair23. \n" +
-        	" ex:hair23 ex:hasHairCount \"23\". " ;        
-        String expected = 
+        	" ex:hair23 ex:hasHairCount \"23\". " ;
+        String expected =
             prefixesN3 +
             " ex:bob ex:hasNose ex:nose1 .   \n" +
         	" ex:nose1 ex:hasHair ex:hair23. \n" +
         	" ex:hair23 ex:hasHairCount \"23\". " ;
-        
-        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");                                              
+
+        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
         Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
-        
+
         List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(
         		model.createStatement(
         				model.createResource("http://example.com/bob"),
         				model.createProperty("http://example.com/hasNose"),
         				model.createResource("http://example.com/nose1")),
         				model);
-        
+
         Model resultModel = ModelFactory.createDefaultModel();
         resultModel.add(deletes);
-                
-        //all statements should be deleted               
-        Assert.assertTrue( resultModel.isIsomorphicWith( expectedModel ) ) ;              
+
+        //all statements should be deleted
+        Assert.assertTrue( resultModel.isIsomorphicWith( expectedModel ) ) ;
     }
-    
+
 
     @org.junit.Test
     public void testStmtNonForceDelete() {
-        String n3 = 
+        String n3 =
             prefixesN3 +
-            " ex:bob ex:hasNose ex:nose1 .   \n" +            
+            " ex:bob ex:hasNose ex:nose1 .   \n" +
         	" ex:nose1 ex:hasHair ex:hair23. \n" +
         	" ex:hair23 ex:hasHairCount \"23\". " ;
-        
-        String expected = 
+
+        String expected =
             prefixesN3 +
         	" ex:nose1 ex:hasHair ex:hair23. \n" +
         	" ex:hair23 ex:hasHairCount \"23\". " ;
-        
-        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");                                              
-        
+
+        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
+
         List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(
         		model.createStatement(
         				model.createResource("http://example.com/bob"),
         				model.createProperty("http://example.com/hasNose"),
         				model.createResource("http://example.com/nose1")),
         				model);
-        
-        model.remove(deletes);        
-                        
+
+        model.remove(deletes);
+
         Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
         boolean same = expectedModel.isIsomorphicWith( model );
         if( ! same ) printModels( expectedModel, model);
         Assert.assertTrue( same );
     }
 
-    
+
     @org.junit.Test
     public void testStmtForceDeleteWithLiterals() {
-        String n3 = 
+        String n3 =
             prefixesN3 +
             nosePropIsDependentRel +
             "ex:hasHair " + isDependentRelation +
             " ex:bob ex:a \"Bob\".   \n" +
-            " ex:bob ex:hasNose ex:nose1 .   \n" +            
+            " ex:bob ex:hasNose ex:nose1 .   \n" +
             " ex:nose1 ex:a \"this is a literal\". \n" +
             " ex:nose1 ex:b \"2343\" . \n" +
         	" ex:nose1 ex:hasHair ex:hair23. \n" +
         	" ex:hair23 ex:hasHairCount \"23\". " ;
-        
-        String expected = 
+
+        String expected =
             prefixesN3 +
             nosePropIsDependentRel +
             "ex:hasHair " + isDependentRelation +
             " ex:bob ex:a \"Bob\".   \n"  ;
-        
-        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");                                              
-        
+
+        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
+
         List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(
                 model.createStatement(
                         model.createResource("http://example.com/bob"),
                         model.createProperty("http://example.com/hasNose"),
                         model.createResource("http://example.com/nose1")),
                 model);
-        
-        model.remove(deletes);        
-                        
+
+        model.remove(deletes);
+
         Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
         boolean same = expectedModel.isIsomorphicWith( model );
         if( ! same ) printModels( expectedModel, model);
@@ -164,591 +164,591 @@ public class DependentResourceDeleteJenaTest {
 
     @org.junit.Test
     public void testStmtForceDeleteWithSimpleCycles() {
-        String n3 = 
+        String n3 =
             prefixesN3 +
             nosePropIsDependentRel +
             "ex:hasHair " + isDependentRelation +
             " ex:bob ex:a \"Bob\".   \n" +
-            " ex:bob ex:hasNose ex:nose1 .   \n" +            
+            " ex:bob ex:hasNose ex:nose1 .   \n" +
             " ex:nose1 ex:c ex:bob ." ;
-        
-        String expected = 
+
+        String expected =
             prefixesN3 +
-            nosePropIsDependentRel +                  
+            nosePropIsDependentRel +
             "ex:hasHair " + isDependentRelation +
             " ex:bob ex:a \"Bob\"." ;
-        
-        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");                                              
-       
+
+        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
+
         List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(
                 model.createStatement(
                         model.createResource("http://example.com/bob"),
                         model.createProperty("http://example.com/hasNose"),
                         model.createResource("http://example.com/nose1")),
                 model);
-        
-        model.remove(deletes);        
-                        
+
+        model.remove(deletes);
+
         Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
         boolean same = expectedModel.isIsomorphicWith( model );
         if( ! same ) printModels( expectedModel, model);
         Assert.assertTrue( same );
     }
-    
+
     @org.junit.Test
     public void testStmtForceDeleteWithCycles() {
-        String n3 = 
+        String n3 =
             prefixesN3 +
             nosePropIsDependentRel +
             "ex:hasHair " + isDependentRelation +
             " ex:bob ex:a \"Bob\".   \n" +
-            " ex:bob ex:hasNose ex:nose1 .   \n" +            
+            " ex:bob ex:hasNose ex:nose1 .   \n" +
             " ex:nose1 ex:a \"this is a literal\". \n" +
             " ex:nose1 ex:b \"2343\" . \n" +
             " ex:nose1 ex:c ex:bob . \n" +
         	" ex:nose1 ex:hasHair ex:hair23. \n" +
         	" ex:hair23 ex:c ex:bob . \n" +
         	" ex:hair23 ex:hasHairCount \"23\". " ;
-        
-        String expected = 
+
+        String expected =
             prefixesN3 +
             nosePropIsDependentRel +
             "ex:hasHair " + isDependentRelation +
             " ex:bob ex:a \"Bob\".   \n"  ;
-        
-        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");                                              
-       
+
+        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
+
         List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(
                 model.createStatement(
                         model.createResource("http://example.com/bob"),
                         model.createProperty("http://example.com/hasNose"),
                         model.createResource("http://example.com/nose1")),
                 model);
-        
-        model.remove(deletes);        
-                        
+
+        model.remove(deletes);
+
         Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
         boolean same = expectedModel.isIsomorphicWith( model );
         if( ! same ) printModels( expectedModel, model);
         Assert.assertTrue( same );
     }
-    
+
     @org.junit.Test
     public void testStmtForceDeleteWithCycles2() {
-        String n3 = 
+        String n3 =
             prefixesN3 +
             nosePropIsDependentRel +
             " ex:bob ex:a \"Bob\".   \n" +
-            " ex:bob ex:hasNose ex:nose1 .   \n" +            
+            " ex:bob ex:hasNose ex:nose1 .   \n" +
             " ex:nose1 ex:a \"this is a literal\". \n" +
             " ex:nose1 ex:b \"2343\" . \n" +
             " ex:nose1 ex:c ex:nose1 . \n" +
             " ex:nose1 ex:c ex:bob . \n" ;
-        
-        String expected = 
+
+        String expected =
             prefixesN3 +
             nosePropIsDependentRel +
             " ex:bob ex:a \"Bob\".   \n"  ;
-        
-        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");                                              
-        
+
+        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
+
         List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(
                 model.createStatement(
                         model.createResource("http://example.com/bob"),
                         model.createProperty("http://example.com/hasNose"),
                         model.createResource("http://example.com/nose1")),
                 model);
-        
-        model.remove(deletes);        
-                        
+
+        model.remove(deletes);
+
         Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
         boolean same = expectedModel.isIsomorphicWith( model );
         if( ! same ) printModels( expectedModel, model);
         Assert.assertTrue( same );
     }
-    
+
     @org.junit.Test
     public void testStmtForceDeleteWithLinks() {
-        String n3 = 
+        String n3 =
             prefixesN3 +
             nosePropIsDependentRel +
             " ex:bob ex:a \"Bob\".   \n" +
-            " ex:bob ex:hasNose ex:nose1 .   \n" +            
+            " ex:bob ex:hasNose ex:nose1 .   \n" +
             " ex:nose1 ex:c ex:glasses65 . \n" +
             " ex:glasses65 ex:c ex:nose1 . \n" +
             " ex:glasses65 ex:a \"glasses 65\" ." ;
-        
-        String expected = 
+
+        String expected =
             prefixesN3 +
             nosePropIsDependentRel +
             " ex:bob ex:a \"Bob\".   \n"  +
             " ex:glasses65 ex:a \"glasses 65\" ." ;
-        
-        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");                                              
-       
+
+        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
+
         List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(
                 model.createStatement(
                         model.createResource("http://example.com/bob"),
                         model.createProperty("http://example.com/hasNose"),
                         model.createResource("http://example.com/nose1")),
                 model);
-        
-        model.remove(deletes);        
-                        
+
+        model.remove(deletes);
+
         Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
         boolean same = expectedModel.isIsomorphicWith( model );
         if( ! same ) printModels( expectedModel, model);
         Assert.assertTrue( same );
     }
-    
+
     @org.junit.Test
     public void testStmtForceDeleteWithBNodes() {
-        String n3 = 
+        String n3 =
             prefixesN3 +
             nosePropIsDependentRel +
             " ex:bob ex:a \"Bob\".   \n" +
-            " ex:bob ex:hasNose [ \n" +            
+            " ex:bob ex:hasNose [ \n" +
             "    ex:a \"this is a bnode\"; \n" +
             "    ex:c ex:glasses65 ] . \n" +
             " ex:glasses65 ex:a \"glasses 65\" ." ;
-        
-        String expected = 
+
+        String expected =
             prefixesN3 +
             nosePropIsDependentRel +
             " ex:bob ex:a \"Bob\".   \n"  +
             " ex:glasses65 ex:a \"glasses 65\" ." ;
-        
-        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");                                              
-        
+
+        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
+
         StmtIterator stmtIt = model.listStatements(
         		model.createResource("http://example.com/bob"),
                 model.createProperty("http://example.com/hasNose"),
                 (RDFNode)null);
-                
-        List<Statement> deletes = 
-        	DependentResourceDeleteJena.getDependentResourceDeleteList(stmtIt.nextStatement(),model);        
-        model.remove(deletes);        
-                        
+
+        List<Statement> deletes =
+        	DependentResourceDeleteJena.getDependentResourceDeleteList(stmtIt.nextStatement(),model);
+        model.remove(deletes);
+
         Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
         boolean same = expectedModel.isIsomorphicWith( model );
         if( ! same ) printModels( expectedModel, model);
         Assert.assertTrue( same );
     }
-    
+
     @org.junit.Test
     public void testStmtForceDeleteWithNestedBNodes() {
-        String n3 = 
+        String n3 =
             prefixesN3 +
             nosePropIsDependentRel +
             " ex:bob ex:a \"Bob\".   \n" +
-            " ex:bob ex:hasNose [ \n" +            
+            " ex:bob ex:hasNose [ \n" +
             "    ex:a \"this is a bnode\"; \n" +
             "    ex:c ex:glasses65 ; \n" +
-            "    ex:c [ " + 
+            "    ex:c [ " +
             "           ex:a \"this is a nested bnode\" ] " +
             "] . \n" +
             " ex:glasses65 ex:a \"glasses 65\" ." ;
-        
-        String expected = 
+
+        String expected =
             prefixesN3 +
             nosePropIsDependentRel +
             " ex:bob ex:a \"Bob\".   \n"  +
             " ex:glasses65 ex:a \"glasses 65\" ." ;
-        
-        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");                                              
-               
+
+        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
+
         StmtIterator stmtIt = model.listStatements(
         		model.createResource("http://example.com/bob"),
                 model.createProperty("http://example.com/hasNose"),
                 (RDFNode)null);
-                
-        List<Statement> deletes = 
-        	DependentResourceDeleteJena.getDependentResourceDeleteList(stmtIt.nextStatement(),model);        
-        model.remove(deletes);        
-                        
+
+        List<Statement> deletes =
+        	DependentResourceDeleteJena.getDependentResourceDeleteList(stmtIt.nextStatement(),model);
+        model.remove(deletes);
+
         Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
         boolean same = expectedModel.isIsomorphicWith( model );
         if( ! same ) printModels( expectedModel, model);
         Assert.assertTrue( same );
     }
-    
+
     @org.junit.Test
     public void testResNormalDelete() {
-        String n3 = 
+        String n3 =
             prefixesN3 +
             nosePropIsDependentRel +
-            " ex:bob ex:hasNose ex:nose1 .  " ;     
-        String expected = 
+            " ex:bob ex:hasNose ex:nose1 .  " ;
+        String expected =
             prefixesN3 +
             nosePropIsDependentRel ;
-                    
-        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");                                              
+
+        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
         Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
-        
-        List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(        		
-        				model.createResource("http://example.com/nose1"),model);        
-        Model resultModel = model.remove(deletes);        
-                
+
+        List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(
+        				model.createResource("http://example.com/nose1"),model);
+        Model resultModel = model.remove(deletes);
+
         //all statements should be deleted
         boolean same = resultModel.isIsomorphicWith( expectedModel );
         if( ! same ) printModels( expectedModel, model);
-        Assert.assertTrue( same);   
+        Assert.assertTrue( same);
     }
-    
+
     @org.junit.Test
     public void testResSimpleForceDelete() {
-        String n3 = 
+        String n3 =
             prefixesN3 +
             nosePropIsDependentRel +
             " ex:bob ex:hasNose ex:nose1 .   \n" +
         	" ex:nose1 ex:hasHair ex:hair23. \n" +
         	" ex:hair23 ex:hasHairCount \"23\". " ;
-        String expected = 
+        String expected =
             prefixesN3 +
-            nosePropIsDependentRel +                    	
-        	" ex:hair23 ex:hasHairCount \"23\". " ;        
-        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");                                              
+            nosePropIsDependentRel +
+        	" ex:hair23 ex:hasHairCount \"23\". " ;
+        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
         Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
-        
-        List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(        		
-        				model.createResource("http://example.com/nose1"),model);        
+
+        List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(
+        				model.createResource("http://example.com/nose1"),model);
         Model resultModel = model.remove(deletes);
-                
+
         //all statements should be deleted
         boolean same = resultModel.isIsomorphicWith( expectedModel );
         if( ! same ) printModels( expectedModel, model);
-        Assert.assertTrue( same);                
+        Assert.assertTrue( same);
     }
-    
+
 
     @org.junit.Test
     public void testResNonForceDelete() {
-        String n3 = 
+        String n3 =
             prefixesN3 +
-            " ex:bob ex:hasNose ex:nose1 .   \n" +            
+            " ex:bob ex:hasNose ex:nose1 .   \n" +
         	" ex:nose1 ex:hasHair ex:hair23. \n" +
-        	" ex:hair23 ex:hasHairCount \"23\". " ;        
-        String expected = 
-            prefixesN3 +                                	
-        	" ex:hair23 ex:hasHairCount \"23\". " ;        	       
-        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");                                              
+        	" ex:hair23 ex:hasHairCount \"23\". " ;
+        String expected =
+            prefixesN3 +
+        	" ex:hair23 ex:hasHairCount \"23\". " ;
+        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
         Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
-        
-        List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(        		
-        				model.createResource("http://example.com/nose1"),model);        
+
+        List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(
+        				model.createResource("http://example.com/nose1"),model);
         Model resultModel = model.remove(deletes);
-                
+
         //all statements should be deleted
         boolean same = resultModel.isIsomorphicWith( expectedModel );
         if( ! same ) printModels( expectedModel, model);
-        Assert.assertTrue( same);      
+        Assert.assertTrue( same);
     }
 
     @org.junit.Test
     public void testResNonForceDelete2() {
-        String n3 = 
+        String n3 =
             prefixesN3 +
             nosePropIsDependentRel +
-            " ex:bob ex:hasNose ex:nose1 .   \n" +            
+            " ex:bob ex:hasNose ex:nose1 .   \n" +
         	" ex:nose1 ex:hasHair ex:hair23. \n" +
-        	" ex:hair23 ex:hasHairCount \"23\". " ;        
-        String expected = 
-            prefixesN3 +            
+        	" ex:hair23 ex:hasHairCount \"23\". " ;
+        String expected =
+            prefixesN3 +
             nosePropIsDependentRel +
-        	" ex:hair23 ex:hasHairCount \"23\". " ;        	       
-        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");                                              
+        	" ex:hair23 ex:hasHairCount \"23\". " ;
+        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
         Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
-        
-        List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(        		
-        				model.createResource("http://example.com/nose1"),model);        
+
+        List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(
+        				model.createResource("http://example.com/nose1"),model);
         Model resultModel = model.remove(deletes);
-                
+
         //all statements should be deleted
         boolean same = resultModel.isIsomorphicWith( expectedModel );
         if( ! same ) printModels( expectedModel, model);
-        Assert.assertTrue( same);      
+        Assert.assertTrue( same);
     }
-    
+
     @org.junit.Test
     public void testResForceDeleteWithLiterals() {
-        String n3 = 
+        String n3 =
             prefixesN3 +
             nosePropIsDependentRel +
-            " ex:hasHair " + isDependentRelation + 
+            " ex:hasHair " + isDependentRelation +
             " ex:bob ex:a \"Bob\".   \n" +
-            " ex:bob ex:hasNose ex:nose1 .   \n" +            
+            " ex:bob ex:hasNose ex:nose1 .   \n" +
             " ex:nose1 ex:a \"this is a literal\". \n" +
             " ex:nose1 ex:b \"2343\" . \n" +
         	" ex:nose1 ex:hasHair ex:hair23. \n" +
         	" ex:hair23 ex:hasHairCount \"23\". " ;
-        
-        String expected = 
+
+        String expected =
             prefixesN3 +
             nosePropIsDependentRel +
             " ex:hasHair " + isDependentRelation +
-            " ex:bob ex:a \"Bob\".   \n"  ;        
-        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");                                              
-        
+            " ex:bob ex:a \"Bob\".   \n"  ;
+        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
+
         List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(
         		model.createResource("http://example.com/nose1"),model);
-        
-        model.remove(deletes);        
-                        
+
+        model.remove(deletes);
+
         Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
         boolean same = expectedModel.isIsomorphicWith( model );
         if( ! same ) printModels( expectedModel, model);
         Assert.assertTrue( same );
     }
-    
+
     @org.junit.Test
     public void testResForceDeleteWithCycles() {
-        String n3 = 
+        String n3 =
             prefixesN3 +
             nosePropIsDependentRel +
             "ex:hasHair " + isDependentRelation +
             " ex:bob ex:a \"Bob\".   \n" +
-            " ex:bob ex:hasNose ex:nose1 .   \n" +            
+            " ex:bob ex:hasNose ex:nose1 .   \n" +
             " ex:nose1 ex:a \"this is a literal\". \n" +
             " ex:nose1 ex:b \"2343\" . \n" +
             " ex:nose1 ex:c ex:bob . \n" +
         	" ex:nose1 ex:hasHair ex:hair23. \n" +
         	" ex:hair23 ex:c ex:bob . \n" +
         	" ex:hair23 ex:hasHairCount \"23\". " ;
-        
-        String expected = 
-            prefixesN3 +
-            nosePropIsDependentRel +
-            "ex:hasHair " + isDependentRelation +
-            " ex:bob ex:a \"Bob\".   \n"  ;        
-        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");                                              
-       
-        List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(
-        		model.createResource("http://example.com/nose1"),model);
-        
-        model.remove(deletes);        
-                        
-        Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
-        boolean same = expectedModel.isIsomorphicWith( model );
-        if( ! same ) printModels( expectedModel, model);
-        Assert.assertTrue( same );
-    }
-    
-    @org.junit.Test
-    public void testResForceDeleteWithCycles2() {
-        String n3 = 
-            prefixesN3 +
-            nosePropIsDependentRel +
-            " ex:bob ex:a \"Bob\".   \n" +
-            " ex:bob ex:hasNose ex:nose1 .   \n" +            
-            " ex:nose1 ex:a \"this is a literal\". \n" +
-            " ex:nose1 ex:b \"2343\" . \n" +
-            " ex:nose1 ex:c ex:nose1 . \n" +
-            " ex:nose1 ex:c ex:bob . \n" ;
-        
-        String expected = 
-            prefixesN3 +
-            nosePropIsDependentRel ;        
-        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");                                              
-        
-        List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(
-        		model.createResource("http://example.com/bob"),model);        
-        model.remove(deletes);        
-                        
-        Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
-        boolean same = expectedModel.isIsomorphicWith( model );
-        if( ! same ) printModels( expectedModel, model);
-        Assert.assertTrue( same );
-    }
-    
-    @org.junit.Test
-    public void testResForceDeleteWithLinks() {
-        String n3 = 
-            prefixesN3 +
-            nosePropIsDependentRel +
-            " ex:bob ex:a \"Bob\".   \n" +
-            " ex:bob ex:hasNose ex:nose1 .   \n" +            
-            " ex:nose1 ex:c ex:glasses65 . \n" +
-            " ex:glasses65 ex:c ex:nose1 . \n" +
-            " ex:glasses65 ex:a \"glasses 65\" ." ;
-        
-        String expected = 
-            prefixesN3 +
-            nosePropIsDependentRel +
-            " ex:bob ex:a \"Bob\".   \n"  +
-            " ex:glasses65 ex:a \"glasses 65\" ." ;        
-        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");                                              
-       
-        List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(
-        		model.createResource("http://example.com/nose1"),model);        
-        model.remove(deletes);        
-                        
-        Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
-        boolean same = expectedModel.isIsomorphicWith( model );
-        if( ! same ) printModels( expectedModel, model);
-        Assert.assertTrue( same );
-    }
-    
-//    @org.junit.Test
-//    public void testResForceDeleteWithBNodes() {
-//        String n3 = 
-//            prefixesN3 +
-//            nosePropIsDependentRel +
-//            " ex:bob ex:a \"Bob\".   \n" +
-//            " ex:bob ex:hasNose [ \n" +            
-//            "    ex:a \"this is a bnode\"; \n" +
-//            "    ex:c ex:glasses65 ] . \n" +
-//            " ex:glasses65 ex:a \"glasses 65\" ." ;
-//        
-//        String expected = 
-//            prefixesN3 +
-//            nosePropIsDependentRel +
-//            " ex:bob ex:a \"Bob\".   \n"  +
-//            " ex:glasses65 ex:a \"glasses 65\" ." ;       
-//        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");                                              
-//        
-//        StmtIterator stmtIt = model.listStatements(
-//        		model.createResource("http://example.com/bob"),
-//                model.createProperty("http://example.com/hasNose"),
-//                (RDFNode)null);
-//                
-//        RDFNode bnode = stmtIt.nextStatement().getObject();
-//        
-//        List<Statement> deletes = 
-//        	DependentResourceDeleteJena.getDependentResourceDeleteList(bnode,model);        
-//        model.remove(deletes);        
-//                        
-//        Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
-//        boolean same = expectedModel.isIsomorphicWith( model );
-//        if( ! same ) printModels( expectedModel, model);
-//        Assert.assertTrue( same );
-//    }
-    
-//    @org.junit.Test
-//    public void testResForceDeleteWithNestedBNodes() {
-//        String n3 = 
-//            prefixesN3 +
-//            nosePropIsDependentRel +
-//            " ex:bob ex:a \"Bob\".   \n" +
-//            " ex:bob ex:hasNose [ \n" +            
-//            "    ex:a \"this is a bnode\"; \n" +
-//            "    ex:c ex:glasses65 ; \n" +
-//            "    ex:c [ " + 
-//            "           ex:a \"this is a nested bnode\" ] " +
-//            "] . \n" +
-//            " ex:glasses65 ex:a \"glasses 65\" ." ;
-//        
-//        String expected = 
-//            prefixesN3 +
-//            nosePropIsDependentRel +
-//            " ex:bob ex:a \"Bob\".   \n"  +
-//            " ex:glasses65 ex:a \"glasses 65\" ." ;
-//        
-//        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");                                              
-//               
-//        StmtIterator stmtIt = model.listStatements(
-//        		model.createResource("http://example.com/bob"),
-//                model.createProperty("http://example.com/hasNose"),
-//                (RDFNode)null);                
-//        RDFNode bnode = stmtIt.nextStatement().getObject();
-//        
-//        List<Statement> deletes = 
-//        	DependentResourceDeleteJena.getDependentResourceDeleteList(bnode,model);        
-//        model.remove(deletes);        
-//                        
-//        Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
-//        boolean same = expectedModel.isIsomorphicWith( model );
-//        if( ! same ) printModels( expectedModel, model);
-//        Assert.assertTrue( same );
-//    }
 
-    
-    @org.junit.Test
-    public void testDeleteForChange() {
-        String source = 
-            prefixesN3 +
-            nosePropIsDependentRel +
-            "ex:hasHair " + isDependentRelation +
-            " ex:bob ex:a \"Bob\".   \n" +
-            " ex:bob ex:hasNose ex:nose1 .   \n" +            
-            " ex:nose1 ex:a \"this is a literal\". \n" +
-            " ex:nose1 ex:b \"2343\" . \n" +
-        	" ex:nose1 ex:hasHair ex:hair23. \n" +
-        	" ex:hair23 ex:hasHairCount \"23\". " ;
-        
-        String expected = 
+        String expected =
             prefixesN3 +
             nosePropIsDependentRel +
             "ex:hasHair " + isDependentRelation +
             " ex:bob ex:a \"Bob\".   \n"  ;
-                        
-        String retractions =     
-        	"@prefix ex: <http://example.com/> . \n" +                    	        
-        	" ex:bob ex:hasNose ex:nose1 . ";        
-                
-        Model sourceModel = (ModelFactory.createDefaultModel()).read(new StringReader(source), "", "N3");                                              
+        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
+
+        List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(
+        		model.createResource("http://example.com/nose1"),model);
+
+        model.remove(deletes);
+
+        Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
+        boolean same = expectedModel.isIsomorphicWith( model );
+        if( ! same ) printModels( expectedModel, model);
+        Assert.assertTrue( same );
+    }
+
+    @org.junit.Test
+    public void testResForceDeleteWithCycles2() {
+        String n3 =
+            prefixesN3 +
+            nosePropIsDependentRel +
+            " ex:bob ex:a \"Bob\".   \n" +
+            " ex:bob ex:hasNose ex:nose1 .   \n" +
+            " ex:nose1 ex:a \"this is a literal\". \n" +
+            " ex:nose1 ex:b \"2343\" . \n" +
+            " ex:nose1 ex:c ex:nose1 . \n" +
+            " ex:nose1 ex:c ex:bob . \n" ;
+
+        String expected =
+            prefixesN3 +
+            nosePropIsDependentRel ;
+        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
+
+        List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(
+        		model.createResource("http://example.com/bob"),model);
+        model.remove(deletes);
+
+        Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
+        boolean same = expectedModel.isIsomorphicWith( model );
+        if( ! same ) printModels( expectedModel, model);
+        Assert.assertTrue( same );
+    }
+
+    @org.junit.Test
+    public void testResForceDeleteWithLinks() {
+        String n3 =
+            prefixesN3 +
+            nosePropIsDependentRel +
+            " ex:bob ex:a \"Bob\".   \n" +
+            " ex:bob ex:hasNose ex:nose1 .   \n" +
+            " ex:nose1 ex:c ex:glasses65 . \n" +
+            " ex:glasses65 ex:c ex:nose1 . \n" +
+            " ex:glasses65 ex:a \"glasses 65\" ." ;
+
+        String expected =
+            prefixesN3 +
+            nosePropIsDependentRel +
+            " ex:bob ex:a \"Bob\".   \n"  +
+            " ex:glasses65 ex:a \"glasses 65\" ." ;
+        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
+
+        List<Statement> deletes = DependentResourceDeleteJena.getDependentResourceDeleteList(
+        		model.createResource("http://example.com/nose1"),model);
+        model.remove(deletes);
+
+        Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
+        boolean same = expectedModel.isIsomorphicWith( model );
+        if( ! same ) printModels( expectedModel, model);
+        Assert.assertTrue( same );
+    }
+
+//    @org.junit.Test
+//    public void testResForceDeleteWithBNodes() {
+//        String n3 =
+//            prefixesN3 +
+//            nosePropIsDependentRel +
+//            " ex:bob ex:a \"Bob\".   \n" +
+//            " ex:bob ex:hasNose [ \n" +
+//            "    ex:a \"this is a bnode\"; \n" +
+//            "    ex:c ex:glasses65 ] . \n" +
+//            " ex:glasses65 ex:a \"glasses 65\" ." ;
+//
+//        String expected =
+//            prefixesN3 +
+//            nosePropIsDependentRel +
+//            " ex:bob ex:a \"Bob\".   \n"  +
+//            " ex:glasses65 ex:a \"glasses 65\" ." ;
+//        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
+//
+//        StmtIterator stmtIt = model.listStatements(
+//        		model.createResource("http://example.com/bob"),
+//                model.createProperty("http://example.com/hasNose"),
+//                (RDFNode)null);
+//
+//        RDFNode bnode = stmtIt.nextStatement().getObject();
+//
+//        List<Statement> deletes =
+//        	DependentResourceDeleteJena.getDependentResourceDeleteList(bnode,model);
+//        model.remove(deletes);
+//
+//        Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
+//        boolean same = expectedModel.isIsomorphicWith( model );
+//        if( ! same ) printModels( expectedModel, model);
+//        Assert.assertTrue( same );
+//    }
+
+//    @org.junit.Test
+//    public void testResForceDeleteWithNestedBNodes() {
+//        String n3 =
+//            prefixesN3 +
+//            nosePropIsDependentRel +
+//            " ex:bob ex:a \"Bob\".   \n" +
+//            " ex:bob ex:hasNose [ \n" +
+//            "    ex:a \"this is a bnode\"; \n" +
+//            "    ex:c ex:glasses65 ; \n" +
+//            "    ex:c [ " +
+//            "           ex:a \"this is a nested bnode\" ] " +
+//            "] . \n" +
+//            " ex:glasses65 ex:a \"glasses 65\" ." ;
+//
+//        String expected =
+//            prefixesN3 +
+//            nosePropIsDependentRel +
+//            " ex:bob ex:a \"Bob\".   \n"  +
+//            " ex:glasses65 ex:a \"glasses 65\" ." ;
+//
+//        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
+//
+//        StmtIterator stmtIt = model.listStatements(
+//        		model.createResource("http://example.com/bob"),
+//                model.createProperty("http://example.com/hasNose"),
+//                (RDFNode)null);
+//        RDFNode bnode = stmtIt.nextStatement().getObject();
+//
+//        List<Statement> deletes =
+//        	DependentResourceDeleteJena.getDependentResourceDeleteList(bnode,model);
+//        model.remove(deletes);
+//
+//        Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
+//        boolean same = expectedModel.isIsomorphicWith( model );
+//        if( ! same ) printModels( expectedModel, model);
+//        Assert.assertTrue( same );
+//    }
+
+
+    @org.junit.Test
+    public void testDeleteForChange() {
+        String source =
+            prefixesN3 +
+            nosePropIsDependentRel +
+            "ex:hasHair " + isDependentRelation +
+            " ex:bob ex:a \"Bob\".   \n" +
+            " ex:bob ex:hasNose ex:nose1 .   \n" +
+            " ex:nose1 ex:a \"this is a literal\". \n" +
+            " ex:nose1 ex:b \"2343\" . \n" +
+        	" ex:nose1 ex:hasHair ex:hair23. \n" +
+        	" ex:hair23 ex:hasHairCount \"23\". " ;
+
+        String expected =
+            prefixesN3 +
+            nosePropIsDependentRel +
+            "ex:hasHair " + isDependentRelation +
+            " ex:bob ex:a \"Bob\".   \n"  ;
+
+        String retractions =
+        	"@prefix ex: <http://example.com/> . \n" +
+        	" ex:bob ex:hasNose ex:nose1 . ";
+
+        Model sourceModel = (ModelFactory.createDefaultModel()).read(new StringReader(source), "", "N3");
         Model additionsModel = (ModelFactory.createDefaultModel()); //no additions
         Model retractionsModel = (ModelFactory.createDefaultModel()).read(new StringReader(retractions), "", "N3");
-        
-        Model deletes = 
-        	DependentResourceDeleteJena.getDependentResourceDeleteForChange(additionsModel, retractionsModel, sourceModel);                
+
+        Model deletes =
+        	DependentResourceDeleteJena.getDependentResourceDeleteForChange(additionsModel, retractionsModel, sourceModel);
         sourceModel.remove(retractionsModel);
-        sourceModel.remove(deletes);        
-                        
-        Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
-        boolean same = expectedModel.isIsomorphicWith( sourceModel );
-        if( ! same ) printModels( expectedModel, sourceModel);
-        Assert.assertTrue( same );
-    }  
-    
-    @org.junit.Test
-    public void testDeleteForChangeWithReplace() {
-        String source = 
-            prefixesN3 +
-            nosePropIsDependentRel +
-            " ex:bob ex:a \"Bob\".   \n" +
-            " ex:jim ex:a \"Jim\".   \n" +
-            " ex:bob ex:hasNose ex:nose1 .   \n" +            
-            " ex:nose1 ex:a \"this is a literal\". \n" +
-            " ex:nose1 ex:b \"2343\" . \n" +
-        	" ex:nose1 ex:hasHair ex:hair23. \n" +
-        	" ex:hair23 ex:hasHairCount \"23\". " ;
-        
-        String expected = 
-            prefixesN3 +
-            nosePropIsDependentRel +
-            " ex:jim ex:a \"Jim\".   \n" +
-            " ex:bob ex:a \"Bob\".   \n" +
-            " ex:jim ex:hasNose ex:nose1 .   \n" +            
-            " ex:nose1 ex:a \"this is a literal\". \n" +
-            " ex:nose1 ex:b \"2343\" . \n" +
-        	" ex:nose1 ex:hasHair ex:hair23. \n" +
-        	" ex:hair23 ex:hasHairCount \"23\". " ;
-            
-        String additions =     
-        	"@prefix ex: <http://example.com/> . \n" +                    	        
-        	" ex:jim ex:hasNose ex:nose1 . ";
-        
-        String retractions =     
-        	"@prefix ex: <http://example.com/> . \n" +                    	        
-        	" ex:bob ex:hasNose ex:nose1 . ";        
-                
-        Model sourceModel = (ModelFactory.createDefaultModel()).read(new StringReader(source), "", "N3");                                              
-        Model additionsModel = (ModelFactory.createDefaultModel()).read(new StringReader(additions), "", "N3");
-        Model retractionsModel = (ModelFactory.createDefaultModel()).read(new StringReader(retractions), "", "N3");
-        
-        Model depDeletes = 
-        	DependentResourceDeleteJena.getDependentResourceDeleteForChange(additionsModel, retractionsModel, sourceModel);                        
-        sourceModel.remove(depDeletes);
-        sourceModel.remove(retractionsModel);
-        sourceModel.add(additionsModel);
-                        
+        sourceModel.remove(deletes);
+
         Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
         boolean same = expectedModel.isIsomorphicWith( sourceModel );
         if( ! same ) printModels( expectedModel, sourceModel);
         Assert.assertTrue( same );
     }
 
-     
+    @org.junit.Test
+    public void testDeleteForChangeWithReplace() {
+        String source =
+            prefixesN3 +
+            nosePropIsDependentRel +
+            " ex:bob ex:a \"Bob\".   \n" +
+            " ex:jim ex:a \"Jim\".   \n" +
+            " ex:bob ex:hasNose ex:nose1 .   \n" +
+            " ex:nose1 ex:a \"this is a literal\". \n" +
+            " ex:nose1 ex:b \"2343\" . \n" +
+        	" ex:nose1 ex:hasHair ex:hair23. \n" +
+        	" ex:hair23 ex:hasHairCount \"23\". " ;
+
+        String expected =
+            prefixesN3 +
+            nosePropIsDependentRel +
+            " ex:jim ex:a \"Jim\".   \n" +
+            " ex:bob ex:a \"Bob\".   \n" +
+            " ex:jim ex:hasNose ex:nose1 .   \n" +
+            " ex:nose1 ex:a \"this is a literal\". \n" +
+            " ex:nose1 ex:b \"2343\" . \n" +
+        	" ex:nose1 ex:hasHair ex:hair23. \n" +
+        	" ex:hair23 ex:hasHairCount \"23\". " ;
+
+        String additions =
+        	"@prefix ex: <http://example.com/> . \n" +
+        	" ex:jim ex:hasNose ex:nose1 . ";
+
+        String retractions =
+        	"@prefix ex: <http://example.com/> . \n" +
+        	" ex:bob ex:hasNose ex:nose1 . ";
+
+        Model sourceModel = (ModelFactory.createDefaultModel()).read(new StringReader(source), "", "N3");
+        Model additionsModel = (ModelFactory.createDefaultModel()).read(new StringReader(additions), "", "N3");
+        Model retractionsModel = (ModelFactory.createDefaultModel()).read(new StringReader(retractions), "", "N3");
+
+        Model depDeletes =
+        	DependentResourceDeleteJena.getDependentResourceDeleteForChange(additionsModel, retractionsModel, sourceModel);
+        sourceModel.remove(depDeletes);
+        sourceModel.remove(retractionsModel);
+        sourceModel.add(additionsModel);
+
+        Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
+        boolean same = expectedModel.isIsomorphicWith( sourceModel );
+        if( ! same ) printModels( expectedModel, sourceModel);
+        Assert.assertTrue( same );
+    }
+
+
     @org.junit.Test
     public void testDeleteWithNonZeroInDegree() {
         /*
@@ -756,54 +756,54 @@ public class DependentResourceDeleteJenaTest {
           Currently the required behavior is that the position context node not be
           deleted when the object property statement is deleted from the organization side.
         */
-        String source = 
-            prefixesN3 +            
+        String source =
+            prefixesN3 +
             " ex:personHasPosition " + isDependentRelation +
             " ex:bob  ex:a \"Bob\".   \n" +
             " ex:orgP ex:a \"orgP\".   \n" +
-            " ex:bob  ex:personHasPosition ex:position1 .   \n" +            
+            " ex:bob  ex:personHasPosition ex:position1 .   \n" +
             " ex:orgP ex:positionInOrganization ex:position1 .   \n" +
             " ex:position1 ex:a \"This is Position1\". \n" +
-            " ex:position1 ex:b \"2343\" . ";         	
-        
-        String expected = 
-        	prefixesN3 +            
+            " ex:position1 ex:b \"2343\" . ";
+
+        String expected =
+        	prefixesN3 +
             " ex:personHasPosition " + isDependentRelation +
             " ex:bob  ex:a \"Bob\".   \n" +
             " ex:orgP ex:a \"orgP\".   \n" +
-            " ex:bob  ex:personHasPosition ex:position1 .   \n" +                        
+            " ex:bob  ex:personHasPosition ex:position1 .   \n" +
             " ex:position1 ex:a \"This is Position1\". \n" +
             " ex:position1 ex:hasOrgName \"org xyz\" . \n" +
             " ex:position1 ex:b \"2343\" . ";
-        	
-//            prefixesN3 +            
+
+//            prefixesN3 +
 //            " ex:bob  ex:a \"Bob\".   \n" +
 //            " ex:orgP ex:a \"orgP\".   \n" +
-//            " ex:bob  ex:hasPosition ex:position1 .   \n" +            
+//            " ex:bob  ex:hasPosition ex:position1 .   \n" +
 //            " ex:position1 ex:a \"This is Position1\". \n" +
 //            " ex:position1 ex:hasOrgName \"org xyz\" . \n" +
 //            " ex:position1 ex:b \"2343\" . ";
-            
-        String additions =     
-        	"@prefix ex: <http://example.com/> . \n" +        
+
+        String additions =
+        	"@prefix ex: <http://example.com/> . \n" +
             "@prefix xsd: <" + XSD.getURI() + "> . \n " +
         	" ex:position1 ex:hasOrgName \"org xyz\" . ";
-        
-        String retractions =     
-        	"@prefix ex: <http://example.com/> . \n" +   
+
+        String retractions =
+        	"@prefix ex: <http://example.com/> . \n" +
             "@prefix xsd: <" + XSD.getURI() + "> . \n " +
-        	" ex:orgP ex:positionInOrganization ex:position1 . ";        
-                
-        Model sourceModel = (ModelFactory.createDefaultModel()).read(new StringReader(source), "", "N3");                                              
+        	" ex:orgP ex:positionInOrganization ex:position1 . ";
+
+        Model sourceModel = (ModelFactory.createDefaultModel()).read(new StringReader(source), "", "N3");
         Model additionsModel = (ModelFactory.createDefaultModel()).read(new StringReader(additions), "", "N3");
         Model retractionsModel = (ModelFactory.createDefaultModel()).read(new StringReader(retractions), "", "N3");
-        
-        Model depDeletes = 
-        	DependentResourceDeleteJena.getDependentResourceDeleteForChange(additionsModel, retractionsModel, sourceModel);                        
+
+        Model depDeletes =
+        	DependentResourceDeleteJena.getDependentResourceDeleteForChange(additionsModel, retractionsModel, sourceModel);
         sourceModel.remove(depDeletes);
         sourceModel.remove(retractionsModel);
         sourceModel.add(additionsModel);
-                        
+
         Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
         boolean same = expectedModel.isIsomorphicWith( sourceModel );
         if( ! same ) printModels( expectedModel, sourceModel);
@@ -817,40 +817,40 @@ public class DependentResourceDeleteJenaTest {
           Currently the required behavior is that the position context node not be
           deleted when the object property statement is deleted from the organization side.
         */
-        String source = 
-            prefixesN3 +            
+        String source =
+            prefixesN3 +
             " ex:personHasPosition " + isDependentRelation +
             " ex:bob  ex:a \"Bob\".   \n" +
             " ex:orgP ex:a \"orgP\".   \n" +
-            " ex:bob  ex:personHasPosition ex:position1 .   \n" +            
+            " ex:bob  ex:personHasPosition ex:position1 .   \n" +
             " ex:orgP ex:positionInOrganization ex:position1 .   \n" +
             " ex:position1 ex:a \"This is Position1\". \n" +
-            " ex:position1 ex:b \"2343\" . ";         	
-        
-        String expected = 
-        	prefixesN3 +            
+            " ex:position1 ex:b \"2343\" . ";
+
+        String expected =
+        	prefixesN3 +
             " ex:personHasPosition " + isDependentRelation +
             " ex:bob  ex:a \"Bob\".   \n" +
             " ex:orgP ex:a \"orgP\".   \n" +
             " ex:bob  ex:personHasPosition ex:position1 .   \n" +
             " ex:position1 ex:a \"This is Position1\". \n" +
-            " ex:position1 ex:b \"2343\" . ";        	
-                   
-        String retractions =     
-        	"@prefix ex: <http://example.com/> . \n" +   
+            " ex:position1 ex:b \"2343\" . ";
+
+        String retractions =
+        	"@prefix ex: <http://example.com/> . \n" +
             "@prefix xsd: <" + XSD.getURI() + "> . \n " +
-        	" ex:orgP ex:positionInOrganization ex:position1 . ";        
-                
-        Model sourceModel = (ModelFactory.createDefaultModel()).read(new StringReader(source), "", "N3");                                              
+        	" ex:orgP ex:positionInOrganization ex:position1 . ";
+
+        Model sourceModel = (ModelFactory.createDefaultModel()).read(new StringReader(source), "", "N3");
         Model additionsModel = ModelFactory.createDefaultModel(); //no additions
         Model retractionsModel = (ModelFactory.createDefaultModel()).read(new StringReader(retractions), "", "N3");
-        
-        Model depDeletes = 
-        	DependentResourceDeleteJena.getDependentResourceDeleteForChange(additionsModel, retractionsModel, sourceModel);                        
+
+        Model depDeletes =
+        	DependentResourceDeleteJena.getDependentResourceDeleteForChange(additionsModel, retractionsModel, sourceModel);
         sourceModel.remove(depDeletes);
         sourceModel.remove(retractionsModel);
         sourceModel.add(additionsModel);
-                        
+
         Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
         boolean same = expectedModel.isIsomorphicWith( sourceModel );
         if( ! same ) printModels( expectedModel, sourceModel);
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoTest.java
index c89037058..01058f799 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoTest.java
@@ -38,66 +38,66 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 public class JenaBaseDaoTest {
 	String isDependentRelation =
 		" <"+VitroVocabulary.PROPERTY_STUBOBJECTPROPERTYANNOT+"> \"true\"^^xsd:boolean .\n" ;
-	
-	String nosePropIsDependentRel = 
+
+	String nosePropIsDependentRel =
 	"<"+VitroVocabulary.PROPERTY_STUBOBJECTPROPERTYANNOT+"> rdf:type owl:AnnotationProperty .\n" +
     " ex:hasNose " + isDependentRelation;
-	
-    String prefixesN3 = 
+
+    String prefixesN3 =
         "@prefix vitro: <" + VitroVocabulary.vitroURI + "> . \n" +
-        "@prefix xsd: <" + XSD.getURI() + "> . \n " +                   
+        "@prefix xsd: <" + XSD.getURI() + "> . \n " +
         "@prefix rdf:  <" + RDF.getURI() + "> . \n"+
         "@prefix rdfs: <" + RDFS.getURI() + "> . \n"+
         "@prefix owl:  <" + OWL.getURI() + "> . \n" +
         "@prefix ex: <http://example.com/> . \n" ;
-    
+
 	@Test
 	public void smartRemoveTestForIndivdiualDelete(){
-		
-		String n3 = prefixesN3 + 
+
+		String n3 = prefixesN3 +
 			"ex:prop1 rdf:type owl:ObjectProperty ." +
 			"ex:prop1 rdfs:label \"Prop 1 Dependent Relation\" ." +
 			"ex:prop1 " + isDependentRelation;
-					
+
 		Model readInModel = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
 		OntModel ontModel = ModelFactory.createOntologyModel();
 		ontModel.add(readInModel);
 		WebappDaoFactoryJena wdfj = new WebappDaoFactoryJena( ontModel);
-		
+
 		try {
 			ObjectProperty prop1 = wdfj.getObjectPropertyDao().getObjectPropertyByURI("http://example.com/prop1");
 			Assert.assertNotNull(prop1);
-			
+
 			Individual ind = new IndividualImpl();
 			ind.setURI("http://example.com/bob");
-			ind.setName("Smith, Bob");		
-			
-			wdfj.getIndividualDao().insertNewIndividual(ind);			
-					
+			ind.setName("Smith, Bob");
+
+			wdfj.getIndividualDao().insertNewIndividual(ind);
+
 			Individual indxyz = new IndividualImpl();
 			indxyz.setURI("http://example.com/depResXYZ");
-			indxyz.setName("depResXYZ");			
-			wdfj.getIndividualDao().insertNewIndividual(indxyz);			
-			
+			indxyz.setName("depResXYZ");
+			wdfj.getIndividualDao().insertNewIndividual(indxyz);
+
 			Individual indAbc = new IndividualImpl();
 			indAbc.setURI("http://example.com/depResNested");
-			indAbc.setName("depResNested");					
-			wdfj.getIndividualDao().insertNewIndividual(indAbc);								
-		
+			indAbc.setName("depResNested");
+			wdfj.getIndividualDao().insertNewIndividual(indAbc);
+
 			ObjectPropertyStatement ops = new ObjectPropertyStatementImpl();
 			ops.setSubjectURI("http://example.com/bob");
 			ops.setPropertyURI("http://example.com/prop1");
 			ops.setObjectURI("http://example.com/depResXYZ");
 			wdfj.getObjectPropertyStatementDao().insertNewObjectPropertyStatement(ops);
-		
+
 			ops = new ObjectPropertyStatementImpl();
 			ops.setSubjectURI("http://example.com/depResXYZ");
 			ops.setPropertyURI("http://example.com/prop1");
 			ops.setObjectURI("http://example.com/depResNested");
 			wdfj.getObjectPropertyStatementDao().insertNewObjectPropertyStatement(ops);
-			
+
 			wdfj.getIndividualDao().deleteIndividual("http://example.com/depResXYZ");
-			
+
 			String expected =
 				"@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> . "+
 				"@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> ."+
@@ -109,7 +109,7 @@ public class JenaBaseDaoTest {
 				"    a       owl:ObjectProperty ; " +
 				"    rdfs:label \"Prop 1 Dependent Relation\" ; " +
 			         isDependentRelation ;
-										
+
 			Model expectedModel = (ModelFactory.createOntologyModel()).read(new StringReader(expected), "", "N3");
 
 			assertEquivalentModels(expectedModel, ontModel);
@@ -117,19 +117,19 @@ public class JenaBaseDaoTest {
 				Assert.fail(e.getMessage());
 		}
 	}
-	
+
 	@Test
 	public void smartRemoveTestForObjPropStmtDelete(){
-		String n3 = prefixesN3 + 
+		String n3 = prefixesN3 +
 			"ex:prop1 rdf:type owl:ObjectProperty ." +
 			"ex:prop1 rdfs:label \"Prop 1 Dependent Relation\" ." +
 			"ex:prop1 " + isDependentRelation;
-				
+
 		Model readInModel = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
 		OntModel model = ModelFactory.createOntologyModel();
 		model.add(readInModel);
-		WebappDaoFactoryJena wdfj = new WebappDaoFactoryJena( model);								
-				
+		WebappDaoFactoryJena wdfj = new WebappDaoFactoryJena( model);
+
 		Individual ind = new IndividualImpl();
 		ind.setURI("http://example.com/bob");
 		ind.setName("Smith, Bob");
@@ -138,43 +138,43 @@ public class JenaBaseDaoTest {
 		} catch (InsertException e) {
 			Assert.fail("Could not create new Individual Smith, Bob");
 		}
-				
+
 		Individual indxyz = new IndividualImpl();
 		indxyz.setURI("http://example.com/depResXYZ");
 		indxyz.setName("depResXYZ");
 		try {
-			wdfj.getIndividualDao().insertNewIndividual(indxyz);			
+			wdfj.getIndividualDao().insertNewIndividual(indxyz);
 		} catch (InsertException e) {
 			Assert.fail("Could not create new Individual depResXYZ");
-		}				
-		
+		}
+
 		Individual indAbc = new IndividualImpl();
 		indAbc.setURI("http://example.com/depResNested");
 		indAbc.setName("depResNested");
 		try {
-			wdfj.getIndividualDao().insertNewIndividual(indAbc);			
+			wdfj.getIndividualDao().insertNewIndividual(indAbc);
 		} catch (InsertException e) {
 			Assert.fail("Could not create new Individual depResNested");
-		}			
-		
+		}
+
 		ObjectPropertyStatement ops = new ObjectPropertyStatementImpl();
 		ops.setSubjectURI("http://example.com/bob");
 		ops.setPropertyURI("http://example.com/prop1");
 		ops.setObjectURI("http://example.com/depResXYZ");
 		wdfj.getObjectPropertyStatementDao().insertNewObjectPropertyStatement(ops);
-		
+
 		ops = new ObjectPropertyStatementImpl();
 		ops.setSubjectURI("http://example.com/depResXYZ");
 		ops.setPropertyURI("http://example.com/prop1");
 		ops.setObjectURI("http://example.com/depResNested");
 		wdfj.getObjectPropertyStatementDao().insertNewObjectPropertyStatement(ops);
-		
+
 		ops = new ObjectPropertyStatementImpl();
 		ops.setSubjectURI("http://example.com/bob");
 		ops.setPropertyURI("http://example.com/prop1");
 		ops.setObjectURI("http://example.com/depResXYZ");
 		wdfj.getObjectPropertyStatementDao().deleteObjectPropertyStatement(ops);
-		
+
 		String expected =
 			"@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> . "+
 			"@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> ."+
@@ -186,59 +186,59 @@ public class JenaBaseDaoTest {
 			"    a       owl:ObjectProperty ; " +
 			"    rdfs:label \"Prop 1 Dependent Relation\" ; " +
 			     isDependentRelation ;
-									
-		Model expectedModel = (ModelFactory.createOntologyModel()).read(new StringReader(expected), "", "N3");		
-				
+
+		Model expectedModel = (ModelFactory.createOntologyModel()).read(new StringReader(expected), "", "N3");
+
 		assertEquivalentModels(expectedModel, model);
 	}
-	
-	
+
+
 	@Test
-	public void smartRemoveTestForObjPropDelete(){				
-		String n3 = prefixesN3 + 
+	public void smartRemoveTestForObjPropDelete(){
+		String n3 = prefixesN3 +
 			"ex:prop1 rdf:type owl:ObjectProperty ." +
 			"ex:prop1 rdfs:label \"Prop 1 Dependent Relation\" ." +
 			"ex:prop1 " + isDependentRelation;
-					
+
 		Model readInModel = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
 		OntModel ontModel = ModelFactory.createOntologyModel();
 		ontModel.add(readInModel);
 		WebappDaoFactoryJena wdfj = new WebappDaoFactoryJena( ontModel);
-		
+
 		try {
 			ObjectProperty prop1 = wdfj.getObjectPropertyDao().getObjectPropertyByURI("http://example.com/prop1");
 			Assert.assertNotNull(prop1);
-			
+
 			Individual ind = new IndividualImpl();
 			ind.setURI("http://example.com/bob");
-			ind.setName("Smith, Bob");		
-			
-			wdfj.getIndividualDao().insertNewIndividual(ind);			
-					
+			ind.setName("Smith, Bob");
+
+			wdfj.getIndividualDao().insertNewIndividual(ind);
+
 			Individual indxyz = new IndividualImpl();
 			indxyz.setURI("http://example.com/depResXYZ");
-			indxyz.setName("depResXYZ");			
-			wdfj.getIndividualDao().insertNewIndividual(indxyz);			
-			
+			indxyz.setName("depResXYZ");
+			wdfj.getIndividualDao().insertNewIndividual(indxyz);
+
 			Individual indAbc = new IndividualImpl();
 			indAbc.setURI("http://example.com/depResNested");
-			indAbc.setName("depResNested");					
-			wdfj.getIndividualDao().insertNewIndividual(indAbc);								
-		
+			indAbc.setName("depResNested");
+			wdfj.getIndividualDao().insertNewIndividual(indAbc);
+
 			ObjectPropertyStatement ops = new ObjectPropertyStatementImpl();
 			ops.setSubjectURI("http://example.com/bob");
 			ops.setPropertyURI("http://example.com/prop1");
 			ops.setObjectURI("http://example.com/depResXYZ");
 			wdfj.getObjectPropertyStatementDao().insertNewObjectPropertyStatement(ops);
-		
+
 			ops = new ObjectPropertyStatementImpl();
 			ops.setSubjectURI("http://example.com/depResXYZ");
 			ops.setPropertyURI("http://example.com/prop1");
 			ops.setObjectURI("http://example.com/depResNested");
 			wdfj.getObjectPropertyStatementDao().insertNewObjectPropertyStatement(ops);
-			
+
 			wdfj.getObjectPropertyDao().deleteObjectProperty(prop1);
-			
+
 			String expected =
 				"@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> . "+
 				"@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> ."+
@@ -246,18 +246,18 @@ public class JenaBaseDaoTest {
 				"@prefix owl:     <http://www.w3.org/2002/07/owl#> . "+
 				"<http://example.com/bob>      a       owl:Thing ; " +
 				"    rdfs:label \"Smith, Bob\"@en-US . " ;
-										
+
 			Model expectedModel = (ModelFactory.createOntologyModel()).read(new StringReader(expected), "", "N3");
-			
+
 			assertEquivalentModels(expectedModel, ontModel);
 			} catch (InsertException e) {
 				Assert.fail(e.getMessage());
 		}
 	}
-	
+
 //	@Test
 //	public void smartRemoveTestForObjPropDelete(){
-//		
+//
 //		OntModel model = ModelFactory.createOntologyModel();
 //		WebappDaoFactoryJena wdfj = new WebappDaoFactoryJena( model );
 //
@@ -269,7 +269,7 @@ public class JenaBaseDaoTest {
 //		} catch (InsertException e1) {
 //			Assert.fail("could not create class for dependentResourc");
 //		}
-//		
+//
 //		/* Need to have an Object Property */
 //		ObjectProperty op = new ObjectProperty();
 //		op.setURI("http://example.com/prop1");
@@ -278,7 +278,7 @@ public class JenaBaseDaoTest {
 //		} catch (InsertException e1) {
 //			Assert.fail("Could not create object property.");
 //		}
-//		
+//
 //		Individual ind = new IndividualImpl();
 //		ind.setURI("http://example.com/bob");
 //		ind.setName("Smith, Bob");
@@ -287,48 +287,48 @@ public class JenaBaseDaoTest {
 //		} catch (InsertException e) {
 //			Assert.fail("Could not create new Individual Smith, Bob");
 //		}
-//				
+//
 //		Individual indxyz = new IndividualImpl();
 //		indxyz.setURI("http://example.com/depResXYZ");
 //		indxyz.setName("depResXYZ");
 //		//indxyz.setVClassURI(VitroVocabulary.DEPENDENT_RESOURCE);
 //		try {
-//			wdfj.getIndividualDao().insertNewIndividual(indxyz);			
+//			wdfj.getIndividualDao().insertNewIndividual(indxyz);
 //		} catch (InsertException e) {
 //			Assert.fail("Could not create new Individual depResXYZ");
-//		}				
+//		}
 ////		StmtIterator it = model.listStatements(model.createResource("http://example.com/depResXYZ"),
 ////				RDF.type, model.createResource(VitroVocabulary.DEPENDENT_RESOURCE));
 ////		Assert.assertTrue("depResXYZ did not get rdf:type vitro:dependentResource" ,
 ////				it != null && it.nextStatement() != null);
-//		
+//
 //		Individual indAbc = new IndividualImpl();
 //		indAbc.setURI("http://example.com/depResNested");
 //		indAbc.setName("depResNested");
 ////		indAbc.setVClassURI(VitroVocabulary.DEPENDENT_RESOURCE);
 //		try {
-//			wdfj.getIndividualDao().insertNewIndividual(indAbc);			
+//			wdfj.getIndividualDao().insertNewIndividual(indAbc);
 //		} catch (InsertException e) {
 //			Assert.fail("Could not create new Individual depResNested");
-//		}	
+//		}
 ////		it = model.listStatements(model.createResource("http://example.com/depResNested"),
 ////				RDF.type, model.createResource(VitroVocabulary.DEPENDENT_RESOURCE));
 ////		Assert.assertTrue("depResNested did not get rdf:type vitro:dependentResource" ,
 ////				it != null && it.nextStatement() != null);
-//		
-//		
+//
+//
 //		ObjectPropertyStatement ops = new ObjectPropertyStatementImpl();
 //		ops.setSubjectURI("http://example.com/bob");
 //		ops.setPropertyURI("http://example.com/prop1");
 //		ops.setObjectURI("http://example.com/depResXYZ");
 //		wdfj.getObjectPropertyStatementDao().insertNewObjectPropertyStatement(ops);
-//		
+//
 //		ops = new ObjectPropertyStatementImpl();
 //		ops.setSubjectURI("http://example.com/depResXYZ");
 //		ops.setPropertyURI("http://example.com/prop1");
 //		ops.setObjectURI("http://example.com/depResNested");
 //		wdfj.getObjectPropertyStatementDao().insertNewObjectPropertyStatement(ops);
-//		
+//
 //		String expected = "<rdf:RDF\n"+
 //		"    xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n"+
 //		"    xmlns:j.0=\"http://vitro.mannlib.cornell.edu/ns/vitro/0.7#\"\n"+
@@ -346,18 +346,18 @@ public class JenaBaseDaoTest {
 //		"    <rdf:type rdf:resource=\"http://www.w3.org/2002/07/owl#Class\"/>\n"+
 //		"  </rdf:Description>\n"+
 //		"</rdf:RDF>";
-//								
+//
 //		wdfj.getObjectPropertyDao().deleteObjectProperty(op);
-//		
+//
 //		Model expectedModel = (ModelFactory.createOntologyModel()).read(new StringReader(expected), "", "RDF/XML");
-//		
+//
 //		//modtime times make it difficult to compare graphs
 //		wipeOutModTime(expectedModel);
 //		wipeOutModTime(model);
-//		Assert.assertTrue( model.isIsomorphicWith(expectedModel));		
+//		Assert.assertTrue( model.isIsomorphicWith(expectedModel));
 //	}
 
-	@Test 
+	@Test
 	/**
 	 * Tests that any statements with a property as predicate are removed
 	 * when the property itself is removed
@@ -365,9 +365,9 @@ public class JenaBaseDaoTest {
 	public void testABoxAssertionsRemovedWhenPropertyRemoved() throws InsertException {
 		OntModel preModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		OntModel postModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
-		
+
 		WebappDaoFactoryJena preWadf = new WebappDaoFactoryJena(preModel);
-		
+
 		// make some other stuff that won't be deleted
 		ObjectProperty objPropNotForDeletion = new ObjectProperty();
 		objPropNotForDeletion.setURI("http://dont.delete.me/objProp");
@@ -384,13 +384,13 @@ public class JenaBaseDaoTest {
 		dataPropStmtNotForDeletion.setIndividualURI("http://individual.example.org/a/");
 		dataPropStmtNotForDeletion.setDatapropURI(dataPropNotForDeletion.getURI());
 		dataPropStmtNotForDeletion.setData("junk");
-		
+
 		// copy the not-for-deletion data to the postModel
 		postModel.add(preModel);
-		
+
 		// Make some properties and assertions that should be deleted.
 		// After deletion, the "preModel" should match the "postModel," which
-        // only contains the not-for-deletion statements.		
+        // only contains the not-for-deletion statements.
 		ObjectProperty objProp = new ObjectProperty();
 		objProp.setURI("http://example.org/objProp");
 		preWadf.getObjectPropertyDao().insertObjectProperty(objProp);
@@ -407,18 +407,18 @@ public class JenaBaseDaoTest {
 		dataPropStmtForDeletion.setDatapropURI(dataProp.getURI());
 		dataPropStmtForDeletion.setData("I will be deleted!");
 		preWadf.getDataPropertyStatementDao().insertNewDataPropertyStatement(dataPropStmtForDeletion);
-		
-		// delete the object property and the data property.  
+
+		// delete the object property and the data property.
 		// The abox assertions should go with them.
 		preWadf.getObjectPropertyDao().deleteObjectProperty(objProp);
 		preWadf.getDataPropertyDao().deleteDataProperty(dataProp);
-		
+
 		// the preModel and the postModel should now have the same statements
 		//Assert.assertTrue(preModel.isIsomorphicWith(postModel));
 		Assert.assertTrue(preModel.size() == postModel.size());
-		
+
 	}
-		
+
 	@Test
 	/**
 	 * Test that removing classes or properties used in restrictions
@@ -428,35 +428,35 @@ public class JenaBaseDaoTest {
 	public void testPreventInvalidRestrictionsOnDeletion() {
 		OntModel m = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		WebappDaoFactoryJena wadf = new WebappDaoFactoryJena(m);
-		
+
 		String ns = "http://example.org/ontology/";
 		String class1URI = ns + "Class1";
 		String class2URI = ns + "Class2";
 		String propURI = ns + "property";
-		
+
 		OntClass class1 = m.createClass(class1URI);
 		OntClass class2 = m.createClass(class2URI);
 		OntProperty prop = m.createObjectProperty(propURI);
 		Restriction rest = m.createAllValuesFromRestriction(null, prop, class2);
 		class1.addSuperClass(rest);
-		
+
 		ObjectProperty op = wadf.getObjectPropertyDao().getObjectPropertyByURI(propURI);
 		wadf.getObjectPropertyDao().deleteObjectProperty(op);
-		
+
 		Assert.assertEquals(class1.listSuperClasses().toSet().size(), 0);
 		Assert.assertEquals(m.size(), 2); // just rdf:type owl:Class for Class1 and Class2
-		
+
 		prop = m.createObjectProperty(propURI);
 		rest = m.createAllValuesFromRestriction(null, prop, class2);
 		class1.addSuperClass(rest);
-		
+
 		VClass vclass = wadf.getVClassDao().getVClassByURI(class2URI);
 		wadf.getVClassDao().deleteVClass(vclass);
-		
+
 		Assert.assertEquals(class1.listSuperClasses().toSet().size(), 0);
 		Assert.assertEquals(m.size(), 2); // just rdf:type for Class1 and Prop
-		
-	}	
+
+	}
 
 	/**
 	 * Compare the contents of the expected model with the actual model (not counting modification times).
@@ -483,6 +483,6 @@ public class JenaBaseDaoTest {
 	private void wipeOutModTime(Model model){
 		model.removeAll(null, model.createProperty(VitroVocabulary.MODTIME), null);
 	}
-	
+
 
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJenaTest.java
index bce4aa09f..59a8d8bc5 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJenaTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJenaTest.java
@@ -23,17 +23,17 @@ import edu.cornell.mannlib.vitro.webapp.web.templatemodels.menu.MenuItem;
 
 
 public class MenuDaoJenaTest extends AbstractTestClass {
-    
+
     OntModel displayModel;
-    
+
     @Before
     public void setUp() throws Exception {
         // Suppress error logging.
         setLoggerLevel(RDFDefaultErrorHandler.class, Level.OFF);
 
-        Model model = ModelFactory.createDefaultModel();        
+        Model model = ModelFactory.createDefaultModel();
         InputStream in = MenuDaoJenaTest.class.getResourceAsStream("resources/menuForTest.n3");
-        model.read(in,"","N3");        
+        model.read(in,"","N3");
         displayModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM,model);
     }
 
@@ -42,64 +42,64 @@ public class MenuDaoJenaTest extends AbstractTestClass {
         SimpleOntModelSelector sos = new SimpleOntModelSelector( ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM));
         sos.setDisplayModel(displayModel);
         MenuDaoJena menuDaoJena = new MenuDaoJena(new WebappDaoFactoryJena(sos));
-        
-        MainMenu menu = menuDaoJena.getMainMenu( "notImportant" );       
-        
+
+        MainMenu menu = menuDaoJena.getMainMenu( "notImportant" );
+
         try{
             Class clz = UrlBuilder.class;
             Field f = clz.getDeclaredField( "contextPath" );
             f.setAccessible(true);
-            f.set(null, "bogusUrlContextPath"); 
+            f.set(null, "bogusUrlContextPath");
         }catch(Exception e){
             Assert.fail(e.toString());
         }
-        
+
         Assert.assertNotNull(menu);
         Assert.assertNotNull( menu.getItems() );
         Assert.assertEquals(5, menu.getItems().size());
-        
+
         //The nulls in getUrl() are from the UrlBuilder not being setup correctly.
         //it should be fine.
-        
+
         MenuItem item = menu.getItems().get(0);
         Assert.assertNotNull(item);
         Assert.assertEquals("Home",item.getLinkText());
         Assert.assertEquals("bogusUrlContextPath/home",item.getUrl());
-        
+
         item = menu.getItems().get(1);
         Assert.assertNotNull(item);
         Assert.assertEquals("People",item.getLinkText());
         Assert.assertEquals("bogusUrlContextPath/people",item.getUrl());
-        
+
         item = menu.getItems().get(2);
         Assert.assertNotNull(item);
         Assert.assertEquals("Publications",item.getLinkText());
         Assert.assertEquals("bogusUrlContextPath/publications",item.getUrl());
-        
+
         item = menu.getItems().get(3);
         Assert.assertNotNull(item);
         Assert.assertEquals("Events",item.getLinkText());
         Assert.assertEquals("bogusUrlContextPath/events",item.getUrl());
-        
+
         item = menu.getItems().get(4);
         Assert.assertNotNull(item);
         Assert.assertEquals("Organizations",item.getLinkText());
         Assert.assertEquals("bogusUrlContextPath/organizations",item.getUrl());
     }
-    
-    
+
+
     @Test
     public void isActiveTest(){
         SimpleOntModelSelector sos = new SimpleOntModelSelector( ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM));
         sos.setDisplayModel(displayModel);
-        MenuDaoJena menuDaoJena = new MenuDaoJena(new WebappDaoFactoryJena(sos));                 
-        
+        MenuDaoJena menuDaoJena = new MenuDaoJena(new WebappDaoFactoryJena(sos));
+
         //First arg is the page the user is on.  Second arg is the urlmapping of the menu item.
         Assert.assertTrue( menuDaoJena.isActive("/", "/") );
         Assert.assertTrue( menuDaoJena.isActive("/people", "/people") );
-        
+
         Assert.assertFalse( menuDaoJena.isActive("/people", "/") );
         Assert.assertFalse( menuDaoJena.isActive("/", "/people") );
-        
+
     }
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJenaTest.java
index 6ff573a27..5df236060 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJenaTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJenaTest.java
@@ -18,16 +18,16 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 
 
-public class ObjectPropertyDaoJenaTest extends AbstractTestClass {  
-        
+public class ObjectPropertyDaoJenaTest extends AbstractTestClass {
+
 	@Test
 	public void testCollateBySubclass(){
 		/* Check that we can save collateBySubclass */
 		OntModel model = ModelFactory.createOntologyModel();
 		WebappDaoFactory wdf = new WebappDaoFactoryJena(model);
-		
+
 		ObjectProperty op1 = new ObjectProperty();
-		String propURI = "http://example.com/testObjectProp" ;		
+		String propURI = "http://example.com/testObjectProp" ;
 		op1.setURI(propURI);
 		Assert.assertFalse(op1.getCollateBySubclass());
 		try {
@@ -35,34 +35,34 @@ public class ObjectPropertyDaoJenaTest extends AbstractTestClass {
 			ObjectProperty op2 = wdf.getObjectPropertyDao().getObjectPropertyByURI(propURI);
 			Assert.assertNotNull(op2);
 			Assert.assertFalse(op2.getCollateBySubclass());
-			
+
 			op2.setCollateBySubclass(true);
 			wdf.getObjectPropertyDao().updateObjectProperty(op2);
-			
+
 			ObjectProperty op3 = wdf.getObjectPropertyDao().getObjectPropertyByURI(propURI);
 			Assert.assertNotNull(op3);
 			Assert.assertTrue(op3.getCollateBySubclass());
-			
+
 			op3.setCollateBySubclass(false);
 			wdf.getObjectPropertyDao().updateObjectProperty(op3);
-			
+
 			ObjectProperty op4 = wdf.getObjectPropertyDao().getObjectPropertyByURI(propURI);
 			Assert.assertNotNull(op4);
 			Assert.assertFalse(op4.getCollateBySubclass());
-			
+
 		} catch (InsertException e) {
 			Assert.fail(e.getMessage());
 		}
 	}
-	
+
 	@Test
 	public void testStubObjectProperty(){
 		/* Check that we can save collateBySubclass */
 		OntModel model = ModelFactory.createOntologyModel();
 		WebappDaoFactory wdf = new WebappDaoFactoryJena(model);
-		
+
 		ObjectProperty op1 = new ObjectProperty();
-		String propURI = "http://example.com/testObjectProp" ;		
+		String propURI = "http://example.com/testObjectProp" ;
 		op1.setURI(propURI);
 		Assert.assertFalse(op1.getStubObjectRelation());
 		try {
@@ -70,42 +70,42 @@ public class ObjectPropertyDaoJenaTest extends AbstractTestClass {
 			ObjectProperty op2 = wdf.getObjectPropertyDao().getObjectPropertyByURI(propURI);
 			Assert.assertNotNull(op2);
 			Assert.assertFalse(op2.getStubObjectRelation());
-			
+
 			op2.setStubObjectRelation(true);
 			wdf.getObjectPropertyDao().updateObjectProperty(op2);
-			
+
 			ObjectProperty op3 = wdf.getObjectPropertyDao().getObjectPropertyByURI(propURI);
 			Assert.assertNotNull(op3);
 			Assert.assertTrue(op3.getStubObjectRelation());
-			
+
 			op3.setStubObjectRelation(false);
 			wdf.getObjectPropertyDao().updateObjectProperty(op3);
-			
+
 			ObjectProperty op4 = wdf.getObjectPropertyDao().getObjectPropertyByURI(propURI);
 			Assert.assertNotNull(op4);
 			Assert.assertFalse(op4.getStubObjectRelation());
-			
+
 		} catch (InsertException e) {
 			Assert.fail(e.getMessage());
 		}
 	}
-	
+
 	@Test
-	// Test that the ObjectPropertyDaoJena::updateProperty method will only update the jena model for 
+	// Test that the ObjectPropertyDaoJena::updateProperty method will only update the jena model for
 	// those properties in ObjectProperty that have a different value from what is already in the
-	// jena model for that property. 
-	//	
+	// jena model for that property.
+	//
 	// Specifically, updateProperty method should not remove a statement from the model and
 	// then add the same statement back in. The reason for this is that in vitro the "immutable" properties
 	// are stored in a sub-model and the user-editable properties are stored in a super-model and
-	// all updates are performed against the super-model, so removing and then re-adding 
-	// the same statement may result in a change of state (if the statement was in the sub-model 
+	// all updates are performed against the super-model, so removing and then re-adding
+	// the same statement may result in a change of state (if the statement was in the sub-model
 	// it will migrate to the super-model) because of the way jena handles additions and
 	// deletions with respect to super and sub models. This migration of statements may cause
 	// undesirable behavior in the vitro application.
-		
+
 	public void minimalUpdates(){
-	
+
 		// 1. create two models and attach one as a sub-model of the other
 		// 2. populate the sub-model with one statement for each of the properties represented in ObjectProperty
 		// TODO still need to populate more of the properties, and set up some inverse and parent and inverse of
@@ -114,26 +114,26 @@ public class ObjectPropertyDaoJenaTest extends AbstractTestClass {
 		// 4. populate an ObjectProperty object with the data in the (combined) model and call the updateProperty
 		//    (having made no changes to the ObjectProperty object)
 		// 5. verify that both the sub-model and the super-model are unchanged
-		
+
 		String propertyURI = "http://example.com/testObjectProp";
 
 		OntModel superModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); // this simulates the user-editable ontology in vivo
 		OntModel subModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);   // this simulates the core ontology in vivo
 		superModel.addSubModel(subModel);
-		
+
 		String rdfsLabel = "this is the rdfs label";
 		String lang = "en-US";
-		
+
 		// populate sub-model
 		org.apache.jena.ontology.ObjectProperty property1 = subModel.createObjectProperty(propertyURI);
-		
-		property1.setLabel(rdfsLabel,lang);  
-		
+
+		property1.setLabel(rdfsLabel,lang);
+
 		property1.convertToTransitiveProperty();
 		property1.convertToSymmetricProperty();
 		property1.convertToFunctionalProperty();
 		property1.convertToInverseFunctionalProperty();
-		
+
 		property1.setPropertyValue(RDFS.domain, subModel.createResource("http://thisIsTheDomainClassURI"));
 		property1.setPropertyValue(RDFS.range, subModel.createResource("http://thisIsTheRangeClassURI"));
 		property1.setPropertyValue(subModel.createProperty(VitroVocabulary.EXAMPLE_ANNOT), subModel.createTypedLiteral("this is the example"));
@@ -150,62 +150,62 @@ public class ObjectPropertyDaoJenaTest extends AbstractTestClass {
 		property1.setPropertyValue(subModel.createProperty(VitroVocabulary.PROPERTY_INPROPERTYGROUPANNOT), subModel.createResource("http://thisIsTheInPropertyGroupURI"));
 		property1.setPropertyValue(subModel.createProperty(VitroVocabulary.PROPERTY_CUSTOMENTRYFORMANNOT), subModel.createResource("http://thisIsTheCustomFormEntryURI"));
 		property1.setPropertyValue(subModel.createProperty(VitroVocabulary.PROPERTY_SELECTFROMEXISTINGANNOT), subModel.createTypedLiteral(true));
-		
+
 		// Save copies of sub-model and super-model
-		
+
 		// uncommment the next two lines to debug failures
-		//System.out.println("**Before updating data property:");		
-		//printModels(superModel, subModel);		
-		
+		//System.out.println("**Before updating data property:");
+		//printModels(superModel, subModel);
+
 		superModel.removeSubModel(subModel);
-		
-		OntModel origSubModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+
+		OntModel origSubModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		origSubModel.add(subModel);
-		OntModel origSuperModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel origSuperModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		origSuperModel.add(superModel);
-		
+
 		superModel.addSubModel(subModel);
-		
+
 		// Populate the ObjectProperty with the data in the sub-model and then update the combined model
 		// (from the unchanged object).
 		WebappDaoFactoryJena wdfj = new WebappDaoFactoryJena(superModel);
 		ObjectPropertyDaoJena pdj = (ObjectPropertyDaoJena) wdfj.getObjectPropertyDao();
-		ObjectProperty objectProperty = pdj.getObjectPropertyByURI(propertyURI); // the Property will be populated 
-		                                                                         // with the information already in 
+		ObjectProperty objectProperty = pdj.getObjectPropertyByURI(propertyURI); // the Property will be populated
+		                                                                         // with the information already in
 		                                                                         // the jena model.
-		
-		
+
+
        // check RDFS label here
-		
-        pdj.updateObjectProperty(objectProperty);       // we haven't changed any values here, so 
+
+        pdj.updateObjectProperty(objectProperty);       // we haven't changed any values here, so
                                                         // the models should be unchanged.
- 
+
         // Verify that the sub-model and super-model are both unchanged
 
         // uncommment the next two lines to debug failures
         //System.out.println("\n**After updating data property:");
         //printModels(superModel,subModel);
-    
+
         superModel.removeSubModel(subModel);
-        
+
 		//modtime affects the diff but we don't care about that difference
 		wipeOutModTime(origSubModel);
 		wipeOutModTime(origSuperModel);
 		wipeOutModTime(subModel);
 		wipeOutModTime(superModel);
-		
-		Assert.assertTrue(subModel.isIsomorphicWith(origSubModel));	
-	    Assert.assertTrue(superModel.isIsomorphicWith(origSuperModel));	    
+
+		Assert.assertTrue(subModel.isIsomorphicWith(origSubModel));
+	    Assert.assertTrue(superModel.isIsomorphicWith(origSuperModel));
 	}
-	
-	
+
+
 	void printModels(OntModel superModel, OntModel subModel) {
 
 		// Detach the submodel for printing to get an accurate
 		// account of what is in each.
-		
+
 	    superModel.removeSubModel(subModel);
-	    
+
 		System.out.println("\nThe sub-model has " + subModel.size() + " statements:");
 		System.out.println("---------------------------------------------------");
 		subModel.writeAll(System.out,"N3",null);
@@ -213,15 +213,15 @@ public class ObjectPropertyDaoJenaTest extends AbstractTestClass {
 		System.out.println("\nThe super-model has " + superModel.size() + " statements:");
 		System.out.println("---------------------------------------------------");
 	    superModel.write(System.out,"N3",null);
-		
+
 	    superModel.addSubModel(subModel);
-		
+
 	}
-	
+
 
 	void wipeOutModTime(Model model){
 		model.removeAll(null, model.createProperty(VitroVocabulary.MODTIME), null);
 	}
-		
+
 
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJenaTest.java
index f74c45b2a..bc5c8bdef 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJenaTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJenaTest.java
@@ -18,16 +18,16 @@ public class ObjectPropertyStatementDaoJenaTest {
      */
     @Test
     public void testN3WithSameAs() {
-        
+
         String n3WithSameAs = " <http://example.com/bob> = <http://example.com/robert> .";
-        
+
         try{
             Model m = ModelFactory.createDefaultModel();
             m.read(n3WithSameAs, null, "N3");
             fail( "If this test fails it means that jena now correctly parses = when reading N3.");
         }catch(Exception ex ){
-            
-            
+
+
         }
     }
 
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSegementationTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSegementationTest.java
index c6637e220..8867ce9cc 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSegementationTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSegementationTest.java
@@ -35,10 +35,10 @@ public class OntModelSegementationTest {
 	public void setUpWebappDaoFactoryJena() {
 		wadf = new WebappDaoFactoryJena(new SimpleOntModelSelector());
 	}
-	
+
 	@Test
 	public void testUserAccountModel() {
-		
+
 		UserAccountsDao uadao = wadf.getUserAccountsDao();
 		OntModelSelector oms = wadf.getOntModelSelector();
 
@@ -46,14 +46,14 @@ public class OntModelSegementationTest {
 		user.setFirstName("Chuck");
 		user.setLastName("Roast");
 		user.setExternalAuthId("chuckroast");
-		
+
 		uadao.insertUserAccount(user);
 		Assert.assertTrue(oms.getUserAccountsModel().size() > 0);
 		Assert.assertTrue(oms.getFullModel().size() == 0);
 		Assert.assertTrue(oms.getABoxModel().size() == 0);
 		Assert.assertTrue(oms.getTBoxModel().size() == 0);
 		Assert.assertTrue(oms.getApplicationMetadataModel().size() == 0);
-		
+
 		user.setEmailAddress("todd@somewhere");
 		uadao.updateUserAccount(user);
 		Assert.assertTrue(oms.getUserAccountsModel().size() > 0);
@@ -61,154 +61,154 @@ public class OntModelSegementationTest {
 		Assert.assertTrue(oms.getABoxModel().size() == 0);
 		Assert.assertTrue(oms.getTBoxModel().size() == 0);
 		Assert.assertTrue(oms.getApplicationMetadataModel().size() == 0);
-		
+
 		uadao.deleteUserAccount(user.getUri());
 		Assert.assertTrue(oms.getUserAccountsModel().size() == 0);
 		Assert.assertTrue(oms.getFullModel().size() == 0);
 		Assert.assertTrue(oms.getABoxModel().size() == 0);
 		Assert.assertTrue(oms.getTBoxModel().size() == 0);
 		Assert.assertTrue(oms.getApplicationMetadataModel().size() == 0);
-		
+
 	}
-	
+
 	/*
 	@Test
 	public void testApplicationMetadataModel() throws InsertException {
-		
+
 		PortalDao pdao = wadf.getPortalDao();
 		TabDao tdao = wadf.getTabDao();
 		VClassGroupDao vcgdao = wadf.getVClassGroupDao();
 		PropertyGroupDao pgdao = wadf.getPropertyGroupDao();
 		OntModelSelector oms = wadf.getOntModelSelector();
-	
+
 		this.assertAllModelsExceptAppMetadataAreEmpty(oms);
-		
+
 		//insert a portal
 		Portal portal = new Portal();
 		portal.setPortalId(1);
 		portal.setAppName("test portal");
 		pdao.insertPortal(portal);
 		this.assertMetadataModelNonemptyAndAllOtherModelsAreEmpty(oms);
-		
+
 		//insert a tab
 		Tab tab = new Tab();
 		tab.setTitle("test tab");
 		int tabId = tdao.insertTab(tab);
 		tab.setTabId(tabId);
 		this.assertMetadataModelNonemptyAndAllOtherModelsAreEmpty(oms);
-		
+
 		//insert a classgroup
 		VClassGroup group = new VClassGroup();
 		group.setURI("http://example.org/classgroup");
 		group.setPublicName("test group");
 		vcgdao.insertNewVClassGroup(group);
 		this.assertMetadataModelNonemptyAndAllOtherModelsAreEmpty(oms);
-		
+
 		//insert a property group
 		PropertyGroup pgroup = new PropertyGroup();
 		pgroup.setURI("http://example.org/propertygroup");
 		pgroup.setName("test property group");
 		pgdao.insertNewPropertyGroup(pgroup);
 		this.assertMetadataModelNonemptyAndAllOtherModelsAreEmpty(oms);
-		
+
 		portal.setAppName("updated portal");
 		tab.setTitle("updated tab");
 		group.setPublicName("updated group");
 		pgroup.setName("updated property group");
-		
+
 		pdao.updatePortal(portal);
 		this.assertMetadataModelNonemptyAndAllOtherModelsAreEmpty(oms);
-		
+
 		tdao.updateTab(tab);
 		this.assertMetadataModelNonemptyAndAllOtherModelsAreEmpty(oms);
-		
+
 		vcgdao.updateVClassGroup(group);
 		this.assertMetadataModelNonemptyAndAllOtherModelsAreEmpty(oms);
-		
+
 		pgdao.updatePropertyGroup(pgroup);
 		this.assertMetadataModelNonemptyAndAllOtherModelsAreEmpty(oms);
-		
+
 		tdao.deleteTab(tab);
 		vcgdao.deleteVClassGroup(group);
 		pgdao.deletePropertyGroup(pgroup);
-		
+
 		this.assertAllModelsExceptAppMetadataAreEmpty(oms);
-		
+
 	}
 	*/
-	
+
 	@Test
 	public void testTBoxModel() throws InsertException {
-		
+
 		OntModelSelector oms = wadf.getOntModelSelector();
 		VClassDao vcDao = wadf.getVClassDao();
 		ObjectPropertyDao opDao = wadf.getObjectPropertyDao();
 		DataPropertyDao dpDao = wadf.getDataPropertyDao();
 		OntologyDao oDao = wadf.getOntologyDao();
-		
+
 		VClass vclass = new VClass();
 		vclass.setURI("http://example.org/vclass");
 		vcDao.insertNewVClass(vclass);
 		this.assertTBoxModelNonemptyAndAllOtherModelsAreEmpty(oms);
-		
+
 		ObjectProperty op = new ObjectProperty();
 		op.setURI("http://example.org/objectProperty");
 		opDao.insertObjectProperty(op);
 		this.assertTBoxModelNonemptyAndAllOtherModelsAreEmpty(oms);
-		
+
 		DataProperty dp = new DataProperty();
 		dp.setURI("http://example.org/dataProperty");
 		dpDao.insertDataProperty(dp);
 		this.assertTBoxModelNonemptyAndAllOtherModelsAreEmpty(oms);
-		
+
 		Ontology o = new Ontology();
 		o.setURI("http://example.org/");
 		oDao.insertNewOntology(o);
 		this.assertTBoxModelNonemptyAndAllOtherModelsAreEmpty(oms);
-		
+
 		vclass.setName("vclass");
 		op.setDomainPublic("objectProperty");
 		dp.setPublicName("dataProperty");
 		o.setName("ontology");
-		
+
 		vcDao.updateVClass(vclass);
 		this.assertTBoxModelNonemptyAndAllOtherModelsAreEmpty(oms);
-		
+
 		opDao.updateObjectProperty(op);
 		this.assertTBoxModelNonemptyAndAllOtherModelsAreEmpty(oms);
-		
+
 		dpDao.updateDataProperty(dp);
 		this.assertTBoxModelNonemptyAndAllOtherModelsAreEmpty(oms);
-		
+
 		oDao.updateOntology(o);
 		this.assertTBoxModelNonemptyAndAllOtherModelsAreEmpty(oms);
-		
+
 		vcDao.deleteVClass(vclass);
 		opDao.deleteObjectProperty(op);
 		dpDao.deleteDataProperty(dp);
 		oDao.deleteOntology(o);
-		
+
 		this.assertAllModelsExceptAppMetadataAreEmpty(oms);
-			
+
 	}
-	
+
 	@Test
 	public void testAboxModel() throws InsertException {
-		
+
 		OntModelSelector oms = wadf.getOntModelSelector();
 		IndividualDao iDao = wadf.getIndividualDao();
-		
+
 		Individual ind = new IndividualImpl("http://example.org/individual");
 		iDao.insertNewIndividual(ind);
 		this.assertABoxModelNonemptyAndAllOtherModelsAreEmpty(oms);
-		
+
 		ind.setName("ind");
 		iDao.updateIndividual(ind);
 		this.assertABoxModelNonemptyAndAllOtherModelsAreEmpty(oms);
-		
+
 		iDao.deleteIndividual(ind);
 		this.assertAllModelsExceptAppMetadataAreEmpty(oms);
-		
+
 	}
 
 	private void assertAllModelsExceptAppMetadataAreEmpty(OntModelSelector oms) {
@@ -218,7 +218,7 @@ public class OntModelSegementationTest {
 		Assert.assertTrue(oms.getTBoxModel().size() == 0);
 		Assert.assertTrue(oms.getUserAccountsModel().size() == 0);
 	}
-	
+
 	/*
 	private void assertMetadataModelNonemptyAndAllOtherModelsAreEmpty(OntModelSelector oms) {
 		Assert.assertTrue(oms.getApplicationMetadataModel().size() > 0);
@@ -228,7 +228,7 @@ public class OntModelSegementationTest {
 		Assert.assertTrue(oms.getUserAccountsModel().size() == 0);
 	}
 	*/
-	
+
 	private void assertTBoxModelNonemptyAndAllOtherModelsAreEmpty(OntModelSelector oms) {
 		Assert.assertTrue(oms.getTBoxModel().size() > 0);
 		Assert.assertTrue(oms.getFullModel().size() == oms.getTBoxModel().size());
@@ -236,7 +236,7 @@ public class OntModelSegementationTest {
 		Assert.assertTrue(oms.getApplicationMetadataModel().size() == 0);
 		Assert.assertTrue(oms.getUserAccountsModel().size() == 0);
 	}
-	
+
 	private void assertABoxModelNonemptyAndAllOtherModelsAreEmpty(OntModelSelector oms) {
 		Assert.assertTrue(oms.getABoxModel().size() > 0);
 		Assert.assertTrue(oms.getFullModel().size() == oms.getABoxModel().size());
@@ -244,7 +244,7 @@ public class OntModelSegementationTest {
 		Assert.assertTrue(oms.getApplicationMetadataModel().size() == 0);
 		Assert.assertTrue(oms.getUserAccountsModel().size() == 0);
 	}
-	
+
 	@Ignore
 	@Test
 	public void testConcurrency() throws InsertException {
@@ -260,32 +260,32 @@ public class OntModelSegementationTest {
 			v.setName("blah " + i);
 			wadf.getVClassDao().updateVClass(v);
 		}
-		
+
 	}
-	
+
 	private class ClassLister implements Runnable {
-		
+
 		private WebappDaoFactory wadf;
-		
+
 		public ClassLister(WebappDaoFactory wadf) {
 			this.wadf = wadf;
 		}
-		
+
 		public void run() {
-			
+
 			//int vclassTotal = wadf.getVClassDao().getAllVclasses().size();
-			
+
 			for (int i = 0; i < 1500; i++) {
-				
+
 				wadf.getVClassDao().getAllVclasses().size();
-				
+
 			//	if (vclassTotal != wadf.getVClassDao().getAllVclasses().size()) {
 			//		throw new RuntimeException("Inconsistent VClass list size");
 			//	}
 			}
-			
+
 		}
-		
+
 	}
-	
+
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJenaTest.java
index adbf484c5..d4b55a540 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJenaTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJenaTest.java
@@ -23,115 +23,115 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 public class PropertyInstanceDaoJenaTest {
 	String isDependentRelation =
 		" <"+VitroVocabulary.PROPERTY_STUBOBJECTPROPERTYANNOT+"> \"true\"^^xsd:boolean .\n" ;
-	
-	String nosePropIsDependentRel = 
+
+	String nosePropIsDependentRel =
 	"<"+VitroVocabulary.PROPERTY_STUBOBJECTPROPERTYANNOT+"> rdf:type owl:AnnotationProperty .\n" +
     " ex:hasNose " + isDependentRelation;
-	
-    String prefixesN3 = 
+
+    String prefixesN3 =
         "@prefix vitro: <" + VitroVocabulary.vitroURI + "> . \n" +
         "@prefix xsd: <" + XSD.getURI() + "> . \n " +
-        "@prefix ex: <http://example.com/> . \n" +            
+        "@prefix ex: <http://example.com/> . \n" +
         "@prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . \n"+
         "@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . \n"+
         "@prefix owl:  <http://www.w3.org/2002/07/owl#> . \n";
 
-	
+
     void printModels(Model expected, Model result){
     	System.out.println("Expected:");
     	expected.write(System.out);
     	System.out.println("Result:");
-    	result.write(System.out);    
+    	result.write(System.out);
     }
-    
- 
+
+
     @org.junit.Test
     public void testStmtNonForceDelete() {
-        String n3 = 
+        String n3 =
             prefixesN3 +
-            " ex:bob ex:hasNose ex:nose1 .   \n" +            
-        	" ex:nose1 ex:hasHair ex:hair23. \n" +
-        	" ex:hair23 ex:hasHairCount \"23\". " ;
-        
-        String expected = 
-            prefixesN3 +
-        	" ex:nose1 ex:hasHair ex:hair23. \n" +
-        	" ex:hair23 ex:hasHairCount \"23\". " ;
-        
-        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
-        OntModel ontModel = ModelFactory.createOntologyModel();
-        ontModel.add(model.listStatements());        
-        WebappDaoFactory wdf = new WebappDaoFactoryJena(ontModel);
-        wdf.getPropertyInstanceDao().deleteObjectPropertyStatement("http://example.com/bob", "http://example.com/hasNose", "http://example.com/nose1");       
-                        
-        Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
-        wipeOutModTime(ontModel);
-        //Model resultModel = ModelFactory.createDefaultModel().add(ontModel.listStatements());
-        
-        boolean same = expectedModel.isIsomorphicWith( ontModel.getBaseModel() );
-        if( ! same ) printModels( expectedModel, ontModel.getBaseModel());
-        Assert.assertTrue( same );
-    }
-    
-    
-    @org.junit.Test
-    public void testStmtSimpleForceDelete() {
-        String n3= 
-            prefixesN3 + 
-            nosePropIsDependentRel +
-            "ex:hasHair " + isDependentRelation + 
             " ex:bob ex:hasNose ex:nose1 .   \n" +
         	" ex:nose1 ex:hasHair ex:hair23. \n" +
-        	" ex:hair23 ex:hasHairCount \"23\". " ;        
-        String expected = 
+        	" ex:hair23 ex:hasHairCount \"23\". " ;
+
+        String expected =
             prefixesN3 +
-            nosePropIsDependentRel +
-            "ex:hasHair " + isDependentRelation ;                                          
-        
+        	" ex:nose1 ex:hasHair ex:hair23. \n" +
+        	" ex:hair23 ex:hasHairCount \"23\". " ;
+
         Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
         OntModel ontModel = ModelFactory.createOntologyModel();
-        ontModel.add(model.listStatements());        
+        ontModel.add(model.listStatements());
         WebappDaoFactory wdf = new WebappDaoFactoryJena(ontModel);
-        wdf.getPropertyInstanceDao().deleteObjectPropertyStatement("http://example.com/bob", "http://example.com/hasNose", "http://example.com/nose1");       
-                        
+        wdf.getPropertyInstanceDao().deleteObjectPropertyStatement("http://example.com/bob", "http://example.com/hasNose", "http://example.com/nose1");
+
         Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
         wipeOutModTime(ontModel);
         //Model resultModel = ModelFactory.createDefaultModel().add(ontModel.listStatements());
-        
+
         boolean same = expectedModel.isIsomorphicWith( ontModel.getBaseModel() );
         if( ! same ) printModels( expectedModel, ontModel.getBaseModel());
         Assert.assertTrue( same );
     }
-    
+
+
+    @org.junit.Test
+    public void testStmtSimpleForceDelete() {
+        String n3=
+            prefixesN3 +
+            nosePropIsDependentRel +
+            "ex:hasHair " + isDependentRelation +
+            " ex:bob ex:hasNose ex:nose1 .   \n" +
+        	" ex:nose1 ex:hasHair ex:hair23. \n" +
+        	" ex:hair23 ex:hasHairCount \"23\". " ;
+        String expected =
+            prefixesN3 +
+            nosePropIsDependentRel +
+            "ex:hasHair " + isDependentRelation ;
+
+        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
+        OntModel ontModel = ModelFactory.createOntologyModel();
+        ontModel.add(model.listStatements());
+        WebappDaoFactory wdf = new WebappDaoFactoryJena(ontModel);
+        wdf.getPropertyInstanceDao().deleteObjectPropertyStatement("http://example.com/bob", "http://example.com/hasNose", "http://example.com/nose1");
+
+        Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
+        wipeOutModTime(ontModel);
+        //Model resultModel = ModelFactory.createDefaultModel().add(ontModel.listStatements());
+
+        boolean same = expectedModel.isIsomorphicWith( ontModel.getBaseModel() );
+        if( ! same ) printModels( expectedModel, ontModel.getBaseModel());
+        Assert.assertTrue( same );
+    }
+
     @org.junit.Test
     public void testStmtForceDeleteWithLiterals() {
-        String n3 = 
+        String n3 =
             prefixesN3 +
             nosePropIsDependentRel +
             "ex:hasHair " + isDependentRelation +
             " ex:bob ex:a \"Bob\".   \n" +
-            " ex:bob ex:hasNose ex:nose1 .   \n" +            
+            " ex:bob ex:hasNose ex:nose1 .   \n" +
             " ex:nose1 ex:a \"this is a literal\". \n" +
             " ex:nose1 ex:b \"2343\" . \n" +
         	" ex:nose1 ex:hasHair ex:hair23. \n" +
         	" ex:hair23 ex:hasHairCount \"23\". " ;
-        
-        String expected = 
+
+        String expected =
             prefixesN3 +
             nosePropIsDependentRel +
             "ex:hasHair " + isDependentRelation +
             " ex:bob ex:a \"Bob\".   \n"  ;
-        
+
         Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
         OntModel ontModel = ModelFactory.createOntologyModel();
-        ontModel.add(model.listStatements());        
+        ontModel.add(model.listStatements());
         WebappDaoFactory wdf = new WebappDaoFactoryJena(ontModel);
-        wdf.getPropertyInstanceDao().deleteObjectPropertyStatement("http://example.com/bob", "http://example.com/hasNose", "http://example.com/nose1");       
-                        
+        wdf.getPropertyInstanceDao().deleteObjectPropertyStatement("http://example.com/bob", "http://example.com/hasNose", "http://example.com/nose1");
+
         Model expectedModel = (ModelFactory.createDefaultModel()).read(new StringReader(expected), "", "N3");
         wipeOutModTime(ontModel);
         //Model resultModel = ModelFactory.createDefaultModel().add(ontModel.listStatements());
-        
+
         boolean same = expectedModel.isIsomorphicWith( ontModel.getBaseModel() );
         if( ! same ) printModels( expectedModel, ontModel.getBaseModel());
         Assert.assertTrue( same );
@@ -140,7 +140,7 @@ public class PropertyInstanceDaoJenaTest {
     void wipeOutModTime(Model model){
 		model.removeAll(null, model.createProperty(VitroVocabulary.MODTIME), null);
 	}
-    
+
     @org.junit.Test
     public void testGetAllPossiblePropInstForIndividual() {
         String n3 = prefixesN3 +
@@ -171,35 +171,35 @@ public class PropertyInstanceDaoJenaTest {
                                        "owl:allValuesFrom ex:Organism ] . \n" +
             "ex:Person rdfs:subClassOf [ a owl:Restriction ; \n" +
                                        "owl:onProperty ex:hasSpore ; \n" +
-                                       "owl:someValuesFrom ex:Spore ] . \n" +            
+                                       "owl:someValuesFrom ex:Spore ] . \n" +
             "ex:bob a ex:Person ; a ex:Agent . \n";
-        
+
         // The applicable properties for bob should be:
         // 1. hasMold (values from Mold)
         // 2. hasSpore (values from Organism)
         // 3. hasFungus (values from Fungus)
-        
+
         OntModel ontModel = (ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM));
         ontModel.read(new StringReader(n3), null, "N3");
-        
+
         WebappDaoFactory wadf = new WebappDaoFactoryJena(ontModel);
         Assert.assertEquals(4, wadf.getObjectPropertyDao().getAllObjectProperties().size());
         Assert.assertEquals(6, wadf.getVClassDao().getAllVclasses().size());
         Assert.assertNotNull(wadf.getIndividualDao().getIndividualByURI("http://example.com/bob"));
-        
+
         Collection<PropertyInstance> pinsts = wadf.getPropertyInstanceDao()
                 .getAllPossiblePropInstForIndividual("http://example.com/bob");
-        
+
         Assert.assertEquals(3, pinsts.size());
-        
+
         Map<String, String> propToRange = new HashMap<String,String>();
         for (PropertyInstance pi : pinsts) {
             propToRange.put(pi.getPropertyURI(), pi.getRangeClassURI());
         }
-        
+
         Assert.assertEquals("http://example.com/Mold", propToRange.get("http://example.com/hasMold"));
         Assert.assertEquals("http://example.com/Organism", propToRange.get("http://example.com/hasSpore"));
-        Assert.assertEquals("http://example.com/Fungus", propToRange.get("http://example.com/hasFungus"));    
-            
+        Assert.assertEquals("http://example.com/Fungus", propToRange.get("http://example.com/hasFungus"));
+
     }
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java
index 9e18f5603..e6a301366 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java
@@ -366,7 +366,7 @@ public class UserAccountsDaoJenaTest extends AbstractTestClass {
 		ps3.setLabel("Role 3");
 		ps3.setForPublic(true);
 		expected.add(ps3);
-		
+
 		assertCorrectPermissionSets(expected, dao.getAllPermissionSets());
 	}
 
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoTest.java
index 25940cf85..4bca1fd7e 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoTest.java
@@ -20,47 +20,47 @@ import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 
 /**
- * 
- * 
+ *
+ *
  */
 
 public class VClassDaoTest {
-	
+
 	@Test
-	// Test that the VClassDaoJena::updateVClass method will only update the jena model for 
+	// Test that the VClassDaoJena::updateVClass method will only update the jena model for
 	// those properties in VClass that have a different value from what is already in the
-	// jena model for that property. 
-	//	
+	// jena model for that property.
+	//
 	// Specifically, VClass should not remove a statement from the model and then add the
 	// same statement back in. The reason for this is that in vivo the "immutable" properties
 	// are stored in a sub-model and the user-editable properties are stored in a super-model and
-	// all updates are performed against the super-model, so removing and then re-adding 
-	// the same statement may result in a change of state (if the statement was in the sub-model 
+	// all updates are performed against the super-model, so removing and then re-adding
+	// the same statement may result in a change of state (if the statement was in the sub-model
 	// it will migrate to the super-model) because of the way jena handles additions and
 	// deletions with respect to super and sub models. This migration of statements may cause
 	// undesirable behavior in the vivo/vitro application.
-	
+
 	public void modelIsolation(){
-	
+
 		// 1. create two models and attach one as a sub-model of the other
 		// 2. populate the sub-model with one statement for each of the 14 properties represented in VClass
 		// 3. save the state of both the sub-model and the super-model
 		// 4. populate a VClass object with the data in the (combined) model and call the updateVClass method
 		// 5. verify that both the sub-model and the super-model are unchanged
-		
+
 		String class1URI = "http://test.vivo/AcademicDegree";
 
 		OntModel superModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); // this simulates the user-editable ontology in vivo
 		OntModel subModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);   // this simulates the core ontology in vivo
 		superModel.addSubModel(subModel);
-		
+
 		String rdfsLabel = "this is the rdfs label";
 		String lang = "en-US";
-		
+
 		// populate sub-model
 		OntClass class1 = subModel.createClass(class1URI);
-		
-		class1.setLabel(rdfsLabel,lang);   //rdfs:label		
+
+		class1.setLabel(rdfsLabel,lang);   //rdfs:label
 		class1.setPropertyValue(subModel.createProperty(VitroVocabulary.IN_CLASSGROUP), subModel.createResource("http://thisIsTheClassGroupURI"));
 		class1.setPropertyValue(subModel.createProperty(VitroVocabulary.SHORTDEF), subModel.createTypedLiteral("this is the short definition"));
 		class1.setPropertyValue(subModel.createProperty(VitroVocabulary.EXAMPLE_ANNOT), subModel.createTypedLiteral("this is the example - why is this a string?"));
@@ -75,36 +75,36 @@ public class VClassDaoTest {
 		class1.setPropertyValue(subModel.createProperty(VitroVocabulary.PROPERTY_CUSTOMDISPLAYVIEWANNOT), subModel.createTypedLiteral("this is the custom display view annotation"));
 		class1.setPropertyValue(subModel.createProperty(VitroVocabulary.PROPERTY_CUSTOMSHORTVIEWANNOT), subModel.createTypedLiteral("this is the custom short view annotation"));
 		class1.setPropertyValue(subModel.createProperty(VitroVocabulary.PROPERTY_CUSTOMSEARCHVIEWANNOT), subModel.createTypedLiteral("this is the custom search view annotation"));
-	
-		
+
+
 		// Save copies of sub-model and super-model
-		
+
 		// uncommment the next two lines to debug failures
-		//System.out.println("**Before updating VClass:");		
+		//System.out.println("**Before updating VClass:");
 		//printModels(superModel, subModel);
-		
+
 		superModel.removeSubModel(subModel);
-		
-		OntModel origSubModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+
+		OntModel origSubModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		origSubModel.add(subModel);
-		OntModel origSuperModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel origSuperModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		origSuperModel.add(superModel);
-		
+
 		superModel.addSubModel(subModel);
-		
+
 		// Populate the VClass with the data in the sub-model and then update the combined model
 		WebappDaoFactoryJena wdfj = new WebappDaoFactoryJena(superModel);
 		VClassDaoJena vcdj = (VClassDaoJena) wdfj.getVClassDao();
 		VClass vClass = vcdj.getVClassByURI(class1URI);           // the VClass will be populated with the
 		                                                          // information already in the jena model.
-		
-		
+
+
 		assertEquals(vClass.getName(), class1.getLabel(lang));  //
-		
-		
-        vcdj.updateVClass(vClass);                                // we haven't changed any values here, so 
+
+
+        vcdj.updateVClass(vClass);                                // we haven't changed any values here, so
                                                                   // the models should be unchanged.
- 
+
         // Verify that the sub-model and super-model are both unchanged
 
         // uncommment the next two lines to debug failures
@@ -112,26 +112,26 @@ public class VClassDaoTest {
         //printModels(superModel,subModel);
 
         superModel.removeSubModel(subModel);
-        
+
 		//modtime affects the diff but we don't care about that difference
 		wipeOutModTime(origSubModel);
 		wipeOutModTime(origSuperModel);
 		wipeOutModTime(subModel);
 		wipeOutModTime(superModel);
-		
-		assertTrue(subModel.isIsomorphicWith(origSubModel));	
-	    assertTrue(superModel.isIsomorphicWith(origSuperModel));	
-        
+
+		assertTrue(subModel.isIsomorphicWith(origSubModel));
+	    assertTrue(superModel.isIsomorphicWith(origSuperModel));
+
 	}
-	
-	
+
+
 	void printModels(OntModel superModel, OntModel subModel) {
 
 		// Detach the submodel for printing to get an accurate
 		// account of what is in each.
-		
+
 	    superModel.removeSubModel(subModel);
-	    
+
 		System.out.println("\nThe sub-model has " + subModel.size() + " statements:");
 		System.out.println("---------------------------------------------------");
 		subModel.writeAll(System.out,"N3",null);
@@ -139,17 +139,17 @@ public class VClassDaoTest {
 		System.out.println("\nThe super-model has " + superModel.size() + " statements:");
 		System.out.println("---------------------------------------------------");
 	    superModel.write(System.out,"N3",null);
-		
+
 	    superModel.addSubModel(subModel);
-		
+
 	}
-	
+
 
 	void wipeOutModTime(Model model){
 		model.removeAll(null, model.createProperty(VitroVocabulary.MODTIME), null);
 	}
-	
-	
+
+
 	@Test
 	public void getVClassesForPropertyTest(){
 		String lang = "en-US";
@@ -157,47 +157,47 @@ public class VClassDaoTest {
 		String subClassAURI = "http://example.com/SUB_class_A";
 		String subClassBURI = "http://example.com/SUB_class_B";
 		String propURI = "http://example.com/PROP";
-		
+
 		String propNoRangeURI = "http://example.com/PROP_NO_RANGE";
-				
+
 		OntModel model = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
-		
-		
-		//Define super class and sub classes 
+
+
+		//Define super class and sub classes
 		OntClass superClass = model.createClass( superClassURI );
 		superClass.addLabel("SUPER",lang);
 		superClass.setPropertyValue(model.createProperty(VitroVocabulary.IN_CLASSGROUP), model.createResource("http://thisIsTheClassGroupURI"));
 		superClass.addSuperClass( OWL.Thing );
-		
+
 		OntClass subA = model.createClass(subClassAURI);
 		subA.addLabel("subA",lang);
 		subA.setPropertyValue(model.createProperty(VitroVocabulary.IN_CLASSGROUP), model.createResource("http://thisIsTheClassGroupURI"));
 		superClass.addSubClass(subA);
-				
+
 		OntClass subB = model.createClass(subClassBURI);
 		subB.addLabel("subB",lang);
 		subB.setPropertyValue(model.createProperty(VitroVocabulary.IN_CLASSGROUP), model.createResource("http://thisIsTheClassGroupURI"));
 		superClass.addSubClass(subB);
-		
+
 		//Define property using the super class
 		ObjectProperty prop = model.createObjectProperty( propURI );
 		prop.setLabel("PROP", lang);
 		prop.setRange( superClass );
-					
+
 		ObjectProperty propNoRange = model.createObjectProperty( propNoRangeURI );
 		propNoRange.setLabel("PROP_NO_RANGE", lang);
-		
+
 		WebappDaoFactoryJena wdfj = new WebappDaoFactoryJena(model);
-		
+
 		List<VClass> classesForProp = wdfj.getVClassDao().getVClassesForProperty(propURI, true);
 		assertNotNull( classesForProp );
 		assertEquals(3, classesForProp.size());
-		
+
 		List<VClass> classesForPropNoRange = wdfj.getVClassDao().getVClassesForProperty(propNoRangeURI, true);
 		assertNotNull( classesForPropNoRange );
 		assertEquals(0, classesForPropNoRange.size());
-		
-		
+
+
 	}
-	
+
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCacheTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCacheTest.java
index 9d25d2091..684686a07 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCacheTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCacheTest.java
@@ -22,11 +22,11 @@ public class VClassGroupCacheTest {
 
     @Test
     public void testIsVClassGroupNameChange() {
-        
-        
+
+
         //protected static boolean isVClassGroupNameChange(Statement stmt, OntModel jenaOntModel) {
-        
-        String rdf = 
+
+        String rdf =
             "core:Summer \n" +
             "      a       owl:Class ; \n" +
             "      rdfs:label \"Spring and toast 3\"@en-US ; \n" +
@@ -45,36 +45,36 @@ public class VClassGroupCacheTest {
             "              <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ; \n" +
             "      vitro:shortDef \"sfsfe\"^^xsd:string ; \n" +
             "      owl:equivalentClass core:Summer . ";
-        
+
         OntModel om = ModelFactory.createOntologyModel();
         om.read( new StringReader( prefixes + rdf) , null , "N3");
-        
+
         Statement stmt = ResourceFactory.createStatement(
                 ResourceFactory.createResource("http://vivoweb.org/ontology/core#Summer"),
                 RDFS.label,
                 ResourceFactory.createPlainLiteral("some old label"));
-                
+
         boolean isNameChange = VClassGroupCache.isClassNameChange(stmt, om);
         Assert.assertTrue("Expected it to be a name change but it wasn't.", isNameChange);
-        
+
         stmt = ResourceFactory.createStatement(
                 ResourceFactory.createResource("http://vivoweb.org/ontology/core#bogus"),
                 ResourceFactory.createProperty("http://example.com/nonLabelProperty"),
                 ResourceFactory.createPlainLiteral("some old label"));
-                
+
         boolean notNameChange = ! VClassGroupCache.isClassNameChange(stmt, om);
         Assert.assertTrue("Expected it to NOT be a name change but it was.",  notNameChange);
-     
+
         stmt = ResourceFactory.createStatement(
                 ResourceFactory.createResource("http://vivoweb.org/ontology/core#bogus"),
                 RDFS.label,
                 ResourceFactory.createPlainLiteral("some old label"));
-                
+
         notNameChange = ! VClassGroupCache.isClassNameChange(stmt, om);
         Assert.assertTrue("Expected it to NOT be a name change but it was.",  notNameChange);
     }
 
-    static final String prefixes = 
+    static final String prefixes =
     "@prefix dc:      <http://purl.org/dc/elements/1.1/> . \n" +
     "@prefix pvs:     <http://vivoweb.org/ontology/provenance-support#> . \n" +
     "@prefix geo:     <http://aims.fao.org/aos/geopolitical.owl#> . \n" +
@@ -97,6 +97,6 @@ public class VClassGroupCacheTest {
     "@prefix dcelem:  <http://purl.org/dc/elements/1.1/> . \n" +
     "@prefix ero:     <http://purl.obolibrary.org/obo/> . \n" +
     " \n" ;
-    
-   
+
+
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJenaTest.java
index 1d3a3baa0..e252292d0 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJenaTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJenaTest.java
@@ -44,15 +44,15 @@ import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 
 /**
- * 
- * 
- * 
+ *
+ *
+ *
  */
 
 public class VClassJenaTest {
-	
+
 	@Test
-	// NIHVIVO-1157 introduced VClassJena.java, a lazy-loading version of VClass.java.  
+	// NIHVIVO-1157 introduced VClassJena.java, a lazy-loading version of VClass.java.
 	// Per instructions from Brian L., this test tests that for one randomly selected Class,
 	// the getter methods in VClassJena return the same values as would have been
 	// returned by the pre-NIHVIVO-1157 VClass (which would have been set by the
@@ -62,27 +62,27 @@ public class VClassJenaTest {
 	// maybe more stable) if the values returned by the VClassJena getter methods
 	// are tested against hard-coded values (which could be set now based on the
 	// model code)
-	 	
+
 	public void correctValues(){
-	
+
 		// 1. create a model and populate it with the data for one class
 		// 2. retrieve the OntClass for the target class by URI
-		// 3. populate a VClass instance from the OntClass instance, as it would have been 
+		// 3. populate a VClass instance from the OntClass instance, as it would have been
 		//    populated pre-NIHVIVO-1157 (with the deleted vClassWebappFromOntClass, copied here)
 		// 4. populate a VClassJena instance as is done with the current application code
 		// 5. verify that the getter methods on the VClassJena and VClass instances return the same values
-		
+
 		String class1URI = "http://test.vivo/AcademicDegree";
 
-		OntModel ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
-		
+		OntModel ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
+
 		String rdfsLabel = "this is the rdfs label";
 		String lang = "en-US";
-		
+
 		// populate sub-model
 		OntClass class1 = ontModel.createClass(class1URI);
-		
-		class1.setLabel(rdfsLabel,lang);   //rdfs:label		
+
+		class1.setLabel(rdfsLabel,lang);   //rdfs:label
 		class1.setPropertyValue(ontModel.createProperty(VitroVocabulary.IN_CLASSGROUP), ontModel.createResource("http://thisIsTheClassGroupURI"));
 		class1.setPropertyValue(ontModel.createProperty(VitroVocabulary.SHORTDEF), ontModel.createTypedLiteral("this is the short definition"));
 		class1.setPropertyValue(ontModel.createProperty(VitroVocabulary.EXAMPLE_ANNOT), ontModel.createTypedLiteral("this is the example"));
@@ -97,51 +97,51 @@ public class VClassJenaTest {
 		class1.setPropertyValue(ontModel.createProperty(VitroVocabulary.PROPERTY_CUSTOMDISPLAYVIEWANNOT), ontModel.createTypedLiteral("this is the custom display view annotation"));
 		class1.setPropertyValue(ontModel.createProperty(VitroVocabulary.PROPERTY_CUSTOMSHORTVIEWANNOT), ontModel.createTypedLiteral("this is the custom short view annotation"));
 		class1.setPropertyValue(ontModel.createProperty(VitroVocabulary.PROPERTY_CUSTOMSEARCHVIEWANNOT), ontModel.createTypedLiteral("this is the custom search view annotation"));
-	
-		
-		WebappDaoFactoryJena wadf = new WebappDaoFactoryJena(ontModel);
-		
-		// Populate a VClass instance...old style 
-		
-		VClass vClass = vClassWebappFromOntClass(class1,wadf);
-		
-		// Populate a VClassJena instance...modern style
-		
-		VClassJena vClassJena = new VClassJena(class1, wadf);
-		
-		
-		// Check that the getters from the VClass and the VClassJena return the same values
-		
-		Assert.assertEquals(vClassJena.getName(), vClass.getName());  
-		Assert.assertEquals(vClassJena.getLocalNameWithPrefix(), vClass.getLocalNameWithPrefix()); 
 
-		Assert.assertEquals(vClassJena.getPickListName(), vClass.getPickListName());  
-		Assert.assertEquals(vClassJena.getExample(), vClass.getExample());  
-		Assert.assertEquals(vClassJena.getDescription(), vClass.getDescription());  
-		Assert.assertEquals(vClassJena.getShortDef(), vClass.getShortDef());  
-		Assert.assertEquals(vClassJena.getDisplayRank(), vClass.getDisplayRank());  
-		Assert.assertEquals(vClassJena.getGroupURI(), vClass.getGroupURI());  
-		Assert.assertEquals(vClassJena.getCustomEntryForm(), vClass.getCustomEntryForm());  
-		Assert.assertEquals(vClassJena.getCustomShortView(), vClass.getCustomShortView());  
-		Assert.assertEquals(vClassJena.getCustomSearchView(), vClass.getCustomSearchView());  
-		Assert.assertEquals(vClassJena.getSearchBoost(), vClass.getSearchBoost());  
+
+		WebappDaoFactoryJena wadf = new WebappDaoFactoryJena(ontModel);
+
+		// Populate a VClass instance...old style
+
+		VClass vClass = vClassWebappFromOntClass(class1,wadf);
+
+		// Populate a VClassJena instance...modern style
+
+		VClassJena vClassJena = new VClassJena(class1, wadf);
+
+
+		// Check that the getters from the VClass and the VClassJena return the same values
+
+		Assert.assertEquals(vClassJena.getName(), vClass.getName());
+		Assert.assertEquals(vClassJena.getLocalNameWithPrefix(), vClass.getLocalNameWithPrefix());
+
+		Assert.assertEquals(vClassJena.getPickListName(), vClass.getPickListName());
+		Assert.assertEquals(vClassJena.getExample(), vClass.getExample());
+		Assert.assertEquals(vClassJena.getDescription(), vClass.getDescription());
+		Assert.assertEquals(vClassJena.getShortDef(), vClass.getShortDef());
+		Assert.assertEquals(vClassJena.getDisplayRank(), vClass.getDisplayRank());
+		Assert.assertEquals(vClassJena.getGroupURI(), vClass.getGroupURI());
+		Assert.assertEquals(vClassJena.getCustomEntryForm(), vClass.getCustomEntryForm());
+		Assert.assertEquals(vClassJena.getCustomShortView(), vClass.getCustomShortView());
+		Assert.assertEquals(vClassJena.getCustomSearchView(), vClass.getCustomSearchView());
+		Assert.assertEquals(vClassJena.getSearchBoost(), vClass.getSearchBoost());
 		Assert.assertEquals(vClassJena.getHiddenFromDisplayBelowRoleLevel(), vClass.getHiddenFromDisplayBelowRoleLevel());
 		Assert.assertEquals(vClassJena.getProhibitedFromUpdateBelowRoleLevel(), vClass.getProhibitedFromUpdateBelowRoleLevel());
 		Assert.assertEquals(vClassJena.getHiddenFromPublishBelowRoleLevel(), vClass.getHiddenFromPublishBelowRoleLevel());
-    
+
 	}
 
-	
+
 	// To help in debugging the unit test
 	void printModels(OntModel ontModel) {
-	    
+
 		System.out.println("\nThe model has " + ontModel.size() + " statements:");
 		System.out.println("---------------------------------------------------");
 		ontModel.writeAll(System.out,"N3",null);
-		
+
 	}
-	
-	
+
+
 	// The following class and methods are pre-NIHVIVO-1157 code for
 	// populating a VClass. Original comments included.
 
@@ -156,12 +156,12 @@ public class VClassJenaTest {
     protected AnnotationProperty LOCAL_PROPERTY_CUSTOMDISPLAYVIEWANNOT = _constModel.createAnnotationProperty(VitroVocabulary.PROPERTY_CUSTOMDISPLAYVIEWANNOT);
     protected AnnotationProperty LOCAL_PROPERTY_CUSTOMSHORTVIEWANNOT = _constModel.createAnnotationProperty(VitroVocabulary.PROPERTY_CUSTOMSHORTVIEWANNOT);
     protected AnnotationProperty LOCAL_PROPERTY_CUSTOMSEARCHVIEWANNOT = _constModel.createAnnotationProperty(VitroVocabulary.PROPERTY_CUSTOMSEARCHVIEWANNOT);
-    protected AnnotationProperty LOCAL_HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT = _constModel.createAnnotationProperty(VitroVocabulary.HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT);    
-    protected AnnotationProperty LOCAL_PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT = _constModel.createAnnotationProperty(VitroVocabulary.PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT);    
-    protected AnnotationProperty LOCAL_HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT = _constModel.createAnnotationProperty(VitroVocabulary.HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT);    
+    protected AnnotationProperty LOCAL_HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT = _constModel.createAnnotationProperty(VitroVocabulary.HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT);
+    protected AnnotationProperty LOCAL_PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT = _constModel.createAnnotationProperty(VitroVocabulary.PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT);
+    protected AnnotationProperty LOCAL_HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT = _constModel.createAnnotationProperty(VitroVocabulary.HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT);
     protected AnnotationProperty LOCAL_IN_CLASSGROUP = _constModel.createAnnotationProperty(VitroVocabulary.IN_CLASSGROUP);
-	
- 
+
+
     private VClass vClassWebappFromOntClass(OntClass cls, WebappDaoFactoryJena wadf) {
         VClass vcw = new VClass();
         cls.getModel().enterCriticalSection(Lock.READ);
@@ -187,7 +187,7 @@ public class VClassJenaTest {
             } catch (Exception e) {
                 System.out.println("error retrieving vitro:inClassGroup property value for "+cls.getURI());
             }
-            
+
             vcw.setShortDef(getPropertyStringValue(cls,LOCAL_SHORTDEF));
             vcw.setExample(getPropertyStringValue(cls,LOCAL_EXAMPLE_ANNOT));
             vcw.setDescription(getPropertyStringValue(cls,LOCAL_DESCRIPTION_ANNOT));
@@ -198,7 +198,7 @@ public class VClassJenaTest {
             vcw.setCustomShortView(getPropertyStringValue(cls,LOCAL_PROPERTY_CUSTOMSHORTVIEWANNOT));
             vcw.setCustomSearchView(getPropertyStringValue(cls,LOCAL_PROPERTY_CUSTOMSEARCHVIEWANNOT));
             vcw.setSearchBoost(getPropertyFloatValue(cls,LOCAL_SEARCH_BOOST_ANNOT));
-            
+
             //There might be multiple HIDDEN_FROM_EDIT_DISPLAY_ANNOT properties, only use the highest
             StmtIterator it = cls.listProperties(LOCAL_HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT);
             BaseResourceBean.RoleLevel hiddenRoleLevel = null;
@@ -209,13 +209,13 @@ public class VClassJenaTest {
                     Resource res = (Resource)obj.as(Resource.class);
                     if( res != null && res.getURI() != null ){
                         BaseResourceBean.RoleLevel roleFromModel = BaseResourceBean.RoleLevel.getRoleByUri(res.getURI());
-                        if( roleFromModel != null && 
+                        if( roleFromModel != null &&
                             (hiddenRoleLevel == null || roleFromModel.compareTo(hiddenRoleLevel) > 0 )){
-                            hiddenRoleLevel = roleFromModel;                            
+                            hiddenRoleLevel = roleFromModel;
                         }
                     }
                 }
-            }            
+            }
             vcw.setHiddenFromDisplayBelowRoleLevel(hiddenRoleLevel);//this might get set to null
 
             //There might be multiple PROHIBITED_FROM_UPDATE_DISPLAY_ANNOT properties, only use the highest
@@ -228,15 +228,15 @@ public class VClassJenaTest {
                     Resource res = (Resource)obj.as(Resource.class);
                     if( res != null && res.getURI() != null ){
                         BaseResourceBean.RoleLevel roleFromModel = BaseResourceBean.RoleLevel.getRoleByUri(res.getURI());
-                        if( roleFromModel != null && 
+                        if( roleFromModel != null &&
                             (prohibitedRoleLevel == null || roleFromModel.compareTo(prohibitedRoleLevel) > 0 )){
-                            prohibitedRoleLevel = roleFromModel;                            
+                            prohibitedRoleLevel = roleFromModel;
                         }
                     }
                 }
-            }            
+            }
             vcw.setProhibitedFromUpdateBelowRoleLevel(prohibitedRoleLevel);//this might get set to null
-            
+
             //There might be multiple LOCAL_HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT properties, only use the highest
             it = cls.listProperties(LOCAL_HIDDEN_FROM_PUBLISH_BELOW_ROLE_LEVEL_ANNOT);
             BaseResourceBean.RoleLevel publishRoleLevel = null;
@@ -247,13 +247,13 @@ public class VClassJenaTest {
                     Resource res = (Resource)obj.as(Resource.class);
                     if( res != null && res.getURI() != null ){
                         BaseResourceBean.RoleLevel roleFromModel = BaseResourceBean.RoleLevel.getRoleByUri(res.getURI());
-                        if( roleFromModel != null && 
+                        if( roleFromModel != null &&
                             (publishRoleLevel == null || roleFromModel.compareTo(publishRoleLevel) > 0 )){
-                            publishRoleLevel = roleFromModel;                            
+                            publishRoleLevel = roleFromModel;
                         }
                     }
                 }
-            }            
+            }
             vcw.setHiddenFromPublishBelowRoleLevel(publishRoleLevel);//this might get set to null
 
         } finally {
@@ -262,12 +262,12 @@ public class VClassJenaTest {
         return vcw;
     }
 
-    
+
     public String getLabelForClass(OntClass cls,boolean withPrefix,boolean forPickList,WebappDaoFactoryJena wadf) {
     	cls.getModel().enterCriticalSection(Lock.READ);
     	try {
 	    	if (cls.isAnon()) {
-		    	if (cls.isRestriction()) {	    		
+		    	if (cls.isRestriction()) {
 		    		Restriction rest = cls.asRestriction();
 		    		OntProperty onProperty = rest.getOnProperty();
 		    		String labelStr = "restriction on " + getLabelOrId(onProperty) + ": ";
@@ -282,7 +282,7 @@ public class VClassJenaTest {
 			    			fillerRes = svfRest.getSomeValuesFrom();
 			    			labelStr += "some values from ";
 			    		}
-		    			if (fillerRes.canAs(OntClass.class)) { 
+		    			if (fillerRes.canAs(OntClass.class)) {
 		    				OntClass avf = (OntClass) fillerRes.as(OntClass.class);
 		    				labelStr += getLabelForClass(avf,withPrefix,forPickList,wadf);
 		    			} else {
@@ -291,7 +291,7 @@ public class VClassJenaTest {
 		    				} catch (Exception e) {
 		    					labelStr += "???";
 		    				}
-		    			}		    			
+		    			}
 		    		} else if (rest.isHasValueRestriction()) {
 		    			HasValueRestriction hvRest = rest.asHasValueRestriction();
 		    			labelStr += "has value ";
@@ -300,7 +300,7 @@ public class VClassJenaTest {
 			    			if (fillerNode.isResource()) {
 			    				labelStr += getLabelOrId((OntResource)fillerNode.as(OntResource.class));
 			    			} else {
-			    				labelStr += ((Literal) fillerNode.as(Literal.class)).getLexicalForm(); 
+			    				labelStr += ((Literal) fillerNode.as(Literal.class)).getLexicalForm();
 			    			}
 		    			} catch (Exception e) {
 		    				labelStr += "???";
@@ -356,10 +356,10 @@ public class VClassJenaTest {
                     OntologyDao oDao=wadf.getOntologyDao();
                     Ontology o = (Ontology)oDao.getOntologyByURI(cls.getNameSpace());
                     if (o!=null) {
-                        if (withPrefix) {                        	
+                        if (withPrefix) {
                             return(o.getPrefix()==null?(o.getName()==null?"unspec:"+getLabelOrId(cls):o.getName()+":"+getLabelOrId(cls)):o.getPrefix()+":"+getLabelOrId(cls));
                         } else {
-                            return(getLabelOrId(cls)+(o.getPrefix()==null?(o.getName()==null?" (unspec)":" ("+o.getName()+")"):" ("+o.getPrefix()+")"));                            
+                            return(getLabelOrId(cls)+(o.getPrefix()==null?(o.getName()==null?" (unspec)":" ("+o.getName()+")"):" ("+o.getPrefix()+")"));
                         }
                     } else {
                     	return getLabelOrId(cls);
@@ -373,7 +373,7 @@ public class VClassJenaTest {
     		cls.getModel().leaveCriticalSection();
     	}
     }
-    
+
     protected String getLabelOrId(OntResource r) {
     	String label = null;
     	r.getOntModel().enterCriticalSection(Lock.READ);
@@ -386,45 +386,45 @@ public class VClassJenaTest {
     	}
         return label;
     }
-    
-    
+
+
     private final boolean ALSO_TRY_NO_LANG = true;
     /**
-     * works through list of PREFERRED_LANGUAGES to find an appropriate 
-     * label, or NULL if not found.  
+     * works through list of PREFERRED_LANGUAGES to find an appropriate
+     * label, or NULL if not found.
      */
-    
+
     protected String getLabel(OntResource r){
         String label = null;
         r.getOntModel().enterCriticalSection(Lock.READ);
-        try {            
+        try {
             // try rdfs:label with preferred languages
             label = tryPropertyForPreferredLanguages( r, RDFS.label, ALSO_TRY_NO_LANG );
-            
+
             // try vitro:label with preferred languages
             if ( label == null ) {
                 label = tryPropertyForPreferredLanguages( r, r.getModel().getProperty(VitroVocabulary.label), ALSO_TRY_NO_LANG );
-            }                              
+            }
         } finally {
             r.getOntModel().leaveCriticalSection();
         }
         return label;
     }
-    
+
     private String tryPropertyForPreferredLanguages( OntResource r, Property p, boolean alsoTryNoLang ) {
     	String label = null;
 	    List<RDFNode> labels = (List<RDFNode>) r.listPropertyValues(p).toList();
-	    
+
 	    String lang = "en-US";
 	    label = getLabel2(lang,labels);
-	    
+
         if ( label == null && alsoTryNoLang ) {
         	label = getLabel2("", labels);
         }
-        
+
 	    return label;
     }
-    
+
     private String getLabel2(String lang, List<RDFNode>labelList) {
 		for (RDFNode label : labelList) {
 			if (label.isLiteral()) {
@@ -440,30 +440,30 @@ public class VClassJenaTest {
 		}
     	return null;
     }
-    
-    
+
+
     /**
-     * Get the local name, bnode or URI of the resource. 
+     * Get the local name, bnode or URI of the resource.
      */
     protected String getLocalNameOrId(OntResource r){
         String label = null;
         r.getOntModel().enterCriticalSection(Lock.READ);
-        try {                       
+        try {
             String localName = r.getLocalName();
             if (localName != null) {
                 label = localName;
             } else if (r.isAnon()) {
                 label = r.getId().toString();
             } else {
-                label = r.getURI();                
-            }                       
+                label = r.getURI();
+            }
         } finally {
             r.getOntModel().leaveCriticalSection();
         }
         return label;
     }
- 
-   
+
+
     protected String getPropertyStringValue(OntResource res, Property dataprop) {
         if (dataprop != null) {
             try {
@@ -483,11 +483,11 @@ public class VClassJenaTest {
             return null;
         }
     }
-   
+
     protected int getPropertyNonNegativeIntValue(OntResource res, Property dataprop) {
-    	
+
         if (dataprop != null) {
-    
+
             try {
 				return ((Literal)res.getPropertyValue(dataprop)).getInt();
 			} catch (Exception e) {
@@ -498,7 +498,7 @@ public class VClassJenaTest {
             return -1;
         }
     }
-    
+
     protected Float getPropertyFloatValue(OntResource res, Property prop){
         if( prop != null ){
             try{
@@ -509,11 +509,11 @@ public class VClassJenaTest {
         }else
             return null;
     }
-    
+
     public synchronized boolean isBooleanClassExpression(OntClass cls) {
     	return (cls.isComplementClass() || cls.isIntersectionClass() || cls.isUnionClass());
     }
-    
+
     protected String getClassURIStr(Resource cls) {
     	if (cls.isAnon()) {
     		return VitroVocabulary.PSEUDO_BNODE_NS+cls.getId().toString();
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/vclassgroup/ProhibitedFromSearchTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/vclassgroup/ProhibitedFromSearchTest.java
index 528c11e2e..18f317301 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/vclassgroup/ProhibitedFromSearchTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/vclassgroup/ProhibitedFromSearchTest.java
@@ -21,104 +21,104 @@ import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
 public class ProhibitedFromSearchTest {
 	String SEARCH_CONFIG_URI = DisplayVocabulary.SEARCH_INDEX_URI;
 	String TEST_CLASS = "http://vivoweb.org/ontology/test/bogus#Class5";
-	
-	String n3 = 
+
+	String n3 =
 		"@prefix : <http://vitro.mannlib.cornell.edu/ns/vitroDisplay#> . \n" +
 		"@prefix vivo: <http://vivoweb.org/ontology/test/bogus#> . \n" +
 		"@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . \n"+
-		"<"+SEARCH_CONFIG_URI+"> rdf:type :ProhibitedFromSearch ;\n" +		
+		"<"+SEARCH_CONFIG_URI+"> rdf:type :ProhibitedFromSearch ;\n" +
 		"           <" + DisplayVocabulary.EXCLUDE_CLASS.getURI() + "> vivo:Class2, vivo:Class3, vivo:Class4, <"+TEST_CLASS+"> .\n" ;
-	
-	
-	
+
+
+
 	@Test
 	public void testBuildingProhibited(){
 		Model r = ModelFactory.createDefaultModel().read(new StringReader(n3), null, "N3");
 		OntModel m = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		m.add( r.listStatements() );
-		
-		Assert.assertTrue(m.size() > 4);	
+
+		Assert.assertTrue(m.size() > 4);
 		ProhibitedFromSearch pfs = new ProhibitedFromSearch( SEARCH_CONFIG_URI , m);
 		Assert.assertNotNull(pfs.prohibitedClasses);
 		Assert.assertTrue(pfs.prohibitedClasses.size() == 4);
 		Assert.assertTrue(pfs.isClassProhibitedFromSearch(TEST_CLASS));
 		Assert.assertTrue(!pfs.isClassProhibitedFromSearch("http://someOtherClass.com/test"));
 	}
-	
+
 	@Test
 	public void testNotFound(){
 		Model r = ModelFactory.createDefaultModel().read(new StringReader(n3), null, "N3");
 		OntModel m = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		m.add( r.listStatements() );
-		
-		Assert.assertTrue(m.size() > 4);	
+
+		Assert.assertTrue(m.size() > 4);
 		ProhibitedFromSearch pfs = new ProhibitedFromSearch( "http://NotFound.com/inModel", m);
 		Assert.assertNotNull(pfs.prohibitedClasses);
 		Assert.assertTrue(pfs.prohibitedClasses.size() == 0);
 		Assert.assertTrue(!pfs.isClassProhibitedFromSearch(TEST_CLASS));
 		Assert.assertTrue(!pfs.isClassProhibitedFromSearch("http://someOtherClass.com/test"));
 	}
-	
-	
+
+
 	@Test
 	public void testListener(){
 		Model r = ModelFactory.createDefaultModel().read(new StringReader(n3), null, "N3");
 		OntModel m = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
-		m.add( r.listStatements() );		
+		m.add( r.listStatements() );
 		Assert.assertTrue(m.size() > 4);
-		
+
 		ProhibitedFromSearch pfs = new ProhibitedFromSearch( SEARCH_CONFIG_URI , m);
 		Assert.assertTrue(pfs.prohibitedClasses.size() == 4);
-		
+
 		Resource bougsClass3 = ResourceFactory.createResource("http://example.com/bougsClass3");
-		Resource searchConfig = ResourceFactory.createResource(SEARCH_CONFIG_URI);		
+		Resource searchConfig = ResourceFactory.createResource(SEARCH_CONFIG_URI);
 		m.add(searchConfig, DisplayVocabulary.EXCLUDE_CLASS, bougsClass3);
 		Assert.assertEquals(5, pfs.prohibitedClasses.size());
-		
+
 		m.remove(searchConfig, DisplayVocabulary.EXCLUDE_CLASS, bougsClass3);
 		Assert.assertEquals(4, pfs.prohibitedClasses.size());
-		
+
 		Resource bougsClass4 = ResourceFactory.createResource("http://vivoweb.org/ontology/test/bogus#Class4");
 		m.remove(searchConfig, DisplayVocabulary.EXCLUDE_CLASS, bougsClass4);
-		Assert.assertEquals(3, pfs.prohibitedClasses.size());			
+		Assert.assertEquals(3, pfs.prohibitedClasses.size());
 	}
-	
-	
+
+
 	@Test
 	public void testListenerAbnormal(){
 		Model r = ModelFactory.createDefaultModel().read(new StringReader(n3), null, "N3");
 		OntModel m = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
-		m.add( r.listStatements() );		
+		m.add( r.listStatements() );
 		Assert.assertTrue(m.size() > 4);
-		
+
 		ProhibitedFromSearch pfs = new ProhibitedFromSearch( SEARCH_CONFIG_URI , m);
 		Assert.assertTrue(pfs.prohibitedClasses.size() == 4);
 		int originalSize = pfs.prohibitedClasses.size();
-		
+
 		Literal bogusLiteral = ResourceFactory.createPlainLiteral("some bogus literal");
-		Resource searchConfig = ResourceFactory.createResource(SEARCH_CONFIG_URI);		
+		Resource searchConfig = ResourceFactory.createResource(SEARCH_CONFIG_URI);
 		m.add(searchConfig, DisplayVocabulary.EXCLUDE_CLASS, bogusLiteral);
-		Assert.assertEquals(originalSize, pfs.prohibitedClasses.size());		
+		Assert.assertEquals(originalSize, pfs.prohibitedClasses.size());
 		m.remove(searchConfig, DisplayVocabulary.EXCLUDE_CLASS, bogusLiteral);
 		Assert.assertEquals(originalSize, pfs.prohibitedClasses.size());
-		
+
 		Resource anonRes = ResourceFactory.createResource();
 		m.remove(searchConfig, DisplayVocabulary.EXCLUDE_CLASS, anonRes);
-		Assert.assertEquals(originalSize, pfs.prohibitedClasses.size());			
+		Assert.assertEquals(originalSize, pfs.prohibitedClasses.size());
 	}
-	
+
 	@Test
-	public void testPrimaryIndex(){		
-		String primaryIndexN3 = 
+	public void testPrimaryIndex(){
+		String primaryIndexN3 =
 			"<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#SearchIndex>" +
 			"<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#excludeClass>" +
-			"<http://vivoweb.org/ontology/core#NonAcademic> . ";		
-		
+			"<http://vivoweb.org/ontology/core#NonAcademic> . ";
+
 		Model r = ModelFactory.createDefaultModel().read(new StringReader(primaryIndexN3), null, "N3");
 		OntModel m = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		m.add( r.listStatements() );
-		
-		Assert.assertTrue(m.size() == 1);	
+
+		Assert.assertTrue(m.size() == 1);
 		ProhibitedFromSearch pfs = new ProhibitedFromSearch( DisplayVocabulary.SEARCH_INDEX_URI, m);
 		Assert.assertNotNull(pfs.prohibitedClasses);
 		Assert.assertEquals(1, pfs.prohibitedClasses.size() );
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/EditLiteralTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/EditLiteralTest.java
index 2c65a9556..a88d8f2b0 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/EditLiteralTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/EditLiteralTest.java
@@ -106,19 +106,19 @@ public class EditLiteralTest {
         Assert.assertFalse( EditLiteral.equalLiterals(
                 new EditLiteral("dog", (String)"http://someUri", (String)null ),
                 new EditLiteral("catFood", (String)"http://someUri", (String)null )
-        ));           
+        ));
     }
-    
-    
+
+
     @Test
     public void testBug2(){
-        
+
         Literal a2 = new EditLiteral("<ul><li>Stephen G. Yusem is the senior partner of High, Swartz, Roberts &amp; Seidel in Norristown, Pennsylvania. <br /></li><li>He has been certified as a mediator for the United States District Court for the Eastern District of Pennsylvania since 1991. <br /></li><li>He is a Fellow of the College of Commercial Arbitrators, a member of the Chartered Institute of Arbitrators, a panelist on the CPR Roster of Distinguished Neutrals and a past director of the Commercial Section of the Association for Conflict Resolution. <br /></li><li>He co-chairs the Arbitration Committee of the Dispute Resolution Section of the American Bar Association and is a former member of the Arbitration Faculty of the American Arbitration Association. <br /></li><li>He is a past president of the Montgomery County (PA) Bar Association and was Founding President of the Montgomery County Bar Foundation. He co-teaches Dispute Resolution: Negotiation, Mediation and Arbitration in the fall semester.</li></ul>",
                 "http://www.w3.org/2001/XMLSchema#string","");
         Literal b2 = new EditLiteral("<ul><li>Stephen G. Yusem is the senior partner of High, Swartz, Roberts &amp; Seidel in Norristown, Pennsylvania. <br /></li><li>He has been certified as a mediator for the United States District Court for the Eastern District of Pennsylvania since 1991. <br /></li></ul>",
                 "http://www.w3.org/2001/XMLSchema#string",null);
         Assert.assertFalse( EditLiteral.equalLiterals( a2, b2 ) );
-                  
+
     }
-    
+
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditN3UtilsTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditN3UtilsTest.java
index ec2363c75..e389cfd47 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditN3UtilsTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditN3UtilsTest.java
@@ -20,25 +20,25 @@ public class EditN3UtilsTest {
     public void testStripInvalidXMLChars() {
         Model m = ModelFactory.createDefaultModel();
         String containsInvalidXMLChars = "Blah \u0001blah \u0002blah\uDDDD";
-        String clean = "Blah blah blah"; 
-        
+        String clean = "Blah blah blah";
+
         // add a statement with the literal incompatible with XML to model m
         m.add(m.createResource(), RDFS.label, containsInvalidXMLChars);
-        
+
         Assert.assertFalse(isSerializableAsXML(m));
-        
+
         String stripped = N3EditUtils.stripInvalidXMLChars(
                                 containsInvalidXMLChars);
         Assert.assertEquals(clean, stripped);
-        
+
         // clear the model of any statements
         m.removeAll();
         // add a statement with a literal that has been stripped of bad chars
         m.add(m.createResource(), RDFS.label, stripped);
-        
-        Assert.assertTrue(isSerializableAsXML(m));      
+
+        Assert.assertTrue(isSerializableAsXML(m));
     }
-    
+
     private boolean isSerializableAsXML(Model m) {
         try {
             NullOutputStream nullStream = new NullOutputStream();
@@ -48,5 +48,5 @@ public class EditN3UtilsTest {
             return false;
         }
     }
-    
+
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwoTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwoTest.java
index 959207048..678ca76d1 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwoTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwoTest.java
@@ -18,28 +18,28 @@ public class BasicValidationVTwoTest {
         String res;
         res = bv.validate("httpUrl", "http://example.com/index");
         Assert.assertEquals(res, BasicValidationVTwo.SUCCESS);
-        
+
         res = bv.validate("httpUrl", "http://example.com/index?bogus=skjd%20skljd&something=sdkf");
         Assert.assertEquals(res, BasicValidationVTwo.SUCCESS);
-        
+
         res = bv.validate("httpUrl", "http://example.com/index#2.23?bogus=skjd%20skljd&something=sdkf");
-        Assert.assertEquals(res, BasicValidationVTwo.SUCCESS);               
+        Assert.assertEquals(res, BasicValidationVTwo.SUCCESS);
     }
-    
+
     @SuppressWarnings("unchecked")
     @Test
     public void testEmptyValidate(){
-       BasicValidationVTwo bv = new BasicValidationVTwo(Collections.EMPTY_MAP);              
-       
+       BasicValidationVTwo bv = new BasicValidationVTwo(Collections.EMPTY_MAP);
+
        Assert.assertEquals(
                bv.validate("nonempty", null)
                , BasicValidationVTwo.REQUIRED_FIELD_EMPTY_MSG);
-        
+
 
        Assert.assertEquals(
                bv.validate("nonempty", "")
                , BasicValidationVTwo.REQUIRED_FIELD_EMPTY_MSG);
-       
+
        Assert.assertEquals(
                bv.validate("nonempty", "some value")
                , BasicValidationVTwo.SUCCESS);
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtilsTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtilsTest.java
index 742d2add0..2316410ce 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtilsTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtilsTest.java
@@ -19,18 +19,18 @@ public class EditConfigurationUtilsTest {
     public void testGetEditKey() {
         HttpServletRequestStub req = new HttpServletRequestStub();
         req.addParameter("datapropKey", "2343");
-        
+
         Integer hash = EditConfigurationUtils.getDataHash(new VitroRequest(req));
         Assert.assertNotNull(hash);
         Assert.assertEquals(new Integer(2343), hash);
-        
-        
-        req = new HttpServletRequestStub();        
-        
+
+
+        req = new HttpServletRequestStub();
+
         hash = EditConfigurationUtils.getDataHash(new VitroRequest(req));
         Assert.assertNull( hash);
-        
-        
+
+
     }
 
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwoTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwoTest.java
index de087bc41..044efa722 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwoTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwoTest.java
@@ -22,26 +22,26 @@ import edu.cornell.mannlib.vitro.webapp.edit.EditLiteral;
 
 public class EditN3GeneratorVTwoTest {
     static EditN3GeneratorVTwo gen = new EditN3GeneratorVTwo();
-    
+
     @Test
-    public void testVarAtEndOfString(){                
+    public void testVarAtEndOfString(){
         String result = gen.subInNonBracketedURIS("newRes", "<http://someuri.com/n23", "?newRes");
         Assert.assertEquals("<http://someuri.com/n23", result);
     }
-    
+
     @Test
     public void testNullTarget(){
-        List<String> targets = Arrays.asList("?var",null,null,"?var"); 
-        
-        Map<String,List<String>> keyToValues = new HashMap<String,List<String>>();        
+        List<String> targets = Arrays.asList("?var",null,null,"?var");
+
+        Map<String,List<String>> keyToValues = new HashMap<String,List<String>>();
         keyToValues.put("var", Arrays.asList("ABC"));
-        keyToValues.put("var2", Arrays.asList((String)null));        
+        keyToValues.put("var2", Arrays.asList((String)null));
         /* test for exception */
         gen.subInMultiUris(null, targets);
         gen.subInMultiUris(keyToValues, null);
         gen.subInMultiUris(keyToValues, targets);
-        
-        Map<String,List<Literal>> keyToLiterals = new HashMap<String,List<Literal>>();        
+
+        Map<String,List<Literal>> keyToLiterals = new HashMap<String,List<Literal>>();
         keyToLiterals.put("var", Arrays.asList( ResourceFactory.createTypedLiteral("String")));
         keyToLiterals.put("var2", Arrays.asList( (Literal)null));
         /* test for exception */
@@ -49,81 +49,81 @@ public class EditN3GeneratorVTwoTest {
         gen.subInMultiLiterals(keyToLiterals, null);
         gen.subInMultiLiterals(null, targets);
     }
-    
-    
+
+
     @Test
-    public void testPunctAfterVarName(){        
-        List<String> targets = Arrays.asList("?var.","?var;","?var]","?var,"); 
-        
-        Map<String,List<String>> keyToValues = new HashMap<String,List<String>>();        
+    public void testPunctAfterVarName(){
+        List<String> targets = Arrays.asList("?var.","?var;","?var]","?var,");
+
+        Map<String,List<String>> keyToValues = new HashMap<String,List<String>>();
         keyToValues.put("var", Arrays.asList("ABC"));
-        
+
         gen.subInMultiUris(keyToValues, targets);
         Assert.assertNotNull(targets);
         Assert.assertEquals(4,targets.size());
-        
+
         Assert.assertEquals("<ABC>.", targets.get(0));
         Assert.assertEquals("<ABC>;", targets.get(1));
         Assert.assertEquals("<ABC>]", targets.get(2));
-        Assert.assertEquals("<ABC>,", targets.get(3));                      
+        Assert.assertEquals("<ABC>,", targets.get(3));
     }
-    
+
     @Test
-    public void testPunctAfterVarNameForLiterals(){        
-        List<String> targets = Arrays.asList("?var.","?var;","?var]","?var,"); 
-        
-        Map keyToValues = new HashMap();        
+    public void testPunctAfterVarNameForLiterals(){
+        List<String> targets = Arrays.asList("?var.","?var;","?var]","?var,");
+
+        Map keyToValues = new HashMap();
         keyToValues.put("var", Arrays.asList(new EditLiteral("ABC", null, null)));
-        
+
         gen.subInMultiLiterals(keyToValues, targets);
         Assert.assertNotNull(targets);
         Assert.assertEquals(4,targets.size());
-        
+
         Assert.assertEquals("\"ABC\".", targets.get(0));
         Assert.assertEquals("\"ABC\";", targets.get(1));
         Assert.assertEquals("\"ABC\"]", targets.get(2));
-        Assert.assertEquals("\"ABC\",", targets.get(3));                   
+        Assert.assertEquals("\"ABC\",", targets.get(3));
     }
-    
+
     @Test
     public void testLiterlasWithDatatypes(){
-        List<String> targets = Arrays.asList("?var.","?var;","?var]","?var,","?var", " ?var "); 
-                                                
+        List<String> targets = Arrays.asList("?var.","?var;","?var]","?var,","?var", " ?var ");
+
         String value = "ABC";
         String datatype = "http://someDataType.com/bleck";
         String expected = '"' + value + '"' + "^^<" + datatype + ">";
-        
-        Map keyToValues = new HashMap();           
+
+        Map keyToValues = new HashMap();
         keyToValues.put("var", Arrays.asList(new EditLiteral(value,datatype,null)));
-        
+
         gen.subInMultiLiterals(keyToValues, targets);
         Assert.assertNotNull(targets);
         Assert.assertEquals(6,targets.size());
-        
+
         Assert.assertEquals( expected + ".", targets.get(0));
         Assert.assertEquals(expected + ";", targets.get(1));
         Assert.assertEquals(expected + "]", targets.get(2));
         Assert.assertEquals(expected + ",", targets.get(3));
         Assert.assertEquals(expected , targets.get(4));
         Assert.assertEquals(" " + expected + " ", targets.get(5));
-    }        
-    
+    }
+
     @Test
     public void testLiterlasWithLang(){
-        List<String> targets = Arrays.asList("?var.","?var;","?var]","?var,","?var", " ?var "); 
-                                                
+        List<String> targets = Arrays.asList("?var.","?var;","?var]","?var,","?var", " ?var ");
+
         String value = "ABC";
         String datatype = null;
         String lang = "XYZ";
         String expected = '"' + value + '"' + "@" + lang + "";
-        
-        Map keyToValues = new HashMap();           
+
+        Map keyToValues = new HashMap();
         keyToValues.put("var", Arrays.asList(new EditLiteral(value,datatype,lang)));
-        
+
         gen.subInMultiLiterals(keyToValues, targets);
         Assert.assertNotNull(targets);
         Assert.assertEquals(6,targets.size());
-        
+
         Assert.assertEquals( expected + ".", targets.get(0));
         Assert.assertEquals(expected + ";", targets.get(1));
         Assert.assertEquals(expected + "]", targets.get(2));
@@ -131,139 +131,139 @@ public class EditN3GeneratorVTwoTest {
         Assert.assertEquals(expected , targets.get(4));
         Assert.assertEquals(" " + expected + " ", targets.get(5));
     }
-    
-    
-    @Test 
-    public void testSubInMultiUrisNull(){        
+
+
+    @Test
+    public void testSubInMultiUrisNull(){
         String n3 = "?varXYZ" ;
         List<String> targets = new ArrayList<String>();
         targets.add(n3);
-        
+
         Map<String,List<String>> keyToValues = new HashMap<String,List<String>>();
-        List<String> targetValue = new ArrayList<String>();        
-        targetValue.add(null);       
+        List<String> targetValue = new ArrayList<String>();
+        targetValue.add(null);
         keyToValues.put("varXYZ", targetValue);
-        
+
         gen.subInMultiUris(keyToValues, targets);
         Assert.assertNotNull(targets);
         Assert.assertEquals(1,targets.size());
-        
+
         String resultN3 = targets.get(0);
         Assert.assertNotNull(resultN3);
         Assert.assertTrue("String was empty", !resultN3.isEmpty());
-        
+
         String not_expected = "<null>";
         Assert.assertTrue("must not sub in <null>", !not_expected.equals(resultN3));
-                        
-        not_expected = "<>";        
+
+        not_expected = "<>";
         Assert.assertTrue("must not sub in <>", !not_expected.equals(resultN3));
-        
+
         Assert.assertEquals("?varXYZ", resultN3);
     }
-    
-    @Test 
-    public void testSubInMultiUrisEmptyString(){        
+
+    @Test
+    public void testSubInMultiUrisEmptyString(){
         String n3 = "?varXYZ" ;
         List<String> targets = new ArrayList<String>();
         targets.add(n3);
-        
+
         Map<String,List<String>> keyToValues = new HashMap<String,List<String>>();
-        List<String> targetValue = new ArrayList<String>();        
-        targetValue.add("");       
+        List<String> targetValue = new ArrayList<String>();
+        targetValue.add("");
         keyToValues.put("varXYZ", targetValue);
-        
+
         gen.subInMultiUris(keyToValues, targets);
         Assert.assertNotNull(targets);
         Assert.assertEquals(1,targets.size());
-        
+
         String resultN3 = targets.get(0);
         Assert.assertNotNull(resultN3);
-        Assert.assertTrue("String was empty", !resultN3.isEmpty());                
-                                
+        Assert.assertTrue("String was empty", !resultN3.isEmpty());
+
         Assert.assertEquals("?varXYZ", resultN3);
     }
-    
-    @Test 
+
+    @Test
     public void testSubInUrisNull(){
         String n3 = " ?varXYZ " ;
         List<String> targets = new ArrayList<String>();
         targets.add(n3);
-        
-        Map<String,String> keyToValues = new HashMap<String,String>();                       
+
+        Map<String,String> keyToValues = new HashMap<String,String>();
         keyToValues.put("varXYZ", "xyzURI");
-        
+
         gen.subInUris(keyToValues, targets);
         List<String> result = targets;
         Assert.assertNotNull(result);
         Assert.assertEquals(1,result.size());
-        
+
         String resultN3 = result.get(0);
         Assert.assertNotNull(resultN3);
-        Assert.assertTrue("String was empty", !resultN3.isEmpty());                
+        Assert.assertTrue("String was empty", !resultN3.isEmpty());
         Assert.assertEquals(" <xyzURI> ", resultN3);
-        
-        keyToValues = new HashMap<String,String>();                       
+
+        keyToValues = new HashMap<String,String>();
         keyToValues.put("varXYZ", null);
-                
+
         List<String> targets2 = new ArrayList<String>();
         targets2.add(n3);
-        
+
         gen.subInUris(keyToValues, targets2);
         Assert.assertNotNull(targets2);
         Assert.assertEquals(1,targets2.size());
-        
-        resultN3 = targets2.get(0);        
+
+        resultN3 = targets2.get(0);
         Assert.assertNotNull(resultN3);
-        Assert.assertTrue("String was empty", !resultN3.isEmpty());                
+        Assert.assertTrue("String was empty", !resultN3.isEmpty());
         Assert.assertEquals(" ?varXYZ ", resultN3);
     }
 
-    
-    
+
+
     /*
-     
-      
+
+
       [@prefix core: <http://vivoweb.org/ontology/core#> .
 ?person core:educationalTraining  ?edTraining .
 ?edTraining  a core:EducationalTraining ;
 core:educationalTrainingOf ?person ;
 <http://vivoweb.org/ontology/core#trainingAtOrganization> ?org .
-, ?org <http://www.w3.org/2000/01/rdf-schema#label> ?orgLabel ., ?org a ?orgType .] 
+, ?org <http://www.w3.org/2000/01/rdf-schema#label> ?orgLabel ., ?org a ?orgType .]
 
      */
 
     //{person=http://caruso-laptop.mannlib.cornell.edu:8090/vivo/individual/n2576, predicate=http://vivoweb.org/ontology/core#educationalTraining, edTraining=null}
-        
-    
+
+
 	@Test
     public void testSubInMultiUris() {
         String n3 = "?subject ?predicate ?multivalue ." ;
         List<String> strs = new ArrayList<String>();
         strs.add(n3);
-         
+
         Map<String,List<String>> keyToValues = new HashMap<String,List<String>>();
-        List<String> values = new ArrayList<String>();               
+        List<String> values = new ArrayList<String>();
         values.add("http://a.com/2");
         values.add("http://b.com/ont#2");
-        values.add("http://c.com/individual/n23431");        
+        values.add("http://c.com/individual/n23431");
         keyToValues.put("multivalue", values);
-        
+
         List<String> subject = new ArrayList<String>();
         List<String> predicate = new ArrayList<String>();
         subject.add("http://testsubject.com/1");
         predicate.add("http://testpredicate.com/2");
         keyToValues.put("subject", subject);
         keyToValues.put("predicate", predicate);
-        
-        gen.subInMultiUris(keyToValues, strs);        
-        
+
+        gen.subInMultiUris(keyToValues, strs);
+
         Assert.assertNotNull(strs);
         Assert.assertTrue( strs.size() == 1 );
         String expected ="<http://testsubject.com/1> <http://testpredicate.com/2> <http://a.com/2>, <http://b.com/ont#2>, <http://c.com/individual/n23431> .";
         Assert.assertEquals(expected, strs.get(0));
-        
+
         //Replace subject and predicate with other variables
-        
+
         //make a model,
         Model expectedModel = ModelFactory.createDefaultModel();
         StringReader expectedReader = new StringReader(expected);
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfFormTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfFormTest.java
index 77f4d6b67..79ee54365 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfFormTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfFormTest.java
@@ -24,26 +24,26 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfigurationConstants;
 
 public class ProcessRdfFormTest extends AbstractTestClass{
-     
+
     @Test
     public void basicNewStatementTest() throws Exception{
-        
-        /* A very basic new statement edit. */        
+
+        /* A very basic new statement edit. */
         EditConfigurationVTwo config = new EditConfigurationVTwo();
         config.setEditKey("mockEditKey");
         config.setN3Required(Arrays.asList("?test1 ?test2 ?test3 ." ));
         config.setUrisOnform(Arrays.asList("test1", "test2", "test3"));
-        
-        Map<String,String[]> values = new HashMap<String, String[]>();        
+
+        Map<String,String[]> values = new HashMap<String, String[]>();
         values.put("test1", (new String[] {"http://test.com/uri1"}));
         values.put("test2", (new String[] {"http://test.com/uri2"}));
         values.put("test3", (new String[] {"http://test.com/uri3"}));
         values.put("editKey", (new String[] {"mockEditKey"}));
-                
+
         MultiValueEditSubmission submission = new MultiValueEditSubmission(values, config);
-        
+
         ProcessRdfForm processor = new ProcessRdfForm(config,getMockNewURIMaker());
-        
+
         /* test just the N3 substitution part */
         List<String>req = config.getN3Required();
         List<String>opt = config.getN3Optional();
@@ -54,15 +54,15 @@ public class ProcessRdfFormTest extends AbstractTestClass{
         assertEquals("<http://test.com/uri1> <http://test.com/uri2> <http://test.com/uri3> .", req.get(0));
         /* test the N3 and parse RDF parts */
         AdditionsAndRetractions changes = processor.process( config, submission, null );
-        
+
         assertNotNull( changes );
         assertNotNull( changes.getAdditions() );
         assertNotNull( changes.getRetractions());
         assertTrue( changes.getAdditions().size() == 1 );
         assertTrue( changes.getRetractions().size() == 0 );
-        
+
         assertTrue( changes.getAdditions().contains(
-                ResourceFactory.createResource("http://test.com/uri1"), 
+                ResourceFactory.createResource("http://test.com/uri1"),
                 ResourceFactory.createProperty("http://test.com/uri2"),
                 ResourceFactory.createResource("http://test.com/uri3")));
     }
@@ -74,112 +74,112 @@ public class ProcessRdfFormTest extends AbstractTestClass{
         String testYURI = "http://test.com/uriY";
         String testZURIOrginal = "http://test.com/uriZ";
         String testZURIChanged = "http://test.com/uriZChanged";
-        
+
         /* set up model */
         Model model = ModelFactory.createDefaultModel();
-        model.add(model.createResource(testXURI), 
-                  model.createProperty(testYURI), 
+        model.add(model.createResource(testXURI),
+                  model.createProperty(testYURI),
                   model.createResource(testZURIOrginal));
-        
+
         /* set up EditConfiguration */
         EditConfigurationVTwo config = new EditConfigurationVTwo();
-        config.setEditKey("mockEditKey");        
+        config.setEditKey("mockEditKey");
         config.setUrisOnform(Arrays.asList("testX", "testY", "testZ"));
         config.setN3Required( Arrays.asList("?testX ?testY ?testZ ." ));
-        
+
         config.setVarNameForSubject("testX");
         config.setSubjectUri(testXURI);
-        
+
         config.setPredicateUri(testYURI);
         config.setVarNameForPredicate("testY");
-        
+
         config.setObject(testZURIOrginal);
-        config.setVarNameForObject("testZ");                
-                
-        config.prepareForObjPropUpdate(model);               
-        
-        /* set up Submission */        
-        Map<String,String[]> values = new HashMap<String, String[]>();                
+        config.setVarNameForObject("testZ");
+
+        config.prepareForObjPropUpdate(model);
+
+        /* set up Submission */
+        Map<String,String[]> values = new HashMap<String, String[]>();
         values.put("testZ", (new String[] {testZURIChanged}));
-        values.put("editKey", (new String[] {"mockEditKey"}));               
+        values.put("editKey", (new String[] {"mockEditKey"}));
         MultiValueEditSubmission submission = new MultiValueEditSubmission(values, config);
-        
-        ProcessRdfForm processor = new ProcessRdfForm(config,getMockNewURIMaker());        
+
+        ProcessRdfForm processor = new ProcessRdfForm(config,getMockNewURIMaker());
         AdditionsAndRetractions changes = processor.process( config, submission, null );
-             
+
         assertNotNull( changes );
         assertNotNull( changes.getAdditions() );
         assertNotNull( changes.getRetractions());
-        
+
         assertTrue( changes.getAdditions().size() == 1 );
         assertTrue( changes.getRetractions().size() == 1 );
-        
+
         assertTrue( changes.getAdditions().contains(
-                ResourceFactory.createResource(testXURI), 
+                ResourceFactory.createResource(testXURI),
                 ResourceFactory.createProperty(testYURI),
                 ResourceFactory.createResource(testZURIChanged)));
-        
+
         assertTrue( changes.getRetractions().contains(
-                ResourceFactory.createResource(testXURI), 
+                ResourceFactory.createResource(testXURI),
                 ResourceFactory.createProperty(testYURI),
-                ResourceFactory.createResource(testZURIOrginal)));        
+                ResourceFactory.createResource(testZURIOrginal)));
     }
-    
+
     @Test
-    public void substituteInSubPredObjURIsTest(){        
+    public void substituteInSubPredObjURIsTest(){
         String testXURI = "http://test.com/uriX";
         String testYURI = "http://test.com/uriY";
-        String testZURI = "http://test.com/uriZ";        
-                
+        String testZURI = "http://test.com/uriZ";
+
         /* set up EditConfiguration */
         EditConfigurationVTwo config = new EditConfigurationVTwo();
-        
+
         config.setVarNameForSubject("testX");
         config.setSubjectUri(testXURI);
-        
+
         config.setPredicateUri(testYURI);
         config.setVarNameForPredicate("testY");
-        
+
         config.setObject(testZURI);
         config.setVarNameForObject("testZ");
-        
+
         List<String> a = Arrays.asList("a.0 ?testX ?testY ?testZ.", "a.1 ?testX ?testY ?testZ.");
         List<String> b = Arrays.asList("b.0 ?testX ?testY ?testZ.", "b.1 ?testX ?testY ?testZ.");
-        
-        ProcessRdfForm processor = new ProcessRdfForm(config,getMockNewURIMaker());                        
-        
+
+        ProcessRdfForm processor = new ProcessRdfForm(config,getMockNewURIMaker());
+
         processor.substituteInSubPredObjURIs(config, a, b);
         assertEquals("a.0 <" + testXURI + "> <" + testYURI + "> <" + testZURI + ">.", a.get(0));
-        assertEquals("a.1 <" + testXURI + "> <" + testYURI + "> <" + testZURI + ">.", a.get(1));        
+        assertEquals("a.1 <" + testXURI + "> <" + testYURI + "> <" + testZURI + ">.", a.get(1));
         assertEquals("b.0 <" + testXURI + "> <" + testYURI + "> <" + testZURI + ">.", b.get(0));
         assertEquals("b.1 <" + testXURI + "> <" + testYURI + "> <" + testZURI + ">.", b.get(1));
-        
+
     }
 
     @Test
     public void unicodeTest() throws Exception{
-        /* A test unicode characters with new statement edit. */                
-        
+        /* A test unicode characters with new statement edit. */
+
         /* make configuration */
         EditConfigurationVTwo config = new EditConfigurationVTwo();
         config.setEditKey("mockEditKey");
         config.setN3Required(Arrays.asList("?test1 ?test2 ?test3 ." ));
         config.setUrisOnform(Arrays.asList("test1", "test2", "test3"));
-        
+
         String test1 = "http://test.com/uriWithUnicodeƺ",
             test2 = "http://test.com/latin-1-ÙåàÞñöÿ",
             test3 = "http://test.com/moreUnicode-ἎἘὤ" ;
-        
+
         /* make submission */
-        Map<String,String[]> values = new HashMap<String, String[]>();        
+        Map<String,String[]> values = new HashMap<String, String[]>();
         values.put("test1", (new String[] {test1}));
         values.put("test2", (new String[] {test2}));
         values.put("test3", (new String[] {test3}));
-        values.put("editKey", (new String[] {"mockEditKey"}));                
+        values.put("editKey", (new String[] {"mockEditKey"}));
         MultiValueEditSubmission submission = new MultiValueEditSubmission(values, config);
-                
+
         ProcessRdfForm processor = new ProcessRdfForm(config,getMockNewURIMaker());
-        
+
         /* test just the N3 substitution part */
         List<String>req = config.getN3Required();
         List<String>opt = config.getN3Optional();
@@ -188,42 +188,42 @@ public class ProcessRdfFormTest extends AbstractTestClass{
         assertTrue( req.size() > 0);
         assertNotNull(req.get(0));
         assertEquals("<" +test1+ "> <" +test2+ "> <" +test3+ "> .", req.get(0));
-        
+
         /* test the N3 and parse RDF parts */
         AdditionsAndRetractions changes = processor.process( config, submission, null );
-        
+
         assertNotNull( changes );
         assertNotNull( changes.getAdditions() );
         assertNotNull( changes.getRetractions());
         assertTrue( changes.getAdditions().size() == 1 );
         assertTrue( changes.getRetractions().size() == 0 );
-        
+
         assertTrue( changes.getAdditions().contains(
-                ResourceFactory.createResource(test1), 
+                ResourceFactory.createResource(test1),
                 ResourceFactory.createProperty(test2),
                 ResourceFactory.createResource(test3)));
     }
-    
+
     @Test
-    public void basicNewResourceTest() throws Exception{       
-        /* A very basic new statement edit. */        
+    public void basicNewResourceTest() throws Exception{
+        /* A very basic new statement edit. */
         EditConfigurationVTwo config = new EditConfigurationVTwo();
         config.setEditKey("mockEditKey");
         config.setN3Required(Arrays.asList("?newRes ?test2 ?test3 ." ));
         config.setUrisOnform(Arrays.asList( "test2", "test3"));
         config.addNewResource("newRes", null);
-        config.setEntityToReturnTo("?newRes");        
-        
-        Map<String,String[]> values = new HashMap<String, String[]>();        
+        config.setEntityToReturnTo("?newRes");
+
+        Map<String,String[]> values = new HashMap<String, String[]>();
 
         values.put("test2", (new String[] {"http://test.com/uri2"}));
         values.put("test3", (new String[] {"http://test.com/uri3"}));
         values.put("editKey", (new String[] {"mockEditKey"}));
-                
+
         MultiValueEditSubmission submission = new MultiValueEditSubmission(values, config);
-        
+
         ProcessRdfForm processor = new ProcessRdfForm(config,getMockNewURIMaker());
-        
+
         /* test just the N3 substitution part */
         List<String>req = config.getN3Required();
         List<String>opt = config.getN3Optional();
@@ -232,28 +232,28 @@ public class ProcessRdfFormTest extends AbstractTestClass{
         assertTrue( req.size() > 0);
         assertNotNull(req.get(0));
         assertEquals("<"+NEWURI_STRING + "0> <http://test.com/uri2> <http://test.com/uri3> .", req.get(0));
-        
+
         assertEquals("<" + NEWURI_STRING + "0>", submission.getEntityToReturnTo());
-        
+
         /* test the N3 and parse RDF parts */
         AdditionsAndRetractions changes = processor.process( config, submission, null );
-        
+
         assertNotNull( changes );
         assertNotNull( changes.getAdditions() );
         assertNotNull( changes.getRetractions());
         assertTrue( changes.getAdditions().size() == 1 );
         assertTrue( changes.getRetractions().size() == 0 );
-        
+
         assertTrue( changes.getAdditions().contains(
-                ResourceFactory.createResource(NEWURI_STRING + "0"), 
+                ResourceFactory.createResource(NEWURI_STRING + "0"),
                 ResourceFactory.createProperty("http://test.com/uri2"),
                 ResourceFactory.createResource("http://test.com/uri3")));
     }
 
     @Test
     //Edit existing statement
-    public void forcedNewResourceTest() throws Exception{       
-        /* A very basic new statement edit. */        
+    public void forcedNewResourceTest() throws Exception{
+        /* A very basic new statement edit. */
         EditConfigurationVTwo config = new EditConfigurationVTwo();
         config.setEditKey("mockEditKey");
         config.setN3Required(Arrays.asList("?newRes ?test2 ?test3 ." ));
@@ -261,19 +261,19 @@ public class ProcessRdfFormTest extends AbstractTestClass{
         //set uris in scope to include an existing value for new resource
         config.addUrisInScope("newRes", Arrays.asList("<http://test.com/uri1>"));
         config.addNewResource("newRes", null);
-        config.setEntityToReturnTo("?newRes");        
-        
-        Map<String,String[]> values = new HashMap<String, String[]>(); 
+        config.setEntityToReturnTo("?newRes");
+
+        Map<String,String[]> values = new HashMap<String, String[]>();
         //value from form should indicate that newRes should have new uri created
         values.put("newRes", (new String[] {EditConfigurationConstants.NEW_URI_SENTINEL}));
         values.put("test2", (new String[] {"http://test.com/uri2"}));
         values.put("test3", (new String[] {"http://test.com/uri3"}));
         values.put("editKey", (new String[] {"mockEditKey"}));
-                
+
         MultiValueEditSubmission submission = new MultiValueEditSubmission(values, config);
-        
+
         ProcessRdfForm processor = new ProcessRdfForm(config,getMockNewURIMaker());
-        
+
         /* test just the N3 substitution part */
         List<String>req = config.getN3Required();
         List<String>opt = config.getN3Optional();
@@ -282,27 +282,27 @@ public class ProcessRdfFormTest extends AbstractTestClass{
         assertTrue( req.size() > 0);
         assertNotNull(req.get(0));
         assertEquals("<"+NEWURI_STRING + "0> <http://test.com/uri2> <http://test.com/uri3> .", req.get(0));
-        
+
         assertEquals("<" + NEWURI_STRING + "0>", submission.getEntityToReturnTo());
-        
+
         /* test the N3 and parse RDF parts */
         AdditionsAndRetractions changes = processor.process( config, submission, null );
-        
+
         assertNotNull( changes );
         assertNotNull( changes.getAdditions() );
         assertNotNull( changes.getRetractions());
         assertTrue( changes.getAdditions().size() == 1 );
         //the old uri should be removed
         assertTrue( changes.getRetractions().size() == 0 );
-        
+
         assertTrue( changes.getAdditions().contains(
-                ResourceFactory.createResource(NEWURI_STRING + "0"), 
+                ResourceFactory.createResource(NEWURI_STRING + "0"),
                 ResourceFactory.createProperty("http://test.com/uri2"),
                 ResourceFactory.createResource("http://test.com/uri3")));
-        
+
 
     }
-    
+
     /* An edit of an existing statement set where some statements need to be replaced while
      * others must be retained. */
     @Test
@@ -316,77 +316,77 @@ public class ProcessRdfFormTest extends AbstractTestClass{
         /* set up model */
         Model model = ModelFactory.createDefaultModel();
         //?x ?y ?zOriginal.
-        model.add(model.createResource(testXURI), 
-                  model.createProperty(testYURI), 
+        model.add(model.createResource(testXURI),
+                  model.createProperty(testYURI),
                   model.createResource(testZURIOrginal));
         //?zOriginal a TestType.
 
-        model.add(model.createResource(testZURIOrginal), 
-                RDF.type, 
+        model.add(model.createResource(testZURIOrginal),
+                RDF.type,
                 model.createResource(zType));
         //?zOriginal label "zLabel";
 
-        model.add(model.createResource(testZURIOrginal), 
-                RDFS.label, 
+        model.add(model.createResource(testZURIOrginal),
+                RDFS.label,
                 model.createLiteral("Z Original Label"));
-        
+
         /* set up EditConfiguration */
         EditConfigurationVTwo config = new EditConfigurationVTwo();
-        config.setEditKey("mockEditKey");        
+        config.setEditKey("mockEditKey");
         config.setLiteralsOnForm(Arrays.asList("zLabel"));
         config.setUrisOnform(Arrays.asList("testX", "testY", "testZ"));
         config.setN3Required( Arrays.asList("?testX ?testY ?testZ ." ));
-        config.setN3Optional( Arrays.asList("?testZ a <" + zType + "> . \n" + 
+        config.setN3Optional( Arrays.asList("?testZ a <" + zType + "> . \n" +
         		"?testZ <" + rdfsLabel + "> ?zLabel ." ));
         //mimicking an existing value for the label
-        config.addLiteralInScope("zLabel", model.createLiteral("Z Original Label"));        
-        
+        config.addLiteralInScope("zLabel", model.createLiteral("Z Original Label"));
+
         config.setVarNameForSubject("testX");
         config.setSubjectUri(testXURI);
-        
+
         config.setPredicateUri(testYURI);
         config.setVarNameForPredicate("testY");
-        
+
         config.setObject(testZURIOrginal);
-        config.setVarNameForObject("testZ");                
-                
+        config.setVarNameForObject("testZ");
+
         config.addField(new FieldVTwo().setName("zLabel"));
-        config.prepareForObjPropUpdate(model);    
-        /* set up Submission */        
-        Map<String,String[]> values = new HashMap<String, String[]>();                
+        config.prepareForObjPropUpdate(model);
+        /* set up Submission */
+        Map<String,String[]> values = new HashMap<String, String[]>();
         values.put("testZ", (new String[] {testZURIChanged}));
         values.put("zLabel", (new String[] {"New Z Label"}));
-        values.put("editKey", (new String[] {"mockEditKey"}));               
+        values.put("editKey", (new String[] {"mockEditKey"}));
         MultiValueEditSubmission submission = new MultiValueEditSubmission(values, config);
-        
-        ProcessRdfForm processor = new ProcessRdfForm(config,getMockNewURIMaker());        
+
+        ProcessRdfForm processor = new ProcessRdfForm(config,getMockNewURIMaker());
         AdditionsAndRetractions changes = processor.process( config, submission, null );
-             
+
         assertNotNull( changes );
         assertNotNull( changes.getAdditions() );
         assertNotNull( changes.getRetractions());
-        
+
        // assertTrue( changes.getAdditions().size() == 3 );
         //only one statement should be retracted
        // assertTrue( changes.getRetractions().size() == 1 );
-        
+
         assertTrue( changes.getAdditions().contains(
-                ResourceFactory.createResource(testXURI), 
+                ResourceFactory.createResource(testXURI),
                 ResourceFactory.createProperty(testYURI),
                 ResourceFactory.createResource(testZURIChanged)));
-        
+
         assertTrue( changes.getRetractions().contains(
-                ResourceFactory.createResource(testXURI), 
+                ResourceFactory.createResource(testXURI),
                 ResourceFactory.createProperty(testYURI),
-                ResourceFactory.createResource(testZURIOrginal)));        
+                ResourceFactory.createResource(testZURIOrginal)));
     }
-    
-    
+
+
     String NEWURI_STRING= "http://newURI/n";
-    
+
     public NewURIMaker getMockNewURIMaker(){
         return new NewURIMaker() {
-            int count = 0; 
+            int count = 0;
             @Override
             public String getUnusedNewURI(String prefixURI) throws InsertException {
                 if( prefixURI != null )
@@ -394,6 +394,6 @@ public class ProcessRdfFormTest extends AbstractTestClass{
                 else
                     return NEWURI_STRING + count;
             }
-        };        
+        };
     }
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/AntiXssValidationTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/AntiXssValidationTest.java
index 76d27c137..e9e2c463d 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/AntiXssValidationTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/AntiXssValidationTest.java
@@ -14,7 +14,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmis
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
 
 public class AntiXssValidationTest {
-    
+
     @Test
     public void  testLiteral( ){
         //test all fields constructor
@@ -24,18 +24,18 @@ public class AntiXssValidationTest {
         eConf.setEditKey("fakeEditKey");
         eConf.addField( new FieldVTwo().setName("X") );
         eConf.setLiteralsOnForm( Arrays.asList("X") );
-        
+
         Map<String, String[]> params = new HashMap<String,String[]>();
         String[] vals= { "some sort of string" };
-        params.put("X", vals);         
-        
-        MultiValueEditSubmission mvEditSub = 
-            new MultiValueEditSubmission(params,eConf);                    
-        
+        params.put("X", vals);
+
+        MultiValueEditSubmission mvEditSub =
+            new MultiValueEditSubmission(params,eConf);
+
         Map<String, String> res = validator.validate(eConf, mvEditSub);
         Assert.assertEquals(null, res);
     }
-    
+
     @Test
     public void  testAllURI( ){
         //test all fields constructor
@@ -44,86 +44,86 @@ public class AntiXssValidationTest {
         EditConfigurationVTwo eConf = new EditConfigurationVTwo();
         eConf.setEditKey("fakeEditKey");
         eConf.setUrisOnform( Arrays.asList("X","Y","Z"));
-        
+
         Map<String, String[]> params = new HashMap<String,String[]>();
         String[] strings0 = {"no problem 0"};
-        params.put("X", strings0 ); 
+        params.put("X", strings0 );
         String[] strings1 = {"no problem 1"};
         params.put("Y", strings1 );
         String[] strings2 = {"no problem 2"};
         params.put("Z", strings2 );
-        
-        MultiValueEditSubmission mvEditSub = 
-            new MultiValueEditSubmission(params,eConf);                    
-        
+
+        MultiValueEditSubmission mvEditSub =
+            new MultiValueEditSubmission(params,eConf);
+
         Map<String, String> res = validator.validate(eConf, mvEditSub);
         Assert.assertNull( res );
     }
-    
+
     protected Map<String, String> testURI( String ... strings){
 
-        AntiXssValidation validator = 
+        AntiXssValidation validator =
             new AntiXssValidation(Arrays.asList("X"));
 
         EditConfigurationVTwo eConf = new EditConfigurationVTwo();
         eConf.setEditKey("fakeEditKey");
         eConf.setUrisOnform( Arrays.asList("X"));
-        
-        Map<String, String[]> params = new HashMap<String,String[]>();              
-        params.put("X", strings ); 
-        
-        MultiValueEditSubmission mvEditSub = 
-            new MultiValueEditSubmission(params,eConf);                    
-        
-        return validator.validate(eConf, mvEditSub);        
+
+        Map<String, String[]> params = new HashMap<String,String[]>();
+        params.put("X", strings );
+
+        MultiValueEditSubmission mvEditSub =
+            new MultiValueEditSubmission(params,eConf);
+
+        return validator.validate(eConf, mvEditSub);
     }
-    
+
     @Test
-    public void testURIValidation(){                   
-        Map<String, String> result = testURI("http://this.should.be.fine.com/xyz#lskd?junk=a&bkeck=%23");                
+    public void testURIValidation(){
+        Map<String, String> result = testURI("http://this.should.be.fine.com/xyz#lskd?junk=a&bkeck=%23");
         Assert.assertNull(result);
     }
-    
+
     @Test
-    public void testURIValidationWithScriptTagLevel1(){                                   
+    public void testURIValidationWithScriptTagLevel1(){
         Map<String, String> result = null;
-        result = testURI("http:<SCRIPT SRC=http://ha.ckers.org/xss.js></SCRIPT>//bad.news.com");                
+        result = testURI("http:<SCRIPT SRC=http://ha.ckers.org/xss.js></SCRIPT>//bad.news.com");
         Assert.assertNotNull(result);
-        
-        result = testURI("http:<IMG SRC=JaVaScRiPt:alert('XSS')>//bad.news.com");                
+
+        result = testURI("http:<IMG SRC=JaVaScRiPt:alert('XSS')>//bad.news.com");
         Assert.assertNotNull(result);
-        
-        result = testURI("http:<IMG SRC=javascript:alert('XSS')>//bad.news.com");                
+
+        result = testURI("http:<IMG SRC=javascript:alert('XSS')>//bad.news.com");
         Assert.assertNotNull(result);
-        
-        result = testURI("http:<IMG SRC=javascript:alert(&quot;XSS&quot;)>//bad.news.com");                
+
+        result = testURI("http:<IMG SRC=javascript:alert(&quot;XSS&quot;)>//bad.news.com");
+        Assert.assertNotNull(result);
+
+        result = testURI("http:<IMG SRC=\"jav\tascript:alert('XSS');\">//bad.news.com");
         Assert.assertNotNull(result);
-        
-        result = testURI("http:<IMG SRC=\"jav\tascript:alert('XSS');\">//bad.news.com");                
-        Assert.assertNotNull(result);                
     }
-    
+
     @Test
-    public void testURIValidationWithScriptTagLevel2(){                                   
+    public void testURIValidationWithScriptTagLevel2(){
         Map<String, String> result = null;
-        result = testURI("http:<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>//bad.news.com");                
+        result = testURI("http:<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>//bad.news.com");
         Assert.assertNotNull(result);
-                
-        result = testURI("http:<IMG SRC=&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000088&#0000083&#0000083&#0000039&#0000041>//bad.news.com");                
+
+        result = testURI("http:<IMG SRC=&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000088&#0000083&#0000083&#0000039&#0000041>//bad.news.com");
         Assert.assertNotNull(result);
-        
-        result = testURI("http:<IMG SRC=&#x6A&#x61&#x76&#x61&#x73&#x63&#x72&#x69&#x70&#x74&#x3A&#x61&#x6C&#x65&#x72&#x74&#x28&#x27&#x58&#x53&#x53&#x27&#x29>//bad.news.com");                
+
+        result = testURI("http:<IMG SRC=&#x6A&#x61&#x76&#x61&#x73&#x63&#x72&#x69&#x70&#x74&#x3A&#x61&#x6C&#x65&#x72&#x74&#x28&#x27&#x58&#x53&#x53&#x27&#x29>//bad.news.com");
         Assert.assertNotNull(result);
-        
-        result = testURI("http:<<SCRIPT>alert(\"XSS\");//<</SCRIPT>//bad.news.com");                
+
+        result = testURI("http:<<SCRIPT>alert(\"XSS\");//<</SCRIPT>//bad.news.com");
         Assert.assertNotNull(result);
-        
-        result = testURI("http:<IMG SRC=&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000088&#0000083&#0000083&#0000039&#0000041>//bad.news.com");                
+
+        result = testURI("http:<IMG SRC=&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000088&#0000083&#0000083&#0000039&#0000041>//bad.news.com");
+        Assert.assertNotNull(result);
+
+        result = testURI("http:<IMG SRC=&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000088&#0000083&#0000083&#0000039&#0000041>//bad.news.com");
         Assert.assertNotNull(result);
-        
-        result = testURI("http:<IMG SRC=&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000088&#0000083&#0000083&#0000039&#0000041>//bad.news.com");                
-        Assert.assertNotNull(result);                        
     }
-    
-    
+
+
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/processEdit/RdfLiteralHashTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/processEdit/RdfLiteralHashTest.java
index 077f5b1c1..2594ecc08 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/processEdit/RdfLiteralHashTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/processEdit/RdfLiteralHashTest.java
@@ -178,7 +178,7 @@ public class RdfLiteralHashTest {
 //        Assert.assertNull(stmt);
 //
 //    }
-    
+
 //    @Test
 //    public void testGetRdfsLabelStatementByHash(){
 //
@@ -187,7 +187,7 @@ public class RdfLiteralHashTest {
 //            "@prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . \n"+
 //            "@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .\n"+
 //            " ex:bob rdfs:label \"Smith, Bob\"^^<"+XSD.xstring.getURI()+"> ." ;
-//               
+//
 //        Model model = (ModelFactory.createDefaultModel()).read(new StringReader(n3), "", "N3");
 //
 //        Individual bob = new IndividualImpl();
@@ -195,16 +195,16 @@ public class RdfLiteralHashTest {
 //
 //        int hash = RdfLiteralHash.makeRdfsLabelLiteralHash(bob, "Smith, Bob", model);
 //        DataPropertyStatement stmt = RdfLiteralHash.getRdfsLabelStatementByHash(bob.getURI(), model, hash);
-//        
+//
 //        String data = stmt.getData();
 //        String datatypeUri = stmt.getDatatypeURI();
 //        String predicateUri = stmt.getDatapropURI();
 //        String subjectUri = stmt.getIndividualURI();
-//        
+//
 //        Assert.assertEquals("Smith, Bob", data);
 //        Assert.assertEquals(XSD.xstring.getURI(), datatypeUri);
 //        Assert.assertEquals(VitroVocabulary.LABEL, predicateUri);
 //        Assert.assertEquals("http://example.com/bob", subjectUri);
-//      
+//
 //    }
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filestorage/FileServingHelperTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filestorage/FileServingHelperTest.java
index 97b02397d..3d2566e6c 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filestorage/FileServingHelperTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filestorage/FileServingHelperTest.java
@@ -30,7 +30,7 @@ public class FileServingHelperTest extends AbstractTestClass {
 	@Before
 	public void createConfigurationProperties() throws Exception {
 		setLoggerLevel(ConfigurationProperties.class, Level.WARN);
-		
+
 		ctx = new ServletContextStub();
 
 		ConfigurationPropertiesStub props = new ConfigurationPropertiesStub();
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filestorage/impl/FileStorageHelperTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filestorage/impl/FileStorageHelperTest.java
index 8fff3623c..c00ce1b04 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filestorage/impl/FileStorageHelperTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filestorage/impl/FileStorageHelperTest.java
@@ -12,7 +12,7 @@ import java.util.Map;
 import org.junit.Test;
 
 /**
- * 
+ *
  */
 public class FileStorageHelperTest {
 	private static String RAW_NAME_1 = "simpleName";
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponseTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponseTest.java
index 39403f4c6..88ed7472a 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponseTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponseTest.java
@@ -24,37 +24,37 @@ public class URLRewritingHttpServletResponseTest {
      */
     protected void urlEncodingStyleA(String urlToEncode, String expectedUrlResult ){
         URLRewritingHttpServletResponse urhsr = new URLRewritingHttpServletResponse(new stubs.javax.servlet.http.HttpServletResponseStub());
-        
+
         List<String>externalNamespaces = new ArrayList();
-        externalNamespaces.add("http://vivo.med.cornell.edu/individual/");        
-                
-        String actual = urhsr.encodeForVitro(urlToEncode, "UTF-8",  
-                true, 1, 
-                getMockNamespaceMapper(), 
-                "http://vivo.cornell.edu/individual/", 
+        externalNamespaces.add("http://vivo.med.cornell.edu/individual/");
+
+        String actual = urhsr.encodeForVitro(urlToEncode, "UTF-8",
+                true, 1,
+                getMockNamespaceMapper(),
+                "http://vivo.cornell.edu/individual/",
                 externalNamespaces);
         Assert.assertEquals(expectedUrlResult, actual);
-    }      
-    
+    }
+
     /*
-     * Style A is for sites that are running behind apache httpd at a 
+     * Style A is for sites that are running behind apache httpd at a
      * URL like http://caruso.mannlib.cornell.edu/ with no portals.
      */
     protected void urlEncodingStyleB(String urlToEncode, String expectedUrlResult){
         URLRewritingHttpServletResponse urhsr = new URLRewritingHttpServletResponse(new stubs.javax.servlet.http.HttpServletResponseStub());
-        
+
         List<String>externalNamespaces = new ArrayList();
-        externalNamespaces.add("http://vivo.med.cornell.edu/individual/");        
-                
-        String actual = urhsr.encodeForVitro(urlToEncode, "UTF-8", 
-                true, 0, 
-                getMockNamespaceMapper(), 
-                "http://vivo.cornell.edu/individual/", 
+        externalNamespaces.add("http://vivo.med.cornell.edu/individual/");
+
+        String actual = urhsr.encodeForVitro(urlToEncode, "UTF-8",
+                true, 0,
+                getMockNamespaceMapper(),
+                "http://vivo.cornell.edu/individual/",
                 externalNamespaces);
         Assert.assertEquals(expectedUrlResult, actual);
     }
-    
-    
+
+
     @Test
     public void test40984(){ urlEncodingStyleA( "/vivo/js/jquery-1.12.4.min.js",
     "/vivo/js/jquery-1.12.4.min.js"); }
@@ -593,8 +593,8 @@ public class URLRewritingHttpServletResponseTest {
     "/vivo/js/jquery_plugins/ui.datepicker.js",
     "/vivo/js/jquery_plugins/ui.datepicker.js"); }
 
-    
-    
+
+
 
     @Test
     public void test35560(){ urlEncodingStyleB( "/js/jquery-1.12.4.min.js",
@@ -783,85 +783,85 @@ public class URLRewritingHttpServletResponseTest {
 
     public NamespaceMapper getMockNamespaceMapper(){
         return new NamespaceMapper() {
-            
+
             @Override
             public void removedStatements(Model arg0) {
                 // TODO Auto-generated method stub
-                
+
             }
-            
+
             @Override
             public void removedStatements(StmtIterator arg0) {
                 // TODO Auto-generated method stub
-                
+
             }
-            
+
             @Override
             public void removedStatements(List<Statement> arg0) {
                 // TODO Auto-generated method stub
-                
+
             }
-            
+
             @Override
             public void removedStatements(Statement[] arg0) {
                 // TODO Auto-generated method stub
-                
+
             }
-            
+
             @Override
             public void removedStatement(Statement arg0) {
                 // TODO Auto-generated method stub
-                
+
             }
-            
+
             @Override
             public void notifyEvent(Model arg0, Object arg1) {
                 // TODO Auto-generated method stub
-                
+
             }
-            
+
             @Override
             public void addedStatements(Model arg0) {
                 // TODO Auto-generated method stub
-                
+
             }
-            
+
             @Override
             public void addedStatements(StmtIterator arg0) {
                 // TODO Auto-generated method stub
-                
+
             }
-            
+
             @Override
             public void addedStatements(List<Statement> arg0) {
                 // TODO Auto-generated method stub
-                
+
             }
-            
+
             @Override
             public void addedStatements(Statement[] arg0) {
                 // TODO Auto-generated method stub
-                
+
             }
-            
+
             @Override
             public void addedStatement(Statement arg0) {
                 // TODO Auto-generated method stub
-                
+
             }
-            
+
             @Override
             public List<String> getPrefixesForNamespace(String namespace) {
                 // TODO Auto-generated method stub
                 return null;
             }
-            
+
             @Override
             public String getPrefixForNamespace(String namespace) {
                 // TODO Auto-generated method stub
                 return null;
             }
-            
+
             @Override
             public String getNamespaceForPrefix(String prefix) {
                 // TODO Auto-generated method stub
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filters/VitroURLTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filters/VitroURLTest.java
index b5534d87e..c8fcb34af 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filters/VitroURLTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/filters/VitroURLTest.java
@@ -10,14 +10,14 @@ import org.junit.Assert;
 import org.junit.Test;
 
 
-public class VitroURLTest { 
+public class VitroURLTest {
 
     /**
      * Test of beginsWithSlash method, of class VitroURL.
      */
     @Test
     public void testBeginsWithSlash()
-    {     
+    {
         String pathStr = "entity?home=1&uri=http://aims.fao.org/aos/geopolitical.owl#Afghanistan";
         VitroURL instance = new VitroURL("", "UTF-8");
         boolean expResult = false;
@@ -30,7 +30,7 @@ public class VitroURLTest {
      */
     @Test
     public void testEndsInSlash()
-    {        
+    {
         String pathStr = "/entity?home=1&uri=http://aims.fao.org/aos/geopolitical.owl#Afghanistan";
         VitroURL instance = new VitroURL("", "UTF-8");
         boolean expResult = false;
@@ -58,8 +58,8 @@ public class VitroURLTest {
         result = instance.toString();
         assertEquals(expResult, result);
     }
-    
-    
+
+
     /**
      * This is a test similar to testToString()
      * in that it has a = and a ?  but it doesn't
@@ -69,77 +69,77 @@ public class VitroURLTest {
     public void testWithEqualsSign(){
         String MelbUniStr = "/entity?home=1&uri=HTTPS://bida.themis.unimelb.edu.au/pls/apex/f?p=mrw2rdf:org:::::org_id:145";
         VitroURL instance = new VitroURL(MelbUniStr, "UTF-8");
-        String expResult ="/entity?home=1&uri=HTTPS%3A%2F%2Fbida.themis.unimelb.edu.au%2Fpls%2Fapex%2Ff%3Fp%3Dmrw2rdf%3Aorg%3A%3A%3A%3A%3Aorg_id%3A145";        
+        String expResult ="/entity?home=1&uri=HTTPS%3A%2F%2Fbida.themis.unimelb.edu.au%2Fpls%2Fapex%2Ff%3Fp%3Dmrw2rdf%3Aorg%3A%3A%3A%3A%3Aorg_id%3A145";
         assertEquals(expResult, instance.toString());
     }
-   
+
     @Test
     public void testParseQueryParams(){
         //parseQueryParams
-        VitroURL instance = new VitroURL("stringNotImportant", "UTF-8");       
+        VitroURL instance = new VitroURL("stringNotImportant", "UTF-8");
         List<String[]> result = instance.parseQueryParams("uri=HTTPS://bida.themis.unimelb.edu.au/pls/apex/f?p=mrw2rdf:org:::::org_id:145");
         Assert.assertNotNull(result);
         Assert.assertEquals(1, result.size());
         Assert.assertNotNull(result.get(0));
         Assert.assertEquals(2, result.get(0).length);
         Assert.assertEquals("uri",result.get(0)[0]);
-        Assert.assertEquals("HTTPS://bida.themis.unimelb.edu.au/pls/apex/f?p=mrw2rdf:org:::::org_id:145",result.get(0)[1]);    
+        Assert.assertEquals("HTTPS://bida.themis.unimelb.edu.au/pls/apex/f?p=mrw2rdf:org:::::org_id:145",result.get(0)[1]);
     }
-    
+
     @Test
     public void testParseQueryParams2(){
         //parseQueryParams
-        VitroURL instance = new VitroURL("stringNotImportant", "UTF-8");       
+        VitroURL instance = new VitroURL("stringNotImportant", "UTF-8");
         List<String[]> result = instance.parseQueryParams("home=1&uri=HTTPS://bida.themis.unimelb.edu.au/pls/apex/f?p=mrw2rdf:org:::::org_id:145");
         Assert.assertNotNull(result);
         Assert.assertEquals(2, result.size());
-        
+
         Assert.assertNotNull(result.get(0));
         Assert.assertEquals(2, result.get(0).length);
         Assert.assertEquals("home",result.get(0)[0]);
         Assert.assertEquals("1",result.get(0)[1]);
-        
+
         Assert.assertNotNull(result.get(1));
         Assert.assertEquals(2, result.get(1).length);
         Assert.assertEquals("uri",result.get(1)[0]);
-        Assert.assertEquals("HTTPS://bida.themis.unimelb.edu.au/pls/apex/f?p=mrw2rdf:org:::::org_id:145",result.get(1)[1]);    
+        Assert.assertEquals("HTTPS://bida.themis.unimelb.edu.au/pls/apex/f?p=mrw2rdf:org:::::org_id:145",result.get(1)[1]);
     }
-    
+
     @Test
     public void testParseQueryParams3(){
         //parseQueryParams
-        VitroURL instance = new VitroURL("stringNotImportant", "UTF-8");       
+        VitroURL instance = new VitroURL("stringNotImportant", "UTF-8");
         List<String[]> result = instance.parseQueryParams("home=1&uri=HTTPS://bida.edu.au/pls/apex/f?p=mrw2&additiona=234");
         Assert.assertNotNull(result);
         Assert.assertEquals(2, result.size());
-        
+
         Assert.assertNotNull(result.get(0));
         Assert.assertEquals(2, result.get(0).length);
         Assert.assertEquals("home",result.get(0)[0]);
         Assert.assertEquals("1",result.get(0)[1]);
-        
+
         Assert.assertNotNull(result.get(1));
         Assert.assertEquals(2, result.get(1).length);
         Assert.assertEquals("uri",result.get(1)[0]);
-        Assert.assertEquals("HTTPS://bida.edu.au/pls/apex/f?p=mrw2&additiona=234",result.get(1)[1]);    
+        Assert.assertEquals("HTTPS://bida.edu.au/pls/apex/f?p=mrw2&additiona=234",result.get(1)[1]);
     }
-    
+
     @Test (expected=Error.class)
     public void testParseQueryParams4(){
         //parseQueryParams
-        VitroURL instance = new VitroURL("stringNotImportant", "UTF-8");       
+        VitroURL instance = new VitroURL("stringNotImportant", "UTF-8");
         List<String[]> result = instance.parseQueryParams("home=1&shouldBeURI=HTTPS://bida.edu.au/pls/apex/f?p=mrw2&additiona=234");
         Assert.assertNotNull(result);
         Assert.assertEquals(2, result.size());
-        
+
         Assert.assertNotNull(result.get(0));
         Assert.assertEquals(2, result.get(0).length);
         Assert.assertEquals("home",result.get(0)[0]);
         Assert.assertEquals("1",result.get(0)[1]);
-        
+
         Assert.assertNotNull(result.get(1));
         Assert.assertEquals(2, result.get(1).length);
         Assert.assertEquals("uri",result.get(1)[0]);
-        Assert.assertEquals("HTTPS://bida.edu.au/pls/apex/f?p=mrw2&additiona=234",result.get(1)[1]);    
+        Assert.assertEquals("HTTPS://bida.edu.au/pls/apex/f?p=mrw2&additiona=234",result.get(1)[1]);
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/i18n/I18nTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/i18n/I18nTest.java
index 503b3d20a..8396f1beb 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/i18n/I18nTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/i18n/I18nTest.java
@@ -17,7 +17,7 @@ import edu.cornell.mannlib.vitro.webapp.i18n.selection.SelectedLocale;
 
 /**
  * Test the I18N functionality.
- * 
+ *
  * Start by checking the logic that finds approximate matches for
  * language-specific property files.
  */
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetupTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetupTest.java
index dd3cbb3d7..ba894d6cd 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetupTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetupTest.java
@@ -146,7 +146,7 @@ public class LocaleSelectionSetupTest extends AbstractTestClass {
 		expectForced("es");
 		expectMessages(1, 0, 0);
 	}
-	
+
 	@Test
 	public void forceSuccessL_C() {
 		props.setProperty(PROPERTY_FORCE_LOCALE, "es_ES");
@@ -154,7 +154,7 @@ public class LocaleSelectionSetupTest extends AbstractTestClass {
 		expectForced("es_ES");
 		expectMessages(1, 0, 0);
 	}
-	
+
 	@Test
 	public void forceSuccessL_C_V() {
 		props.setProperty(PROPERTY_FORCE_LOCALE, "no_NO_NY");
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/VitroModelFactoryTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/VitroModelFactoryTest.java
index e4b9b1c2e..205476159 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/VitroModelFactoryTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/VitroModelFactoryTest.java
@@ -36,31 +36,31 @@ import edu.cornell.mannlib.vitro.testing.RecordingProxy.MethodCallRecorder;
 /**
  * Test that the VitroModelFactory is doing what we want, with regard to bulk
  * updates.
- * 
+ *
  * With the switch to Jena 2.10, bulk update operations are deprecated, but
  * still supported, to a large extent. A Graph still has a bulk updater which
  * can be called for bulk operations (like adding multiple statements). However,
  * the default Model won't call the bulk updater of its Graph, and neither will
  * the default OntModel.
- * 
+ *
  * VitroModelFactory creates Models and OntModels that do call the bulk updaters
  * of their respective graphs.
- * 
+ *
  * ---------------
- * 
+ *
  * These tests show which methods are called on which objects (graph, model,
  * listener) for both simple operations (add a statement) and bulk operations
  * (add multiple statements).
- * 
+ *
  * The tests of the default ModelFactory aren't necessary. They do add
  * confidence to the testing mechanism, and provide a contrast with the
  * VitroModelFactory.
- * 
+ *
  * The tests of simple operations may or may not add value. Probably good to
  * keep them.
- * 
+ *
  * ----------------
- * 
+ *
  * Who knows how we will deal with this in the next Jena upgrade, when
  * presumably the bulk updaters will be removed completely.
  */
@@ -84,7 +84,7 @@ public class VitroModelFactoryTest extends AbstractTestClass {
 	/**
 	 * A ModelGroup has a talkative graph, with a talkative bulkUpdater, wrapped
 	 * by a model that has a talkative listener attached.
-	 * 
+	 *
 	 * But what kind of model?
 	 */
 	private static abstract class ModelGroup extends TestObjectGrouping {
@@ -164,7 +164,7 @@ public class VitroModelFactoryTest extends AbstractTestClass {
 	/**
 	 * An OntModelGroup is like a ModelGroup, but the model is wrapped in an
 	 * OntModel that has its own talkative listener.
-	 * 
+	 *
 	 * But what kind of Model, and what kind of OntModel?
 	 */
 	private static abstract class OntModelGroup extends ModelGroup {
@@ -256,7 +256,7 @@ public class VitroModelFactoryTest extends AbstractTestClass {
 	/**
 	 * A UnionModelGroup is two ModelGroups, joined into a union that has its
 	 * own talkative listener.
-	 * 
+	 *
 	 * But what kind of ModelGroup, and what kind of union?
 	 */
 	private abstract static class UnionModelGroup extends TestObjectGrouping {
@@ -359,7 +359,7 @@ public class VitroModelFactoryTest extends AbstractTestClass {
 	/**
 	 * A UnionOntModelGroup is two OntModelGroups, joined into a union that has
 	 * its own talkative listener.
-	 * 
+	 *
 	 * But what kind of OntModelGroup, and what kind of union?
 	 */
 	private abstract static class UnionOntModelGroup extends TestObjectGrouping {
@@ -467,7 +467,7 @@ public class VitroModelFactoryTest extends AbstractTestClass {
 	/**
 	 * A OntModelUnionModelGroup is a UnionModelGroup wrapped by an OntModel
 	 * with a listener.
-	 * 
+	 *
 	 * But what kind of UnionModelGroup, and what kind of OntModel?
 	 */
 	private abstract static class OntModelUnionModelGroup extends
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFServiceTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFServiceTest.java
index c649bab89..261718d6d 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFServiceTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFServiceTest.java
@@ -27,7 +27,7 @@ import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
 
 /**
  * This is the matching order we expect to see:
- * 
+ *
  * <pre>
  * exact match to preferred, by order.
  * partial match to preferred, by order.
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerInversePropertyTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerInversePropertyTest.java
index 5c94e98f1..1d9812795 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerInversePropertyTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerInversePropertyTest.java
@@ -22,9 +22,9 @@ import org.apache.jena.vocabulary.OWL;
 import edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread;
 
 public class SimpleReasonerInversePropertyTest extends SimpleReasonerTBoxHelper {
-	
+
 	long delay = 50;
-  
+
 	@Before
 	public void suppressErrorOutput() {
 		suppressSyserr();
@@ -37,10 +37,10 @@ public class SimpleReasonerInversePropertyTest extends SimpleReasonerTBoxHelper
 	@Before public void setup() {
 		ApplicationStub.setup(new ServletContextStub(), new SearchEngineStub());
 	}
-	
+
     @Test
     public void addABoxAssertion1Test(){
-        addABoxAssertion1(true);        
+        addABoxAssertion1(true);
     }
 
     @Test
@@ -50,47 +50,47 @@ public class SimpleReasonerInversePropertyTest extends SimpleReasonerTBoxHelper
 
 	/*
 	* basic scenarios around adding abox data
-	* 
+	*
 	* Create a Tbox with property P inverseOf property Q.
     * Add a statement a P b, and verify that b Q a is inferred.
-    * Add a statement c Q d and verify that d Q c is inferred. 
+    * Add a statement c Q d and verify that d Q c is inferred.
 	*/
 	public void addABoxAssertion1(boolean sameAs ) {
 
 		// set up the tbox
-		OntModel tBox = createTBoxModel(); 
+		OntModel tBox = createTBoxModel();
 		OntProperty P = createObjectProperty(tBox, "http://test.vivo/P", "property P");
 		OntProperty Q = createObjectProperty(tBox, "http://test.vivo/Q", "property Q");
 		setInverse(P, Q);
-	            
+
         // this is the model to receive abox inferences
         Model inf = ModelFactory.createDefaultModel();
-        
+
 		// create an abox and register the SimpleReasoner listener with it
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 
         SimpleReasoner sr = new SimpleReasoner(tBox,aBox,inf);
         sr.setSameAsEnabled( sameAs );
 
 		aBox.register( sr );
-		
+
         // add assertions to the abox and verify inferences
 		Resource a = aBox.createResource("http://test.vivo/a");
 		Resource b = aBox.createResource("http://test.vivo/b");
 		Resource c = aBox.createResource("http://test.vivo/c");
 		Resource d = aBox.createResource("http://test.vivo/d");
-		
-		aBox.add(a,P,b);		
-		Assert.assertTrue(inf.contains(b,Q,a));				
-		aBox.add(c,Q,d);		
-		Assert.assertTrue(inf.contains(d,P,c));	      
-		
+
+		aBox.add(a,P,b);
+		Assert.assertTrue(inf.contains(b,Q,a));
+		aBox.add(c,Q,d);
+		Assert.assertTrue(inf.contains(d,P,c));
+
 		// delete assertions and verify that inferences go away
 		aBox.remove(c,Q,d);
 		Assert.assertFalse(inf.contains(d,P,c));
 		aBox.remove(a,P,b);
 		Assert.assertFalse(inf.contains(b,Q,a));
-		
+
 	}
 
     @Test
@@ -110,29 +110,29 @@ public class SimpleReasonerInversePropertyTest extends SimpleReasonerTBoxHelper
 	public void addABoxAssertion2(boolean sameAs ) {
 
 		// set up the tbox
-		OntModel tBox = createTBoxModel(); 
+		OntModel tBox = createTBoxModel();
 		OntProperty P = createObjectProperty(tBox, "http://test.vivo/P", "property P");
 		OntProperty Q = createObjectProperty(tBox, "http://test.vivo/Q", "property Q");
 		setInverse(P, Q);
-	            
+
         // this is the model to receive abox inferences
         Model inf = ModelFactory.createDefaultModel();
-        
+
 		// create an ABox and add data (no inferencing happening yet)
 		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
         // Individuals a, b, c and d
 		Resource a = aBox.createResource("http://test.vivo/a");
 		Resource b = aBox.createResource("http://test.vivo/b");
 		aBox.add(b,Q,a);
-		
+
 		// register SimpleReasoner
 		aBox.register(new SimpleReasoner(tBox, aBox, inf));
-				
+
 		Assert.assertFalse(inf.contains(b,Q,a));
-		
+
 		// add data and verify inferences
 		aBox.add(a,P,b);
-		Assert.assertFalse(inf.contains(b,Q,a));	
+		Assert.assertFalse(inf.contains(b,Q,a));
 	}
 
     @Test
@@ -149,16 +149,16 @@ public class SimpleReasonerInversePropertyTest extends SimpleReasonerTBoxHelper
 	 * (remove the inference when it is asserted)
 	*/
 	public void addABoxAssertion3(boolean sameAs) {
-		
+
 		// set up the tbox
-		OntModel tBox = createTBoxModel(); 
+		OntModel tBox = createTBoxModel();
 		OntProperty P = createObjectProperty(tBox, "http://test.vivo/P", "property P");
 		OntProperty Q = createObjectProperty(tBox, "http://test.vivo/Q", "property Q");
 		setInverse(P, Q);
-	            
+
         // this is the model to receive abox inferences
         Model inf = ModelFactory.createDefaultModel();
-        
+
 		// create abox and register SimpleReasoner
 		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 
@@ -166,15 +166,15 @@ public class SimpleReasonerInversePropertyTest extends SimpleReasonerTBoxHelper
         sr.setSameAsEnabled( sameAs );
 
 		aBox.register( sr );
-		
+
         // add statements to the abox and verify inferences
 		Resource a = aBox.createResource("http://test.vivo/a");
 		Resource b = aBox.createResource("http://test.vivo/b");
-				
+
 		aBox.add(a,P,b);
-		Assert.assertTrue(inf.contains(b,Q,a));		
+		Assert.assertTrue(inf.contains(b,Q,a));
 		aBox.add(b,Q,a); // this should cause the inference to be removed
-		Assert.assertFalse(inf.contains(b,Q,a));	
+		Assert.assertFalse(inf.contains(b,Q,a));
 	}
 
     @Test
@@ -193,38 +193,38 @@ public class SimpleReasonerInversePropertyTest extends SimpleReasonerTBoxHelper
 	public void addABoxAssertion4( boolean sameAs ) {
 
 		// set up the tbox
-		OntModel tBox = createTBoxModel(); 
+		OntModel tBox = createTBoxModel();
 		OntProperty P = createObjectProperty(tBox, "http://test.vivo/P", "property P");
 		OntProperty Q = createObjectProperty(tBox, "http://test.vivo/Q", "property Q");
 		OntProperty R = createObjectProperty(tBox, "http://test.vivo/R", "property R");
 		setInverse(P, Q);
 		setInverse(R, Q);
 		setEquivalent(R, P);
-	            
+
         // this is the model to receive abox inferences
         Model inf = ModelFactory.createDefaultModel();
-        
+
 		// create an ABox and register the SimpleReasoner with it
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 
         SimpleReasoner sr = new SimpleReasoner(tBox, aBox, inf);
         sr.setSameAsEnabled( sameAs );
 		aBox.register( sr );
-		
+
         // add abox statements and verify inferences
 		Resource a = aBox.createResource("http://test.vivo/a");
 		Resource b = aBox.createResource("http://test.vivo/b");
 		Resource c = aBox.createResource("http://test.vivo/c");
 		Resource d = aBox.createResource("http://test.vivo/d");
 
-		aBox.add(a,R,b);		
-		Assert.assertTrue(inf.contains(b,Q,a));	
-								
-		aBox.add(c,Q,d);		
-		Assert.assertTrue(inf.contains(d,P,c));	
-		Assert.assertTrue(inf.contains(d,R,c));	
+		aBox.add(a,R,b);
+		Assert.assertTrue(inf.contains(b,Q,a));
+
+		aBox.add(c,Q,d);
+		Assert.assertTrue(inf.contains(d,P,c));
+		Assert.assertTrue(inf.contains(d,R,c));
 	}
-	
+
     @Test
     public void removedABoxAssertion1Test(){
         removedABoxAssertion1(true);
@@ -237,49 +237,49 @@ public class SimpleReasonerInversePropertyTest extends SimpleReasonerTBoxHelper
 
 	/*
 	 *  basic scenarios around removing abox data
-	 *  don't remove an inference if it's still 
+	 *  don't remove an inference if it's still
 	 *  entailed by something else in the abox.
-	 */ 
+	 */
 	public void removedABoxAssertion1(boolean sameAs) {
-		
+
 		// set up the tbox
-		OntModel tBox = createTBoxModel(); 
+		OntModel tBox = createTBoxModel();
 		OntProperty P = createObjectProperty(tBox, "http://test.vivo/P", "property P");
 		OntProperty Q = createObjectProperty(tBox, "http://test.vivo/Q", "property Q");
 		OntProperty T = createObjectProperty(tBox, "http://test.vivo/T", "property T");
 		setInverse(P, Q);
 		setInverse(P, T);
-	            
+
         // this is the model to receive abox inferences
         Model inf = ModelFactory.createDefaultModel();
-        
+
 		// create an ABox and register the SimpleReasoner with it
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
         SimpleReasoner sr = new SimpleReasoner(tBox, aBox, inf);
         sr.setSameAsEnabled( sameAs );
 		aBox.register( sr );
-		
+
         // add statements to the abox and verify inferences
 		Resource a = aBox.createResource("http://test.vivo/a");
 		Resource b = aBox.createResource("http://test.vivo/b");
 		Resource c = aBox.createResource("http://test.vivo/c");
 		Resource d = aBox.createResource("http://test.vivo/d");
-		
+
 		aBox.add(a,P,b);
-		Assert.assertTrue(inf.contains(b,Q,a));	
-		
-        // d P c is inferred from c Q d and also from c T d			
-		aBox.add(c,Q,d);		
+		Assert.assertTrue(inf.contains(b,Q,a));
+
+        // d P c is inferred from c Q d and also from c T d
+		aBox.add(c,Q,d);
 		aBox.add(c,T,d);
-		Assert.assertTrue(inf.contains(d,P,c));	
-		
+		Assert.assertTrue(inf.contains(d,P,c));
+
 		aBox.remove(a,P,b);
 		Assert.assertFalse(inf.contains(b,Q,a));
-				
-		aBox.remove(c,Q,d); 
+
+		aBox.remove(c,Q,d);
 		Assert.assertTrue(inf.contains(d,P,c)); // still inferred from c T d
 	}
-	
+
     @Test
     public void removedABoxAssertion2Test(){
         removedABoxAssertion2(true);
@@ -293,11 +293,11 @@ public class SimpleReasonerInversePropertyTest extends SimpleReasonerTBoxHelper
 	/*
 	 *  removing abox data with equivalent and inverse properties
 	 *  don't remove inference if it's still inferred.
-	 */ 
+	 */
 	public void removedABoxAssertion2(boolean sameAs) {
-		
+
 		// set up the tbox
-		OntModel tBox = createTBoxModel(); 
+		OntModel tBox = createTBoxModel();
 		OntProperty P = createObjectProperty(tBox, "http://test.vivo/P", "property P");
 		OntProperty Q = createObjectProperty(tBox, "http://test.vivo/Q", "property Q");
 		OntProperty T = createObjectProperty(tBox, "http://test.vivo/T", "property T");
@@ -307,28 +307,28 @@ public class SimpleReasonerInversePropertyTest extends SimpleReasonerTBoxHelper
 
         // this is the model to receive abox inferences
         Model inf = ModelFactory.createDefaultModel();
-        
+
 		// create an abox and register the SimpleReasoner listener with it
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
         SimpleReasoner sr = new SimpleReasoner(tBox, aBox, inf);
         sr.setSameAsEnabled( sameAs );
 		aBox.register( sr );
-		
+
         // add abox data and verify inferences
 		Resource a = aBox.createResource("http://test.vivo/a");
 		Resource b = aBox.createResource("http://test.vivo/b");
-		
-        // b Q a is inferred from a P b and  also from a T b.		
+
+        // b Q a is inferred from a P b and  also from a T b.
 		aBox.add(a,P,b);
 		aBox.add(a,T,b);
 		Assert.assertTrue(inf.contains(b,Q,a));
 		Assert.assertFalse(inf.contains(a,P,b));
 		Assert.assertFalse(inf.contains(a,T,b));
-		
+
 		aBox.remove(a,P,b);
 		Assert.assertTrue(inf.contains(b,Q,a));
 	}
-	
+
     @Test
     public void removedABoxAssertion3Test(){
         removedABoxAssertion3(true);
@@ -341,18 +341,18 @@ public class SimpleReasonerInversePropertyTest extends SimpleReasonerTBoxHelper
 
 	/*
 	 *  removing abox data with equivalent and inverse properties
-	 */ 
+	 */
 	public void removedABoxAssertion3(boolean sameAs) {
-		
+
 		// set up the tbox
-		OntModel tBox = createTBoxModel(); 
+		OntModel tBox = createTBoxModel();
 		OntProperty P = createObjectProperty(tBox, "http://test.vivo/P", "property P");
 		OntProperty Q = createObjectProperty(tBox, "http://test.vivo/Q", "property Q");
 		setInverse(P, Q);
 
         // this is the model to receive abox inferences
         Model inf = ModelFactory.createDefaultModel();
-        
+
 		// create the abox and add some data - no reasoning is happening yet
 		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 
@@ -364,7 +364,7 @@ public class SimpleReasonerInversePropertyTest extends SimpleReasonerTBoxHelper
         SimpleReasoner sr = new SimpleReasoner(tBox, aBox, inf);
         sr.setSameAsEnabled( sameAs );
 		aBox.register( sr );
-		
+
 		// add abox statements and verify inferences
 		aBox.add(b,Q,a);
 		Assert.assertFalse(inf.contains(b,Q,a));
@@ -374,7 +374,7 @@ public class SimpleReasonerInversePropertyTest extends SimpleReasonerTBoxHelper
 		Assert.assertTrue(inf.contains(a,P,b));  // now it gets added to inference model
 		                                         // when it's removed from the abox
 	}
-	
+
     @Test
     public void addTBoxInverseAssertion1Test() throws InterruptedException {
         addTBoxInverseAssertion1(true);
@@ -389,9 +389,9 @@ public class SimpleReasonerInversePropertyTest extends SimpleReasonerTBoxHelper
 	 * adding an inverseOf assertion to the tbox
 	 */
 	public void addTBoxInverseAssertion1(boolean sameAs) throws InterruptedException {
-         
+
 		// set up the tbox
-		OntModel tBox = createTBoxModel(); 
+		OntModel tBox = createTBoxModel();
 		OntProperty P = createObjectProperty(tBox, "http://test.vivo/P", "property P");
 		OntProperty Q = createObjectProperty(tBox, "http://test.vivo/Q", "property Q");
 
@@ -400,11 +400,11 @@ public class SimpleReasonerInversePropertyTest extends SimpleReasonerTBoxHelper
 
         // abox
 		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
-        
-		// set up SimpleReasoner and register it with abox. register 
+
+		// set up SimpleReasoner and register it with abox. register
 		// SimpleReasonerTBoxListener with the tbox.
         SimpleReasoner simpleReasoner = new SimpleReasoner(tBox, aBox, inf );
-        simpleReasoner.setSameAsEnabled( sameAs );        
+        simpleReasoner.setSameAsEnabled( sameAs );
 		aBox.register(simpleReasoner);
 		SimpleReasonerTBoxListener simpleReasonerTBoxListener = getTBoxListener(simpleReasoner);
 		tBox.register(simpleReasonerTBoxListener);
@@ -414,32 +414,32 @@ public class SimpleReasonerInversePropertyTest extends SimpleReasonerTBoxHelper
 		Resource b = aBox.createIndividual("http://test.vivo/b", OWL.Thing);
 		Resource c = aBox.createIndividual("http://test.vivo/c", OWL.Thing);
 		Resource d = aBox.createIndividual("http://test.vivo/d", OWL.Thing);
-				
-		aBox.add(a,P,b);	
+
+		aBox.add(a,P,b);
 	    aBox.add(c,P,d);
 	    aBox.add(b,Q,a);
-		
+
         // Assert P and Q as inverses and wait for
 	    // SimpleReasonerTBoxListener thread to end
-	    
+
 		setInverse(P, Q);
 
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
-	    	    
-		// Verify inferences	
+
+		// Verify inferences
 		Assert.assertTrue(inf.contains(d,Q,c));
 		Assert.assertFalse(inf.contains(b,Q,a));
 		Assert.assertFalse(inf.contains(a,P,b));
-		
+
 		simpleReasonerTBoxListener.setStopRequested();
 	}
-	
+
     @Test
     public void removeTBoxInverseAssertion1Test() throws InterruptedException {
         removeTBoxInverseAssertion1(true);
-    }	
+    }
 
     @Test
     public void removeTBoxInverseAssertion1NoSameAsTest() throws InterruptedException {
@@ -450,48 +450,48 @@ public class SimpleReasonerInversePropertyTest extends SimpleReasonerTBoxHelper
 	 * removing an inverseOf assertion from the tbox
 	 */
 	public void removeTBoxInverseAssertion1(boolean sameAs) throws InterruptedException {
-				
+
 		// set up the tbox
-		OntModel tBox = createTBoxModel(); 
+		OntModel tBox = createTBoxModel();
 		OntProperty P = createObjectProperty(tBox, "http://test.vivo/P", "property P");
 		OntProperty Q = createObjectProperty(tBox, "http://test.vivo/Q", "property Q");
 		setInverse(P, Q);
-	    
+
 		// this is the model to receive abox inferences
 		Model inf = ModelFactory.createDefaultModel();
 
 		// abox
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
-        
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
+
 		// set up SimpleReasoner and SimpleReasonerTBox listener,
 		// register them with abox and tbox
         SimpleReasoner simpleReasoner = new SimpleReasoner(tBox, aBox, inf);
-        simpleReasoner.setSameAsEnabled( sameAs );                         
+        simpleReasoner.setSameAsEnabled( sameAs );
 		aBox.register(simpleReasoner);
 		SimpleReasonerTBoxListener simpleReasonerTBoxListener = getTBoxListener(simpleReasoner);
-		tBox.register(simpleReasonerTBoxListener);	    
-		
+		tBox.register(simpleReasonerTBoxListener);
+
         // add statements to the abox and verify inference
 		Resource c = aBox.createIndividual("http://test.vivo/c", OWL.Thing);
 		Resource d = aBox.createIndividual("http://test.vivo/d", OWL.Thing);
 	    aBox.add(c,P,d);
 		Assert.assertTrue(inf.contains(d,Q,c));
-		
+
         // Remove P and Q inverse relationship and wait for
 	    // SimpleReasoner TBox thread to end.
-		
+
 	    removeInverse(P, Q);
-	    
+
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
- 	    
-		// Verify inference has been removed	
+
+		// Verify inference has been removed
 		Assert.assertFalse(inf.contains(d,Q,c));
-				
+
 		simpleReasonerTBoxListener.setStopRequested();
 	}
-	
+
     @Test
     public void recomputeABox1Test() throws InterruptedException {
         recomputeABox1(true);
@@ -506,9 +506,9 @@ public class SimpleReasonerInversePropertyTest extends SimpleReasonerTBoxHelper
 	 * Basic scenario around recomputing the ABox inferences
 	 */
 	public void recomputeABox1(boolean sameAs) throws InterruptedException {
-				
+
 		// set up the tbox
-		OntModel tBox = createTBoxModel(); 
+		OntModel tBox = createTBoxModel();
 		OntProperty P = createObjectProperty(tBox, "http://test.vivo/P", "property P");
 		OntProperty Q = createObjectProperty(tBox, "http://test.vivo/Q", "property Q");
 		setInverse(P, Q);
@@ -518,12 +518,12 @@ public class SimpleReasonerInversePropertyTest extends SimpleReasonerTBoxHelper
 
 		// create abox and abox inf model and register simplereasoner
 		// with abox.
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
-        Model inf = ModelFactory.createDefaultModel();		
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
+        Model inf = ModelFactory.createDefaultModel();
         SimpleReasoner simpleReasoner = new SimpleReasoner(tBox, aBox, inf);
         simpleReasoner.setSameAsEnabled( sameAs );
 		aBox.register(simpleReasoner);
-		
+
         // abox statements
 		Resource a = aBox.createIndividual("http://test.vivo/a", OWL.Thing);
 		Resource b = aBox.createIndividual("http://test.vivo/b", OWL.Thing);
@@ -532,44 +532,44 @@ public class SimpleReasonerInversePropertyTest extends SimpleReasonerTBoxHelper
 
 	    aBox.add(a,P,b);
         aBox.add(c,X,d);
-	    
+
 		Assert.assertTrue(inf.contains(b,Q,a));
-		Assert.assertTrue(inf.contains(d,Y,c));		
-		
+		Assert.assertTrue(inf.contains(d,Y,c));
+
         inf.remove(b,Q,a);
         inf.remove(d,Y,c);
-        
+
         //recompute whole abox
 	    simpleReasoner.recompute();
-	    
+
 	    while (simpleReasoner.isRecomputing()) {
 	    	Thread.sleep(delay);
 	    }
- 	    
-		// Verify inferences	
+
+		// Verify inferences
 		Assert.assertTrue(inf.contains(b,Q,a));
-		Assert.assertTrue(inf.contains(d,Y,c));				
+		Assert.assertTrue(inf.contains(d,Y,c));
 	}
 
 	//==================================== Utility methods ====================
 	SimpleReasonerTBoxListener getTBoxListener(SimpleReasoner simpleReasoner) {
 	    return new SimpleReasonerTBoxListener(simpleReasoner, new Exception().getStackTrace()[1].getMethodName());
 	}
-		
+
 	// To help in debugging the unit test
 	void printModel(Model model, String modelName) {
-	    
+
 		System.out.println("\nThe " + modelName + " model has " + model.size() + " statements:");
 		System.out.println("---------------------------------------------------------------------");
-		model.write(System.out);		
+		model.write(System.out);
 	}
-	
+
 	// To help in debugging the unit test
 	void printModel(OntModel ontModel, String modelName) {
-	    
+
 		System.out.println("\nThe " + modelName + " model has " + ontModel.size() + " statements:");
 		System.out.println("---------------------------------------------------------------------");
 		ontModel.writeAll(System.out,"N3",null);
-		
+
 	}
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerPluginTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerPluginTest.java
index c763f1153..af4328542 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerPluginTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerPluginTest.java
@@ -24,18 +24,18 @@ import org.apache.jena.vocabulary.RDFS;
 
 public class SimpleReasonerPluginTest extends SimpleReasonerTBoxHelper {
 	long delay = 50;
-	
+
 	private final static String DEFAULT_NS = "http://vivoweb.org/individual/";
-	
+
 	private final static String DCTERMS_NS = "http://purl.org/dc/terms/";
 	private final static String VIVOCORE_NS = "http://vivoweb.org/ontology/core#";
-	
+
 	private final static String creator_URI = DCTERMS_NS + "creator";
 	private final static String authorInAuthorship_URI = VIVOCORE_NS + "authorInAuthorship";
 	private final static String linkedAuthor_URI = VIVOCORE_NS + "linkedAuthor";
 	private final static String informationResourceInAuthorship_URI = VIVOCORE_NS + "informationResourceInAuthorship";
 	private final static String linkedInformationResource_URI = VIVOCORE_NS + "linkedInformationResource";
-		
+
 	@Before
 	public void suppressErrorOutput() {
 		//suppressSyserr();
@@ -43,43 +43,43 @@ public class SimpleReasonerPluginTest extends SimpleReasonerTBoxHelper {
 		setLoggerLevel(SimpleReasoner.class, Level.DEBUG);
 		setLoggerLevel(SimpleReasonerTBoxListener.class, Level.DEBUG);
 	}
-	
+
 	/*
 	* testing samplePlugin - based on dcterms:creator plugin
-	* 
+	*
 	*/
 	@Test
 	public void test1()  {
-		OntModel tBox = createTBoxModel(); 
-		
+		OntModel tBox = createTBoxModel();
+
 		OntProperty authorInAuthorship = tBox.createObjectProperty(authorInAuthorship_URI);
 		OntProperty linkedAuthor = tBox.createObjectProperty(linkedAuthor_URI);
 		OntProperty informationResourceInAuthorship = tBox.createObjectProperty(informationResourceInAuthorship_URI);
 		OntProperty linkedInformationResource = tBox.createObjectProperty(linkedInformationResource_URI);
-		
+
 		authorInAuthorship.addInverseOf(linkedAuthor);
 		informationResourceInAuthorship.addInverseOf(linkedInformationResource);
-				
+
 		Literal title1 = tBox.createLiteral("My Findings");
 		Literal name1 = tBox.createLiteral("Priscilla Powers");
-		
+
         // this is the model to receive inferences
         Model inf = ModelFactory.createDefaultModel();
-        
+
 		// create an ABox and register the SimpleReasoner listener with it
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		SimpleReasoner simpleReasoner = new SimpleReasoner(tBox, aBox, inf);
 		aBox.register(simpleReasoner);
-	
+
 		// register plugin with SimpleReasoner
-		List<ReasonerPlugin> pluginList = new ArrayList<ReasonerPlugin>();	
+		List<ReasonerPlugin> pluginList = new ArrayList<ReasonerPlugin>();
 		String pluginClassName = "edu.cornell.mannlib.vitro.webapp.reasoner.plugin.SamplePlugin";
-		
+
 		try {
 		    ReasonerPlugin plugin = (ReasonerPlugin) Class.forName(pluginClassName).getConstructors()[0].newInstance();
 		    plugin.setSimpleReasoner(simpleReasoner);
 		    pluginList.add(plugin);
-	        simpleReasoner.setPluginList(pluginList);		
+	        simpleReasoner.setPluginList(pluginList);
 		} catch (Exception e) {
 			System.out.println("Exception trying to instantiate plugin: " + e.getMessage());
 			e.printStackTrace();
@@ -87,56 +87,56 @@ public class SimpleReasonerPluginTest extends SimpleReasonerTBoxHelper {
 		}
 
 		Property dctermsCreator = ResourceFactory.createProperty(creator_URI);
-		
-        // add abox data for person, authorship and article.	
+
+        // add abox data for person, authorship and article.
 		// note, they aren't actually typed in this test tbox
 		Resource prissy = aBox.createResource(DEFAULT_NS + "prissy");
-	
+
 		// assert same as
-		
+
 		Resource authorship1 = aBox.createResource(DEFAULT_NS + "authorship1");
 		Resource article1 = aBox.createResource(DEFAULT_NS + "article1");
-		Resource article100 = aBox.createResource(DEFAULT_NS + "article100");		
-		
+		Resource article100 = aBox.createResource(DEFAULT_NS + "article100");
+
 		aBox.add(prissy,RDFS.label,name1);
 		aBox.add(prissy,authorInAuthorship,authorship1);
-		
+
 		aBox.add(authorship1,linkedAuthor,prissy);
 		aBox.add(authorship1,linkedInformationResource,article1);
-		
+
 		aBox.add(article1,RDFS.label,title1);
 		aBox.add(article1,informationResourceInAuthorship,authorship1);
         aBox.add(article1, OWL.sameAs, article100);
 
 		Assert.assertTrue(inf.contains(article1,dctermsCreator,prissy));
-		Assert.assertTrue(inf.contains(article100,dctermsCreator,prissy));	
-		
+		Assert.assertTrue(inf.contains(article100,dctermsCreator,prissy));
+
 		aBox.remove(authorship1,linkedAuthor,prissy);
-		
+
 		Assert.assertFalse(inf.contains(article1,dctermsCreator,prissy));
-		Assert.assertFalse(inf.contains(article100,dctermsCreator,prissy));				
+		Assert.assertFalse(inf.contains(article100,dctermsCreator,prissy));
 	}
-			
-	
+
+
 	//==================================== Utility methods ====================
 	SimpleReasonerTBoxListener getTBoxListener(SimpleReasoner simpleReasoner) {
 	    return new SimpleReasonerTBoxListener(simpleReasoner, new Exception().getStackTrace()[1].getMethodName());
 	}
-		
+
 	// To help in debugging the unit test
 	void printModel(Model model, String modelName) {
-	    
+
 		System.out.println("\nThe " + modelName + " model has " + model.size() + " statements:");
 		System.out.println("---------------------------------------------------------------------");
-		model.write(System.out);		
+		model.write(System.out);
 	}
-	
+
 	// To help in debugging the unit test
 	void printModel(OntModel ontModel, String modelName) {
-	    
+
 		System.out.println("\nThe " + modelName + " model has " + ontModel.size() + " statements:");
 		System.out.println("---------------------------------------------------------------------");
 		ontModel.writeAll(System.out,"N3",null);
-		
+
 	}
-}
\ No newline at end of file
+}
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerSameAsTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerSameAsTest.java
index 8f006fb41..c079b07ce 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerSameAsTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerSameAsTest.java
@@ -24,10 +24,10 @@ import org.apache.jena.vocabulary.RDF;
 import edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread;
 
 public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
-	
+
 	long delay = 50;
 	private static final String mostSpecificTypePropertyURI = "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#mostSpecificType";
-	
+
 	@Before
 	public void suppressErrorOutput() {
 		suppressSyserr();
@@ -36,33 +36,33 @@ public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
 		setLoggerLevel(SimpleReasonerTBoxListener.class, Level.OFF);
 		setLoggerLevel(ABoxRecomputer.class, Level.OFF);
 	}
-	
+
 	/*
-	* basic scenario of adding an abox sameAs assertion 
+	* basic scenario of adding an abox sameAs assertion
 	//*/
 	@Test
 	public void addSameAsABoxAssertion1() {
-		OntModel tBox = createTBoxModel(); 
+		OntModel tBox = createTBoxModel();
 		OntProperty P = createObjectProperty(tBox, "http://test.vivo/P", "property P");
 		OntProperty Q = createObjectProperty(tBox, "http://test.vivo/Q", "property Q");
 		OntProperty S = createObjectProperty(tBox, "http://test.vivo/S", "property S");
 		OntProperty T = createObjectProperty(tBox, "http://test.vivo/T", "property T");
 		Literal literal1 = tBox.createLiteral("Literal value 1");
 		Literal literal2 = tBox.createLiteral("Literal value 2");
-		
+
         // this is the model to receive inferences
         Model inf = ModelFactory.createDefaultModel();
-        
+
 		// create an ABox and register the SimpleReasoner listener with it
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		aBox.register(new SimpleReasoner(tBox, aBox, inf));
-		
+
         // Individuals a, b, c and d
 		Resource a = aBox.createResource("http://test.vivo/a");
 		Resource b = aBox.createResource("http://test.vivo/b");
 		Resource c = aBox.createResource("http://test.vivo/c");
 		Resource d = aBox.createResource("http://test.vivo/d");
-		
+
 		aBox.add(a,P,c);
 		aBox.add(a,S,literal1);
 		aBox.add(b,Q,d);
@@ -80,19 +80,19 @@ public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
 		Assert.assertFalse(aBox.contains(b,S,literal1));
 		Assert.assertFalse(aBox.contains(a,Q,d));
 		Assert.assertFalse(aBox.contains(a,T,literal2));
-        
+
         //run same test with sameAs = false
         inf = ModelFactory.createDefaultModel();
-        aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+        aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
         SimpleReasoner sres = new SimpleReasoner(tBox,aBox,inf);
         sres.setSameAsEnabled( false );
 		aBox.register(sres);
-		
+
 		a = aBox.createResource("http://test.vivo/a");
 		b = aBox.createResource("http://test.vivo/b");
 		c = aBox.createResource("http://test.vivo/c");
 		d = aBox.createResource("http://test.vivo/d");
-		
+
         aBox.add(a,P,c);
 		aBox.add(a,S,literal1);
 		aBox.add(b,Q,d);
@@ -112,39 +112,39 @@ public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
 		Assert.assertFalse(aBox.contains(a,Q,d));
 		Assert.assertFalse(aBox.contains(a,T,literal2));
 	}
-			
+
 	/*
-	* basic scenario of removing an abox sameAs assertion  
+	* basic scenario of removing an abox sameAs assertion
 	*/
 	@Test
 	public void removeSameAsABoxAssertion1() {
-		OntModel tBox = createTBoxModel(); 
+		OntModel tBox = createTBoxModel();
 		OntProperty P = createObjectProperty(tBox, "http://test.vivo/P", "property P");
 		OntProperty Q = createObjectProperty(tBox, "http://test.vivo/Q", "property Q");
 		OntProperty S = createObjectProperty(tBox, "http://test.vivo/S", "property S");
 		OntProperty T = createObjectProperty(tBox, "http://test.vivo/T", "property T");
 		Literal literal1 = tBox.createLiteral("Literal value 1");
 		Literal literal2 = tBox.createLiteral("Literal value 2");
-		
+
         // this is the model to receive inferences
         Model inf = ModelFactory.createDefaultModel();
-        
+
 		// create an ABox and register the SimpleReasoner listener with it
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		aBox.register(new SimpleReasoner(tBox, aBox, inf));
-		
+
         // Individuals a, b, c and d
 		Resource a = aBox.createResource("http://test.vivo/a");
 		Resource b = aBox.createResource("http://test.vivo/b");
 		Resource c = aBox.createResource("http://test.vivo/c");
 		Resource d = aBox.createResource("http://test.vivo/d");
-		
+
 		aBox.add(a,P,c);
 		aBox.add(a,S,literal1);
 		aBox.add(b,Q,d);
 		aBox.add(b,T,literal2);
 		aBox.add(a,OWL.sameAs,b);
-		
+
 		Assert.assertTrue(inf.contains(b,OWL.sameAs,a));
 		Assert.assertTrue(inf.contains(b,P,c));
 		Assert.assertTrue(inf.contains(b,S,literal1));
@@ -152,34 +152,34 @@ public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
 		Assert.assertTrue(inf.contains(a,T,literal2));
 
 		aBox.remove(a,OWL.sameAs,b);
-		
+
 		Assert.assertFalse(inf.contains(b,OWL.sameAs,a));
 		Assert.assertFalse(inf.contains(b,P,c));
 		Assert.assertFalse(inf.contains(b,S,literal1));
 		Assert.assertFalse(inf.contains(a,Q,d));
 		Assert.assertFalse(inf.contains(a,T,literal2));
 	}
-	
+
 	/*
 	* adding abox assertion for individual in sameAs chain.
 	*/
 	@Test
 	public void addABoxAssertion1() {
-		OntModel tBox = createTBoxModel(); 
+		OntModel tBox = createTBoxModel();
 		OntProperty P = createObjectProperty(tBox, "http://test.vivo/P", "property P");
 		OntProperty Q = createObjectProperty(tBox, "http://test.vivo/Q", "property Q");
 		OntProperty S = createObjectProperty(tBox, "http://test.vivo/S", "property S");
 		OntProperty T = createObjectProperty(tBox, "http://test.vivo/T", "property T");
 		Literal literal1 = tBox.createLiteral("Literal value 1");
 		Literal literal2 = tBox.createLiteral("Literal value 2");
-		
+
         // this is the model to receive inferences
         Model inf = ModelFactory.createDefaultModel();
-        
+
 		// create an ABox and register the SimpleReasoner listener with it
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		aBox.register(new SimpleReasoner(tBox, aBox, inf));
-		
+
         // Individuals a, b, c and d
 		Resource a = aBox.createResource("http://test.vivo/a");
 		Resource b = aBox.createResource("http://test.vivo/b");
@@ -187,7 +187,7 @@ public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
 		Resource d = aBox.createResource("http://test.vivo/d");
 		Resource e = aBox.createResource("http://test.vivo/e");
 		Resource f = aBox.createResource("http://test.vivo/f");
-		
+
 		aBox.add(a,OWL.sameAs,b);
 		aBox.add(b,OWL.sameAs,e);
 		aBox.add(e,OWL.sameAs,f);
@@ -202,12 +202,12 @@ public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
 		Assert.assertTrue(inf.contains(b,OWL.sameAs,f));
 		Assert.assertTrue(inf.contains(a,OWL.sameAs,f));
 
-		
+
 		aBox.add(a,P,c);
 		aBox.add(a,S,literal1);
 		aBox.add(b,Q,d);
 		aBox.add(b,T,literal2);
-	
+
 		Assert.assertTrue(inf.contains(b,P,c));
 		Assert.assertTrue(inf.contains(b,S,literal1));
 		Assert.assertTrue(inf.contains(a,Q,d));
@@ -220,7 +220,7 @@ public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
 		Assert.assertTrue(inf.contains(f,S,literal1));
 		Assert.assertTrue(inf.contains(f,Q,d));
 		Assert.assertTrue(inf.contains(f,T,literal2));
-		
+
 		aBox.remove(b,OWL.sameAs,e);
 
 		Assert.assertTrue(inf.contains(b,OWL.sameAs,a));
@@ -244,7 +244,7 @@ public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
 		Assert.assertFalse(inf.contains(f,P,c));
 		Assert.assertFalse(inf.contains(f,S,literal1));
 		Assert.assertFalse(inf.contains(f,Q,d));
-		Assert.assertFalse(inf.contains(f,T,literal2));		
+		Assert.assertFalse(inf.contains(f,T,literal2));
 	}
 
     /**
@@ -252,27 +252,27 @@ public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
      */
 	@Test
 	public void disabledSameAs() {
-		OntModel tBox = createTBoxModel(); 
+		OntModel tBox = createTBoxModel();
 		OntProperty P = createObjectProperty(tBox, "http://test.vivo/P", "property P");
 		OntProperty Q = createObjectProperty(tBox, "http://test.vivo/Q", "property Q");
 		OntProperty S = createObjectProperty(tBox, "http://test.vivo/S", "property S");
 		OntProperty T = createObjectProperty(tBox, "http://test.vivo/T", "property T");
 		Literal literal1 = tBox.createLiteral("Literal value 1");
 		Literal literal2 = tBox.createLiteral("Literal value 2");
-		
+
         // this is the model to receive inferences
         Model inf = ModelFactory.createDefaultModel();
-        
+
 		// create an ABox and register the SimpleReasoner listener with it
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		aBox.register(new SimpleReasoner(tBox, aBox, inf));
-		
+
         // Individuals a, b, c and d
 		Resource a = aBox.createResource("http://test.vivo/a");
 		Resource b = aBox.createResource("http://test.vivo/b");
 		Resource c = aBox.createResource("http://test.vivo/c");
 		Resource d = aBox.createResource("http://test.vivo/d");
-		
+
 		aBox.add(a,P,c);
 		aBox.add(a,S,literal1);
 		aBox.add(b,Q,d);
@@ -290,19 +290,19 @@ public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
 		Assert.assertFalse(aBox.contains(b,S,literal1));
 		Assert.assertFalse(aBox.contains(a,Q,d));
 		Assert.assertFalse(aBox.contains(a,T,literal2));
-        
+
         //run same test with sameAs = false
         inf = ModelFactory.createDefaultModel();
-        aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+        aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
         SimpleReasoner sres = new SimpleReasoner(tBox,aBox,inf);
         sres.setSameAsEnabled( false );
 		aBox.register(sres);
-		
+
 		a = aBox.createResource("http://test.vivo/a");
 		b = aBox.createResource("http://test.vivo/b");
 		c = aBox.createResource("http://test.vivo/c");
 		d = aBox.createResource("http://test.vivo/d");
-		
+
         aBox.add(a,P,c);
 		aBox.add(a,S,literal1);
 		aBox.add(b,Q,d);
@@ -328,90 +328,90 @@ public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
 	*/
 	@Test
 	public void addABoxAssertion2() {
-		OntModel tBox = createTBoxModel(); 
-			     		
+		OntModel tBox = createTBoxModel();
+
 		OntProperty desc = tBox.createDatatypeProperty("http://test.vivo/desc");
 		desc.setLabel("property desc", "en-US");
-		
+
 		Literal desc1 = tBox.createLiteral("individual 1");
 		Literal desc2 = tBox.createLiteral("individual 2");
-		
+
         // this is the model to receive inferences
         Model inf = ModelFactory.createDefaultModel();
-        
+
 		// create an ABox and register the SimpleReasoner listener with it
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		aBox.register(new SimpleReasoner(tBox, aBox, inf));
-		
+
         // Individuals a and b
 		Resource a = aBox.createResource("http://test.vivo/a");
 		Resource b = aBox.createResource("http://test.vivo/b");
-		
+
 		aBox.add(a,desc,desc1);
 		aBox.add(b,desc,desc2);
 		aBox.add(a,OWL.sameAs,b);
-	
+
 		Assert.assertTrue(inf.contains(a,desc,desc2));
 		Assert.assertTrue(inf.contains(b,desc,desc1));
 		Assert.assertTrue(inf.contains(b,OWL.sameAs,a));
 	}
-	
+
 	/*
 	* basic scenario of removing an abox assertion for
-	* an individual is sameAs another. 
+	* an individual is sameAs another.
 	*/
 	@Test
 	public void removeABoxAssertion1() {
-		OntModel tBox = createTBoxModel(); 
+		OntModel tBox = createTBoxModel();
 		OntProperty P = createObjectProperty(tBox, "http://test.vivo/P", "property P");
 		OntProperty Q = createObjectProperty(tBox, "http://test.vivo/Q", "property Q");
 		OntProperty S = createObjectProperty(tBox, "http://test.vivo/S", "property S");
 		OntProperty T = createObjectProperty(tBox, "http://test.vivo/T", "property T");
 		Literal literal1 = tBox.createLiteral("Literal value 1");
 		Literal literal2 = tBox.createLiteral("Literal value 2");
-		
+
         // this is the model to receive inferences
         Model inf = ModelFactory.createDefaultModel();
-        
+
 		// create an ABox and register the SimpleReasoner listener with it
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		aBox.register(new SimpleReasoner(tBox, aBox, inf));
-		
+
         // Individuals a, b, c and d
 		Resource a = aBox.createResource("http://test.vivo/a");
 		Resource b = aBox.createResource("http://test.vivo/b");
 		Resource c = aBox.createResource("http://test.vivo/c");
 		Resource d = aBox.createResource("http://test.vivo/d");
-		
+
 		aBox.add(a,P,c);
 		aBox.add(a,S,literal1);
 		aBox.add(b,Q,d);
 		aBox.add(b,T,literal2);
 		aBox.add(a,OWL.sameAs,b);
-		
+
 		aBox.remove(a,P,c);
 		aBox.remove(a,S,literal1);
 
 		Assert.assertFalse(inf.contains(b,P,c));
 		Assert.assertFalse(inf.contains(b,S,literal1));
 	}
-	
+
 	/*
 	 * adding and removing an inverseOf assertion for individuals who
 	 * are sameAs each other.
 	 */
 	@Test
 	public void tBoxInverseAssertion1() throws InterruptedException {
-		OntModel tBox = createTBoxModel(); 
+		OntModel tBox = createTBoxModel();
 		OntProperty P = createObjectProperty(tBox, "http://test.vivo/P", "property P");
 		OntProperty Q = createObjectProperty(tBox, "http://test.vivo/Q", "property Q");
 
 		// Create ABox and Inference models and register
 		// the ABox reasoner listeners with the ABox and TBox
 
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
         Model inf = ModelFactory.createDefaultModel();
-		
+
         SimpleReasoner simpleReasoner = new SimpleReasoner(tBox, aBox, inf);
 		aBox.register(simpleReasoner);
 		SimpleReasonerTBoxListener simpleReasonerTBoxListener = getTBoxListener(simpleReasoner);
@@ -420,17 +420,17 @@ public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
         // Individuals a and b
 		Resource a = aBox.createResource("http://test.vivo/a");
 		Resource b = aBox.createResource("http://test.vivo/b");
-		
-        // abox statements			
-		aBox.add(a,P,b);	
+
+        // abox statements
+		aBox.add(a,P,b);
         aBox.add(a, OWL.sameAs,b);
-			    
+
 	    setInverse(Q, P);
-	    
+
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
-	    	    	
+
 		Assert.assertTrue(inf.contains(b,Q,a));
 		Assert.assertTrue(inf.contains(b,OWL.sameAs,a));
 		Assert.assertTrue(inf.contains(b,P,b));
@@ -446,11 +446,11 @@ public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
 		Assert.assertTrue(inf.contains(b,OWL.sameAs,a));
 		Assert.assertTrue(inf.contains(b,P,b));
 		Assert.assertFalse(inf.contains(a,Q,a));
-		
+
 		simpleReasonerTBoxListener.setStopRequested();
 	}
-	
-	
+
+
 	/*
 	 * adding and removing a type assertion for an individual who has
 	 * a sameAs individual.
@@ -458,31 +458,31 @@ public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
 	@Test
 	public void tBoxTypeAssertion1() {
 		// Create a Tbox with a simple class hierarchy. B is a subclass of A.
-		OntModel tBox = createTBoxModel(); 
-		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A"); 
-		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B"); 
+		OntModel tBox = createTBoxModel();
+		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A");
+		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B");
 	    addSubclass(classA, classB);
-	            
+
         // this is the model to receive inferences
         Model inf = ModelFactory.createDefaultModel();
-        
+
 		// create an ABox and register the SimpleReasoner listener with it
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		aBox.register(new SimpleReasoner(tBox, aBox, inf));
-		
+
 		Resource x = aBox.createResource("http://test.vivo/x");
 		Resource y = aBox.createResource("http://test.vivo/y");
 		Resource z = aBox.createResource("http://test.vivo/z");
-		
+
        	aBox.add(x,OWL.sameAs,y);
        	aBox.add(y,OWL.sameAs,z);
-		aBox.add(x,RDF.type,classB);		
-	
+		aBox.add(x,RDF.type,classB);
+
 		Assert.assertTrue(inf.contains(y,RDF.type,classB));
 		Assert.assertTrue(inf.contains(y,RDF.type,classA));
 		Assert.assertTrue(inf.contains(z,RDF.type,classB));
 		Assert.assertTrue(inf.contains(z,RDF.type,classA));
-		
+
 		aBox.remove(x,RDF.type,classB);
 		Assert.assertFalse(inf.contains(y,RDF.type,classB));
 		Assert.assertFalse(inf.contains(y,RDF.type,classA));
@@ -491,21 +491,21 @@ public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
 	}
 
 	/*
-	 * adding and removing subclass assertion when there is an 
+	 * adding and removing subclass assertion when there is an
 	 * individual member who has a sameAs individual.
 	 */
 	@Test
 	public void tBoxSubclassAssertion1() throws InterruptedException {
 		// Create a Tbox with a simple class hierarchy. B is a subclass of A.
-		OntModel tBox = createTBoxModel(); 
-		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A"); 
-		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B"); 
-		OntClass classC = createClass(tBox, "http://test.vivo/C", "class C"); 
+		OntModel tBox = createTBoxModel();
+		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A");
+		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B");
+		OntClass classC = createClass(tBox, "http://test.vivo/C", "class C");
 
 		//create aBox and SimpleReasoner to listen to them
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
         Model inf = ModelFactory.createDefaultModel();
-		
+
         SimpleReasoner simpleReasoner = new SimpleReasoner(tBox, aBox, inf);
 		aBox.register(simpleReasoner);
 		SimpleReasonerTBoxListener simpleReasonerTBoxListener = getTBoxListener(simpleReasoner);
@@ -515,31 +515,31 @@ public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
 		Resource a = aBox.createResource("http://test.vivo/a");
 		Resource b = aBox.createResource("http://test.vivo/b");
 		Resource c = aBox.createResource("http://test.vivo/c");
-		
-		aBox.add(a, RDF.type, classC);		
+
+		aBox.add(a, RDF.type, classC);
 	    aBox.add(a, OWL.sameAs, b);
 	    aBox.add(c, OWL.sameAs, a);
-			    
+
 	    // update TBox
 	    addSubclass(classA, classB);
-	    	    
+
 	    // wait for SimpleReasonerTBoxListener thread to end
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
-	    
+
 	    addSubclass(classB, classC);
-	    	    
+
 	    // wait for SimpleReasonerTBoxListener thread to end
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
-	    
+
 		// Verify inferences
 		Assert.assertFalse(inf.contains(a, RDF.type, classC));
 		Assert.assertTrue(inf.contains(a, RDF.type, classB));
 		Assert.assertTrue(inf.contains(a, RDF.type, classA));
-		
+
 		Assert.assertTrue(inf.contains(b, RDF.type, classC));
 		Assert.assertTrue(inf.contains(b, RDF.type, classB));
 		Assert.assertTrue(inf.contains(b, RDF.type, classA));
@@ -555,12 +555,12 @@ public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
-	    
-		// Verify inferences	
+
+		// Verify inferences
 		Assert.assertFalse(inf.contains(a, RDF.type, classC));
 		Assert.assertTrue(inf.contains(a, RDF.type, classB));
 		Assert.assertFalse(inf.contains(a, RDF.type, classA));
-		
+
 		Assert.assertTrue(inf.contains(b, RDF.type, classC));
 		Assert.assertTrue(inf.contains(b, RDF.type, classB));
 		Assert.assertFalse(inf.contains(b, RDF.type, classA));
@@ -568,20 +568,20 @@ public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
 		Assert.assertTrue(inf.contains(c, RDF.type, classC));
 		Assert.assertTrue(inf.contains(c, RDF.type, classB));
 		Assert.assertFalse(inf.contains(c, RDF.type, classA));
-	    
+
 	    // update TBox
 		removeSubclass(classB, classC);
-	    
+
 	    // wait for SimpleReasonerTBoxListener thread to end
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
-	    
-		// Verify inferences	
+
+		// Verify inferences
 		Assert.assertFalse(inf.contains(a, RDF.type, classC));
 		Assert.assertFalse(inf.contains(a, RDF.type, classB));
 		Assert.assertFalse(inf.contains(a, RDF.type, classA));
-		
+
 		Assert.assertTrue(inf.contains(b, RDF.type, classC));
 		Assert.assertFalse(inf.contains(b, RDF.type, classB));
 		Assert.assertFalse(inf.contains(b, RDF.type, classA));
@@ -591,17 +591,17 @@ public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
 		Assert.assertFalse(inf.contains(c, RDF.type, classA));
 
 		simpleReasonerTBoxListener.setStopRequested();
-	}	
+	}
 
 	/*
-	 * test that mostSpecificType inferences propagate to sameAs 
+	 * test that mostSpecificType inferences propagate to sameAs
 	 * individuals
 	 */
 	@Test
 	public void mostSpecificTypeTest1() {
 		// Create a Tbox with a simple class hierarchy. B is a subclass of A.
-		OntModel tBox = createTBoxModel(); 
-		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A"); 
+		OntModel tBox = createTBoxModel();
+		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A");
 		OntClass classC = createClass(tBox, "http://test.vivo/C", "class C");
 		OntClass classD = createClass(tBox, "http://test.vivo/D", "class D");
 		OntClass classE = createClass(tBox, "http://test.vivo/E", "class E");
@@ -616,14 +616,14 @@ public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
 
 		// this will receive the abox inferences
         Model inf = ModelFactory.createDefaultModel();
-        
-        // abox
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
 
-        // set up SimpleReasoner and register it with abox		
+        // abox
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
+
+        // set up SimpleReasoner and register it with abox
         SimpleReasoner simpleReasoner = new SimpleReasoner(tBox, aBox, inf);
 		aBox.register(simpleReasoner);
-	    
+
         // add & remove ABox type statements and verify inferences
 		Resource a = aBox.createResource("http://test.vivo/a");
 		Resource b = aBox.createResource("http://test.vivo/b");
@@ -633,11 +633,11 @@ public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
 		// Assert a, b, c and d are the same
 		aBox.add(a, OWL.sameAs, b);
 		aBox.add(c, OWL.sameAs, b);
-		aBox.add(d, OWL.sameAs, a);		
+		aBox.add(d, OWL.sameAs, a);
 
 		// Assert a is D, and d ic C
 		// All resources will therefore be C and D
-		aBox.add(a, RDF.type, classD);	
+		aBox.add(a, RDF.type, classD);
 		aBox.add(d, RDF.type, classC);
 
 		// All resources should be inferred as C and D, except a and d which have direct assertions
@@ -677,86 +677,86 @@ public class SimpleReasonerSameAsTest extends SimpleReasonerTBoxHelper {
 		Assert.assertFalse(inf.contains(b, mostSpecificType, ResourceFactory.createResource(classD.getURI())));
 		Assert.assertFalse(inf.contains(c, mostSpecificType, ResourceFactory.createResource(classD.getURI())));
 		Assert.assertFalse(inf.contains(d, mostSpecificType, ResourceFactory.createResource(classD.getURI())));
-	}	
+	}
 
 	/*
 	 * Basic scenario around recomputing the ABox inferences
 	 */
 	@Test
 	public void recomputeABox1() throws InterruptedException {
-		OntModel tBox = createTBoxModel(); 
+		OntModel tBox = createTBoxModel();
 		OntProperty P = createObjectProperty(tBox, "http://test.vivo/P", "property P");
 		OntProperty Q = createObjectProperty(tBox, "http://test.vivo/Q", "property Q");
 		OntProperty S = createObjectProperty(tBox, "http://test.vivo/S", "property S");
 		OntProperty T = createObjectProperty(tBox, "http://test.vivo/T", "property T");
 		Literal literal1 = tBox.createLiteral("Literal value 1");
 		Literal literal2 = tBox.createLiteral("Literal value 2");
-		
+
         // this is the model to receive inferences
         Model inf = ModelFactory.createDefaultModel();
-        
+
 		// create an ABox and register the SimpleReasoner listener with it
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		SimpleReasoner simpleReasoner = new SimpleReasoner(tBox, aBox, inf);
 		aBox.register(simpleReasoner);
-		
+
         // Individuals a, b, c and d
 		Resource a = aBox.createIndividual("http://test.vivo/a", OWL.Thing);
 		Resource b = aBox.createIndividual("http://test.vivo/b", OWL.Thing);
 		Resource c = aBox.createIndividual("http://test.vivo/c", OWL.Thing);
 		Resource d = aBox.createIndividual("http://test.vivo/d", OWL.Thing);
-		
+
 		aBox.add(a,P,c);
 		aBox.add(a,S,literal1);
 		aBox.add(b,Q,d);
 		aBox.add(b,T,literal2);
 		aBox.add(a,OWL.sameAs,b);
-           
+
 		Assert.assertTrue(inf.contains(b,OWL.sameAs,a));
 		Assert.assertTrue(inf.contains(b,P,c));
 		Assert.assertTrue(inf.contains(b,S,literal1));
 		Assert.assertTrue(inf.contains(a,Q,d));
 		Assert.assertTrue(inf.contains(a,T,literal2));
-		
+
 		inf.remove(b,OWL.sameAs,a);
 		inf.remove(b,P,c);
 		inf.remove(b,S,literal1);
 		inf.remove(a,Q,d);
 		inf.remove(a,T,literal2);
-		
+
 	    simpleReasoner.recompute();
-	    
+
 	    while (simpleReasoner.isRecomputing()) {
 	    	Thread.sleep(delay);
 	    }
- 	    
-		// Verify inferences	
+
+		// Verify inferences
 		Assert.assertTrue(inf.contains(b,OWL.sameAs,a));
 		Assert.assertTrue(inf.contains(b,P,c));
 		Assert.assertTrue(inf.contains(b,S,literal1));
 		Assert.assertTrue(inf.contains(a,Q,d));
 		Assert.assertTrue(inf.contains(a,T,literal2));
 	}
-	
+
 	//==================================== Utility methods ====================
 	SimpleReasonerTBoxListener getTBoxListener(SimpleReasoner simpleReasoner) {
 	    return new SimpleReasonerTBoxListener(simpleReasoner, new Exception().getStackTrace()[1].getMethodName());
 	}
-		
+
 	// To help in debugging the unit test
 	void printModel(Model model, String modelName) {
-	    
+
 		System.out.println("\nThe " + modelName + " model has " + model.size() + " statements:");
 		System.out.println("---------------------------------------------------------------------");
-		model.write(System.out);		
+		model.write(System.out);
 	}
-	
+
 	// To help in debugging the unit test
 	void printModel(OntModel ontModel, String modelName) {
-	    
+
 		System.out.println("\nThe " + modelName + " model has " + ontModel.size() + " statements:");
 		System.out.println("---------------------------------------------------------------------");
 		ontModel.writeAll(System.out,"N3",null);
-		
+
 	}
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTBoxHelper.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTBoxHelper.java
index 82343c866..28ec9f214 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTBoxHelper.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTBoxHelper.java
@@ -17,23 +17,23 @@ import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
 /**
  * We're using a simple OntModel as the TBox in the SimpleReasoner tests, so we
  * don't get tied to a particular TBox reasoner (like Pellet).
- * 
+ *
  * But the SimpleReasoner expects certain elementary reasoning, so these methods
  * impose that reasoning on the model.
- * 
+ *
  * On the model: Thing is a class.
- * 
+ *
  * On classes: Every class is equivalent to itself, a subclass of itself, and a
  * subclass of Thing. Every class is a subclass of all its ancestors and a
  * superclass of all its descendants. Every class has the same superclasses and
  * subclasses as do all of its equivalent classes.
- * 
+ *
  * On object properties: Every object property is equivalent to itself and a
  * subproperty of itself. Every object property has the same inverses as do all
  * of its equivalent properties.
- * 
+ *
  * ----------------------
- * 
+ *
  * It's a little silly to implement this as a parent class of the unit tests. It
  * would have been nicer to find a way that is more object-oriented but still
  * explicit in what "reasoning" is performed. This will do for now.
@@ -135,15 +135,15 @@ public class SimpleReasonerTBoxHelper extends AbstractTestClass {
 
 	/**
 	 * This has the potential for problems if we set this up:
-	 * 
+	 *
 	 * <pre>
 	 * A -> B -> C
-	 * 
+	 *
 	 * explicit add A -> C
-	 * 
+	 *
 	 * remove A -> B
 	 * </pre>
-	 * 
+	 *
 	 * But why would we do that?
 	 */
 	private void removeSubclass(Set<OntClass> equivalentParents,
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTest.java
index d0884c9aa..958a0f370 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTest.java
@@ -24,10 +24,10 @@ import edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread;
 
 
 public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
-	
+
 	private static final String mostSpecificTypePropertyURI = "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#mostSpecificType";
 	long delay = 50;
-  
+
 	@Before
 	public void suppressErrorOutput() {
 		suppressSyserr();
@@ -35,7 +35,7 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
 		setLoggerLevel(SimpleReasoner.class, Level.OFF);
 		setLoggerLevel(SimpleReasonerTBoxListener.class, Level.OFF);
 	}
-	
+
     @Test
     public void addABoxTypeAssertion1Test(){
         addABoxTypeAssertion1(true);
@@ -50,31 +50,31 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
 	* its asserted type is not added to the inference graph
 	*/
 	public void addABoxTypeAssertion1( boolean sameAsEnabled ){
-			
+
 		// Create a Tbox with a simple class hierarchy. B is a subclass of A.
-		OntModel tBox = createTBoxModel(); 
-		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A"); 
-		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B"); 
+		OntModel tBox = createTBoxModel();
+		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A");
+		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B");
 	    classA.addSubClass(classB);
-	            
+
         // this is the model to receive inferences
         Model inf = ModelFactory.createDefaultModel();
-        
+
 		// create an ABox and register the SimpleReasoner listener with it
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
         SimpleReasoner simpleReasoner = new SimpleReasoner(tBox, aBox, inf);
         simpleReasoner.setSameAsEnabled( sameAsEnabled );
 		aBox.register(simpleReasoner);
-		
-        // Individual x 
-		Resource ind_x = aBox.createResource("http://test.vivo/x");
-		
-        // add a statement to the ABox that individual x is of type (i.e. is an instance of) B.		
-		Statement xisb = ResourceFactory.createStatement(ind_x, RDF.type, classB);	
-		aBox.add(xisb);		
 
-		// Verify that "x is of type B" was not inferred	
-		Assert.assertFalse(inf.contains(xisb));	
+        // Individual x
+		Resource ind_x = aBox.createResource("http://test.vivo/x");
+
+        // add a statement to the ABox that individual x is of type (i.e. is an instance of) B.
+		Statement xisb = ResourceFactory.createStatement(ind_x, RDF.type, classB);
+		aBox.add(xisb);
+
+		// Verify that "x is of type B" was not inferred
+		Assert.assertFalse(inf.contains(xisb));
 	}
 
     @Test
@@ -91,40 +91,40 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
 	* of its superclasses
 	*/
 	public void addABoxTypeAssertion2(boolean enableSameAs){
-	
+
 		// Create a Tbox with a simple class hierarchy. D and E are subclasses
-		// of C. B and C are subclasses of A. 
-		OntModel tBox = createTBoxModel(); 
-		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A"); 
-		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B"); 
-		OntClass classC = createClass(tBox, "http://test.vivo/C", "class C"); 
-		OntClass classD = createClass(tBox, "http://test.vivo/D", "class D"); 
-		OntClass classE = createClass(tBox, "http://test.vivo/E", "class E"); 
+		// of C. B and C are subclasses of A.
+		OntModel tBox = createTBoxModel();
+		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A");
+		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B");
+		OntClass classC = createClass(tBox, "http://test.vivo/C", "class C");
+		OntClass classD = createClass(tBox, "http://test.vivo/D", "class D");
+		OntClass classE = createClass(tBox, "http://test.vivo/E", "class E");
 		addSubclass(classA, classB);
 		addSubclass(classA, classC);
 		addSubclass(classC, classD);
 		addSubclass(classC, classE);
-		
+
         // this is the model to receive inferences
         Model inf = ModelFactory.createDefaultModel();
-        
+
 		// create an Abox and register the SimpleReasoner listener with it
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
         SimpleReasoner sr = new SimpleReasoner(tBox, aBox, inf);
         sr.setSameAsEnabled( enableSameAs );
 		aBox.register( sr );
-		
+
         // add a statement to the ABox that individual x is of type E.
 		Resource ind_x = aBox.createResource("http://test.vivo/x");
-		aBox.add(ind_x, RDF.type, classE);		
+		aBox.add(ind_x, RDF.type, classE);
 
 		// Verify that "x is of type C" was inferred
-		Statement xisc = ResourceFactory.createStatement(ind_x, RDF.type, classC);	
-		Assert.assertTrue(inf.contains(xisc));	
-		
+		Statement xisc = ResourceFactory.createStatement(ind_x, RDF.type, classC);
+		Assert.assertTrue(inf.contains(xisc));
+
 		// Verify that "x is of type A" was inferred
-		Statement xisa = ResourceFactory.createStatement(ind_x, RDF.type, classA);	
-		Assert.assertTrue(inf.contains(xisa));	
+		Statement xisa = ResourceFactory.createStatement(ind_x, RDF.type, classA);
+		Assert.assertTrue(inf.contains(xisa));
 	}
 
     @Test
@@ -137,22 +137,22 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
     }
 	/*
 	* Test inference based on class equivalence
-	*/ 
+	*/
 	public void addABoxTypeAssertion3(boolean enableSameAs) throws InterruptedException {
 
 		// Add classes A, B and C to the TBox
 	    // A is equivalent to B
 		// C is a subclass of A
-		OntModel tBox = createTBoxModel(); 
-		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A"); 
-		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B"); 
+		OntModel tBox = createTBoxModel();
+		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A");
+		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B");
 		OntClass classC = createClass(tBox, "http://test.vivo/C", "class C");
 		addSubclass(classA, classC);
 		setEquivalent(classA, classB);
 
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
         Model inf = ModelFactory.createDefaultModel();
-		
+
         SimpleReasoner sr = new SimpleReasoner(tBox, aBox, inf);
         sr.setSameAsEnabled( enableSameAs );
         SimpleReasoner simpleReasoner =  sr ;
@@ -163,22 +163,22 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
-	       
+
         // Add a statement that individual x is of type C to the ABox
 		Resource ind_x = aBox.createResource("http://test.vivo/x");
-		aBox.add(ind_x, RDF.type, classC);		
-	    
+		aBox.add(ind_x, RDF.type, classC);
+
 		// Verify that "x is of type A" was inferred
-		Statement xisa = ResourceFactory.createStatement(ind_x, RDF.type, classA);	
-		Assert.assertTrue(inf.contains(xisa));		
-		
+		Statement xisa = ResourceFactory.createStatement(ind_x, RDF.type, classA);
+		Assert.assertTrue(inf.contains(xisa));
+
 		// Verify that "x is of type B" was inferred
-		Statement xisb = ResourceFactory.createStatement(ind_x, RDF.type, classB);	
-		Assert.assertTrue(inf.contains(xisb));	
-		
+		Statement xisb = ResourceFactory.createStatement(ind_x, RDF.type, classB);
+		Assert.assertTrue(inf.contains(xisb));
+
 		simpleReasonerTBoxListener.setStopRequested();;
 	}
-	
+
     @Test
     public void addABoxTypeAssertion4Test()throws InterruptedException{
         addABoxTypeAssertion4(true);
@@ -189,41 +189,41 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
     }
 	/*
 	 * Test inference based on class equivalence
-	 */ 
+	 */
 	public void addABoxTypeAssertion4(boolean enableSameAs) throws InterruptedException {
-				
+
 		// Add classes A and B to the TBox
 		// A is equivalent to B
-		OntModel tBox = createTBoxModel(); 
-		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A"); 
-		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B"); 
+		OntModel tBox = createTBoxModel();
+		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A");
+		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B");
 		setEquivalent(classA, classB);
-		
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
         Model inf = ModelFactory.createDefaultModel();
-		
+
         SimpleReasoner sr = new SimpleReasoner(tBox, aBox, inf);
         sr.setSameAsEnabled( enableSameAs );
         SimpleReasoner simpleReasoner =  sr ;
 		aBox.register(simpleReasoner);
 		SimpleReasonerTBoxListener simpleReasonerTBoxListener = getTBoxListener(simpleReasoner);
 		tBox.register(simpleReasonerTBoxListener);
-		
+
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
-	    
+
         // Add a statement that individual x is of type B to the ABox
 		Resource ind_x = aBox.createResource("http://test.vivo/x");
-		aBox.add(ind_x, RDF.type, classB);		
-	    
+		aBox.add(ind_x, RDF.type, classB);
+
 		// Verify that "x is of type A" was inferred
-		Statement xisa = ResourceFactory.createStatement(ind_x, RDF.type, classA);	
-		Assert.assertTrue(inf.contains(xisa));	
+		Statement xisa = ResourceFactory.createStatement(ind_x, RDF.type, classA);
+		Assert.assertTrue(inf.contains(xisa));
 
 		simpleReasonerTBoxListener.setStopRequested();
 	}
-	
+
 
     @Test
     public void addABoxTypeAssertion5Test()throws InterruptedException{
@@ -240,14 +240,14 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
 
 		// Add classes classes A and B to the TBox
 		// A is equivalent to B
-		OntModel tBox = createTBoxModel(); 
-		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A"); 
-		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B"); 
+		OntModel tBox = createTBoxModel();
+		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A");
+		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B");
 		setEquivalent(classA, classB);
-	    
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
         Model inf = ModelFactory.createDefaultModel();
-		
+
         SimpleReasoner sr = new SimpleReasoner(tBox, aBox, inf);
         sr.setSameAsEnabled( enableSameAs );
         SimpleReasoner simpleReasoner =  sr ;
@@ -258,20 +258,20 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
-	    
+
         // Add a statement that individual x is of type B to the ABox
 		Resource ind_x = aBox.createResource("http://test.vivo/x");
-		aBox.add(ind_x, RDF.type, classB);		
-	    
+		aBox.add(ind_x, RDF.type, classB);
+
 		// Verify that "x is of type A" was inferred
-		Statement xisa = ResourceFactory.createStatement(ind_x, RDF.type, classA);	
-		Assert.assertTrue(inf.contains(xisa));	
-		
+		Statement xisa = ResourceFactory.createStatement(ind_x, RDF.type, classA);
+		Assert.assertTrue(inf.contains(xisa));
+
 		// Remove the statement that x is of type B from the ABox
 		aBox.remove(ind_x, RDF.type, classB);
-		
+
 		// Verify that "x is of type A" was removed from the inference graph
-		Assert.assertFalse(inf.contains(xisa));	
+		Assert.assertFalse(inf.contains(xisa));
 
 		simpleReasonerTBoxListener.setStopRequested();
 	}
@@ -293,47 +293,47 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
 	* should not be retracted.
 	*/
 	public void removeABoxTypeAssertion1(boolean enableSameAs){
-	
+
 		// Create a Tbox with a simple class hierarchy. C is a subclass of B
 		// and B is a subclass of A.
-		
-		OntModel tBox = createTBoxModel(); 
-		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A"); 
-		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B"); 
+
+		OntModel tBox = createTBoxModel();
+		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A");
+		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B");
 		OntClass classC = createClass(tBox, "http://test.vivo/C", "class C");
 		addSubclass(classB, classC);
 		addSubclass(classA, classB);
-	    
+
         // this is the model to receive inferences
         Model inf = ModelFactory.createDefaultModel();
-        
+
 		// create an Abox and register the SimpleReasoner listener with it
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
         SimpleReasoner sr = new SimpleReasoner(tBox, aBox, inf);
         sr.setSameAsEnabled( enableSameAs );
 		aBox.register( sr );
-		
+
         // add a statement to the ABox that individual x is of type C.
 		Resource ind_x = aBox.createResource("http://test.vivo/x");
-		aBox.add(ind_x, RDF.type, classC);		
+		aBox.add(ind_x, RDF.type, classC);
 
         // add a statement to the ABox that individual x is of type B.
-		aBox.add(ind_x, RDF.type, classB);		
+		aBox.add(ind_x, RDF.type, classB);
 
 		// remove the statement that individual x is of type C
 		aBox.remove(ind_x, RDF.type, classC);
-		
+
 		// Verify that the inference graph contains the statement that x is of type A.
-		Statement xisa = ResourceFactory.createStatement(ind_x, RDF.type, classA);	
-		Assert.assertTrue(inf.contains(xisa));	
-		
+		Statement xisa = ResourceFactory.createStatement(ind_x, RDF.type, classA);
+		Assert.assertTrue(inf.contains(xisa));
+
 		// Hopefully the assertion that x is b got removed from
 		// the inference graph
-		Statement xisb = ResourceFactory.createStatement(ind_x, RDF.type, classB);	
-		Assert.assertFalse(inf.contains(xisb));	
+		Statement xisb = ResourceFactory.createStatement(ind_x, RDF.type, classB);
+		Assert.assertFalse(inf.contains(xisb));
 
 	}
-	
+
     @Test
     public void addTBoxSubClassAssertion1Test()throws InterruptedException{
         addTBoxSubClassAssertion1(true);
@@ -343,15 +343,15 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
         addTBoxSubClassAssertion1(false);
     }
 	/*
-	 * Test the addition of a subClassOf statement to 
+	 * Test the addition of a subClassOf statement to
 	 * the TBox. The instance data that is the basis
 	 * for the inference is in the ABox. The existing
 	 * instance of the newly declared subclass should
-	 * be inferred to have the type of the superclass. 
+	 * be inferred to have the type of the superclass.
 	 * There are also a few checks that the instance
 	 * is not inferred to have the types of some other
 	 * random classes.
-	 * 
+	 *
 	 * Since the addition of an owl:equivalentClass
 	 * statement is implemented as two calls to the
 	 * method that handles the addition of an
@@ -360,17 +360,17 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
 	 */
 	public void addTBoxSubClassAssertion1(boolean enableSameAs) throws InterruptedException {
 		// Create the TBox and add classes A, B, C and D
-		OntModel tBox = createTBoxModel(); 
-		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A"); 
-		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B"); 
-		OntClass classC = createClass(tBox, "http://test.vivo/C", "class C"); 
-		OntClass classD = createClass(tBox, "http://test.vivo/D", "class D"); 
-		
+		OntModel tBox = createTBoxModel();
+		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A");
+		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B");
+		OntClass classC = createClass(tBox, "http://test.vivo/C", "class C");
+		OntClass classD = createClass(tBox, "http://test.vivo/D", "class D");
+
 		// Create ABox and Inference models and register
 		// the ABox reasoner listeners with the ABox and TBox
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
         Model inf = ModelFactory.createDefaultModel();
-		
+
         SimpleReasoner sr = new SimpleReasoner(tBox, aBox, inf);
         sr.setSameAsEnabled( enableSameAs );
         SimpleReasoner simpleReasoner =  sr ;
@@ -380,27 +380,27 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
 
         // Add a statement that individual x is of type C to the ABox
 		Resource ind_x = aBox.createResource("http://test.vivo/x");
-		aBox.add(ind_x, RDF.type, classC);		
-	    
-        // Add a statement that C is a subclass of A to the TBox	
+		aBox.add(ind_x, RDF.type, classC);
+
+        // Add a statement that C is a subclass of A to the TBox
 	    addSubclass(classA, classC);
-		
+
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
-	    
+
 		// Verify that "x is of type A" was inferred
-		Statement xisa = ResourceFactory.createStatement(ind_x, RDF.type, classA);	
+		Statement xisa = ResourceFactory.createStatement(ind_x, RDF.type, classA);
 		Assert.assertTrue(inf.contains(xisa));
 
 		// Verify that "x is of type B" was not inferred
-		Statement xisb = ResourceFactory.createStatement(ind_x, RDF.type, classB);	
-		Assert.assertFalse(inf.contains(xisb));	
+		Statement xisb = ResourceFactory.createStatement(ind_x, RDF.type, classB);
+		Assert.assertFalse(inf.contains(xisb));
 
 		// Verify that "x is of type D" was not inferred
-		Statement xisd = ResourceFactory.createStatement(ind_x, RDF.type, classD);	
-		Assert.assertFalse(inf.contains(xisd));	
-		
+		Statement xisd = ResourceFactory.createStatement(ind_x, RDF.type, classD);
+		Assert.assertFalse(inf.contains(xisd));
+
 		simpleReasonerTBoxListener.setStopRequested();
 	}
 
@@ -413,67 +413,67 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
         addTBoxSubClassAssertion2(false);
     }
 	/*
-	 * Test the addition of a subClassOf statement to 
+	 * Test the addition of a subClassOf statement to
 	 * the TBox. The instance data that is the basis
 	 * for the inference is in the ABox graph and the
 	 * inference graph. The existing instance of the
 	 * subclass of the newly added subclass should
 	 * be inferred to have the type of the superclass
-	 * of the newly added subclass. 
-	 * 
+	 * of the newly added subclass.
+	 *
 	 * Since the addition of an owl:equivalentClass
 	 * statement is implemented as two calls to the
 	 * method that handles the addition of an
 	 * rdfs:subClassOf statement, this test serves
 	 * as some test of equivalentClass statements also.
-	 * 
+	 *
 	 */
 	public void addTBoxSubClassAssertion2(boolean enableSameAs) throws InterruptedException {
-				
+
 		// Create the TBox and add classes A, B, C and D.
 		// D is a subclass of C.
-		OntModel tBox = createTBoxModel(); 
-		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A"); 
-		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B"); 
-		OntClass classC = createClass(tBox, "http://test.vivo/C", "class C"); 
+		OntModel tBox = createTBoxModel();
+		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A");
+		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B");
+		OntClass classC = createClass(tBox, "http://test.vivo/C", "class C");
 		OntClass classD = createClass(tBox, "http://test.vivo/D", "class D");
 		addSubclass(classC, classD);
-		
+
 		// Create ABox and Inference models and register
 		// the ABox reasoner listeners with the ABox and TBox
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
         Model inf = ModelFactory.createDefaultModel();
-		
+
         SimpleReasoner sr = new SimpleReasoner(tBox, aBox, inf);
         sr.setSameAsEnabled( enableSameAs );
         SimpleReasoner simpleReasoner =  sr ;
 		aBox.register(simpleReasoner);
 		SimpleReasonerTBoxListener simpleReasonerTBoxListener = getTBoxListener(simpleReasoner);
 		tBox.register(simpleReasonerTBoxListener);
-		
+
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
-	    
+
         // Add a statement that individual x is of type D to the ABox
 		Resource ind_x = aBox.createResource("http://test.vivo/x");
-		aBox.add(ind_x, RDF.type, classD);		
-	    
-        // Add a statement that C is a subclass of A to the TBox	
+		aBox.add(ind_x, RDF.type, classD);
+
+        // Add a statement that C is a subclass of A to the TBox
 		addSubclass(classA, classC);
 
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
-	    
+
 		// Verify that "x is of type A" was inferred
-		Statement xisa = ResourceFactory.createStatement(ind_x, RDF.type, classA);	
-		Assert.assertTrue(inf.contains(xisa));	
-		
+		Statement xisa = ResourceFactory.createStatement(ind_x, RDF.type, classA);
+		Assert.assertTrue(inf.contains(xisa));
+
 		simpleReasonerTBoxListener.setStopRequested();
 	}
-	
-	
+
+
     @Test
     public void removeTBoxSubClassAssertion1Test()throws InterruptedException{
         removeTBoxSubClassAssertion1(true);
@@ -483,11 +483,11 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
         removeTBoxSubClassAssertion1(false);
     }
 	/*
-	 * Test the removal of a subClassOf statement from 
+	 * Test the removal of a subClassOf statement from
 	 * the TBox. The instance data that is the basis
 	 * for the inference is in the ABox graph and the
-	 * inference graph. 
-	 * 
+	 * inference graph.
+	 *
 	 */
 	public void removeTBoxSubClassAssertion1(boolean enableSameAs) throws InterruptedException {
 		// Create the TBox and add classes A, B, C, D, E, F, G and H.
@@ -495,10 +495,10 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
 		// E is a subclass of B.
 		// F and G are subclasses of C.
 		// H is a subclass of D.
-		OntModel tBox = createTBoxModel(); 
-		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A"); 
-		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B"); 
-		OntClass classC = createClass(tBox, "http://test.vivo/C", "class C"); 
+		OntModel tBox = createTBoxModel();
+		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A");
+		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B");
+		OntClass classC = createClass(tBox, "http://test.vivo/C", "class C");
 		OntClass classD = createClass(tBox, "http://test.vivo/D", "class D");
 		OntClass classE = createClass(tBox, "http://test.vivo/E", "class E");
 		OntClass classF = createClass(tBox, "http://test.vivo/F", "class F");
@@ -511,12 +511,12 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
 		addSubclass(classC, classF);
 		addSubclass(classC, classG);
 		addSubclass(classD, classH);
-		
+
 		// Create ABox and Inference models and register
 		// the ABox reasoner listeners with the ABox and TBox
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
         Model inf = ModelFactory.createDefaultModel();
-		
+
         SimpleReasoner sr = new SimpleReasoner(tBox, aBox, inf);
         sr.setSameAsEnabled( enableSameAs );
         SimpleReasoner simpleReasoner =  sr ;
@@ -527,45 +527,45 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
-	    
+
         // Add a statement that individual x is of type E to the ABox
 		Resource ind_x = aBox.createResource("http://test.vivo/x");
-		aBox.add(ind_x, RDF.type, classE);		
-	    
+		aBox.add(ind_x, RDF.type, classE);
+
 		// Remove the statement that B is a subclass of A from the TBox
 		removeSubclass(classA, classB);
-		
+
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
-		
+
 		// Verify that "x is of type A" is not in the inference graph
-		Statement xisa = ResourceFactory.createStatement(ind_x, RDF.type, classA);	
+		Statement xisa = ResourceFactory.createStatement(ind_x, RDF.type, classA);
 		Assert.assertFalse(inf.contains(xisa));
-		
+
 		// Verify that "x is of type B" is in the inference graph
-		Statement xisb = ResourceFactory.createStatement(ind_x, RDF.type, classB);	
-		Assert.assertTrue(inf.contains(xisb));	
+		Statement xisb = ResourceFactory.createStatement(ind_x, RDF.type, classB);
+		Assert.assertTrue(inf.contains(xisb));
 
         // Add statements that individual y is of types F and H to the ABox
 		Resource ind_y = aBox.createResource("http://test.vivo/y");
-		aBox.add(ind_y, RDF.type, classF);	
+		aBox.add(ind_y, RDF.type, classF);
 		aBox.add(ind_y, RDF.type, classH);
-		
+
 		// Remove the statement that C is a subclass of A from the TBox
 		classA.removeSubClass(classC);
 
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
-		
+
 		// Verify that "y is of type A" is in the inference graph
-		Statement yisa = ResourceFactory.createStatement(ind_y, RDF.type, classA);	
+		Statement yisa = ResourceFactory.createStatement(ind_y, RDF.type, classA);
 		Assert.assertTrue(inf.contains(yisa));
-		
+
 		simpleReasonerTBoxListener.setStopRequested();
 	}
-	
+
     @Ignore(" needs TBoxReasoner infrastructure which is not in this suite.")
     @Test
     public void bcdTest()throws InterruptedException{
@@ -578,11 +578,11 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
         bcd(false);
     }
 	/*
-	 * Test the removal of a subClassOf statement from 
+	 * Test the removal of a subClassOf statement from
 	 * the TBox. The instance data that is the basis
 	 * for the inference is in the ABox graph and the
-	 * inference graph. 
-	 * 
+	 * inference graph.
+	 *
 	 */
 	// this test would need TBoxReasoner infrastructure, which we're not
 	// testing in this suite. The reason it doesn't work as it is because
@@ -594,15 +594,15 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
 
 		// Create ABox and Inference models and register
 		// the ABox reasoner listeners with the ABox and TBox
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
         Model inf = ModelFactory.createDefaultModel();
-		
+
         SimpleReasoner simpleReasoner = new SimpleReasoner(tBox, aBox, inf);
         simpleReasoner.setSameAsEnabled( enableSameAs );
 		aBox.register(simpleReasoner);
 		SimpleReasonerTBoxListener simpleReasonerTBoxListener = getTBoxListener(simpleReasoner);
 		tBox.register(simpleReasonerTBoxListener);
-		
+
 		// Add classes LivingThing, Flora, Brassica to the TBox
 		// Brassica is a subClass of Flora and Flora is a subclass of Brassica
 		OntClass LivingThing = createClass(tBox, "http://test.vivo/LivingThing", "Living Thing");
@@ -610,18 +610,18 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
 		OntClass Brassica = createClass(tBox, "http://test.vivo/Brassica", "Brassica");
 		addSubclass(LivingThing, Flora);
 		addSubclass(Flora, Brassica);
-	    
+
 	    tBox.rebind();
 	    tBox.prepare();
-	    
+
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
-	    
+
         // Add a statement that individual kale is of type Brassica to the ABox
 		Resource kale = aBox.createResource("http://test.vivo/kale");
-		aBox.add(kale, RDF.type, Brassica);		
-	    
+		aBox.add(kale, RDF.type, Brassica);
+
 		// Remove the statement that Brassica is a subclass of Flora from the TBox
 		Flora.removeSubClass(Brassica);
 
@@ -630,18 +630,18 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
-		
+
 		// Verify that "kale is of type Flora" is not in the inference graph
-		Statement kaleIsFlora = ResourceFactory.createStatement(kale, RDF.type, Flora);	
+		Statement kaleIsFlora = ResourceFactory.createStatement(kale, RDF.type, Flora);
 		Assert.assertFalse(inf.contains(kaleIsFlora));
-		
+
 		// Verify that "kale is of type LivingThing" is not in the inference graph
-		Statement kaleIsLivingThing = ResourceFactory.createStatement(kale, RDF.type, LivingThing);	
+		Statement kaleIsLivingThing = ResourceFactory.createStatement(kale, RDF.type, LivingThing);
 		Assert.assertFalse(inf.contains(kaleIsLivingThing));
-		
+
 		simpleReasonerTBoxListener.setStopRequested();
 	}
-	
+
     @Test
     public void mstTest1Test()throws InterruptedException{
         mstTest1(true);
@@ -657,10 +657,10 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
 	public void mstTest1(boolean enableSameAs) throws InterruptedException {
 		// Set up the Tbox with a class hierarchy. C is a subclass of A
 		// and Y. D and E are subclasses of C. B is a subclass of D.
-		OntModel tBox = createTBoxModel(); 
-		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A"); 
-		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B"); 
-		OntClass classC = createClass(tBox, "http://test.vivo/C", "class C"); 
+		OntModel tBox = createTBoxModel();
+		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A");
+		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B");
+		OntClass classC = createClass(tBox, "http://test.vivo/C", "class C");
 		OntClass classD = createClass(tBox, "http://test.vivo/D", "class D");
 		OntClass classE = createClass(tBox, "http://test.vivo/E", "class E");
 		OntClass classY = createClass(tBox, "http://test.vivo/Y", "class Y");
@@ -672,44 +672,44 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
 
 		// Create ABox and Inference models and register
 		// the ABox reasoner listeners with the ABox and TBox
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
         Model inf = ModelFactory.createDefaultModel();
-		
+
         SimpleReasoner sr = new SimpleReasoner(tBox, aBox, inf);
         sr.setSameAsEnabled( enableSameAs );
         SimpleReasoner simpleReasoner =  sr ;
 		aBox.register(simpleReasoner);
 		SimpleReasonerTBoxListener simpleReasonerTBoxListener = getTBoxListener(simpleReasoner);
 		tBox.register(simpleReasonerTBoxListener);
-		
+
 		AnnotationProperty mostSpecificType = tBox.createAnnotationProperty(mostSpecificTypePropertyURI);
-		
+
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
-	    
+
         // Add the statement individual x is of type Y to the ABox
 		Resource ind_x = aBox.createResource("http://test.vivo/x");
-		aBox.add(ind_x, RDF.type, classD);		
-		
+		aBox.add(ind_x, RDF.type, classD);
+
 		// Verify ind_x mostSpecificType annotation for D
-		Assert.assertTrue(inf.contains(ind_x, mostSpecificType, ResourceFactory.createResource(classD.getURI())));	
-		
-		// Verify ind_x doesn't have a mostSpecificType annotation for 
+		Assert.assertTrue(inf.contains(ind_x, mostSpecificType, ResourceFactory.createResource(classD.getURI())));
+
+		// Verify ind_x doesn't have a mostSpecificType annotation for
 		// A, Y, C, E or B.
-		Assert.assertFalse(aBox.contains(ind_x, mostSpecificType, ResourceFactory.createResource(classA.getURI())));	
+		Assert.assertFalse(aBox.contains(ind_x, mostSpecificType, ResourceFactory.createResource(classA.getURI())));
 		Assert.assertFalse(aBox.contains(ind_x, mostSpecificType, ResourceFactory.createResource(classY.getURI())));
-		Assert.assertFalse(aBox.contains(ind_x, mostSpecificType, ResourceFactory.createResource(classC.getURI())));	
+		Assert.assertFalse(aBox.contains(ind_x, mostSpecificType, ResourceFactory.createResource(classC.getURI())));
 		Assert.assertFalse(aBox.contains(ind_x, mostSpecificType, ResourceFactory.createResource(classE.getURI())));
-		Assert.assertFalse(aBox.contains(ind_x, mostSpecificType, ResourceFactory.createResource(classB.getURI())));	
-		
+		Assert.assertFalse(aBox.contains(ind_x, mostSpecificType, ResourceFactory.createResource(classB.getURI())));
+
 		aBox.remove(ind_x, RDF.type, classD); // retract assertion that x is of type D.
 		// Verify that D is not longer the most specific type
-		Assert.assertFalse(inf.contains(ind_x, mostSpecificType, ResourceFactory.createResource(classD.getURI())));	
-		
+		Assert.assertFalse(inf.contains(ind_x, mostSpecificType, ResourceFactory.createResource(classD.getURI())));
+
 		simpleReasonerTBoxListener.setStopRequested();
 	}
-	
+
 
     @Test
     public void mstTest2Test()throws InterruptedException{
@@ -726,43 +726,43 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
 	public void mstTest2(boolean enableSameAs) throws InterruptedException {
 		// Set up the Tbox with a class hierarchy. A, B, and C are all equivalent.
 		// This implies that they are all subclasses of each other.
-		OntModel tBox = createTBoxModel(); 
-		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A"); 
-		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B"); 
-		OntClass classC = createClass(tBox, "http://test.vivo/C", "class C"); 
+		OntModel tBox = createTBoxModel();
+		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A");
+		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B");
+		OntClass classC = createClass(tBox, "http://test.vivo/C", "class C");
 		setEquivalent(classA, classB);
 		setEquivalent(classB, classC);
 
 		// Create ABox and Inference models and register
 		// the ABox reasoner listeners with the ABox and TBox
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
         Model inf = ModelFactory.createDefaultModel();
-		
+
         SimpleReasoner sr = new SimpleReasoner(tBox, aBox, inf);
         sr.setSameAsEnabled( enableSameAs );
         SimpleReasoner simpleReasoner =  sr ;
 		aBox.register(simpleReasoner);
 		SimpleReasonerTBoxListener simpleReasonerTBoxListener = getTBoxListener(simpleReasoner);
 		tBox.register(simpleReasonerTBoxListener);
-		
+
 		AnnotationProperty mostSpecificType = tBox.createAnnotationProperty(mostSpecificTypePropertyURI);
-		
+
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
-	    
+
 	    // Add the statement individual x is of type B to the ABox
 		Resource ind_x = aBox.createResource("http://test.vivo/x");
-		aBox.add(ind_x, RDF.type, classB);		
-	    				
+		aBox.add(ind_x, RDF.type, classB);
+
 		// Verify ind_x mostSpecificType annotation for A, B and C
-		Assert.assertTrue(inf.contains(ind_x, mostSpecificType, ResourceFactory.createResource(classA.getURI())));	
-		Assert.assertTrue(inf.contains(ind_x, mostSpecificType, ResourceFactory.createResource(classB.getURI())));	
-		Assert.assertTrue(inf.contains(ind_x, mostSpecificType, ResourceFactory.createResource(classC.getURI())));	
-		
+		Assert.assertTrue(inf.contains(ind_x, mostSpecificType, ResourceFactory.createResource(classA.getURI())));
+		Assert.assertTrue(inf.contains(ind_x, mostSpecificType, ResourceFactory.createResource(classB.getURI())));
+		Assert.assertTrue(inf.contains(ind_x, mostSpecificType, ResourceFactory.createResource(classC.getURI())));
+
 		simpleReasonerTBoxListener.setStopRequested();
 	}
-	
+
     @Test
     public void mstTest3Test()throws InterruptedException{
         mstTest3(true);
@@ -777,52 +777,52 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
 	 */
 	public void mstTest3(boolean enableSameAs) throws InterruptedException {
 		// Set up the Tbox with classes A, B, C, D, E, F and G
-		OntModel tBox = createTBoxModel(); 
-		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A"); 
-		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B"); 
-		OntClass classC = createClass(tBox, "http://test.vivo/C", "class C"); 
-		OntClass classD = createClass(tBox, "http://test.vivo/D", "class D"); 
-		OntClass classE = createClass(tBox, "http://test.vivo/E", "class E"); 
-		OntClass classF = createClass(tBox, "http://test.vivo/F", "class F"); 
-		OntClass classG = createClass(tBox, "http://test.vivo/G", "class G"); 
+		OntModel tBox = createTBoxModel();
+		OntClass classA = createClass(tBox, "http://test.vivo/A", "class A");
+		OntClass classB = createClass(tBox, "http://test.vivo/B", "class B");
+		OntClass classC = createClass(tBox, "http://test.vivo/C", "class C");
+		OntClass classD = createClass(tBox, "http://test.vivo/D", "class D");
+		OntClass classE = createClass(tBox, "http://test.vivo/E", "class E");
+		OntClass classF = createClass(tBox, "http://test.vivo/F", "class F");
+		OntClass classG = createClass(tBox, "http://test.vivo/G", "class G");
 
 		// Create ABox and Inference models and register
 		// the ABox reasoner listeners with the ABox and TBox
-		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
         Model inf = ModelFactory.createDefaultModel();
-		
+
         SimpleReasoner sr = new SimpleReasoner(tBox, aBox, inf);
         sr.setSameAsEnabled( enableSameAs );
         SimpleReasoner simpleReasoner =  sr ;
 		aBox.register(simpleReasoner);
 		SimpleReasonerTBoxListener simpleReasonerTBoxListener = getTBoxListener(simpleReasoner);
 		tBox.register(simpleReasonerTBoxListener);
-		
+
 		OntClass OWL_THING = tBox.createClass(OWL.Thing.getURI());
 		AnnotationProperty mostSpecificType = tBox.createAnnotationProperty(mostSpecificTypePropertyURI);
-		
+
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
-	    
+
 		// add individuals x, y and z to the aBox
 		Resource ind_x = aBox.createResource("http://test.vivo/x");
 		Resource ind_y = aBox.createResource("http://test.vivo/y");
-		
-		aBox.add(ind_x, RDF.type, OWL_THING);	
-		aBox.add(ind_y, RDF.type, classD);	
-	
-		Assert.assertTrue(inf.contains(ind_x, mostSpecificType, ResourceFactory.createResource(OWL.Thing.getURI())));	
+
+		aBox.add(ind_x, RDF.type, OWL_THING);
+		aBox.add(ind_y, RDF.type, classD);
+
+		Assert.assertTrue(inf.contains(ind_x, mostSpecificType, ResourceFactory.createResource(OWL.Thing.getURI())));
 		Assert.assertTrue(inf.contains(ind_y, mostSpecificType, ResourceFactory.createResource(classD.getURI())));
-		
+
 		aBox.add(ind_x, RDF.type, classC);
 		aBox.add(ind_y, RDF.type, classF);
-		
-		Assert.assertFalse(inf.contains(ind_x, mostSpecificType, ResourceFactory.createResource(OWL.Thing.getURI())));	
-		Assert.assertTrue(inf.contains(ind_x, mostSpecificType, ResourceFactory.createResource(classC.getURI())));	
+
+		Assert.assertFalse(inf.contains(ind_x, mostSpecificType, ResourceFactory.createResource(OWL.Thing.getURI())));
+		Assert.assertTrue(inf.contains(ind_x, mostSpecificType, ResourceFactory.createResource(classC.getURI())));
 		Assert.assertTrue(inf.contains(ind_y, mostSpecificType, ResourceFactory.createResource(classD.getURI())));
 		Assert.assertTrue(inf.contains(ind_y, mostSpecificType, ResourceFactory.createResource(classF.getURI())));
-		
+
 		// Set up a class hierarchy.
 		addSubclass(classA, classB);
 		addSubclass(classA, classC);
@@ -830,45 +830,45 @@ public class SimpleReasonerTest extends SimpleReasonerTBoxHelper {
 		addSubclass(classC, classE);
 		addSubclass(classD, classF);
 		addSubclass(classD, classG);
-	    
+
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
-	    
+
 		Assert.assertFalse(inf.contains(ind_y, mostSpecificType, ResourceFactory.createResource(classD.getURI())));
 		Assert.assertTrue(inf.contains(ind_y, mostSpecificType, ResourceFactory.createResource(classF.getURI())));
-	    
+
 		// If F is removed as a subclass of D, then D should once again be a most specific type
 		// for y.
 		removeSubclass(classD, classF);
-		
+
 	    while (!VitroBackgroundThread.getLivingThreads().isEmpty()) {
 	    	Thread.sleep(delay);
 	    }
-		
-		Assert.assertTrue(inf.contains(ind_y, mostSpecificType, ResourceFactory.createResource(classD.getURI())));	
-		
+
+		Assert.assertTrue(inf.contains(ind_y, mostSpecificType, ResourceFactory.createResource(classD.getURI())));
+
 		simpleReasonerTBoxListener.setStopRequested();
 	}
-	
+
 	SimpleReasonerTBoxListener getTBoxListener(SimpleReasoner simpleReasoner) {
 	    return new SimpleReasonerTBoxListener(simpleReasoner, new Exception().getStackTrace()[1].getMethodName());
 	}
-		
+
 	// To help in debugging the unit test
 	void printModel(Model model, String modelName) {
-	    
+
 		System.out.println("\nThe " + modelName + " model has " + model.size() + " statements:");
 		System.out.println("---------------------------------------------------------------------");
-		model.write(System.out);		
+		model.write(System.out);
 	}
-	
+
 	// To help in debugging the unit test
 	void printModel(OntModel ontModel, String modelName) {
-	    
+
 		System.out.println("\nThe " + modelName + " model has " + ontModel.size() + " statements:");
 		System.out.println("---------------------------------------------------------------------");
 		ontModel.writeAll(System.out,"N3",null);
-		
+
 	}
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SamplePlugin.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SamplePlugin.java
index b4fa9463a..e38e25d64 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SamplePlugin.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/reasoner/plugin/SamplePlugin.java
@@ -6,12 +6,12 @@ package edu.cornell.mannlib.vitro.webapp.reasoner.plugin;
 import edu.cornell.mannlib.vitro.webapp.reasoner.ReasonerPlugin;
 
 public class SamplePlugin 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 SamplePlugin() {
-		super(VIVOCORE + "informationResourceInAuthorship", 
+		super(VIVOCORE + "informationResourceInAuthorship",
 			  VIVOCORE + "linkedAuthor",
 			  DCTERMS + "creator");
 	}
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchControllerTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchControllerTest.java
index a356600b2..06999f230 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchControllerTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchControllerTest.java
@@ -1,6 +1,6 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 /**
- * 
+ *
  */
 package edu.cornell.mannlib.vitro.webapp.search.controller;
 
@@ -17,7 +17,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMa
 import edu.cornell.mannlib.vitro.webapp.search.controller.PagedSearchController.PagingLink;
 
 public class PagedSearchControllerTest {
-	
+
 	@Before
 	public void useI18nStubBundles() {
 		I18nStub.setup();
@@ -25,14 +25,14 @@ public class PagedSearchControllerTest {
 
     @Test
     public void testGetPagingLinks() {
-        ParamMap pm = new ParamMap();         
+        ParamMap pm = new ParamMap();
         int hitsPerPage = 25;
         int totalHits = 500;
         int currentStartIndex = 0;
         List<PagingLink> pageLinks = PagedSearchController.getPagingLinks(currentStartIndex, hitsPerPage, totalHits, "baseURL", pm, null);
         Assert.assertNotNull(pageLinks);
         Assert.assertEquals(500 / 25, pageLinks.size());
-        
+
         //test for no page links on a very short result
         hitsPerPage = 25;
         totalHits = 10;
@@ -41,25 +41,25 @@ public class PagedSearchControllerTest {
         Assert.assertNotNull(pageLinks);
         Assert.assertEquals(0, pageLinks.size());
     }
-    
+
     @Test
     public void testGetPagingLinksForLargeResults() {
-        ParamMap pm = new ParamMap();         
+        ParamMap pm = new ParamMap();
         int hitsPerPage = 25;
         int totalHits = 349909;
         int currentStartIndex = 0;
         List<PagingLink> pageLinks =  PagedSearchController.getPagingLinks(currentStartIndex, hitsPerPage, totalHits, "baseURL", pm, null);
         Assert.assertNotNull(pageLinks);
         Assert.assertEquals( PagedSearchController.DEFAULT_MAX_HIT_COUNT / hitsPerPage, pageLinks.size());
-        
+
         //test for large sets of results with high start index
         hitsPerPage = 25;
         totalHits = PagedSearchController.DEFAULT_MAX_HIT_COUNT + 20329;
         currentStartIndex = PagedSearchController.DEFAULT_MAX_HIT_COUNT + 5432;
         pageLinks = PagedSearchController.getPagingLinks(currentStartIndex, hitsPerPage, totalHits, "baseURL", pm, null);
         Assert.assertNotNull(pageLinks);
-        Assert.assertEquals( 
-                (currentStartIndex / hitsPerPage) + //all the pages that are before the current page 
+        Assert.assertEquals(
+                (currentStartIndex / hitsPerPage) + //all the pages that are before the current page
                 (PagedSearchController.DEFAULT_MAX_HIT_COUNT / hitsPerPage) + //some pages after the current apge
                 1, //for the more... page
                 pageLinks.size());
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchengine/base/BaseSearchInputDocumentTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchengine/base/BaseSearchInputDocumentTest.java
index 20a72dcc2..2736377cb 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchengine/base/BaseSearchInputDocumentTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchengine/base/BaseSearchInputDocumentTest.java
@@ -32,7 +32,7 @@ public class BaseSearchInputDocumentTest {
 		SearchInputField field2 = new BaseSearchInputField("anotherField");
 		field2.setBoost(-16F);
 		doc.addField(field2);
-		
+
 		BaseSearchInputDocument other = new BaseSearchInputDocument(doc);
 		assertEquals(doc, other);
 		assertEquals(doc.getDocumentBoost(), other.getDocumentBoost(), 0.01F);
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURLTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURLTest.java
index c69f695a3..cd33c59f6 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURLTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURLTest.java
@@ -32,7 +32,7 @@ import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames;
 public class ThumbnailImageURLTest extends AbstractTestClass{
 	ContextModelAccessStub contextModels;
     String personsURI = "http://vivo.cornell.edu/individual/individual8803";
-        
+
     /**
      * @throws java.lang.Exception
      */
@@ -41,9 +41,9 @@ public class ThumbnailImageURLTest extends AbstractTestClass{
         setLoggerLevel(RDFDefaultErrorHandler.class, Level.OFF);
         ApplicationStub.setup(new ServletContextStub(), new SearchEngineStub());
 
-        Model model = ModelFactory.createDefaultModel();        
+        Model model = ModelFactory.createDefaultModel();
         InputStream in = ThumbnailImageURLTest.class.getResourceAsStream("testPerson.n3");
-        model.read(in,"","N3");        
+        model.read(in,"","N3");
         contextModels = new ContextModelAccessStub();
         contextModels.setRDFService(CONTENT, new RDFServiceModel( model ));
     }
@@ -59,18 +59,18 @@ public class ThumbnailImageURLTest extends AbstractTestClass{
         testMe.setContextModels(contextModels);
         Individual ind = new IndividualImpl();
         ind.setURI(personsURI);
-        
+
         //make sure that the person is in the RDF
         testMe.modifyDocument(ind, doc);
 
         //make sure that a search document field got created for the thumbnail image
-        
+
         SearchInputField thumbnailField = doc.getField( VitroSearchTermNames.THUMBNAIL_URL );
         Assert.assertNotNull(thumbnailField);
 
         Assert.assertNotNull( thumbnailField.getValues() );
         Assert.assertEquals(1, thumbnailField.getValues().size());
-        
+
         Assert.assertEquals("http://vivo.cornell.edu/individual/n54945", thumbnailField.getFirstValue());
     }
 
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnTypeTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnTypeTest.java
index 5130cdcb3..d05222e19 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnTypeTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnTypeTest.java
@@ -17,70 +17,70 @@ public class ExcludeBasedOnTypeTest {
 
 	@Test
 	public void testCheckForExclusion() {
-		
+
 		ExcludeBasedOnType ebot = new ExcludeBasedOnType();
 		ebot.addTypeToExclude("http://xmlns.com/foaf/0.1/Person");
-		
+
 		IndividualImpl ind = new IndividualImpl();
 		ind.setURI("http://example.com/n2343");
 
-		VClass personClass = new VClass("http://xmlns.com/foaf/0.1/Person");		
-		ind.setVClasses(Collections.singletonList(personClass), false);		
-		
+		VClass personClass = new VClass("http://xmlns.com/foaf/0.1/Person");
+		ind.setVClasses(Collections.singletonList(personClass), false);
+
 		String excludeResult = ebot.checkForExclusion(ind);
-		assertNotNull( excludeResult );		
+		assertNotNull( excludeResult );
 	}
 
 	@Test
 	public void testCheckForExclusion2() {
-		
+
 		ExcludeBasedOnType ebot = new ExcludeBasedOnType();
 		ebot.addTypeToExclude("http://example.com/KillerRobot");
-		
+
 		IndividualImpl ind = new IndividualImpl();
 		ind.setURI("http://example.com/n2343");
-		
+
 		List<VClass> vClassList = new ArrayList<VClass>();
 		vClassList.add( new VClass("http://xmlns.com/foaf/0.1/Agent"));
 		vClassList.add( new VClass("http://example.com/Robot"));
 		vClassList.add( new VClass("http://example.com/KillerRobot"));
 		vClassList.add( new VClass("http://example.com/Droid"));
 		ind.setVClasses(vClassList, false);
-		
+
 		String excludeResult = ebot.checkForExclusion(ind);
-		assertNotNull( excludeResult );		
+		assertNotNull( excludeResult );
 	}
-	
+
 	@Test
 	public void testCheckForNonExclusion() {
 		ExcludeBasedOnType ebot = new ExcludeBasedOnType();
 		ebot.addTypeToExclude("http://xmlns.com/foaf/0.1/Person");
-		
+
 		IndividualImpl ind = new IndividualImpl();
 		ind.setURI("http://example.com/n2343");
-		VClass personClass = new VClass("http://xmlns.com/foaf/0.1/Robot");		
-		ind.setVClasses(Collections.singletonList(personClass), false);		
-		
+		VClass personClass = new VClass("http://xmlns.com/foaf/0.1/Robot");
+		ind.setVClasses(Collections.singletonList(personClass), false);
+
 		String excludeResult = ebot.checkForExclusion(ind);
-		assertNull( excludeResult );		
+		assertNull( excludeResult );
 	}
-	
+
 	@Test
-	public void testCheckForNonExclusion2() {		
+	public void testCheckForNonExclusion2() {
 		ExcludeBasedOnType ebot = new ExcludeBasedOnType();
 		ebot.addTypeToExclude("http://xmlns.com/foaf/0.1/Person");
-		
+
 		IndividualImpl ind = new IndividualImpl();
 		ind.setURI("http://example.com/n2343");
-		
+
 		List<VClass> vClassList = new ArrayList<VClass>();
 		vClassList.add( new VClass("http://xmlns.com/foaf/0.1/Agent"));
 		vClassList.add( new VClass("http://example.com/Robot"));
 		vClassList.add( new VClass("http://example.com/KillerRobot"));
 		vClassList.add( new VClass("http://example.com/Droid"));
 		ind.setVClasses(vClassList, false);
-		
+
 		String excludeResult = ebot.checkForExclusion(ind);
-		assertNull( excludeResult );		
+		assertNull( excludeResult );
 	}
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForClassGroupChangesTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForClassGroupChangesTest.java
index 860213748..71c6ea13a 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForClassGroupChangesTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForClassGroupChangesTest.java
@@ -37,40 +37,40 @@ public class AdditionalURIsForClassGroupChangesTest {
     public void testFindAdditionalURIsToIndex() {
         OntModel model = ModelFactory.createOntologyModel();
         model.read( new StringReader(n3ForPresentationClass), null,  "N3");
-        
+
         ContextModelAccessStub models = new ContextModelAccessStub();
         models.setOntModel(ModelNames.TBOX_ASSERTIONS, model);
-        
+
         AdditionalURIsForClassGroupChanges uriFinder = new AdditionalURIsForClassGroupChanges( );
         uriFinder.setContextModels(models);
-        
-        List<String> uris = uriFinder.findAdditionalURIsToIndex( 
+
+        List<String> uris = uriFinder.findAdditionalURIsToIndex(
                 ResourceFactory.createStatement(
                         ResourceFactory.createResource("http://vivoweb.org/ontology/core#Presentation"),
                         ResourceFactory.createProperty(VitroVocabulary.IN_CLASSGROUP),
                         ResourceFactory.createResource("http://example.com/someClassGroup")));
-        
+
         Assert.assertNotNull(uris);
         Assert.assertTrue("uris list is empty", uris.size() > 0 );
-        
+
         Assert.assertTrue(uris.contains("http://vivo.scripps.edu/individual/n400"));
         Assert.assertTrue(uris.contains("http://vivo.scripps.edu/individual/n12400"));
         Assert.assertTrue(uris.contains("http://vivo.scripps.edu/individual/n210"));
         Assert.assertTrue(uris.contains("http://vivo.scripps.edu/individual/n264"));
         Assert.assertTrue(uris.contains("http://vivo.scripps.edu/individual/n25031"));
         Assert.assertTrue(uris.contains("http://vivo.scripps.edu/individual/n2486"));
-        
+
         Assert.assertTrue("uris list should not contain n9999",!uris.contains("http://vivo.scripps.edu/individual/n9999"));
         Assert.assertTrue("uris list should not contain n9998",!uris.contains("http://vivo.scripps.edu/individual/n9998"));
-        
+
 //        Assert.assertTrue("uris didn't not contain test:onions", uris.contains(testNS+"onions"));
 //        Assert.assertTrue("uris didn't not contain test:cheese", uris.contains(testNS+"cheese"));
 //        Assert.assertTrue("uris didn't not contain test:icecream", uris.contains(testNS+"icecream"));
-//        
+//
 //        Assert.assertTrue("uris contained test:Person", !uris.contains(testNS+"Person"));
-//        Assert.assertTrue("uris contained owl:Thing", !uris.contains( OWL.Thing.getURI() ));        
+//        Assert.assertTrue("uris contained owl:Thing", !uris.contains( OWL.Thing.getURI() ));
     }
-String n3ForPresentationClass = 
+String n3ForPresentationClass =
     "@prefix dc:      <http://purl.org/dc/elements/1.1/> . \n" +
     "@prefix pvs:     <http://vivoweb.org/ontology/provenance-support#> . \n" +
     "@prefix geo:     <http://aims.fao.org/aos/geopolitical.owl#> . \n" +
@@ -136,16 +136,16 @@ String n3ForPresentationClass =
     "      a       core:Presentation ; \n" +
     "      vitro:mostSpecificType \n" +
     "              core:Presentation . \n" +
-    " \n " + 
+    " \n " +
     "<http://vivo.scripps.edu/individual/n9998> \n" +
-    "      a       core:BogusClass . \n" +   
+    "      a       core:BogusClass . \n" +
     "<http://vivo.scripps.edu/individual/n9999> \n" +
     "      a       core:BogusClass . \n" +
-    " \n" +    
+    " \n" +
     "core:InvitedTalk \n" +
     "      rdfs:subClassOf core:Presentation . \n" +
     " \n" ;
- 
-   
-  
-}
\ No newline at end of file
+
+
+
+}
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForObjectPropertiesTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForObjectPropertiesTest.java
index 3230bacf0..038c25453 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForObjectPropertiesTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForObjectPropertiesTest.java
@@ -27,7 +27,7 @@ public class AdditionalURIsForObjectPropertiesTest {
     Model model;
     RDFService rdfService;
     AdditionalURIsForObjectProperties aufop;
-    
+
     String testNS = "http://example.com/test#";
     String n3 = "" +
     	"@prefix owl: <http://www.w3.org/2002/07/owl#> .\n" +
@@ -43,102 +43,102 @@ public class AdditionalURIsForObjectPropertiesTest {
         "test:bob a test:Person .  \n" +
         "test:bob a owl:Thing .  \n" +
         "test:bob test:likes [ rdfs:label \"this is a blank node\" ] . ";
-    
+
     @Before
     public void setUp() throws Exception {
         model = ModelFactory.createDefaultModel();
         model.read(new StringReader(n3 ), null , "N3");
         rdfService = new RDFServiceModel(model);
-        
+
         ContextModelAccessStub models = new ContextModelAccessStub();
         models.setRDFService(CONTENT, rdfService);
-        
+
         aufop = new AdditionalURIsForObjectProperties();
         aufop.setContextModels(models);
     }
 
     @Test
     public void testChangeOfRdfsLabel() {
-        List<String> uris = aufop.findAdditionalURIsToIndex( 
+        List<String> uris = aufop.findAdditionalURIsToIndex(
                 ResourceFactory.createStatement(
                         ResourceFactory.createResource(testNS + "bob"),
                         RDFS.label,
                         ResourceFactory.createPlainLiteral("Some new label for bob")));
-        
+
         Assert.assertNotNull(uris);
-        Assert.assertTrue("uris was empty", uris.size() > 0 );        
-        
+        Assert.assertTrue("uris was empty", uris.size() > 0 );
+
         Assert.assertTrue("uris didn't not contain test:onions", uris.contains(testNS+"onions"));
         Assert.assertTrue("uris didn't not contain test:cheese", uris.contains(testNS+"cheese"));
         Assert.assertTrue("uris didn't not contain test:icecream", uris.contains(testNS+"icecream"));
-        
+
         Assert.assertTrue("uris contained test:Person", !uris.contains(testNS+"Person"));
         Assert.assertTrue("uris contained owl:Thing", !uris.contains( OWL.Thing.getURI() ));
-        
+
         Assert.assertEquals(3, uris.size());
     }
-    
+
     @Test
     public void testChangeOfObjPropStmt() {
-        List<String> uris = aufop.findAdditionalURIsToIndex( 
+        List<String> uris = aufop.findAdditionalURIsToIndex(
                 ResourceFactory.createStatement(
                         ResourceFactory.createResource(testNS + "bob"),
                         ResourceFactory.createProperty(testNS+"likes"),
                         ResourceFactory.createResource(testNS+"cheese")));
-        
+
         Assert.assertNotNull(uris);
-        Assert.assertTrue("uris was empty", uris.size() > 0 );        
-        
+        Assert.assertTrue("uris was empty", uris.size() > 0 );
+
         Assert.assertTrue("uris didn't not contain test:cheese", uris.contains(testNS+"cheese"));
-        
+
         Assert.assertTrue("uris contained test:Person", !uris.contains(testNS+"Person"));
         Assert.assertTrue("uris contained owl:Thing", !uris.contains( OWL.Thing.getURI() ));
-        Assert.assertTrue("uris contained test:onions", !uris.contains(testNS+"onions"));        
+        Assert.assertTrue("uris contained test:onions", !uris.contains(testNS+"onions"));
         Assert.assertTrue("uris contained test:icecream", !uris.contains(testNS+"icecream"));
-        
+
         Assert.assertEquals(1, uris.size());
     }
-    
+
     @Test
     public void testOfDataPropChange() {
-        List<String> uris = aufop.findAdditionalURIsToIndex( 
+        List<String> uris = aufop.findAdditionalURIsToIndex(
                 ResourceFactory.createStatement(
                         ResourceFactory.createResource(testNS + "bob"),
                         ResourceFactory.createProperty(testNS+"hatsize"),
                         ResourceFactory.createPlainLiteral("Some new hat size for bob")));
-        
+
         Assert.assertNotNull(uris);
-        Assert.assertTrue("uris was not empty", uris.size() == 0 );                        
+        Assert.assertTrue("uris was not empty", uris.size() == 0 );
     }
-    
+
     // For NIHVIVO-2902
     @Test
     public void testNIHVIVO_2902 (){
         //Update search index for research area when a statement is
         //removed between a person and the research area.
-        
+
         Model model = ModelFactory.createDefaultModel();
         model.read(new StringReader( n3ForNIHVIVO_2902 ), null , "N3");
-        
+
         ContextModelAccessStub models = new ContextModelAccessStub();
         models.setRDFService(CONTENT, new RDFServiceModel(model));
 
         aufop.setContextModels(models);
-        
-        List<String> uris = aufop.findAdditionalURIsToIndex( 
+
+        List<String> uris = aufop.findAdditionalURIsToIndex(
                 ResourceFactory.createStatement(
                         ResourceFactory.createResource("http://caruso-laptop.mannlib.cornell.edu:8090/vivo/individual/n2241"),
                         ResourceFactory.createProperty("http://vivoweb.org/ontology/core#hasResearchArea"),
                         ResourceFactory.createResource("http://caruso-laptop.mannlib.cornell.edu:8090/vivo/individual/n7416")));
-        
+
         Assert.assertNotNull(uris);
         Assert.assertTrue("uris was empty", uris.size() > 0 );
-        
-        Assert.assertTrue("NIHVIVO-2902 regression, research area is not getting reindexed", uris.contains("http://caruso-laptop.mannlib.cornell.edu:8090/vivo/individual/n7416"));       
+
+        Assert.assertTrue("NIHVIVO-2902 regression, research area is not getting reindexed", uris.contains("http://caruso-laptop.mannlib.cornell.edu:8090/vivo/individual/n7416"));
     }
-    
+
     // For NIHVIVO-2902
-    String n3ForNIHVIVO_2902 = 
+    String n3ForNIHVIVO_2902 =
         "@prefix dc:      <http://purl.org/dc/elements/1.1/> . \n" +
         "@prefix pvs:     <http://vivoweb.org/ontology/provenance-support#> . \n" +
         "@prefix geo:     <http://aims.fao.org/aos/geopolitical.owl#> . \n" +
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForTypeStatementsTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForTypeStatementsTest.java
index 044be09f9..414227c9e 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForTypeStatementsTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForTypeStatementsTest.java
@@ -31,14 +31,14 @@ public class AdditionalURIsForTypeStatementsTest {
         AdditionalURIsForTypeStatements aufts = new AdditionalURIsForTypeStatements();
 
         String subject = "http://caruso-laptop.mannlib.cornell.edu:8090/vivo/individual/n3270";
-        Statement typeChangeStatement =  ResourceFactory.createStatement(                
+        Statement typeChangeStatement =  ResourceFactory.createStatement(
                 ResourceFactory.createResource(subject),
                 ResourceFactory.createProperty("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"),
                 ResourceFactory.createResource( "http://caruso-laptop.mannlib.cornell.edu:8090/vivo/ontology/localOnt#LocalInternalClass"));
-                  
-        
+
+
         List<String> uris = aufts.findAdditionalURIsToIndex( typeChangeStatement );
-        
+
         Assert.assertNotNull(uris);
         Assert.assertTrue("Did not contain subject of type change statement", uris.contains(subject));
     }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/SelectQueryUriFinderTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/SelectQueryUriFinderTest.java
index 970337b3e..8a58d0c03 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/SelectQueryUriFinderTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/SelectQueryUriFinderTest.java
@@ -33,20 +33,20 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.model.RDFServiceMod
 
 /**
  * TODO
- * 
+ *
  * If the statement qualifies, execute the queries and return the accumulated
  * results.
- * 
+ *
  * A statement qualifies if the predicate matches any of the restrictions, or if
  * there are no restrictions.
- * 
+ *
  * If a query contains a ?subject or ?object variable, it will be bound to the
  * URI of the subject or object of the statement, respectively. If the subject
  * or object has no URI for the query, then the query will be ignored.
- * 
+ *
  * All of the result fields of all result rows of all of the queries will be
  * returned.
- * 
+ *
  * A label may be supplied to the instance, for use in logging. If no label is
  * supplied, one will be generated.
  */
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBaseTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBaseTest.java
index 92e8d2ebd..1107dbd15 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBaseTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBaseTest.java
@@ -5,10 +5,10 @@ package edu.cornell.mannlib.vitro.webapp.servlet.setup;
 import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
 
 public class UpdateKnowledgeBaseTest extends AbstractTestClass {
-	
+
 	@org.junit.Test
 	public void testMigrateDisplayModel14() {
 
     }
-	
+
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/test/JenaOntologyLoader.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/test/JenaOntologyLoader.java
index 70f984634..b8cc98204 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/test/JenaOntologyLoader.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/test/JenaOntologyLoader.java
@@ -17,30 +17,30 @@ import org.apache.jena.rdf.model.ModelFactory;
  */
 public class JenaOntologyLoader {
     public OntModel ontModel = null;
-    
+
     /**
      * This should load the system with classes, data properties and
      * object properties that the vitro systems needs.
-     *  
+     *
      * @throws Exception
      */
-    OntModel loadSystemAndUsers() throws Exception{        
-        Model model = ModelFactory.createDefaultModel();        
-        for( String ont : systemOnts){                    
+    OntModel loadSystemAndUsers() throws Exception{
+        Model model = ModelFactory.createDefaultModel();
+        for( String ont : systemOnts){
             InputStream in = this.getClass().getResourceAsStream(ont);
             model.read(in,null);
             in.close();
-        }        
-        ontModel = ModelFactory.createOntologyModel(ONT_MODEL_SPEC,model);        
-        ontModel.prepare();    
+        }
+        ontModel = ModelFactory.createOntologyModel(ONT_MODEL_SPEC,model);
+        ontModel.prepare();
         return ontModel;
     }
 
-    
+
     /**
      * Loads a owl file into the ontModel.  Looks for files on classpath.
-     * example: loadSpecialVivoModel("/testontologies/smallVivo-20070809.owl") 
-     * 
+     * example: loadSpecialVivoModel("/testontologies/smallVivo-20070809.owl")
+     *
      * @param junk Junk value
      * @throws IOException
      */
@@ -49,19 +49,19 @@ public class JenaOntologyLoader {
         Model model = ModelFactory.createDefaultModel();
         model.read(in,null);
         in.close();
-            
-        ontModel.add(model);         
-        ontModel.prepare();    
-        return ontModel;                
+
+        ontModel.add(model);
+        ontModel.prepare();
+        return ontModel;
     }
-    
-    static String systemOnts[] ={    
+
+    static String systemOnts[] ={
         "/testontologies/vitro1.owl",
         "/testontologies/vivo-users.owl" };
-    
+
     static String testOnt[] ={
         "/testontologies/smallVivo-20070809.owl" };
-    
+
     static OntModelSpec ONT_MODEL_SPEC = OntModelSpec.OWL_DL_MEM; // no additional entailment reasoning
 
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderTest.java
index a0ebfa672..bfd88db4a 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderTest.java
@@ -33,7 +33,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.configuration.WrappedInstance.Reso
 
 /**
  * TODO
- * 
+ *
  * Circularity prevention. Before setting properties, create a WeakMap of
  * instances by URIs, so if a property refers to a created instance, we just
  * pass it in.
@@ -387,14 +387,14 @@ public class ConfigurationBeanLoaderTest extends
 
 		SimpleSuccess instance = loader.loadInstance(
 				SIMPLE_SUCCESS_INSTANCE_URI, SimpleSuccess.class);
-		
+
 		assertNotNull(instance);
 	}
-	
+
 	public static class SimpleSuccess {
 		// Nothing of interest.
 	}
-	
+
 	// --------------------------------------------
 
 	/**
@@ -599,7 +599,7 @@ public class ConfigurationBeanLoaderTest extends
 
 	/**
 	 * FullSuccess already tests for multiple validation methods.
-	 * 
+	 *
 	 * SimpleSuccess already test for no validation methods, and for no property
 	 * methods.
 	 */
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader_PropertyTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader_PropertyTest.java
index 22b5e278a..f5d3d5877 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader_PropertyTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader_PropertyTest.java
@@ -269,7 +269,7 @@ public class ConfigurationBeanLoader_PropertyTest extends
 						"Value"),
 				dataProperty(GENERIC_INSTANCE_URI, OTHER_PROPERTY_URI,
 						100.0F) });
-		
+
 		expectSimpleFailure(
 				DistinctPropertyMethodSubclass.class,
 				throwable(ConfigurationBeanLoaderException.class,
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtilsTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtilsTest.java
index 4014042f6..5906724f6 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtilsTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtilsTest.java
@@ -23,24 +23,24 @@ import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 
 public class DataGetterUtilsTest extends AbstractTestClass{
-    
+
     OntModel displayModel;
     VitroRequest vreq;
     String testDataGetterURI_1 = "http://vitro.mannlib.cornell.edu/ontologies/display/1.1#query1data";
     String pageURI_1 = "http://vitro.mannlib.cornell.edu/ontologies/display/1.1#SPARQLPage";
     String pageX = "http://vitro.mannlib.cornell.edu/ontologies/display/1.1#pageX";
     String dataGetterX = "http://vitro.mannlib.cornell.edu/ontologies/display/1.1#pageDataGetterX";
-    
+
     @Before
-    public void setUp() throws Exception {    
+    public void setUp() throws Exception {
         // Suppress error logging.
         setLoggerLevel(RDFDefaultErrorHandler.class, Level.OFF);
-        
-        Model model = ModelFactory.createDefaultModel();        
+
+        Model model = ModelFactory.createDefaultModel();
         InputStream in = DataGetterUtilsTest.class.getResourceAsStream("resources/dataGetterTest.n3");
-        model.read(in,"","N3");        
+        model.read(in,"","N3");
         displayModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM,model);
-        
+
         vreq = new VitroRequest(new HttpServletRequestStub());
     }
 
@@ -57,16 +57,16 @@ public class DataGetterUtilsTest extends AbstractTestClass{
         DataGetter dg = DataGetterUtils.dataGetterForURI(vreq, displayModel, testDataGetterURI_1);
         Assert.assertNotNull(dg);
     }
-    
+
     @Test
     public void testGetDataGettersForPage() throws IllegalArgumentException, SecurityException, InstantiationException, IllegalAccessException, ClassNotFoundException, InvocationTargetException, NoSuchMethodException {
-        List<DataGetter> dgList = 
+        List<DataGetter> dgList =
             DataGetterUtils.getDataGettersForPage(vreq, displayModel, pageURI_1);
         Assert.assertNotNull(dgList);
         Assert.assertTrue("List of DataGetters was empty, it should not be.", dgList.size() > 0);
     }
 
 
-    
+
 
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetterTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetterTest.java
index 03ab49a90..8cb9279ef 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetterTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetterTest.java
@@ -29,26 +29,26 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.SimpleOntModelSelector;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactoryJena;
 
 public class SparqlQueryDataGetterTest extends AbstractTestClass{
-    
+
     OntModel displayModel;
     String testDataGetterURI_1 = "http://vitro.mannlib.cornell.edu/ontologies/display/1.1#query1data";
     WebappDaoFactory wdf;
     VitroRequest vreq;
-    
+
     @Before
     public void setUp() throws Exception {
         // Suppress error logging.
         setLoggerLevel(RDFDefaultErrorHandler.class, Level.OFF);
 
-        OntModel model = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM);        
+        OntModel model = ModelFactory.createOntologyModel( OntModelSpec.OWL_MEM);
         InputStream in = SparqlQueryDataGetterTest.class.getResourceAsStream("resources/dataGetterTest.n3");
-        model.read(in,"","N3");        
+        model.read(in,"","N3");
         displayModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM,model);
-        
+
         SimpleOntModelSelector sos = new SimpleOntModelSelector( ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM));
-        sos.setDisplayModel(displayModel);            
-        wdf = new WebappDaoFactoryJena(sos);    
-        
+        sos.setDisplayModel(displayModel);
+        wdf = new WebappDaoFactoryJena(sos);
+
         vreq = new VitroRequest(new HttpServletRequestStub());
     }
 
@@ -59,27 +59,27 @@ public class SparqlQueryDataGetterTest extends AbstractTestClass{
         Assert.assertTrue(
                 "DataGetter should be of type " + SparqlQueryDataGetter.class.getName(),
                 dg instanceof SparqlQueryDataGetter);
-        
+
         SparqlQueryDataGetter sdg = (SparqlQueryDataGetter)dg;
-        
-        
+
+
         Model dataModel = ModelFactory.createDefaultModel();
         String bobURI = "http://example.com/p/bob";
         dataModel.add(ResourceFactory.createResource(bobURI), RDF.type, ResourceFactory.createResource("http://xmlns.com/foaf/0.1/Person"));
-        
+
         Map<String, String> params = Collections.emptyMap();
-        
+
         Map<String,Object> mapOut = sdg.doQueryOnModel(sdg.queryText, dataModel);
-        
+
         Assert.assertNotNull(mapOut);
         Assert.assertTrue("should contain key people" , mapOut.containsKey("people"));
-        
-        Object obj = mapOut.get("people");        
-        Assert.assertTrue("people should be a List, it is " + obj.getClass().getName(), obj instanceof List);        
+
+        Object obj = mapOut.get("people");
+        Assert.assertTrue("people should be a List, it is " + obj.getClass().getName(), obj instanceof List);
         List people = (List)obj;
-        
+
         Assert.assertEquals(1, people.size());
-        
+
         Map<String,String> first = (Map<String, String>) people.get(0);
         Assert.assertEquals(bobURI, first.get("uri"));
     }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/ingest/JenaIngestUtilsTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/ingest/JenaIngestUtilsTest.java
index c6b494154..18c615a6a 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/ingest/JenaIngestUtilsTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/ingest/JenaIngestUtilsTest.java
@@ -23,18 +23,18 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.model.RDFServiceMod
 import edu.cornell.mannlib.vitro.webapp.utils.jena.JenaIngestUtils;
 
 public class JenaIngestUtilsTest {
-    
+
     private final Log log = LogFactory.getLog(JenaIngestUtilsTest.class);
-    
+
     protected JenaIngestUtils utils = new JenaIngestUtils();
-    
+
     protected Model makeModel() {
         Model base = ModelFactory.createDefaultModel();
         RDFService rdfService = new RDFServiceModel(base);
         return RDFServiceGraph.createRDFServiceModel(
                 new RDFServiceGraph(rdfService));
     }
-    
+
     @Test
     public void testSmush() {
         Model model = makeModel();
@@ -60,7 +60,7 @@ public class JenaIngestUtilsTest {
             		s.toString());
         }
     }
-    
+
     @Test
     public void testRenameBNodes() {
         Model initialState = ModelFactory.createDefaultModel();
@@ -68,7 +68,7 @@ public class JenaIngestUtilsTest {
                 "renameBlank.n3"), null, "N3");
         Model renamedState = utils.renameBNodes(
                 initialState, "http://example.org/node/n");
-        Assert.assertEquals("Post-rename model is not the same size as the " + 
+        Assert.assertEquals("Post-rename model is not the same size as the " +
                 "initial model", initialState.size(), renamedState.size());
         StmtIterator sit = renamedState.listStatements();
         boolean lingeringBNodes = false;
@@ -80,12 +80,12 @@ public class JenaIngestUtilsTest {
         }
         if(lingeringBNodes) {
             StringWriter s = new StringWriter();
-            renamedState.write(s, "N3");            
-            Assert.fail("Renamed model still contains blank nodes \n" + 
+            renamedState.write(s, "N3");
+            Assert.fail("Renamed model still contains blank nodes \n" +
                     s.toString());
         }
     }
-    
+
     @Test
     public void testGenerateTBox() {
         Model abox = ModelFactory.createDefaultModel();
@@ -96,11 +96,11 @@ public class JenaIngestUtilsTest {
                 "tbox.n3"), null, "N3");
         Model generatedTBox = utils.generateTBox(abox);
         //log.warn(tbox.toString());
-        Assert.assertTrue("Generated TBox does not match expected result", 
+        Assert.assertTrue("Generated TBox does not match expected result",
                 tbox.isIsomorphicWith(generatedTBox));
     }
-    
-    @Test 
+
+    @Test
     public void testDoMerge() {
         OntModel model = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, makeModel());
         OntModel tbox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, makeModel());
@@ -113,7 +113,7 @@ public class JenaIngestUtilsTest {
         utils.doMerge("http://example.com/ns/n1", "http://example.com/ns/n1", model, tbox, false);
         Assert.assertTrue("Merged model with multiple labels does not match " +
                 "expected result", expectedMergeMultipleLabels.isIsomorphicWith(model));
-        
+
         model = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, makeModel());
         model.read(JenaIngestUtilsTest.class.getResourceAsStream(
                 "merge.n3"), null, "N3");
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtilsTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtilsTest.java
index 8805e5cf4..8ef91b337 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtilsTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtilsTest.java
@@ -17,25 +17,25 @@ public class JenaIngestUtilsTest extends AbstractTestClass {
 
 	@Test
 	public void testRenameBNodes() {
-		
+
 		JenaIngestUtils jiu = new JenaIngestUtils();
-		
+
 		Model blankModel = ModelFactory.createDefaultModel();
 		for (int i = 0; i < 20; i++) {
 			blankModel.add(blankModel.createResource(), RDF.type, OWL.Thing);
 		}
 		Assert.assertTrue(blankModel.size() == 20);
-		
+
 		Model named = jiu.renameBNodes(blankModel, "http://example.org/resource");
 		Assert.assertTrue(named.size() == blankModel.size());
 		Assert.assertTrue(named.size() == 20);
-		
+
 		StmtIterator stmtIt = named.listStatements();
 		while (stmtIt.hasNext()) {
 			Statement stmt = stmtIt.nextStatement();
 			Assert.assertEquals("http://example.org/", stmt.getSubject().getNameSpace());
 		}
-		
+
 	}
-	
+
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/json/JacksonUtilsTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/json/JacksonUtilsTest.java
index 6fda141a8..b5e27fafe 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/json/JacksonUtilsTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/json/JacksonUtilsTest.java
@@ -10,8 +10,8 @@ import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
 
 /**
  * quotes,\, \r, \n, \b, \f, \t and other control characters.
- * 
- * 
+ *
+ *
  */
 public class JacksonUtilsTest extends AbstractTestClass {
 
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/ContentTypeTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/ContentTypeTest.java
index 89721e980..c55f30c1c 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/ContentTypeTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/ContentTypeTest.java
@@ -24,7 +24,7 @@ public class ContentTypeTest {
         Assert.assertEquals(0.5f, map.get("text/rdf+n3"), 0.01f);
         Assert.assertEquals(0.8f,map.get("*/*"), 0.01f);
     }
-    
+
     @Test
     public void typeAndQTest2(){
         Map<String,Float> map = ContentType.getTypesAndQ(
@@ -32,32 +32,32 @@ public class ContentTypeTest {
         Assert.assertEquals(1.0f, map.get("text/html"), 0.01f);
         Assert.assertEquals(1.0f, map.get("application/xhtml+xml"), 0.01f);
         Assert.assertEquals(0.9f, map.get("application/xml"), 0.01f);
-        Assert.assertEquals(0.8f,map.get("*/*"), 0.01f);               
+        Assert.assertEquals(0.8f,map.get("*/*"), 0.01f);
     }
-    
+
     @Test
     public void testWeightedBestContentTypeForTabulator(){
         //accept header from tabulator
         Map<String,Float> clientAccepts = ContentType.getTypesAndQ(
         "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8,application/rdf+xml;q=0.93,text/rdf+n3;q=0.5");
-        
+
         Map<String,Float> serverTypes = IndividualController.ACCEPTED_CONTENT_TYPES;
-        
-        Assert.assertEquals("application/rdf+xml", ContentType.getBestContentType(clientAccepts, serverTypes)); 
+
+        Assert.assertEquals("application/rdf+xml", ContentType.getBestContentType(clientAccepts, serverTypes));
     }
- 
+
     /**
      * Modified this, added q-factor to text/html, because otherwise the result is indeterminate, and the
      * test fails in Java 8.
-     */ 
+     */
     @Test
     public void testWeightedBestContentTypeForFirefox(){
         //accept header from normal firefox
         Map<String,Float> clientAccepts = ContentType.getTypesAndQ(
         "text/html;q=0.95,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
-        
+
         Map<String,Float> serverTypes = IndividualController.ACCEPTED_CONTENT_TYPES;
-        
-        Assert.assertEquals("application/xhtml+xml", ContentType.getBestContentType(clientAccepts, serverTypes)); 
+
+        Assert.assertEquals("application/xhtml+xml", ContentType.getBestContentType(clientAccepts, serverTypes));
     }
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/BaseTemplateModelTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/BaseTemplateModelTest.java
index c61ab5b55..d1c898f9a 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/BaseTemplateModelTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/BaseTemplateModelTest.java
@@ -7,16 +7,16 @@ import org.junit.Test;
 public class BaseTemplateModelTest {
 
     private static String value;
-    
-    @Test 
+
+    @Test
     public void testCleanURIofNull(){
-        
+
         BaseTemplateModel btm = new BaseTemplateModel(){};
         //should not throw NPE
         value = btm.cleanURIForDisplay( null );
-        
+
         //should not throw NPE
-        value = btm.cleanTextForDisplay( null );                
+        value = btm.cleanTextForDisplay( null );
     }
 
 }
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/TagsTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/TagsTest.java
index 11fadb585..0d6b5b10d 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/TagsTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/TagsTest.java
@@ -245,4 +245,4 @@ public class TagsTest extends AbstractTestClass {
         return t.list();
     }
 
-}
\ No newline at end of file
+}
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFileTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFileTest.java
index e82e22b07..95b2862f6 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFileTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFileTest.java
@@ -25,7 +25,7 @@ import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
 public class CustomListViewConfigFileTest extends AbstractTestClass {
 	/**
 	 * Use this XML to test the methods that strip tags from the select clause.
-	 * 
+	 *
 	 * If not collated, omit the "collated" tag. If editing, omit the
 	 * "critical-data-required" tag.
 	 */
@@ -41,7 +41,7 @@ public class CustomListViewConfigFileTest extends AbstractTestClass {
 	/**
 	 * In general, we expect no exception, but individual tests may override,
 	 * like this:
-	 * 
+	 *
 	 * <pre>
 	 * thrown.expect(InvalidConfigurationException.class);
 	 * thrown.expectMessage(&quot;Bozo&quot;);
@@ -204,7 +204,7 @@ public class CustomListViewConfigFileTest extends AbstractTestClass {
 	 * TODO Successes:
 	 *   select query with all tags
 	 *   	collated, editing, both, neither
-	 * 
+	 *
 	 * </pre>
 	 */
 
diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java
index 08d5c0e79..d7ce9c7c3 100644
--- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java
+++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java
@@ -74,13 +74,13 @@ public class ObjectPropertyTemplateModel_PropertyListConfigTest extends
 	private TemplateLoaderStub tl;
 
 	private StringWriter logMessages;
-	
+
 	private ModelAccessFactoryStub mafs;
 
 	/**
 	 * In general, we expect no exception, but individual tests may override,
 	 * like this:
-	 * 
+	 *
 	 * <pre>
 	 * thrown.expect(InvalidConfigurationException.class);
 	 * thrown.expectMessage(&quot;Bozo&quot;);
@@ -138,7 +138,7 @@ public class ObjectPropertyTemplateModel_PropertyListConfigTest extends
 		hreq.setSession(session);
 
 		vreq = new VitroRequest(hreq);
-		
+
 		mafs = new ModelAccessFactoryStub();
 		mafs.get(vreq).setWebappDaoFactory(wadf, ASSERTIONS_AND_INFERENCES);
 		mafs.get(vreq).setWebappDaoFactory(wadf, POLICY_NEUTRAL);
@@ -394,7 +394,7 @@ public class ObjectPropertyTemplateModel_PropertyListConfigTest extends
 	/**
 	 * Sets up an operation with name "foobar" and adds it to the
 	 * ObjectPropertyDaoStub.
-	 * 
+	 *
 	 * The URI will be "http://foobar", and the ListViewConfig file will be
 	 * "testConfig-foobar.xml". That file is assumed to exist already, and to be
 	 * mapped in the ServletContextStub.
diff --git a/api/src/test/java/freemarker/ext/dump/DumpAllDirectiveTest.java b/api/src/test/java/freemarker/ext/dump/DumpAllDirectiveTest.java
index c7fae4187..32159ba49 100644
--- a/api/src/test/java/freemarker/ext/dump/DumpAllDirectiveTest.java
+++ b/api/src/test/java/freemarker/ext/dump/DumpAllDirectiveTest.java
@@ -44,57 +44,57 @@ public class DumpAllDirectiveTest {
         Logger.getLogger(BaseDumpDirective.class).setLevel(Level.OFF);
     }
 
-    @Test 
+    @Test
     public void dumpDataModel() {
- 
+
         Map<String, Object> dataModel = new HashMap<String, Object>();
-        
+
         String stringName = "dog";
         String stringVal = "Rover";
         dataModel.put(stringName, stringVal);
-        
+
         String boolName = "isLoggedIn";
         boolean boolVal = true;
         dataModel.put(boolName, boolVal);
-        
+
         String intName = "tabCount";
         int intVal = 7;
         dataModel.put(intName, intVal);
-        
+
         String dateName = "now";
         Date dateVal = new Date();
         dataModel.put(dateName, dateVal);
-        
+
         String listName = "fruit";
         List<String> listVal = new ArrayList<String>();
         listVal.add("apples");
         listVal.add("bananas");
         listVal.add("oranges");
         dataModel.put(listName, listVal);
-        
+
         SortedMap<String, Object> expectedDump = new TreeMap<String, Object>();
-        
+
         Map<String, Object> expectedStringDump = new HashMap<String, Object>();
         expectedStringDump.put(Key.TYPE.toString(), Type.STRING);
         expectedStringDump.put(Key.VALUE.toString(), stringVal);
         expectedDump.put(stringName, expectedStringDump);
-        
+
         Map<String, Object> expectedBoolDump = new HashMap<String, Object>();
         expectedBoolDump.put(Key.TYPE.toString(), Type.BOOLEAN);
         expectedBoolDump.put(Key.VALUE.toString(), boolVal);
         expectedDump.put(boolName, expectedBoolDump);
-        
+
         Map<String, Object> expectedIntDump = new HashMap<String, Object>();
         expectedIntDump.put(Key.TYPE.toString(), Type.NUMBER);
         expectedIntDump.put(Key.VALUE.toString(), intVal);
         expectedDump.put(intName, expectedIntDump);
-        
+
         Map<String, Object> expectedDateDump = new HashMap<String, Object>();
         expectedDateDump.put(Key.TYPE.toString(), Type.DATE);
         expectedDateDump.put(Key.DATE_TYPE.toString(), DateType.UNKNOWN);
         expectedDateDump.put(Key.VALUE.toString(), dateVal);
         expectedDump.put(dateName, expectedDateDump);
-        
+
         Map<String, Object> expectedListDump = new HashMap<String, Object>();
         expectedListDump.put(Key.TYPE.toString(), Type.SEQUENCE);
         List<Map<String, Object>> listItemsExpectedDump = new ArrayList<Map<String, Object>>(listVal.size());
@@ -102,32 +102,32 @@ public class DumpAllDirectiveTest {
             Map<String, Object> itemDump = new HashMap<String, Object>();
             itemDump.put(Key.TYPE.toString(), Type.STRING);
             itemDump.put(Key.VALUE.toString(), str);
-            listItemsExpectedDump.add(itemDump);            
+            listItemsExpectedDump.add(itemDump);
         }
         expectedListDump.put(Key.VALUE.toString(), listItemsExpectedDump);
         expectedDump.put(listName, expectedListDump);
-        
+
         SortedMap<String, Object> dump = getDump(dataModel);
         assertEquals(expectedDump, dump);
-        
+
         // Test sorting of the data model
         List<String> expectedKeys = new ArrayList<String>(expectedDump.keySet());
         List<String> actualKeys = new ArrayList<String>(dump.keySet());
         assertEquals(expectedKeys, actualKeys);
-        
+
     }
-    
-    
+
+
     /////////////////////////// Private helper methods ///////////////////////////
 
     private SortedMap<String, Object> getDump(Map<String, Object> dataModel) {
         try {
             Environment env = template.createProcessingEnvironment(dataModel, new StringWriter());
-            return new DumpAllDirective().getDataModelDump(env);     
+            return new DumpAllDirective().getDataModelDump(env);
         } catch (Exception e) {
             fail(e.getMessage());
             return null;
-        }             
-    }    
+        }
+    }
 
 }
diff --git a/api/src/test/java/freemarker/ext/dump/DumpDirectiveTest.java b/api/src/test/java/freemarker/ext/dump/DumpDirectiveTest.java
index 8816672ba..346894c2c 100644
--- a/api/src/test/java/freemarker/ext/dump/DumpDirectiveTest.java
+++ b/api/src/test/java/freemarker/ext/dump/DumpDirectiveTest.java
@@ -53,12 +53,12 @@ import freemarker.template.TemplateModelException;
  * 2. Create the expected dump data structure
  * 3. Create the actual dump data structure by running the data model through a processing environment
  * 4. Compare expected and actual dump data structures
- * 
+ *
  * @author rjy7
  *
  */
 public class DumpDirectiveTest {
-    
+
     private Template template;
 
     @Before
@@ -76,85 +76,85 @@ public class DumpDirectiveTest {
 
     @Test
     public void dumpUndefinedValue() {
-        
+
         String varName = "dog";
         Map<String, Object> dataModel = new HashMap<String, Object>();
-        
+
         Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
         expectedDumpValue.put(Key.VALUE.toString(), Value.UNDEFINED.toString());
 
         Map<String, Object> expectedDump = new HashMap<String, Object>();
         expectedDump.put(varName, expectedDumpValue);
-        
+
         test(varName, dataModel, expectedDump);
     }
-    
+
     @Test
     public void dumpString() {
-        
+
         String varName = "dog";
         Map<String, Object> dataModel = new HashMap<String, Object>();
-        
+
         String value = "Rover";
         dataModel.put(varName, value);
-         
+
         Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
         expectedDumpValue.put(Key.TYPE.toString(), Type.STRING);
         expectedDumpValue.put(Key.VALUE.toString(), value);
 
         Map<String, Object> expectedDump = new HashMap<String, Object>();
         expectedDump.put(varName, expectedDumpValue);
-        
+
         test(varName, dataModel, expectedDump);
     }
-    
+
     @Test
     public void dumpBoolean() {
 
         String varName = "isLoggedIn";
         Map<String, Object> dataModel = new HashMap<String, Object>();
-        
+
         boolean value = true;
         dataModel.put(varName, value);
-         
+
         Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
         expectedDumpValue.put(Key.TYPE.toString(), Type.BOOLEAN);
         expectedDumpValue.put(Key.VALUE.toString(), value);
 
         Map<String, Object> expectedDump = new HashMap<String, Object>();
         expectedDump.put(varName, expectedDumpValue);
-        
-        test(varName, dataModel, expectedDump);     
+
+        test(varName, dataModel, expectedDump);
     }
-    
+
     @Test
     public void dumpNumber() {
-        
+
         String varName = "tabCount";
         Map<String, Object> dataModel = new HashMap<String, Object>();
-        
+
         int value = 7;
         dataModel.put(varName, value);
-         
+
         Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
         expectedDumpValue.put(Key.TYPE.toString(), Type.NUMBER);
         expectedDumpValue.put(Key.VALUE.toString(), value);
 
         Map<String, Object> expectedDump = new HashMap<String, Object>();
         expectedDump.put(varName, expectedDumpValue);
-        
-        test(varName, dataModel, expectedDump);         
+
+        test(varName, dataModel, expectedDump);
     }
-    
+
     @Test
     public void dumpSimpleDate() {
 
         String varName = "now";
         Map<String, Object> dataModel = new HashMap<String, Object>();
-        
+
         Date now = new Date();
         dataModel.put(varName, now);
-         
+
         Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
         expectedDumpValue.put(Key.TYPE.toString(), Type.DATE);
         expectedDumpValue.put(Key.DATE_TYPE.toString(), DateType.UNKNOWN);
@@ -162,7 +162,7 @@ public class DumpDirectiveTest {
 
         Map<String, Object> expectedDump = new HashMap<String, Object>();
         expectedDump.put(varName, expectedDumpValue);
-        
+
         test(varName, dataModel, expectedDump);
     }
 
@@ -171,12 +171,12 @@ public class DumpDirectiveTest {
 
         String varName = "myDate";
         Map<String, Object> dataModel = new HashMap<String, Object>();
-        
+
         Calendar c = Calendar.getInstance();
         c.set(1991, Calendar.MAY, 5);
         Date myDate = c.getTime();
         dataModel.put("myDate", myDate);
-         
+
         Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
         expectedDumpValue.put(Key.TYPE.toString(), Type.DATE);
         expectedDumpValue.put(Key.DATE_TYPE.toString(), DateType.UNKNOWN);
@@ -184,18 +184,18 @@ public class DumpDirectiveTest {
 
         Map<String, Object> expectedDump = new HashMap<String, Object>();
         expectedDump.put(varName, expectedDumpValue);
-        
+
         test(varName, dataModel, expectedDump);
     }
     @Test
     public void dumpDateTime() {
-        
+
         String varName = "timestamp";
         Map<String, Object> dataModel = new HashMap<String, Object>();
-        
+
         Timestamp ts = new Timestamp(1302297332043L);
         dataModel.put(varName, ts);
-         
+
         Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
         expectedDumpValue.put(Key.TYPE.toString(), Type.DATE);
         expectedDumpValue.put(Key.DATE_TYPE.toString(), DateType.DATETIME);
@@ -203,19 +203,19 @@ public class DumpDirectiveTest {
 
         Map<String, Object> expectedDump = new HashMap<String, Object>();
         expectedDump.put(varName, expectedDumpValue);
-        
+
         test(varName, dataModel, expectedDump);
     }
 
     @Test
     public void dumpSqlDate() {
-        
+
         String varName = "date";
         Map<String, Object> dataModel = new HashMap<String, Object>();
-        
+
         java.sql.Date date = new java.sql.Date(1302297332043L);
         dataModel.put(varName, date);
-         
+
         Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
         expectedDumpValue.put(Key.TYPE.toString(), Type.DATE);
         expectedDumpValue.put(Key.DATE_TYPE.toString(), DateType.DATE);
@@ -223,19 +223,19 @@ public class DumpDirectiveTest {
 
         Map<String, Object> expectedDump = new HashMap<String, Object>();
         expectedDump.put(varName, expectedDumpValue);
-        
+
         test(varName, dataModel, expectedDump);
     }
-    
+
     @Test
     public void dumpTime() {
-        
+
         String varName = "time";
         Map<String, Object> dataModel = new HashMap<String, Object>();
-        
+
         Time time = new Time(1302297332043L);
         dataModel.put(varName, time);
-         
+
         Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
         expectedDumpValue.put(Key.TYPE.toString(), Type.DATE);
         expectedDumpValue.put(Key.DATE_TYPE.toString(), DateType.TIME);
@@ -243,7 +243,7 @@ public class DumpDirectiveTest {
 
         Map<String, Object> expectedDump = new HashMap<String, Object>();
         expectedDump.put(varName, expectedDumpValue);
-        
+
         test(varName, dataModel, expectedDump);
     }
 
@@ -252,10 +252,10 @@ public class DumpDirectiveTest {
 
        String varName = "square";
        Map<String, Object> dataModel = new HashMap<String, Object>();
-       
+
        TemplateMethodModel methodModel = new HelplessMethod();
        dataModel.put(varName, methodModel);
-        
+
        Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
        expectedDumpValue.put(Key.TYPE.toString(), Type.METHOD);
        expectedDumpValue.put(Key.CLASS.toString(), methodModel.getClass().getName());
@@ -263,8 +263,8 @@ public class DumpDirectiveTest {
 
        Map<String, Object> expectedDump = new HashMap<String, Object>();
        expectedDump.put(varName, expectedDumpValue);
-       
-       test(varName, dataModel, expectedDump); 
+
+       test(varName, dataModel, expectedDump);
    }
 
    @Test
@@ -272,10 +272,10 @@ public class DumpDirectiveTest {
 
        String varName = "square";
        Map<String, Object> dataModel = new HashMap<String, Object>();
-       
+
        TemplateMethodModel methodModel = new HelpfulMethod();
        dataModel.put(varName, methodModel);
-        
+
        Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
        expectedDumpValue.put(Key.TYPE.toString(), Type.METHOD);
        expectedDumpValue.put(Key.CLASS.toString(), methodModel.getClass().getName());
@@ -283,7 +283,7 @@ public class DumpDirectiveTest {
 
        Map<String, Object> expectedDump = new HashMap<String, Object>();
        expectedDump.put(varName, expectedDumpValue);
-       
+
        test(varName, dataModel, expectedDump);
    }
 
@@ -292,10 +292,10 @@ public class DumpDirectiveTest {
 
        String varName = "square";
        Map<String, Object> dataModel = new HashMap<String, Object>();
-       
+
        TemplateMethodModel methodModel = new MethodWithStringHelp();
        dataModel.put(varName, methodModel);
-        
+
        Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
        expectedDumpValue.put(Key.TYPE.toString(), Type.METHOD);
        expectedDumpValue.put(Key.CLASS.toString(), methodModel.getClass().getName());
@@ -303,7 +303,7 @@ public class DumpDirectiveTest {
 
        Map<String, Object> expectedDump = new HashMap<String, Object>();
        expectedDump.put(varName, expectedDumpValue);
-       
+
        test(varName, dataModel, expectedDump);
    }
 
@@ -312,10 +312,10 @@ public class DumpDirectiveTest {
 
        String varName = "square";
        Map<String, Object> dataModel = new HashMap<String, Object>();
-       
+
        TemplateMethodModel methodModel = new MethodWithStringStringMapHelp();
        dataModel.put(varName, methodModel);
-        
+
        Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
        expectedDumpValue.put(Key.TYPE.toString(), Type.METHOD);
        expectedDumpValue.put(Key.CLASS.toString(), methodModel.getClass().getName());
@@ -323,19 +323,19 @@ public class DumpDirectiveTest {
 
        Map<String, Object> expectedDump = new HashMap<String, Object>();
        expectedDump.put(varName, expectedDumpValue);
-       
+
        test(varName, dataModel, expectedDump);
    }
-   
+
    @Test
    public void dumpHelplessDirective() {
 
        String varName = "dump";
        Map<String, Object> dataModel = new HashMap<String, Object>();
-       
+
        TemplateDirectiveModel directiveModel = new HelplessDirective();
        dataModel.put(varName, directiveModel);
-        
+
        Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
        expectedDumpValue.put(Key.TYPE.toString(), Type.DIRECTIVE);
        expectedDumpValue.put(Key.CLASS.toString(), directiveModel.getClass().getName());
@@ -343,19 +343,19 @@ public class DumpDirectiveTest {
 
        Map<String, Object> expectedDump = new HashMap<String, Object>();
        expectedDump.put(varName, expectedDumpValue);
-       
+
        test(varName, dataModel, expectedDump);
    }
 
    @Test
    public void dumpHelpfulDirective() {
 
-       String varName = "dump";   
+       String varName = "dump";
        Map<String, Object> dataModel = new HashMap<String, Object>();
-       
+
        TemplateDirectiveModel directiveModel = new HelpfulDirective();
        dataModel.put(varName, directiveModel);
-        
+
        Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
        expectedDumpValue.put(Key.TYPE.toString(), Type.DIRECTIVE);
        expectedDumpValue.put(Key.CLASS.toString(), directiveModel.getClass().getName());
@@ -363,19 +363,19 @@ public class DumpDirectiveTest {
 
        Map<String, Object> expectedDump = new HashMap<String, Object>();
        expectedDump.put(varName, expectedDumpValue);
-       
-       test(varName, dataModel, expectedDump); 
+
+       test(varName, dataModel, expectedDump);
    }
- 
+
    @Test
    public void dumpDirectiveWithStringHelp() {
 
        String varName = "dump";
        Map<String, Object> dataModel = new HashMap<String, Object>();
-       
+
        TemplateDirectiveModel directiveModel = new DirectiveWithStringHelp();
        dataModel.put(varName, directiveModel);
-        
+
        Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
        expectedDumpValue.put(Key.TYPE.toString(), Type.DIRECTIVE);
        expectedDumpValue.put(Key.CLASS.toString(), directiveModel.getClass().getName());
@@ -383,19 +383,19 @@ public class DumpDirectiveTest {
 
        Map<String, Object> expectedDump = new HashMap<String, Object>();
        expectedDump.put(varName, expectedDumpValue);
-       
+
        test(varName, dataModel, expectedDump);
-   } 
+   }
 
    @Test
    public void dumpDirectiveWithStringStringMapHelp() {
 
        String varName = "dump";
        Map<String, Object> dataModel = new HashMap<String, Object>();
-       
+
        TemplateDirectiveModel directiveModel = new DirectiveWithStringStringMapHelp();
        dataModel.put(varName, directiveModel);
-        
+
        Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
        expectedDumpValue.put(Key.TYPE.toString(), Type.DIRECTIVE);
        expectedDumpValue.put(Key.CLASS.toString(), directiveModel.getClass().getName());
@@ -403,22 +403,22 @@ public class DumpDirectiveTest {
 
        Map<String, Object> expectedDump = new HashMap<String, Object>();
        expectedDump.put(varName, expectedDumpValue);
-       
+
        test(varName, dataModel, expectedDump);
-   } 
-   
+   }
+
     @Test
     public void dumpStringList() {
-        
-        String varName = "fruit";        
+
+        String varName = "fruit";
         Map<String, Object> dataModel = new HashMap<String, Object>();
-        
+
         List<String> myList = new ArrayList<String>();
         myList.add("apples");
         myList.add("bananas");
         myList.add("oranges");
         dataModel.put(varName, myList);
-        
+
         Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
         expectedDumpValue.put(Key.TYPE.toString(), Type.SEQUENCE);
         List<Map<String, Object>> myListItemsExpectedDump = new ArrayList<Map<String, Object>>(myList.size());
@@ -432,19 +432,19 @@ public class DumpDirectiveTest {
 
         Map<String, Object> expectedDump = new HashMap<String, Object>();
         expectedDump.put(varName, expectedDumpValue);
-        
-        test(varName, dataModel, expectedDump);       
+
+        test(varName, dataModel, expectedDump);
     }
-    
+
     @Test
     public void dumpStringArray() {
-        
-        String varName = "fruit";        
+
+        String varName = "fruit";
         Map<String, Object> dataModel = new HashMap<String, Object>();
-        
+
         String[] myArray = { "apples", "bananas", "oranges" };
         dataModel.put(varName, myArray);
-        
+
         Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
         expectedDumpValue.put(Key.TYPE.toString(), Type.SEQUENCE);
         List<Map<String, Object>> myArrayExpectedDumpValue = new ArrayList<Map<String, Object>>(myArray.length);
@@ -458,81 +458,81 @@ public class DumpDirectiveTest {
 
         Map<String, Object> expectedDump = new HashMap<String, Object>();
         expectedDump.put(varName, expectedDumpValue);
-        
-        test(varName, dataModel, expectedDump);       
-    }    
-    
+
+        test(varName, dataModel, expectedDump);
+    }
+
     @Test
     public void dumpMixedList() {
-        
-        String varName = "stuff";        
+
+        String varName = "stuff";
         Map<String, Object> dataModel = new HashMap<String, Object>();
-        
+
         List<Object> mixedList = new ArrayList<Object>();
-        
+
         String myString = "apples";
         mixedList.add(myString);
-        
+
         int myInt = 4;
         mixedList.add(myInt);
-        
+
         boolean myBool = true;
         mixedList.add(myBool);
-        
+
         List<String> myList = new ArrayList<String>();
         myList.add("dog");
         myList.add("cat");
         myList.add("elephant");
         mixedList.add(myList);
-        
+
         dataModel.put(varName, mixedList);
-        
+
         Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
         expectedDumpValue.put(Key.TYPE.toString(), Type.SEQUENCE);
-        
+
         List<Map<String, Object>> mixedListExpectedDumpValue = new ArrayList<Map<String, Object>>(mixedList.size());
-        
-        Map<String, Object> myStringExpectedDumpValue = new HashMap<String, Object>();        
+
+        Map<String, Object> myStringExpectedDumpValue = new HashMap<String, Object>();
         myStringExpectedDumpValue.put(Key.TYPE.toString(), Type.STRING);
         myStringExpectedDumpValue.put(Key.VALUE.toString(), myString);
         mixedListExpectedDumpValue.add(myStringExpectedDumpValue);
- 
-        Map<String, Object> myIntExpectedDumpValue = new HashMap<String, Object>();  
+
+        Map<String, Object> myIntExpectedDumpValue = new HashMap<String, Object>();
         myIntExpectedDumpValue.put(Key.TYPE.toString(), Type.NUMBER);
         myIntExpectedDumpValue.put(Key.VALUE.toString(), myInt);
         mixedListExpectedDumpValue.add(myIntExpectedDumpValue);
-        
-        Map<String, Object> myBoolExpectedDumpValue = new HashMap<String, Object>();  
+
+        Map<String, Object> myBoolExpectedDumpValue = new HashMap<String, Object>();
         myBoolExpectedDumpValue.put(Key.TYPE.toString(), Type.BOOLEAN);
         myBoolExpectedDumpValue.put(Key.VALUE.toString(), myBool);
         mixedListExpectedDumpValue.add(myBoolExpectedDumpValue);
-        
+
         Map<String, Object> myListExpectedDumpValue = new HashMap<String, Object>();
-        myListExpectedDumpValue.put(Key.TYPE.toString(), Type.SEQUENCE); 
+        myListExpectedDumpValue.put(Key.TYPE.toString(), Type.SEQUENCE);
         List<Map<String, Object>> myListItemsExpectedDumpValue = new ArrayList<Map<String, Object>>(myList.size());
         for ( String animal : myList ) {
             Map<String, Object> itemDump = new HashMap<String, Object>();
             itemDump.put(Key.TYPE.toString(), Type.STRING);
             itemDump.put(Key.VALUE.toString(), animal);
-            myListItemsExpectedDumpValue.add(itemDump);            
-        }        
+            myListItemsExpectedDumpValue.add(itemDump);
+        }
         myListExpectedDumpValue.put(Key.VALUE.toString(), myListItemsExpectedDumpValue);
         mixedListExpectedDumpValue.add(myListExpectedDumpValue);
-        
+
         expectedDumpValue.put(Key.VALUE.toString(), mixedListExpectedDumpValue);
 
         Map<String, Object> expectedDump = new HashMap<String, Object>();
         expectedDump.put(varName, expectedDumpValue);
-        
-        test(varName, dataModel, expectedDump);       
-    }    
+
+        test(varName, dataModel, expectedDump);
+    }
 
     @Test
     public void dumpNumberSet() {
 
         String varName = "oddNums";
         Map<String, Object> dataModel = new HashMap<String, Object>();
-        
+
         Set<Integer> myIntSet = new HashSet<Integer>();
         for (int i=0; i <= 10; i++) {
             if (i % 2 == 1) {
@@ -540,9 +540,9 @@ public class DumpDirectiveTest {
             }
         }
         dataModel.put(varName, myIntSet);
-        
+
         Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
-        expectedDumpValue.put(Key.TYPE.toString(), Type.SEQUENCE);        
+        expectedDumpValue.put(Key.TYPE.toString(), Type.SEQUENCE);
         List<Map<String, Object>> myIntSetExpectedDumpValue = new ArrayList<Map<String, Object>>(myIntSet.size());
         for ( int i : myIntSet ) {
             Map<String, Object> itemDump = new HashMap<String, Object>();
@@ -554,16 +554,16 @@ public class DumpDirectiveTest {
 
         Map<String, Object> expectedDump = new HashMap<String, Object>();
         expectedDump.put(varName, expectedDumpValue);
-        
-        test(varName, dataModel, expectedDump); 
+
+        test(varName, dataModel, expectedDump);
     }
-    
+
     @Test
     public void dumpSimpleCollection() {
 
         String varName = "oddNums";
         Map<String, Object> dataModel = new HashMap<String, Object>();
-        
+
         Set<Integer> odds = new HashSet<Integer>();
         for (int i=0; i <= 10; i++) {
             if (i % 2 == 1) {
@@ -572,9 +572,9 @@ public class DumpDirectiveTest {
         }
         TemplateCollectionModel myCollection = new SimpleCollection(odds);
         dataModel.put(varName, myCollection);
-        
+
         Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
-        expectedDumpValue.put(Key.TYPE.toString(), Type.COLLECTION);       
+        expectedDumpValue.put(Key.TYPE.toString(), Type.COLLECTION);
         List<Map<String, Object>> myCollectionExpectedDumpValue = new ArrayList<Map<String, Object>>(odds.size());
         for ( int i : odds ) {
             Map<String, Object> itemDump = new HashMap<String, Object>();
@@ -586,16 +586,16 @@ public class DumpDirectiveTest {
 
         Map<String, Object> expectedDump = new HashMap<String, Object>();
         expectedDump.put(varName, expectedDumpValue);
-        
-        test(varName, dataModel, expectedDump); 
-    }    
+
+        test(varName, dataModel, expectedDump);
+    }
 
     @Test
     public void dumpCollectionModel() {
 
         String varName = "oddNums";
         Map<String, Object> dataModel = new HashMap<String, Object>();
-        
+
         Set<Integer> odds = new HashSet<Integer>();
         for (int i=0; i <= 10; i++) {
             if (i % 2 == 1) {
@@ -604,9 +604,9 @@ public class DumpDirectiveTest {
         }
         TemplateCollectionModel myCollection = new CollectionModel(odds, new BeansWrapper());
         dataModel.put(varName, myCollection);
-        
+
         Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
-        expectedDumpValue.put(Key.TYPE.toString(), Type.COLLECTION);       
+        expectedDumpValue.put(Key.TYPE.toString(), Type.COLLECTION);
         List<Map<String, Object>> myCollectionExpectedDumpValue = new ArrayList<Map<String, Object>>(odds.size());
         for ( int i : odds ) {
             Map<String, Object> itemDump = new HashMap<String, Object>();
@@ -618,16 +618,16 @@ public class DumpDirectiveTest {
 
         Map<String, Object> expectedDump = new HashMap<String, Object>();
         expectedDump.put(varName, expectedDumpValue);
-        
-        test(varName, dataModel, expectedDump); 
-    }  
- 
+
+        test(varName, dataModel, expectedDump);
+    }
+
     @Test
     public void dumpCollectionAndSequenceModel() {
 
         String varName = "oddNums";
         Map<String, Object> dataModel = new HashMap<String, Object>();
-        
+
         Set<Integer> odds = new HashSet<Integer>();
         for (int i=0; i <= 10; i++) {
             if (i % 2 == 1) {
@@ -637,9 +637,9 @@ public class DumpDirectiveTest {
         TemplateCollectionModel coll = new CollectionModel(odds, new BeansWrapper());
         TemplateCollectionModel myCollection = new CollectionAndSequence(coll);
         dataModel.put(varName, myCollection);
-        
+
         Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
-        expectedDumpValue.put(Key.TYPE.toString(), Type.SEQUENCE);       
+        expectedDumpValue.put(Key.TYPE.toString(), Type.SEQUENCE);
         List<Map<String, Object>> myCollectionExpectedDumpValue = new ArrayList<Map<String, Object>>(odds.size());
         for ( int i : odds ) {
             Map<String, Object> itemDump = new HashMap<String, Object>();
@@ -651,16 +651,16 @@ public class DumpDirectiveTest {
 
         Map<String, Object> expectedDump = new HashMap<String, Object>();
         expectedDump.put(varName, expectedDumpValue);
-        
-        test(varName, dataModel, expectedDump); 
-    }  
+
+        test(varName, dataModel, expectedDump);
+    }
 
     @Test
     public void dumpStringToStringMap() {
 
-        String varName = "capitals";        
+        String varName = "capitals";
         Map<String, Object> dataModel = new HashMap<String, Object>();
-        
+
         Map<String, String> myMap = new HashMap<String, String>();
         myMap.put("Albany", "New York");
         myMap.put("St. Paul", "Minnesota");
@@ -668,7 +668,7 @@ public class DumpDirectiveTest {
         myMap.put("Sacramento", "California");
         myMap.put("Richmond", "Virginia");
         dataModel.put(varName, myMap);
-        
+
         Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
         expectedDumpValue.put(Key.TYPE.toString(), Type.HASH_EX);
         SortedMap<String, Object> myMapExpectedDump = new TreeMap<String, Object>();
@@ -683,9 +683,9 @@ public class DumpDirectiveTest {
 
         Map<String, Object> expectedDump = new HashMap<String, Object>();
         expectedDump.put(varName, expectedDumpValue);
-        
+
         Map<String, Object> dump = getDump(varName, dataModel);
-        assertEquals(expectedDump, dump); 
+        assertEquals(expectedDump, dump);
 
         // Test the sorting of the map
         List<String> expectedKeys = new ArrayList<String>(myMapExpectedDump.keySet());
@@ -694,81 +694,81 @@ public class DumpDirectiveTest {
         @SuppressWarnings("unchecked")
         SortedMap<String, Object> myMapActualDump = (SortedMap<String, Object>) actualDumpValue.get(Key.VALUE.toString());
         List<String> actualKeys = new ArrayList<String>(myMapActualDump.keySet());
-        assertEquals(expectedKeys, actualKeys);               
+        assertEquals(expectedKeys, actualKeys);
     }
-    
+
     @Test
     public void dumpStringToObjectMap() {
 
-        String varName = "stuff";        
+        String varName = "stuff";
         Map<String, Object> dataModel = new HashMap<String, Object>();
-        
+
         Map<String, Object> mixedMap = new HashMap<String, Object>();
-        
+
         String myString = "apples";
         mixedMap.put("myString", myString);
-        
+
         boolean myBool = true;
         mixedMap.put("myBoolean", myBool);
-        
+
         int myInt = 4;
         mixedMap.put("myNumber", myInt);
-        
+
         Date myDate = new Date();
         mixedMap.put("myDate", myDate);
-        
+
         List<String> myList = new ArrayList<String>();
         myList.add("apples");
         myList.add("bananas");
         myList.add("oranges");
         mixedMap.put("myList", myList);
-        
+
         Map<String, String> myMap = new HashMap<String, String>();
         myMap.put("Great Expectations", "Charles Dickens");
         myMap.put("Pride and Prejudice", "Jane Austen");
         myMap.put("Middlemarch", "George Eliot");
         myMap.put("Jude the Obscure", "Thomas Hardy");
         mixedMap.put("myMap", myMap);
-        
+
         dataModel.put(varName, mixedMap);
-        
+
         Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
         expectedDumpValue.put(Key.TYPE.toString(), Type.HASH_EX);
         SortedMap<String, Object> mixedMapExpectedDump = new TreeMap<String, Object>();
-        
+
         Map<String, Object> myStringExpectedDump = new HashMap<String, Object>();
         myStringExpectedDump.put(Key.TYPE.toString(), Type.STRING);
         myStringExpectedDump.put(Key.VALUE.toString(), myString);
         mixedMapExpectedDump.put("myString", myStringExpectedDump);
-        
+
         Map<String, Object> myBooleanExpectedDump = new HashMap<String, Object>();
         myBooleanExpectedDump.put(Key.TYPE.toString(), Type.BOOLEAN);
         myBooleanExpectedDump.put(Key.VALUE.toString(), myBool);
         mixedMapExpectedDump.put("myBoolean", myBooleanExpectedDump);
- 
+
         Map<String, Object> myIntExpectedDump = new HashMap<String, Object>();
         myIntExpectedDump.put(Key.TYPE.toString(), Type.NUMBER);
         myIntExpectedDump.put(Key.VALUE.toString(), myInt);
         mixedMapExpectedDump.put("myNumber", myIntExpectedDump);
-        
+
         Map<String, Object> myDateExpectedDump = new HashMap<String, Object>();
         myDateExpectedDump.put(Key.TYPE.toString(), Type.DATE);
         myDateExpectedDump.put(Key.DATE_TYPE.toString(), DateType.UNKNOWN);
         myDateExpectedDump.put(Key.VALUE.toString(), myDate);
         mixedMapExpectedDump.put("myDate", myDateExpectedDump);
-        
+
         Map<String, Object> myListExpectedDump = new HashMap<String, Object>();
-        myListExpectedDump.put(Key.TYPE.toString(), Type.SEQUENCE); 
+        myListExpectedDump.put(Key.TYPE.toString(), Type.SEQUENCE);
         List<Map<String, Object>> myListItemsExpectedDump = new ArrayList<Map<String, Object>>(myList.size());
         for ( String item : myList ) {
             Map<String, Object> itemDump = new HashMap<String, Object>();
             itemDump.put(Key.TYPE.toString(), Type.STRING);
             itemDump.put(Key.VALUE.toString(), item);
-            myListItemsExpectedDump.add(itemDump);            
-        }        
+            myListItemsExpectedDump.add(itemDump);
+        }
         myListExpectedDump.put(Key.VALUE.toString(), myListItemsExpectedDump);
         mixedMapExpectedDump.put("myList", myListExpectedDump);
-        
+
         Map<String, Object> myMapExpectedDump = new HashMap<String, Object>();
         myMapExpectedDump.put(Key.TYPE.toString(), Type.HASH_EX);
         SortedMap<String, Object> myMapItemsExpectedDump = new TreeMap<String, Object>();
@@ -780,16 +780,16 @@ public class DumpDirectiveTest {
         }
         myMapExpectedDump.put(Key.VALUE.toString(), myMapItemsExpectedDump);
         mixedMapExpectedDump.put("myMap", myMapExpectedDump);
-        
+
         expectedDumpValue.put(Key.VALUE.toString(), mixedMapExpectedDump);
 
         Map<String, Object> expectedDump = new HashMap<String, Object>();
         expectedDump.put(varName, expectedDumpValue);
-        
-        Map<String, Object> dump = getDump(varName, dataModel);
-        assertEquals(expectedDump, dump); 
 
-        // Test the sorting of the outer map        
+        Map<String, Object> dump = getDump(varName, dataModel);
+        assertEquals(expectedDump, dump);
+
+        // Test the sorting of the outer map
         List<String> expectedDumpValueKeys = new ArrayList<String>(mixedMapExpectedDump.keySet());
         @SuppressWarnings("unchecked")
         Map<String, Object> actualDumpValue = (Map<String, Object>) dump.get(varName);
@@ -797,7 +797,7 @@ public class DumpDirectiveTest {
         SortedMap<String, Object> mixedMapActualDump = (SortedMap<String, Object>) actualDumpValue.get(Key.VALUE.toString());
         List<String> actualDumpValueKeys = new ArrayList<String>(mixedMapActualDump.keySet());
         assertEquals(expectedDumpValueKeys, actualDumpValueKeys);
-        
+
         // Test the sorting of the inner map
         List<String> myMapItemsExpectedDumpKeys = new ArrayList<String>(myMapItemsExpectedDump.keySet());
         @SuppressWarnings("unchecked")
@@ -806,39 +806,39 @@ public class DumpDirectiveTest {
         SortedMap<String, Object> myMapItemsActualDump = (SortedMap<String, Object>) myMapActualDump.get(Key.VALUE.toString());
         List<String> myMapItemsActualDumpKeys = new ArrayList<String>(myMapItemsActualDump.keySet());
         assertEquals(myMapItemsExpectedDumpKeys, myMapItemsActualDumpKeys);
-        
-    }    
+
+    }
 
     @Test
     public void dumpObjectWithExposeNothingWrapper() {
-        dumpObject(BeansWrapper.EXPOSE_NOTHING);       
+        dumpObject(BeansWrapper.EXPOSE_NOTHING);
     }
- 
+
     @Test
     public void dumpObjectWithExposePropertiesOnlyWrapper() {
-        dumpObject(BeansWrapper.EXPOSE_PROPERTIES_ONLY);  
+        dumpObject(BeansWrapper.EXPOSE_PROPERTIES_ONLY);
     }
-    
+
     @Test
     public void dumpObjectWithExposeSafeWrapper() {
-        dumpObject(BeansWrapper.EXPOSE_SAFE);            
+        dumpObject(BeansWrapper.EXPOSE_SAFE);
     }
-    
+
     @Test
     public void dumpObjectWithExposeAllWrapper() {
-        dumpObject(BeansWrapper.EXPOSE_ALL);    
+        dumpObject(BeansWrapper.EXPOSE_ALL);
     }
-    
-    
+
+
     /////////////////////////// Private test classes and helper methods ///////////////////////////
 
     private void test(String varName, Map<String, Object> dataModel, Map<String, Object> expectedDump) {
         Map<String, Object> dump = getDump(varName, dataModel);
-        assertEquals(expectedDump, dump);        
+        assertEquals(expectedDump, dump);
     }
-    
+
     private void dumpObject(int exposureLevel) {
-        
+
         String varName = "employee";
         Map<String, Object> dataModel = new HashMap<String, Object>();
         BeansWrapper wrapper = new BeansWrapper();
@@ -849,22 +849,22 @@ public class DumpDirectiveTest {
         } catch (TemplateModelException e) {
             // logging is suppressed, so what do we do here?
         }
-        
+
         Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
         expectedDumpValue.put(Key.TYPE.toString(), employee.getClass().getName());
         expectedDumpValue.put(Key.VALUE.toString(), getJohnDoeExpectedDump(exposureLevel));
 
         Map<String, Object> expectedDump = new HashMap<String, Object>();
         expectedDump.put(varName, expectedDumpValue);
-        
-        testObjectDump(varName, dataModel, expectedDump);         
+
+        testObjectDump(varName, dataModel, expectedDump);
     }
 
     private void testObjectDump(String varName, Map<String, Object> dataModel, Map<String, Object> expectedDump) {
-        
+
         Map<String, Object> dump = getDump(varName, dataModel);
-        assertEquals(expectedDump, dump);         
-        
+        assertEquals(expectedDump, dump);
+
         // Test the sorting of the properties
         @SuppressWarnings("unchecked")
         Map<String, Object> expectedVarDump = (Map<String, Object>) expectedDump.get(varName);
@@ -873,7 +873,7 @@ public class DumpDirectiveTest {
         @SuppressWarnings("unchecked")
         SortedMap<String, Object> expectedPropertyDump = (SortedMap<String, Object>) expectedValueDump.get(Key.PROPERTIES.toString());
         List<String> expectedPropertyDumpKeys = new ArrayList<String>(expectedPropertyDump.keySet());
-        
+
         @SuppressWarnings("unchecked")
         Map<String, Object> actualVarDump = (Map<String, Object>) dump.get(varName);
         @SuppressWarnings("unchecked")
@@ -881,27 +881,27 @@ public class DumpDirectiveTest {
         @SuppressWarnings("unchecked")
         SortedMap<String, Object> actualPropertyDump = (SortedMap<String, Object>) actualValueDump.get(Key.PROPERTIES.toString());
         List<String> actualPropertyDumpKeys = new ArrayList<String>(actualPropertyDump.keySet());
-        
-        assertEquals(expectedPropertyDumpKeys, actualPropertyDumpKeys);  
-   
+
+        assertEquals(expectedPropertyDumpKeys, actualPropertyDumpKeys);
+
     }
-    
+
     private Map<String, Object> getDump(String varName, Map<String, Object> dataModel) {
         try {
             Environment env = template.createProcessingEnvironment(dataModel, new StringWriter());
-            return new DumpDirective().getTemplateVariableDump(varName, env);     
+            return new DumpDirective().getTemplateVariableDump(varName, env);
         } catch (Exception e) {
             fail(e.getMessage());
             return null;
-        }             
+        }
     }
-    
+
     private class HelplessMethod implements TemplateMethodModel {
 
         @Override
         public Object exec(List arg0) throws TemplateModelException {
             return null;
-        }        
+        }
     }
 
     private class HelpfulMethod implements TemplateMethodModel {
@@ -909,8 +909,8 @@ public class DumpDirectiveTest {
         @Override
         public Object exec(List arg0) throws TemplateModelException {
             return null;
-        } 
-        
+        }
+
         public Map<String, Object> help(String name) {
             return getMethodHelp(name);
         }
@@ -921,8 +921,8 @@ public class DumpDirectiveTest {
         @Override
         public Object exec(List arg0) throws TemplateModelException {
             return null;
-        } 
-        
+        }
+
         public String help(String name) {
             return "help";
         }
@@ -933,19 +933,19 @@ public class DumpDirectiveTest {
         @Override
         public Object exec(List arg0) throws TemplateModelException {
             return null;
-        } 
-        
+        }
+
         public Map<String, String> help(String name) {
             return new HashMap<String, String>();
         }
     }
-    
+
     private class HelplessDirective implements TemplateDirectiveModel {
 
         @Override
         public void execute(Environment arg0, Map arg1, TemplateModel[] arg2,
                 TemplateDirectiveBody arg3) throws TemplateException,
-                IOException {            
+                IOException {
         }
     }
 
@@ -954,22 +954,22 @@ public class DumpDirectiveTest {
         @Override
         public void execute(Environment arg0, Map arg1, TemplateModel[] arg2,
                 TemplateDirectiveBody arg3) throws TemplateException,
-                IOException {            
+                IOException {
         }
-        
+
         public Map<String, Object> help(String name) {
             return getDirectiveHelp(name);
         }
     }
-    
+
     private class DirectiveWithStringHelp implements TemplateDirectiveModel {
 
         @Override
         public void execute(Environment arg0, Map arg1, TemplateModel[] arg2,
                 TemplateDirectiveBody arg3) throws TemplateException,
-                IOException {            
+                IOException {
         }
-        
+
         public String help(String name) {
             return "help";
         }
@@ -980,52 +980,52 @@ public class DumpDirectiveTest {
         @Override
         public void execute(Environment arg0, Map arg1, TemplateModel[] arg2,
                 TemplateDirectiveBody arg3) throws TemplateException,
-                IOException {            
+                IOException {
         }
-        
+
         public Map<String, String> help(String name) {
             return new HashMap<String, String>();
         }
     }
-    
+
     private Map<String, Object> getDirectiveHelp(String name) {
         Map<String, Object> map = new HashMap<String, Object>();
-        
+
         map.put("effect", "Dump the contents of a template variable.");
-        
+
         map.put("comments", "Sequences (lists and arrays) are enclosed in square brackets. Hashes are enclosed in curly braces.");
-        
+
         Map<String, String> params = new HashMap<String, String>();
         params.put("var", "name of variable to dump");
         map.put("parameters", params);
-        
+
         List<String> examples = new ArrayList<String>();
         examples.add("<@" + name + " var=\"urls\" />");
         map.put("examples", examples);
-        
-        return map;        
+
+        return map;
     }
- 
+
     private Map<String, Object> getMethodHelp(String name) {
         Map<String, Object> map = new HashMap<String, Object>();
-        
+
         map.put("returns", "The square of the argument");
 
         List<String>params = new ArrayList<String>();
         params.add("Integer to square");
         map.put("parameters", params);
-        
+
         List<String> examples = new ArrayList<String>();
         examples.add(name + "(4)");
         map.put("examples", examples);
-        
-        return map;     
+
+        return map;
     }
-    
+
     public static class Employee {
-        
+
         private static int count = 0;
-        
+
         private String firstName;
         private String lastName;
         private String nickname;
@@ -1037,7 +1037,7 @@ public class DumpDirectiveTest {
         // private Map<String, String> degrees;
         private Employee supervisor;
         private float salary;
-        
+
         Employee(String firstName, String lastName, int id, Date birthdate) {
             this.firstName = firstName;
             this.lastName = lastName;
@@ -1057,15 +1057,15 @@ public class DumpDirectiveTest {
         void setSalary(float salary) {
             this.salary = salary;
         }
-        
+
         public void setNickname(String nickname) {
             this.nickname = nickname;
         }
-         
+
         public void setFavoriteColors(String...colors) {
             Collections.addAll(favoriteColors, colors);
         }
-        
+
 //        void setDegrees(Map<String, String> degrees) {
 //            this.degrees = degrees;
 //        }
@@ -1073,21 +1073,21 @@ public class DumpDirectiveTest {
         float getSalary() {
             return salary;
         }
-        
+
         public static int getEmployeeCount() {
             return count;
         }
-        
+
         /*  Public accessor methods for templates */
-        
+
         public String getFullName() {
             return firstName + " " + lastName;
         }
-        
+
         public String getName(String which) {
             return "first".equals(which) ? firstName : lastName;
         }
-        
+
         public String getMiddleName() {
             return middleName;
         }
@@ -1095,19 +1095,19 @@ public class DumpDirectiveTest {
         public String getNickname() {
             return nickname;
         }
-        
+
         public Date getBirthdate() {
             return birthdate;
         }
-        
+
         public int getId() {
             return id;
-        }      
-        
+        }
+
         public boolean isMarried() {
             return married;
         }
- 
+
         @Deprecated
         public int getFormerId() {
             return id % 10000;
@@ -1116,24 +1116,24 @@ public class DumpDirectiveTest {
         public Employee getSupervisor() {
             return supervisor;
         }
-        
+
         public Employee boss() {
             return supervisor;
         }
-        
+
         public List<String> getFavoriteColors() {
             return favoriteColors;
         }
-        
+
 //        public Map<String, String> getDegrees() {
 //            return degrees;
 //        }
-        
+
         public String familyName() {
             return lastName;
         }
     }
-    
+
     private Employee getEmployee() {
 
         Calendar c = Calendar.getInstance();
@@ -1147,7 +1147,7 @@ public class DumpDirectiveTest {
 //        degrees.put("BA", "Mathematics");
 //        degrees.put("MS", "Computer Science");
 //        jdoe.setDegrees(degrees);
-        
+
         c.clear();
         c.set(1975, Calendar.OCTOBER, 25);
         c = DateUtils.truncate(c, Calendar.DATE);
@@ -1158,7 +1158,7 @@ public class DumpDirectiveTest {
 
         return jdoe;
     }
-    
+
     private Map<String, Object> getJohnDoeExpectedDump(int exposureLevel) {
 
         Map<String, Object> expectedDump = new HashMap<String, Object>();
@@ -1166,12 +1166,12 @@ public class DumpDirectiveTest {
         Map<String, Object> supervisorExpectedDump = new HashMap<String, Object>();
         supervisorExpectedDump.put(Key.TYPE.toString(), "freemarker.ext.dump.DumpDirectiveTest$Employee");
         supervisorExpectedDump.put(Key.VALUE.toString(), getJaneSmithExpectedDump(exposureLevel));
-        
+
         // Properties
         SortedMap<String, Object> propertiesExpectedDump = new TreeMap<String, Object>();
-        
-        if (exposureLevel < BeansWrapper.EXPOSE_NOTHING) {           
-    
+
+        if (exposureLevel < BeansWrapper.EXPOSE_NOTHING) {
+
             Map<String, Object> birthdateExpectedDump = new HashMap<String, Object>();
             birthdateExpectedDump.put(Key.TYPE.toString(), Type.DATE);
             birthdateExpectedDump.put(Key.DATE_TYPE.toString(), DateType.UNKNOWN);
@@ -1180,35 +1180,35 @@ public class DumpDirectiveTest {
             c = DateUtils.truncate(c, Calendar.DATE);
             birthdateExpectedDump.put(Key.VALUE.toString(), c.getTime());
             propertiesExpectedDump.put("birthdate", birthdateExpectedDump);
-    
+
             Map<String, Object> fullNameExpectedDump = new HashMap<String, Object>();
             fullNameExpectedDump.put(Key.TYPE.toString(), Type.STRING);
             fullNameExpectedDump.put(Key.VALUE.toString(), "John Doe");
             propertiesExpectedDump.put("fullName", fullNameExpectedDump);
-    
+
             Map<String, Object> idExpectedDump = new HashMap<String, Object>();
             idExpectedDump.put(Key.TYPE.toString(), Type.NUMBER);
             idExpectedDump.put(Key.VALUE.toString(), 34523);
             propertiesExpectedDump.put("id", idExpectedDump);
-    
+
             Map<String, Object> nicknameExpectedDump = new HashMap<String, Object>();
             nicknameExpectedDump.put(Key.TYPE.toString(), Type.STRING);
             nicknameExpectedDump.put(Key.VALUE.toString(), "");
             propertiesExpectedDump.put("nickname", nicknameExpectedDump);
-    
+
             Map<String, Object> middleNameExpectedDump = new HashMap<String, Object>();
             middleNameExpectedDump.put(Key.VALUE.toString(), Value.NULL.toString());
             propertiesExpectedDump.put("middleName", middleNameExpectedDump);
-            
+
             Map<String, Object> marriedExpectedDump = new HashMap<String, Object>();
             marriedExpectedDump.put(Key.TYPE.toString(), Type.BOOLEAN);
             marriedExpectedDump.put(Key.VALUE.toString(), true);
             propertiesExpectedDump.put("married", marriedExpectedDump);
-                 
 
-            propertiesExpectedDump.put("supervisor", supervisorExpectedDump);    
-            
-            Map<String, Object> favoriteColorsExpectedDump = new HashMap<String, Object>(); 
+
+            propertiesExpectedDump.put("supervisor", supervisorExpectedDump);
+
+            Map<String, Object> favoriteColorsExpectedDump = new HashMap<String, Object>();
             favoriteColorsExpectedDump.put(Key.TYPE.toString(), Type.SEQUENCE);
             List<Map<String, Object>> favoriteColorListExpectedDump = new ArrayList<Map<String, Object>>();
             Map<String, Object> color1ExpectedDump = new HashMap<String, Object>();
@@ -1216,10 +1216,10 @@ public class DumpDirectiveTest {
             color1ExpectedDump.put(Key.VALUE.toString(), "blue");
             favoriteColorListExpectedDump.add(color1ExpectedDump);
             Map<String, Object> color2ExpectedDump = new HashMap<String, Object>();
-            color2ExpectedDump.put(Key.TYPE.toString(), Type.STRING); 
-            color2ExpectedDump.put(Key.VALUE.toString(), "green"); 
+            color2ExpectedDump.put(Key.TYPE.toString(), Type.STRING);
+            color2ExpectedDump.put(Key.VALUE.toString(), "green");
             favoriteColorListExpectedDump.add(color2ExpectedDump);
-            favoriteColorsExpectedDump.put(Key.VALUE.toString(), favoriteColorListExpectedDump);        
+            favoriteColorsExpectedDump.put(Key.VALUE.toString(), favoriteColorListExpectedDump);
             propertiesExpectedDump.put("favoriteColors", favoriteColorsExpectedDump);
 
 // This test fails, don't know why
@@ -1236,35 +1236,35 @@ public class DumpDirectiveTest {
 //            degreeMapExpectedDump.put("MS", degree2ExpectedDump);
 //            degreesExpectedDump.put(Key.VALUE.toString(), degreeMapExpectedDump);
 //            propertiesExpectedDump.put("degrees", degreesExpectedDump);
-            
-        }        
-        
+
+        }
+
         expectedDump.put(Key.PROPERTIES.toString(), propertiesExpectedDump);
-        
-        // Methods       
+
+        // Methods
         SortedMap<String, Object> methodDump = getEmployeeMethodsExpectedDump(exposureLevel, "Doe");
         if ( ! methodDump.isEmpty()) {
             methodDump.put("boss()", supervisorExpectedDump);
         }
         expectedDump.put(Key.METHODS.toString(), methodDump);
-        
+
         return expectedDump;
     }
-    
+
     private SortedMap<String, Object> getEmployeeMethodsExpectedDump(int exposureLevel, String familyName) {
-        
+
         SortedMap<String, Object> expectedDump = new TreeMap<String, Object>();
-        
+
         if (exposureLevel <= BeansWrapper.EXPOSE_SAFE) {
 
             Map<String, Object> nameExpectedDump = new HashMap<String, Object>();
             nameExpectedDump.put(Key.TYPE.toString(), "String");
             expectedDump.put("getName(String)", nameExpectedDump);
-            
+
             expectedDump.put("setFavoriteColors(Strings)", Collections.emptyMap());
-            
+
             expectedDump.put("setNickname(String)", Collections.emptyMap());
-            
+
             Map<String, Object> familyNameExpectedDump = new HashMap<String, Object>();
             familyNameExpectedDump.put(Key.TYPE.toString(), Type.STRING);
             familyNameExpectedDump.put(Key.VALUE.toString(), familyName);
@@ -1274,23 +1274,23 @@ public class DumpDirectiveTest {
             employeeCountExpectedDump.put(Key.TYPE.toString(), Type.NUMBER);
             employeeCountExpectedDump.put(Key.VALUE.toString(), Employee.getEmployeeCount());
             expectedDump.put("getEmployeeCount()", employeeCountExpectedDump);
-        }   
+        }
 
         return expectedDump;
     }
-    
+
     private Map<String, Object> getJaneSmithExpectedDump(int exposureLevel) {
 
         Map<String, Object> expectedDump = new HashMap<String, Object>();
 
         Map<String, Object> supervisorExpectedDump = new HashMap<String, Object>();
         supervisorExpectedDump.put(Key.VALUE.toString(), Value.NULL.toString());
-        
+
         SortedMap<String, Object> propertiesExpectedDump = new TreeMap<String, Object>();
-        
-        // Properties 
+
+        // Properties
         if (exposureLevel < BeansWrapper.EXPOSE_NOTHING) {
-            
+
             Map<String, Object> birthdateExpectedDump = new HashMap<String, Object>();
             birthdateExpectedDump.put(Key.TYPE.toString(), Type.DATE);
             birthdateExpectedDump.put(Key.DATE_TYPE.toString(), DateType.UNKNOWN);
@@ -1304,56 +1304,56 @@ public class DumpDirectiveTest {
             fullNameExpectedDump.put(Key.TYPE.toString(), Type.STRING);
             fullNameExpectedDump.put(Key.VALUE.toString(), "Jane Smith");
             propertiesExpectedDump.put("fullName", fullNameExpectedDump);
-        
+
             Map<String, Object> idExpectedDump = new HashMap<String, Object>();
             idExpectedDump.put(Key.TYPE.toString(), Type.NUMBER);
             idExpectedDump.put(Key.VALUE.toString(), 78234);
             propertiesExpectedDump.put("id", idExpectedDump);
-        
+
             Map<String, Object> nicknameExpectedDump = new HashMap<String, Object>();
             nicknameExpectedDump.put(Key.TYPE.toString(), Type.STRING);
             nicknameExpectedDump.put(Key.VALUE.toString(), "");
             propertiesExpectedDump.put("nickname", nicknameExpectedDump);
-        
+
             Map<String, Object> middleNameExpectedDump = new HashMap<String, Object>();
             middleNameExpectedDump.put(Key.VALUE.toString(), Value.NULL.toString());
             propertiesExpectedDump.put("middleName", middleNameExpectedDump);
-              
+
             Map<String, Object> marriedExpectedDump = new HashMap<String, Object>();
             marriedExpectedDump.put(Key.TYPE.toString(), Type.BOOLEAN);
             marriedExpectedDump.put(Key.VALUE.toString(), true);
-            propertiesExpectedDump.put("married", marriedExpectedDump);      
-        
-            propertiesExpectedDump.put("supervisor", supervisorExpectedDump);             
-    
-            Map<String, Object> favoriteColorsExpectedDump = new HashMap<String, Object>(); 
+            propertiesExpectedDump.put("married", marriedExpectedDump);
+
+            propertiesExpectedDump.put("supervisor", supervisorExpectedDump);
+
+            Map<String, Object> favoriteColorsExpectedDump = new HashMap<String, Object>();
             favoriteColorsExpectedDump.put(Key.TYPE.toString(), Type.SEQUENCE);
             List<Map<String, Object>> favoriteColorListExpectedDump = new ArrayList<Map<String, Object>>();
             Map<String, Object> color1ExpectedDump = new HashMap<String, Object>();
             color1ExpectedDump.put(Key.TYPE.toString(), Type.STRING);
-            color1ExpectedDump.put(Key.VALUE.toString(), "red"); 
+            color1ExpectedDump.put(Key.VALUE.toString(), "red");
             favoriteColorListExpectedDump.add(color1ExpectedDump);
             Map<String, Object> color2ExpectedDump = new HashMap<String, Object>();
-            color2ExpectedDump.put(Key.TYPE.toString(), Type.STRING); 
-            color2ExpectedDump.put(Key.VALUE.toString(), "orange"); 
+            color2ExpectedDump.put(Key.TYPE.toString(), Type.STRING);
+            color2ExpectedDump.put(Key.VALUE.toString(), "orange");
             favoriteColorListExpectedDump.add(color2ExpectedDump);
-            favoriteColorsExpectedDump.put(Key.VALUE.toString(), favoriteColorListExpectedDump);        
+            favoriteColorsExpectedDump.put(Key.VALUE.toString(), favoriteColorListExpectedDump);
             propertiesExpectedDump.put("favoriteColors", favoriteColorsExpectedDump);
-            
+
 //            Map<String, Object> degreesExpectedDump = new HashMap<String, Object>();
 //            degreesExpectedDump.put(Key.VALUE.toString(), Value.NULL.toString());
-//            propertiesExpectedDump.put("degrees", degreesExpectedDump);            
+//            propertiesExpectedDump.put("degrees", degreesExpectedDump);
         }
         expectedDump.put(Key.PROPERTIES.toString(), propertiesExpectedDump);
-        
+
         // Methods
         SortedMap<String, Object> methodDump = getEmployeeMethodsExpectedDump(exposureLevel, "Smith");
         if ( ! methodDump.isEmpty()) {
             methodDump.put("boss()", supervisorExpectedDump);
         }
         expectedDump.put(Key.METHODS.toString(), methodDump);
-        
+
         return expectedDump;
     }
-    
+
 }
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanStub.java
index c3f5dd752..fdb660b11 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionBeanStub.java
@@ -37,7 +37,7 @@ public class PropertyRestrictionBeanStub extends PropertyRestrictionBean {
 	/**
 	 * Prohibit some namespaces and restrict some properties from modification
 	 * by anybody. They may still be displayed or published.
-	 * 
+	 *
 	 * We can implement more granular control if we need it.
 	 */
 	public static PropertyRestrictionBeanStub getInstance(
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/beans/IndividualStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/beans/IndividualStub.java
index e992b2b54..53b0dddc9 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/beans/IndividualStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/beans/IndividualStub.java
@@ -505,4 +505,4 @@ public class IndividualStub implements Individual {
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesStub.java
index b6c77c082..23a35bfbb 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesStub.java
@@ -13,7 +13,7 @@ import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
  * A version of ConfigurationProperties that we can use for unit tests. Unlike
  * the basic implementation, this starts as an empty map, and allows the user to
  * add properties as desired.
- * 
+ *
  * Call setBean() to store these properties in the ServletContext.
  */
 public class ConfigurationPropertiesStub extends ConfigurationProperties {
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/ApplicationDaoStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/ApplicationDaoStub.java
index 816064620..7db3433ed 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/ApplicationDaoStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/ApplicationDaoStub.java
@@ -9,7 +9,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.ApplicationDao;
 
 /**
  * A minimal implementation of the ApplicationDao.
- * 
+ *
  * I have only implemented the methods that I needed. Feel free to implement
  * others.
  */
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyDaoStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyDaoStub.java
index 29eaebc08..e4d659b08 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyDaoStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyDaoStub.java
@@ -20,7 +20,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
 
 /**
  * A minimal implementation of the DataPropertyDao.
- * 
+ *
  * I have only implemented the methods that I needed. Feel free to implement
  * others.
  */
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/IndividualDaoStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/IndividualDaoStub.java
index 817e602c0..044764af6 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/IndividualDaoStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/IndividualDaoStub.java
@@ -17,7 +17,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.EditLiteral;
 
 /**
  * A minimal implementation of the IndividualDao.
- * 
+ *
  * I have only implemented the methods that I needed. Feel free to implement
  * others.
  */
@@ -32,12 +32,12 @@ public class IndividualDaoStub implements IndividualDao {
 		if (individual == null) {
 			throw new NullPointerException("individual may not be null.");
 		}
-		
+
 		String uri = individual.getURI();
 		if (uri == null) {
 			throw new NullPointerException("uri may not be null.");
 		}
-		
+
 		indMap.put(uri, individual);
 	}
 
@@ -133,13 +133,13 @@ public class IndividualDaoStub implements IndividualDao {
 	public Collection<String> getAllIndividualUris() {
 		throw new RuntimeException(
 				"IndividualDaoStub.getAllIndividualUris() not implemented.");
-	}	
+	}
 
 	@Override
 	public Iterator<String> getUpdatedSinceIterator(long updatedSince) {
 		throw new RuntimeException(
 				"IndividualDaoStub.getUpdatedSinceIterator() not implemented.");
-	}	
+	}
 
 	@Override
 	public boolean isIndividualOfClass(String vclassURI, String indURI) {
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/MenuDaoStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/MenuDaoStub.java
index 5d9476770..5684c7666 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/MenuDaoStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/MenuDaoStub.java
@@ -9,7 +9,7 @@ import javax.servlet.ServletRequest;
 
 /**
  * A minimal implementation of the MenuDao.
- * 
+ *
  * I have only implemented the methods that I needed. Feel free to implement
  * others.
  */
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDaoStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDaoStub.java
index 31189f2e6..99f22934f 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDaoStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDaoStub.java
@@ -20,7 +20,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
 
 /**
  * A minimal implementation of the ObjectPropertyDao.
- * 
+ *
  * I have only implemented the methods that I needed. Feel free to implement
  * others.
  */
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyStatementDaoStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyStatementDaoStub.java
index 0d2a9d52b..3c738dfbc 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyStatementDaoStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyStatementDaoStub.java
@@ -16,7 +16,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao;
 
 /**
  * A minimal implementation of the ObjectPropertyStatementDao
- * 
+ *
  * I have only implemented the methods that I needed. Feel free to implement
  * others.
  */
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/OntologyDaoStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/OntologyDaoStub.java
index 68d39441e..5b3b197ad 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/OntologyDaoStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/OntologyDaoStub.java
@@ -12,7 +12,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
 
 /**
  * A minimal implementation of the OntologyDao.
- * 
+ *
  * I have only implemented the methods that I needed. Feel free to implement
  * others.
  */
@@ -22,7 +22,7 @@ public class OntologyDaoStub implements OntologyDao {
 	// ----------------------------------------------------------------------
 
 	private final Map<String, Ontology> ontologies = new HashMap<String, Ontology>();
-	
+
 	// ----------------------------------------------------------------------
 	// Stub methods
 	// ----------------------------------------------------------------------
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/PropertyGroupDaoStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/PropertyGroupDaoStub.java
index 3a73c6287..9ab043aaf 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/PropertyGroupDaoStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/PropertyGroupDaoStub.java
@@ -14,11 +14,11 @@ public class PropertyGroupDaoStub implements PropertyGroupDao {
 	// ----------------------------------------------------------------------
 
 	private final Map<String, PropertyGroup> map = new HashMap<>();
-	
+
 	public void addPropertyGroup(PropertyGroup group) {
 		map.put(group.getURI(), group);
 	}
-	
+
 	// ----------------------------------------------------------------------
 	// Stub methods
 	// ----------------------------------------------------------------------
@@ -27,7 +27,7 @@ public class PropertyGroupDaoStub implements PropertyGroupDao {
 	public PropertyGroup getGroupByURI(String uri) {
 		return (uri == null) ? null : copyGroup(map.get(uri), false);
 	}
-	
+
 	@Override
 	public List<PropertyGroup> getPublicGroups(boolean withProperties) {
 		List<PropertyGroup> list = new ArrayList<>();
@@ -36,22 +36,22 @@ public class PropertyGroupDaoStub implements PropertyGroupDao {
 		}
 		return list;
 	}
-	
+
 	private PropertyGroup copyGroup(PropertyGroup source, boolean withProperties) {
 		if (source == null) {
 			return null;
 		}
-		
+
 		PropertyGroup target = new PropertyGroup();
-	
+
 		target.setURI(source.getURI());
 		target.setPickListName(source.getPickListName());
-		
+
 		target.setDisplayRank(source.getDisplayRank());
 		target.setName(source.getName());
 		target.setStatementCount(source.getStatementCount());
 		target.setPublicDescription(source.getPublicDescription());
-		
+
 		if (withProperties) {
 			target.setPropertyList(source.getPropertyList());
 		}
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/UserAccountsDaoStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/UserAccountsDaoStub.java
index fc502d1c0..ac6f609af 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/UserAccountsDaoStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/UserAccountsDaoStub.java
@@ -30,7 +30,7 @@ public class UserAccountsDaoStub implements UserAccountsDao {
 	public void addUser(UserAccount user) {
 		userAccountsByUri.put(user.getUri(), user);
 	}
-	
+
 	public void addPermissionSet(PermissionSet ps) {
 		permissionSetsByUri.put(ps.getUri(), ps);
 	}
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/VClassGroupDaoStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/VClassGroupDaoStub.java
index 0006d93f6..2791b1d1a 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/VClassGroupDaoStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/VClassGroupDaoStub.java
@@ -16,11 +16,11 @@ public class VClassGroupDaoStub implements VClassGroupDao {
 	// ----------------------------------------------------------------------
 
 	private List<VClassGroup> groups = new ArrayList<>();
-	
+
 	public void setGroups(VClassGroup... groups) {
 		this.groups = new ArrayList<>(Arrays.asList(groups));
 	}
-	
+
 	// ----------------------------------------------------------------------
 	// Stub methods
 	// ----------------------------------------------------------------------
@@ -34,7 +34,7 @@ public class VClassGroupDaoStub implements VClassGroupDao {
 		}
 		return null;
 	}
-	
+
 	@Override
 	public List<VClassGroup> getPublicGroupsWithVClasses() {
 		List<VClassGroup> list = new ArrayList<>();
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryStub.java
index 05f8dfbfd..24efa6885 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryStub.java
@@ -26,7 +26,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 
 /**
  * A minimal implementation of the WebappDaoFactory.
- * 
+ *
  * I have only implemented the methods that I needed. Feel free to implement
  * others.
  */
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/i18n/I18nStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/i18n/I18nStub.java
index cf6797619..76d3a3727 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/i18n/I18nStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/i18n/I18nStub.java
@@ -18,7 +18,7 @@ import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 /**
  * An implementation of I18n for unit tests. Construct a new instance and it
  * replaces the instance of I18n.
- * 
+ *
  * Each bundle that you get from it is the same, returning the key itself as the
  * value of that key.
  */
@@ -42,12 +42,12 @@ public class I18nStub extends I18n {
 			throw new RuntimeException(e);
 		}
 	}
-	
+
 	/** Make it private, so they will use the setup() method. */
 	private I18nStub() {
 		// Nothing to initialize.
 	}
-	
+
 	@Override
 	protected I18nBundle getBundle(String bundleName, HttpServletRequest req) {
 		return new I18nBundleStub(bundleName);
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/ContextModelAccessStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/ContextModelAccessStub.java
index 90b4d7c78..3f1d5664b 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/ContextModelAccessStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/ContextModelAccessStub.java
@@ -23,7 +23,7 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 
 /**
  * A mock instance of ContextModelAccess for use in unit tests.
- * 
+ *
  * I have only implemented the methods that I needed for my tests. Feel free to
  * implement the rest, as needed.
  */
@@ -47,11 +47,11 @@ public class ContextModelAccessStub implements ContextModelAccess {
 			ReasoningOption option) {
 		wadfMap.put(option, wadf);
 	}
-	
+
 	public void setRDFService(WhichService which, RDFService rdfService) {
 		rdfServiceMap.put(which, rdfService);
 	}
-	
+
 	public void setOntModel(String name, OntModel model) {
 		ontModelMap.put(name, model);
 	}
@@ -69,12 +69,12 @@ public class ContextModelAccessStub implements ContextModelAccess {
 	public RDFService getRDFService() {
 		return getRDFService(CONTENT);
 	}
-	
+
 	@Override
 	public RDFService getRDFService(WhichService which) {
 		return rdfServiceMap.get(which);
 	}
-	
+
 	@Override
 	public OntModel getOntModel() {
 		return getOntModel(FULL_UNION);
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/ModelAccessFactoryStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/ModelAccessFactoryStub.java
index 82b5a3ee2..492e85e91 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/ModelAccessFactoryStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/ModelAccessFactoryStub.java
@@ -14,7 +14,7 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.RequestModelAccess;
 
 /**
  * A mock instance of ModelAccessFactory for use in unit tests.
- * 
+ *
  * I have only implemented the methods that I needed for my tests. Feel free to
  * implement the rest, as needed.
  */
@@ -50,7 +50,7 @@ public class ModelAccessFactoryStub extends ModelAccessFactory {
 	public ContextModelAccessStub get(ServletContext ctx) {
 		return contextMA;
 	}
-	
+
 	public RequestModelAccessStub get(HttpServletRequest req) {
 		return requestMA;
 	}
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/RequestModelAccessStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/RequestModelAccessStub.java
index 498952cfa..8a97b4d8e 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/RequestModelAccessStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modelaccess/RequestModelAccessStub.java
@@ -24,7 +24,7 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 
 /**
  * A mock instance of RequestModelAccess for use in unit tests.
- * 
+ *
  * I have only implemented the methods that I needed for my tests. Feel free to
  * implement the rest, as needed.
  */
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modules/ApplicationStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modules/ApplicationStub.java
index eeeac620c..01f78981f 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modules/ApplicationStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modules/ApplicationStub.java
@@ -48,7 +48,7 @@ public class ApplicationStub implements Application {
 	public ApplicationStub(ServletContext ctx, SearchEngine searchEngine) {
 		this.ctx = ctx;
 		this.searchEngine = searchEngine;
-		
+
 		this.searchIndexer = new SearchIndexerStub();
 		this.searchIndexer.unpause();
 	}
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchResponseStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchResponseStub.java
index bbefa8ae2..0b33d8d0d 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchResponseStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchResponseStub.java
@@ -19,7 +19,7 @@ public class SearchResponseStub implements SearchResponse {
 	// ----------------------------------------------------------------------
 
 	public static final SearchResponseStub EMPTY_RESPONSE = null;
-	
+
 
 	// ----------------------------------------------------------------------
 	// Stub methods
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexerStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexerStub.java
index 715158eed..0bf924292 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexerStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/modules/searchIndexer/SearchIndexerStub.java
@@ -19,7 +19,7 @@ public class SearchIndexerStub implements SearchIndexer {
 	// ----------------------------------------------------------------------
 	// Stub infrastructure
 	// ----------------------------------------------------------------------
-	
+
 	private boolean paused = true;
 
 	// ----------------------------------------------------------------------
diff --git a/api/src/test/java/stubs/javax/naming/ContextStub.java b/api/src/test/java/stubs/javax/naming/ContextStub.java
index 5754000fa..66295b2dd 100644
--- a/api/src/test/java/stubs/javax/naming/ContextStub.java
+++ b/api/src/test/java/stubs/javax/naming/ContextStub.java
@@ -17,7 +17,7 @@ import javax.naming.NamingException;
 /**
  * In order to use this and the other naming stubs.javax.naming classes, do
  * this:
- * 
+ *
  * <pre>
  * System.setProperty(Context.INITIAL_CONTEXT_FACTORY,
  * 		InitialContextFactoryStub.class.getName());
diff --git a/api/src/test/java/stubs/javax/naming/InitialContextStub.java b/api/src/test/java/stubs/javax/naming/InitialContextStub.java
index 6b17b14b1..74121d691 100644
--- a/api/src/test/java/stubs/javax/naming/InitialContextStub.java
+++ b/api/src/test/java/stubs/javax/naming/InitialContextStub.java
@@ -18,12 +18,12 @@ import javax.naming.NamingException;
 /**
  * In order to use this and the other naming stubs.javax.naming classes, do
  * this:
- * 
+ *
  * <pre>
  * System.setProperty(Context.INITIAL_CONTEXT_FACTORY,
  * 		InitialContextFactoryStub.class.getName());
  * </pre>
- * 
+ *
  * The bindings are static, so you will probablly want to call {@link #reset()}
  * before each test.
  */
diff --git a/api/src/test/java/stubs/javax/naming/spi/InitialContextFactoryStub.java b/api/src/test/java/stubs/javax/naming/spi/InitialContextFactoryStub.java
index c8c420c95..2a21cc1d0 100644
--- a/api/src/test/java/stubs/javax/naming/spi/InitialContextFactoryStub.java
+++ b/api/src/test/java/stubs/javax/naming/spi/InitialContextFactoryStub.java
@@ -13,7 +13,7 @@ import stubs.javax.naming.InitialContextStub;
 /**
  * In order to use this and the other naming stubs.javax.naming classes, do
  * this:
- * 
+ *
  * <pre>
  * System.setProperty(Context.INITIAL_CONTEXT_FACTORY,
  * 		InitialContextFactoryStub.class.getName());
diff --git a/api/src/test/java/stubs/javax/servlet/http/HttpServletResponseStub.java b/api/src/test/java/stubs/javax/servlet/http/HttpServletResponseStub.java
index ae42e61a1..cf27b60ca 100644
--- a/api/src/test/java/stubs/javax/servlet/http/HttpServletResponseStub.java
+++ b/api/src/test/java/stubs/javax/servlet/http/HttpServletResponseStub.java
@@ -160,7 +160,7 @@ public class HttpServletResponseStub implements HttpServletResponse {
 	@Override
 	public void setContentType(String contentType) {
 		this.contentType = contentType;
-		
+
 		Pattern p = Pattern.compile(";\\scharset=([^;]+)");
 		Matcher m = p.matcher(contentType);
 		if (m.find()) {
diff --git a/api/src/test/java/stubs/org/apache/jena/rdf/model/ModelMaker/ModelMakerStub.java b/api/src/test/java/stubs/org/apache/jena/rdf/model/ModelMaker/ModelMakerStub.java
index b60229d34..721086a29 100644
--- a/api/src/test/java/stubs/org/apache/jena/rdf/model/ModelMaker/ModelMakerStub.java
+++ b/api/src/test/java/stubs/org/apache/jena/rdf/model/ModelMaker/ModelMakerStub.java
@@ -19,12 +19,12 @@ import org.apache.jena.util.iterator.WrappedIterator;
 /**
  * A ModelMaker stub, but is it strict or relaxed? Choose one of the
  * sub-classes.
- * 
+ *
  * The only difference between strict and relaxed is on a call to
  * openModel(name), when no such model exists. The relaxed ModelMaker will
  * create a fresh model and associate it with the name. The strict modelMaker
  * will throw a DoesNotExistException.
- * 
+ *
  * Warning: the "fresh model" is the same every time, so calling
  * createFreshModel() more than once during a test will give illusory results.
  */
@@ -137,7 +137,7 @@ public abstract class ModelMakerStub implements ModelMaker {
 	/**
 	 * "Relaxed" means that if they ask for a model that doesn't exist, we
 	 * create one.
-	 * 
+	 *
 	 * Note: should return a new model, instead of the "fresh" model.
 	 */
 	private static class ModelMakerRelaxedStub extends ModelMakerStub {
diff --git a/api/src/test/resources/commons-logging.properties b/api/src/test/resources/commons-logging.properties
index d529f234c..6a2fd0cba 100644
--- a/api/src/test/resources/commons-logging.properties
+++ b/api/src/test/resources/commons-logging.properties
@@ -1,3 +1,3 @@
-# Tell Apache Commons Logging that we want to use Log4J for the unit tests, 
+# Tell Apache Commons Logging that we want to use Log4J for the unit tests,
 # even if other logging systems are available.
 org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.n3 b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.n3
index 95307fd2e..de7ad4798 100644
--- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.n3
+++ b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.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 rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@@ -9,7 +9,7 @@
 ### This file is for the test UserAccountsSelectorTest.java.
 
 #
-# Note: each optional field (everything except URI and emailAddress) is missing 
+# Note: each optional field (everything except URI and emailAddress) is missing
 # from some user account.
 #
 # Note: user accounts have 0, 1, or 2 permission sets.
@@ -27,7 +27,7 @@ mydomain:user01
 	auth:status "ACTIVE" ;
 	auth:hasPermissionSet mydomain:role1 ;
 	.
-	
+
 mydomain:user02
 	a auth:UserAccount ;
 	auth:emailAddress "email@bob.edu" ;
@@ -40,7 +40,7 @@ mydomain:user02
 	auth:status "INACTIVE" ;
 	auth:hasPermissionSet mydomain:role1 ;
 	.
-	
+
 mydomain:user03
 	a auth:UserAccount ;
 	auth:emailAddress "email@charlie.edu" ;
@@ -54,7 +54,7 @@ mydomain:user03
 	auth:hasPermissionSet mydomain:role1 ;
 	auth:hasPermissionSet mydomain:role2 ;
 	.
-	
+
 mydomain:user04
 	a auth:UserAccount ;
 	auth:emailAddress "email@delta.edu" ;
@@ -66,7 +66,7 @@ mydomain:user04
 	auth:lastLoginTime 3 ;
 	auth:status "ACTIVE" ;
 	.
-	
+
 mydomain:user05
 	a auth:UserAccount ;
 	auth:emailAddress "email@echo.edu" ;
@@ -79,7 +79,7 @@ mydomain:user05
 	auth:status "ACTIVE" ;
 	auth:hasPermissionSet mydomain:role1 ;
 	.
-	
+
 mydomain:user06
 	a auth:UserAccount ;
 	auth:emailAddress "email@foxtrot.edu" ;
@@ -92,7 +92,7 @@ mydomain:user06
 	auth:status "INACTIVE" ;
 	auth:hasPermissionSet mydomain:role1 ;
 	.
-	
+
 mydomain:user07
 	a auth:UserAccount ;
 	auth:emailAddress "email@golf.edu" ;
@@ -105,7 +105,7 @@ mydomain:user07
 #	auth:status NONE ;
 	auth:hasPermissionSet mydomain:role22 ;
 	.
-	
+
 mydomain:user08
 	a auth:UserAccount ;
 	a auth:RootUserAccount ;
@@ -119,7 +119,7 @@ mydomain:user08
 	auth:lastLoginTime 1122334455667788 ;
 	auth:status "ACTIVE" ;
 	.
-	
+
 mydomain:user09
 	a auth:UserAccount ;
 	auth:emailAddress "email@indigo.edu" ;
@@ -132,7 +132,7 @@ mydomain:user09
 	auth:status "ACTIVE" ;
 	auth:hasPermissionSet mydomain:role1 ;
 	.
-	
+
 mydomain:user10
 	a auth:UserAccount ;
 	auth:emailAddress "email@jones.edu" ;
@@ -146,21 +146,21 @@ mydomain:user10
 	auth:status "ACTIVE" ;
 	auth:hasPermissionSet mydomain:role2 ;
 	.
-	
+
 mydomain:role1
 	a auth:PermissionSet ;
 	rdfs:label "Role 1" ;
 	.
-	
+
 mydomain:role2
 	a auth:PermissionSet ;
 	rdfs:label "Role 2" ;
 	.
-	
-# this is intentionally a typographical extension of mydomain:role2 
+
+# this is intentionally a typographical extension of mydomain:role2
 #    to test that our reg-exp filters correctly.
 mydomain:role22
 	a auth:PermissionSet ;
 	rdfs:label "Role 22" ;
 	.
-	
+
diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectorTest_UnionModel.n3 b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectorTest_UnionModel.n3
index 1d7e805d9..43d928c1d 100644
--- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectorTest_UnionModel.n3
+++ b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectorTest_UnionModel.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 rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> .
@@ -21,7 +21,7 @@ mydomain:firstProfile
 	.
 mydomain:firstSelf
 	a foaf:Person ;
-	vitro:mostSpecificType mydomain:selfType ; 
+	vitro:mostSpecificType mydomain:selfType ;
 	public:mainImage mydomain:selfImage ;
 	mydomain:matching "firstSelf" ;
 	.
@@ -33,7 +33,7 @@ mydomain:firstSelf
 mydomain:bozo
 	a foaf:Person ;
 	rdfs:label "Bozo, Not Just Any" ;
-	vitro:mostSpecificType mydomain:profileType; 
+	vitro:mostSpecificType mydomain:profileType;
 	.
 
 
@@ -43,8 +43,8 @@ mydomain:bozo
 mydomain:popularProfile
 	a foaf:Person ;
 	rdfs:label "Profile, Popular" ;
-	vitro:mostSpecificType mydomain:profileType; 
-	public:mainImage mydomain:profileImage; 
+	vitro:mostSpecificType mydomain:profileType;
+	public:mainImage mydomain:profileImage;
 	.
 
 
@@ -55,13 +55,13 @@ mydomain:popularProfile
 mydomain:profileWithNoClassLabel
 	a foaf:Person ;
 	rdfs:label "NoClassLabel, Profile with" ;
-	public:mainImage mydomain:profileImage; 
+	public:mainImage mydomain:profileImage;
 	.
 
 mydomain:profileWithNoImageUrl
 	a foaf:Person ;
 	rdfs:label "NoImageUrl, Profile with" ;
-	vitro:mostSpecificType mydomain:profileType; 
+	vitro:mostSpecificType mydomain:profileType;
 	.
 
 mydomain:profileWithNeither
@@ -72,11 +72,11 @@ mydomain:profileWithNeither
 mydomain:profileWithBoth
 	a foaf:Person ;
 	rdfs:label "Both, Profile with" ;
-	vitro:mostSpecificType mydomain:profileType; 
-	public:mainImage mydomain:profileImage; 
+	vitro:mostSpecificType mydomain:profileType;
+	public:mainImage mydomain:profileImage;
 	.
-	
-	
+
+
 #
 # These Individiauls are each the "self" for a different proxy.
 # Each profile has a different combination of attributes.
@@ -84,14 +84,14 @@ mydomain:profileWithBoth
 mydomain:individualWithNoClassLabel
 	a foaf:Person ;
 	rdfs:label "Person, Bozo" ;
-	public:mainImage mydomain:selfImage; 
+	public:mainImage mydomain:selfImage;
 	mydomain:matching "individualWithNoClassLabel" ;
 	.
 
 mydomain:individualWithNoImageUrl
 	a foaf:Person ;
 	rdfs:label "Person, Bozo" ;
-	vitro:mostSpecificType mydomain:selfType; 
+	vitro:mostSpecificType mydomain:selfType;
 	mydomain:matching "individualWithNoImageUrl" ;
 	.
 
@@ -105,21 +105,21 @@ mydomain:individualWithBoth
 	a foaf:Person ;
 	rdfs:label "Person, Bozo" ;
 	vitro:mostSpecificType mydomain:selfType;
-	public:mainImage mydomain:selfImage; 
+	public:mainImage mydomain:selfImage;
 	mydomain:matching "individualWithBoth" ;
 	.
 
 #
 # Use this as a "most specific type" for Profiles.
 #
-mydomain:profileType 
+mydomain:profileType
 	rdfs:label "Profile";
 	.
 
 #
 # Use this as a "most specific type" for "selves".
 #
-mydomain:selfType 
+mydomain:selfType
 	rdfs:label "Self";
 	.
 
diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectorTest_UserAccountsModel.n3 b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectorTest_UserAccountsModel.n3
index 2da266d30..9c71acfb8 100644
--- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectorTest_UserAccountsModel.n3
+++ b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ProxyRelationshipSelectorTest_UserAccountsModel.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 auth: <http://vitro.mannlib.cornell.edu/ns/vitro/authorization#> .
 @prefix mydomain: <http://vivo.mydomain.edu/individual/> .
@@ -29,7 +29,7 @@ mydomain:userProxyForNone
 	.
 
 #
-# This user account is proxy for a bunch of profiles. 
+# This user account is proxy for a bunch of profiles.
 # This user account has no self
 #
 mydomain:userPopularProxy
diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssemblerTest.filteredRdf.n3 b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssemblerTest.filteredRdf.n3
index 5225f55f4..ee7746c3f 100644
--- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssemblerTest.filteredRdf.n3
+++ b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssemblerTest.filteredRdf.n3
@@ -20,16 +20,16 @@
 @prefix vivo:    <http://vivoweb.org/ontology/core#> .
 
 <http://vivo.mydomain.edu/individual/n3639>
-      a       vivo:FacultyMember , 
-              foaf:Person , 
-              owl:Thing , 
-              foaf:Agent , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000001 , 
+      a       vivo:FacultyMember ,
+              foaf:Person ,
+              owl:Thing ,
+              foaf:Agent ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000001 ,
               obo:BFO_0000004 ;
       rdfs:label "Baker, Able "^^xsd:string ;
       obo:ARG_2000028 <http://vivo.mydomain.edu/individual/n3972> ;
-      obo:RO_0000053 <http://vivo.mydomain.edu/individual/n475> , 
+      obo:RO_0000053 <http://vivo.mydomain.edu/individual/n475> ,
                      <http://vivo.mydomain.edu/individual/n7850> ;
       vitro:mostSpecificType
               vivo:FacultyMember ;
@@ -37,88 +37,88 @@
               "Potrezebie, Chattanooga" ;
       vivo:hasCollaborator
               <http://vivo.mydomain.edu/individual/n7429> ;
-      vivo:relatedBy <http://vivo.mydomain.edu/individual/n3401> , 
-                     <http://vivo.mydomain.edu/individual/n5855> , 
+      vivo:relatedBy <http://vivo.mydomain.edu/individual/n3401> ,
+                     <http://vivo.mydomain.edu/individual/n5855> ,
                      <http://vivo.mydomain.edu/individual/n2421> ;
       vivo:researchOverview
               "Whatever strikes my fancy." ;
       vivo:scopusId "abaker" .
 
 <http://vivo.mydomain.edu/individual/n3972>
-      a       vcard:Kind , 
-              obo:BFO_0000031 , 
-              owl:Thing , 
-              obo:ARG_2000379 , 
-              obo:IAO_0000030 , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000001 , 
+      a       vcard:Kind ,
+              obo:BFO_0000031 ,
+              owl:Thing ,
+              obo:ARG_2000379 ,
+              obo:IAO_0000030 ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000001 ,
               vcard:Individual ;
       obo:ARG_2000029 <http://vivo.mydomain.edu/individual/n3639> .
 
 <http://vivo.mydomain.edu/individual/n475>
-      a       owl:Thing , 
-              obo:BFO_0000023 , 
-              vivo:InvestigatorRole , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000017 , 
-              vivo:PrincipalInvestigatorRole , 
-              obo:BFO_0000020 , 
-              obo:BFO_0000001 , 
+      a       owl:Thing ,
+              obo:BFO_0000023 ,
+              vivo:InvestigatorRole ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000017 ,
+              vivo:PrincipalInvestigatorRole ,
+              obo:BFO_0000020 ,
+              obo:BFO_0000001 ,
               vivo:ResearcherRole ;
       obo:RO_0000052 <http://vivo.mydomain.edu/individual/n3639> .
 
 <http://vivo.mydomain.edu/individual/n7850>
-      a       owl:Thing , 
-              obo:BFO_0000023 , 
-              obo:BFO_0000017 , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000020 , 
-              obo:BFO_0000001 , 
+      a       owl:Thing ,
+              obo:BFO_0000023 ,
+              obo:BFO_0000017 ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000020 ,
+              obo:BFO_0000001 ,
               vivo:LeaderRole ;
       rdfs:label "Lead Guitarist"^^xsd:string ;
       obo:RO_0000052 <http://vivo.mydomain.edu/individual/n3639> .
 
 <http://vivo.mydomain.edu/individual/n7429>
-      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 "Yum, Yum " .
 
 <http://vivo.mydomain.edu/individual/n3401>
-      a       owl:Thing , 
-              vivo:Relationship , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000020 , 
-              obo:BFO_0000001 , 
+      a       owl:Thing ,
+              vivo:Relationship ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000020 ,
+              obo:BFO_0000001 ,
               vivo:Authorship ;
       vivo:relates <http://vivo.mydomain.edu/individual/n3639> .
 
 <http://vivo.mydomain.edu/individual/n5855>
-      a       vivo:FacultyPosition , 
-              owl:Thing , 
-              vivo:Relationship , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000020 , 
-              obo:BFO_0000001 , 
+      a       vivo:FacultyPosition ,
+              owl:Thing ,
+              vivo:Relationship ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000020 ,
+              obo:BFO_0000001 ,
               vivo:Position ;
       rdfs:label "Functionary"^^xsd:string ;
       vivo:relates <http://vivo.mydomain.edu/individual/n3639> .
 
 <http://vivo.mydomain.edu/individual/n2421>
-      a       owl:Thing , 
-              vivo:Relationship , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000020 , 
-              obo:BFO_0000001 , 
+      a       owl:Thing ,
+              vivo:Relationship ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000020 ,
+              obo:BFO_0000001 ,
               vivo:Grant ;
       rdfs:label "Cosmogenic Lassitude in Plegmatic Axolotls" ;
       vivo:relates <http://vivo.mydomain.edu/individual/n3639> .
 
-obo:BFO_0000001 
+obo:BFO_0000001
       a       owl:Class ;
       rdfs:label "Entity" .
 
diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssemblerTest.rawRdf.n3 b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssemblerTest.rawRdf.n3
index f16c07cfe..e25c2d2e9 100644
--- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssemblerTest.rawRdf.n3
+++ b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssemblerTest.rawRdf.n3
@@ -20,16 +20,16 @@
 @prefix vivo:    <http://vivoweb.org/ontology/core#> .
 
 <http://vivo.mydomain.edu/individual/n3639>
-      a       vivo:FacultyMember , 
-              foaf:Person , 
-              owl:Thing , 
-              foaf:Agent , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000001 , 
+      a       vivo:FacultyMember ,
+              foaf:Person ,
+              owl:Thing ,
+              foaf:Agent ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000001 ,
               obo:BFO_0000004 ;
       rdfs:label "Baker, Able "^^xsd:string ;
       obo:ARG_2000028 <http://vivo.mydomain.edu/individual/n3972> ;
-      obo:RO_0000053 <http://vivo.mydomain.edu/individual/n475> , 
+      obo:RO_0000053 <http://vivo.mydomain.edu/individual/n475> ,
                      <http://vivo.mydomain.edu/individual/n7850> ;
       vitro:mostSpecificType
               vivo:FacultyMember ;
@@ -38,104 +38,104 @@
       vivo:hasCollaborator
               <http://vivo.mydomain.edu/individual/n7429> ;
       vivo:hasResearchArea
-              <http://www.eionet.europa.eu/gemet/concept/971> , 
+              <http://www.eionet.europa.eu/gemet/concept/971> ,
               <http://vivo.mydomain.edu/individual/n2158> ;
       vivo:overview "Just an ordinary chap of simple means and simple desires." ;
-      vivo:relatedBy <http://vivo.mydomain.edu/individual/n3401> , 
-                     <http://vivo.mydomain.edu/individual/n5855> , 
+      vivo:relatedBy <http://vivo.mydomain.edu/individual/n3401> ,
+                     <http://vivo.mydomain.edu/individual/n5855> ,
                      <http://vivo.mydomain.edu/individual/n2421> ;
       vivo:researchOverview
               "Whatever strikes my fancy." ;
       vivo:scopusId "abaker" .
 
 <http://vivo.mydomain.edu/individual/n3972>
-      a       vcard:Kind , 
-              obo:BFO_0000031 , 
-              owl:Thing , 
-              obo:ARG_2000379 , 
-              obo:IAO_0000030 , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000001 , 
+      a       vcard:Kind ,
+              obo:BFO_0000031 ,
+              owl:Thing ,
+              obo:ARG_2000379 ,
+              obo:IAO_0000030 ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000001 ,
               vcard:Individual ;
       obo:ARG_2000029 <http://vivo.mydomain.edu/individual/n3639> .
 
 <http://vivo.mydomain.edu/individual/n475>
-      a       owl:Thing , 
-              obo:BFO_0000023 , 
-              vivo:InvestigatorRole , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000017 , 
-              vivo:PrincipalInvestigatorRole , 
-              obo:BFO_0000020 , 
-              obo:BFO_0000001 , 
+      a       owl:Thing ,
+              obo:BFO_0000023 ,
+              vivo:InvestigatorRole ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000017 ,
+              vivo:PrincipalInvestigatorRole ,
+              obo:BFO_0000020 ,
+              obo:BFO_0000001 ,
               vivo:ResearcherRole ;
       obo:RO_0000052 <http://vivo.mydomain.edu/individual/n3639> .
 
 <http://vivo.mydomain.edu/individual/n7850>
-      a       owl:Thing , 
-              obo:BFO_0000023 , 
-              obo:BFO_0000017 , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000020 , 
-              obo:BFO_0000001 , 
+      a       owl:Thing ,
+              obo:BFO_0000023 ,
+              obo:BFO_0000017 ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000020 ,
+              obo:BFO_0000001 ,
               vivo:LeaderRole ;
       rdfs:label "Lead Guitarist"^^xsd:string ;
       obo:RO_0000052 <http://vivo.mydomain.edu/individual/n3639> .
 
 <http://vivo.mydomain.edu/individual/n7429>
-      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 "Yum, Yum " .
 
 <http://www.eionet.europa.eu/gemet/concept/971>
-      a       owl:Thing , 
-              <http://vivo.mydomain.edu/individual/n7793> , 
+      a       owl:Thing ,
+              <http://vivo.mydomain.edu/individual/n7793> ,
               skos:Concept ;
       rdfs:label "botany"^^xsd:string ;
       vivo:researchAreaOf <http://vivo.mydomain.edu/individual/n3639> .
 
 <http://vivo.mydomain.edu/individual/n2158>
-      a       owl:Thing , 
+      a       owl:Thing ,
               skos:Concept ;
       rdfs:label "What a concept!"^^xsd:string ;
       vivo:researchAreaOf <http://vivo.mydomain.edu/individual/n3639> .
 
 <http://vivo.mydomain.edu/individual/n3401>
-      a       owl:Thing , 
-              vivo:Relationship , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000020 , 
-              obo:BFO_0000001 , 
+      a       owl:Thing ,
+              vivo:Relationship ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000020 ,
+              obo:BFO_0000001 ,
               vivo:Authorship ;
       vivo:relates <http://vivo.mydomain.edu/individual/n3639> .
 
 <http://vivo.mydomain.edu/individual/n5855>
-      a       vivo:FacultyPosition , 
-              owl:Thing , 
-              vivo:Relationship , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000020 , 
-              obo:BFO_0000001 , 
+      a       vivo:FacultyPosition ,
+              owl:Thing ,
+              vivo:Relationship ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000020 ,
+              obo:BFO_0000001 ,
               vivo:Position ;
       rdfs:label "Functionary"^^xsd:string ;
       vivo:relates <http://vivo.mydomain.edu/individual/n3639> .
 
 <http://vivo.mydomain.edu/individual/n2421>
-      a       owl:Thing , 
-              vivo:Relationship , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000020 , 
-              obo:BFO_0000001 , 
+      a       owl:Thing ,
+              vivo:Relationship ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000020 ,
+              obo:BFO_0000001 ,
               vivo:Grant ;
       rdfs:label "Cosmogenic Lassitude in Plegmatic Axolotls" ;
       vivo:relates <http://vivo.mydomain.edu/individual/n3639> .
 
-obo:BFO_0000001 
+obo:BFO_0000001
       a       owl:Class ;
       rdfs:label "Entity" .
 
diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssemblerTest.unfilteredRdf.n3 b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssemblerTest.unfilteredRdf.n3
index 779d5c51f..bbe786719 100644
--- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssemblerTest.unfilteredRdf.n3
+++ b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/controller/individual/IndividualRdfAssemblerTest.unfilteredRdf.n3
@@ -20,16 +20,16 @@
 @prefix vivo:    <http://vivoweb.org/ontology/core#> .
 
 <http://vivo.mydomain.edu/individual/n3639>
-      a       vivo:FacultyMember , 
-              foaf:Person , 
-              owl:Thing , 
-              foaf:Agent , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000001 , 
+      a       vivo:FacultyMember ,
+              foaf:Person ,
+              owl:Thing ,
+              foaf:Agent ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000001 ,
               obo:BFO_0000004 ;
       rdfs:label "Baker, Able "^^xsd:string ;
       obo:ARG_2000028 <http://vivo.mydomain.edu/individual/n3972> ;
-      obo:RO_0000053 <http://vivo.mydomain.edu/individual/n475> , 
+      obo:RO_0000053 <http://vivo.mydomain.edu/individual/n475> ,
                      <http://vivo.mydomain.edu/individual/n7850> ;
       vitro:mostSpecificType
               vivo:FacultyMember ;
@@ -38,104 +38,104 @@
       vivo:hasCollaborator
               <http://vivo.mydomain.edu/individual/n7429> ;
       vivo:hasResearchArea
-              <http://www.eionet.europa.eu/gemet/concept/971> , 
+              <http://www.eionet.europa.eu/gemet/concept/971> ,
               <http://vivo.mydomain.edu/individual/n2158> ;
       vivo:overview "Just an ordinary chap of simple means and simple desires." ;
-      vivo:relatedBy <http://vivo.mydomain.edu/individual/n3401> , 
-                     <http://vivo.mydomain.edu/individual/n5855> , 
+      vivo:relatedBy <http://vivo.mydomain.edu/individual/n3401> ,
+                     <http://vivo.mydomain.edu/individual/n5855> ,
                      <http://vivo.mydomain.edu/individual/n2421> ;
       vivo:researchOverview
               "Whatever strikes my fancy." ;
       vivo:scopusId "abaker" .
 
 <http://vivo.mydomain.edu/individual/n3972>
-      a       vcard:Kind , 
-              obo:BFO_0000031 , 
-              owl:Thing , 
-              obo:ARG_2000379 , 
-              obo:IAO_0000030 , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000001 , 
+      a       vcard:Kind ,
+              obo:BFO_0000031 ,
+              owl:Thing ,
+              obo:ARG_2000379 ,
+              obo:IAO_0000030 ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000001 ,
               vcard:Individual ;
       obo:ARG_2000029 <http://vivo.mydomain.edu/individual/n3639> .
 
 <http://vivo.mydomain.edu/individual/n475>
-      a       owl:Thing , 
-              obo:BFO_0000023 , 
-              vivo:InvestigatorRole , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000017 , 
-              vivo:PrincipalInvestigatorRole , 
-              obo:BFO_0000020 , 
-              obo:BFO_0000001 , 
+      a       owl:Thing ,
+              obo:BFO_0000023 ,
+              vivo:InvestigatorRole ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000017 ,
+              vivo:PrincipalInvestigatorRole ,
+              obo:BFO_0000020 ,
+              obo:BFO_0000001 ,
               vivo:ResearcherRole ;
       obo:RO_0000052 <http://vivo.mydomain.edu/individual/n3639> .
 
 <http://vivo.mydomain.edu/individual/n7850>
-      a       owl:Thing , 
-              obo:BFO_0000023 , 
-              obo:BFO_0000017 , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000020 , 
-              obo:BFO_0000001 , 
+      a       owl:Thing ,
+              obo:BFO_0000023 ,
+              obo:BFO_0000017 ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000020 ,
+              obo:BFO_0000001 ,
               vivo:LeaderRole ;
       rdfs:label "Lead Guitarist"^^xsd:string ;
       obo:RO_0000052 <http://vivo.mydomain.edu/individual/n3639> .
 
 <http://vivo.mydomain.edu/individual/n7429>
-      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 "Yum, Yum " .
 
 <http://www.eionet.europa.eu/gemet/concept/971>
-      a       owl:Thing , 
-              <http://vivo.mydomain.edu/individual/n7793> , 
+      a       owl:Thing ,
+              <http://vivo.mydomain.edu/individual/n7793> ,
               skos:Concept ;
       rdfs:label "botany"^^xsd:string ;
       vivo:researchAreaOf <http://vivo.mydomain.edu/individual/n3639> .
 
 <http://vivo.mydomain.edu/individual/n2158>
-      a       owl:Thing , 
+      a       owl:Thing ,
               skos:Concept ;
       rdfs:label "What a concept!"^^xsd:string ;
       vivo:researchAreaOf <http://vivo.mydomain.edu/individual/n3639> .
 
 <http://vivo.mydomain.edu/individual/n3401>
-      a       owl:Thing , 
-              vivo:Relationship , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000020 , 
-              obo:BFO_0000001 , 
+      a       owl:Thing ,
+              vivo:Relationship ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000020 ,
+              obo:BFO_0000001 ,
               vivo:Authorship ;
       vivo:relates <http://vivo.mydomain.edu/individual/n3639> .
 
 <http://vivo.mydomain.edu/individual/n5855>
-      a       vivo:FacultyPosition , 
-              owl:Thing , 
-              vivo:Relationship , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000020 , 
-              obo:BFO_0000001 , 
+      a       vivo:FacultyPosition ,
+              owl:Thing ,
+              vivo:Relationship ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000020 ,
+              obo:BFO_0000001 ,
               vivo:Position ;
       rdfs:label "Functionary"^^xsd:string ;
       vivo:relates <http://vivo.mydomain.edu/individual/n3639> .
 
 <http://vivo.mydomain.edu/individual/n2421>
-      a       owl:Thing , 
-              vivo:Relationship , 
-              obo:BFO_0000002 , 
-              obo:BFO_0000020 , 
-              obo:BFO_0000001 , 
+      a       owl:Thing ,
+              vivo:Relationship ,
+              obo:BFO_0000002 ,
+              obo:BFO_0000020 ,
+              obo:BFO_0000001 ,
               vivo:Grant ;
       rdfs:label "Cosmogenic Lassitude in Plegmatic Axolotls" ;
       vivo:relates <http://vivo.mydomain.edu/individual/n3639> .
 
-obo:BFO_0000001 
+obo:BFO_0000001
       a       owl:Class ;
       rdfs:label "Entity" .
 
diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/dao/jena/resources/UserAccountsDaoJenaTest.n3 b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/dao/jena/resources/UserAccountsDaoJenaTest.n3
index 5b2c4f80e..df65b21df 100644
--- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/dao/jena/resources/UserAccountsDaoJenaTest.n3
+++ b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/dao/jena/resources/UserAccountsDaoJenaTest.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 rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@@ -22,27 +22,27 @@ mydomain:user01
 	auth:externalAuthId "user1";
 	auth:hasPermissionSet mydomain:role1 ;
 	.
-	
+
 mydomain:role1
 	a auth:PermissionSet ;
 	rdfs:label "Role 1" ;
 	auth:hasPermission mydomain:permissionA ;
 	.
-	
+
 mydomain:role2
 	a auth:PermissionSet ;
     a auth:PermissionSetForNewUsers ;
 	rdfs:label "Role 2" ;
 	.
-	
+
 mydomain:role3
 	a auth:PermissionSet ;
     a auth:PermissionSetForPublic ;
 	rdfs:label "Role 3" ;
 	.
-	
+
 mydomain:permissionA
     a auth:Permission ;
     rdfs:label "Permission A" ;
     .
-    
\ No newline at end of file
+
diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/dao/jena/resources/menuForTest.n3 b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/dao/jena/resources/menuForTest.n3
index 8e6aec28a..b0724f211 100644
--- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/dao/jena/resources/menuForTest.n3
+++ b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/dao/jena/resources/menuForTest.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#> .
@@ -10,7 +10,7 @@
 
 #### Default Menu ####
 
-display:DefaultMenu 
+display:DefaultMenu
     a  display:MainMenu ;
     display:hasElement display:EventsMenuItem ;
     display:hasElement display:HomeMenuItem ;
@@ -21,63 +21,63 @@ 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:PublicationsMenuItem     
+display:PublicationsMenuItem
     a display:NavigationElement ;
     display:menuPosition "3";
     display:linkText "Publications";
     display:toPage display:Publications .
 
-display:EventsMenuItem 
+display:EventsMenuItem
     a display:NavigationElement ;
     display:menuPosition "4";
     display:linkText "Events";
     display:toPage display:Events .
 
-display:OrganizationsMenuItem 
+display:OrganizationsMenuItem
     a display:NavigationElement ;
     display:menuPosition "5";
     display:linkText "Organizations";
-    display:toPage display:Organizations .  
+    display:toPage display:Organizations .
 
 ########## Pages ############
 
-display:Home 
+display:Home
     a display:Page ;
     display:requiresBodyTemplate "home.ftl" ;
     display:title "Home" ;
     display:urlMapping "/home" .
 
-display:Events 
+display:Events
     a display:Page ;
     display:requiresBodyTemplate "Events.ftl" ;
     display:title "Events" ;
     display:urlMapping "/events" .
 
-display:Organizations 
+display:Organizations
     a display:Page ;
     display:requiresBodyTemplate "organizations.ftl" ;
     display:title "Organizations" ;
     display:urlMapping "/organizations" .
 
-display:People 
+display:People
     a display:Page ;
     display:requiresBodyTemplate "people.ftl" ;
     display:title "People" ;
     display:urlMapping "/people" .
 
-display:Publications 
+display:Publications
     a display:Page ;
     display:requiresBodyTemplate "publications.ftl" ;
     display:title "Publications" ;
diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/edit/n3editing/testEditConfig.json b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/edit/n3editing/testEditConfig.json
index 60e7ed808..93f5f4ba9 100644
--- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/edit/n3editing/testEditConfig.json
+++ b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/edit/n3editing/testEditConfig.json
@@ -61,4 +61,4 @@
          "assertions"       : [ ]
       }
     }
-  }
\ No newline at end of file
+  }
diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/resources/dataGetterTest.n3 b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/resources/dataGetterTest.n3
index 51942c9dc..e9d84d4cc 100644
--- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/resources/dataGetterTest.n3
+++ b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/resources/dataGetterTest.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#> .
@@ -9,16 +9,16 @@
 ### This file is for the test DataGetterUtilsTest.java
 
 display:SPARQLPage
-    a display:Page ;            
+    a display:Page ;
     display:title "TestQuery" ;
     display:urlMapping "/query1" ;
     display:hasDataGetter display:query1data .
-    
-display:query1data 
+
+display:query1data
     a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter>;
     display:query "SELECT * WHERE { ?uri a <http://xmlns.com/foaf/0.1/Person> } " ;
-    display:saveToVar "people" .      
-    
-    
+    display:saveToVar "people" .
+
+
+
 
-      
\ No newline at end of file
diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/utils/ingest/renameBlank.n3 b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/utils/ingest/renameBlank.n3
index fd1d93249..2eb2d2875 100644
--- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/utils/ingest/renameBlank.n3
+++ b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/utils/ingest/renameBlank.n3
@@ -10,4 +10,4 @@
             ns:duckCode "3" ;
             ns:d "cake" ;
         ] ;
-    ] .  
+    ] .
diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-constructQueryMissing.xml b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-constructQueryMissing.xml
index 0d1a97928..e41d0fecf 100644
--- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-constructQueryMissing.xml
+++ b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-constructQueryMissing.xml
@@ -3,7 +3,7 @@
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <!--
-	No construct query. Should throw an error.  
+	No construct query. Should throw an error.
 -->
 
 <list-view-config>
@@ -15,7 +15,7 @@
             <collated>
             ?object a ?subclass.
             </collated>
-        }  
+        }
     </query-select>
 
     <template>propStatement-default.ftl</template>
diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-constructQueryMultiple.xml b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-constructQueryMultiple.xml
index 2ac0bb891..1de97da06 100644
--- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-constructQueryMultiple.xml
+++ b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-constructQueryMultiple.xml
@@ -3,7 +3,7 @@
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <!--
-	More than one construct query.  
+	More than one construct query.
 -->
 
 <list-view-config>
@@ -15,12 +15,12 @@
             <collated>
             ?object a ?subclass.
             </collated>
-        }  
+        }
     </query-select>
 
     <query-construct>ONE</query-construct>
     <query-construct>TWO</query-construct>
     <query-construct>THREE</query-construct>
-    
+
     <template>propStatement-default.ftl</template>
 </list-view-config>
diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-default.xml b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-default.xml
index 8b1dd2a2a..ea2eb9975 100644
--- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-default.xml
+++ b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-default.xml
@@ -3,7 +3,7 @@
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <!--
-	Default list view configuration for unit tests in this directory.  
+	Default list view configuration for unit tests in this directory.
 -->
 
 <list-view-config>
@@ -15,16 +15,16 @@
             <collated>
             ?object a ?subclass.
             </collated>
-        }  
+        }
     </query-select>
 
     <query-construct>
         CONSTRUCT {
             ?subject ?property ?object .
         } WHERE {
-            ?subject ?property ?object 
+            ?subject ?property ?object
         }
     </query-construct>
-    
+
     <template>propStatement-default.ftl</template>
 </list-view-config>
diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorClassNotFound.xml b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorClassNotFound.xml
index 41da45769..54a8e899b 100644
--- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorClassNotFound.xml
+++ b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorClassNotFound.xml
@@ -3,7 +3,7 @@
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <!--
-	postprocessor tag refers to a non-existent class.  
+	postprocessor tag refers to a non-existent class.
 -->
 
 <list-view-config>
@@ -15,18 +15,18 @@
             <collated>
             ?object a ?subclass.
             </collated>
-        }  
+        }
     </query-select>
 
     <query-construct>
         CONSTRUCT {
             ?subject ?property ?object .
         } WHERE {
-            ?subject ?property ?object 
+            ?subject ?property ?object
         }
     </query-construct>
-    
+
     <template>propStatement-default.ftl</template>
-    
+
     <postprocessor>edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.ObjectPropertyTemplateModel_PropertyListConfigTest$NoSuchClass</postprocessor>
 </list-view-config>
diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorClassNotSuitable.xml b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorClassNotSuitable.xml
index 8bb43e895..47e7b144d 100644
--- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorClassNotSuitable.xml
+++ b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorClassNotSuitable.xml
@@ -3,7 +3,7 @@
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <!--
-	postprocessor tag refers to a class that does not implement the required interface.  
+	postprocessor tag refers to a class that does not implement the required interface.
 -->
 
 <list-view-config>
@@ -15,18 +15,18 @@
             <collated>
             ?object a ?subclass.
             </collated>
-        }  
+        }
     </query-select>
 
     <query-construct>
         CONSTRUCT {
             ?subject ?property ?object .
         } WHERE {
-            ?subject ?property ?object 
+            ?subject ?property ?object
         }
     </query-construct>
-    
+
     <template>propStatement-default.ftl</template>
-    
+
     <postprocessor>edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.ObjectPropertyTemplateModel_PropertyListConfigTest$ClassNotSuitable</postprocessor>
 </list-view-config>
diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorConstructorThrowsException.xml b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorConstructorThrowsException.xml
index 79ca73a8e..f6dee403f 100644
--- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorConstructorThrowsException.xml
+++ b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorConstructorThrowsException.xml
@@ -3,7 +3,7 @@
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <!--
-	postprocessor tag refers to a class that does not implement the required interface.  
+	postprocessor tag refers to a class that does not implement the required interface.
 -->
 
 <list-view-config>
@@ -15,18 +15,18 @@
             <collated>
             ?object a ?subclass.
             </collated>
-        }  
+        }
     </query-select>
 
     <query-construct>
         CONSTRUCT {
             ?subject ?property ?object .
         } WHERE {
-            ?subject ?property ?object 
+            ?subject ?property ?object
         }
     </query-construct>
-    
+
     <template>propStatement-default.ftl</template>
-    
+
     <postprocessor>edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.ObjectPropertyTemplateModel_PropertyListConfigTest$PostProcessorThrowsException</postprocessor>
 </list-view-config>
diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorNameEmpty.xml b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorNameEmpty.xml
index 9f63d9f62..94d4265a6 100644
--- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorNameEmpty.xml
+++ b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorNameEmpty.xml
@@ -3,7 +3,7 @@
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <!--
-	Has a postprocessor tag with no contents. Should use the default.  
+	Has a postprocessor tag with no contents. Should use the default.
 -->
 
 <list-view-config>
@@ -15,18 +15,18 @@
             <collated>
             ?object a ?subclass.
             </collated>
-        }  
+        }
     </query-select>
 
     <query-construct>
         CONSTRUCT {
             ?subject ?property ?object .
         } WHERE {
-            ?subject ?property ?object 
+            ?subject ?property ?object
         }
     </query-construct>
-    
+
     <template>propStatement-default.ftl</template>
-    
+
     <postprocessor></postprocessor>
 </list-view-config>
diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorOK.xml b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorOK.xml
index eb948643d..ffc079177 100644
--- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorOK.xml
+++ b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorOK.xml
@@ -3,7 +3,7 @@
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <!--
-	postprocessor tag references an acceptable class.  
+	postprocessor tag references an acceptable class.
 -->
 
 <list-view-config>
@@ -15,18 +15,18 @@
             <collated>
             ?object a ?subclass.
             </collated>
-        }  
+        }
     </query-select>
 
     <query-construct>
         CONSTRUCT {
             ?subject ?property ?object .
         } WHERE {
-            ?subject ?property ?object 
+            ?subject ?property ?object
         }
     </query-construct>
-    
+
     <template>propStatement-default.ftl</template>
-    
+
     <postprocessor>edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.ObjectPropertyTemplateModel_PropertyListConfigTest$PostProcessorOK</postprocessor>
 </list-view-config>
diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorWrongConstructor.xml b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorWrongConstructor.xml
index d338c27fd..21747016d 100644
--- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorWrongConstructor.xml
+++ b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-postProcessorWrongConstructor.xml
@@ -15,18 +15,18 @@
             <collated>
             ?object a ?subclass.
             </collated>
-        }  
+        }
     </query-select>
 
     <query-construct>
         CONSTRUCT {
             ?subject ?property ?object .
         } WHERE {
-            ?subject ?property ?object 
+            ?subject ?property ?object
         }
     </query-construct>
-    
+
     <template>propStatement-default.ftl</template>
-    
+
     <postprocessor>edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.ObjectPropertyTemplateModel_PropertyListConfigTest$PostProcessorWrongConstructor</postprocessor>
 </list-view-config>
diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-templateDoesNotExist.xml b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-templateDoesNotExist.xml
index 79a999651..514aed886 100644
--- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-templateDoesNotExist.xml
+++ b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/testConfig-templateDoesNotExist.xml
@@ -3,7 +3,7 @@
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <!--
-	Template file does not exist. Should throw an exception.  
+	Template file does not exist. Should throw an exception.
 -->
 
 <list-view-config>
@@ -15,16 +15,16 @@
             <collated>
             ?object a ?subclass.
             </collated>
-        }  
+        }
     </query-select>
 
     <query-construct>
         CONSTRUCT {
             ?subject ?property ?object .
         } WHERE {
-            ?subject ?property ?object 
+            ?subject ?property ?object
         }
     </query-construct>
-    
+
     <template>propStatement-doesNotExist.ftl</template>
 </list-view-config>
diff --git a/api/src/test/resources/log4j.properties b/api/src/test/resources/log4j.properties
index 8df713484..efa92dd05 100644
--- a/api/src/test/resources/log4j.properties
+++ b/api/src/test/resources/log4j.properties
@@ -1,7 +1,7 @@
 #
-# A simple Log4J configuration for unit tests. 
+# A simple Log4J configuration for unit tests.
 #
-# It's not very important, because the tests themselves will override this 
+# It's not very important, because the tests themselves will override this
 # configuration in AbstractTestClass.initializeLogging().
 #
 log4j.rootLogger=WARN, AllAppender
diff --git a/api/src/test/resources/testontologies/SolrQueryTestRDF/jcr.rdf b/api/src/test/resources/testontologies/SolrQueryTestRDF/jcr.rdf
index fc5c9818f..b1937be74 100644
--- a/api/src/test/resources/testontologies/SolrQueryTestRDF/jcr.rdf
+++ b/api/src/test/resources/testontologies/SolrQueryTestRDF/jcr.rdf
@@ -31,7 +31,7 @@
     xmlns:mann="http://vivo.cornell.edu/ns/mannadditions/0.1#"
     xmlns:owl="http://www.w3.org/2002/07/owl#"
     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#" >
   <rdfsyn:Description rdfsyn:about="http://vivo.cornell.edu/individual/n56282">
     <rdfs:label rdfsyn:datatype="http://www.w3.org/2001/XMLSchema#string">AgriVIVO: an Ontology-based Store of URIs and Relations between Entities in Agricultural Research</rdfs:label>
   </rdfsyn:Description>
diff --git a/api/src/test/resources/testontologies/SolrQueryTestRDF/vivo15.2.n3 b/api/src/test/resources/testontologies/SolrQueryTestRDF/vivo15.2.n3
index 20fc4891e..856211eea 100644
--- a/api/src/test/resources/testontologies/SolrQueryTestRDF/vivo15.2.n3
+++ b/api/src/test/resources/testontologies/SolrQueryTestRDF/vivo15.2.n3
@@ -42,4 +42,4 @@
 		owl:Thing,
 		foaf:Agent,
 		foaf:Person;
-	rdfs:label "Test individual for issue vivo15".
\ No newline at end of file
+	rdfs:label "Test individual for issue vivo15".
diff --git a/api/src/test/resources/testontologies/SolrQueryTestRDF/vivo15.n3 b/api/src/test/resources/testontologies/SolrQueryTestRDF/vivo15.n3
index 4b961e6ad..a0b9bd15a 100644
--- a/api/src/test/resources/testontologies/SolrQueryTestRDF/vivo15.n3
+++ b/api/src/test/resources/testontologies/SolrQueryTestRDF/vivo15.n3
@@ -42,4 +42,4 @@
 		owl:Thing,
 		foaf:Agent,
 		foaf:Person;
-	rdfs:label "Test individual for issue vivo15".
\ No newline at end of file
+	rdfs:label "Test individual for issue vivo15".
diff --git a/api/src/test/resources/testontologies/smallVivo-20070809.owl b/api/src/test/resources/testontologies/smallVivo-20070809.owl
index 0f171d71a..1c73a3d17 100644
--- a/api/src/test/resources/testontologies/smallVivo-20070809.owl
+++ b/api/src/test/resources/testontologies/smallVivo-20070809.owl
@@ -2631,7 +2631,7 @@ report on the &lt;a target="_new" href="http://www.ifla.org/VII/s13/frbr/frbr.ht
 &lt;li>Sentinel Node&lt;/li>
 &lt;li>Skin Sparing Mastectomy&lt;/li>&lt;/ul>&lt;/p>
 
-&lt;p>Dr. Alexander Swistel is one of the department's most well known breast surgeons. He specializes in all types of breast cancer, surgery and 
+&lt;p>Dr. Alexander Swistel is one of the department's most well known breast surgeons. He specializes in all types of breast cancer, surgery and
 diseases.&lt;/p></vitro:description>
     <rdfs:label rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
     >Swistel, Alexander J.</rdfs:label>
@@ -5072,8 +5072,8 @@ Please use the &lt;a href="comments.jsp?home=6">Contact Us&lt;/a> link to submit
     <vitro:imageThumb rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
     >people/talman_richard_thumb.gif</vitro:imageThumb>
   </mann:CornellFaculty>
-  
-  
+
+
   <mann:CornellFaculty rdf:about="http://vivo.library.cornell.edu/abox#entity11821">
     <vitro:sunrise rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime"
     >2007-07-17T14:55:12</vitro:sunrise>
@@ -5104,6 +5104,6 @@ Please use the &lt;a href="comments.jsp?home=6">Contact Us&lt;/a> link to submit
     <vitro:imageThumb rdf:datatype="http://www.w3.org/2001/XMLSchema#string"
     >people/Suthanthiran_Manikkam_thumb.gif</vitro:imageThumb>
   </mann:CornellFaculty>
-    
+
 
 </rdf:RDF>
diff --git a/api/src/test/resources/testontologies/vitro1.owl b/api/src/test/resources/testontologies/vitro1.owl
index 2a4c4339d..3f6acf1ff 100644
--- a/api/src/test/resources/testontologies/vitro1.owl
+++ b/api/src/test/resources/testontologies/vitro1.owl
@@ -22,12 +22,12 @@ xmlns:vivo="http://vivo.library.cornell.edu/ns/0.1#"
 
 <!-- externalIDs -->
 
-  <owl:DatatypeProperty rdf:about="http://lowe.mannlib.cornell.edu/ns/vitro/0.1/vitro.owl#externalID"/> 
+  <owl:DatatypeProperty rdf:about="http://lowe.mannlib.cornell.edu/ns/vitro/0.1/vitro.owl#externalID"/>
 
 
 <!-- begin BJL afterthoughts -->
 
-  <owl:AnnotationProperty rdf:about="http://lowe.mannlib.cornell.edu/ns/vitro/0.1/vitro.owl#descriptionAnnot"/> 
+  <owl:AnnotationProperty rdf:about="http://lowe.mannlib.cornell.edu/ns/vitro/0.1/vitro.owl#descriptionAnnot"/>
   <owl:AnnotationProperty rdf:about="http://lowe.mannlib.cornell.edu/ns/vitro/0.1/vitro.owl#shortDef"/>
   <owl:AnnotationProperty rdf:about="http://lowe.mannlib.cornell.edu/ns/vitro/0.1/vitro.owl#example"/>
   <owl:AnnotationProperty rdf:about="http://lowe.mannlib.cornell.edu/ns/vitro/0.1/vitro.owl#displayLimit"/>
diff --git a/api/src/test/resources/testontologies/vivo-users.owl b/api/src/test/resources/testontologies/vivo-users.owl
index 5dd6f2bcc..ae8939562 100644
--- a/api/src/test/resources/testontologies/vivo-users.owl
+++ b/api/src/test/resources/testontologies/vivo-users.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://lowe.mannlib.cornell.edu/ns/vitro/0.1/vitro.owl#"
@@ -20,7 +20,7 @@
     <vitro:modTime rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2007-07-17T14:54:14</vitro:modTime>
     <vitro:firstTime rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2004-11-16T16:05:07</vitro:firstTime>
     <vitro:loginCount rdf:datatype="http://www.w3.org/2001/XMLSchema#int">410</vitro:loginCount>
-    <vitro:roleURI rdf:datatype="http://www.w3.org/2001/XMLSchema#string">role:/50</vitro:roleURI>    
+    <vitro:roleURI rdf:datatype="http://www.w3.org/2001/XMLSchema#string">role:/50</vitro:roleURI>
 </vitro:User>
 
 <vitro:User rdf:about="#bdc34">
diff --git a/home/src/main/assembly/home.xml b/home/src/main/assembly/home.xml
index 426c55393..c02d3e375 100644
--- a/home/src/main/assembly/home.xml
+++ b/home/src/main/assembly/home.xml
@@ -40,4 +40,4 @@
             <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
         </dependencySet>
     </dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/home/src/main/resources/config/example.applicationSetup.n3 b/home/src/main/resources/config/example.applicationSetup.n3
index 6ead57a93..5d0562be2 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
@@ -112,7 +112,7 @@
 #        vitroWebapp:modules.tripleSource.ContentTripleSource ;
 #    # The URI of Virtuoso's SPARQL endpoint.
 #    :hasEndpointURI "PUT_YOUR_VIRTUOSO_URI_HERE" ;
-#    # The URI to use for SPARQL UPDATE calls against Virtuoso. 
+#    # The URI to use for SPARQL UPDATE calls against Virtuoso.
 #    :hasUpdateEndpointURI "PUT_THE UPDATE_URI_HERE" .
 
 
@@ -126,10 +126,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.developer.properties b/home/src/main/resources/config/example.developer.properties
index f064f05a9..67b119f92 100644
--- a/home/src/main/resources/config/example.developer.properties
+++ b/home/src/main/resources/config/example.developer.properties
@@ -3,17 +3,17 @@
 #
 # Runtime properties for developer mode.
 #
-# If the developer.properties file is present in the config sub-directory of 
-# your VIVO home directory, it will be loaded as VIVO starts up, taking effect 
-# immediately. 
+# If the developer.properties file is present in the config sub-directory of
+# your VIVO home directory, it will be loaded as VIVO starts up, taking effect
+# immediately.
 #
-# Each of these properties can be set or changed while VIVO is running, but it 
+# Each of these properties can be set or changed while VIVO is running, but it
 # can be convenient to set them in advance.
 #
 # WARNING: Some of these options can seriously degrade performance. They should
 # not be enabled in a production instance of VIVO.
 #
-# For more information go to 
+# For more information go to
 #    https://wiki.duraspace.org/display/VIVO/The+Developer+Panel
 #
 # -----------------------------------------------------------------------------
@@ -28,7 +28,7 @@
 
 
 #------------------------------------------------------------------------------
-# Freemarker 
+# Freemarker
 #------------------------------------------------------------------------------
 
 # developer.defeatFreemarkerCache = false
@@ -36,7 +36,7 @@
 
 
 #------------------------------------------------------------------------------
-# Page configuration 
+# Page configuration
 #------------------------------------------------------------------------------
 
 # developer.pageContents.logCustomListView = false
@@ -44,7 +44,7 @@
 
 
 #------------------------------------------------------------------------------
-# Internationalization 
+# Internationalization
 #------------------------------------------------------------------------------
 
 # developer.i18n.defeatCache = false
diff --git a/home/src/main/resources/config/example.runtime.properties b/home/src/main/resources/config/example.runtime.properties
index 882026b55..9822be25e 100644
--- a/home/src/main/resources/config/example.runtime.properties
+++ b/home/src/main/resources/config/example.runtime.properties
@@ -4,25 +4,25 @@
 #
 # This file is provided as example.runtime.properties.
 #
-# Save a copy of this file as runtime.properties in your Vitro home directory, 
+# Save a copy of this file as runtime.properties in your Vitro home directory,
 # and edit the properties as needed for your installation.
 #
 # -----------------------------------------------------------------------------
 
-# 
-# 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 
+#
+# 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/
 #
 Vitro.defaultNamespace = http://vivo.mydomain.edu/individual/
 
-# 
+#
 # URL of Solr context used in local Vitro search. This will usually consist of:
 #     scheme + server_name + port + vitro_webapp_name + "solr"
 # In the standard installation, the Solr context will be on the same server as Vitro,
@@ -33,7 +33,7 @@ Vitro.defaultNamespace = http://vivo.mydomain.edu/individual/
 vitro.local.solr.url = http://localhost:8080/vitrosolr
 
 #
-# 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.
 #
@@ -41,8 +41,8 @@ email.smtpHost = smtp.my.domain.edu
 email.replyTo = vivoAdmin@my.domain.edu
 
 #
-# The basic parameters for a MySQL database connection. Change the end of the 
-# URL to reflect your database name (if it is not "vitro"). Change the username 
+# The basic parameters for a MySQL database connection. Change the end of the
+# URL to reflect your database name (if it is not "vitro"). Change the username
 # and password to match the authorized user you created in MySQL.
 #
 VitroConnection.DataSource.url = jdbc:mysql://localhost/vitro
@@ -63,7 +63,7 @@ VitroConnection.DataSource.pool.maxActive = 40
 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
@@ -71,8 +71,8 @@ VitroConnection.DataSource.driver = com.mysql.jdbc.Driver
 VitroConnection.DataSource.validationQuery = SELECT 1
 
 #
-# 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 
+# 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 = root@myDomain.com
@@ -94,7 +94,7 @@ argon2.memory = 1024
 argon2.time = 1000
 
 #
-# 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 is the name of that property.
 #
@@ -104,11 +104,11 @@ selfEditing.idMatchingProperty = http://vitro.mydomain.edu/ns#networkId
 # If an external authentication system like Shibboleth or CUWebAuth is to be
 # used, these properties say how the login button should be labeled, and which
 # HTTP header will contain the user ID from the authentication system. If such
-# as system is not to be used, leave these commented out. Consult the 
-# installation instructions for more details. 
+# as system is not to be used, leave these commented out. Consult the
+# installation instructions for more details.
 #
 #externalAuth.buttonText = Log in using BearCat Shibboleth
-#externalAuth.netIdHeaderName = remote_userID 
+#externalAuth.netIdHeaderName = remote_userID
 
 #
 # Types of individual for which we can create proxy editors.
@@ -116,39 +116,39 @@ selfEditing.idMatchingProperty = http://vitro.mydomain.edu/ns#networkId
 proxy.eligibleTypeList = http://www.w3.org/2002/07/owl#Thing
 
 #
-# 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 = true
 
 #
-# 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.
 #
-# For more information, see 
+# For more information, see
 # https://wiki.duraspace.org/display/VIVO/Use+HTTP+caching+to+improve+performance
 #
 # 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
 
 #
-# 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.
 #
diff --git a/home/src/main/resources/rdf/auth/everytime/permission_config.n3 b/home/src/main/resources/rdf/auth/everytime/permission_config.n3
index 7e8aff985..f94e3516f 100644
--- a/home/src/main/resources/rdf/auth/everytime/permission_config.n3
+++ b/home/src/main/resources/rdf/auth/everytime/permission_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$
 
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix auth: <http://vitro.mannlib.cornell.edu/ns/vitro/authorization#> .
@@ -7,13 +7,13 @@
 @prefix editByRole: <java:edu.cornell.mannlib.vitro.webapp.auth.permissions.EditByRolePermission#> .
 @prefix publishByRole: <java:edu.cornell.mannlib.vitro.webapp.auth.permissions.PublishByRolePermission#> .
 
-auth:ADMIN 
+auth:ADMIN
     a auth:PermissionSet ;
     rdfs:label "Site Admin" ;
-    
+
     # ADMIN-only permissions
     auth:hasPermission simplePermission:AccessSpecialDataModels ;
-   	auth:hasPermission simplePermission:EnableDeveloperPanel ;    
+   	auth:hasPermission simplePermission:EnableDeveloperPanel ;
     auth:hasPermission simplePermission:LoginDuringMaintenance ;
     auth:hasPermission simplePermission:ManageMenus ;
     auth:hasPermission simplePermission:ManageProxies ;
@@ -25,20 +25,20 @@ auth:ADMIN
     auth:hasPermission simplePermission:UseAdvancedDataToolsPages ;
     auth:hasPermission simplePermission:UseMiscellaneousAdminPages ;
     auth:hasPermission simplePermission:UseSparqlQueryPage ;
-    auth:hasPermission simplePermission:PageViewableAdmin ;  
-   	
-    # Uncomment the following permission line to enable the SPARQL update API. 
-    # Before enabling, be sure that the URL api/sparqlUpdate is secured by HTTPS, 
-    # so passwords will not be sent in clear text.   	  
-    #auth:hasPermission simplePermission:UseSparqlUpdateApi ;    
-    
+    auth:hasPermission simplePermission:PageViewableAdmin ;
+
+    # Uncomment the following permission line to enable the SPARQL update API.
+    # Before enabling, be sure that the URL api/sparqlUpdate is secured by HTTPS,
+    # so passwords will not be sent in clear text.
+    #auth:hasPermission simplePermission:UseSparqlUpdateApi ;
+
     # permissions for CURATOR and above.
     auth:hasPermission simplePermission:EditOntology ;
     auth:hasPermission simplePermission:EditSiteInformation ;
     auth:hasPermission simplePermission:SeeVerbosePropertyInformation ;
     auth:hasPermission simplePermission:UseMiscellaneousCuratorPages ;
 	auth:hasPermission simplePermission:PageViewableCurator ;
-    
+
     # permissions for EDITOR and above.
     auth:hasPermission simplePermission:DoBackEndEditing ;
     auth:hasPermission simplePermission:SeeIndividualEditingPanel ;
@@ -55,28 +55,28 @@ auth:ADMIN
     auth:hasPermission simplePermission:UseBasicAjaxControllers ;
     auth:hasPermission simplePermission:UseMiscellaneousPages ;
   	auth:hasPermission simplePermission:PageViewableLoggedIn ;
-    
+
     # permissions for ANY user, even if they are not logged in.
     auth:hasPermission simplePermission:QueryFullModel ;
 	auth:hasPermission simplePermission:PageViewablePublic ;
-    
+
     # role-based permissions for ADMIN
     auth:hasPermission displayByRole:Admin ;
     auth:hasPermission editByRole:Admin ;
     auth:hasPermission publishByRole:Admin ;
     .
 
-auth:CURATOR 
+auth:CURATOR
     a auth:PermissionSet ;
     rdfs:label "Curator" ;
-    
+
     # permissions for CURATOR and above.
     auth:hasPermission simplePermission:EditOntology ;
     auth:hasPermission simplePermission:EditSiteInformation ;
     auth:hasPermission simplePermission:SeeVerbosePropertyInformation ;
     auth:hasPermission simplePermission:UseMiscellaneousCuratorPages ;
     auth:hasPermission simplePermission:PageViewableCurator ;
-    
+
     # permissions for EDITOR and above.
     auth:hasPermission simplePermission:DoBackEndEditing ;
     auth:hasPermission simplePermission:SeeIndividualEditingPanel ;
@@ -93,21 +93,21 @@ auth:CURATOR
     auth:hasPermission simplePermission:UseBasicAjaxControllers ;
     auth:hasPermission simplePermission:UseMiscellaneousPages ;
    	auth:hasPermission simplePermission:PageViewableLoggedIn ;
-    
+
     # permissions for ANY user, even if they are not logged in.
     auth:hasPermission simplePermission:QueryFullModel ;
     auth:hasPermission simplePermission:PageViewablePublic ;
-    
+
     # role-based permissions for CURATOR
     auth:hasPermission displayByRole:Curator ;
     auth:hasPermission editByRole:Curator ;
     auth:hasPermission publishByRole:Curator ;
     .
 
-auth:EDITOR 
+auth:EDITOR
     a auth:PermissionSet ;
     rdfs:label "Editor" ;
-    
+
     # permissions for EDITOR and above.
     auth:hasPermission simplePermission:DoBackEndEditing ;
     auth:hasPermission simplePermission:SeeIndividualEditingPanel ;
@@ -124,11 +124,11 @@ auth:EDITOR
     auth:hasPermission simplePermission:UseBasicAjaxControllers ;
     auth:hasPermission simplePermission:UseMiscellaneousPages ;
     auth:hasPermission simplePermission:PageViewableLoggedIn ;
-    
+
     # permissions for ANY user, even if they are not logged in.
     auth:hasPermission simplePermission:QueryFullModel ;
    	auth:hasPermission simplePermission:PageViewablePublic ;
-    
+
     # role-based permissions for EDITOR
     auth:hasPermission displayByRole:Editor ;
     auth:hasPermission editByRole:Editor ;
@@ -148,23 +148,23 @@ auth:SELF_EDITOR
     auth:hasPermission simplePermission:UseBasicAjaxControllers ;
     auth:hasPermission simplePermission:UseMiscellaneousPages ;
     auth:hasPermission simplePermission:PageViewableLoggedIn ;
-    
+
     # permissions for ANY user, even if they are not logged in.
     auth:hasPermission simplePermission:QueryFullModel ;
 	auth:hasPermission simplePermission:PageViewablePublic ;
 
     # role-based permissions for SELF_EDITOR
-    #     For role-based display and editing, SelfEditor is like Public. 
+    #     For role-based display and editing, SelfEditor is like Public.
     #     SelfEditor uses its special permissions to edit/display its own values.
-    auth:hasPermission displayByRole:Public ; 
-    auth:hasPermission publishByRole:Public ; 
+    auth:hasPermission displayByRole:Public ;
+    auth:hasPermission publishByRole:Public ;
     .
 
 auth:PUBLIC
     a auth:PermissionSet ;
     a auth:PermissionSetForPublic ;
     rdfs:label "Public" ;
-    
+
     # permissions for ANY user, even if they are not logged in.
     auth:hasPermission simplePermission:QueryFullModel ;
 	auth:hasPermission simplePermission:PageViewablePublic ;
diff --git a/home/src/main/resources/rdf/display/everytime/dataGetterLabels.n3 b/home/src/main/resources/rdf/display/everytime/dataGetterLabels.n3
index 9e0836548..a53effd4f 100644
--- a/home/src/main/resources/rdf/display/everytime/dataGetterLabels.n3
+++ b/home/src/main/resources/rdf/display/everytime/dataGetterLabels.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 rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 
 #Data getter type labels
@@ -6,9 +6,9 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 
 <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData>  rdfs:label "Class Group Page" .
-<java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.BrowseDataGetter> rdfs:label "Browse Page" . 
+<java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.BrowseDataGetter> rdfs:label "Browse Page" .
 <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.IndividualsForClassesDataGetter> rdfs:label "Class Group Page - Selected Classes" .
 <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter> rdfs:label "Sparql Query Results" .
-        
- 
-      
\ No newline at end of file
+
+
+
diff --git a/home/src/main/resources/rdf/display/everytime/displayModelListViews.rdf b/home/src/main/resources/rdf/display/everytime/displayModelListViews.rdf
index 4a17524f5..77f7620fd 100644
--- a/home/src/main/resources/rdf/display/everytime/displayModelListViews.rdf
+++ b/home/src/main/resources/rdf/display/everytime/displayModelListViews.rdf
@@ -15,9 +15,9 @@
     xmlns:rdfs="&rdfs;"
     xmlns:vitro="&vitro;">
 
-    
+
     <rdf:Description rdf:about="http://vitro.mannlib.cornell.edu/ontologies/display/1.1#hasElement">
         <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasElement.xml</display:listViewConfigFile>
     </rdf:Description>
-    
-</rdf:RDF>
\ No newline at end of file
+
+</rdf:RDF>
diff --git a/home/src/main/resources/rdf/display/everytime/pageList.n3 b/home/src/main/resources/rdf/display/everytime/pageList.n3
index 23d49019b..d09a0e589 100644
--- a/home/src/main/resources/rdf/display/everytime/pageList.n3
+++ b/home/src/main/resources/rdf/display/everytime/pageList.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$
 
 # This file is for the portions of the pageList that should not be editable, i.e.#
 # that it cannot be deleted and that it requires certain permissions #
@@ -13,4 +13,4 @@
 
 display:pageListPage
     display:requiresAction <java:edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission#ManageMenus> ;
-    display:cannotDeletePage "true" .
\ No newline at end of file
+    display:cannotDeletePage "true" .
diff --git a/home/src/main/resources/rdf/display/everytime/permissions.n3 b/home/src/main/resources/rdf/display/everytime/permissions.n3
index 9ce78bcec..38055479d 100644
--- a/home/src/main/resources/rdf/display/everytime/permissions.n3
+++ b/home/src/main/resources/rdf/display/everytime/permissions.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#> .
@@ -143,15 +143,15 @@ action:UseMiscellaneousPages
     rdfs:label "USE_MISCELLANEOUS_PAGES" .
 
 ##Page specific permissions
-action:PageViewableAdmin 
+action:PageViewableAdmin
 	a display:RequiredAction ;
     rdfs:label "PAGE_VIEWABLE_ADMIN" .
-    
+
 action:PageViewableCurator
 	a display:RequiredAction ;
 	rdfs:label "PAGE_VIEWABLE_CURATOR" .
 
-action:PageViewableEditor 
+action:PageViewableEditor
 	a display:RequiredAction ;
 	rdfs:label "PAGE_VIEWABLE_EDITOR" .
 
@@ -159,6 +159,6 @@ action:PageViewableLoggedIn
 	a display:RequiredAction ;
 	rdfs:label "PAGE_VIEWABLE_LOGGEDIN" .
 
-action:PageViewablePublic 
+action:PageViewablePublic
 	a display:RequiredAction ;
-	rdfs:label "PAGE_VIEWABLE_PUBLIC" .
\ No newline at end of file
+	rdfs:label "PAGE_VIEWABLE_PUBLIC" .
diff --git a/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVitro.n3 b/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVitro.n3
index 4c5a384c8..2716f10e2 100644
--- a/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVitro.n3
+++ b/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVitro.n3
@@ -64,13 +64,13 @@
     rdfs:label "All labels are added to name fields." ;
     :hasTargetField "nameRaw" ;
     :hasSelectQuery """
-        PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> 
-		SELECT ?label 
+        PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+		SELECT ?label
 		WHERE {
 			?uri rdfs:label ?label .
 	    }
         """ .
-    
+
 :documentModifier_NameFieldBooster
     a   searchIndex:documentBuilding.FieldBooster ,
         searchIndex:documentBuilding.DocumentModifier ;
diff --git a/home/src/main/resources/rdf/display/everytime/vitroSearchProhibited.n3 b/home/src/main/resources/rdf/display/everytime/vitroSearchProhibited.n3
index e5758ea82..74b223d25 100644
--- a/home/src/main/resources/rdf/display/everytime/vitroSearchProhibited.n3
+++ b/home/src/main/resources/rdf/display/everytime/vitroSearchProhibited.n3
@@ -1,17 +1,17 @@
-# $This file is distributed under the terms of the license in LICENSE$ 
+# $This file is distributed under the terms of the license in LICENSE$
 
-# All instances of a class can be excluded from the search index by adding a 
-# vitroDisplay:excludeClass property between vitroDisplay:SearchIndex and the 
+# All instances of a class can be excluded from the search index by adding a
+# vitroDisplay:excludeClass property between vitroDisplay:SearchIndex and the
 # URI of the class that you would like to exclude.
 
-# .n3 or .rdf files can be created in this directory to configure the search 
-# exclusions.  Each file must be a valid file in the format specified by its 
-# extension. Each file will be loaded individually and must be a complete 
-# stand alone example of its format.  Each file must contain all the necessary 
-# prefixes, namespaces and preambles required by the format specified by its 
-# extension.  
+# .n3 or .rdf files can be created in this directory to configure the search
+# exclusions.  Each file must be a valid file in the format specified by its
+# extension. Each file will be loaded individually and must be a complete
+# stand alone example of its format.  Each file must contain all the necessary
+# prefixes, namespaces and preambles required by the format specified by its
+# extension.
 
-# If you would like to add classes to the exclusions, add a file to this 
+# If you would like to add classes to the exclusions, add a file to this
 # directory ending in .n3 with N3 statements similar to this example.
 
 #
@@ -20,6 +20,6 @@
 # @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 # @prefix example: <http://example/ns/> .
 #
-# vitroDisplay:SearchIndex 
-#    rdf:type owl:Thing ; 
-#    vitroDisplay:excludeClass example:classToExclude ;
\ No newline at end of file
+# vitroDisplay:SearchIndex
+#    rdf:type owl:Thing ;
+#    vitroDisplay:excludeClass example:classToExclude ;
diff --git a/home/src/main/resources/rdf/display/firsttime/application.owl b/home/src/main/resources/rdf/display/firsttime/application.owl
index 1023146e8..02dbd5736 100644
--- a/home/src/main/resources/rdf/display/firsttime/application.owl
+++ b/home/src/main/resources/rdf/display/firsttime/application.owl
@@ -6,7 +6,7 @@
   <!ENTITY rdfs "http://www.w3.org/2000/01/rdf-schema#">
   <!ENTITY xsd "http://www.w3.org/2001/XMLSchema#">
   <!ENTITY vitro "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#">
-  
+
 ]>
 <rdf:RDF xml:base="http://vitro.mannlib.cornell.edu/ontologies/display/1.1/"
          xmlns:display="&display;"
@@ -38,7 +38,7 @@
   <owl:Class rdf:about="&owl;DatatypeProperty"/>
   <owl:Class rdf:about="&owl;ObjectProperty"/>
   <owl:Class rdf:about="&owl;AnnotationProperty"/>
-  
+
 
   <owl:Class rdf:about="&owl;Class"/>
   <owl:Class rdf:about="&display;MainMenu">
@@ -53,7 +53,7 @@
   <owl:Class rdf:about="&display;ClassGroupPage"/>
   <owl:Class rdf:about="&display;IndividualsForClassesPage"/>
   <owl:Class rdf:about="&display;InternalClassesPage"/>
- 
+
  <!-- For permissions -->
 <owl:Class rdf:about="&display;RequiredAction"/>
 <!-- Annotation Properties -->
@@ -69,7 +69,7 @@
   <owl:DatatypeProperty rdf:about="&rdfs;label"/>
   <owl:DatatypeProperty rdf:about="&owl;versionInfo"/>
   <!--end originally generated -->
-  
+
   <owl:DatatypeProperty rdf:about="&display;linkText"
                         rdfs:comment="Text to display to a link.">
   </owl:DatatypeProperty>
@@ -129,7 +129,7 @@
 <owl:ObjectProperty rdf:about="&display;getIndividualsForClass"/>
 <owl:ObjectProperty rdf:about="&display;hasDataGetter"/>
  <owl:ObjectProperty rdf:about="&display;requiresAction">
-    
+
   </owl:ObjectProperty>
 <!--Custom properties-->
 
diff --git a/home/src/main/resources/rdf/display/firsttime/menu.n3 b/home/src/main/resources/rdf/display/firsttime/menu.n3
index 148dc6504..2fc75e1b4 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#> .
@@ -31,8 +31,8 @@ display:Home
     display:urlMapping "/" ;
     display:hasDataGetter display:homeDataGetter;
     display:cannotDeletePage "true" .
-    
+
 ########## Data Getter ############
-    
+
 <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#homeDataGetter>
-      a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.BrowseDataGetter> .  
+      a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.BrowseDataGetter> .
diff --git a/home/src/main/resources/rdf/display/firsttime/pageList_editableStatements.n3 b/home/src/main/resources/rdf/display/firsttime/pageList_editableStatements.n3
index 2403094eb..d9869b12e 100644
--- a/home/src/main/resources/rdf/display/firsttime/pageList_editableStatements.n3
+++ b/home/src/main/resources/rdf/display/firsttime/pageList_editableStatements.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#> .
@@ -9,28 +9,28 @@
 ### This file defines the page list menu for vitro. These statements can be edited through the interface.###
 
 display:pageListPage
-    a display:Page ;              
+    a display:Page ;
     display:title "Pages" ;
     display:urlMapping "/pageList" ;
-    display:requiresBodyTemplate "pageList.ftl" ;   
+    display:requiresBodyTemplate "pageList.ftl" ;
     display:hasDataGetter display:pageListData.
 
 display:pageListData
-    a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter>;                       
+    a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter>;
     display:saveToVar "pages" ;
-    display:queryModel <vitro:requestDisplayModel> ; 
+    display:queryModel <vitro:requestDisplayModel> ;
     display:query """
-    PREFIX display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> 
+    PREFIX display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#>
     PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
     SELECT ?listedPageUri ?listedPageTitle ?listedPageUrlMapping ?listedPageTemplate ?listedPageMenuItem ?listedPageCannotDeletePage
-    WHERE { 
+    WHERE {
         ?listedPageUri a display:Page .
         OPTIONAL{ ?listedPageUri display:urlMapping ?listedPageUrlMapping. }
-        OPTIONAL{ ?listedPageUri display:title  ?listedPageTitle. }  
+        OPTIONAL{ ?listedPageUri display:title  ?listedPageTitle. }
         OPTIONAL {?listedPageUri display:requiresBodyTemplate ?listedPageTemplate .}
         OPTIONAL {?listedPageMenuItem display:toPage ?listedPageUri .}
         OPTIONAL {?listedPageUri display:cannotDeletePage ?listedPageCannotDeletePage .}
-     }  ORDER BY ?listedPageTitle """ .      
+     }  ORDER BY ?listedPageTitle """ .
 ###Page Management and Data Getters
 
-          
\ No newline at end of file
+
diff --git a/home/src/main/resources/rdf/display/firsttime/profilePageType.n3 b/home/src/main/resources/rdf/display/firsttime/profilePageType.n3
index 2aa732eeb..a3760f738 100644
--- a/home/src/main/resources/rdf/display/firsttime/profilePageType.n3
+++ b/home/src/main/resources/rdf/display/firsttime/profilePageType.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 xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
@@ -8,18 +8,18 @@
 @base <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> .
 
 display:ProfilePageType rdf:type owl:Class ;
-                 
+
                  owl:equivalentClass [ rdf:type owl:Class ;
                                        owl:oneOf ( display:standard
                                                    display:quickView
                                                  )
                                      ] .
 
-display:quickView rdf:type display:ProfilePageType , 
+display:quickView rdf:type display:ProfilePageType ,
                                 owl:NamedIndividual .
 
 display:standard rdf:type display:ProfilePageType ,
                           owl:NamedIndividual .
 
-display:hasDefaultProfilePageType rdf:type owl:ObjectProperty .                                                                                    
-display:hasDefaultProfilePageType rdfs:range display:ProfilePageType .
\ No newline at end of file
+display:hasDefaultProfilePageType rdf:type owl:ObjectProperty .
+display:hasDefaultProfilePageType rdfs:range display:ProfilePageType .
diff --git a/home/src/main/resources/rdf/displayDisplay/everytime/displayDisplay.n3 b/home/src/main/resources/rdf/displayDisplay/everytime/displayDisplay.n3
index d0de36caa..b8656304e 100644
--- a/home/src/main/resources/rdf/displayDisplay/everytime/displayDisplay.n3
+++ b/home/src/main/resources/rdf/displayDisplay/everytime/displayDisplay.n3
@@ -4,18 +4,18 @@
 @prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> .
 
-rdf:type 
+rdf:type
       a owl:ObjectProperty ;
       rdfs:label "RDF Type"@en-US ;
-      rdfs:range owl:Class;                   
+      rdfs:range owl:Class;
       <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#customEntryFormAnnot>
-         "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.RdfTypeGenerator"^^xsd:string ;                             
+         "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.RdfTypeGenerator"^^xsd:string ;
       <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#offerCreateNewOptionAnnot>
               "true"^^xsd:boolean ;
       <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#selectFromExistingAnnot>
-              "true"^^xsd:boolean .  
-              
-              
+              "true"^^xsd:boolean .
+
+
 display:requiresAction
       a owl:ObjectProperty ;
       rdfs:label "Required Action"@en-US ;
@@ -25,4 +25,4 @@ display:requiresAction
               "true"^^xsd:boolean ;
       <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#selectFromExistingAnnot>
               "true"^^xsd:boolean .
-      
+
diff --git a/home/src/main/resources/rdf/displayTbox/everytime/displayTBOX.n3 b/home/src/main/resources/rdf/displayTbox/everytime/displayTBOX.n3
index e4d615440..d5fcf9ec2 100644
--- a/home/src/main/resources/rdf/displayTbox/everytime/displayTBOX.n3
+++ b/home/src/main/resources/rdf/displayTbox/everytime/displayTBOX.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 rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
@@ -7,32 +7,32 @@
 @prefix display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> .
 @prefix vitro:  <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> .
 
-#########Classes######### 
+#########Classes#########
 ###Basic
 owl:Class a owl:Class .
-owl:Ontology a owl:Class .     
-owl:AnnotationProperty a owl:Class .   
+owl:Ontology a owl:Class .
+owl:AnnotationProperty a owl:Class .
 owl:DatatypeProperty a owl:Class .
 owl:ObjectProperty a owl:Class .
-      
-###Display Model 
+
+###Display Model
 display:MainMenu
       a       owl:Class ;
       vitro:customDisplayViewAnnot "individual-menu.ftl"^^xsd:string .
 
 display:NavigationElement a owl:Class .
 
-display:Page a owl:Class . 
+display:Page a owl:Class .
 
 display:HomePage a owl:Class .
 
 display:ClassGroupPage a owl:Class .
-      
-display:IndividualsForClassesPage a owl:Class .      
-      
-display:InternalClassesPage a owl:Class .   
-      
-display:DataGetter a owl:Class .  
+
+display:IndividualsForClassesPage a owl:Class .
+
+display:InternalClassesPage a owl:Class .
+
+display:DataGetter a owl:Class .
 
 display:RequiredAction a owl:Class ;
     rdfs:comment "Represents a action that may need authorization to perform." .
@@ -40,15 +40,15 @@ display:RequiredAction a owl:Class ;
 <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter>
     a owl:Class ;
     rdfs:comment "Data getter for running a SPARQL query." .
-    
+
 <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SearchIndividualsDataGetter>
     a owl:Class ;
     rdfs:comment "A data getter for a Class search, i.e. get individuals for VClass" .
-    
+
 <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlUpdate>
     a owl:Class ;
     rdfs:comment "A data getter that runs a SPARQL Update" .
-      
+
 <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.BrowseDataGetter>
     a owl:Class ;
     rdfs:comment "A data getter for a standard Vitro browse page" .
@@ -63,10 +63,10 @@ display:RequiredAction a owl:Class ;
 
 <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.IndividualsForClassesDataGetter>
     a owl:Class .
-    
-## Class defining what N3 editing model preprocessors are associated with the system  
+
+## Class defining what N3 editing model preprocessors are associated with the system
 ## This is technically a JAVA interface but we can designate this as an owl:Class to indicate
-## which classes are model change preprocessors  
+## which classes are model change preprocessors
 
 <java:edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.ModelChangePreprocessor> a owl:Class .
 ########Data Properties#########
@@ -74,67 +74,67 @@ display:RequiredAction a owl:Class ;
 ###Basic
 
 rdfs:comment
-      a       owl:DatatypeProperty .      
+      a       owl:DatatypeProperty .
 rdfs:label
-      a       owl:DatatypeProperty .      
+      a       owl:DatatypeProperty .
 owl:versionInfo
       a       owl:DatatypeProperty .
-      
-###Vitro model 
+
+###Vitro model
 
 vitro:modTime
       a       owl:DatatypeProperty .
 vitro:displayRank
-      a       owl:DatatypeProperty .      
+      a       owl:DatatypeProperty .
 vitro:customDisplayViewAnnot
       a       owl:DatatypeProperty .
-      
-###Display model 
+
+###Display model
 
 display:listViewConfigFile
     a       owl:DatatypeProperty .
 
 display:title
-    a       owl:DatatypeProperty .      
+    a       owl:DatatypeProperty .
 
 display:urlMapping
     a       owl:DatatypeProperty .
 
 display:requiresBodyTemplate
-    a       owl:DatatypeProperty .      
+    a       owl:DatatypeProperty .
 
 display:isSelfContainedTemplate
-    a       owl:DatatypeProperty .      
+    a       owl:DatatypeProperty .
 
 display:menuPosition
     a       owl:DatatypeProperty ;
     vitro:displayLimitAnnot
-              "1"^^xsd:int .      
+              "1"^^xsd:int .
 
 display:linkText
-    a       owl:DatatypeProperty .      
+    a       owl:DatatypeProperty .
 
 display:hasMenuText
-    a       owl:DatatypeProperty .        
+    a       owl:DatatypeProperty .
 
 display:usesDataGetterClass
-    a       owl:DatatypeProperty .      
+    a       owl:DatatypeProperty .
 
 display:query
-    a owl:DatatypeProperty .   
+    a owl:DatatypeProperty .
 
 display:saveToVar
-    a owl:DatatypeProperty.   
+    a owl:DatatypeProperty.
 
 display:queryModel
-    a owl:DatatypeProperty.     
+    a owl:DatatypeProperty.
 
 display:htmlValue
-    a owl:DatatypeProperty.      
+    a owl:DatatypeProperty.
 
 display:cannotDeletePage
-    a owl:DatatypeProperty.                   
-      
+    a owl:DatatypeProperty.
+
 ######### Object Properties#########
 ###Basic
 rdfs:range
@@ -147,14 +147,14 @@ owl:topObjectProperty
 display:hasVClassId
     a owl:ObjectProperty ;
     rdfs:comment "Object property defining class for search data getter" .
-           
+
 ###Vitro properties without which individual templates throw errors as are required
 
 <http://vitro.mannlib.cornell.edu/ns/vitro/public#mainImage>
       a       owl:ObjectProperty ;
       rdfs:range <http://vitro.mannlib.cornell.edu/ns/vitro/public#File> ;
       rdfs:subPropertyOf <http://vitro.mannlib.cornell.edu/ns/vitro/public#mainImage> , owl:topObjectProperty .
-      
+
 vitro:primaryLink
       a       owl:ObjectProperty ;
       rdfs:label "Primary Link"@en-US ;
@@ -169,18 +169,18 @@ vitro:primaryLink
       vitro:selectFromExistingAnnot
               "false"^^xsd:boolean ;
       vitro:stubObjectPropertyAnnot
-              "true"^^xsd:boolean .      
+              "true"^^xsd:boolean .
 
-rdf:type 
+rdf:type
       a owl:ObjectProperty ;
       rdfs:label "RDF Type"@en-US ;
-      rdfs:range owl:Class ;                   
+      rdfs:range owl:Class ;
       vitro:customEntryFormAnnot
-         "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.RdfTypeGenerator"^^xsd:string ;                             
+         "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.RdfTypeGenerator"^^xsd:string ;
       vitro:offerCreateNewOptionAnnot
               "true"^^xsd:boolean ;
       vitro:selectFromExistingAnnot
-              "true"^^xsd:boolean .       
+              "true"^^xsd:boolean .
 
 
 vitro:additionalLink
@@ -198,30 +198,30 @@ vitro:additionalLink
               "false"^^xsd:boolean ;
       vitro:stubObjectPropertyAnnot
               "true"^^xsd:boolean .
-              
-###Display model    
+
+###Display model
 
 display:hasElement
       a       owl:ObjectProperty .
-      
+
 display:excludeClass
       a       owl:ObjectProperty .
 
 display:toPage
-      a       owl:ObjectProperty .      
-      
+      a       owl:ObjectProperty .
+
 display:forClassGroup
       a       owl:ObjectProperty .
-      
+
 display:hasDataGetter
       a       owl:ObjectProperty .
-      
+
 display:getIndividualsForClass
-      a       owl:ObjectProperty .  
-      
+      a       owl:ObjectProperty .
+
 display:restrictResultsByClass
-      a       owl:ObjectProperty .    
+      a       owl:ObjectProperty .
 
 display:requiresAction
       a owl:ObjectProperty .
-      
+
diff --git a/home/src/main/resources/rdf/tbox/filegraph/vitro-0.7.owl b/home/src/main/resources/rdf/tbox/filegraph/vitro-0.7.owl
index 8e9428535..1fda08108 100644
--- a/home/src/main/resources/rdf/tbox/filegraph/vitro-0.7.owl
+++ b/home/src/main/resources/rdf/tbox/filegraph/vitro-0.7.owl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE rdf [
-<!ENTITY vitro "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#"> 
+<!ENTITY vitro "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#">
 <!ENTITY list "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#"> ]>
 
 <rdf:RDF
@@ -16,7 +16,7 @@ xmlns:vitro="&vitro;"
 
 <!-- Vitro Application Ontology version 0.7 -->
 
-<!-- This ontology is used internally by the Vitro 0.7 Java application.  It is not user viewable or editable:  editing this file could have various unintended consequences --> 
+<!-- This ontology is used internally by the Vitro 0.7 Java application.  It is not user viewable or editable:  editing this file could have various unintended consequences -->
 
 <owl:Ontology rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7">
     <rdfs:label rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Vitro internals</rdfs:label>
@@ -149,7 +149,7 @@ xmlns:vitro="&vitro;"
   <rdf:Description rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#customDisplayViewAnnot">
     <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#AnnotationProperty"/>
   </rdf:Description>
-  
+
   <owl:AnnotationProperty rdf:about="&vitro;mostSpecificType"/>
   <owl:AnnotationProperty rdf:about="&vitro;extendedLinkedData"/>
 <!--Institutional Internal class -->
diff --git a/home/src/main/resources/rdf/tbox/filegraph/vitroPublic.owl b/home/src/main/resources/rdf/tbox/filegraph/vitroPublic.owl
index 6692af929..597799a9b 100644
--- a/home/src/main/resources/rdf/tbox/filegraph/vitroPublic.owl
+++ b/home/src/main/resources/rdf/tbox/filegraph/vitroPublic.owl
@@ -16,8 +16,8 @@
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 	Vitro Application Public Ontology
 
-	This ontology is used by the Vitro application. 
-	It contains constructs that are available for public export and use. 
+	This ontology is used by the Vitro application.
+	It contains constructs that are available for public export and use.
  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
 <owl:Ontology rdf:about="">
@@ -71,4 +71,4 @@
 	<rdfs:range><owl:Class rdf:about="#File"/></rdfs:range>
 </owl:ObjectProperty>
 
-</rdf:RDF>
\ No newline at end of file
+</rdf:RDF>
diff --git a/home/src/main/resources/solr/README.txt b/home/src/main/resources/solr/README.txt
index 6bd90efb2..b98390325 100644
--- a/home/src/main/resources/solr/README.txt
+++ b/home/src/main/resources/solr/README.txt
@@ -31,7 +31,7 @@ The Solr Home directory typically contains the following subdirectories...
 
    conf/
         This directory is mandatory and must contain your solrconfig.xml
-        and schema.xml.  Any other optional configuration files would also 
+        and schema.xml.  Any other optional configuration files would also
         be kept here.
 
    data/
diff --git a/home/src/main/resources/solr/conf/admin-extra.html b/home/src/main/resources/solr/conf/admin-extra.html
index fecab2051..7bf3f64b2 100644
--- a/home/src/main/resources/solr/conf/admin-extra.html
+++ b/home/src/main/resources/solr/conf/admin-extra.html
@@ -16,7 +16,7 @@
 -->
 
 <!-- The content of this page will be statically included into the top-
-right box of the cores overview page. Uncomment this as an example to 
+right box of the cores overview page. Uncomment this as an example to
 see there the content will show up.
 
 <img src="img/ico/construction.png"> This line will appear at the top-
diff --git a/home/src/main/resources/solr/conf/clustering/carrot2/kmeans-attributes.xml b/home/src/main/resources/solr/conf/clustering/carrot2/kmeans-attributes.xml
index d802465f6..b2db5022d 100644
--- a/home/src/main/resources/solr/conf/clustering/carrot2/kmeans-attributes.xml
+++ b/home/src/main/resources/solr/conf/clustering/carrot2/kmeans-attributes.xml
@@ -1,6 +1,6 @@
-<!-- 
+<!--
   Default configuration for the bisecting k-means clustering algorithm.
-  
+
   This file can be loaded (and saved) by Carrot2 Workbench.
   http://project.carrot2.org/download.html
 -->
diff --git a/home/src/main/resources/solr/conf/clustering/carrot2/lingo-attributes.xml b/home/src/main/resources/solr/conf/clustering/carrot2/lingo-attributes.xml
index 5febfc320..3974f40d5 100644
--- a/home/src/main/resources/solr/conf/clustering/carrot2/lingo-attributes.xml
+++ b/home/src/main/resources/solr/conf/clustering/carrot2/lingo-attributes.xml
@@ -1,4 +1,4 @@
-<!-- 
+<!--
   Default configuration for the Lingo clustering algorithm.
 
   This file can be loaded (and saved) by Carrot2 Workbench.
@@ -8,9 +8,9 @@
     <attribute-set id="attributes">
       <value-set>
         <label>attributes</label>
-          <!-- 
+          <!--
           The language to assume for clustered documents.
-          For a list of allowed values, see: 
+          For a list of allowed values, see:
           http://download.carrot2.org/stable/manual/#section.attribute.lingo.MultilingualClustering.defaultLanguage
           -->
           <attribute key="MultilingualClustering.defaultLanguage">
diff --git a/home/src/main/resources/solr/conf/clustering/carrot2/stc-attributes.xml b/home/src/main/resources/solr/conf/clustering/carrot2/stc-attributes.xml
index c1bf110c8..a041ffa08 100644
--- a/home/src/main/resources/solr/conf/clustering/carrot2/stc-attributes.xml
+++ b/home/src/main/resources/solr/conf/clustering/carrot2/stc-attributes.xml
@@ -1,4 +1,4 @@
-<!-- 
+<!--
   Default configuration for the STC clustering algorithm.
 
   This file can be loaded (and saved) by Carrot2 Workbench.
diff --git a/home/src/main/resources/solr/conf/currency.xml b/home/src/main/resources/solr/conf/currency.xml
index 3a9c58afe..654de41fa 100644
--- a/home/src/main/resources/solr/conf/currency.xml
+++ b/home/src/main/resources/solr/conf/currency.xml
@@ -58,10 +58,10 @@
     <rate from="USD" to="AED" rate="3.672955" comment="U.A.E. Dirham" />
     <rate from="USD" to="UAH" rate="7.988582" comment="UKRAINE Hryvnia" />
     <rate from="USD" to="GBP" rate="0.647910" comment="UNITED KINGDOM Pound" />
-    
+
     <!-- Cross-rates for some common currencies -->
-    <rate from="EUR" to="GBP" rate="0.869914" />  
-    <rate from="EUR" to="NOK" rate="7.800095" />  
-    <rate from="GBP" to="NOK" rate="8.966508" />  
+    <rate from="EUR" to="GBP" rate="0.869914" />
+    <rate from="EUR" to="NOK" rate="7.800095" />
+    <rate from="GBP" to="NOK" rate="8.966508" />
   </rates>
 </currencyConfig>
diff --git a/home/src/main/resources/solr/conf/elevate.xml b/home/src/main/resources/solr/conf/elevate.xml
index 25d5cebe4..8f3aa80fa 100644
--- a/home/src/main/resources/solr/conf/elevate.xml
+++ b/home/src/main/resources/solr/conf/elevate.xml
@@ -29,10 +29,10 @@
   <doc id="2" />
   <doc id="3" />
  </query>
- 
+
  <query text="ipod">
    <doc id="MA147LL/A" />  <!-- put the actual ipod at the top -->
    <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
  </query>
- 
+
 </elevate>
diff --git a/home/src/main/resources/solr/conf/lang/contractions_it.txt b/home/src/main/resources/solr/conf/lang/contractions_it.txt
index cac040953..35cdb40e6 100644
--- a/home/src/main/resources/solr/conf/lang/contractions_it.txt
+++ b/home/src/main/resources/solr/conf/lang/contractions_it.txt
@@ -1,23 +1,23 @@
 # Set of Italian contractions for ElisionFilter
 # TODO: load this as a resource from the analyzer and sync it in build.xml
 c
-l 
-all 
-dall 
-dell 
-nell 
-sull 
-coll 
-pell 
-gl 
-agl 
-dagl 
-degl 
-negl 
-sugl 
-un 
-m 
-t 
-s 
-v 
+l
+all
+dall
+dell
+nell
+sull
+coll
+pell
+gl
+agl
+dagl
+degl
+negl
+sugl
+un
+m
+t
+s
+v
 d
diff --git a/home/src/main/resources/solr/conf/lang/stoptags_ja.txt b/home/src/main/resources/solr/conf/lang/stoptags_ja.txt
index 71b750845..a7e4f5931 100644
--- a/home/src/main/resources/solr/conf/lang/stoptags_ja.txt
+++ b/home/src/main/resources/solr/conf/lang/stoptags_ja.txt
@@ -17,7 +17,7 @@
 #  noun-common: Common nouns or nouns where the sub-classification is undefined
 #�詞-一般
 #
-#  noun-proper: Proper nouns where the sub-classification is undefined 
+#  noun-proper: Proper nouns where the sub-classification is undefined
 #�詞-固有�詞
 #
 #  noun-proper-misc: miscellaneous proper nouns
@@ -26,7 +26,7 @@
 #  noun-proper-person: Personal names where the sub-classification is undefined
 #�詞-固有�詞-人�
 #
-#  noun-proper-person-misc: names that cannot be divided into surname and 
+#  noun-proper-person-misc: names that cannot be divided into surname and
 #  given name; foreign names; names where the surname or given name is unknown.
 #  e.g. �市�方
 #�詞-固有�詞-人�-一般
@@ -50,28 +50,28 @@
 #  e.g. アジア, �ルセロナ, 京都
 #�詞-固有�詞-地域-一般
 #
-#  noun-proper-place-country: Country names. 
+#  noun-proper-place-country: Country names.
 #  e.g. 日本, オーストラリア
 #�詞-固有�詞-地域-国
 #
 #  noun-pronoun: Pronouns where the sub-classification is undefined
 #�詞-代�詞
 #
-#  noun-pronoun-misc: miscellaneous pronouns: 
+#  noun-pronoun-misc: miscellaneous pronouns:
 #  e.g. �れ, ��, ���, ���, ����, ���, ���, ��, ���ん, �ん�, ����, �れ�れ
 #�詞-代�詞-一般
 #
-#  noun-pronoun-contraction: Spoken language contraction made by combining a 
+#  noun-pronoun-contraction: Spoken language contraction made by combining a
 #  pronoun and the particle 'wa'.
-#  e.g. �りゃ, �りゃ, �りゃ�, �りゃ, �りゃ� 
+#  e.g. �りゃ, �りゃ, �りゃ�, �りゃ, �りゃ�
 #�詞-代�詞-縮約
 #
-#  noun-adverbial: Temporal nouns such as names of days or months that behave 
+#  noun-adverbial: Temporal nouns such as names of days or months that behave
 #  like adverbs. Nouns that represent amount or ratios and can be used adverbially,
 #  e.g. 金曜, 一月, �後, 少�
 #�詞-副詞�能
 #
-#  noun-verbal: Nouns that take arguments with case and can appear followed by 
+#  noun-verbal: Nouns that take arguments with case and can appear followed by
 #  'suru' and related verbs (�る, ��る, ��る, ���る)
 #  e.g. インプット, 愛�, 悪化, 悪戦苦闘, 一安心, 下�り
 #�詞-サ変接続
@@ -87,28 +87,28 @@
 #  noun-affix: noun affixes where the sub-classification is undefined
 #�詞-�自立
 #
-#  noun-affix-misc: Of adnominalizers, the case-marker � ("no"), and words that 
-#  attach to the base form of inflectional words, words that cannot be classified 
+#  noun-affix-misc: Of adnominalizers, the case-marker � ("no"), and words that
+#  attach to the base form of inflectional words, words that cannot be classified
 #  into any of the other categories below. This category includes indefinite nouns.
-#  e.g. ����, �, ��, 甲�, 気, �ら�, 嫌�, ��, 癖, ��, 事, ��, 毎, ���, 次第, 
-#       順, ��, 所為, ���, ��, �もり, �もり, 点, ���, �, ��, 筈, ���, 弾�, 
+#  e.g. ����, �, ��, 甲�, 気, �ら�, 嫌�, ��, 癖, ��, 事, ��, 毎, ���, 次第,
+#       順, ��, 所為, ���, ��, �もり, �もり, 点, ���, �, ��, 筈, ���, 弾�,
 #       ��, ��, �り, 振り, ��, 方, 旨, も�, 物, 者, ゆ�, 故, ゆ�ん, 所以, ��, 訳,
 #       �り, 割り, 割, ん-�語/, もん-�語/
 #�詞-�自立-一般
 #
 #  noun-affix-adverbial: noun affixes that that can behave as adverbs.
-#  e.g. ���, 間, ���, 挙��, ��, 後, 余り, 以外, 以�, 以後, 以上, 以�, 一方, ��, 
-#       上, ��, 内, �り, 折り, ��り, �り, �り, ��り, �果, ��, 頃, ��, 際, 最中, ���, 
-#       最中, ���, 自体, ��, 度, ��, 為, ��, 都度, ��り, 通り, ��, 時, ���, 所, 
-#       ��ん, 途端, ��, 中, ��, 後, ���, 場�, 日, �ん, 分, ��, 他, ��, �, ��, 
+#  e.g. ���, 間, ���, 挙��, ��, 後, 余り, 以外, 以�, 以後, 以上, 以�, 一方, ��,
+#       上, ��, 内, �り, 折り, ��り, �り, �り, ��り, �果, ��, 頃, ��, 際, 最中, ���,
+#       最中, ���, 自体, ��, 度, ��, 為, ��, 都度, ��り, 通り, ��, 時, ���, 所,
+#       ��ん, 途端, ��, 中, ��, 後, ���, 場�, 日, �ん, 分, ��, 他, ��, �, ��,
 #       儘, 侭, ��り, 矢先
 #�詞-�自立-副詞�能
 #
-#  noun-affix-aux: noun affixes treated as 助動詞 ("auxiliary verb") in school grammars 
+#  noun-affix-aux: noun affixes treated as 助動詞 ("auxiliary verb") in school grammars
 #  with the stem よ�(�) ("you(da)").
 #  e.g.  よ�, や�, 様 (よ�)
 #�詞-�自立-助動詞語幹
-#  
+#
 #  noun-affix-adjective-base: noun affixes that can connect to the indeclinable
 #  connection form � (aux "da").
 #  e.g. ���, ��
@@ -117,8 +117,8 @@
 #  noun-special: special nouns where the sub-classification is undefined.
 #�詞-特殊
 #
-#  noun-special-aux: The ��� ("souda") stem form that is used for reporting news, is 
-#  treated as 助動詞 ("auxiliary verb") in school grammars, and attach to the base 
+#  noun-special-aux: The ��� ("souda") stem form that is used for reporting news, is
+#  treated as 助動詞 ("auxiliary verb") in school grammars, and attach to the base
 #  form of inflectional words.
 #  e.g. ��
 #�詞-特殊-助動詞語幹
@@ -126,9 +126,9 @@
 #  noun-suffix: noun suffixes where the sub-classification is undefined.
 #�詞-接尾
 #
-#  noun-suffix-misc: Of the nouns or stem forms of other parts of speech that connect 
+#  noun-suffix-misc: Of the nouns or stem forms of other parts of speech that connect
 #  to ガル or タイ and can combine into compound nouns, words that cannot be classified into
-#  any of the other categories below. In general, this category is more inclusive than 
+#  any of the other categories below. In general, this category is more inclusive than
 #  接尾語 ("suffix") and is usually the last element in a compound noun.
 #  e.g. ��, ��, 方, 甲� (��), ��り, ��, 気味, �る�, (～��) �, 次第, 済 (�) �,
 #       よ�, (��)��, 感, 観, 性, 学, 類, �, 用
@@ -139,23 +139,23 @@
 #  e.g. �, 様, 著
 #�詞-接尾-人�
 #
-#  noun-suffix-place: Suffixes that form nouns and attach to place names more often 
+#  noun-suffix-place: Suffixes that form nouns and attach to place names more often
 #  than other nouns.
 #  e.g. 町, 市, 県
 #�詞-接尾-地域
 #
-#  noun-suffix-verbal: Of the suffixes that attach to nouns and form nouns, those that 
+#  noun-suffix-verbal: Of the suffixes that attach to nouns and form nouns, those that
 #  can appear before スル ("suru").
 #  e.g. 化, 視, 分�, 入り, ��, 買�
 #�詞-接尾-サ変接続
 #
-#  noun-suffix-aux: The stem form of ��� (様態) that is used to indicate conditions, 
-#  is treated as 助動詞 ("auxiliary verb") in school grammars, and attach to the 
+#  noun-suffix-aux: The stem form of ��� (様態) that is used to indicate conditions,
+#  is treated as 助動詞 ("auxiliary verb") in school grammars, and attach to the
 #  conjunctive form of inflectional words.
 #  e.g. ��
 #�詞-接尾-助動詞語幹
 #
-#  noun-suffix-adjective-base: Suffixes that attach to other nouns or the conjunctive 
+#  noun-suffix-adjective-base: Suffixes that attach to other nouns or the conjunctive
 #  form of inflectional words and appear before the copula � ("da").
 #  e.g. 的, �, ��
 #�詞-接尾-形容動詞語幹
@@ -164,8 +164,8 @@
 #  e.g. 後 (�), 以後, 以�, 以�, �後, 中, 末, 上, 時 (�)
 #�詞-接尾-副詞�能
 #
-#  noun-suffix-classifier: Suffixes that attach to numbers and form nouns. This category 
-#  is more inclusive than 助数詞 ("classifier") and includes common nouns that attach 
+#  noun-suffix-classifier: Suffixes that attach to numbers and form nouns. This category
+#  is more inclusive than 助数詞 ("classifier") and includes common nouns that attach
 #  to numbers.
 #  e.g. 個, �, 本, 冊, パーセント, cm, kg, カ月, �国, 区画, 時間, 時�
 #�詞-接尾-助数詞
@@ -174,18 +174,18 @@
 #  e.g. (楽�) �, (考�) 方
 #�詞-接尾-特殊
 #
-#  noun-suffix-conjunctive: Nouns that behave like conjunctions and join two words 
+#  noun-suffix-conjunctive: Nouns that behave like conjunctions and join two words
 #  together.
 #  e.g. (日本) 対 (アメリカ), 対 (アメリカ), (3) 対 (5), (女優) 兼 (主婦)
 #�詞-接続詞的
 #
-#  noun-verbal_aux: Nouns that attach to the conjunctive particle � ("te") and are 
+#  noun-verbal_aux: Nouns that attach to the conjunctive particle � ("te") and are
 #  semantically verb-like.
 #  e.g. �らん, �覧, 御覧, 頂戴
 #�詞-動詞�自立的
 #
-#  noun-quotation: text that cannot be segmented into words, proverbs, Chinese poetry, 
-#  dialects, English, etc. Currently, the only entry for �詞 引用文字列 ("noun quotation") 
+#  noun-quotation: text that cannot be segmented into words, proverbs, Chinese poetry,
+#  dialects, English, etc. Currently, the only entry for �詞 引用文字列 ("noun quotation")
 #  is ��� ("iwaku").
 #�詞-引用文字列
 #
@@ -198,7 +198,7 @@
 #  prefix: unclassified prefixes
 #接頭詞
 #
-#  prefix-nominal: Prefixes that attach to nouns (including adjective stem forms) 
+#  prefix-nominal: Prefixes that attach to nouns (including adjective stem forms)
 #  excluding numerical expressions.
 #  e.g. � (水), � (�), � (社), 故 (～�), 高 (�質), � (見事), � (立派)
 #接頭詞-�詞接続
@@ -246,20 +246,20 @@
 #  adverb: unclassified adverbs
 #副詞
 #
-#  adverb-misc: Words that can be segmented into one unit and where adnominal 
+#  adverb-misc: Words that can be segmented into one unit and where adnominal
 #  modification is not possible.
 #  e.g. ����ら�, 多分
 #副詞-一般
 #
-#  adverb-particle_conjunction: Adverbs that can be followed by �, �, �, 
+#  adverb-particle_conjunction: Adverbs that can be followed by �, �, �,
 #  �, �る, �, etc.
 #  e.g. �ん��, �ん��, �ん��, ���, �ん�も
 #副詞-助詞類接続
 #
 #####
 #  adnominal: Words that only have noun-modifying forms.
-#  e.g. ��, ��, ��, ��, ��ゆる, �んら��, 何ら��, ��ん�, ����, ����, ����, 
-#       ����, �ん�, �ん�, �ん�, �ん�, 大��, ���, ����, �ん�, ����, 
+#  e.g. ��, ��, ��, ��, ��ゆる, �んら��, 何ら��, ��ん�, ����, ����, ����,
+#       ����, �ん�, �ん�, �ん�, �ん�, 大��, ���, ����, �ん�, ����,
 #       「(, も) �る (����ら)�, 微々�る, 堂々�る, ��る, ���る, 我��「��, 亡�
 #連体詞
 #
@@ -279,27 +279,27 @@
 #  e.g. �ら, �, �, �, �, �, より, を, �, ��
 助詞-格助詞-一般
 #
-#  particle-case-quote: the "to" that appears after nouns, a person’s speech, 
+#  particle-case-quote: the "to" that appears after nouns, a person’s speech,
 #  quotation marks, expressions of decisions from a meeting, reasons, judgements,
 #  conjectures, etc.
 #  e.g. ( �) � (述��.), ( ��る) � (��執行猶予...)
 助詞-格助詞-引用
 #
-#  particle-case-compound: Compounds of particles and verbs that mainly behave 
+#  particle-case-compound: Compounds of particles and verbs that mainly behave
 #  like case particles.
 #  e.g. ���, ����, ����, ���, ��も�, �共�, �も��, �����, �当���, �当��,
-#       ���り, �当�り, �当り, �当�る, ���る, ����, �於��,�於�, ���る, �於�る, 
-#       ���, ����, ��ん�, �関�, ��ん��, �関��, ��ん�る, �関�る, �際�, 
-#       �際��, �����, �従�, �従�, ������, �従��, ����, �対�, �����, 
+#       ���り, �当�り, �当り, �当�る, ���る, ����, �於��,�於�, ���る, �於�る,
+#       ���, ����, ��ん�, �関�, ��ん��, �関��, ��ん�る, �関�る, �際�,
+#       �際��, �����, �従�, �従�, ������, �従��, ����, �対�, �����,
 #       �対��, ����る, �対�る, ����, ���, ���, ����, ��れ, ��れ�, ����,
-#       ��り, ����る, �よ��, ����, �因��, �より, ��り, �因り, �よる, ��る, �因る, 
+#       ��り, ����る, �よ��, ����, �因��, �より, ��り, �因り, �よる, ��る, �因る,
 #       �����, ���る, をも��, を以��, を通�, を通��, を通��, を����, を��り, を��る,
 #       ��-�語/, �ゅ�-関西�「����/, (何) ��� (人)-�語/, ����-�語/, ���, ����
 助詞-格助詞-連語
 #
 #  particle-conjunctive:
-#  e.g. �ら, �ら��, �, �れ�, �れ�も, ��, �, ��, �, �, �, ����, ����, �も, �も, 
-#       ��ら, �り, ��, ��, �, も��, や ( ��), や��や, (��ん) �ゃ(����)-�語/, 
+#  e.g. �ら, �ら��, �, �れ�, �れ�も, ��, �, ��, �, �, �, ����, ����, �も, �も,
+#       ��ら, �り, ��, ��, �, も��, や ( ��), や��や, (��ん) �ゃ(����)-�語/,
 #       (行�) �ゃ(����)-�語/, (言�) ��� (������)-�語/, (�れ���)���� (平気)-�語/
 助詞-接続助詞
 #
@@ -308,9 +308,9 @@
 助詞-係助詞
 #
 #  particle-adverbial:
-#  e.g. ��ら, �も, �ら�, �, �ら�, �も, (学校) �ゃ(�れ��行���る)-�語/, 
+#  e.g. ��ら, �も, �ら�, �, �ら�, �も, (学校) �ゃ(�れ��行���る)-�語/,
 #       (�れ)�ゃ� (よ���)-�語/, ��, (�) ��, ��, (�) �り (�), (先生) �ん� (大嫌�)-�語/,
-#       (�) �ん�, (先生) �ん� (大嫌�)-�語/, ��, ��, (�) ���-�語/, ��, 
+#       (�) �ん�, (先生) �ん� (大嫌�)-�語/, ��, ��, (�) ���-�語/, ��,
 #       (彼)��ら-�語/, (�茶) �も (���), 等 (��), (今後) �も, ��り, ���-�語/, ���り-�語/,
 #       ��, 程, ��, 迄, (誰) も (�)([助詞-格助詞] �よ� [助詞-係助詞] ����置�る「も�)
 助詞-副助詞
@@ -324,11 +324,11 @@
 助詞-並立助詞
 #
 #  particle-final:
-#  e.g. ��, ��ら, �, �, (�)��-�語/, (����る) �-方言/, �, ナ, ��-�語/, �, �, �, 
+#  e.g. ��, ��ら, �, �, (�)��-�語/, (����る) �-方言/, �, ナ, ��-�語/, �, �, �,
 #       ��-�語/, ��-�語/, �ん-方言/, �, ��-�語/, や, よ, ヨ, よ�-�語/, �, ��-�語/
 助詞-終助詞
 #
-#  particle-adverbial/conjunctive/final: The particle "ka" when unknown whether it is 
+#  particle-adverbial/conjunctive/final: The particle "ka" when unknown whether it is
 #  adverbial, conjunctive, or sentence final. For example:
 #       (a) 「A � B ��. Ex:「(国内��用�る) �,(海外��用�る) � (.)�
 #       (b) Inside an adverb phrase. Ex:「(幸����) � (, 死者������.)�
@@ -337,16 +337,16 @@
 #  e.g. �
 助詞-副助詞�並立助詞�終助詞
 #
-#  particle-adnominalizer: The "no" that attaches to nouns and modifies 
+#  particle-adnominalizer: The "no" that attaches to nouns and modifies
 #  non-inflectional words.
 助詞-連体化
 #
-#  particle-adnominalizer: The "ni" and "to" that appear following nouns and adverbs 
+#  particle-adnominalizer: The "ni" and "to" that appear following nouns and adverbs
 #  that are giongo, giseigo, or gitaigo.
 #  e.g. �, �
 助詞-副詞化
 #
-#  particle-special: A particle that does not fit into one of the above classifications. 
+#  particle-special: A particle that does not fit into one of the above classifications.
 #  This includes particles that are used in Tanka, Haiku, and other poetry.
 #  e.g. ��, �む, ( �����) �, (�ん�) �ゃ(��らん), (俺) ん (家)
 助詞-特殊
@@ -357,7 +357,7 @@
 #
 #####
 #  interjection: Greetings and other exclamations.
-#  e.g. ��よ�, ��よ������, �ん���, �ん�ん�, �り���, ��も�り���, �り��������, 
+#  e.g. ��よ�, ��よ������, �ん���, �ん�ん�, �り���, ��も�り���, �り��������,
 #       ������, ������, �よ�ら, �よ��ら, ��, ���, ��ん, ��ん���
 #æ„Ÿå‹•è©ž
 #
@@ -395,7 +395,7 @@
 #  other: unclassified other
 #��他
 #
-#  other-interjection: Words that are hard to classify as noun-suffixes or 
+#  other-interjection: Words that are hard to classify as noun-suffixes or
 #  sentence-final particles.
 #  e.g. (�)ァ
 ��他-間投
diff --git a/home/src/main/resources/solr/conf/lang/stopwords_ar.txt b/home/src/main/resources/solr/conf/lang/stopwords_ar.txt
index 046829db6..18d5f6383 100644
--- a/home/src/main/resources/solr/conf/lang/stopwords_ar.txt
+++ b/home/src/main/resources/solr/conf/lang/stopwords_ar.txt
@@ -2,7 +2,7 @@
 # See http://members.unine.ch/jacques.savoy/clef/index.html.
 # Also see http://www.opensource.org/licenses/bsd-license.html
 # Cleaned on October 11, 2009 (not normalized, so use before normalization)
-# This means that when modifying this list, you might need to add some 
+# This means that when modifying this list, you might need to add some
 # redundant entries, for example containing forms with both أ and ا
 من
 ومن
diff --git a/home/src/main/resources/solr/conf/lang/stopwords_ca.txt b/home/src/main/resources/solr/conf/lang/stopwords_ca.txt
index 3da65deaf..fb4e4edc6 100644
--- a/home/src/main/resources/solr/conf/lang/stopwords_ca.txt
+++ b/home/src/main/resources/solr/conf/lang/stopwords_ca.txt
@@ -88,7 +88,7 @@ havia
 he
 hem
 heu
-hi 
+hi
 ho
 i
 igual
@@ -142,7 +142,7 @@ pels
 per
 però
 perquè
-poc 
+poc
 poca
 pocs
 poques
@@ -151,7 +151,7 @@ propi
 qual
 quals
 quan
-quant 
+quant
 que
 què
 quelcom
@@ -166,7 +166,7 @@ sa
 semblant
 semblants
 ses
-seu 
+seu
 seus
 seva
 seva
@@ -177,9 +177,9 @@ sobretot
 sóc
 solament
 sols
-son 
+son
 són
-sons 
+sons
 sota
 sou
 t'ha
diff --git a/home/src/main/resources/solr/conf/lang/stopwords_el.txt b/home/src/main/resources/solr/conf/lang/stopwords_el.txt
index 232681f5b..ddb61bf0f 100644
--- a/home/src/main/resources/solr/conf/lang/stopwords_el.txt
+++ b/home/src/main/resources/solr/conf/lang/stopwords_el.txt
@@ -1,6 +1,6 @@
 # Lucene Greek Stopwords list
 # Note: by default this file is used after GreekLowerCaseFilter,
-# so when modifying this file use 'σ' instead of 'ς' 
+# so when modifying this file use 'σ' instead of 'ς'
 ο
 η
 το
@@ -11,7 +11,7 @@
 των
 τον
 την
-και 
+και
 κι
 κ
 ειμαι
diff --git a/home/src/main/resources/solr/conf/lang/stopwords_fi.txt b/home/src/main/resources/solr/conf/lang/stopwords_fi.txt
index 4372c9a05..53c3aaf21 100644
--- a/home/src/main/resources/solr/conf/lang/stopwords_fi.txt
+++ b/home/src/main/resources/solr/conf/lang/stopwords_fi.txt
@@ -6,7 +6,7 @@
  |  - This notice was added.
  |
  | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
- 
+
 | forms of BE
 
 olla
diff --git a/home/src/main/resources/solr/conf/lang/stopwords_hi.txt b/home/src/main/resources/solr/conf/lang/stopwords_hi.txt
index 86286bb08..230f84520 100644
--- a/home/src/main/resources/solr/conf/lang/stopwords_hi.txt
+++ b/home/src/main/resources/solr/conf/lang/stopwords_hi.txt
@@ -1,10 +1,10 @@
 # Also see http://www.opensource.org/licenses/bsd-license.html
 # See http://members.unine.ch/jacques.savoy/clef/index.html.
 # This file was created by Jacques Savoy and is distributed under the BSD license.
-# Note: by default this file also contains forms normalized by HindiNormalizer 
-# for spelling variation (see section below), such that it can be used whether or 
+# Note: by default this file also contains forms normalized by HindiNormalizer
+# for spelling variation (see section below), such that it can be used whether or
 # not you enable that feature. When adding additional entries to this list,
-# please add the normalized form as well. 
+# please add the normalized form as well.
 अंदर
 अत
 अपना
@@ -14,7 +14,7 @@
 आदि
 आप
 इत�यादि
-इन 
+इन
 इनका
 इन�हीं
 इन�हें
@@ -111,7 +111,7 @@
 नीचे
 ने
 पर
-पर  
+पर
 पहले
 पूरा
 पे
@@ -133,7 +133,7 @@
 यहा�
 यही
 या
-यिह 
+यिह
 ये
 रखें
 रहा
@@ -145,11 +145,11 @@
 व
 वर�ग
 वह
-वह 
+वह
 वहा�
 वहीं
 वाले
-व�ह 
+व�ह
 वे
 वग़ैरह
 संग
diff --git a/home/src/main/resources/solr/conf/lang/stopwords_hu.txt b/home/src/main/resources/solr/conf/lang/stopwords_hu.txt
index 37526da8a..b3c26e901 100644
--- a/home/src/main/resources/solr/conf/lang/stopwords_hu.txt
+++ b/home/src/main/resources/solr/conf/lang/stopwords_hu.txt
@@ -6,7 +6,7 @@
  |  - This notice was added.
  |
  | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
- 
+
 | Hungarian stop word list
 | prepared by Anna Tordai
 
diff --git a/home/src/main/resources/solr/conf/lang/stopwords_lv.txt b/home/src/main/resources/solr/conf/lang/stopwords_lv.txt
index e21a23c06..11bcf8a91 100644
--- a/home/src/main/resources/solr/conf/lang/stopwords_lv.txt
+++ b/home/src/main/resources/solr/conf/lang/stopwords_lv.txt
@@ -1,7 +1,7 @@
 # Set of Latvian stopwords from A Stemming Algorithm for Latvian, Karlis Kreslins
-# the original list of over 800 forms was refined: 
+# the original list of over 800 forms was refined:
 #   pronouns, adverbs, interjections were removed
-# 
+#
 # prepositions
 aiz
 ap
@@ -101,8 +101,8 @@ tak
 iekams
 vien
 # modal verbs
-būt  
-biju 
+būt
+biju
 biji
 bija
 bij�m
@@ -110,8 +110,8 @@ bij�t
 esmu
 esi
 esam
-esat 
-būšu     
+esat
+būšu
 būsi
 būs
 būsim
diff --git a/home/src/main/resources/solr/conf/lang/stopwords_ro.txt b/home/src/main/resources/solr/conf/lang/stopwords_ro.txt
index 4fdee90a5..c3a420553 100644
--- a/home/src/main/resources/solr/conf/lang/stopwords_ro.txt
+++ b/home/src/main/resources/solr/conf/lang/stopwords_ro.txt
@@ -121,7 +121,7 @@ ieri
 îl
 îmi
 împotriva
-în 
+în
 înainte
 înaintea
 încât
diff --git a/home/src/main/resources/solr/conf/mapping-FoldToASCII.txt b/home/src/main/resources/solr/conf/mapping-FoldToASCII.txt
index 9a84b6eac..e59baf7d7 100644
--- a/home/src/main/resources/solr/conf/mapping-FoldToASCII.txt
+++ b/home/src/main/resources/solr/conf/mapping-FoldToASCII.txt
@@ -34,7 +34,7 @@
 # - Supplemental Punctuation: http://www.unicode.org/charts/PDF/U2E00.pdf
 # - Alphabetic Presentation Forms: http://www.unicode.org/charts/PDF/UFB00.pdf
 # - Halfwidth and Fullwidth Forms: http://www.unicode.org/charts/PDF/UFF00.pdf
-#  
+#
 # See: http://en.wikipedia.org/wiki/Latin_characters_in_Unicode
 #
 # The set of character conversions supported by this map is a superset of
@@ -3785,11 +3785,11 @@
 #
 # use warnings;
 # use strict;
-# 
+#
 # my @source_chars = ();
 # my @source_char_descriptions = ();
 # my $target = '';
-# 
+#
 # while (<>) {
 #   if (/case\s+'(\\u[A-F0-9]+)':\s*\/\/\s*(.*)/i) {
 #     push @source_chars, $1;
diff --git a/home/src/main/resources/solr/conf/schema-old.xml b/home/src/main/resources/solr/conf/schema-old.xml
index 30dcf0c74..46402098c 100644
--- a/home/src/main/resources/solr/conf/schema-old.xml
+++ b/home/src/main/resources/solr/conf/schema-old.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <schema name="example" version="1.3">
-  
+
   <types>
     <!-- The StrField type is not analyzed, but indexed/stored verbatim. -->
     <fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
 
     <!-- boolean type: "true" or "false" -->
     <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true" omitNorms="true"/>
-    
+
     <!--Binary data type. The data should be sent/retrieved in as Base64 encoded Strings -->
     <fieldtype name="binary" class="solr.BinaryField"/>
-    
+
     <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
     <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
     <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
-    <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/> 
+    <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
     <!--  A Trie based int field -->
     <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" omitNorms="true" positionIncrementGap="0" sortMissingLast="true"/>
     <fieldType name="date" class="solr.TrieDateField" omitNorms="true" precisionStep="0" positionIncrementGap="0"/>
@@ -22,63 +22,63 @@
     <fieldType name="tdate" class="solr.TrieDateField" omitNorms="true" precisionStep="6" positionIncrementGap="0"/>
 
     <fieldType name="random" class="solr.RandomSortField" indexed="true" />
-  
+
     <fieldType name="text" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true">
     <analyzer type="index">
-      <tokenizer class="solr.WhitespaceTokenizerFactory"/>      
+      <tokenizer class="solr.WhitespaceTokenizerFactory"/>
       <filter class="solr.ASCIIFoldingFilterFactory"/>
       <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
-      <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" 
+      <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1"
               catenateWords="1" catenateNumbers="1" catenateAll="0"/>
       <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>        
+      <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
       <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
     </analyzer>
     <analyzer type="query">
       <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-      <filter class="solr.ASCIIFoldingFilterFactory"/>      
+      <filter class="solr.ASCIIFoldingFilterFactory"/>
       <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
       <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
-      <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" 
+      <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1"
               catenateWords="0" catenateNumbers="0" catenateAll="0"/>
       <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>        
-      <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>      
+      <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
+      <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
     </analyzer>
     </fieldType>
-        
-    
+
+
     <fieldType name="text_unstemmed" class="solr.TextField" positionIncrementGap="100">
       <analyzer>
         <tokenizer class="solr.WhitespaceTokenizerFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"  enablePositionIncrements="true" />
-        
+
         <!--  This field intentionally sets solr.WordDelimiterFilterFactory splitOnCaseChange to 0/false because of issue NIHVIVO-3332 -->
-        <filter class="solr.WordDelimiterFilterFactory" 
-                generateWordParts="1"  generateNumberParts="1" catenateWords="0" 
+        <filter class="solr.WordDelimiterFilterFactory"
+                generateWordParts="1"  generateNumberParts="1" catenateWords="0"
                 catenateNumbers="0" catenateAll="0" splitOnCaseChange="0" />
         <filter class="solr.ASCIIFoldingFilterFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/> 
-      </analyzer>  
+        <filter class="solr.LowerCaseFilterFactory"/>
+      </analyzer>
     </fieldType>
-  
-  
+
+
     <!-- Like text, but without synonyms. Good for autocomplete matching of book/grant titles, etc.,
          where we want to remove stop words and stem. -->
     <fieldType name="text_stemmed" class="solr.TextField" positionIncrementGap="100">
       <analyzer>
         <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" 
+        <filter class="solr.StopFilterFactory" ignoreCase="true"
         	words="stopwords-name.txt"  enablePositionIncrements="true" />
-        <filter class="solr.WordDelimiterFilterFactory" 
-                generateWordParts="1"  generateNumberParts="1" catenateWords="0" 
+        <filter class="solr.WordDelimiterFilterFactory"
+                generateWordParts="1"  generateNumberParts="1" catenateWords="0"
                 catenateNumbers="0" catenateAll="0" splitOnCaseChange="1" />
-        <filter class="solr.ASCIIFoldingFilterFactory"/>        
-        <filter class="solr.LowerCaseFilterFactory"/>        
-        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>  
+        <filter class="solr.ASCIIFoldingFilterFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
       </analyzer>
-    </fieldType>        
-        
+    </fieldType>
+
 
     <!-- A general unstemmed text field - good if one does not know the language of the field -->
     <fieldType name="textgen" class="solr.TextField" positionIncrementGap="100">
@@ -99,7 +99,7 @@
       </analyzer>
     </fieldType>
 
-    
+
     <fieldtype name="phonetic" stored="false" indexed="true" class="solr.TextField" >
       <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
@@ -118,54 +118,54 @@
     </fieldType>
 
     <!-- since fields of this type are by default not stored or indexed,
-         any data added to them will be ignored outright.  --> 
+         any data added to them will be ignored outright.  -->
     <fieldtype name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
-    
+
     <fieldtype name="edgengram_untokenized" class="solr.TextField">
       <analyzer type="index">
-        <tokenizer class="solr.KeywordTokenizerFactory"/>       
+        <tokenizer class="solr.KeywordTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory" />
         <filter class="solr.EdgeNGramFilterFactory" minGramSize="2" maxGramSize="25" side="front"/>
       </analyzer>
       <analyzer type="query">
-        <tokenizer class="solr.KeywordTokenizerFactory"/>       
+        <tokenizer class="solr.KeywordTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory" />
-      </analyzer>      
+      </analyzer>
     </fieldtype>
 
     <fieldtype name="edgengram_stemmed" class="solr.TextField">
       <analyzer type="index">
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>   
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true"
-          words="stopwords-name.txt"  enablePositionIncrements="true" /> 
-        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1"                 
-          generateNumberParts="1" catenateWords="0"                 
-          catenateNumbers="0" catenateAll="0"                
-          splitOnCaseChange="1" />  
+          words="stopwords-name.txt"  enablePositionIncrements="true" />
+        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1"
+          generateNumberParts="1" catenateWords="0"
+          catenateNumbers="0" catenateAll="0"
+          splitOnCaseChange="1" />
         <filter class="solr.LowerCaseFilterFactory" />
-        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>  
+        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
         <filter class="solr.EdgeNGramFilterFactory" minGramSize="1" maxGramSize="25" side="front"/>
       </analyzer>
       <analyzer type="query">
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>   
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true"
-          words="stopwords-name.txt"  enablePositionIncrements="true" />  
-        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1"                 
-          generateNumberParts="1" catenateWords="0"                 
-          catenateNumbers="0" catenateAll="0"                
-          splitOnCaseChange="1" />   
+          words="stopwords-name.txt"  enablePositionIncrements="true" />
+        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1"
+          generateNumberParts="1" catenateWords="0"
+          catenateNumbers="0" catenateAll="0"
+          splitOnCaseChange="1" />
         <filter class="solr.LowerCaseFilterFactory" />
-        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>  
-      </analyzer>      
-    </fieldtype>    
-    
+        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
+      </analyzer>
+    </fieldtype>
+
  </types>
 
 
  <fields>
    <!-- Valid attributes for fields:
      name: mandatory - the name for the field
-     type: mandatory - the name of a previously defined type from the 
+     type: mandatory - the name of a previously defined type from the
        <types> section
      indexed: true if this field should be indexed (searchable or sortable)
      stored: true if this field should be retrievable
@@ -178,93 +178,93 @@
        given field.
        When using MoreLikeThis, fields used for similarity should be
        stored for best performance.
-     termPositions: Store position information with the term vector.  
+     termPositions: Store position information with the term vector.
        This will increase storage costs.
-     termOffsets: Store offset information with the term vector. This 
+     termOffsets: Store offset information with the term vector. This
        will increase storage costs.
      default: a value that should be used if no value is specified
        when adding a document.
    -->
 
   <!-- ****************************  Vitro Fields *************************** -->
-  
-  <field name="DocId" type="string" indexed="true" stored="true" required="true" omitNorms="true"/> 
-  
+
+  <field name="DocId" type="string" indexed="true" stored="true" required="true" omitNorms="true"/>
+
   <field name="type" type="string" indexed="true" stored="true" omitNorms="true" multiValued="true"/>
-  
+
   <field name="classgroup" type="string" indexed="true" stored="true" multiValued="true"/>
 
   <field name="mostSpecificTypeURIs" type="string" indexed="true" stored="true" omitNorms="true" multiValued="true"/>
 
   <field name="PROHIBITED_FROM_TEXT_RESULTS" type="string" indexed="true" stored="false" omitNorms="true" multiValued="true"/>
   <field name="URI" type="string" indexed="true" stored="true" multiValued="false" omitNorms="true"/>
-  
+
   <field name="nameRaw" type="string" indexed="false" stored="true" multiValued="true"/>
-  
+
   <!--  nameText added for NIHVIVO-3701 -->
   <field name="nameText" type="text" indexed="true" stored="false" multiValued="true"/>
-  
+
   <field name="nameLowercase" type="lowercase" indexed="true" stored="false" multiValued="true"/>
   <!-- A sortable version of nameLowercase -->
-  <field name="nameLowercaseSingleValued" type="lowercase" indexed="true" stored="false" multiValued="false" omitNorms="true" />  
+  <field name="nameLowercaseSingleValued" type="lowercase" indexed="true" stored="false" multiValued="false" omitNorms="true" />
   <field name="nameUnstemmed" type="text_unstemmed" indexed="true" stored="false" multiValued="true"/>
-  <field name="nameStemmed" type="text_stemmed" indexed="true" stored="false" multiValued="true"/>  
-     
+  <field name="nameStemmed" type="text_stemmed" indexed="true" stored="false" multiValued="true"/>
+
   <!-- Autocomplete search fields -->
   <field name="acNameUntokenized" type="edgengram_untokenized" indexed="true" stored="false" multiValued="true" />
   <field name="acNameStemmed" type="edgengram_stemmed" indexed="true" stored="false" multiValued="true" />
-  
+
   <field name="indexedTime" type="long" indexed="true" stored="true"/>
   <field name="NAME_PHONETIC" type ="phonetic" indexed="true" stored="false" multiValued="true"/>
-  
+
   <field name="ALLTEXT" type="text" indexed="true" stored="true" multiValued="true"/>
   <field name="ALLTEXTUNSTEMMED" type="textgen" indexed="true" stored="false" multiValued="true"/>
-  
+
   <field name="THUMBNAIL" type="string" indexed="true" stored="true"/>
-    
+
   <field name="BETA" type="float" indexed="true" stored="true" multiValued="false"/>
-  
+
   <!-- field for storing locations of thumbnails -->
   <field name="THUMBNAIL_URL" type="string" indexed="false" stored="true"/>
-  
+
   <!-- field for source institution's url -->
   <field name="siteURL" type="string" indexed="true" stored="true"/>
-  
+
   <!--  field for source institution's name -->
   <field name="siteName" type="string" indexed="true" stored="true"/>
-  
+
   <!--  field for preferred title -->
   <field name="PREFERRED_TITLE" type="string" indexed="true" stored="true" multiValued="true"/>
-  
-  <!-- Copy nameRaw into several other fields -->  
+
+  <!-- Copy nameRaw into several other fields -->
   <copyField source="nameRaw" dest="nameStemmed" />
   <copyField source="nameRaw" dest="nameUnstemmed" />
   <copyField source="nameRaw" dest="nameLowercase" />
   <copyField source="nameRaw" dest="NAME_PHONETIC" />
   <copyField source="nameRaw" dest="acNameUntokenized" />
-  <copyField source="nameRaw" dest="acNameStemmed" /> 
+  <copyField source="nameRaw" dest="acNameStemmed" />
   <copyField source="nameRaw" dest="nameText" />
   <!--  nameLowercaseSingleValued is not copied from nameRaw becasue nameRaw might have multiple values -->
-  
+
   <!-- field for hash signature, used for comparing to versions from external caches -->
   <field name="etag" type="string" stored="true" indexed="false" multiValued="false" />
 
-  
-     
+
+
   <!-- ****************************  End Vitro Fields *************************** -->
   <!-- ****************************  Dynamic Fields *************************** -->
   <dynamicField name="*_string" type="string" indexed="true" stored="true" multiValued="true"/>
   <dynamicField name="*_text" type="text" indexed="true" stored="true" multiValued="true"/>
   <dynamicField name="*_tdate" type="tdate" indexed="true" stored="true" multiValued="true"/>
   <dynamicField name="*_tint" type="tint" indexed="true" stored="true" multiValued="true"/>
-  
+
    <!-- ****************************  End Dynamic Fields *************************** -->
-  
-   
-   <field name="timestamp" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>     
+
+
+   <field name="timestamp" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>
  </fields>
 
- <!-- Field to use to determine and enforce document uniqueness. 
+ <!-- Field to use to determine and enforce document uniqueness.
       Unless this field is marked with required="false", it will be a required field -->
  <uniqueKey>DocId</uniqueKey>
 
diff --git a/home/src/main/resources/solr/conf/schema.xml b/home/src/main/resources/solr/conf/schema.xml
index 55d7741ff..2182e43db 100644
--- a/home/src/main/resources/solr/conf/schema.xml
+++ b/home/src/main/resources/solr/conf/schema.xml
@@ -16,10 +16,10 @@
  limitations under the License.
 -->
 
-<!--  
+<!--
  This is the Solr schema file. This file should be named "schema.xml" and
  should be in the conf directory under the solr home
- (i.e. ./solr/conf/schema.xml by default) 
+ (i.e. ./solr/conf/schema.xml by default)
  or located where the classloader for the Solr webapp can find it.
 
  This example schema is the recommended starting point for users.
@@ -47,26 +47,26 @@
 
 <schema name="example" version="1.5">
   <!-- attribute "name" is the name of this schema and is only used for display purposes.
-       version="x.y" is Solr's version number for the schema syntax and 
+       version="x.y" is Solr's version number for the schema syntax and
        semantics.  It should not normally be changed by applications.
 
-       1.0: multiValued attribute did not exist, all fields are multiValued 
+       1.0: multiValued attribute did not exist, all fields are multiValued
             by nature
-       1.1: multiValued attribute introduced, false by default 
-       1.2: omitTermFreqAndPositions attribute introduced, true by default 
+       1.1: multiValued attribute introduced, false by default
+       1.2: omitTermFreqAndPositions attribute introduced, true by default
             except for text fields.
        1.3: removed optional field compress feature
        1.4: autoGeneratePhraseQueries attribute introduced to drive QueryParser
-            behavior when a single string produces multiple tokens.  Defaults 
+            behavior when a single string produces multiple tokens.  Defaults
             to off for version >= 1.4
-       1.5: omitNorms defaults to true for primitive field types 
+       1.5: omitNorms defaults to true for primitive field types
             (int, float, boolean, string...)
      -->
 
 <fields>
    <!-- Valid attributes for fields:
      name: mandatory - the name for the field
-     type: mandatory - the name of a field type from the 
+     type: mandatory - the name of a field type from the
        <types> fieldType section
      indexed: true if this field should be indexed (searchable or sortable)
      stored: true if this field should be retrievable
@@ -89,9 +89,9 @@
        given field.
        When using MoreLikeThis, fields used for similarity should be
        stored for best performance.
-     termPositions: Store position information with the term vector.  
+     termPositions: Store position information with the term vector.
        This will increase storage costs.
-     termOffsets: Store offset information with the term vector. This 
+     termOffsets: Store offset information with the term vector. This
        will increase storage costs.
      required: The field is required.  It will throw an error if the
        value does not exist
@@ -107,104 +107,104 @@
    -->
 
  <!-- Only remove the "id" field if you have a very good reason to. While not strictly
-     required, it is highly recommended. A <uniqueKey> is present in almost all Solr 
+     required, it is highly recommended. A <uniqueKey> is present in almost all Solr
      installations. See the <uniqueKey> declaration below where <uniqueKey> is set to "id".
-   --> 
-   <!--  Replaced with VIVO's DocId -->  
-   
+   -->
+   <!--  Replaced with VIVO's DocId -->
+
 
 <!-- VITRO:::::::::::::::::::::: Fields from original schema.xml -->
   <!-- ****************************  Vitro Fields *************************** -->
-  
-  <field name="DocId" type="string" indexed="true" stored="true" required="true" multiValued="false" omitNorms="true" /> 
-  
+
+  <field name="DocId" type="string" indexed="true" stored="true" required="true" multiValued="false" omitNorms="true" />
+
   <field name="type" type="string" indexed="true" stored="true" omitNorms="true" multiValued="true"/>
-  
+
   <field name="classgroup" type="string" indexed="true" stored="true" multiValued="true"/>
 
   <field name="mostSpecificTypeURIs" type="string" indexed="true" stored="true" omitNorms="true" multiValued="true"/>
 
   <field name="PROHIBITED_FROM_TEXT_RESULTS" type="string" indexed="true" stored="false" omitNorms="true" multiValued="true"/>
   <field name="URI" type="string" indexed="true" stored="true" multiValued="false" omitNorms="true"/>
-  
+
   <field name="nameRaw" type="string" indexed="true" stored="true" multiValued="true" omitNorms="false"/>
-  
+
   <!--  nameText added for NIHVIVO-3701 -->
   <field name="nameText" type="text" indexed="true" stored="false" multiValued="true"/>
-  
+
   <field name="nameLowercase" type="lowercase" indexed="true" stored="false" multiValued="true" omitNorms="false"/>
   <!-- A sortable version of nameLowercase -->
-  <field name="nameLowercaseSingleValued" type="lowercase" indexed="true" stored="false" multiValued="false" omitNorms="true" />  
+  <field name="nameLowercaseSingleValued" type="lowercase" indexed="true" stored="false" multiValued="false" omitNorms="true" />
   <field name="nameUnstemmed" type="text_unstemmed" indexed="true" stored="false" multiValued="true" omitNorms="false"/>
-  <field name="nameStemmed" type="text_stemmed" indexed="true" stored="false" multiValued="true" omitNorms="false"/>  
-     
+  <field name="nameStemmed" type="text_stemmed" indexed="true" stored="false" multiValued="true" omitNorms="false"/>
+
   <!-- Autocomplete search fields -->
   <field name="acNameUntokenized" type="edgengram_untokenized" indexed="true" stored="false" multiValued="true" />
   <field name="acNameStemmed" type="edgengram_stemmed" indexed="true" stored="false" multiValued="true" />
-  
+
   <field name="indexedTime" type="long" indexed="true" stored="true"/>
   <field name="NAME_PHONETIC" type ="phonetic" indexed="true" stored="false" multiValued="true"/>
-  
+
   <field name="ALLTEXT" type="text" indexed="true" stored="true" multiValued="true"/>
   <field name="ALLTEXTUNSTEMMED" type="textgen" indexed="true" stored="false" multiValued="true"/>
-  
+
   <field name="THUMBNAIL" type="string" indexed="true" stored="true"/>
-    
+
   <field name="BETA" type="float" indexed="true" stored="true" multiValued="false"/>
-  
+
   <!-- field for storing locations of thumbnails -->
   <field name="THUMBNAIL_URL" type="string" indexed="false" stored="true"/>
-  
+
   <!-- field for source institution's url -->
   <field name="siteURL" type="string" indexed="true" stored="true"/>
-  
+
   <!--  field for source institution's name -->
   <field name="siteName" type="string" indexed="true" stored="true"/>
-  
+
   <!--  field for preferred title -->
   <field name="PREFERRED_TITLE" type="string" indexed="true" stored="true" multiValued="true"/>
-  
-  <!-- Copy nameRaw into several other fields -->  
+
+  <!-- Copy nameRaw into several other fields -->
   <copyField source="nameRaw" dest="nameStemmed" />
   <copyField source="nameRaw" dest="nameUnstemmed" />
   <copyField source="nameRaw" dest="nameLowercase" />
   <copyField source="nameRaw" dest="NAME_PHONETIC" />
   <copyField source="nameRaw" dest="acNameUntokenized" />
-  <copyField source="nameRaw" dest="acNameStemmed" /> 
+  <copyField source="nameRaw" dest="acNameStemmed" />
   <copyField source="nameRaw" dest="nameText" />
   <!--  nameLowercaseSingleValued is not copied from nameRaw becasue nameRaw might have multiple values -->
-  
+
   <!-- field for hash signature, used for comparing to versions from external caches -->
   <field name="etag" type="string" stored="true" indexed="false" multiValued="false" />
 
-  
-     
+
+
   <!-- ****************************  End Vitro Fields *************************** -->
   <!-- ****************************  Dynamic Fields *************************** -->
   <dynamicField name="*_string" type="string" indexed="true" stored="true" multiValued="true"/>
   <dynamicField name="*_text" type="text" indexed="true" stored="true" multiValued="true"/>
   <dynamicField name="*_tdate" type="tdate" indexed="true" stored="true" multiValued="true"/>
   <dynamicField name="*_tint" type="tint" indexed="true" stored="true" multiValued="true"/>
-  
+
    <!-- ****************************  End Dynamic Fields *************************** -->
-  
-   
-   <field name="timestamp" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/> 
+
+
+   <field name="timestamp" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>
   <!-- VITRO:::::::::::::::::::::: Fields from original schema.xml -->
-   
+
 
    <!-- If you remove this field, you must _also_ disable the update log in solrconfig.xml
       or Solr won't start. _version_ and update log are required for SolrCloud
-   --> 
+   -->
    <field name="_version_" type="long" indexed="true" stored="true"/>
-   
+
    <!-- points to the root document of a block of nested documents. Required for nested
       document support, may be removed otherwise
    -->
    <field name="_root_" type="string" indexed="true" stored="false"/>
 
-  
-        
+
+
    <field name="sku" type="text_en_splitting_tight" indexed="true" stored="true" omitNorms="true"/>
    <field name="name" type="text_general" indexed="true" stored="true"/>
    <field name="manu" type="text_general" indexed="true" stored="true" omitNorms="true"/>
@@ -246,7 +246,7 @@
         using copyField below. This is to save space. Use this field for returning and
         highlighting document content. Use the "text" field to search the content. -->
    <!-- field name="content" type="text_general" indexed="false" stored="true" multiValued="true"/-->
-   
+
 
    <!-- catchall field, containing all other searchable text fields (implemented
         via copyField further on in this schema  -->
@@ -271,11 +271,11 @@
      -->
 
    <!-- Dynamic field definitions allow using convention over configuration
-       for fields via the specification of patterns to match field names. 
+       for fields via the specification of patterns to match field names.
        EXAMPLE:  name="*_i" will match any field ending in _i (like myid_i, z_i)
        RESTRICTION: the glob-like pattern in the name attribute must have
        a "*" only at the start or the end.  -->
-   
+
    <dynamicField name="*_i"  type="int"    indexed="true"  stored="true"/>
    <dynamicField name="*_is" type="int"    indexed="true"  stored="true"  multiValued="true"/>
    <dynamicField name="*_s"  type="string"  indexed="true"  stored="true" />
@@ -313,16 +313,16 @@
 
    <dynamicField name="random_*" type="random" />
 
-   <!-- uncomment the following to ignore any fields that don't already match an existing 
-        field name or dynamic field, rather than reporting them as an error. 
-        alternately, change the type="ignored" to some other type e.g. "text" if you want 
-        unknown fields indexed and/or stored by default --> 
+   <!-- uncomment the following to ignore any fields that don't already match an existing
+        field name or dynamic field, rather than reporting them as an error.
+        alternately, change the type="ignored" to some other type e.g. "text" if you want
+        unknown fields indexed and/or stored by default -->
    <!--dynamicField name="*" type="ignored" multiValued="true" /-->
-   
+
  </fields>
 
 
- <!-- Field to use to determine and enforce document uniqueness. 
+ <!-- Field to use to determine and enforce document uniqueness.
       Unless this field is marked with required="false", it will be a required field
    -->
  <uniqueKey>DocId</uniqueKey>
@@ -369,17 +369,17 @@
 
    <!-- Create a string version of author for faceting -->
    <!-- copyField source="author" dest="author_s"/-->
-	
-   <!-- Above, multiple source fields are copied to the [text] field. 
-	  Another way to map multiple source fields to the same 
-	  destination field is to use the dynamic field syntax. 
+
+   <!-- Above, multiple source fields are copied to the [text] field.
+	  Another way to map multiple source fields to the same
+	  destination field is to use the dynamic field syntax.
 	  copyField also supports a maxChars to copy setting.  -->
-	   
+
    <!-- <copyField source="*_t" dest="text" maxChars="3000"/> -->
 
    <!-- copy name to alphaNameSort, a field designed for sorting by name -->
    <!-- <copyField source="name" dest="alphaNameSort"/> -->
- 
+
   <types>
     <!-- field type definitions. The "name" attribute is
        just a label to be used by field definitions.  The "class"
@@ -412,7 +412,7 @@
        - If sortMissingLast="false" and sortMissingFirst="false" (the default),
          then default lucene sorting will be used which places docs without the
          field first in an ascending sort and last in a descending sort.
-    -->    
+    -->
 
     <!--
       Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
@@ -442,7 +442,7 @@
 
     <!-- The format for this date field is of the form 1995-12-31T23:59:59Z, and
          is a more restricted form of the canonical representation of dateTime
-         http://www.w3.org/TR/xmlschema-2/#dateTime    
+         http://www.w3.org/TR/xmlschema-2/#dateTime
          The trailing "Z" designates UTC time and is mandatory.
          Optional fractional seconds are allowed: 1995-12-31T23:59:59.999Z
          All other components are mandatory.
@@ -457,7 +457,7 @@
                NOW/DAY+6MONTHS+3DAYS
                   ... 6 months and 3 days in the future from the start of
                       the current day
-                      
+
          Consult the DateField javadocs for more information.
 
          Note: For faster range queries, consider the tdate type
@@ -473,11 +473,11 @@
 
     <!-- The "RandomSortField" is not used to store or search any
          data.  You can declare fields of this type it in your schema
-         to generate pseudo-random orderings of your docs for sorting 
+         to generate pseudo-random orderings of your docs for sorting
          or function purposes.  The ordering is generated based on the field
          name and the version of the index. As long as the index version
          remains unchanged, and the same field name is reused,
-         the ordering of the docs will be consistent.  
+         the ordering of the docs will be consistent.
          If you want different psuedo-random orderings of documents,
          for the same version of the index, use a dynamicField and
          change the field name in the request.
@@ -506,60 +506,60 @@
     <!-- Copied from original schema.xml for solr 3/VIVO -->
     <fieldType name="text" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true">
     <analyzer type="index">
-      <tokenizer class="solr.WhitespaceTokenizerFactory"/>      
+      <tokenizer class="solr.WhitespaceTokenizerFactory"/>
       <filter class="solr.ASCIIFoldingFilterFactory"/>
       <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
-      <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" 
+      <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1"
               catenateWords="1" catenateNumbers="1" catenateAll="0"/>
       <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>        
+      <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
       <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
     </analyzer>
     <analyzer type="query">
       <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-      <filter class="solr.ASCIIFoldingFilterFactory"/>      
+      <filter class="solr.ASCIIFoldingFilterFactory"/>
       <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
       <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
-      <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" 
+      <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1"
               catenateWords="0" catenateNumbers="0" catenateAll="0"/>
       <filter class="solr.LowerCaseFilterFactory"/>
-      <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>        
-      <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>      
+      <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
+      <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
     </analyzer>
     </fieldType>
-    
-    
+
+
     <fieldType name="text_unstemmed" class="solr.TextField" positionIncrementGap="100">
       <analyzer>
         <tokenizer class="solr.WhitespaceTokenizerFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"  enablePositionIncrements="true" />
-        
+
         <!--  This field intentionally sets solr.WordDelimiterFilterFactory splitOnCaseChange to 0/false because of issue NIHVIVO-3332 -->
-        <filter class="solr.WordDelimiterFilterFactory" 
-                generateWordParts="1"  generateNumberParts="1" catenateWords="0" 
+        <filter class="solr.WordDelimiterFilterFactory"
+                generateWordParts="1"  generateNumberParts="1" catenateWords="0"
                 catenateNumbers="0" catenateAll="0" splitOnCaseChange="0" />
         <filter class="solr.ASCIIFoldingFilterFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/> 
-      </analyzer>  
+        <filter class="solr.LowerCaseFilterFactory"/>
+      </analyzer>
     </fieldType>
-  
-  
+
+
     <!-- Like text, but without synonyms. Good for autocomplete matching of book/grant titles, etc.,
          where we want to remove stop words and stem. -->
     <fieldType name="text_stemmed" class="solr.TextField" positionIncrementGap="100">
       <analyzer>
         <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" 
+        <filter class="solr.StopFilterFactory" ignoreCase="true"
         	words="stopwords-name.txt"  enablePositionIncrements="true" />
-        <filter class="solr.WordDelimiterFilterFactory" 
-                generateWordParts="1"  generateNumberParts="1" catenateWords="0" 
+        <filter class="solr.WordDelimiterFilterFactory"
+                generateWordParts="1"  generateNumberParts="1" catenateWords="0"
                 catenateNumbers="0" catenateAll="0" splitOnCaseChange="1" />
-        <filter class="solr.ASCIIFoldingFilterFactory"/>        
-        <filter class="solr.LowerCaseFilterFactory"/>        
-        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>  
+        <filter class="solr.ASCIIFoldingFilterFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
       </analyzer>
-    </fieldType>        
-        
+    </fieldType>
+
 
     <!-- A general unstemmed text field - good if one does not know the language of the field -->
     <fieldType name="textgen" class="solr.TextField" positionIncrementGap="100">
@@ -579,7 +579,7 @@
         <filter class="solr.LowerCaseFilterFactory"/>
       </analyzer>
     </fieldType>
-    
+
 
     <!-- A text field that only splits on whitespace for exact matching of words -->
     <fieldType name="text_ws" class="solr.TextField" positionIncrementGap="100">
@@ -755,13 +755,13 @@
         <filter class="solr.TrimFilterFactory" />
         <!-- The PatternReplaceFilter gives you the flexibility to use
              Java Regular expression to replace any sequence of characters
-             matching a pattern with an arbitrary replacement string, 
+             matching a pattern with an arbitrary replacement string,
              which may include back references to portions of the original
              string matched by the pattern.
-             
+
              See the Java Regular Expression documentation for more
              information on pattern and replacement string syntax.
-             
+
              http://java.sun.com/j2se/1.6.0/docs/api/java/util/regex/package-summary.html
           -->
         <filter class="solr.PatternReplaceFilterFactory"
@@ -769,7 +769,7 @@
         />
       </analyzer>
     </fieldType>
-    
+
     <!-- This is from the original, unsure if this is what we want or not -->
      <fieldtype name="phonetic" stored="false" indexed="true" class="solr.TextField" >
       <analyzer>
@@ -777,7 +777,7 @@
         <filter class="solr.PhoneticFilterFactory" encoder="Metaphone" inject="false"/>
       </analyzer>
     </fieldtype>
-    
+
     <!-- This is from the example schema.xml that I am commenting out for now -->
     <!--  fieldtype name="phonetic" stored="false" indexed="true" class="solr.TextField" >
       <analyzer>
@@ -792,7 +792,7 @@
         <!--
         The DelimitedPayloadTokenFilter can put payloads on tokens... for example,
         a token of "foo|1.4"  would be indexed as "foo" with a payload of 1.4f
-        Attributes of the DelimitedPayloadTokenFilterFactory : 
+        Attributes of the DelimitedPayloadTokenFilterFactory :
          "delimiter" - a one character delimiter. Default is | (pipe)
 	 "encoder" - how to encode the following value into a playload
 	    float -> org.apache.lucene.analysis.payloads.FloatEncoder,
@@ -824,7 +824,7 @@
       </analyzer>
     </fieldType-->
 
-    <!-- 
+    <!--
       Example of using PathHierarchyTokenizerFactory at index time, so
       queries for paths match documents at that path, or in descendent paths
     -->
@@ -836,7 +836,7 @@
 	<tokenizer class="solr.KeywordTokenizerFactory" />
       </analyzer>
     </fieldType>
-    <!-- 
+    <!--
       Example of using PathHierarchyTokenizerFactory at query time, so
       queries for paths match documents at that path, or in ancestor paths
     -->
@@ -852,50 +852,50 @@
 <!-- Next 2 are from the original schema.xml -->
   <fieldtype name="edgengram_untokenized" class="solr.TextField">
       <analyzer type="index">
-        <tokenizer class="solr.KeywordTokenizerFactory"/>       
+        <tokenizer class="solr.KeywordTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory" />
         <filter class="solr.EdgeNGramFilterFactory" minGramSize="2" maxGramSize="25" side="front"/>
       </analyzer>
       <analyzer type="query">
-        <tokenizer class="solr.KeywordTokenizerFactory"/>       
+        <tokenizer class="solr.KeywordTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory" />
-      </analyzer>      
+      </analyzer>
     </fieldtype>
 
     <fieldtype name="edgengram_stemmed" class="solr.TextField">
       <analyzer type="index">
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>   
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true"
-          words="stopwords-name.txt"  enablePositionIncrements="true" /> 
-        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1"                 
-          generateNumberParts="1" catenateWords="0"                 
-          catenateNumbers="0" catenateAll="0"                
-          splitOnCaseChange="1" />  
+          words="stopwords-name.txt"  enablePositionIncrements="true" />
+        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1"
+          generateNumberParts="1" catenateWords="0"
+          catenateNumbers="0" catenateAll="0"
+          splitOnCaseChange="1" />
         <filter class="solr.LowerCaseFilterFactory" />
-        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>  
+        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
         <filter class="solr.EdgeNGramFilterFactory" minGramSize="1" maxGramSize="25" side="front"/>
       </analyzer>
       <analyzer type="query">
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>   
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true"
-          words="stopwords-name.txt"  enablePositionIncrements="true" />  
-        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1"                 
-          generateNumberParts="1" catenateWords="0"                 
-          catenateNumbers="0" catenateAll="0"                
-          splitOnCaseChange="1" />   
+          words="stopwords-name.txt"  enablePositionIncrements="true" />
+        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1"
+          generateNumberParts="1" catenateWords="0"
+          catenateNumbers="0" catenateAll="0"
+          splitOnCaseChange="1" />
         <filter class="solr.LowerCaseFilterFactory" />
-        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>  
-      </analyzer>      
-    </fieldtype>    
+        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
+      </analyzer>
+    </fieldtype>
 
 
     <!-- since fields of this type are by default not stored or indexed,
-         any data added to them will be ignored outright.  --> 
+         any data added to them will be ignored outright.  -->
     <fieldtype name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
 
     <!-- This point type indexes the coordinates as separate fields (subFields)
       If subFieldType is defined, it references a type, and a dynamic field
-      definition is created matching *___<typename>.  Alternately, if 
+      definition is created matching *___<typename>.  Alternately, if
       subFieldSuffix is defined, that is used to create the subFields.
       Example: if subFieldType="double", then the coordinates would be
         indexed in fields myloc_0___double,myloc_1___double.
@@ -928,14 +928,14 @@
                              refreshInterval: Number of minutes between each rates fetch (default: 1440, min: 60)
    -->
     <fieldType name="currency" class="solr.CurrencyField" precisionStep="8" defaultCurrency="USD" currencyConfig="currency.xml" />
-             
+
 
 
    <!-- some examples for different languages (generally ordered by ISO code) -->
 
     <!-- Arabic -->
     <fieldType name="text_ar" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <!-- for any non-arabic -->
         <filter class="solr.LowerCaseFilterFactory"/>
@@ -948,26 +948,26 @@
 
     <!-- Bulgarian -->
     <fieldType name="text_bg" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
-        <tokenizer class="solr.StandardTokenizerFactory"/> 
+      <analyzer>
+        <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_bg.txt" /> 
-        <filter class="solr.BulgarianStemFilterFactory"/>       
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_bg.txt" />
+        <filter class="solr.BulgarianStemFilterFactory"/>
       </analyzer>
     </fieldType>
-    
+
     <!-- Catalan -->
     <fieldType name="text_ca" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <!-- removes l', etc -->
         <filter class="solr.ElisionFilterFactory" ignoreCase="true" articles="lang/contractions_ca.txt"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_ca.txt" />
-        <filter class="solr.SnowballPorterFilterFactory" language="Catalan"/>       
+        <filter class="solr.SnowballPorterFilterFactory" language="Catalan"/>
       </analyzer>
     </fieldType>
-    
+
     <!-- CJK bigram (see text_ja for a Japanese configuration using morphological analysis) -->
     <fieldType name="text_cjk" class="solr.TextField" positionIncrementGap="100">
       <analyzer>
@@ -994,27 +994,27 @@
 
     <!-- Czech -->
     <fieldType name="text_cz" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_cz.txt" />
-        <filter class="solr.CzechStemFilterFactory"/>       
+        <filter class="solr.CzechStemFilterFactory"/>
       </analyzer>
     </fieldType>
-    
+
     <!-- Danish -->
     <fieldType name="text_da" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_da.txt" format="snowball" />
-        <filter class="solr.SnowballPorterFilterFactory" language="Danish"/>       
+        <filter class="solr.SnowballPorterFilterFactory" language="Danish"/>
       </analyzer>
     </fieldType>
-    
+
     <!-- German -->
     <fieldType name="text_de" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_de.txt" format="snowball" />
@@ -1024,10 +1024,10 @@
         <!-- more aggressive: <filter class="solr.SnowballPorterFilterFactory" language="German2"/> -->
       </analyzer>
     </fieldType>
-    
+
     <!-- Greek -->
     <fieldType name="text_el" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <!-- greek specific lowercase for sigma -->
         <filter class="solr.GreekLowerCaseFilterFactory"/>
@@ -1035,10 +1035,10 @@
         <filter class="solr.GreekStemFilterFactory"/>
       </analyzer>
     </fieldType>
-    
+
     <!-- Spanish -->
     <fieldType name="text_es" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_es.txt" format="snowball" />
@@ -1046,17 +1046,17 @@
         <!-- more aggressive: <filter class="solr.SnowballPorterFilterFactory" language="Spanish"/> -->
       </analyzer>
     </fieldType>
-    
+
     <!-- Basque -->
     <fieldType name="text_eu" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_eu.txt" />
         <filter class="solr.SnowballPorterFilterFactory" language="Basque"/>
       </analyzer>
     </fieldType>
-    
+
     <!-- Persian -->
     <fieldType name="text_fa" class="solr.TextField" positionIncrementGap="100">
       <analyzer>
@@ -1069,10 +1069,10 @@
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_fa.txt" />
       </analyzer>
     </fieldType>
-    
+
     <!-- Finnish -->
     <fieldType name="text_fi" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_fi.txt" format="snowball" />
@@ -1080,10 +1080,10 @@
         <!-- less aggressive: <filter class="solr.FinnishLightStemFilterFactory"/> -->
       </analyzer>
     </fieldType>
-    
+
     <!-- French -->
     <fieldType name="text_fr" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <!-- removes l', etc -->
         <filter class="solr.ElisionFilterFactory" ignoreCase="true" articles="lang/contractions_fr.txt"/>
@@ -1094,10 +1094,10 @@
         <!-- more aggressive: <filter class="solr.SnowballPorterFilterFactory" language="French"/> -->
       </analyzer>
     </fieldType>
-    
+
     <!-- Irish -->
     <fieldType name="text_ga" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <!-- removes d', etc -->
         <filter class="solr.ElisionFilterFactory" ignoreCase="true" articles="lang/contractions_ga.txt"/>
@@ -1108,10 +1108,10 @@
         <filter class="solr.SnowballPorterFilterFactory" language="Irish"/>
       </analyzer>
     </fieldType>
-    
+
     <!-- Galician -->
     <fieldType name="text_gl" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_gl.txt" />
@@ -1119,10 +1119,10 @@
         <!-- less aggressive: <filter class="solr.GalicianMinimalStemFilterFactory"/> -->
       </analyzer>
     </fieldType>
-    
+
     <!-- Hindi -->
     <fieldType name="text_hi" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <!-- normalizes unicode representation -->
@@ -1133,31 +1133,31 @@
         <filter class="solr.HindiStemFilterFactory"/>
       </analyzer>
     </fieldType>
-    
+
     <!-- Hungarian -->
     <fieldType name="text_hu" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_hu.txt" format="snowball" />
         <filter class="solr.SnowballPorterFilterFactory" language="Hungarian"/>
-        <!-- less aggressive: <filter class="solr.HungarianLightStemFilterFactory"/> -->   
+        <!-- less aggressive: <filter class="solr.HungarianLightStemFilterFactory"/> -->
       </analyzer>
     </fieldType>
-    
+
     <!-- Armenian -->
     <fieldType name="text_hy" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_hy.txt" />
         <filter class="solr.SnowballPorterFilterFactory" language="Armenian"/>
       </analyzer>
     </fieldType>
-    
+
     <!-- Indonesian -->
     <fieldType name="text_id" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_id.txt" />
@@ -1165,10 +1165,10 @@
         <filter class="solr.IndonesianStemFilterFactory" stemDerivational="true"/>
       </analyzer>
     </fieldType>
-    
+
     <!-- Italian -->
     <fieldType name="text_it" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <!-- removes l', etc -->
         <filter class="solr.ElisionFilterFactory" ignoreCase="true" articles="lang/contractions_it.txt"/>
@@ -1178,11 +1178,11 @@
         <!-- more aggressive: <filter class="solr.SnowballPorterFilterFactory" language="Italian"/> -->
       </analyzer>
     </fieldType>
-    
+
     <!-- Japanese using morphological analysis (see text_cjk for a configuration using bigramming)
 
          NOTE: If you want to optimize search for precision, use default operator AND in your query
-         parser config with <solrQueryParser defaultOperator="AND"/> further down in this file.  Use 
+         parser config with <solrQueryParser defaultOperator="AND"/> further down in this file.  Use
          OR if you would like to optimize for recall (default).
     -->
     <fieldType name="text_ja" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="false">
@@ -1231,20 +1231,20 @@
         <filter class="solr.LowerCaseFilterFactory"/>
       </analyzer>
     </fieldType>
-    
+
     <!-- Latvian -->
     <fieldType name="text_lv" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_lv.txt" />
         <filter class="solr.LatvianStemFilterFactory"/>
       </analyzer>
     </fieldType>
-    
+
     <!-- Dutch -->
     <fieldType name="text_nl" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_nl.txt" format="snowball" />
@@ -1252,10 +1252,10 @@
         <filter class="solr.SnowballPorterFilterFactory" language="Dutch"/>
       </analyzer>
     </fieldType>
-    
+
     <!-- Norwegian -->
     <fieldType name="text_no" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_no.txt" format="snowball" />
@@ -1265,10 +1265,10 @@
         <!-- The "light" and "minimal" stemmers support variants: nb=Bokmål, nn=Nynorsk, no=Both -->
       </analyzer>
     </fieldType>
-    
+
     <!-- Portuguese -->
     <fieldType name="text_pt" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_pt.txt" format="snowball" />
@@ -1278,20 +1278,20 @@
         <!-- most aggressive: <filter class="solr.PortugueseStemFilterFactory"/> -->
       </analyzer>
     </fieldType>
-    
+
     <!-- Romanian -->
     <fieldType name="text_ro" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_ro.txt" />
         <filter class="solr.SnowballPorterFilterFactory" language="Romanian"/>
       </analyzer>
     </fieldType>
-    
+
     <!-- Russian -->
     <fieldType name="text_ru" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_ru.txt" format="snowball" />
@@ -1299,10 +1299,10 @@
         <!-- less aggressive: <filter class="solr.RussianLightStemFilterFactory"/> -->
       </analyzer>
     </fieldType>
-    
+
     <!-- Swedish -->
     <fieldType name="text_sv" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_sv.txt" format="snowball" />
@@ -1310,10 +1310,10 @@
         <!-- less aggressive: <filter class="solr.SwedishLightStemFilterFactory"/> -->
       </analyzer>
     </fieldType>
-    
+
     <!-- Turkish -->
     <fieldType name="text_tr" class="solr.TextField" positionIncrementGap="100">
-      <analyzer> 
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.TurkishLowerCaseFilterFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="false" words="lang/stopwords_tr.txt" />
@@ -1322,10 +1322,10 @@
     </fieldType>
 
  </types>
-  
+
   <!-- Similarity is the scoring routine for each document vs. a query.
-       A custom Similarity or SimilarityFactory may be specified here, but 
-       the default is fine for most applications.  
+       A custom Similarity or SimilarityFactory may be specified here, but
+       the default is fine for most applications.
        For more info: http://wiki.apache.org/solr/SchemaXml#Similarity
     -->
   <!--
diff --git a/home/src/main/resources/solr/conf/solrconfig-old.xml b/home/src/main/resources/solr/conf/solrconfig-old.xml
index 9e292b3a4..dc3964558 100644
--- a/home/src/main/resources/solr/conf/solrconfig-old.xml
+++ b/home/src/main/resources/solr/conf/solrconfig-old.xml
@@ -16,9 +16,9 @@
  limitations under the License.
 -->
 
-<!-- 
+<!--
      For more details about configurations options that may appear in
-     this file, see http://wiki.apache.org/solr/SolrConfigXml. 
+     this file, see http://wiki.apache.org/solr/SolrConfigXml.
 -->
 <config>
   <!-- In all configuration below, a prefix of "solr." for class names
@@ -40,7 +40,7 @@
          -Dsolr.abortOnConfigurationError=false
     -->
   <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
-  
+
   <!-- Controls what version of Lucene various components of Solr
        adhere to.  Generally, you want to use the latest version to
        get all bug fixes and improvements. It is highly recommended
@@ -60,7 +60,7 @@
        If a "./lib" directory exists in your instanceDir, all files
        found in it are included as if you had used the following
        syntax...
-       
+
               <lib dir="./lib" />
     -->
   <!-- A dir option by itself adds any files found in the directory to
@@ -80,14 +80,14 @@
        is found that matches, it will be ignored
     -->
   <lib dir="../../contrib/clustering/lib/" />
-  <lib dir="/total/crap/dir/ignored" /> 
+  <lib dir="/total/crap/dir/ignored" />
   <!-- an exact path can be used to specify a specific file.  This
        will cause a serious error to be logged if it can't be loaded.
     -->
   <!--
-  <lib path="../a-jar-that-does-not-exist.jar" /> 
+  <lib path="../a-jar-that-does-not-exist.jar" />
   -->
-  
+
   <!-- Data Directory
 
        Used to specify an alternate directory to hold all index data
@@ -99,12 +99,12 @@
 
 
   <!-- The DirectoryFactory to use for indexes.
-       
+
        solr.StandardDirectoryFactory, the default, is filesystem
        based.  solr.RAMDirectoryFactory is memory based, not
        persistent, and doesn't work with replication.
     -->
-  <directoryFactory name="DirectoryFactory" 
+  <directoryFactory name="DirectoryFactory"
                     class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
 
 
@@ -126,7 +126,7 @@
          flushed to the Directory.  -->
     <ramBufferSizeMB>32</ramBufferSizeMB>
     <!-- If both ramBufferSizeMB and maxBufferedDocs is set, then
-         Lucene will flush based on whichever limit is hit first.  
+         Lucene will flush based on whichever limit is hit first.
       -->
     <!-- <maxBufferedDocs>1000</maxBufferedDocs> -->
 
@@ -134,16 +134,16 @@
     <writeLockTimeout>1000</writeLockTimeout>
     <commitLockTimeout>10000</commitLockTimeout>
 
-    <!-- Expert: Merge Policy 
+    <!-- Expert: Merge Policy
 
          The Merge Policy in Lucene controls how merging is handled by
          Lucene.  The default in 2.3 is the LogByteSizeMergePolicy,
          previous versions used LogDocMergePolicy.
-         
+
          LogByteSizeMergePolicy chooses segments to merge based on
          their size.  The Lucene 2.2 default, LogDocMergePolicy chose
          when to merge based on number of documents
-         
+
          Other implementations of MergePolicy must have a no-argument
          constructor
       -->
@@ -158,15 +158,15 @@
          can perform merges in the background using separate threads.
          The SerialMergeScheduler (Lucene 2.2 default) does not.
      -->
-    <!-- 
+    <!--
        <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
        -->
-	  
-    <!-- LockFactory 
+
+    <!-- LockFactory
 
          This option specifies which Lucene LockFactory implementation
          to use.
-      
+
          single = SingleInstanceLockFactory - suggested for a
                   read-only index or when there is no possibility of
                   another process trying to modify the index.
@@ -210,7 +210,7 @@
          This is not needed if lock type is 'none' or 'single'
      -->
     <unlockOnStartup>false</unlockOnStartup>
-    
+
     <!-- If true, IndexReaders will be reopened (often more efficient)
          instead of closed and then opened.
       -->
@@ -226,7 +226,7 @@
          The standard Solr IndexDeletionPolicy implementation supports
          deleting index commit points on number of commits, age of
          commit point and optimized status.
-         
+
          The latest commit point should always be preserved regardless
          of the criteria.
     -->
@@ -246,19 +246,19 @@
     </deletionPolicy>
 
     <!-- Lucene Infostream
-       
+
          To aid in advanced debugging, Lucene provides an "InfoStream"
          of detailed information when indexing.
 
          Setting The value to true will instruct the underlying Lucene
          IndexWriter to write it's debugging info the specified file
       -->
-     <infoStream file="INFOSTREAM.txt">false</infoStream> 
+     <infoStream file="INFOSTREAM.txt">false</infoStream>
 
   </mainIndex>
 
   <!-- JMX
-       
+
        This example enables JMX if and only if an existing MBeanServer
        is found, use this if you want to configure JMX through JVM
        parameters. Remove this to disable exposing Solr configuration
@@ -268,7 +268,7 @@
     -->
   <jmx />
   <!-- If you want to connect to a particular server, specify the
-       agentId 
+       agentId
     -->
   <!-- <jmx agentId="myAgent" /> -->
   <!-- If you want to start a new MBeanServer, specify the serviceUrl -->
@@ -282,7 +282,7 @@
 
          Perform a <commit/> automatically under certain conditions.
          Instead of enabling autoCommit, consider using "commitWithin"
-         when adding documents. 
+         when adding documents.
 
          http://wiki.apache.org/solr/UpdateXmlMessages
 
@@ -291,17 +291,17 @@
 
          maxTime - Maximum amount of time that is allowed to pass
                    since a document was added before automaticly
-                   triggering a new commit. 
+                   triggering a new commit.
       -->
     <!--
-       <autoCommit> 
+       <autoCommit>
          <maxDocs>10000</maxDocs>
-         <maxTime>1000</maxTime> 
+         <maxTime>1000</maxTime>
        </autoCommit>
       -->
 
     <!-- Update Related Event Listeners
-         
+
          Various IndexWriter realted events can trigger Listeners to
          take actions.
 
@@ -310,10 +310,10 @@
       -->
     <!-- The RunExecutableListener executes an external command from a
          hook such as postCommit or postOptimize.
-         
+
          exe - the name of the executable to run
          dir - dir to use as the current working directory. (default=".")
-         wait - the calling thread waits until the executable returns. 
+         wait - the calling thread waits until the executable returns.
                 (default="true")
          args - the arguments to pass to the program.  (default is none)
          env - environment variables to set.  (default is none)
@@ -332,7 +332,7 @@
        </listener>
       -->
   </updateHandler>
-  
+
   <!-- IndexReaderFactory
 
        Use the following format to specify a custom IndexReaderFactory,
@@ -364,7 +364,7 @@
        be specified.
     -->
   <!--
-     <indexReaderFactory name="IndexReaderFactory" 
+     <indexReaderFactory name="IndexReaderFactory"
                          class="solr.StandardIndexReaderFactory">
        <int name="setTermIndexDivisor">12</int>
      </indexReaderFactory >
@@ -378,15 +378,15 @@
          is thrown if exceeded.
 
          ** WARNING **
-         
+
          This option actually modifies a global Lucene property that
          will affect all SolrCores.  If multiple solrconfig.xml files
          disagree on this property, the value at any given moment will
          be based on the last SolrCore to be initialized.
-         
+
       -->
        -->
-    <!-- Increasing to handle large wildcard queries used in IndividualListController. 
+    <!-- Increasing to handle large wildcard queries used in IndividualListController.
          See VIVO-384. -->
     <maxBooleanClauses>50000</maxBooleanClauses>
 
@@ -395,7 +395,7 @@
 
          There are two implementations of cache available for Solr,
          LRUCache, based on a synchronized LinkedHashMap, and
-         FastLRUCache, based on a ConcurrentHashMap.  
+         FastLRUCache, based on a ConcurrentHashMap.
 
          FastLRUCache has faster gets and slower puts in single
          threaded operation and thus is generally faster than LRUCache
@@ -420,7 +420,7 @@
            initialSize - the initial capacity (number of entries) of
                the cache.  (see java.util.HashMap)
            autowarmCount - the number of entries to prepopulate from
-               and old cache.  
+               and old cache.
       -->
     <filterCache class="solr.FastLRUCache"
                  size="512"
@@ -428,28 +428,28 @@
                  autowarmCount="0"/>
 
     <!-- Query Result Cache
-         
+
          Caches results of searches - ordered lists of document ids
-         (DocList) based on a query, a sort, and the range of documents requested.  
+         (DocList) based on a query, a sort, and the range of documents requested.
       -->
     <queryResultCache class="solr.LRUCache"
                      size="512"
                      initialSize="512"
                      autowarmCount="0"/>
-   
+
     <!-- Document Cache
 
          Caches Lucene Document objects (the stored fields for each
          document).  Since Lucene internal document ids are transient,
-         this cache will not be autowarmed.  
+         this cache will not be autowarmed.
       -->
     <documentCache class="solr.LRUCache"
                    size="512"
                    initialSize="512"
                    autowarmCount="0"/>
-    
+
     <!-- Field Value Cache
-         
+
          Cache used to hold field values that are quickly accessible
          by document id.  The fieldValueCache is created by default
          even if not configured here.
@@ -467,8 +467,8 @@
          name through SolrIndexSearcher.getCache(),cacheLookup(), and
          cacheInsert().  The purpose is to enable easy caching of
          user/application level data.  The regenerator argument should
-         be specified as an implementation of solr.CacheRegenerator 
-         if autowarming is desired.  
+         be specified as an implementation of solr.CacheRegenerator
+         if autowarming is desired.
       -->
     <!--
        <cache name="myUserCache"
@@ -515,12 +515,12 @@
         are collected.  For example, if a search for a particular query
         requests matching documents 10 through 19, and queryWindowSize is 50,
         then documents 0 through 49 will be collected and cached.  Any further
-        requests in that range can be satisfied via the cache.  
+        requests in that range can be satisfied via the cache.
      -->
    <queryResultWindowSize>20</queryResultWindowSize>
 
    <!-- Maximum number of documents to cache for any entry in the
-        queryResultCache. 
+        queryResultCache.
      -->
    <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
 
@@ -538,10 +538,10 @@
         prepared but there is no current registered searcher to handle
         requests or to gain autowarming data from.
 
-        
+
      -->
     <!-- QuerySenderListener takes an array of NamedList and executes a
-         local query request for each NamedList in sequence. 
+         local query request for each NamedList in sequence.
       -->
     <listener event="newSearcher" class="solr.QuerySenderListener">
       <arr name="queries">
@@ -569,7 +569,7 @@
     <useColdSearcher>false</useColdSearcher>
 
     <!-- Max Warming Searchers
-         
+
          Maximum number of searchers that may be warming in the
          background concurrently.  An error is returned if this limit
          is exceeded.
@@ -609,14 +609,14 @@
 
          multipartUploadLimitInKB - specifies the max size of
          Multipart File Uploads that Solr will alow in a Request.
-         
+
          *** WARNING ***
          The settings below authorize Solr to fetch remote files, You
          should make sure your system has some authentication before
          using enableRemoteStreaming="true"
 
-      --> 
-    <requestParsers enableRemoteStreaming="true" 
+      -->
+    <requestParsers enableRemoteStreaming="true"
                     multipartUploadLimitInKB="2048000" />
 
     <!-- HTTP Caching
@@ -630,21 +630,21 @@
     <!-- If you include a <cacheControl> directive, it will be used to
          generate a Cache-Control header (as well as an Expires header
          if the value contains "max-age=")
-         
+
          By default, no Cache-Control header is generated.
-         
+
          You can use the <cacheControl> option even if you have set
          never304="true"
       -->
     <!--
        <httpCaching never304="true" >
-         <cacheControl>max-age=30, public</cacheControl> 
+         <cacheControl>max-age=30, public</cacheControl>
        </httpCaching>
       -->
     <!-- To enable Solr to responde with automaticly generated HTTP
          Caching headers, and to response to Cache Validation requests
          correctly, set the value of never304="false"
-         
+
          This will cause Solr to generate Last-Modified and ETag
          headers based on the properties of the Index.
 
@@ -669,12 +669,12 @@
     <!--
        <httpCaching lastModifiedFrom="openTime"
                     etagSeed="Solr">
-         <cacheControl>max-age=30, public</cacheControl> 
+         <cacheControl>max-age=30, public</cacheControl>
        </httpCaching>
       -->
   </requestDispatcher>
 
-  <!-- Request Handlers 
+  <!-- Request Handlers
 
        http://wiki.apache.org/solr/SolrRequestHandler
 
@@ -688,7 +688,7 @@
        If a /select request is processed with out a qt param
        specified, the requestHandler that declares default="true" will
        be used.
-       
+
        If a Request Handler is declared with startup="lazy", then it will
        not be initialized until the first request that uses it.
 
@@ -796,7 +796,7 @@
        <str name="title">Solritas</str>
 
       <!-- <str name="defType">edismax</str> -->
-     
+
        <str name="q.alt">*:*</str>
        <str name="rows">10</str>
        <str name="fl">*,score</str>
@@ -806,11 +806,11 @@
        </str>
        <str name="mlt.fl">text,features,name,sku,id,manu,cat</str>
        <int name="mlt.count">3</int>
- 
+
        <str name="qf">
           text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
        </str>
-      
+
        <str name="facet">on</str>
        <str name="facet.field">cat</str>
        <str name="facet.field">manu_exact</str>
@@ -845,8 +845,8 @@
      -->
   </requestHandler>
 
-  <!-- XML Update Request Handler.  
-       
+  <!-- XML Update Request Handler.
+
        http://wiki.apache.org/solr/UpdateXmlMessages
 
        The canonical Request Handler for Modifying the Index through
@@ -863,33 +863,33 @@
          <str name="update.chain">etag</str>
        </lst>
   </requestHandler>
-  
+
   <!-- Binary Update Request Handler
        http://wiki.apache.org/solr/javabin
     -->
-  <requestHandler name="/update/javabin" 
+  <requestHandler name="/update/javabin"
                   class="solr.BinaryUpdateRequestHandler" />
 
   <!-- CSV Update Request Handler
        http://wiki.apache.org/solr/UpdateCSV
     -->
-  <requestHandler name="/update/csv" 
-                  class="solr.CSVRequestHandler" 
+  <requestHandler name="/update/csv"
+                  class="solr.CSVRequestHandler"
                   startup="lazy" />
 
   <!-- JSON Update Request Handler
        http://wiki.apache.org/solr/UpdateJSON
     -->
-  <requestHandler name="/update/json" 
-                  class="solr.JsonUpdateRequestHandler" 
+  <requestHandler name="/update/json"
+                  class="solr.JsonUpdateRequestHandler"
                   startup="lazy" />
 
   <!-- Solr Cell Update Request Handler
 
-       http://wiki.apache.org/solr/ExtractingRequestHandler 
+       http://wiki.apache.org/solr/ExtractingRequestHandler
 
     -->
-  <requestHandler name="/update/extract" 
+  <requestHandler name="/update/extract"
                   startup="lazy"
                   class="solr.extraction.ExtractingRequestHandler" >
     <lst name="defaults">
@@ -924,7 +924,7 @@
            field value analysis will be marked as "matched" for every
            token that is produces by the query analysis
    -->
-  <requestHandler name="/analysis/field" 
+  <requestHandler name="/analysis/field"
                   startup="lazy"
                   class="solr.FieldAnalysisRequestHandler" />
 
@@ -957,18 +957,18 @@
     request paraemter that holds the query text to be analyized. It
     also supports the "analysis.showmatch" parameter which when set to
     true, all field tokens that match the query tokens will be marked
-    as a "match". 
+    as a "match".
   -->
-  <requestHandler name="/analysis/document" 
-                  class="solr.DocumentAnalysisRequestHandler" 
+  <requestHandler name="/analysis/document"
+                  class="solr.DocumentAnalysisRequestHandler"
                   startup="lazy" />
 
   <!-- Admin Handlers
 
        Admin Handlers - This will register all the standard admin
-       RequestHandlers.  
+       RequestHandlers.
     -->
-  <requestHandler name="/admin/" 
+  <requestHandler name="/admin/"
                   class="solr.admin.AdminHandlers" />
   <!-- This single handler is equivilent to the following... -->
   <!--
@@ -980,14 +980,14 @@
      <requestHandler name="/admin/file"       class="solr.admin.ShowFileRequestHandler" >
     -->
   <!-- If you wish to hide files under ${solr.home}/conf, explicitly
-       register the ShowFileRequestHandler using: 
+       register the ShowFileRequestHandler using:
     -->
   <!--
-     <requestHandler name="/admin/file" 
+     <requestHandler name="/admin/file"
                      class="solr.admin.ShowFileRequestHandler" >
        <lst name="invariants">
-         <str name="hidden">synonyms.txt</str> 
-         <str name="hidden">anotherfile.txt</str> 
+         <str name="hidden">synonyms.txt</str>
+         <str name="hidden">anotherfile.txt</str>
        </lst>
      </requestHandler>
     -->
@@ -1004,17 +1004,17 @@
   <!-- Echo the request contents back to the client -->
   <requestHandler name="/debug/dump" class="solr.DumpRequestHandler" >
     <lst name="defaults">
-     <str name="echoParams">explicit</str> 
+     <str name="echoParams">explicit</str>
      <str name="echoHandler">true</str>
     </lst>
   </requestHandler>
-  
+
   <!-- Solr Replication
 
        The SolrReplicationHandler supports replicating indexes from a
        "master" used for indexing and "salves" used for queries.
 
-       http://wiki.apache.org/solr/SolrReplication 
+       http://wiki.apache.org/solr/SolrReplication
 
        In the example below, remove the <lst name="master"> section if
        this is just a slave and remove  the <lst name="slave"> section
@@ -1036,18 +1036,18 @@
 
   <!-- Search Components
 
-       Search components are registered to SolrCore and used by 
+       Search components are registered to SolrCore and used by
        instances of SearchHandler (which can access them by name)
-       
+
        By default, the following components are avaliable:
-       
+
        <searchComponent name="query"     class="solr.QueryComponent" />
        <searchComponent name="facet"     class="solr.FacetComponent" />
        <searchComponent name="mlt"       class="solr.MoreLikeThisComponent" />
        <searchComponent name="highlight" class="solr.HighlightComponent" />
        <searchComponent name="stats"     class="solr.StatsComponent" />
        <searchComponent name="debug"     class="solr.DebugComponent" />
-   
+
        Default configuration in a requestHandler would look like:
 
        <arr name="components">
@@ -1059,28 +1059,28 @@
          <str>debug</str>
        </arr>
 
-       If you register a searchComponent to one of the standard names, 
+       If you register a searchComponent to one of the standard names,
        that will be used instead of the default.
 
        To insert components before or after the 'standard' components, use:
-    
+
        <arr name="first-components">
          <str>myFirstComponentName</str>
        </arr>
-    
+
        <arr name="last-components">
          <str>myLastComponentName</str>
        </arr>
 
        NOTE: The component registered with the name "debug" will
-       always be executed after the "last-components" 
-       
+       always be executed after the "last-components"
+
      -->
 
    <!-- Spell Check
 
         The spell check component can return a list of alternative spelling
-        suggestions.  
+        suggestions.
 
         http://wiki.apache.org/solr/SpellCheckComponent
      -->
@@ -1113,7 +1113,7 @@
        </lst>
      -->
 
-    <!-- a spellchecker that use an alternate comparator 
+    <!-- a spellchecker that use an alternate comparator
 
          comparatorClass be one of:
           1. score (default)
@@ -1141,7 +1141,7 @@
       -->
   </searchComponent>
 
-  <!-- A request handler for demonstrating the spellcheck component.  
+  <!-- A request handler for demonstrating the spellcheck component.
 
        NOTE: This is purely as an example.  The whole purpose of the
        SpellCheckComponent is to hook it into the request handler that
@@ -1150,7 +1150,7 @@
 
        IN OTHER WORDS, THERE IS REALLY GOOD CHANCE THE SETUP BELOW IS
        NOT WHAT YOU WANT FOR YOUR PRODUCTION SYSTEM!
-       
+
        See http://wiki.apache.org/solr/SpellCheckComponent for details
        on the request parameters.
     -->
@@ -1175,8 +1175,8 @@
 
        This is purely as an example.
 
-       In reality you will likely want to add the component to your 
-       already specified request handlers. 
+       In reality you will likely want to add the component to your
+       already specified request handlers.
     -->
   <requestHandler name="tvrh" class="solr.SearchHandler" startup="lazy">
     <lst name="defaults">
@@ -1198,20 +1198,20 @@
 
           java -Dsolr.clustering.enabled=true -jar start.jar
     -->
-  <searchComponent name="clustering" 
+  <searchComponent name="clustering"
                    enable="${solr.clustering.enabled:false}"
                    class="solr.clustering.ClusteringComponent" >
     <!-- Declare an engine -->
     <lst name="engine">
       <!-- The name, only one can be named "default" -->
       <str name="name">default</str>
-      <!-- Class name of Carrot2 clustering algorithm. 
-           
+      <!-- Class name of Carrot2 clustering algorithm.
+
            Currently available algorithms are:
-           
+
            * org.carrot2.clustering.lingo.LingoClusteringAlgorithm
            * org.carrot2.clustering.stc.STCClusteringAlgorithm
-           
+
            See http://project.carrot2.org/algorithms.html for the
            algorithm's characteristics.
         -->
@@ -1226,9 +1226,9 @@
            name and attribute value as parameter value.
         -->
       <str name="LingoClusteringAlgorithm.desiredClusterCountBase">20</str>
-      
+
       <!-- The language to assume for the documents.
-           
+
            For a list of allowed values, see:
            http://download.carrot2.org/stable/manual/#section.attribute.lingo.MultilingualClustering.defaultLanguage
        -->
@@ -1244,8 +1244,8 @@
 
        This is purely as an example.
 
-       In reality you will likely want to add the component to your 
-       already specified request handlers. 
+       In reality you will likely want to add the component to your
+       already specified request handlers.
     -->
   <requestHandler name="/clustering"
                   startup="lazy"
@@ -1266,7 +1266,7 @@
        <!--<int name="carrot.numDescriptions">5</int>-->
        <!-- produce sub clusters -->
        <bool name="carrot.outputSubClusters">false</bool>
-       
+
        <str name="defType">edismax</str>
        <str name="qf">
           text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
@@ -1274,12 +1274,12 @@
        <str name="q.alt">*:*</str>
        <str name="rows">10</str>
        <str name="fl">*,score</str>
-    </lst>     
+    </lst>
     <arr name="last-components">
       <str>clustering</str>
     </arr>
   </requestHandler>
-  
+
   <!-- Terms Component
 
        http://wiki.apache.org/solr/TermsComponent
@@ -1293,7 +1293,7 @@
   <requestHandler name="/terms" class="solr.SearchHandler" startup="lazy">
      <lst name="defaults">
       <bool name="terms">true</bool>
-    </lst>     
+    </lst>
     <arr name="components">
       <str>terms</str>
     </arr>
@@ -1332,7 +1332,7 @@
     <highlighting>
       <!-- Configure the standard fragmenter -->
       <!-- This could most likely be commented out in the "default" case -->
-      <fragmenter name="gap" 
+      <fragmenter name="gap"
                   default="true"
                   class="solr.highlight.GapFragmenter">
         <lst name="defaults">
@@ -1340,10 +1340,10 @@
         </lst>
       </fragmenter>
 
-      <!-- A regular-expression-based fragmenter 
-           (for sentence extraction) 
+      <!-- A regular-expression-based fragmenter
+           (for sentence extraction)
         -->
-      <fragmenter name="regex" 
+      <fragmenter name="regex"
                   class="solr.highlight.RegexFragmenter">
         <lst name="defaults">
           <!-- slightly smaller fragsizes work better because of slop -->
@@ -1356,7 +1356,7 @@
       </fragmenter>
 
       <!-- Configure the standard formatter -->
-      <formatter name="html" 
+      <formatter name="html"
                  default="true"
                  class="solr.highlight.HtmlFormatter">
         <lst name="defaults">
@@ -1366,24 +1366,24 @@
       </formatter>
 
       <!-- Configure the standard encoder -->
-      <encoder name="html" 
+      <encoder name="html"
                default="true"
                class="solr.highlight.HtmlEncoder" />
 
       <!-- Configure the standard fragListBuilder -->
-      <fragListBuilder name="simple" 
+      <fragListBuilder name="simple"
                        default="true"
                        class="solr.highlight.SimpleFragListBuilder"/>
 
       <!-- Configure the single fragListBuilder -->
-      <fragListBuilder name="single" 
+      <fragListBuilder name="single"
                        class="solr.highlight.SingleFragListBuilder"/>
 
       <!-- default tag FragmentsBuilder -->
-      <fragmentsBuilder name="default" 
+      <fragmentsBuilder name="default"
                         default="true"
                         class="solr.highlight.ScoreOrderFragmentsBuilder">
-        <!-- 
+        <!--
         <lst name="defaults">
           <str name="hl.multiValuedSeparatorChar">/</str>
         </lst>
@@ -1391,7 +1391,7 @@
       </fragmentsBuilder>
 
       <!-- multi-colored tag FragmentsBuilder -->
-      <fragmentsBuilder name="colored" 
+      <fragmentsBuilder name="colored"
                         class="solr.highlight.ScoreOrderFragmentsBuilder">
         <lst name="defaults">
           <str name="hl.tag.pre"><![CDATA[
@@ -1413,14 +1413,14 @@
       <str name="classname">org.apache.solr.spelling.suggest.Suggester</str>
       <str name="lookupImpl">org.apache.solr.spelling.suggest.tst.TSTLookup</str>
       -->
-      <!-- Alternatives to lookupImpl: 
+      <!-- Alternatives to lookupImpl:
         org.apache.solr.spelling.suggest.fst.FSTLookup   [finite state automaton]
         org.apache.solr.spelling.suggest.jaspell.JaspellLookup [default, jaspell-based]
         org.apache.solr.spelling.suggest.tst.TSTLookup   [ternary trees]
       -->
       <!-- the indexed field to derive suggestions from -->
       <!--
-      <str name="field">nameLowercase</str> 
+      <str name="field">nameLowercase</str>
       <float name="threshold">0.005</float>
       <str name="buildOnCommit">false</str>
       <str name="storeDir">suggest</str>
@@ -1452,15 +1452,15 @@
 
        http://wiki.apache.org/solr/UpdateRequestProcessor
 
-    --> 
+    -->
   <!-- Deduplication
 
        An example dedup update processor that creates the "id" field
        on the fly based on the hash code of some other fields.  This
        example has overwriteDupes set to false since we are using the
        id field as the signatureField and Solr will maintain
-       uniqueness based on that anyway.  
-       
+       uniqueness based on that anyway.
+
     -->
   <!--
      <updateRequestProcessorChain name="dedupe">
@@ -1479,8 +1479,8 @@
   <!-- ETag generation
 
        Creates the "etag" field on the fly based on a hash of all other
-       fields.  
-       
+       fields.
+
     -->
      <updateRequestProcessorChain name="etag">
        <processor class="solr.processor.SignatureUpdateProcessorFactory">
@@ -1508,7 +1508,7 @@
        overridden...
     -->
   <!--
-     <queryResponseWriter name="xml" 
+     <queryResponseWriter name="xml"
                           default="true"
                           class="solr.XMLResponseWriter" />
      <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
@@ -1528,7 +1528,7 @@
 
   <!-- XSLT response writer transforms the XML output by any xslt file found
        in Solr's conf/xslt directory.  Changes to xslt files are checked for
-       every xsltCacheLifetimeSeconds.  
+       every xsltCacheLifetimeSeconds.
     -->
   <queryResponseWriter name="xslt" class="solr.XSLTResponseWriter">
     <int name="xsltCacheLifetimeSeconds">5</int>
@@ -1556,7 +1556,7 @@
     -->
   <!-- example of registering a custom function parser  -->
   <!--
-     <valueSourceParser name="myfunc" 
+     <valueSourceParser name="myfunc"
                         class="com.mycompany.MyValueSourceParser" />
     -->
 
@@ -1565,7 +1565,7 @@
     <defaultQuery>*:*</defaultQuery>
 
     <!-- configure a healthcheck file for servers behind a
-         loadbalancer 
+         loadbalancer
       -->
     <!--
        <healthcheck type="file">server-enabled</healthcheck>
diff --git a/home/src/main/resources/solr/conf/solrconfig.xml b/home/src/main/resources/solr/conf/solrconfig.xml
index 86bc84080..b136cb13a 100644
--- a/home/src/main/resources/solr/conf/solrconfig.xml
+++ b/home/src/main/resources/solr/conf/solrconfig.xml
@@ -16,9 +16,9 @@
  limitations under the License.
 -->
 
-<!-- 
+<!--
      For more details about configurations options that may appear in
-     this file, see http://wiki.apache.org/solr/SolrConfigXml. 
+     this file, see http://wiki.apache.org/solr/SolrConfigXml.
 -->
 <config>
   <!-- In all configuration below, a prefix of "solr." for class names
@@ -46,19 +46,19 @@
        instanceDir.
 
        Please note that <lib/> directives are processed in the order
-       that they appear in your solrconfig.xml file, and are "stacked" 
-       on top of each other when building a ClassLoader - so if you have 
-       plugin jars with dependencies on other jars, the "lower level" 
+       that they appear in your solrconfig.xml file, and are "stacked"
+       on top of each other when building a ClassLoader - so if you have
+       plugin jars with dependencies on other jars, the "lower level"
        dependency jars should be loaded first.
 
        If a "./lib" directory exists in your instanceDir, all files
        found in it are included as if you had used the following
        syntax...
-       
+
               <lib dir="./lib" />
     -->
 
-  <!-- A 'dir' option by itself adds any files found in the directory 
+  <!-- A 'dir' option by itself adds any files found in the directory
        to the classpath, this is useful for including all jars in a
        directory.
 
@@ -69,11 +69,11 @@
        If a 'dir' option (with or without a regex) is used and nothing
        is found that matches, a warning will be logged.
 
-       The examples below can be used to load some solr-contribs along 
+       The examples below can be used to load some solr-contribs along
        with their external dependencies.
     -->
     <!--  Don't think these jars are actually used anywhere so not utilizing them here -->
-    <!-- 
+    <!--
   <lib dir="../../../contrib/extraction/lib" regex=".*\.jar" />
   <lib dir="../../../dist/" regex="solr-cell-\d.*\.jar" />
 
@@ -86,14 +86,14 @@
   <lib dir="../../../contrib/velocity/lib" regex=".*\.jar" />
   <lib dir="../../../dist/" regex="solr-velocity-\d.*\.jar" />
 -->
-  <!-- an exact 'path' can be used instead of a 'dir' to specify a 
-       specific jar file.  This will cause a serious error to be logged 
+  <!-- an exact 'path' can be used instead of a 'dir' to specify a
+       specific jar file.  This will cause a serious error to be logged
        if it can't be loaded.
     -->
   <!--
-     <lib path="../a-jar-that-does-not-exist.jar" /> 
+     <lib path="../a-jar-that-does-not-exist.jar" />
   -->
-  
+
   <!-- Data Directory
 
        Used to specify an alternate directory to hold all index data
@@ -106,7 +106,7 @@
 
 
   <!-- The DirectoryFactory to use for indexes.
-       
+
        solr.StandardDirectoryFactory is filesystem
        based and tries to pick the best implementation for the current
        JVM and platform.  solr.NRTCachingDirectoryFactory, the default,
@@ -119,21 +119,21 @@
        solr.RAMDirectoryFactory is memory based, not
        persistent, and doesn't work with replication.
     -->
-  <directoryFactory name="DirectoryFactory" 
+  <directoryFactory name="DirectoryFactory"
                     class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}">
-    
-         
+
+
     <!-- These will be used if you are using the solr.HdfsDirectoryFactory,
          otherwise they will be ignored. If you don't plan on using hdfs,
-         you can safely remove this section. -->      
-    <!-- The root directory that collection data should be written to. -->     
+         you can safely remove this section. -->
+    <!-- The root directory that collection data should be written to. -->
  <!--    <str name="solr.hdfs.home">${solr.hdfs.home:}</str> -->
-    <!-- The hadoop configuration files to use for the hdfs client. -->    
+    <!-- The hadoop configuration files to use for the hdfs client. -->
  <!--    <str name="solr.hdfs.confdir">${solr.hdfs.confdir:}</str>  -->
-    <!-- Enable/Disable the hdfs cache. -->    
+    <!-- Enable/Disable the hdfs cache. -->
  <!--    <str name="solr.hdfs.blockcache.enabled">${solr.hdfs.blockcache.enabled:true}</str>  -->
-    
-  </directoryFactory> 
+
+  </directoryFactory>
 
   <!-- The CodecFactory for defining the format of the inverted index.
        The default implementation is SchemaCodecFactory, which is the official Lucene
@@ -148,24 +148,24 @@
   <codecFactory class="solr.SchemaCodecFactory"/>
 
   <!-- To enable dynamic schema REST APIs, use the following for <schemaFactory>:
-  
+
        <schemaFactory class="ManagedIndexSchemaFactory">
          <bool name="mutable">true</bool>
          <str name="managedSchemaResourceName">managed-schema</str>
        </schemaFactory>
-       
+
        When ManagedIndexSchemaFactory is specified, Solr will load the schema from
        he resource named in 'managedSchemaResourceName', rather than from schema.xml.
        Note that the managed schema resource CANNOT be named schema.xml.  If the managed
        schema does not exist, Solr will create it after reading schema.xml, then rename
-       'schema.xml' to 'schema.xml.bak'. 
-       
+       'schema.xml' to 'schema.xml.bak'.
+
        Do NOT hand edit the managed schema - external modifications will be ignored and
        overwritten as a result of schema modification REST API calls.
 
        When ManagedIndexSchemaFactory is specified with mutable = true, schema
        modification REST API calls will be allowed; otherwise, error responses will be
-       sent back for these requests. 
+       sent back for these requests.
   -->
   <schemaFactory class="ClassicIndexSchemaFactory"/>
 
@@ -173,27 +173,27 @@
        Index Config - These settings control low-level behavior of indexing
        Most example settings here show the default value, but are commented
        out, to more easily see where customizations have been made.
-       
+
        Note: This replaces <indexDefaults> and <mainIndex> from older versions
        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
   <indexConfig>
-    <!-- maxFieldLength was removed in 4.0. To get similar behavior, include a 
-         LimitTokenCountFilterFactory in your fieldType definition. E.g. 
+    <!-- maxFieldLength was removed in 4.0. To get similar behavior, include a
+         LimitTokenCountFilterFactory in your fieldType definition. E.g.
      <filter class="solr.LimitTokenCountFilterFactory" maxTokenCount="10000"/>
     -->
     <!-- Maximum time to wait for a write lock (ms) for an IndexWriter. Default: 1000 -->
     <!-- <writeLockTimeout>1000</writeLockTimeout>  -->
-<writeLockTimeout>1000</writeLockTimeout> 
+<writeLockTimeout>1000</writeLockTimeout>
     <!-- The maximum number of simultaneous threads that may be
          indexing documents at once in IndexWriter; if more than this
          many threads arrive they will wait for others to finish.
          Default in Solr/Lucene is 8. -->
     <!-- <maxIndexingThreads>8</maxIndexingThreads>  -->
 
-    <!-- Expert: Enabling compound file will use less files for the index, 
-         using fewer file descriptors on the expense of performance decrease. 
+    <!-- Expert: Enabling compound file will use less files for the index,
+         using fewer file descriptors on the expense of performance decrease.
          Default in Lucene is "true". Default in Solr is "false" (since 3.6) -->
-    <useCompoundFile>false</useCompoundFile> 
+    <useCompoundFile>false</useCompoundFile>
 
     <!-- ramBufferSizeMB sets the amount of RAM that may be used by Lucene
          indexing for buffering added documents and deletions before they are
@@ -208,7 +208,7 @@
     <ramBufferSizeMB>100</ramBufferSizeMB>
     <!-- <maxBufferedDocs>1000</maxBufferedDocs> -->
 
-    <!-- Expert: Merge Policy 
+    <!-- Expert: Merge Policy
          The Merge Policy in Lucene controls how merging of segments is done.
          The default since Solr/Lucene 3.3 is TieredMergePolicy.
          The default since Lucene 2.3 was the LogByteSizeMergePolicy,
@@ -220,7 +220,7 @@
           <int name="segmentsPerTier">10</int>
         </mergePolicy>
       -->
-       
+
     <!-- Merge Factor
          The merge factor controls how many segments will get merged at a time.
          For TieredMergePolicy, mergeFactor is a convenience parameter which
@@ -229,9 +229,9 @@
          will be allowed before they are merged into one.
          Default is 10 for both merge policies.
       -->
-    
+
     <mergeFactor>10</mergeFactor>
-      
+
 
     <!-- Expert: Merge Scheduler
          The Merge Scheduler in Lucene controls how merges are
@@ -239,15 +239,15 @@
          can perform merges in the background using separate threads.
          The SerialMergeScheduler (Lucene 2.2 default) does not.
      -->
-    <!-- 
+    <!--
        <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
        -->
 
-    <!-- LockFactory 
+    <!-- LockFactory
 
          This option specifies which Lucene LockFactory implementation
          to use.
-      
+
          single = SingleInstanceLockFactory - suggested for a
                   read-only index or when there is no possibility of
                   another process trying to modify the index.
@@ -287,7 +287,7 @@
          should have this set to false while those in a SolrCloud
          cluster need to be set to true. Default: true
       -->
-    <!-- 
+    <!--
     <nrtMode>true</nrtMode>
       -->
  <nrtMode>true</nrtMode>
@@ -298,17 +298,17 @@
          The default Solr IndexDeletionPolicy implementation supports
          deleting index commit points on number of commits, age of
          commit point and optimized status.
-         
+
          The latest commit point should always be preserved regardless
          of the criteria.
     -->
-    
+
     <deletionPolicy class="solr.SolrDeletionPolicy">
-    
+
       <!-- The number of commit points to be kept -->
-      <str name="maxCommitsToKeep">1</str> 
+      <str name="maxCommitsToKeep">1</str>
       <!-- The number of optimized commit points to be kept -->
-      <str name="maxOptimizedCommitsToKeep">0</str> 
+      <str name="maxOptimizedCommitsToKeep">0</str>
       <!--
           Delete all commit points once they have reached the given age.
           Supports DateMathParser syntax e.g.
@@ -317,12 +317,12 @@
          <str name="maxCommitAge">30MINUTES</str>
          <str name="maxCommitAge">1DAY</str>
       -->
-    
+
     </deletionPolicy>
-    
+
 
     <!-- Lucene Infostream
-       
+
          To aid in advanced debugging, Lucene provides an "InfoStream"
          of detailed information when indexing.
 
@@ -335,7 +335,7 @@
 
 
   <!-- JMX
-       
+
        This example enables JMX if and only if an existing MBeanServer
        is found, use this if you want to configure JMX through JVM
        parameters. Remove this to disable exposing Solr configuration
@@ -345,7 +345,7 @@
     -->
   <jmx />
   <!-- If you want to connect to a particular server, specify the
-       agentId 
+       agentId
     -->
   <!-- <jmx agentId="myAgent" /> -->
   <!-- If you want to start a new MBeanServer, specify the serviceUrl -->
@@ -360,17 +360,17 @@
          uncommitted changes to the index, so use of a hard autoCommit
          is recommended (see below).
          "dir" - the target directory for transaction logs, defaults to the
-                solr data directory.  --> 
+                solr data directory.  -->
     <updateLog>
     <!--  Commenting out this because seems like original Vitro does not have anything similar -->
     <!--    <str name="dir">${solr.ulog.dir:}</str> -->
     </updateLog>
- 
+
     <!-- AutoCommit
 
          Perform a hard commit automatically under certain conditions.
          Instead of enabling autoCommit, consider using "commitWithin"
-         when adding documents. 
+         when adding documents.
 
          http://wiki.apache.org/solr/UpdateXmlMessages
 
@@ -379,7 +379,7 @@
 
          maxTime - Maximum amount of time in ms that is allowed to pass
                    since a document was added before automatically
-                   triggering a new commit. 
+                   triggering a new commit.
          openSearcher - if false, the commit causes recent index changes
            to be flushed to stable storage, but does not cause a new
            searcher to be opened to make those changes visible.
@@ -389,7 +389,7 @@
       -->
      <autoCommit>
        <maxTime>60000</maxTime>
-       <openSearcher>false</openSearcher> 
+       <openSearcher>false</openSearcher>
      </autoCommit>
 
     <!-- softAutoCommit is like autoCommit except it causes a
@@ -398,14 +398,14 @@
          faster and more near-realtime friendly than a hard commit.
       -->
       <!--  Commenting out because neither hard commit nor logging seem included in original Vitro -->
-      <!-- 
+      <!--
 
-     <autoSoftCommit> 
-       <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime> 
+     <autoSoftCommit>
+       <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
      </autoSoftCommit>
  -->
     <!-- Update Related Event Listeners
-         
+
          Various IndexWriter related events can trigger Listeners to
          take actions.
 
@@ -414,10 +414,10 @@
       -->
     <!-- The RunExecutableListener executes an external command from a
          hook such as postCommit or postOptimize.
-         
+
          exe - the name of the executable to run
          dir - dir to use as the current working directory. (default=".")
-         wait - the calling thread waits until the executable returns. 
+         wait - the calling thread waits until the executable returns.
                 (default="true")
          args - the arguments to pass to the program.  (default is none)
          env - environment variables to set.  (default is none)
@@ -437,7 +437,7 @@
       -->
 
   </updateHandler>
-  
+
   <!-- IndexReaderFactory
 
        Use the following format to specify a custom IndexReaderFactory,
@@ -469,7 +469,7 @@
        be specified.
     -->
   <!--
-     <indexReaderFactory name="IndexReaderFactory" 
+     <indexReaderFactory name="IndexReaderFactory"
                          class="solr.StandardIndexReaderFactory">
        <int name="setTermIndexDivisor">12</int>
      </indexReaderFactory >
@@ -485,12 +485,12 @@
          is thrown if exceeded.
 
          ** WARNING **
-         
+
          This option actually modifies a global Lucene property that
          will affect all SolrCores.  If multiple solrconfig.xml files
          disagree on this property, the value at any given moment will
          be based on the last SolrCore to be initialized.
-         
+
       -->
     <maxBooleanClauses>50000</maxBooleanClauses>
 
@@ -499,7 +499,7 @@
 
          There are two implementations of cache available for Solr,
          LRUCache, based on a synchronized LinkedHashMap, and
-         FastLRUCache, based on a ConcurrentHashMap.  
+         FastLRUCache, based on a ConcurrentHashMap.
 
          FastLRUCache has faster gets and slower puts in single
          threaded operation and thus is generally faster than LRUCache
@@ -524,7 +524,7 @@
            initialSize - the initial capacity (number of entries) of
                the cache.  (see java.util.HashMap)
            autowarmCount - the number of entries to prepopulate from
-               and old cache.  
+               and old cache.
       -->
     <filterCache class="solr.FastLRUCache"
                  size="512"
@@ -532,27 +532,27 @@
                  autowarmCount="0"/>
 
     <!-- Query Result Cache
-         
+
          Caches results of searches - ordered lists of document ids
-         (DocList) based on a query, a sort, and the range of documents requested.  
+         (DocList) based on a query, a sort, and the range of documents requested.
       -->
     <queryResultCache class="solr.LRUCache"
                      size="512"
                      initialSize="512"
                      autowarmCount="0"/>
-   
+
     <!-- Document Cache
 
          Caches Lucene Document objects (the stored fields for each
          document).  Since Lucene internal document ids are transient,
-         this cache will not be autowarmed.  
+         this cache will not be autowarmed.
       -->
     <documentCache class="solr.LRUCache"
                    size="512"
                    initialSize="512"
                    autowarmCount="0"/>
-    
-    <!-- custom cache currently used by block join --> 
+
+    <!-- custom cache currently used by block join -->
     <cache name="perSegFilter"
       class="solr.search.LRUCache"
       size="10"
@@ -561,7 +561,7 @@
       regenerator="solr.NoOpRegenerator" />
 
     <!-- Field Value Cache
-         
+
          Cache used to hold field values that are quickly accessible
          by document id.  The fieldValueCache is created by default
          even if not configured here.
@@ -579,8 +579,8 @@
          name through SolrIndexSearcher.getCache(),cacheLookup(), and
          cacheInsert().  The purpose is to enable easy caching of
          user/application level data.  The regenerator argument should
-         be specified as an implementation of solr.CacheRegenerator 
-         if autowarming is desired.  
+         be specified as an implementation of solr.CacheRegenerator
+         if autowarming is desired.
       -->
     <!--
        <cache name="myUserCache"
@@ -627,12 +627,12 @@
         are collected.  For example, if a search for a particular query
         requests matching documents 10 through 19, and queryWindowSize is 50,
         then documents 0 through 49 will be collected and cached.  Any further
-        requests in that range can be satisfied via the cache.  
+        requests in that range can be satisfied via the cache.
      -->
    <queryResultWindowSize>20</queryResultWindowSize>
 
    <!-- Maximum number of documents to cache for any entry in the
-        queryResultCache. 
+        queryResultCache.
      -->
    <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
 
@@ -650,10 +650,10 @@
         prepared but there is no current registered searcher to handle
         requests or to gain autowarming data from.
 
-        
+
      -->
     <!-- QuerySenderListener takes an array of NamedList and executes a
-         local query request for each NamedList in sequence. 
+         local query request for each NamedList in sequence.
       -->
     <listener event="newSearcher" class="solr.QuerySenderListener">
       <arr name="queries">
@@ -681,7 +681,7 @@
     <useColdSearcher>false</useColdSearcher>
 
     <!-- Max Warming Searchers
-         
+
          Maximum number of searchers that may be warming in the
          background concurrently.  An error is returned if this limit
          is exceeded.
@@ -703,7 +703,7 @@
        such as /select?qt=XXX
 
        handleSelect="true" will cause the SolrDispatchFilter to process
-       the request and dispatch the query to a handler specified by the 
+       the request and dispatch the query to a handler specified by the
        "qt" param, assuming "/select" isn't already registered.
 
        handleSelect="false" will cause the SolrDispatchFilter to
@@ -726,26 +726,26 @@
 
          multipartUploadLimitInKB - specifies the max size (in KiB) of
          Multipart File Uploads that Solr will allow in a Request.
-         
+
          formdataUploadLimitInKB - specifies the max size (in KiB) of
          form data (application/x-www-form-urlencoded) sent via
          POST. You can use POST to pass request parameters not
          fitting into the URL.
-         
+
          addHttpRequestToContext - if set to true, it will instruct
          the requestParsers to include the original HttpServletRequest
-         object in the context map of the SolrQueryRequest under the 
+         object in the context map of the SolrQueryRequest under the
          key "httpRequest". It will not be used by any of the existing
-         Solr components, but may be useful when developing custom 
+         Solr components, but may be useful when developing custom
          plugins.
-         
+
          *** WARNING ***
          The settings below authorize Solr to fetch remote files, You
          should make sure your system has some authentication before
          using enableRemoteStreaming="true"
 
-      --> 
-    <requestParsers enableRemoteStreaming="true" 
+      -->
+    <requestParsers enableRemoteStreaming="true"
                     multipartUploadLimitInKB="2048000"
                     formdataUploadLimitInKB="2048"
                     addHttpRequestToContext="false"/>
@@ -761,21 +761,21 @@
     <!-- If you include a <cacheControl> directive, it will be used to
          generate a Cache-Control header (as well as an Expires header
          if the value contains "max-age=")
-         
+
          By default, no Cache-Control header is generated.
-         
+
          You can use the <cacheControl> option even if you have set
          never304="true"
       -->
     <!--
        <httpCaching never304="true" >
-         <cacheControl>max-age=30, public</cacheControl> 
+         <cacheControl>max-age=30, public</cacheControl>
        </httpCaching>
       -->
     <!-- To enable Solr to respond with automatically generated HTTP
          Caching headers, and to response to Cache Validation requests
          correctly, set the value of never304="false"
-         
+
          This will cause Solr to generate Last-Modified and ETag
          headers based on the properties of the Index.
 
@@ -800,12 +800,12 @@
     <!--
        <httpCaching lastModifiedFrom="openTime"
                     etagSeed="Solr">
-         <cacheControl>max-age=30, public</cacheControl> 
+         <cacheControl>max-age=30, public</cacheControl>
        </httpCaching>
       -->
   </requestDispatcher>
 
-  <!-- Request Handlers 
+  <!-- Request Handlers
 
        http://wiki.apache.org/solr/SolrRequestHandler
 
@@ -947,9 +947,9 @@
      </lst>
   </requestHandler>
 
- 
-  <!-- A Robust Example 
-       
+
+  <!-- A Robust Example
+
        This example SearchHandler declaration shows off usage of the
        SearchHandler with many defaults declared
 
@@ -970,8 +970,8 @@
        <!-- Query settings -->
        <!--  commented out in original vitro file -->
       <!--   <str name="defType">edismax</str> -->
-      
-       
+
+
        <str name="qf">
           text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
           title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0
@@ -981,7 +981,7 @@
        <str name="q.alt">*:*</str>
        <str name="rows">10</str>
        <str name="fl">*,score</str>
-		
+
        <str name="mlt.qf">
          text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4
          title^10.0 description^5.0 keywords^5.0 author^2.0 resourcename^1.0
@@ -1032,14 +1032,14 @@
 
        <!-- Spell checking defaults -->
        <str name="spellcheck">on</str>
-       <str name="spellcheck.extendedResults">false</str>       
+       <str name="spellcheck.extendedResults">false</str>
        <str name="spellcheck.count">5</str>
        <str name="spellcheck.alternativeTermCount">2</str>
-       <str name="spellcheck.maxResultsForSuggest">5</str>       
+       <str name="spellcheck.maxResultsForSuggest">5</str>
        <str name="spellcheck.collate">true</str>
-       <str name="spellcheck.collateExtendedResults">true</str>  
+       <str name="spellcheck.collateExtendedResults">true</str>
        <str name="spellcheck.maxCollationTries">5</str>
-       <str name="spellcheck.maxCollations">3</str>           
+       <str name="spellcheck.maxCollations">3</str>
      </lst>
 
      <!-- append spellchecking to our list of components -->
@@ -1049,8 +1049,8 @@
   </requestHandler>
 
 
-  <!-- Update Request Handler.  
-       
+  <!-- Update Request Handler.
+
        http://wiki.apache.org/solr/UpdateXmlMessages
 
        The canonical Request Handler for Modifying the Index through
@@ -1059,17 +1059,17 @@
        Note: Since solr1.1 requestHandlers requires a valid content
        type header if posted in the body. For example, curl now
        requires: -H 'Content-type:text/xml; charset=utf-8'
-       
-       To override the request content type and force a specific 
-       Content-type, use the request parameter: 
+
+       To override the request content type and force a specific
+       Content-type, use the request parameter:
          ?update.contentType=text/csv
-       
+
        This handler will pick a response format to match the input
        if the 'wt' parameter is not explicit
     -->
   <requestHandler name="/update" class="solr.UpdateRequestHandler">
-    <!-- See below for information on defining 
-         updateRequestProcessorChains that can be used by name 
+    <!-- See below for information on defining
+         updateRequestProcessorChains that can be used by name
          on each Update Request
       -->
       <lst name="defaults">
@@ -1082,7 +1082,7 @@
        -->
   </requestHandler>
 
-  <!-- for back compat with clients using /update/json and /update/csv -->  
+  <!-- for back compat with clients using /update/json and /update/csv -->
   <requestHandler name="/update/json" class="solr.UpdateRequestHandler" startup="lazy">
         <lst name="defaults">
          <str name="stream.contentType">application/json</str>
@@ -1098,14 +1098,14 @@
  <!-- Binary Update Request Handler
        http://wiki.apache.org/solr/javabin
     -->
-  <!--  requestHandler name="/update/javabin" 
+  <!--  requestHandler name="/update/javabin"
                   class="solr.BinaryUpdateRequestHandler" /-->
   <!-- Solr Cell Update Request Handler
 
-       http://wiki.apache.org/solr/ExtractingRequestHandler 
+       http://wiki.apache.org/solr/ExtractingRequestHandler
 
     -->
-  <requestHandler name="/update/extract" 
+  <requestHandler name="/update/extract"
                   startup="lazy"
                   class="solr.extraction.ExtractingRequestHandler" >
     <lst name="defaults">
@@ -1121,7 +1121,7 @@
       <str name="fmap.a">links</str>
       <str name="fmap.div">ignored_</str>
     </lst>
-   
+
   </requestHandler>
 
 
@@ -1143,7 +1143,7 @@
            field value analysis will be marked as "matched" for every
            token that is produces by the query analysis
    -->
-  <requestHandler name="/analysis/field" 
+  <requestHandler name="/analysis/field"
                   startup="lazy"
                   class="solr.FieldAnalysisRequestHandler" />
 
@@ -1176,18 +1176,18 @@
     request parameter that holds the query text to be analyzed. It
     also supports the "analysis.showmatch" parameter which when set to
     true, all field tokens that match the query tokens will be marked
-    as a "match". 
+    as a "match".
   -->
-  <requestHandler name="/analysis/document" 
-                  class="solr.DocumentAnalysisRequestHandler" 
+  <requestHandler name="/analysis/document"
+                  class="solr.DocumentAnalysisRequestHandler"
                   startup="lazy" />
 
   <!-- Admin Handlers
 
        Admin Handlers - This will register all the standard admin
-       RequestHandlers.  
+       RequestHandlers.
     -->
-  <requestHandler name="/admin/" 
+  <requestHandler name="/admin/"
                   class="solr.admin.AdminHandlers" />
   <!-- This single handler is equivalent to the following... -->
   <!--
@@ -1199,17 +1199,17 @@
      <requestHandler name="/admin/file"       class="solr.admin.ShowFileRequestHandler" >
     -->
   <!-- If you wish to hide files under ${solr.home}/conf, explicitly
-       register the ShowFileRequestHandler using the definition below. 
+       register the ShowFileRequestHandler using the definition below.
        NOTE: The glob pattern ('*') is the only pattern supported at present, *.xml will
              not exclude all files ending in '.xml'. Use it to exclude _all_ updates
     -->
   <!--
-     <requestHandler name="/admin/file" 
+     <requestHandler name="/admin/file"
                      class="solr.admin.ShowFileRequestHandler" >
        <lst name="invariants">
-         <str name="hidden">synonyms.txt</str> 
-         <str name="hidden">anotherfile.txt</str> 
-         <str name="hidden">*</str> 
+         <str name="hidden">synonyms.txt</str>
+         <str name="hidden">anotherfile.txt</str>
+         <str name="hidden">*</str>
        </lst>
      </requestHandler>
     -->
@@ -1222,10 +1222,10 @@
     <lst name="defaults">
       <str name="echoParams">all</str>
     </lst>
-    <!-- An optional feature of the PingRequestHandler is to configure the 
-         handler with a "healthcheckFile" which can be used to enable/disable 
+    <!-- An optional feature of the PingRequestHandler is to configure the
+         handler with a "healthcheckFile" which can be used to enable/disable
          the PingRequestHandler.
-         relative paths are resolved against the data dir 
+         relative paths are resolved against the data dir
       -->
     <!-- <str name="healthcheckFile">server-enabled.txt</str> -->
   </requestHandler>
@@ -1233,29 +1233,29 @@
   <!-- Echo the request contents back to the client -->
   <requestHandler name="/debug/dump" class="solr.DumpRequestHandler" >
     <lst name="defaults">
-     <str name="echoParams">explicit</str> 
+     <str name="echoParams">explicit</str>
      <str name="echoHandler">true</str>
     </lst>
   </requestHandler>
-  
+
   <!-- Solr Replication
 
        The SolrReplicationHandler supports replicating indexes from a
        "master" used for indexing and "slaves" used for queries.
 
-       http://wiki.apache.org/solr/SolrReplication 
+       http://wiki.apache.org/solr/SolrReplication
 
        It is also necessary for SolrCloud to function (in Cloud mode, the
-       replication handler is used to bulk transfer segments when nodes 
+       replication handler is used to bulk transfer segments when nodes
        are added or need to recover).
 
        https://wiki.apache.org/solr/SolrCloud/
     -->
-  <requestHandler name="/replication" class="solr.ReplicationHandler" > 
+  <requestHandler name="/replication" class="solr.ReplicationHandler" >
     <!--
-       To enable simple master/slave replication, uncomment one of the 
+       To enable simple master/slave replication, uncomment one of the
        sections below, depending on whether this solr instance should be
-       the "master" or a "slave".  If this instance is a "slave" you will 
+       the "master" or a "slave".  If this instance is a "slave" you will
        also need to fill in the masterUrl to point to a real machine.
     -->
     <!--
@@ -1275,18 +1275,18 @@
 
   <!-- Search Components
 
-       Search components are registered to SolrCore and used by 
+       Search components are registered to SolrCore and used by
        instances of SearchHandler (which can access them by name)
-       
+
        By default, the following components are available:
-       
+
        <searchComponent name="query"     class="solr.QueryComponent" />
        <searchComponent name="facet"     class="solr.FacetComponent" />
        <searchComponent name="mlt"       class="solr.MoreLikeThisComponent" />
        <searchComponent name="highlight" class="solr.HighlightComponent" />
        <searchComponent name="stats"     class="solr.StatsComponent" />
        <searchComponent name="debug"     class="solr.DebugComponent" />
-   
+
        Default configuration in a requestHandler would look like:
 
        <arr name="components">
@@ -1298,28 +1298,28 @@
          <str>debug</str>
        </arr>
 
-       If you register a searchComponent to one of the standard names, 
+       If you register a searchComponent to one of the standard names,
        that will be used instead of the default.
 
        To insert components before or after the 'standard' components, use:
-    
+
        <arr name="first-components">
          <str>myFirstComponentName</str>
        </arr>
-    
+
        <arr name="last-components">
          <str>myLastComponentName</str>
        </arr>
 
        NOTE: The component registered with the name "debug" will
-       always be executed after the "last-components" 
-       
+       always be executed after the "last-components"
+
      -->
-  
+
    <!-- Spell Check
 
         The spell check component can return a list of alternative spelling
-        suggestions.  
+        suggestions.
 
         http://wiki.apache.org/solr/SpellCheckComponent
      -->
@@ -1327,7 +1327,7 @@
 	<!--  Vitro has this specified as textSpell but leaving as is here -->
    <!--  <str name="queryAnalyzerFieldType">text_general</str> -->
         <str name="queryAnalyzerFieldType">textSpell</str>
-    
+
 
     <!-- Multiple "Spell Checkers" can be declared and used by this
          component
@@ -1368,11 +1368,11 @@
       	<float name="thresholdTokenFrequency">.01</float>
       -->
     <!-- /lst-->
-    
+
     <!-- a spellchecker that can break or combine words.  See "/spell" handler below for usage -->
     <!-- lst name="spellchecker">
       <str name="name">wordbreak</str>
-      <str name="classname">solr.WordBreakSolrSpellChecker</str>      
+      <str name="classname">solr.WordBreakSolrSpellChecker</str>
       <str name="field">name</str>
       <str name="combineWords">true</str>
       <str name="breakWords">true</str>
@@ -1391,7 +1391,7 @@
        </lst>
      -->
 
-    <!-- a spellchecker that use an alternate comparator 
+    <!-- a spellchecker that use an alternate comparator
 
          comparatorClass be one of:
           1. score (default)
@@ -1417,8 +1417,8 @@
        </lst>
       -->
   </searchComponent>
-  
-  <!-- A request handler for demonstrating the spellcheck component.  
+
+  <!-- A request handler for demonstrating the spellcheck component.
 
        NOTE: This is purely as an example.  The whole purpose of the
        SpellCheckComponent is to hook it into the request handler that
@@ -1427,7 +1427,7 @@
 
        IN OTHER WORDS, THERE IS REALLY GOOD CHANCE THE SETUP BELOW IS
        NOT WHAT YOU WANT FOR YOUR PRODUCTION SYSTEM!
-       
+
        See http://wiki.apache.org/solr/SpellCheckComponent for details
        on the request parameters.
     -->
@@ -1441,14 +1441,14 @@
       <str name="spellcheck.dictionary">default</str>
       <str name="spellcheck.dictionary">wordbreak</str>
       <str name="spellcheck">on</str>
-      <str name="spellcheck.extendedResults">true</str>       
+      <str name="spellcheck.extendedResults">true</str>
       <str name="spellcheck.count">10</str>
       <str name="spellcheck.alternativeTermCount">5</str>
-      <str name="spellcheck.maxResultsForSuggest">5</str>       
+      <str name="spellcheck.maxResultsForSuggest">5</str>
       <str name="spellcheck.collate">true</str>
-      <str name="spellcheck.collateExtendedResults">true</str>  
+      <str name="spellcheck.collateExtendedResults">true</str>
       <str name="spellcheck.maxCollationTries">10</str>
-      <str name="spellcheck.maxCollations">5</str>         
+      <str name="spellcheck.maxCollations">5</str>
     </lst>
     <arr name="last-components">
       <str>spellcheck</str>
@@ -1460,7 +1460,7 @@
   	<lst name="suggester">
       <str name="name">mySuggester</str>
       <str name="lookupImpl">FuzzyLookupFactory</str>      <!-- org.apache.solr.spelling.suggest.fst -->
-      <str name="dictionaryImpl">DocumentDictionaryFactory</str>     <!-- org.apache.solr.spelling.suggest.HighFrequencyDictionaryFactory --> 
+      <str name="dictionaryImpl">DocumentDictionaryFactory</str>     <!-- org.apache.solr.spelling.suggest.HighFrequencyDictionaryFactory -->
       <str name="field">cat</str>
       <str name="weightField">price</str>
       <str name="suggestAnalyzerFieldType">string</str>
@@ -1486,8 +1486,8 @@
 
        This is purely as an example.
 
-       In reality you will likely want to add the component to your 
-       already specified request handlers. 
+       In reality you will likely want to add the component to your
+       already specified request handlers.
     -->
   <requestHandler name="/tvrh" class="solr.SearchHandler" startup="lazy">
     <lst name="defaults">
@@ -1529,11 +1529,11 @@
         -->
       <str name="carrot.algorithm">org.carrot2.clustering.lingo.LingoClusteringAlgorithm</str>
 
-      <!-- Override location of the clustering algorithm's resources 
+      <!-- Override location of the clustering algorithm's resources
            (attribute definitions and lexical resources).
 
            A directory from which to load algorithm-specific stop words,
-           stop labels and attribute definition XMLs. 
+           stop labels and attribute definition XMLs.
 
            For an overview of Carrot2 lexical resources, see:
            http://download.carrot2.org/head/manual/#chapter.lexical-resources
@@ -1561,8 +1561,8 @@
 
        This is purely as an example.
 
-       In reality you will likely want to add the component to your 
-       already specified request handlers. 
+       In reality you will likely want to add the component to your
+       already specified request handlers.
     -->
   <requestHandler name="/clustering"
                   startup="lazy"
@@ -1597,7 +1597,7 @@
       <str>clustering</str>
     </arr>
   </requestHandler>
-  
+
   <!-- Terms Component
 
        http://wiki.apache.org/solr/TermsComponent
@@ -1612,7 +1612,7 @@
      <lst name="defaults">
       <bool name="terms">true</bool>
       <bool name="distrib">false</bool>
-    </lst>     
+    </lst>
     <arr name="components">
       <str>terms</str>
     </arr>
@@ -1652,7 +1652,7 @@
     <highlighting>
       <!-- Configure the standard fragmenter -->
       <!-- This could most likely be commented out in the "default" case -->
-      <fragmenter name="gap" 
+      <fragmenter name="gap"
                   default="true"
                   class="solr.highlight.GapFragmenter">
         <lst name="defaults">
@@ -1660,10 +1660,10 @@
         </lst>
       </fragmenter>
 
-      <!-- A regular-expression-based fragmenter 
-           (for sentence extraction) 
+      <!-- A regular-expression-based fragmenter
+           (for sentence extraction)
         -->
-      <fragmenter name="regex" 
+      <fragmenter name="regex"
                   class="solr.highlight.RegexFragmenter">
         <lst name="defaults">
           <!-- slightly smaller fragsizes work better because of slop -->
@@ -1676,7 +1676,7 @@
       </fragmenter>
 
       <!-- Configure the standard formatter -->
-      <formatter name="html" 
+      <formatter name="html"
                  default="true"
                  class="solr.highlight.HtmlFormatter">
         <lst name="defaults">
@@ -1686,27 +1686,27 @@
       </formatter>
 
       <!-- Configure the standard encoder -->
-      <encoder name="html" 
+      <encoder name="html"
                class="solr.highlight.HtmlEncoder" />
 
       <!-- Configure the standard fragListBuilder -->
-      <fragListBuilder name="simple" 
+      <fragListBuilder name="simple"
                        class="solr.highlight.SimpleFragListBuilder"/>
-      
+
       <!-- Configure the single fragListBuilder -->
-      <fragListBuilder name="single" 
+      <fragListBuilder name="single"
                        class="solr.highlight.SingleFragListBuilder"/>
-      
+
       <!-- Configure the weighted fragListBuilder -->
-      <fragListBuilder name="weighted" 
+      <fragListBuilder name="weighted"
                        default="true"
                        class="solr.highlight.WeightedFragListBuilder"/>
-      
+
       <!-- default tag FragmentsBuilder -->
-      <fragmentsBuilder name="default" 
+      <fragmentsBuilder name="default"
                         default="true"
                         class="solr.highlight.ScoreOrderFragmentsBuilder">
-        <!-- 
+        <!--
         <lst name="defaults">
           <str name="hl.multiValuedSeparatorChar">/</str>
         </lst>
@@ -1714,7 +1714,7 @@
       </fragmentsBuilder>
 
       <!-- multi-colored tag FragmentsBuilder -->
-      <fragmentsBuilder name="colored" 
+      <fragmentsBuilder name="colored"
                         class="solr.highlight.ScoreOrderFragmentsBuilder">
         <lst name="defaults">
           <str name="hl.tag.pre"><![CDATA[
@@ -1726,8 +1726,8 @@
           <str name="hl.tag.post"><![CDATA[</b>]]></str>
         </lst>
       </fragmentsBuilder>
-      
-      <boundaryScanner name="default" 
+
+      <boundaryScanner name="default"
                        default="true"
                        class="solr.highlight.SimpleBoundaryScanner">
         <lst name="defaults">
@@ -1735,8 +1735,8 @@
           <str name="hl.bs.chars">.,!? &#9;&#10;&#13;</str>
         </lst>
       </boundaryScanner>
-      
-      <boundaryScanner name="breakIterator" 
+
+      <boundaryScanner name="breakIterator"
                        class="solr.highlight.BreakIteratorBoundaryScanner">
         <lst name="defaults">
           <!-- type should be one of CHARACTER, WORD(default), LINE and SENTENCE -->
@@ -1758,15 +1758,15 @@
 
        http://wiki.apache.org/solr/UpdateRequestProcessor
 
-    --> 
+    -->
   <!-- Deduplication
 
        An example dedup update processor that creates the "id" field
        on the fly based on the hash code of some other fields.  This
        example has overwriteDupes set to false since we are using the
        id field as the signatureField and Solr will maintain
-       uniqueness based on that anyway.  
-       
+       uniqueness based on that anyway.
+
     -->
   <!--
      <updateRequestProcessorChain name="dedupe">
@@ -1781,7 +1781,7 @@
        <processor class="solr.RunUpdateProcessorFactory" />
      </updateRequestProcessorChain>
     -->
-  
+
   <!-- Language identification
 
        This example update chain identifies the language of the incoming
@@ -1822,12 +1822,12 @@
     </updateRequestProcessorChain>
   -->
  <!--  From original Vitro file -->
- 
+
   <!-- ETag generation
 
        Creates the "etag" field on the fly based on a hash of all other
-       fields.  
-       
+       fields.
+
     -->
      <updateRequestProcessorChain name="etag">
        <processor class="solr.processor.SignatureUpdateProcessorFactory">
@@ -1854,7 +1854,7 @@
        overridden...
     -->
   <!--
-     <queryResponseWriter name="xml" 
+     <queryResponseWriter name="xml"
                           default="true"
                           class="solr.XMLResponseWriter" />
      <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
@@ -1873,16 +1873,16 @@
      -->
     <str name="content-type">text/plain; charset=UTF-8</str>
   </queryResponseWriter>
-  
+
   <!--
      Custom response writers can be declared as needed...
     -->
     <queryResponseWriter name="velocity" class="solr.VelocityResponseWriter" startup="lazy"/>
-  
+
 
   <!-- XSLT response writer transforms the XML output by any xslt file found
        in Solr's conf/xslt directory.  Changes to xslt files are checked for
-       every xsltCacheLifetimeSeconds.  
+       every xsltCacheLifetimeSeconds.
     -->
   <queryResponseWriter name="xslt" class="solr.XSLTResponseWriter">
     <int name="xsltCacheLifetimeSeconds">5</int>
@@ -1910,11 +1910,11 @@
     -->
   <!-- example of registering a custom function parser  -->
   <!--
-     <valueSourceParser name="myfunc" 
+     <valueSourceParser name="myfunc"
                         class="com.mycompany.MyValueSourceParser" />
     -->
-    
-  
+
+
   <!-- Document Transformers
        http://wiki.apache.org/solr/DocTransformers
     -->
@@ -1923,12 +1923,12 @@
      <transformer name="db" class="com.mycompany.LoadFromDatabaseTransformer" >
        <int name="connection">jdbc://....</int>
      </transformer>
-     
+
      To add a constant value to all docs, use:
      <transformer name="mytrans2" class="org.apache.solr.response.transform.ValueAugmenterFactory" >
        <int name="value">5</int>
      </transformer>
-     
+
      If you want the user to still be able to change it with _value:something_ use this:
      <transformer name="mytrans3" class="org.apache.solr.response.transform.ValueAugmenterFactory" >
        <double name="defaultValue">5</double>
@@ -1938,7 +1938,7 @@
       EditorialMarkerFactory will do exactly that:
      <transformer name="qecBooster" class="org.apache.solr.response.transform.EditorialMarkerFactory" />
     -->
-    
+
 
   <!-- Legacy config for the admin interface -->
   <admin>
diff --git a/home/src/main/resources/solr/conf/stopwords-name.txt b/home/src/main/resources/solr/conf/stopwords-name.txt
index 8db699618..1cf159f6d 100644
--- a/home/src/main/resources/solr/conf/stopwords-name.txt
+++ b/home/src/main/resources/solr/conf/stopwords-name.txt
@@ -35,4 +35,4 @@ this
 to
 was
 will
-with
\ No newline at end of file
+with
diff --git a/home/src/main/resources/solr/conf/velocity/VM_global_library.vm b/home/src/main/resources/solr/conf/velocity/VM_global_library.vm
index 5dda07c4e..5d4e08a78 100644
--- a/home/src/main/resources/solr/conf/velocity/VM_global_library.vm
+++ b/home/src/main/resources/solr/conf/velocity/VM_global_library.vm
@@ -19,7 +19,7 @@
 
 #macro(debug)#if($request.params.get('debugQuery'))&debugQuery=true#end#end
 
-#macro(boostPrice)#if($request.params.get('bf') == 'price')&bf=price#end#end        
+#macro(boostPrice)#if($request.params.get('bf') == 'price')&bf=price#end#end
 
 #macro(annotate)#if($request.params.get('annotateBrowse'))&annotateBrowse=true#end#end
 
@@ -35,7 +35,7 @@
 
 #macro(lensNoQ)?#if($request.params.getParams('fq') and $list.size($request.params.getParams('fq')) > 0)&#fqs($request.params.getParams('fq'))#end#sort($request.params.getParams('sort'))#debug#boostPrice#annotate#spatial#qOpts#group#end
 #macro(lens)#lensNoQ#q#end
-        
+
 
 #macro(url_for_lens)#{url_for_home}#lens#end
 
@@ -91,7 +91,7 @@
       #end
     #end
     </ul>
-  #end      
+  #end
 #end
 
 
@@ -150,7 +150,7 @@ $pad$v##
 $v##
     #end
   #end
-#end  
+#end
 
 #macro(utc_date $theDate)
 $date.format("yyyy-MM-dd'T'HH:mm:ss'Z'",$theDate,$date.getLocale(),$date.getTimeZone().getTimeZone("UTC"))##
diff --git a/home/src/main/resources/solr/conf/velocity/jquery.autocomplete.css b/home/src/main/resources/solr/conf/velocity/jquery.autocomplete.css
index 91b622833..416cde1ba 100644
--- a/home/src/main/resources/solr/conf/velocity/jquery.autocomplete.css
+++ b/home/src/main/resources/solr/conf/velocity/jquery.autocomplete.css
@@ -19,15 +19,15 @@
 	padding: 2px 5px;
 	cursor: default;
 	display: block;
-	/* 
-	if width will be 100% horizontal scrollbar will apear 
+	/*
+	if width will be 100% horizontal scrollbar will apear
 	when scroll mode will be used
 	*/
 	/*width: 100%;*/
 	font: menu;
 	font-size: 12px;
-	/* 
-	it is very important, if line-height not setted or setted 
+	/*
+	it is very important, if line-height not setted or setted
 	in relative units scroll will be broken in firefox
 	*/
 	line-height: 16px;
diff --git a/home/src/main/resources/solr/conf/velocity/jquery.autocomplete.js b/home/src/main/resources/solr/conf/velocity/jquery.autocomplete.js
index a377b4057..98ad796b1 100644
--- a/home/src/main/resources/solr/conf/velocity/jquery.autocomplete.js
+++ b/home/src/main/resources/solr/conf/velocity/jquery.autocomplete.js
@@ -12,7 +12,7 @@
  */
 
 ;(function($) {
-	
+
 $.fn.extend({
 	autocomplete: function(urlOrData, options) {
 		var isUrl = typeof urlOrData == "string";
@@ -22,13 +22,13 @@ $.fn.extend({
 			delay: isUrl ? $.Autocompleter.defaults.delay : 10,
 			max: options && !options.scroll ? 10 : 150
 		}, options);
-		
+
 		// if highlight is set to false, replace it with a do-nothing function
 		options.highlight = options.highlight || function(value) { return value; };
-		
+
 		// if the formatMatch option is not specified, then use formatItem for backwards compatibility
 		options.formatMatch = options.formatMatch || options.formatItem;
-		
+
 		return this.each(function() {
 			new $.Autocompleter(this, options);
 		});
@@ -77,9 +77,9 @@ $.Autocompleter = function(input, options) {
 		mouseDownOnSelect: false
 	};
 	var select = $.Autocompleter.Select(options, input, selectCurrent, config);
-	
+
 	var blockSubmit;
-	
+
 	// prevent form submit in opera when selecting with return key
 	$.browser.opera && $(input.form).bind("submit.autocomplete", function() {
 		if (blockSubmit) {
@@ -87,13 +87,13 @@ $.Autocompleter = function(input, options) {
 			return false;
 		}
 	});
-	
+
 	// only opera doesn't trigger keydown multiple times while pressed, others don't work with keypress at all
 	$input.bind(($.browser.opera ? "keypress" : "keydown") + ".autocomplete", function(event) {
 		// track last key pressed
 		lastKeyPressCode = event.keyCode;
 		switch(event.keyCode) {
-		
+
 			case KEY.UP:
 				event.preventDefault();
 				if ( select.visible() ) {
@@ -102,7 +102,7 @@ $.Autocompleter = function(input, options) {
 					onChange(0, true);
 				}
 				break;
-				
+
 			case KEY.DOWN:
 				event.preventDefault();
 				if ( select.visible() ) {
@@ -111,7 +111,7 @@ $.Autocompleter = function(input, options) {
 					onChange(0, true);
 				}
 				break;
-				
+
 			case KEY.PAGEUP:
 				event.preventDefault();
 				if ( select.visible() ) {
@@ -120,7 +120,7 @@ $.Autocompleter = function(input, options) {
 					onChange(0, true);
 				}
 				break;
-				
+
 			case KEY.PAGEDOWN:
 				event.preventDefault();
 				if ( select.visible() ) {
@@ -129,7 +129,7 @@ $.Autocompleter = function(input, options) {
 					onChange(0, true);
 				}
 				break;
-			
+
 			// matches also semicolon
 			case options.multiple && $.trim(options.multipleSeparator) == "," && KEY.COMMA:
 			case KEY.TAB:
@@ -141,11 +141,11 @@ $.Autocompleter = function(input, options) {
 					return false;
 				}
 				break;
-				
+
 			case KEY.ESC:
 				select.hide();
 				break;
-				
+
 			default:
 				clearTimeout(timeout);
 				timeout = setTimeout(onChange, options.delay);
@@ -196,16 +196,16 @@ $.Autocompleter = function(input, options) {
 		$input.unbind();
 		$(input.form).unbind(".autocomplete");
 	});
-	
-	
+
+
 	function selectCurrent() {
 		var selected = select.selected();
 		if( !selected )
 			return false;
-		
+
 		var v = selected.result;
 		previousValue = v;
-		
+
 		if ( options.multiple ) {
 			var words = trimWords($input.val());
 			if ( words.length > 1 ) {
@@ -213,26 +213,26 @@ $.Autocompleter = function(input, options) {
 			}
 			v += options.multipleSeparator;
 		}
-		
+
 		$input.val(v);
 		hideResultsNow();
 		$input.trigger("result", [selected.data, selected.value]);
 		return true;
 	}
-	
+
 	function onChange(crap, skipPrevCheck) {
 		if( lastKeyPressCode == KEY.DEL ) {
 			select.hide();
 			return;
 		}
-		
+
 		var currentValue = $input.val();
-		
+
 		if ( !skipPrevCheck && currentValue == previousValue )
 			return;
-		
+
 		previousValue = currentValue;
-		
+
 		currentValue = lastWord(currentValue);
 		if ( currentValue.length >= options.minChars) {
 			$input.addClass(options.loadingClass);
@@ -244,7 +244,7 @@ $.Autocompleter = function(input, options) {
 			select.hide();
 		}
 	};
-	
+
 	function trimWords(value) {
 		if ( !value ) {
 			return [""];
@@ -257,14 +257,14 @@ $.Autocompleter = function(input, options) {
 		});
 		return result;
 	}
-	
+
 	function lastWord(value) {
 		if ( !options.multiple )
 			return value;
 		var words = trimWords(value);
 		return words[words.length - 1];
 	}
-	
+
 	// fills in the input box w/the first match (assumed to be the best match)
 	// q: the term entered
 	// sValue: the first matching result
@@ -325,20 +325,20 @@ $.Autocompleter = function(input, options) {
 		if (!options.matchCase)
 			term = term.toLowerCase();
 		var data = cache.load(term);
-		data = null; // Avoid buggy cache and go to Solr every time 
+		data = null; // Avoid buggy cache and go to Solr every time
 		// recieve the cached data
 		if (data && data.length) {
 			success(term, data);
 		// if an AJAX url has been supplied, try loading the data now
 		} else if( (typeof options.url == "string") && (options.url.length > 0) ){
-			
+
 			var extraParams = {
 				timestamp: +new Date()
 			};
 			$.each(options.extraParams, function(key, param) {
 				extraParams[key] = typeof param == "function" ? param() : param;
 			});
-			
+
 			$.ajax({
 				// try to leverage ajaxQueue plugin to abort previous requests
 				mode: "abort",
@@ -362,7 +362,7 @@ $.Autocompleter = function(input, options) {
 			failure(term);
 		}
 	};
-	
+
 	function parse(data) {
 		var parsed = [];
 		var rows = data.split("\n");
@@ -417,9 +417,9 @@ $.Autocompleter.Cache = function(options) {
 
 	var data = {};
 	var length = 0;
-	
+
 	function matchSubset(s, sub) {
-		if (!options.matchCase) 
+		if (!options.matchCase)
 			s = s.toLowerCase();
 		var i = s.indexOf(sub);
 		if (options.matchContains == "word"){
@@ -428,17 +428,17 @@ $.Autocompleter.Cache = function(options) {
 		if (i == -1) return false;
 		return i == 0 || options.matchContains;
 	};
-	
+
 	function add(q, value) {
 		if (length > options.cacheLength){
 			flush();
 		}
-		if (!data[q]){ 
+		if (!data[q]){
 			length++;
 		}
 		data[q] = value;
 	}
-	
+
 	function populate(){
 		if( !options.data ) return false;
 		// track the matches
@@ -447,23 +447,23 @@ $.Autocompleter.Cache = function(options) {
 
 		// no url was specified, we need to adjust the cache length to make sure it fits the local data store
 		if( !options.url ) options.cacheLength = 1;
-		
+
 		// track all options for minChars = 0
 		stMatchSets[""] = [];
-		
+
 		// loop through the array and create a lookup structure
 		for ( var i = 0, ol = options.data.length; i < ol; i++ ) {
 			var rawValue = options.data[i];
 			// if rawValue is a string, make an array otherwise just reference the array
 			rawValue = (typeof rawValue == "string") ? [rawValue] : rawValue;
-			
+
 			var value = options.formatMatch(rawValue, i+1, options.data.length);
 			if ( value === false )
 				continue;
-				
+
 			var firstChar = value.charAt(0).toLowerCase();
 			// if no lookup array for this character exists, look it up now
-			if( !stMatchSets[firstChar] ) 
+			if( !stMatchSets[firstChar] )
 				stMatchSets[firstChar] = [];
 
 			// if the match is a string
@@ -472,7 +472,7 @@ $.Autocompleter.Cache = function(options) {
 				data: rawValue,
 				result: options.formatResult && options.formatResult(rawValue) || value
 			};
-			
+
 			// push the current match into the set list
 			stMatchSets[firstChar].push(row);
 
@@ -490,15 +490,15 @@ $.Autocompleter.Cache = function(options) {
 			add(i, value);
 		});
 	}
-	
+
 	// populate any existing data
 	setTimeout(populate, 25);
-	
+
 	function flush(){
 		data = {};
 		length = 0;
 	}
-	
+
 	return {
 		flush: flush,
 		add: add,
@@ -506,7 +506,7 @@ $.Autocompleter.Cache = function(options) {
 		load: function(q) {
 			if (!options.cacheLength || !length)
 				return null;
-			/* 
+			/*
 			 * if dealing w/local data and matchContains than we must make sure
 			 * to loop through all the data collections looking for matches
 			 */
@@ -526,9 +526,9 @@ $.Autocompleter.Cache = function(options) {
 							}
 						});
 					}
-				}				
+				}
 				return csub;
-			} else 
+			} else
 			// if the exact item exists, use it
 			if (data[q]){
 				return data[q];
@@ -556,7 +556,7 @@ $.Autocompleter.Select = function (options, input, select, config) {
 	var CLASSES = {
 		ACTIVE: "ac_over"
 	};
-	
+
 	var listItems,
 		active = -1,
 		data,
@@ -564,7 +564,7 @@ $.Autocompleter.Select = function (options, input, select, config) {
 		needsInit = true,
 		element,
 		list;
-	
+
 	// Create results
 	function init() {
 		if (!needsInit)
@@ -574,11 +574,11 @@ $.Autocompleter.Select = function (options, input, select, config) {
 		.addClass(options.resultsClass)
 		.css("position", "absolute")
 		.appendTo(document.body);
-	
+
 		list = $("<ul/>").appendTo(element).mouseover( function(event) {
 			if(target(event).nodeName && target(event).nodeName.toUpperCase() == 'LI') {
 	            active = $("li", list).removeClass(CLASSES.ACTIVE).index(target(event));
-			    $(target(event)).addClass(CLASSES.ACTIVE);            
+			    $(target(event)).addClass(CLASSES.ACTIVE);
 	        }
 		}).click(function(event) {
 			$(target(event)).addClass(CLASSES.ACTIVE);
@@ -591,13 +591,13 @@ $.Autocompleter.Select = function (options, input, select, config) {
 		}).mouseup(function() {
 			config.mouseDownOnSelect = false;
 		});
-		
+
 		if( options.width > 0 )
 			element.css("width", options.width);
-			
+
 		needsInit = false;
-	} 
-	
+	}
+
 	function target(event) {
 		var element = event.target;
 		while(element && element.tagName != "LI")
@@ -624,7 +624,7 @@ $.Autocompleter.Select = function (options, input, select, config) {
             }
         }
 	};
-	
+
 	function movePosition(step) {
 		active += step;
 		if (active < 0) {
@@ -633,13 +633,13 @@ $.Autocompleter.Select = function (options, input, select, config) {
 			active = 0;
 		}
 	}
-	
+
 	function limitNumberOfItems(available) {
 		return options.max && options.max < available
 			? options.max
 			: available;
 	}
-	
+
 	function fillList() {
 		list.empty();
 		var max = limitNumberOfItems(data.length);
@@ -661,7 +661,7 @@ $.Autocompleter.Select = function (options, input, select, config) {
 		if ( $.fn.bgiframe )
 			list.bgiframe();
 	}
-	
+
 	return {
 		display: function(d, q) {
 			init();
@@ -713,7 +713,7 @@ $.Autocompleter.Select = function (options, input, select, config) {
 					maxHeight: options.scrollHeight,
 					overflow: 'auto'
 				});
-				
+
                 if($.browser.msie && typeof document.body.style.maxHeight === "undefined") {
 					var listHeight = 0;
 					listItems.each(function() {
@@ -726,7 +726,7 @@ $.Autocompleter.Select = function (options, input, select, config) {
 						listItems.width( list.width() - parseInt(listItems.css("padding-left")) - parseInt(listItems.css("padding-right")) );
 					}
                 }
-                
+
             }
 		},
 		selected: function() {
diff --git a/home/src/main/resources/solr/conf/velocity/main.css b/home/src/main/resources/solr/conf/velocity/main.css
index 0aed533e3..060a1f56f 100644
--- a/home/src/main/resources/solr/conf/velocity/main.css
+++ b/home/src/main/resources/solr/conf/velocity/main.css
@@ -1,6 +1,6 @@
 #admin{
   text-align: right;
-  vertical-align: top; 
+  vertical-align: top;
 }
 
 #head{
@@ -46,7 +46,7 @@ a {
   width: 185px;
   padding: 5px;
   top: -20px;
-  position: relative;  
+  position: relative;
 }
 
 .tabs-bar {
@@ -142,11 +142,11 @@ a {
 }
 
 .query-box {
-  
+
 }
 
 .query-boost {
-  
+
   top: 10px;
   left: 50px;
   position: relative;
@@ -156,7 +156,7 @@ a {
 .query-box .inputs{
   left: 180px;
   position: relative;
-  
+
 }
 
 #logo {
@@ -194,13 +194,13 @@ a {
 }
 
 .mlt{
-  
+
 }
 
 .map{
   float: right;
   position: relative;
-  top: -25px;  
+  top: -25px;
 }
 
 .result-document:nth-child(2n+1) {
diff --git a/home/src/main/resources/solr/conf/velocity/query_group.vm b/home/src/main/resources/solr/conf/velocity/query_group.vm
index 42e54573e..12bae06e8 100644
--- a/home/src/main/resources/solr/conf/velocity/query_group.vm
+++ b/home/src/main/resources/solr/conf/velocity/query_group.vm
@@ -34,7 +34,7 @@
         </option>
 
       </select>
-    </label>  
+    </label>
 
     <input type="hidden" name="group" value="true"/>
 
diff --git a/home/src/main/resources/solr/conf/velocity/query_spatial.vm b/home/src/main/resources/solr/conf/velocity/query_spatial.vm
index 2bc204493..436012613 100644
--- a/home/src/main/resources/solr/conf/velocity/query_spatial.vm
+++ b/home/src/main/resources/solr/conf/velocity/query_spatial.vm
@@ -53,7 +53,7 @@
 
     <input type="hidden" name="sfield" value="store"/>
     <input type="hidden" id="spatialFQ" name="fq" value=""/>
-    <input type="hidden" name="queryOpts" value="spatial"/>        
+    <input type="hidden" name="queryOpts" value="spatial"/>
 
   </div>
 
diff --git a/home/src/main/resources/solr/conf/velocity/richtext_doc.vm b/home/src/main/resources/solr/conf/velocity/richtext_doc.vm
index 9e8d6cb71..db6fca67b 100644
--- a/home/src/main/resources/solr/conf/velocity/richtext_doc.vm
+++ b/home/src/main/resources/solr/conf/velocity/richtext_doc.vm
@@ -77,7 +77,7 @@
 ## Resource Name
 <div>
   #if($doc.getFieldValue('resourcename'))
-    Resource name: $filename 
+    Resource name: $filename
   #elseif($url)
     URL: $url
   #end
diff --git a/home/src/main/resources/solr/conf/xslt/example.xsl b/home/src/main/resources/solr/conf/xslt/example.xsl
index b89927008..aa5465937 100644
--- a/home/src/main/resources/solr/conf/xslt/example.xsl
+++ b/home/src/main/resources/solr/conf/xslt/example.xsl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- 
+<!--
  * 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.
@@ -17,17 +17,17 @@
  * limitations under the License.
  -->
 
-<!-- 
+<!--
   Simple transform of Solr query results to HTML
  -->
 <xsl:stylesheet version='1.0'
     xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
 >
 
-  <xsl:output media-type="text/html" encoding="UTF-8"/> 
-  
+  <xsl:output media-type="text/html" encoding="UTF-8"/>
+
   <xsl:variable name="title" select="concat('Solr search results (',response/result/@numFound,' documents)')"/>
-  
+
   <xsl:template match='/'>
     <html>
       <head>
@@ -44,7 +44,7 @@
       </body>
     </html>
   </xsl:template>
-  
+
   <xsl:template match="doc">
     <xsl:variable name="pos" select="position()"/>
     <div class="doc">
@@ -110,7 +110,7 @@
   </xsl:template>
 
   <xsl:template match="*"/>
-  
+
   <xsl:template name="css">
     <script>
       function toggle(id) {
diff --git a/home/src/main/resources/solr/conf/xslt/example_atom.xsl b/home/src/main/resources/solr/conf/xslt/example_atom.xsl
index b6c23151d..86e775074 100644
--- a/home/src/main/resources/solr/conf/xslt/example_atom.xsl
+++ b/home/src/main/resources/solr/conf/xslt/example_atom.xsl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- 
+<!--
  * 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.
@@ -17,7 +17,7 @@
  * limitations under the License.
  -->
 
-<!-- 
+<!--
   Simple transform of Solr query results to Atom
  -->
 
@@ -42,7 +42,7 @@
         <name>Apache Solr</name>
         <email>solr-user@lucene.apache.org</email>
       </author>
-      <link rel="self" type="application/atom+xml" 
+      <link rel="self" type="application/atom+xml"
             href="http://localhost:8983/solr/q={$query}&amp;wt=xslt&amp;tr=atom.xsl"/>
       <updated>
         <xsl:value-of select="response/result/doc[position()=1]/date[@name='timestamp']"/>
@@ -51,7 +51,7 @@
       <xsl:apply-templates select="response/result/doc"/>
     </feed>
   </xsl:template>
-    
+
   <!-- search results xslt -->
   <xsl:template match="doc">
     <xsl:variable name="id" select="str[@name='id']"/>
diff --git a/home/src/main/resources/solr/conf/xslt/example_rss.xsl b/home/src/main/resources/solr/conf/xslt/example_rss.xsl
index 2857f1174..407e65a79 100644
--- a/home/src/main/resources/solr/conf/xslt/example_rss.xsl
+++ b/home/src/main/resources/solr/conf/xslt/example_rss.xsl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!-- 
+<!--
  * 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.
@@ -17,7 +17,7 @@
  * limitations under the License.
  -->
 
-<!-- 
+<!--
   Simple transform of Solr query results to RSS
  -->
 
@@ -44,7 +44,7 @@
        </channel>
     </rss>
   </xsl:template>
-  
+
   <!-- search results xslt -->
   <xsl:template match="doc">
     <xsl:variable name="id" select="str[@name='id']"/>
diff --git a/home/src/main/resources/solr/conf/xslt/luke.xsl b/home/src/main/resources/solr/conf/xslt/luke.xsl
index 8553f3c63..6e988afe5 100644
--- a/home/src/main/resources/solr/conf/xslt/luke.xsl
+++ b/home/src/main/resources/solr/conf/xslt/luke.xsl
@@ -6,9 +6,9 @@
     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.
@@ -17,7 +17,7 @@
 -->
 
 
-<!-- 
+<!--
   Display the luke request handler with graphs
  -->
 <xsl:stylesheet
@@ -190,7 +190,7 @@
                  <div class="histogram">
                   <xsl:attribute name="style">background-color: <xsl:value-of select="$fill"/>; width: <xsl:value-of select="$bar_width"/>px; height: <xsl:value-of select="($iheight*number(.)) div $max"/>px;</xsl:attribute>
                  </div>
-                   </td> 
+                   </td>
                 </xsl:for-each>
               </tr>
               <tr>
diff --git a/home/src/main/resources/solr/conf/xslt/updateXml.xsl b/home/src/main/resources/solr/conf/xslt/updateXml.xsl
index daf1344b0..f0794237e 100644
--- a/home/src/main/resources/solr/conf/xslt/updateXml.xsl
+++ b/home/src/main/resources/solr/conf/xslt/updateXml.xsl
@@ -1,4 +1,4 @@
-<!-- 
+<!--
  * 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.
@@ -30,7 +30,7 @@
         <xsl:apply-templates select="response/result/doc"/>
     </add>
   </xsl:template>
-  
+
   <!-- Ignore score (makes no sense to index) -->
   <xsl:template match="doc/*[@name='score']" priority="100">
   </xsl:template>
@@ -47,7 +47,7 @@
   <!-- Flatten arrays to duplicate field lines -->
   <xsl:template match="doc/arr" priority="100">
       <xsl:variable name="fn" select="@name"/>
-      
+
       <xsl:for-each select="*">
 		<xsl:element name="field">
 		    <xsl:attribute name="name"><xsl:value-of select="$fn"/></xsl:attribute>
diff --git a/home/src/main/resources/solr/solr.xml b/home/src/main/resources/solr/solr.xml
index 4d1a84e75..ce025f2ee 100644
--- a/home/src/main/resources/solr/solr.xml
+++ b/home/src/main/resources/solr/solr.xml
@@ -18,14 +18,14 @@
 
 <!--
  All (relative) paths are relative to the installation path
-  
+
   persistent: Save changes made via the API to this file
   sharedLib: path to a lib directory that will be shared across all cores
 -->
 <solr persistent="false">
 
   <!--
-  adminPath: RequestHandler path to manage cores.  
+  adminPath: RequestHandler path to manage cores.
     If 'null' (or absent), cores will not be manageable via request handler
   -->
   <cores adminPath="/admin/cores" defaultCoreName="collection1">
diff --git a/home/src/main/resources/solr/solr_newversion.xml b/home/src/main/resources/solr/solr_newversion.xml
index 94d60b6a2..d68cd6a97 100644
--- a/home/src/main/resources/solr/solr_newversion.xml
+++ b/home/src/main/resources/solr/solr_newversion.xml
@@ -17,11 +17,11 @@
 -->
 
 <!--
-   This is an example of a simple "solr.xml" file for configuring one or 
-   more Solr Cores, as well as allowing Cores to be added, removed, and 
+   This is an example of a simple "solr.xml" file for configuring one or
+   more Solr Cores, as well as allowing Cores to be added, removed, and
    reloaded via HTTP requests.
 
-   More information about options available in this configuration file, 
+   More information about options available in this configuration file,
    and Solr Core administration can be found online:
    http://wiki.apache.org/solr/CoreAdmin
 -->
diff --git a/installer/example-settings.xml b/installer/example-settings.xml
index 5bc02a8ee..39755cb7d 100644
--- a/installer/example-settings.xml
+++ b/installer/example-settings.xml
@@ -18,4 +18,4 @@
     <activeProfiles>
         <activeProfile>defaults</activeProfile>
     </activeProfiles>
-</settings>
\ No newline at end of file
+</settings>
diff --git a/installer/home/src/main/assembly/home.xml b/installer/home/src/main/assembly/home.xml
index 22d66472c..6de97e21d 100644
--- a/installer/home/src/main/assembly/home.xml
+++ b/installer/home/src/main/assembly/home.xml
@@ -19,4 +19,4 @@
             <filtered>true</filtered>
         </fileSet>
     </fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/installer/solr/src/main/webResources/META-INF/context.xml b/installer/solr/src/main/webResources/META-INF/context.xml
index 50ea873be..6e19758e6 100644
--- a/installer/solr/src/main/webResources/META-INF/context.xml
+++ b/installer/solr/src/main/webResources/META-INF/context.xml
@@ -1,7 +1,7 @@
 <Context crossContext="true" override="true">
    <Environment
-        type="java.lang.String" 
-        name="solr/home"  
+        type="java.lang.String"
+        name="solr/home"
         value="${vitro-dir}/solr" override="true"/>
 
    <!-- Disable persist sessions on shut down.-->
diff --git a/installer/webapp/src/main/webResources/META-INF/context.xml b/installer/webapp/src/main/webResources/META-INF/context.xml
index 7ada55878..1f41e94bf 100644
--- a/installer/webapp/src/main/webResources/META-INF/context.xml
+++ b/installer/webapp/src/main/webResources/META-INF/context.xml
@@ -1,6 +1,6 @@
 <Context> <!-- useHttpOnly="false" -->
    <Environment
-        type="java.lang.String" 
+        type="java.lang.String"
         name="vitro/home"
         value="${vitro-dir}" override="true"/>
 
diff --git a/installer/webapp/src/main/webapp/local/css/local.css b/installer/webapp/src/main/webapp/local/css/local.css
index 4a441c963..b12c01cc8 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/doc/css/doc.css b/legacy/doc/css/doc.css
index b3db0eefa..1743e568a 100644
--- a/legacy/doc/css/doc.css
+++ b/legacy/doc/css/doc.css
@@ -20,7 +20,7 @@ body{
     margin: 0;
     padding: 0;
     height: 100%; /* needed for container min-height */
-    font-family: 'Arimo', "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif; 
+    font-family: 'Arimo', "Lucida Sans Unicode","Lucida Grande", Geneva, helvetica, sans-serif;
     font-size: 1em;
     height: auto !important; /* real browsers */
     height: 100%; /* IE6: treaded as min-height*/;
@@ -28,46 +28,46 @@ body{
     margin: 0 auto;
 }
 body{
-   background: #fff url(../images/header-background.gif) center 0 repeat-x; 
+   background: #fff url(../images/header-background.gif) center 0 repeat-x;
 }
 /* h1,h2,h3,h4,h5,h6 ------>  */
 h1 {
     padding: 8px 0 6px 0;
     margin: 0;
-    font-size: 1.5em;	
+    font-size: 1.5em;
 }
 h2 {
     padding: 8px 0 6px 0;
     margin: 0;
     font-size: 1.4em;
-    color: #2485ae; 
+    color: #2485ae;
 }
 h2 a{
-    color: #2485ae; 
+    color: #2485ae;
 }
 h2 a:link, h2 a:visited{
-    text-decoration: underline; 
+    text-decoration: underline;
 }
 h2 a:hover, h2 a:active{
-    text-decoration: none; 
+    text-decoration: none;
 }
 h3{
     padding: 8px 0 6px 0;
     margin: 0;
     font-size: 1.2em;
-    color: #2485ae; 
+    color: #2485ae;
 }
 h4{
     padding: 4px 0 4px 0;
     margin: 0;
     font-size: 1.1em;
-    color: #000000; 
+    color: #000000;
 }
 h5{
     padding: 3px 0 2px 0;
     margin: 0;
     font-size: 1em;
-    color: #2485ae; 
+    color: #2485ae;
 }
 
 a {
@@ -224,7 +224,7 @@ p{
 
 /* MISCELLANEOUS ------>  */
 .blue{
-    color: #2485ae; 
+    color: #2485ae;
 }
 .grey{
     color: #5e6363;
diff --git a/legacy/doc/install.html b/legacy/doc/install.html
index 22932f888..310242289 100644
--- a/legacy/doc/install.html
+++ b/legacy/doc/install.html
@@ -29,49 +29,49 @@
 
             <br>
             <p>
-                This document is a summary of the Vitro installation process. 
+                This document is a summary of the Vitro installation process.
             </p>
             <p>
-                These instructions assume that you are performing a clean install, 
-                starting with an empty database, an empty Vitro home directory, 
+                These instructions assume that you are performing a clean install,
+                starting with an empty database, an empty Vitro home directory,
                 and a Tomcat installation with no Vitro webapp.
-                If you are upgrading a previous installation of Vitro, 
+                If you are upgrading a previous installation of Vitro,
                 you may need to adjust your procedure accordingly.
             </p>
             <p>
-              Other servlet containers: If you want to use a servlet container 
+              Other servlet containers: If you want to use a servlet container
               other than Tomcat, please consult <a href="other_servlet_containers.html">
               instructions for other servlet containers</a> in this directory.
             </p>
-            
+
             <hr><h2 id="introduction">Introduction to the Vitro installation</h2>
-   
+
             <p>
-                Before beginning the installation, 
+                Before beginning the installation,
                 let’s discuss some of the major concepts relating to the Vitro installation.
             </p>
-   
+
             <h3>Where does Vitro live on your computer?</h3>
-            <p> 
-                Vitro exists in four locations on your computer, from the distribution to the runtime to the data storage. 
+            <p>
+                Vitro exists in four locations on your computer, from the distribution to the runtime to the data storage.
             </p>
             <h4>The Vitro distribution directory</h4>
             <p>
-                This is created when you checkout the Vitro source code 
-                (see <a href="#checkout_code">installation step III</a>, below). 
-                This is where you will create your build.properties file 
-                (see <a href="#build_properties">installation step IV</a>, below), 
-                and where you will make any modifications to the Vitro 
-                theme or code. You can create this wherever you choose. 
+                This is created when you checkout the Vitro source code
+                (see <a href="#checkout_code">installation step III</a>, below).
+                This is where you will create your build.properties file
+                (see <a href="#build_properties">installation step IV</a>, below),
+                and where you will make any modifications to the Vitro
+                theme or code. You can create this wherever you choose.
             </p>
             <h4>Vitro inside Tomcat</h4>
             <p>
-                When you run the build script to compile and deploy Vitro 
-                (see <a href="#deploy">installation step V</a>, below), 
+                When you run the build script to compile and deploy Vitro
+                (see <a href="#deploy">installation step V</a>, below),
                 the files will be deployed to a
-                directory inside Tomcat. This is the actual executing code for Vitro, 
-                but you won’t need to look at it or change it. If you need to change 
-                Vitro, make the changes in the distribution directory, and run the build  
+                directory inside Tomcat. This is the actual executing code for Vitro,
+                but you won’t need to look at it or change it. If you need to change
+                Vitro, make the changes in the distribution directory, and run the build
                 script again. Tell the build script where to find Tomcat by setting <code>tomcat.home</code>
                 in the build.properties file (see <a href="#build_properties">installation step IV</a>,
                 below).
@@ -79,54 +79,54 @@
             <h4>The Vitro home directory</h4>
             <p>
                 This directory contains the runtime configuration properties for Vitro.
-                Vitro will also use this area to store some of the data it uses. Uploaded 
-                image files are stored here, and the Solr home directory is stored here also. 
-                You can create this wherever you choose. Tell Vitro where to find the  
-                home directory by setting <code>vitro.home</code> in the 
-                build.properties file (see <a href="#build_properties">installation step IV</a>, 
-                below). You must create this directory before starting Vitro, 
+                Vitro will also use this area to store some of the data it uses. Uploaded
+                image files are stored here, and the Solr home directory is stored here also.
+                You can create this wherever you choose. Tell Vitro where to find the
+                home directory by setting <code>vitro.home</code> in the
+                build.properties file (see <a href="#build_properties">installation step IV</a>,
+                below). You must create this directory before starting Vitro,
                 you must create the <code>runtime.properties</code> file in this directory
-                (see <a href="#runtime_properties">Step VI</a>, below), and you 
-                must ensure that Tomcat has permission to read and write to this  
-                directory when it runs. 
+                (see <a href="#runtime_properties">Step VI</a>, below), and you
+                must ensure that Tomcat has permission to read and write to this
+                directory when it runs.
             </p>
             <h4>The MySQL database</h4>
             <p>
-                Essentially all of the data that you store in Vitro will be given to 
-                MySQL for storage. The actual location of this data depends on what  
-                system you have, and on how you install MySQL 
-                (see <a href="#required_software">installation step I</a>, below). 
-                but you won’t need to 
-                know the location. You will access the data through Vitro, or  
-                occasionally through the MySQL client application. 
+                Essentially all of the data that you store in Vitro will be given to
+                MySQL for storage. The actual location of this data depends on what
+                system you have, and on how you install MySQL
+                (see <a href="#required_software">installation step I</a>, below).
+                but you won’t need to
+                know the location. You will access the data through Vitro, or
+                occasionally through the MySQL client application.
             </p>
-   
+
             <h3>The relationship between Vitro and VIVO</h3>
 
             <h4>“Vitro Inside�</h4>
             <p>
-                Vitro was developed as a 
-                “general-purpose web-based ontology and instance editor with customizable public browsing.� 
-                It is useful on its own, but also serves as the basis for several products, 
+                Vitro was developed as a
+                “general-purpose web-based ontology and instance editor with customizable public browsing.�
+                It is useful on its own, but also serves as the basis for several products,
                 including VIVO. [http://sourceforge.net/projects/vivo/]
             </p>
             <p>
-                In 2009, the National Institutes of Health (NIH) awarded a major grant to advance the development of VIVO. 
-                Much of the recent development on Vitro has been in support of that grant. 
-                However, Vitro retains its own identity, 
-                and still serves as the core of many projects and products. 
+                In 2009, the National Institutes of Health (NIH) awarded a major grant to advance the development of VIVO.
+                Much of the recent development on Vitro has been in support of that grant.
+                However, Vitro retains its own identity,
+                and still serves as the core of many projects and products.
                 Some of these are currently in use, and some are still in the planning stages.
             </p>
             <p>
-                Because VIVO was so well funded, and because it is widely used, 
-                someone seeking help with Vitro might find information that applies to VIVO instead. 
-                In many cases, that information will apply to Vitro as well. 
+                Because VIVO was so well funded, and because it is widely used,
+                someone seeking help with Vitro might find information that applies to VIVO instead.
+                In many cases, that information will apply to Vitro as well.
                 However, there are some notable exceptions:
                 <ul>
                 <li>
                     <h5>Ontology</h5>
                     <p>
-                        Vitro is essentially a blank slate, and is suitable for use with almost any ontology. 
+                        Vitro is essentially a blank slate, and is suitable for use with almost any ontology.
                         It is packaged with a minimal ontology, sufficient to run the application itself.
                     </p>
                     <p>
@@ -136,8 +136,8 @@
                 <li>
                     <h5>Theme</h5>
                     <p>
-                        Vitro and VIVO are each packaged with their own default theme. 
-                        The VIVO theme is more extensive, 
+                        Vitro and VIVO are each packaged with their own default theme.
+                        The VIVO theme is more extensive,
                         since it includes custom pages and custom list views that apply to the VIVO ontology.
                     </p>
                 </li>
@@ -150,8 +150,8 @@
                 <li>
                     <h5>Harvester</h5>
                     <p>
-                        VIVO includes an RDF Harvester tool for importing data from sources of record. 
-                        The Harvester may be useful for Vitro as well, but it was developed for VIVO, 
+                        VIVO includes an RDF Harvester tool for importing data from sources of record.
+                        The Harvester may be useful for Vitro as well, but it was developed for VIVO,
                         and may have some dependencies on VIVO.
                     </p>
                 </li>
@@ -160,15 +160,15 @@
 
             <h4>Release schedule and names</h4>
             <p>
-                Currently, the Vitro release schedule is coordinated with the VIVO releases, 
-                so version 1.6 of Vitro forms the basis of version 1.6 of VIVO. 
-                In the Vitro code repository, the release tags illustrate this relationship. 
+                Currently, the Vitro release schedule is coordinated with the VIVO releases,
+                so version 1.6 of Vitro forms the basis of version 1.6 of VIVO.
+                In the Vitro code repository, the release tags illustrate this relationship.
                 For example, the Vitro revision that was tagged for version 1.6 of VIVO is named “rel-vivo-1.6�
             </p>
 
             <hr><!-- Page break --><!-- Installation process for Version 1.6 --><h2 id="installation">Installation process for Version 1.6</h2>
             <p>
-                This document is a summary of the Vitro installation process. 
+                This document is a summary of the Vitro installation process.
             </p>
             <toc>
                 <h3>Steps to Installation</h3>
@@ -221,8 +221,8 @@
             </toc>
             <h3 id="required_software">I. Install required software </h3>
             <p>
-                Before installing Vitro, make sure that the following software is 
-                installed on the desired machine: 
+                Before installing Vitro, make sure that the following software is
+                installed on the desired machine:
             </p>
             <ul>
                 <li>
@@ -244,9 +244,9 @@
             <p>
                 Be sure to set up the environment variables for <code java_home="">JAVA_HOME</code>
                 and <code>ANT_HOME</code>
-                and add the executables to your path per 
-                your operating system and installation directions from the software  
-                support websites. 
+                and add the executables to your path per
+                your operating system and installation directions from the software
+                support websites.
             </p>
 
             <p>
@@ -275,32 +275,32 @@
 
             <h3 id="create_database">II. Create an empty MySQL database </h3>
             <p>
-                Decide on a database name, username, and password. Log into your 
+                Decide on a database name, username, and password. Log into your
                 MySQL server and create a new database in MySQL that uses <code>UTF-8
-                    encoding</code>. You will need these values for Step IV when you 
-                configure the deployment properties. At the MySQL command line you can 
-                create the database and user with these commands substituting your  
+                    encoding</code>. You will need these values for Step IV when you
+                configure the deployment properties. At the MySQL command line you can
+                create the database and user with these commands substituting your
                 values for <code>dbname</code>, <code>username</code>, and <code>password</code>.
-                Most 
-                of 
-                the  
-                time, the hostname will equal <code>localhost</code>. 
+                Most
+                of
+                the
+                time, the hostname will equal <code>localhost</code>.
             </p>
             <pre>                CREATE DATABASE dbname CHARACTER SET utf8;<br></pre>
             <p>
-                Grant access to a database user. For example: 
+                Grant access to a database user. For example:
             </p>
             <pre>                GRANT ALL ON dbname.* TO 'username'@'hostname' IDENTIFIED BY 'password';<br></pre>
             <p>
-                Keep track of the database name, username, and password for Step 
-                IV. 
+                Keep track of the database name, username, and password for Step
+                IV.
             </p>
-            <h3 id="checkout_code">III. Check out the Vitro Source Code 
+            <h3 id="checkout_code">III. Check out the Vitro Source Code
                 <br>
             </h3>
             <p>
-                Download the latest stable release of Vitro from SourceForge: 
-                go to 
+                Download the latest stable release of Vitro from SourceForge:
+                go to
                 <pre>      http://sourceforge.net/projects/vivo/files/Vitro%20Application%20Source/</pre>
                 and download either <code>vitro-rel-1.6.zip</code> or <code>vitro-rel-1.6.tar.gz</code>
             </p>
@@ -311,63 +311,63 @@
 
             <h3 id="build_properties">IV. Specify build properties </h3>
             <p>
-                In the <code>webapp/config</code> directory of the Vitro distribution, 
+                In the <code>webapp/config</code> directory of the Vitro distribution,
                 copy the file <code>example.build.properties</code>
-                to a file named simply <code>build.properties</code>. 
-                Edit the file to suit your installation, as described in the following table. 
+                to a file named simply <code>build.properties</code>.
+                Edit the file to suit your installation, as described in the following table.
             </p>
             <p>
-            	These properties are used in compilation and deployment. 
+            	These properties are used in compilation and deployment.
             	They will be incorporated into Vitro when it is compiled in
             	<a href="#deploy">Step V</a>. If you want to change these properties at
-            	a later date, you will need to stop Tomcat, repeat <a href="#deploy">Step V</a>, 
+            	a later date, you will need to stop Tomcat, repeat <a href="#deploy">Step V</a>,
             	and restart Tomcat.
             </p>
             <p>
                 <em>Windows:</em>
-                For those installing on Windows operating 
-                system, include the windows drive and use the forward slash "/" and not  
+                For those installing on Windows operating
+                system, include the windows drive and use the forward slash "/" and not
                 the back slash "\" in the directory locations, e.g. <code>c:/tomcat</code>.
             </p>
             <table border='1' bordercolor="#CCCCCC" cellspacing="5">
                 <tbody>
                     <tr>
                         <td colspan="2">
-                            Directory where tomcat is installed. 
+                            Directory where tomcat is installed.
                         </td>
                     </tr>
                     <tr class="odd_row">
                         <td>
-                            tomcat.home 
+                            tomcat.home
                         </td>
                         <td>
-                            /usr/local/tomcat 
+                            /usr/local/tomcat
                         </td>
                     </tr>
                     <tr>
                         <td colspan="2">
-                            Name of your Vitro application. 
+                            Name of your Vitro application.
                         </td>
                     </tr>
                     <tr class="odd_row">
                         <td>
-                            webapp.name 
+                            webapp.name
                         </td>
                         <td>
-                            vitro 
+                            vitro
                         </td>
                     </tr>
                     <tr>
                         <td colspan="2">
-                            Directory where the Vitro application will store 
-                            the data that it creates. This includes uploaded files (usually images) 
-                            and the Solr search index. Be sure this directory exists and is  
-                            writable by the user who the Tomcat service is running as. 
+                            Directory where the Vitro application will store
+                            the data that it creates. This includes uploaded files (usually images)
+                            and the Solr search index. Be sure this directory exists and is
+                            writable by the user who the Tomcat service is running as.
                         </td>
                     </tr>
                     <tr class="odd_row">
                         <td>
-                            vitro.home 
+                            vitro.home
                         </td>
                         <td>
                             /usr/local/vitro/home
@@ -375,7 +375,7 @@
                     </tr>
                     <tr>
                         <td colspan="2">
-                            Languages (in addition to American English) that will be built into your 
+                            Languages (in addition to American English) that will be built into your
                             Vitro site. The languages must be found in the
                             <code>languages</code> directory of the Vitro distribution.
                             See <a href="https://wiki.duraspace.org/display/VIVO/Building+a+multi-language+VIVO+instance">
@@ -395,21 +395,21 @@
 
             <h3 id="deploy">V. Compile and deploy</h3>
             <p>
-                In <a href="#build_properties">Step IV</a>, you defined the location of the VIVO home directory, 
+                In <a href="#build_properties">Step IV</a>, you defined the location of the VIVO home directory,
                 by specifying <code>vitro.home</code> in the <code>build.properties</code> file.
                 Create that directory now.
             </p>
             <p>
-                At the command line, change to the <code>webapp</code> directory inside the Vitro distribution 
-                directory. Then type: 
+                At the command line, change to the <code>webapp</code> directory inside the Vitro distribution
+                directory. Then type:
             </p>
             <pre>    ant all<br>            </pre>
             <p>
-                to build Vitro and deploy to Tomcat's webapps directory. 
+                to build Vitro and deploy to Tomcat's webapps directory.
             </p>
             <p>
-                The build script may run for as much as five minutes, 
-                and creates more than 100 lines of output. 
+                The build script may run for as much as five minutes,
+                and creates more than 100 lines of output.
                 The process comprises several steps:
                 <ul>
                    <li>collecting the source files from the distribution directory,</li>
@@ -417,26 +417,26 @@
                    <li>compiling and running unit tests,</li>
                    <li>preparing the Solr search engine,</li>
                    <li>deploying Vitro and Solr to Tomcat.</li>
-                </ul> 
+                </ul>
             </p>
             <p>
                 The output of the build may include a variety of warning messages.
                 The Java compiler may warn of code that is outdated.
-                Unit tests may produce warning messages, 
-                and some tests may be ignored if they do not produce consistent results.  
+                Unit tests may produce warning messages,
+                and some tests may be ignored if they do not produce consistent results.
             </p>
             <table align="center"><tr><td>
                 BUILD SUCCESSFUL<br>Total time: 1 minute 49 seconds
             </td></tr></table>
             <p>
-                If the output ends with a success message, the build was successful. 
+                If the output ends with a success message, the build was successful.
                 Proceed to the next step.
             </p>
             <table align="center"><tr><td>
                 BUILD FAILED<br>Total time: 35 seconds
             </td></tr></table>
             <p>
-                If the output ends with a failure message, the build has failed. 
+                If the output ends with a failure message, the build has failed.
                 Find the cause of the failure, fix the problem, and run the script again.
             </p>
 
@@ -444,35 +444,35 @@
             <p>
                 The build process in <a href="deploy">Step V</a> created a file called <code>example.runtime.properties</code>
                 in your Vitro home directory (<code>vitro.home</code> in the <code>build.properties</code> file).
-                Rename this file to  <code>runtime.properties</code>, and  
-                edit the file to suit your installation, as described in the following table. 
+                Rename this file to  <code>runtime.properties</code>, and
+                edit the file to suit your installation, as described in the following table.
             </p>
             <p>
-                These properties are loaded when Vitro starts up. If you want to change these 
-                properties at a later date, you will need to restart Tomcat for them to take 
+                These properties are loaded when Vitro starts up. If you want to change these
+                properties at a later date, you will need to restart Tomcat for them to take
                 effect. You will not need to repeat <a href="#deploy">Step V</a>.
             </p>
             <p>
                 <em>Windows:</em>
-                For those installing on Windows operating 
-                system, include the windows drive and use the forward slash "/" and not  
+                For those installing on Windows operating
+                system, include the windows drive and use the forward slash "/" and not
                 the back slash "\" in the directory locations, e.g. <code>c:/tomcat</code>.
             </p>
             <p>
                 <em>External authentication:</em>
-                If you want to use an external 
-                authentication system like Shibboleth or CUWebAuth, you will need to 
-                set an additional property in this file. See the section below  
-                entitled <a href="#external_auth">Using an External Authentication System with Vitro</a>. 
+                If you want to use an external
+                authentication system like Shibboleth or CUWebAuth, you will need to
+                set an additional property in this file. See the section below
+                entitled <a href="#external_auth">Using an External Authentication System with Vitro</a>.
             </p>
             <table border='1' bordercolor="#CCCCCC" cellspacing="5">
                 <tbody>
                     <tr>
                         <th>
-                            Property Name 
+                            Property Name
                         </th>
                         <th>
-                            Example Value 
+                            Example Value
                         </th>
                     </tr>
                     <tr>
@@ -493,61 +493,61 @@
                     </tr>
                     <tr class="odd_row">
                         <td>
-                            Vitro.defaultNamespace 
+                            Vitro.defaultNamespace
                         </td>
                         <td>
-                            http://vitro.mydomain.edu/individual/ 
+                            http://vitro.mydomain.edu/individual/
                         </td>
                     </tr>
                     <tr>
                         <td colspan="2">
                             URL of Solr context used in local Vitro search.
                             Should consist of:<pre>    scheme + servername + port + vitro_webapp_name + "solr"</pre>
-                            In the standard installation, the Solr context will be on the same 
-                            server as Vitro, and in the same Tomcat instance. The path will be the  
-                            Vitro webapp.name (specified above) + "solr" 
+                            In the standard installation, the Solr context will be on the same
+                            server as Vitro, and in the same Tomcat instance. The path will be the
+                            Vitro webapp.name (specified above) + "solr"
                         </td>
                     </tr>
                     <tr class="odd_row">
                         <td>
-                            vitro.local.solr.url 
+                            vitro.local.solr.url
                         </td>
                         <td>
-                            http://localhost:8080/vitrosolr 
+                            http://localhost:8080/vitrosolr
                         </td>
                     </tr>
                     <tr>
                         <td colspan="2">
-                            Specify an SMTP host that the application will 
-                            use for sending e-mail (Optional). If this is left blank, the contact 
-                            form will be hidden and disabled, and users will not be notified of  
-                            changes to their accounts. 
+                            Specify an SMTP host that the application will
+                            use for sending e-mail (Optional). If this is left blank, the contact
+                            form will be hidden and disabled, and users will not be notified of
+                            changes to their accounts.
                         </td>
                     </tr>
                     <tr class="odd_row">
                         <td>
-                            email.smtpHost 
+                            email.smtpHost
                         </td>
                         <td>
-                            smtp.servername.edu 
+                            smtp.servername.edu
                         </td>
                     </tr>
                     <tr>
                         <td colspan="2">
                             Specify an email address which will appear as
                             the sender in e-mail notifications to users (Optional). If a user
-                            replies to the notification, this address will receive the reply. If a 
-                            user's e-mail address is invalid, this address will receive the error 
-                            notice. If this is left blank, users will not be notified of changes to  
-                            their accounts. 
+                            replies to the notification, this address will receive the reply. If a
+                            user's e-mail address is invalid, this address will receive the error
+                            notice. If this is left blank, users will not be notified of changes to
+                            their accounts.
                         </td>
                     </tr>
                     <tr class="odd_row">
                         <td>
-                            email.replyTo 
+                            email.replyTo
                         </td>
                         <td>
-                            vitroAdmin@my.domain.edu 
+                            vitroAdmin@my.domain.edu
                         </td>
                     </tr>
                     <tr>
@@ -558,116 +558,116 @@
                     </tr>
                     <tr class="odd_row">
                         <td>
-                            VitroConnection.DataSource.url 
+                            VitroConnection.DataSource.url
                         </td>
                         <td>
-                            jdbc:mysql://localhost/vitro 
+                            jdbc:mysql://localhost/vitro
                         </td>
                     </tr>
                     <tr>
                         <td colspan="2">
-                            Change the username to match the authorized user 
-                            you created in MySQL. 
+                            Change the username to match the authorized user
+                            you created in MySQL.
                         </td>
                     </tr>
                     <tr class="odd_row">
                         <td>
-                            VitroConnection.DataSource.username 
+                            VitroConnection.DataSource.username
                         </td>
                         <td>
-                            username 
+                            username
                         </td>
                     </tr>
                     <tr>
                         <td colspan="2">
-                            Change the password to match the password you 
-                            created in MySQL. 
+                            Change the password to match the password you
+                            created in MySQL.
                         </td>
                     </tr>
                     <tr class="odd_row">
                         <td>
-                            VitroConnection.DataSource.password 
+                            VitroConnection.DataSource.password
                         </td>
                         <td>
-                            password 
+                            password
                         </td>
                     </tr>
                     <tr>
                         <td colspan="2">
-                            Specify the maximum number of active connections 
-                            in the database connection pool to support the anticipated number of 
-                            concurrent page requests. 
+                            Specify the maximum number of active connections
+                            in the database connection pool to support the anticipated number of
+                            concurrent page requests.
                         </td>
                     </tr>
                     <tr class="odd_row">
                         <td>
-                            VitroConnection.DataSource.pool.maxActive 
+                            VitroConnection.DataSource.pool.maxActive
                         </td>
                         <td>
-                            40 
+                            40
                         </td>
                     </tr>
                     <tr>
                         <td colspan="2">
-                            Specify the maximum number of database 
-                            connections that will be allowed to remain idle in the connection pool.  
-                            Default is 25% of the maximum number of active connections. 
+                            Specify the maximum number of database
+                            connections that will be allowed to remain idle in the connection pool.
+                            Default is 25% of the maximum number of active connections.
                         </td>
                     </tr>
                     <tr class="odd_row">
                         <td>
-                            VitroConnection.DataSource.pool.maxIdle 
+                            VitroConnection.DataSource.pool.maxIdle
                         </td>
                         <td>
-                            10 
+                            10
                         </td>
                     </tr>
                     <tr>
                         <td colspan="2">
                             Change the dbtype setting to use a database
-                            other than MySQL. Otherwise, leave this value unchanged. Possible 
-                            values are DB2, derby, HSQLDB, H2, MySQL, Oracle, PostgreSQL, and 
-                            SQLServer. Refer to http://openjena.org/wiki/SDB/Databases_Supported  
-                            for additional information. 
+                            other than MySQL. Otherwise, leave this value unchanged. Possible
+                            values are DB2, derby, HSQLDB, H2, MySQL, Oracle, PostgreSQL, and
+                            SQLServer. Refer to http://openjena.org/wiki/SDB/Databases_Supported
+                            for additional information.
                         </td>
                     </tr>
                     <tr class="odd_row">
                         <td>
-                            VitroConnection.DataSource.dbtype 
+                            VitroConnection.DataSource.dbtype
                         </td>
                         <td>
-                            MySQL 
+                            MySQL
                         </td>
                     </tr>
                     <tr>
                         <td colspan="2">
-                            Specify a driver class name to use a database 
-                            other than MySQL. Otherwise, leave this value unchanged. This JAR file 
-                            for this driver must be added to the the webapp/lib directory within  
-                            the vitro.core.dir specified above. 
+                            Specify a driver class name to use a database
+                            other than MySQL. Otherwise, leave this value unchanged. This JAR file
+                            for this driver must be added to the the webapp/lib directory within
+                            the vitro.core.dir specified above.
                         </td>
                     </tr>
                     <tr class="odd_row">
                         <td>
-                            VitroConnection.DataSource.driver 
+                            VitroConnection.DataSource.driver
                         </td>
                         <td>
-                            com.mysql.jdbc.Driver 
+                            com.mysql.jdbc.Driver
                         </td>
                     </tr>
                     <tr>
                         <td colspan="2">
-                            Change the validation query used to test 
-                            database connections only if necessary to use a database other than  
-                            MySQL. Otherwise, leave this value unchanged. 
+                            Change the validation query used to test
+                            database connections only if necessary to use a database other than
+                            MySQL. Otherwise, leave this value unchanged.
                         </td>
                     </tr>
                     <tr class="odd_row">
                         <td>
-                            VitroConnection.DataSource.validationQuery 
+                            VitroConnection.DataSource.validationQuery
                         </td>
                         <td>
-                            SELECT 1 
+                            SELECT 1
                         </td>
                     </tr>
                     <tr>
@@ -677,43 +677,43 @@
                             temporary password of 'rootPassword'. You will be prompted to create a
                             new password on first login.
                             <p>
-                                NOTE: The root user account has access to all data and all 
-                                operations in Vitro. Data views may be surprising when logged in as the 
-                                root user. It is best to create a Site Admin account to use for every  
-                                day administrative tasks. 
+                                NOTE: The root user account has access to all data and all
+                                operations in Vitro. Data views may be surprising when logged in as the
+                                root user. It is best to create a Site Admin account to use for every
+                                day administrative tasks.
                             </p>
                         </td>
                     </tr>
                     <tr class="odd_row">
                         <td>
-                            rootUser.emailAddress 
+                            rootUser.emailAddress
                         </td>
                         <td>
-                            vitroAdmin@my.domain.edu 
+                            vitroAdmin@my.domain.edu
                         </td>
                     </tr>
                     <tr>
                         <td colspan="2">
-                            The URI of a property that can be used to 
-                            associate an Individual with a user account. When a user logs in with a 
-                            name that matches the value of this property, the user will be  
-                            authorized to edit that Individual 
-                            (the value of the property must be either a String literal or an untyped literal). 
+                            The URI of a property that can be used to
+                            associate an Individual with a user account. When a user logs in with a
+                            name that matches the value of this property, the user will be
+                            authorized to edit that Individual
+                            (the value of the property must be either a String literal or an untyped literal).
                         </td>
                     </tr>
                     <tr class="odd_row">
                         <td>
-                            selfEditing.idMatchingProperty 
+                            selfEditing.idMatchingProperty
                         </td>
                         <td>
-                            http://vitro.mydomain.edu/ns#networkId 
+                            http://vitro.mydomain.edu/ns#networkId
                         </td>
                     </tr>
                     <tr>
                         <td colspan="2">
-                            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, 
+                            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.
                         </td>
                     </tr>
@@ -722,16 +722,16 @@
                             externalAuth.netIdHeaderName
                         </td>
                         <td>
-                            remote_userID 
+                            remote_userID
                         </td>
                     </tr>
-                    
+
                     <tr>
                         <td colspan="2">
-                            Tell Vitro to generate HTTP headers on its responses to facilitate caching the 
+                            Tell Vitro to generate HTTP headers on its responses to facilitate caching the
                             profile pages that it creates. This can improve performance, but it can also
                             result in serving stale data. Default is false if not set.
-                            For more information, see the VIVO wiki page: 
+                            For more information, see the VIVO wiki page:
                             <a href="https://wiki.duraspace.org/display/VIVO/Use+HTTP+caching+to+improve+performance">
                             Use HTTP caching to improve performance </a>
                         </td>
@@ -744,10 +744,10 @@
                            true
                         </td>
                     </tr>
-                    
+
                     <tr>
                         <td colspan="2">
-							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.
                         </td>
                     </tr>
@@ -762,10 +762,10 @@
 
                     <tr>
                         <td colspan="2">
-                          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. 
+                          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.
                         </td>
                     </tr>
                     <tr class="odd_row">
@@ -782,8 +782,8 @@
                           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. 
+                          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.
                         </td>
                     </tr>
                     <tr class="odd_row">
@@ -801,40 +801,40 @@
             <h3 id="tomcat_settings">VII. Configure Tomcat</h3>
             <h4>Set JVM parameters</h4>
             <p>
-                Vitro may require more memory than that allocated to Tomcat by 
-                default. With most installations of Tomcat, the "setenv.sh" or 
-                "setenv.bat" file in Tomcat's bin directory is a convenient place to  
+                Vitro may require more memory than that allocated to Tomcat by
+                default. With most installations of Tomcat, the "setenv.sh" or
+                "setenv.bat" file in Tomcat's bin directory is a convenient place to
                 set the memory parameters. <em>If this file does not exist in Tomcat's
                     bin directory, you can create it.</em>
                 <br>
-                For example: 
+                For example:
             </p>
             <pre>    export CATALINA_OPTS="-Xms512m -Xmx512m -XX:MaxPermSize=128m"<br>                </pre>
             <p>
                 This sets Tomcat to allocate an initial heap of 512 megabytes, a
-                maximum heap of 512 megabytes, and a PermGen space of 128 megs. Lower 
+                maximum heap of 512 megabytes, and a PermGen space of 128 megs. Lower
                 values may suffice, especially for small test installations.
             </p>
             <p>
-                If an OutOfMemoryError is encountered during Vitro execution, it can 
-                be remedied by increasing the heap parameters and restarting Tomcat. 
+                If an OutOfMemoryError is encountered during Vitro execution, it can
+                be remedied by increasing the heap parameters and restarting Tomcat.
             </p>
             <h4>Set security limits</h4>
             <p>
-                Vitro is a multithreaded web application that may 
-                require more threads than are permitted under your Linux installation's 
-                default configuration. Ensure that your installation can support the  
+                Vitro is a multithreaded web application that may
+                require more threads than are permitted under your Linux installation's
+                default configuration. Ensure that your installation can support the
                 required number of threads by making the following edits to <code>/etc/security/limits.conf</code>:
             </p>
             <pre>                    apache	hard	nproc	400<br>                    tomcat6	hard	nproc	1500 <br>                </pre>
             <h4>Set URI encoding</h4>
             <p>
-                In order for VIVO to correctly handle international characters, 
-                you must configure Tomcat to conform to the URI standard by 
+                In order for VIVO to correctly handle international characters,
+                you must configure Tomcat to conform to the URI standard by
                 accepting percent-encoded UTF-8.
             </p>
             <p>
-                Edit Tomcat's <code>conf/server.xml</code> and add the following attribute to each of the 
+                Edit Tomcat's <code>conf/server.xml</code> and add the following attribute to each of the
                 Connector elements: URIEncoding="UTF-8".
             </p>
             <pre>
@@ -857,11 +857,11 @@
             </p>
             <p>
                 Tomcat allows you to override these context fragments by adding Context elements to "server.xml".
-                If you decide to do this, be sure that your new Context element includes the necessary 
+                If you decide to do this, be sure that your new Context element includes the necessary
                 deployment parameters from the overridden context fragment.
             </p>
             <p>
-                See <a href="#httpd">Section XI</a> below, 
+                See <a href="#httpd">Section XI</a> below,
                 for an example of overriding the Vitro context fragment.
             </p>
 
@@ -882,68 +882,68 @@
                will allow you to use VIVO in spite of the problems.
            </p>
             <p>
-                If Tomcat does not start up, or the Vitro application is not visible, check 
-                the files in Tomcat's <code>logs</code> directory. Error messages are commonly found  
+                If Tomcat does not start up, or the Vitro application is not visible, check
+                the files in Tomcat's <code>logs</code> directory. Error messages are commonly found
                 in <code>catalina.out</code>
                 or <code>localhost.log</code>
             </p>
-                
+
             </p>
             <h3 id="add_rdf">IX. Log in and add RDF data </h3>
             <p>
-                If the startup was successful, you will see a welcome message 
-                informing you that you have successfully installed Vitro. Click the "Log  
+                If the startup was successful, you will see a welcome message
+                informing you that you have successfully installed Vitro. Click the "Log
                 in" link near the upper right corner. Log in with the <code>rootUser.emailAddress</code>
-                you set up in Step IV. The initial password for the root account is 
-                "rootPassword" (without the quotes). On first login, you will be  
-                prompted to select a new password and verify it a second time. When login is 
-                complete, the search index is checked and, if it is empty, 
-                a full index build will be triggered in the background, in order to ensure 
-                complete functionality throughout the site. 
+                you set up in Step IV. The initial password for the root account is
+                "rootPassword" (without the quotes). On first login, you will be
+                prompted to select a new password and verify it a second time. When login is
+                complete, the search index is checked and, if it is empty,
+                a full index build will be triggered in the background, in order to ensure
+                complete functionality throughout the site.
             </p>
             <p>
                 After logging in, you will be presented with a
                 menu of editing options. Here you can create OWL classes, object
                 properties, data properties, and configure the display of data.
-                Currently, any classes you wish to make visible on your website must be 
-                part of a class group, and there are a number of visibility and display 
-                options available for each ontology entity. Vitro comes with a minimal  
-                ontology. You will likely want to upload additional ontologies from an RDF file. 
+                Currently, any classes you wish to make visible on your website must be
+                part of a class group, and there are a number of visibility and display
+                options available for each ontology entity. Vitro comes with a minimal
+                ontology. You will likely want to upload additional ontologies from an RDF file.
             </p>
             <p>
                 Under the "Advanced Data Tools" click "Add/Remove RDF Data." Note
                 that Vitro currently works best with OWL-DL ontologies and has only
-                limited support for pure RDF data. You can enter a URL pointing to the 
-                RDF data you wish to load or upload from a file on your local machine. 
-                Ensure that the "add RDF" radio button is selected. You will also  
-                likely want to check "create classgroups automatically." 
+                limited support for pure RDF data. You can enter a URL pointing to the
+                RDF data you wish to load or upload from a file on your local machine.
+                Ensure that the "add RDF" radio button is selected. You will also
+                likely want to check "create classgroups automatically."
             </p>
             <p>
-                Clicking the "Index" tab in the navigation bar at the top right of 
-                the page will show a simple index of the knowledge base. 
+                Clicking the "Index" tab in the navigation bar at the top right of
+                the page will show a simple index of the knowledge base.
             </p>
 
             <h3 id="contact_email">X. Set the Contact Email Address (if using
                 "Contact Us" form)</h3>
             <p>
                 If you have configured your application to use the "Contact Us"
-                feature in Step IV (<code>email.smtpHost</code>), you will also need to 
-                add an email address to the Vitro application.&nbsp; This is the email 
-                to which the contact form will submit. It can be a list server or an  
-                individual's email address. 
+                feature in Step IV (<code>email.smtpHost</code>), you will also need to
+                add an email address to the Vitro application.&nbsp; This is the email
+                to which the contact form will submit. It can be a list server or an
+                individual's email address.
             </p>
             <p>
                 Log in as a system administrator. Navigate to the "Site Admin"
-                table of contents (link in the right side of the header). Go to "Site 
-                Information" (under "Site Configuration"). In the "Site Information 
-                Editing Form," enter a functional email address in the field "Contact  
-                Email Address" and submit the change. 
+                table of contents (link in the right side of the header). Go to "Site
+                Information" (under "Site Configuration"). In the "Site Information
+                Editing Form," enter a functional email address in the field "Contact
+                Email Address" and submit the change.
             </p>
             <p>
                 If you set the <code>email.smtpHost</code>
-                in Step IV and do NOT 
-                provide an email address in this step, your users will receive a java  
-                error in the interface. 
+                in Step IV and do NOT
+                provide an email address in this step, your users will receive a java
+                error in the interface.
             </p>
             <h3 id="httpd">XI. Set up Apache HTTPD </h3>
             <p>
@@ -960,55 +960,55 @@
             <p>
                 Modify the &lt;Host&gt; in Tomcat server.xml (located in <code>[tomcat root]/conf/</code>)
                 so that the context path is empty to allow VIVO to be servred from the root path.
-                Locate the <code>&lt;Host name="localhost"...&gt;</code> directive and update as follows: 
+                Locate the <code>&lt;Host name="localhost"...&gt;</code> directive and update as follows:
             </p>
             <pre>              &lt;Host name="localhost" appBase="webapps"
                        DeployOnStartup="false"
                        unpackWARs="true" autoDeploy="false"
                        xmlValidation="false" xmlNamespaceAware="false"&gt;
-                   
+
                    &lt;Alias&gt;example.com&lt;/Alias&gt;
-                   
+
                    &lt;Context path=""
                            docBase="/usr/local/tomcat/webapps/vitro"
                            reloadable="true"
                            cookies="true" &gt;
-                   
+
                        &lt;Manager pathname="" /&gt;
                    &lt;/Context&gt;
-                  
+
                    ...
             </pre>
             <p>
                 After setting up the above, it is recommended that you modify the Tomcat AJP connector
                 parameters in server.xml. Look for the &lt;connector&gt; directive and add the
-                following properties: 
+                following properties:
             </p>
             <pre>    connectionTimeout="20000" maxThreads="320" keepAliveTimeout="20000"&nbsp;<br><br></pre>
             <p>
-                Note: the value for maxThreads (320) is equal or greater than the value for 
-                MaxClients in the apache's <code>httpd.conf</code> file. 
+                Note: the value for maxThreads (320) is equal or greater than the value for
+                MaxClients in the apache's <code>httpd.conf</code> file.
             </p>
 
-            <h3 id="external_auth">XII. Using an External Authentication System 
+            <h3 id="external_auth">XII. Using an External Authentication System
                 with Vitro </h3>
             <p>
             </p>
             <p>
-                Vitro can be configured to work with an external authentication 
-                system like Shibboleth or CUWebAuth. 
+                Vitro can be configured to work with an external authentication
+                system like Shibboleth or CUWebAuth.
             </p>
             <p>
-                Vitro must be accessible only through an Apache HTTP server. The 
-                Apache server will be configured to invoke the external authentication 
-                system. When the user completes the authentication, the Apache server  
-                will pass a network ID to Vitro, to identify the user. 
+                Vitro must be accessible only through an Apache HTTP server. The
+                Apache server will be configured to invoke the external authentication
+                system. When the user completes the authentication, the Apache server
+                will pass a network ID to Vitro, to identify the user.
             </p>
             <p>
-                If Vitro has an account for that user, the user will be logged in 
-                with the privileges of that account. In the absence of an account, Vitro 
-                will try to find a page associated with the user. If such a page is  
-                found, the user can log in to edit his own profile information. 
+                If Vitro has an account for that user, the user will be logged in
+                with the privileges of that account. In the absence of an account, Vitro
+                will try to find a page associated with the user. If such a page is
+                found, the user can log in to edit his own profile information.
             </p>
             <h4>Configuring the Apache server</h4>
             <p>
@@ -1021,32 +1021,32 @@
                 For Vitro, this secured page is named: <code>/loginExternalAuthReturn</code>
             </p>
             <p>
-                When your instructions call for the location of the secured page, 
-                this is the value you should use. 
+                When your instructions call for the location of the secured page,
+                this is the value you should use.
             </p>
             <h4>Configuring Vitro</h4>
             <p>
-                To enable external authentication, Vitro requires three values in 
+                To enable external authentication, Vitro requires three values in
                 the <code>runtime.properties</code>
-                file. 
+                file.
             </p>
             <ul>
                 <li>
                     <h5>The name of the HTTP header that will hold the external user's
                         network ID.</h5>
                     <p>
-                        When a user completes the authentication process, the Apache 
-                        server will put the user's network ID into one of the headers of the 
-                        HTTP request. The instructions from your institution should tell you  
-                        which header is used for this purpose. 
+                        When a user completes the authentication process, the Apache
+                        server will put the user's network ID into one of the headers of the
+                        HTTP request. The instructions from your institution should tell you
+                        which header is used for this purpose.
                     </p>
                     <p>
-                        You need to tell Vitro the name of that HTTP header. Insert a 
-                        line like this in the runtime.properties file: 
+                        You need to tell Vitro the name of that HTTP header. Insert a
+                        line like this in the runtime.properties file:
                     </p>
                     <pre>externalAuth.netIdHeaderName = [the header name]</pre>
                     <p>
-                        For example: 
+                        For example:
                     </p>
                     <pre>externalAuth.netIdHeaderName = remote_userID</pre>
                 </li>
@@ -1057,12 +1057,12 @@
                     that button.
                     <p>
                         In your theme, add a line to the <code>all.properties</code> file,
-                        like this one: 
+                        like this one:
                         <pre>external_login_text = <em>[the text for your login button]</em></pre>
                         For example:
                         <pre>external_login_text = Log in using BearCat Shibboleth</pre>
-                        The Vitro login form will display a button labelled "Log in 
-                        using BearCat Shibboleth". 
+                        The Vitro login form will display a button labelled "Log in
+                        using BearCat Shibboleth".
                     </p>
                     <p>
                     	If your site supports additional languages, add lines to the corresponding files.
@@ -1075,38 +1075,38 @@
                     <p>
                         Vitro will try to associate the user with a profile
                         page, so the user may edit his own profile data. Vitro will search the
-                        data model for a person with a property that matches the User’s network 
-                        ID (the value of the property must be either a String literal or an 
-                        untyped literal). You need to tell Vitro what property should be used  
-                        for matching. Insert a line like this in the runtime.properties file: 
+                        data model for a person with a property that matches the User’s network
+                        ID (the value of the property must be either a String literal or an
+                        untyped literal). You need to tell Vitro what property should be used
+                        for matching. Insert a line like this in the runtime.properties file:
                     </p>
                     <pre>selfEditing.idMatchingProperty = [the URI of the property]</pre>
                     <p>
-                        For example: 
+                        For example:
                     </p>
                     <pre>selfEditing.idMatchingProperty = http://vitro.mydomain.edu/ns#networkId</pre>
                 </li>
             </ul>
             <h3 id="installation_check">XIII. Was the installation successful? </h3>
             <p>
-                If you have completed the previous steps, you have good indications 
-                that the installation was successful. 
+                If you have completed the previous steps, you have good indications
+                that the installation was successful.
             </p>
             <ul>
                 <li>
-                    Step VIII showed that Tomcat recognized the webapp, and that the 
-                    webapp was able to present the initial page. 
+                    Step VIII showed that Tomcat recognized the webapp, and that the
+                    webapp was able to present the initial page.
                 </li>
                 <li>
-                    Step IX verified that you can log in to the administrator 
-                    account. 
+                    Step IX verified that you can log in to the administrator
+                    account.
                 </li>
             </ul>
             <p>
-                Step VIII also shows that the Vitro self-tests ran successfully. 
+                Step VIII also shows that the Vitro self-tests ran successfully.
                 When Tomcat starts the Vitro webapp, it runs several tests.
-                If any of these tests produce warnings or error message, 
-                you would see them instead of the Vitro home page. 
+                If any of these tests produce warnings or error message,
+                you would see them instead of the Vitro home page.
             </p>
             <p>
             	Among other things, the self-tests check
@@ -1120,20 +1120,20 @@
 
             <h3 id="termsofuse">XIV. Review the Vitro Terms of Use</h3>
             <p>
-                Vitro comes with a "Terms of Use" statement linked from the footer. 
+                Vitro comes with a "Terms of Use" statement linked from the footer.
                 The "Site Name" you assign in the "Site Information" form under the <strong>Site Admin</strong>
-                area will be inserted into the "Terms of Use" 
-                statement.  If you want to edit the text content more than just  the 
+                area will be inserted into the "Terms of Use"
+                statement.  If you want to edit the text content more than just  the
                 "Site Name", the file can be found here:
                 <pre>[vitro_source_dir]/webapp/web/templates/freemarker/body/termsOfUse.ftl</pre>
             </p>
             <p>
-            	Your "Terms of Use" statement is also referenced in the Linked Open Data (RDF) 
-            	that your site produces, so you should be sure that it accurately reflects 
+            	Your "Terms of Use" statement is also referenced in the Linked Open Data (RDF)
+            	that your site produces, so you should be sure that it accurately reflects
             	the way that your data may be used.
             </p>
             <p>
-                Be sure to make the changes in your source files and deploy them to your 
+                Be sure to make the changes in your source files and deploy them to your
                 tomcat so you don't lose your changes next time you deploy for another reason.
             </p>
             <h3>Next Steps</h3>
diff --git a/legacy/doc/license.txt b/legacy/doc/license.txt
index dc0434a55..51ba5852a 100644
--- a/legacy/doc/license.txt
+++ b/legacy/doc/license.txt
@@ -1,7 +1,7 @@
 Copyright (c) ${year}, Cornell University
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without 
+Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
     * Redistributions of source code must retain the above copyright notice,
@@ -10,16 +10,16 @@ modification, are permitted provided that the following conditions are met:
       this list of conditions and the following disclaimer in the documentation
       and/or other materials provided with the distribution.
     * Neither the name of Cornell University nor the names of its contributors
-      may be used to endorse or promote products derived from this software 
+      may be used to endorse or promote products derived from this software
       without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE 
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/legacy/opensocial/build_orng.xml b/legacy/opensocial/build_orng.xml
index 2f94c2ccf..fe9a9c2fb 100644
--- a/legacy/opensocial/build_orng.xml
+++ b/legacy/opensocial/build_orng.xml
@@ -2,16 +2,16 @@
 
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<!-- ====================================================================== 
-     Build script for the ORNG Shindig webapp. 
-     
+<!-- ======================================================================
+     Build script for the ORNG Shindig webapp.
+
      This can be used on its own, or invoked from the "orng" target of the main build file.
      ====================================================================== -->
 
 <project name="ORNG-shindig" default="describe">
 
-	<!-- ================================= 
-          target: describe              
+	<!-- =================================
+          target: describe
          ================================= -->
 	<target name="describe" description="--> Describe the targets (this is the default).">
 		<echo>
@@ -21,13 +21,13 @@ deploy   - Configure the application and deploy directly into the Tomcat webapps
 	    </echo>
 	</target>
 
-	<!-- ================================= 
-          target: all              
+	<!-- =================================
+          target: all
          ================================= -->
 	<target name="all" depends="clean, deploy" description="--> Run 'clean', then 'deploy'" />
 
-	<!-- - - - - - - - - - - - - - - - - - 
-          target: properties                      
+	<!-- - - - - - - - - - - - - - - - - -
+          target: properties
          - - - - - - - - - - - - - - - - - -->
 	<target name="properties">
 		<property name="build.properties.file" location="../webapp/config/build.properties" />
@@ -39,7 +39,7 @@ deploy   - Configure the application and deploy directly into the Tomcat webapps
 				</not>
 			</condition>
 		</fail>
-		
+
 		<property file="${build.properties.file}" />
 
 		<fail unless="tomcat.home" message="${build.properties.file} must contain a value for tomcat.home" />
@@ -48,14 +48,14 @@ deploy   - Configure the application and deploy directly into the Tomcat webapps
 
 		<property name="runtime.properties.file" location="${vitro.home}/runtime.properties" />
 
-		<fail message="The runtime properties file &quot;${runtime.properties.file}&quot; does not exist."> 
+		<fail message="The runtime properties file &quot;${runtime.properties.file}&quot; does not exist.">
 			<condition>
 				<not>
 					<available file="${runtime.properties.file}" />
 				</not>
 			</condition>
 		</fail>
-		
+
 		<property file="${runtime.properties.file}" />
 
 		<fail unless="VitroConnection.DataSource.url" message="${runtime.properties.file} must contain a value for VitroConnection.DataSource.url" />
@@ -110,16 +110,16 @@ deploy   - Configure the application and deploy directly into the Tomcat webapps
 		<property name="shindig.properties.template.file" location="${basedir}/shindigorng.properties.template" />
 		<property name="shindig.properties.modified.file" location="${build.shindig.dir}/shindigorng.properties" />
 		<property name="shindig.properties.deployed.file" location="${shindig.config.dir}/shindigorng.properties" />
-		
+
 		<!-- sample-gadgets webapp -->
 		<property name="sample.webapp.original.dir" location="./sample-gadgets" />
 		<property name="sample.webapp.deployed.dir" location="${tomcat.webapps.dir}/sample-gadgets" />
-		
+
 
 	</target>
 
-	<!-- ================================= 
-          target: clean              
+	<!-- =================================
+          target: clean
          ================================= -->
 	<target name="clean" depends="properties" description="--> Delete all artifacts">
 		<delete includeemptydirs="true" failonerror="false">
@@ -130,8 +130,8 @@ deploy   - Configure the application and deploy directly into the Tomcat webapps
 		</delete>
 	</target>
 
-	<!-- - - - - - - - - - - - - - - - - - 
-          target: prepare                      
+	<!-- - - - - - - - - - - - - - - - - -
+          target: prepare
          - - - - - - - - - - - - - - - - - -->
 	<target name="prepare" depends="properties">
 		<mkdir dir="${build.dir}" />
@@ -141,8 +141,8 @@ deploy   - Configure the application and deploy directly into the Tomcat webapps
 		<mkdir dir="${shindig.config.dir}" />
 	</target>
 
-	<!-- - - - - - - - - - - - - - - - - - 
-          target: modifyPropertiesFile                      
+	<!-- - - - - - - - - - - - - - - - - -
+          target: modifyPropertiesFile
          - - - - - - - - - - - - - - - - - -->
 	<target name="modifyPropertiesFile" depends="properties, prepare">
 		<copy file="${shindig.properties.template.file}" toFile="${shindig.properties.modified.file}">
@@ -157,8 +157,8 @@ deploy   - Configure the application and deploy directly into the Tomcat webapps
 		</copy>
 	</target>
 
-	<!-- ================================= 
-          target: deploy              
+	<!-- =================================
+          target: deploy
          ================================= -->
 	<target name="deploy" depends="modifyPropertiesFile" description="--> Deploy the application directly into the Tomcat webapps directory.">
 		<copy file="${shindig.properties.modified.file}" tofile="${shindig.properties.deployed.file}" />
@@ -168,4 +168,4 @@ deploy   - Configure the application and deploy directly into the Tomcat webapps
 		</copy>
 	</target>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/legacy/opensocial/sample-gadgets/Links.xml b/legacy/opensocial/sample-gadgets/Links.xml
index fc5f877e6..d2313989f 100644
--- a/legacy/opensocial/sample-gadgets/Links.xml
+++ b/legacy/opensocial/sample-gadgets/Links.xml
@@ -14,28 +14,28 @@
 	<Content type="html" view="default, home, profile">
 	<![CDATA[<!--HTML-->
     <!DOCTYPE html>
-    
+
 	<!-- #includes -->
 	<link rel="stylesheet" href="css/gadget.css" type="text/css" media="screen, projection" >
-    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.js"></script>    
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.js"></script>
     <script type="text/javascript" src="js/os.js" ></script>
-    
+
 	<style>
     	.links_title { font-family:Verdana, Arial; font-size: 14px; }
     	.links_body { font-family:Arial; font-size: 12px; }
     	.links_credit { font-family:Arial; font-size:10px; }
-	.links_save_button { height:20px; font-size:11px; } 
+	.links_save_button { height:20px; font-size:11px; }
     	a, a:visited { color: #0088CC; text-decoration: none; }
     	a:hover { color: #005580; text-decoration: underline; }
     </style>
-	
+
 	<script type="text/javascript">
-	
+
     	var g_max_links = 5;
 		var g_oLinks = []; // declare it like this to make json work
-		
+
 		// ========================================
-		
+
 		function sort_by (field, reverse, primer) {
 			reverse = (reverse) ? -1 : 1;
 			return function(a,b) {
@@ -51,100 +51,100 @@
 			}
 		}
 		// ========================================
-		
-		
+
+
 		// ========================================
-		
+
 		function deleteArrayItem (array_index) {
 			g_oLinks.splice(array_index,1);
-			
+
 			// write links data to gadget database
 			osapi.appdata.update({'userId': '@viewer', 'appId': '@app', 'data': {'links' : gadgets.json.stringify(g_oLinks)} }).execute(function(result) {
-				if (result.error) { 
+				if (result.error) {
 					alert("Error " + result.error.code + " writing application data: " + result.error.message + ". Your edited link list was not saved.");
 				}
 			});
-			
+
 			// show links w/o deleted item even if data write fails - array already spliced
 			displayData();
 		}
 		// ========================================
-		
-		
+
+
 		// ========================================
-		
+
 		function readData(callback) {
 			osapi.appdata.get({'userId': '@owner', 'appId':'@app', 'fields' : ['links']} ).execute(function(result){
-				
+
 			// get incoming link data (in json string format)
 			var viewer = os.osapi.getViewerFromResult(result);
-	
+
 			// convert to json object format
 			g_oLinks = gadgets.json.parse(viewer.links) || [];
-			
+
 			// execute the callback;
 			callback();
-				
-			}); /* end osapi.appdata.get */			
+
+			}); /* end osapi.appdata.get */
 		}
-		// ========================================		
-	
-	
 		// ========================================
-		
+
+
+		// ========================================
+
 		function displayData() {
-				
+
 			// if links data exists
 			if (g_oLinks) {
-										
+
 				// sort object by link name, case-insensitive, A-Z
 				g_oLinks.sort(sort_by('link_name', false, function(a){return a.toUpperCase()}));
-				
+
 				if (document.getElementById("edit_links_table")){
-				
+
                 	// EDIT MODE - build table to hold retrieved app data
                 	var links_table_data = "<table cellspacing='10' cellpadding='0' border='0'><tr>";
 					var favicon_path_array;
-                    
+
 					for (i in g_oLinks) {
 						cell_name = g_oLinks[i].link_name;
 						cell_url = g_oLinks[i].link_url;
 						cell_url2 = g_oLinks[i].link_url;
-							
+
 						favicon_path_array = cell_url.split("//");
 						cell_url2 = favicon_path_array[1];
 						favicon_path_array = cell_url2.split("/");
 						cell_url2 = favicon_path_array[0];
 						cell_favicon="<img height='16' width=16' src='http://www.google.com/s2/favicons?domain=" + cell_url2 + "' />";
-                            
+
 						// build and add table row
 						links_table_data = links_table_data
 							+ "<tr>" + "<td>" + cell_favicon + "</td>"
 							+ "<td>" + "<a href='" + cell_url + "' target='_blank'>" + cell_name + "</a></td>"
 							+ "<td>" + cell_url + "</td>"
-							+ "<td><input type='button' class='links_save_button' value='Delete' onClick='deleteArrayItem(" 
+							+ "<td><input type='button' class='links_save_button' value='Delete' onClick='deleteArrayItem("
 							+ i + ")'" + "></td>" + "</tr>";
 					}
-                    
+
                 	// close the table
                 	links_table_data = links_table_data + "</tr></table>";
-                        
+
                 	// put appdata table markup in designated div
                 	// and set height based on which view view this is
 					document.getElementById("edit_links_table").innerHTML=links_table_data;
 					gadgets.window.adjustHeight(250 + ((g_oLinks.length - 1) * 28 * 2) + 10 );
 				}
-				
-				if(document.getElementById("view_links_table")){				
-					
+
+				if(document.getElementById("view_links_table")){
+
                 	// VIEW MODE - build table to hold retrieved app data
 					links_table_data = "<table cellspacing='10' cellpadding='0' border='0'><tr>";
-                    
+
 					for (i in g_oLinks) {
 						cell_name = g_oLinks[i].link_name;
 						cell_url = g_oLinks[i].link_url;
 						cell_url2 = g_oLinks[i].link_url;
-							
+
 						favicon_path_array = cell_url.split("//");
 						cell_url2 = favicon_path_array[1];
 						favicon_path_array = cell_url2.split("/");
@@ -155,14 +155,14 @@
 						links_table_data = links_table_data
 							+ "<tr>" + "<td>" + cell_favicon + "</td>"
 							+ "<td onClick=\"gadgetEventTrack('go_to_website', cell_name)\">" + "<a href='" + cell_url + "' target='_blank'>" + cell_name + "</a></td>" + "</tr>";
-					}                    
+					}
                 			// close the table
                 			links_table_data = links_table_data + "</tr></table>";
-                        
+
                 			// put appdata table markup in designated div
 					document.getElementById("view_links_table").innerHTML=links_table_data;
 					if (g_oLinks.length > 0) {
-						gadgets.window.adjustHeight( 12 + ((g_oLinks.length - 1) * 30) + 34 );					
+						gadgets.window.adjustHeight( 12 + ((g_oLinks.length - 1) * 30) + 34 );
 					}
 					else {
 						gadgets.pubsub.publish("hide");
@@ -171,10 +171,10 @@
 			} /* end if link data exists */
 		}
 		// ========================================
-		
-		
+
+
 		// ========================================
-		
+
 		function saveData() {
 
 			// get link name and url from form
@@ -182,24 +182,24 @@
                var new_link_url=document.getElementById("linkurl").value;
 
 			if (g_oLinks.length < g_max_links || !g_oLinks) {
-				
+
 				// check for empty input boxes
 				if(new_link_name=="" || new_link_url==""){
 					alert("Please provide both a Link Name and a URL");
 					return;
 				}
-				
+
 				// prepend http header if missing
 				if(new_link_url.indexOf("://") == -1){new_link_url = "http://" + new_link_url;}
 
 				var newLinkNdx = g_oLinks.length;
-				g_oLinks[newLinkNdx] = {};							
-				g_oLinks[newLinkNdx].link_name = new_link_name;							
-				g_oLinks[newLinkNdx].link_url = new_link_url;							
+				g_oLinks[newLinkNdx] = {};
+				g_oLinks[newLinkNdx].link_name = new_link_name;
+				g_oLinks[newLinkNdx].link_url = new_link_url;
 
 				// write links data to gadget database
 				osapi.appdata.update({'userId': '@viewer', 'appId': '@app', 'data': {'links' : gadgets.json.stringify(g_oLinks)} }).execute(function(result) {
-					if (result.error) { 
+					if (result.error) {
 						alert("Error " + result.error.code + " writing application data: " + result.error.message);
 					} else {
 
@@ -210,7 +210,7 @@
 						alert("Your links information is saved. Don't forget to use the Hide / Show links to make this section visible or hidden on your profile page.");
 					}
 				});
-				
+
 			} else {
 				alert("You already have the maximum number of links.");
 			}
@@ -218,32 +218,32 @@
 	// ==============================================================
 
 	function gadgetEventTrack(action, label, value) {
-	
+
 		var message = {'action' : action};
 		if (label) {message.label = label;}
 		if (value) {message.value = value;}
-		
+
 		gadgets.pubsub.publish("analytics", message);
-	}	
+	}
 	// ==============================================================
-        		
+
 	</script>
-    
+
     ]]></Content>
 	<!-- ==================== END COMBINED VIEWS ==================== -->
 
 	<!-- ==================== START HOME/EDIT VIEW ==================== -->
 	<Content type="html" view="home" preferred_height="300" preferred_width="700">
 	<![CDATA[<!--HTML-->
-    	
+
     <h3 style="padding-left:10px; padding-top: 0px;">Manage Links to Other Websites</h3>
 
     <div style="padding:5px 0px 0px 25px;">
-    	Add up to five  websites to your profile. 
-		Enter the website name, as you want it to appear on your profile, and its URL. 
+    	Add up to five  websites to your profile.
+		Enter the website name, as you want it to appear on your profile, and its URL.
         Some samples include a link to your lab web site, your research program or your research blog.<br /><br />
 	</div>
-	
+
 	<!-- display the new link input fields -->
 	<div class='question' style="padding:0px 0px 5px 12px;">
 		<table cellpadding="0" cellspacing="0">
@@ -260,19 +260,19 @@
                 </td>
                 <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
                 <td><br /><br /><input type="button" style="margin-bottom: 8px;" value="Save" onClick="saveData();"></td>
-			</tr>				
-		</table>			
+			</tr>
+		</table>
 	</div>
-    
+
     <h4 style="padding-left:10px; padding-top: 0px;">Your Current Websites:</h4>
     <div id="edit_links_table" style="padding:0px 0px 10px 25px;"></div>
-            
+
     <script type="text/javascript">
     	gadgets.util.registerOnLoadHandler(function() {
 			readData(displayData)
 		});
     </script>
-            
+
     ]]></Content>
 	<!-- ==================== END HOME/EDIT VIEW ==================== -->
 
@@ -280,15 +280,15 @@
 	<!-- ==================== START PROFILE VIEW ==================== -->
 	<Content type="html" view="profile" preferred_height="100" preferred_width="670">
 	<![CDATA[<!--HTML-->
-   
-    <div id="view_links_table" style="padding:0px 0px 10px 20px;"></div>     
-   
+
+    <div id="view_links_table" style="padding:0px 0px 10px 20px;"></div>
+
 	<script type="text/javascript">
     	gadgets.util.registerOnLoadHandler(function() {
 			readData(displayData)
 		});
     </script>
-    
+
     ]]></Content>
 	<!-- ==================== END PROFILE VIEW ==================== -->
 
diff --git a/legacy/opensocial/sample-gadgets/Mentor.xml b/legacy/opensocial/sample-gadgets/Mentor.xml
index 718903deb..e1029aed3 100644
--- a/legacy/opensocial/sample-gadgets/Mentor.xml
+++ b/legacy/opensocial/sample-gadgets/Mentor.xml
@@ -13,12 +13,12 @@
 
 	<Content type="html" view="default, home, profile"><![CDATA[<!--HTML-->
     <!DOCTYPE html>
-    
+
     <!-- #includes -->
     <link rel="stylesheet" href="css/gadget.css" type="text/css" media="screen, projection" >
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.js"></script>
     <script type="text/javascript" src="js/os.js" ></script>
-	
+
 	<style>
     	.mentor_title {
     		font-family: Verdana, Arial;
@@ -31,7 +31,7 @@
     	.mentor_credit {
     		font-family: Arial;
     		font-size: 10px;
-    	}      	
+    	}
     	.mentor_list {
     		font-family: Arial;
     		font-size: 11px;
@@ -40,132 +40,132 @@
     		font-family: Arial;
     		font-size: 12px;
     		font-weight: normal;
-    	}      	
+    	}
     	a, a:visited { color: #0088CC; text-decoration: none; }
     	a:hover { color: #005580; text-decoration: underline; }
     </style>
-	
+
     <script type="text/javascript">
-	
+
 		var g_chars_allowed=2000;
 		var g_textarea_content="";
-	
+
 		function limit_chars(){
-			num_chars = document.getElementById("facultyNarrative").value.length; 
+			num_chars = document.getElementById("facultyNarrative").value.length;
 			if (num_chars > g_chars_allowed) {
 				alert("Your narrative exceeds the maximum number of characters.");
 				document.getElementById("facultyNarrative").value = g_textarea_content;
 			}
-			else { 
-				g_textarea_content = document.getElementById("facultyNarrative").value; 
+			else {
+				g_textarea_content = document.getElementById("facultyNarrative").value;
 			}
 		}
 		// ==============================================================
 
 		function gadgetEventTrack(action, label, value) {
-	
+
 			var message = {'action' : action};
 			if (label) {message.label = label;}
 			if (value) {message.value = value;}
-		
+
 			gadgets.pubsub.publish("analytics", message);
-		}	
-		// ==============================================================		
-    
+		}
+		// ==============================================================
+
 		function displayMentorAppData() {
-		
+
 			var fields = ["careerMentor", "coMentor", "leadResearch", "projectMentor",
-							"contactEmail", "contactPhone", "contactAssistant", 
-							"assistantName", "assistantEmail", "assistantPhone", 
+							"contactEmail", "contactPhone", "contactAssistant",
+							"assistantName", "assistantEmail", "assistantPhone",
 							"narrative", "lastUpdate"];
-		
+
 			osapi.appdata.get( {'userId': '@owner', 'appId':'@app', 'fields': fields } ).execute(function(result) {
 
-				if (result.error) { 
+				if (result.error) {
 					alert("Error " + result.error.code + " reading application data: " + result.error.message);
 				} else {
-			
-				// get incoming mentor data 
+
+				// get incoming mentor data
 				var viewer = os.osapi.getViewerFromResult(result);
-	
+
 				if (viewer.careerMentor == "T" && document.getElementById("edit_career_mentor") )
 					document.getElementById("edit_career_mentor").checked = true;
 				if (viewer.coMentor == "T" && document.getElementById("edit_co_mentor") )
-					document.getElementById("edit_co_mentor").checked = true;						
+					document.getElementById("edit_co_mentor").checked = true;
 				if (viewer.leadResearch == "T" && document.getElementById("edit_lead_research") )
-					document.getElementById("edit_lead_research").checked = true;						
+					document.getElementById("edit_lead_research").checked = true;
 				if (viewer.projectMentor == "T" && document.getElementById("edit_project_mentor") )
-					document.getElementById("edit_project_mentor").checked = true;	
-					
+					document.getElementById("edit_project_mentor").checked = true;
+
 				if (viewer.contactEmail == "T" && document.getElementById("edit_email"))
 					document.getElementById("edit_email").checked = true;
 				if (viewer.contactPhone == "T" && document.getElementById("edit_phone"))
 					document.getElementById("edit_phone").checked = true;
 				if (viewer.contactAssistant == "T" && document.getElementById("edit_assistant"))
-					document.getElementById("edit_assistant").checked = true;								
+					document.getElementById("edit_assistant").checked = true;
 
-				if (viewer.assistantName && document.getElementById("edit_assistant_name") ) 
+				if (viewer.assistantName && document.getElementById("edit_assistant_name") )
 					document.getElementById("edit_assistant_name").value = viewer.assistantName;
 				if (viewer.assistantEmail && document.getElementById("edit_assistant_email") )
 					document.getElementById("edit_assistant_email").value = viewer.assistantEmail;
 				if (viewer.assistantPhone && document.getElementById("edit_assistant_phone") )
 					document.getElementById("edit_assistant_phone").value = viewer.assistantPhone;
-					
+
 				if (viewer.narrative)
 					document.getElementById("facultyNarrative").value = viewer.narrative;
-													
+
 				if (viewer.lastUpdate)
 					document.getElementById("last_updated").innerHTML = viewer.lastUpdate;
-					
+
 				// VIEW MODE - build table to hold retrieved app data
-				
+
 				var view_window_height=80;
 				var mentor_as = "hidden";
 				var mentor_contact = "hidden";
-									  					      
-										
+
+
 				if (viewer.careerMentor == "T" && document.getElementById("mentor_as_career_mentor") && document.getElementById("mentor_as") ) {
 					document.getElementById("mentor_as").style.display = "block";
 					document.getElementById("mentor_as_career_mentor").style.display = "block";
 					view_window_height += 20;
 					mentor_as = "visible";
 				}
-							
+
 				if (viewer.coMentor == "T" && document.getElementById("mentor_as_co_mentor") && document.getElementById("mentor_as") ) {
 					document.getElementById("mentor_as").style.display = "block";
 					document.getElementById("mentor_as_co_mentor").style.display = "block";
 					view_window_height += 20;
 					mentor_as = "visible";
 				}
-							
+
 				if (viewer.leadResearch == "T" && document.getElementById("mentor_as_lead_research") && document.getElementById("mentor_as") ) {
 					document.getElementById("mentor_as").style.display = "block";
 					document.getElementById("mentor_as_lead_research").style.display = "block";
 					view_window_height += 20;
 					mentor_as = "visible";
 				}
-							
-				if (viewer.projectMentor == "T" && document.getElementById("mentor_as_project_mentor") && document.getElementById("mentor_as") ) {								
+
+				if (viewer.projectMentor == "T" && document.getElementById("mentor_as_project_mentor") && document.getElementById("mentor_as") ) {
 					document.getElementById("mentor_as").style.display = "block";
 					document.getElementById("mentor_as_project_mentor").style.display = "block";
 					view_window_height += 20;
 					mentor_as = "visible";
 				}
-							
-				if (viewer.contactEmail == "T" && document.getElementById("mentor_contact_email") && document.getElementById("mentor_contact") ) {		
+
+				if (viewer.contactEmail == "T" && document.getElementById("mentor_contact_email") && document.getElementById("mentor_contact") ) {
 					document.getElementById("mentor_contact").style.display = "block";
 					document.getElementById("mentor_contact_email").style.display = "block";
 					view_window_height += 20;
 					mentor_contact = "visible";
 				}
-															
+
 				if (viewer.contactPhone == "T" && document.getElementById("mentor_contact_phone") && document.getElementById("mentor_contact") ) {
 					document.getElementById("mentor_contact").style.display = "block";
 					document.getElementById("mentor_contact_phone").style.display = "block";
 					view_window_height += 20;
 					mentor_contact = "visible";
 				}
-						
+
 				if (viewer.contactAssistant == "T" && document.getElementById("mentor_contact_assistant") && document.getElementById("mentor_contact") ) {
 					document.getElementById("mentor_contact").style.display = "block";
 					document.getElementById("mentor_contact_assistant").style.display = "block";
@@ -179,52 +179,52 @@
 					document.getElementById("mentor_assistant_name").innerHTML += viewer.assistantName;
 					view_window_height += 20;
 				}
-							
+
 				if (viewer.assistantEmail && document.getElementById("mentor_assistant") && document.getElementById("mentor_assistant_email") ) {
 					document.getElementById("mentor_assistant_email").style.display = "block";
 					document.getElementById("mentor_assistant_email").innerHTML += viewer.assistantEmail;
 					view_window_height += 20;
 				}
-							
+
 				if (viewer.assistantPhone && document.getElementById("mentor_assistant") && document.getElementById("mentor_assistant_phone") ) {
 					document.getElementById("mentor_assistant_phone").style.display = "block";
 					document.getElementById("mentor_assistant_phone").innerHTML += viewer.assistantPhone;
 					view_window_height += 20;
 				}
-					
+
 				if (viewer.narrative) {
 						document.getElementById("facultyNarrative").style.display = "block";
 						var p_chars = viewer.narrative;
-								
-					// count the characters	and calculate number of rows								
-					p_num_chars = p_chars.length;									
+
+					// count the characters	and calculate number of rows
+					p_num_chars = p_chars.length;
 					document.getElementById("facultyNarrative").innerHTML = p_chars;
 					p_lines = Math.round(p_num_chars / 100);
 					if (p_lines < 1) {p_lines = 1}
 					view_window_height += (p_lines * 15);
-																	
+
 					// note works in FF but not IE:
 					// view_window_height += document.getElementById('facultyNarrative').offsetHeight;
 				}
-							
+
 				if (viewer.lastUpdated)
 						document.getElementById("last_updated").innerHTML = viewer.lastUpdated;
-				
+
 				if (mentor_as == "visible") {view_window_height += 20};
 				if (mentor_contact == "visible") {view_window_height += 20};
-				
+
 				// adjust the window height - only do this here if in profile VIEW (not in EDIT)
-				if (document.getElementById("mentor_as")) { 
+				if (document.getElementById("mentor_as")) {
 					gadgets.window.adjustHeight(view_window_height);
 				}
-				
+
 			} /* end else */
-					
-			}); /*osapi.appdata.get*/	
+
+			}); /*osapi.appdata.get*/
 		}
-		
+
 		function saveMentorAppData() {
-		
+
 			var mentor_today = new Date();
 			var weekday=new Array(7);
 			weekday[0]="Sunday";
@@ -234,7 +234,7 @@
 			weekday[4]="Thursday";
 			weekday[5]="Friday";
 			weekday[6]="Saturday";
-			
+
 			var month=new Array(12);
 			month[0]="January";
 			month[1]="February";
@@ -247,43 +247,43 @@
 			month[8]="September";
 			month[9]="October";
 			month[10]="November";
-			month[11]="December";			
-			
+			month[11]="December";
+
 			var mentor_day = weekday[mentor_today.getDay()]
 			var mentor_month = month[mentor_today.getMonth()]
 			var mentor_date = mentor_today.getDate();
 			var mentor_year = mentor_today.getFullYear();
-			var current_date = mentor_day + " " + mentor_month + " " + mentor_date + ", " + mentor_year;			
-			
-			// pack the data into an Object (md for mentor data) 
-			// with property names that match the values in the "fields" array 
-			// used by osapi.appdate.get in displayMentorAppData							
+			var current_date = mentor_day + " " + mentor_month + " " + mentor_date + ", " + mentor_year;
+
+			// pack the data into an Object (md for mentor data)
+			// with property names that match the values in the "fields" array
+			// used by osapi.appdate.get in displayMentorAppData
 			var md = {};
-			
+
 			md.careerMentor = document.getElementById("edit_career_mentor").checked ? "T" : "F";
 			md.coMentor = document.getElementById("edit_co_mentor").checked ? "T" : "F";
 			md.leadResearch = document.getElementById("edit_lead_research").checked ? "T" : "F";
 			md.projectMentor = document.getElementById("edit_project_mentor").checked ? "T" : "F";
-			
+
 			md.contactEmail = document.getElementById("edit_email").checked ? "T" : "F";
 			md.contactPhone = document.getElementById("edit_phone").checked ? "T" : "F";
 			md.contactAssistant = document.getElementById("edit_assistant").checked ? "T" : "F";
-			
+
 			md.assistantName = document.getElementById("edit_assistant_name").value;
 			md.assistantEmail = document.getElementById("edit_assistant_email").value;
 			md.assistantPhone = document.getElementById("edit_assistant_phone").value;
 			md.narrative = document.getElementById("facultyNarrative").value;
 			md.lastUpdate = current_date;
-			
+
             osapi.appdata.update({'userId': '@viewer', 'appId':'@app', 'data':md }).execute(function(result) {
-				if (result.error) { 
+				if (result.error) {
 					alert("Error " + result.error.code + " writing application data: " + result.error.message);
-				} 
+				}
 			});
 		}
 
     </script>
-    
+
     ]]></Content>
 
 	<!-- ==================== END COMBINED VIEWS ==================== -->
@@ -292,23 +292,23 @@
 	<!-- ==================== START HOME/EDIT VIEW ==================== -->
 
 	<Content type="html" view="default, home" preferred_width="700"><![CDATA[<!--HTML-->
-    	    	
+
 	<h4 style="padding-left:12px;">Add Faculty Mentoring to Your Profile</h4>
-	
+
     <div id='AddEdit' style="padding:15px 0px 0px 12px;">
-		Add details about your availability to mentor UCSF faculty. 
-		Learn about the <a href="http://academicaffairs.ucsf.edu/ccfl/faculty_mentoring_program.php" target="_blank" title="Go to the UCSF Faculty Mentoring Website">Faculty Mentoring Program</a> 
+		Add details about your availability to mentor UCSF faculty.
+		Learn about the <a href="http://academicaffairs.ucsf.edu/ccfl/faculty_mentoring_program.php" target="_blank" title="Go to the UCSF Faculty Mentoring Website">Faculty Mentoring Program</a>
 		and the <a href="http://ctsi.ucsf.edu/training/mdp-announcement" target="_blank" title="Go to the CTSI MDP Web page">CTSI&nbsp;Mentor&nbsp;Development&nbsp;Program</a>
 		<br /><br />
 	</div>
-		
-		
+
+
 	<div>
 		<div style="float:left;">
 			<span class="mentor_message">&nbsp;&nbsp;&nbsp;
 			Be sure to <b>SAVE</b> your work below.</span>
 		</div>
-		
+
 		<div class="updated" style="float:right; display:block; text-align:left; padding-right:10px; font-size: 10px;">
 			Last Updated: <span id="last_updated" style="font-size: 10px;"></span>
 		</div>
@@ -328,11 +328,11 @@
 				<td valign="middle" class="mentor_list">
 				<input id="edit_lead_research" type="checkbox">Lead Research / Scholarly Mentor&nbsp;&nbsp;&nbsp;&nbsp;</td>
 				<td valign="middle" class="mentor_list">
-				<input id="edit_project_mentor" type="checkbox">Project Mentor</td>	
+				<input id="edit_project_mentor" type="checkbox">Project Mentor</td>
 			</tr>
 		</table>
-	</div>	
-	
+	</div>
+
 	<div class='question'>
 		<h4>My Contact Preference:</h4>
 		<table cellspacing="0" cellpadding="15">
@@ -349,7 +349,7 @@
 			</tr>
 		</table>
 	</div>
-	
+
 	<div class='question' style="padding:0px 0px 0px 10px;">
 		<span class="mentor_list"><b>Assistant Details</b></span><br>
 		<fieldset class='details roundbox'>
@@ -369,23 +369,23 @@
 					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
 					<td><label class='textlabel'>Phone</label>
 					<input id="edit_assistant_phone"></td>
-				</tr>				
-			</table>			
+				</tr>
+			</table>
 
 		</fieldset>
 	</div>
-	
+
 	<div class='question'>
 		<h4>Mentoring Narrative:&nbsp;<img src="images/hovertiptarget.png" border="0" onClick="document.getElementById('sample').style.display='block';">
 		<span class="mentor_message">&nbsp;&nbsp;Be sure to <b>SAVE</b> your work below.</span></h4>
-		
+
 		<div id="sample" style="display:none; border:1px solid #383838; padding:10px 10px 10px 10px; margin:10px; height:160px;">
-		
+
 			<div style="padding-bottom: 5px;">
 			<button style="float:right;" onClick="document.getElementById('sample').style.display='none';">Close</button><br>
 			<center><b>Sample Mentor Narratives</b> (cut and paste to create your own)</center><br>
 			</div>
-			
+
 			<div style="height:110px; padding: 0px 0px 0 5px;overflow:auto;">
 			EXAMPLE 1:<br />
 			Dr. Brown is willing to mentor faculty, fellows, residents and students interested in an academic research career.  Most often her mentees have had training in clinical research methods or will obtain training through the CTSI CTST.  For students, it is expected they will have dedicated time for research. Through email or meeting, if there is a “match� for research interest, time, and training, further discussions as to project, goals, and access to resources (space, databases, and  statistical support) will be discussed to provide a productive experience.
@@ -394,17 +394,17 @@
 			I am highly qualified to participate as a lead mentor or co-mentor at UCSF. My program of research is focused on health outcomes associated with disturbed sleep in various populations of healthy women and women with chronic illnesses like HIV/AIDS and cancer.  I have completed cross-sectional studies, longitudinal studies, and most recently, randomized clinical trials to improve sleep.  I have mentored doctoral students and postdoctoral fellows studying various patient populations, from the very young to very old.  During my tenure at UCSF, I have directly supervised over 30 doctoral students, mentored 14 postdoctoral trainees, and served as a lead mentor for 6 pre-tenured faculty. I have been the Director for a T32 Nurse Research Training Grant since 1996, and I have been honored with being voted mentor of the year by doctoral students on two occasions.  I play a significant role in the clinical and translational (CTSI) research mentoring and career development programs at UCSF.  I am the seminar leader for the first session in the CTSI Mentor Development program on “Rewards and Challenges of Mentoring� and I have co-mentored two KL2 scholars.  I have published over 50 peer-reviewed research articles with trainees as first-author, and serve as a consultant on two external K awards as well as three external R01 awards with former mentees.  Finally, I have served on many different NIH study section review panels, and I served as the Chair of an NIH study section (2008-2010), which allows me to be particularly effective in mentoring early career principal investigators who are writing their first NIH applications.
  			<br><br>
 			I can provide mentees a cubicle space with my research team, tangible resources such as access to large datasets for secondary analysis as needed, and intangible resources such as attending our formal research team meetings and our informal spontaneous group discussions as well as networking at national sleep research conferences.
-			
+
  			</div>
- 		
+
  		</div>
-		
+
 		<fieldset>
 			<textarea id="facultyNarrative" rows='9' cols='72' class='roundbox' style="margin-left:12px;" name="facultyNarrative" onKeyDown="limit_chars()" onKeyUp="limit_chars()" onMouseout="limit_chars()"></textarea>
 			<span style="margin-left:12px;white-space:nowrap">(2000 characters max)</span>
-		</fieldset>		
+		</fieldset>
 	</div>
-	
+
 	<div>
 		<center>
 			<input type="button" onClick="saveMentorAppData();" value="Save">
@@ -412,12 +412,12 @@
 			<input type="button" onClick="displayMentorAppData()" value="Cancel">
 		</center>
 	</div>
-	
+
 	<script type="text/javascript" >
     	// retrieve last-saved data and map it to the fields in the markup
     	displayMentorAppData();
     	gadgets.window.adjustHeight(700);
-	</script>  
+	</script>
 
     ]]></Content>
 
@@ -427,7 +427,7 @@
 	<!-- ==================== START PROFILE VIEW ==================== -->
 
 	<Content type="html" view="default, profile" preferred_width="670"><![CDATA[<!--HTML-->
-    
+
 	<div class="updated" style="display:block; text-align:left; padding: 5px 10px 10px 0; font-size: 10px;">
 		Last Updated: <span id="last_updated" style="font-size: 10px;"></span>
 	</div>
@@ -435,7 +435,7 @@
     <div>
 		<p id="facultyNarrative" style="margin-left:20px; margin-right:20px; font-family:Arial; font-size:12px; display:none;"></p>
 	</div>
-				
+
 	<div id="mentor_as" style="display:none; margin-left:20px;">
 		<span class='detailtitle'>Available to Mentor as: </span> (<a href="http://ctsi.ucsf.edu/training/mdp-seminar1-definitions" target="_blank" title="Go to the Mentor Role Definitions Web page" onClick="gadgetEventTrack('view_mentor_roles', 'http://ctsi.ucsf.edu/training/mdp-seminar1-definitions'); return true">Review Mentor Role Definitions</a>):
 			<span id="mentor_as_career_mentor" style="display:none; padding-botom:3px;"><span style="font-size:18px;">&nbsp;&nbsp;&nbsp;<b>&middot;</b>&nbsp;</span>Career Mentor</span>
@@ -443,36 +443,36 @@
 			<span id="mentor_as_lead_research" style="display:none; padding-botom:3px;"><span style="font-size:18px;">&nbsp;&nbsp;&nbsp;<b>&middot;</b>&nbsp;</span>Lead Research / Scholarly Mentor</span>
 			<span id="mentor_as_project_mentor" style="display:none; padding-botom:3px;"><span style="font-size:18px;">&nbsp;&nbsp;&nbsp;<b>&middot;</b>&nbsp;</span>Project Mentor</span>
 	</div>
-		
+
 	<div id="mentor_contact" style="padding:10px 0 0 0; display:none; margin-left: 20px;">
 		<span class='detailtitle'>Contact for Mentoring:</span>
 		<ul style="width:400px;">
 			<li id="mentor_contact_email" style="display:none; padding-botom:3px;"><span style="font-size:18px;">&nbsp;&nbsp;&nbsp;<b>&middot;</b>&nbsp;</span>Email (see above)</li>
 			<li id="mentor_contact_phone" style="display:none; padding-botom:3px;"><span style="font-size:18px;">&nbsp;&nbsp;&nbsp;<b>&middot;</b>&nbsp;</span>Phone (see above)</li>
-			<li id="mentor_contact_assistant" style="display:none; padding-botom:3px;"><span style="font-size:18px;">&nbsp;&nbsp;&nbsp;<b>&middot;</b>&nbsp;</span>Assistant</li>		
+			<li id="mentor_contact_assistant" style="display:none; padding-botom:3px;"><span style="font-size:18px;">&nbsp;&nbsp;&nbsp;<b>&middot;</b>&nbsp;</span>Assistant</li>
 		</ul>
 	</div>
-					
+
 	<div id="mentor_assistant" style="padding:5px 0 0 0; display:none; margin-left: 55px;">
 		<div id="mentor_assistant_name" style="display:none; height:20px;">Name:&nbsp;</div>
 		<div id="mentor_assistant_email" style="display:none; height:20px;">Email:&nbsp;</div>
 		<div id="mentor_assistant_phone" style="display:none; height:20px;">Phone:&nbsp;</div>
 	</div>
 
-    <div style="padding:10px 0px 0px 20px;"> 
-		Learn about the <a href="http://academicaffairs.ucsf.edu/ccfl/faculty_mentoring_program.php" target="_blank" title="Go to the UCSF Faculty Mentoring Website" onClick="gadgetEventTrack('go_to_program', 'http://academicaffairs.ucsf.edu/ccfl/faculty_mentoring_program.php'); return true">Faculty Mentoring Program</a> 
+    <div style="padding:10px 0px 0px 20px;">
+		Learn about the <a href="http://academicaffairs.ucsf.edu/ccfl/faculty_mentoring_program.php" target="_blank" title="Go to the UCSF Faculty Mentoring Website" onClick="gadgetEventTrack('go_to_program', 'http://academicaffairs.ucsf.edu/ccfl/faculty_mentoring_program.php'); return true">Faculty Mentoring Program</a>
 		and the <a href="http://ctsi.ucsf.edu/training/mdp-announcement" target="_blank" title="Go to the CTSI | MDP Web page" onClick="gadgetEventTrack('go_to_development', 'http://ctsi.ucsf.edu/training/mdp-announcement'); return true">CTSI Mentor Development Program</a>
 		<br /><br />
 	</div>
-	
+
     <script type="text/javascript">
-	
+
     	displayMentorAppData();
 
-    </script>	
-		
+    </script>
+
     ]]></Content>
 
 	<!-- ==================== END PROFILE VIEW ==================== -->
 
-</Module>
\ No newline at end of file
+</Module>
diff --git a/legacy/opensocial/sample-gadgets/ProfileListTool.xml b/legacy/opensocial/sample-gadgets/ProfileListTool.xml
index cac350a5f..0452541e6 100644
--- a/legacy/opensocial/sample-gadgets/ProfileListTool.xml
+++ b/legacy/opensocial/sample-gadgets/ProfileListTool.xml
@@ -9,13 +9,13 @@
     </ModulePrefs>
     <Content type="html" view="canvas, small"><![CDATA[<!--HTML-->
     <!DOCTYPE html>
-    
+
         <!-- #includes -->
         <link rel="stylesheet" href="css/gadget.css" type="text/css" media="screen, projection" >
     <script type="text/javascript" src="js/os.js" ></script>
         <script type="text/javascript" src="js/jquery-1.4.4.js"></script>
         <script type="text/javascript" src="js/environment.js"></script>
-                
+
         <style>
             .tool_title {font-family:Arial,Helvetica; font-size:14px;}
             .tool_title_orange {font-weight:bold; font-family:Arial,Helvetica; font-size:14px; color:#CA7C29;margin-top:-1px;}
@@ -25,30 +25,30 @@
             .tool_table_cell_small {font-family:Arial,Helvetica;font-size:11px;}
             .tool_table_cell_small span a {font-size:11px;}
         .tool_table_cell_small span {font-size:11px;display:inline-block;margin-right: -15px; }
-            .tool_toggle_button {font-size: 13px;padding:0 5px;}          
+            .tool_toggle_button {font-size: 13px;padding:0 5px;}
             a, a:visited { color: #0088CC; text-decoration: none; }
             a:hover { color: #005580; text-decoration: underline; }
     </style>
 
         <script type="text/javascript">
-        
+
         // ==============================================================
 
         function gadgetEventTrack(action, label, value) {
-        
+
                 var message = {'action' : action};
                 if (label) {message.label = label;}
                 if (value) {message.value = value;}
-                
+
                 gadgets.pubsub.publish("analytics", message);
-        }        
+        }
         // ==============================================================
-        
+
         function showHelp() {
-        
+
                 var pop = window.open('Create a Group Help','','top=200,left=200,width=450,height=340,scrollbars=0,status=0,menubar=0,location=0,resizable=0');
                 pop.document.title = "Create a Group Help";
-                pop.document.write("<html><head></head><body><div style='margin:10px; font-family:Arial; font-size:12px;'>");  
+                pop.document.write("<html><head></head><body><div style='margin:10px; font-family:Arial; font-size:12px;'>");
                 pop.document.write("Create a list of profiles and start a UCSF Chatter group or email list from here. "
                                 + "Here's how:<br><ol>"
                                 + "<li>Click the 'Create Now!' button</li>"
@@ -66,33 +66,33 @@
                                 + "To learn more about UCSF Chatter, go to "
                                 + "<a href='http://it.ucsf.edu/services/chatter' target='_blank'>"
                                 + "http://it.ucsf.edu/services/chatter</a>");
-                pop.document.write("<br><br><center>" 
-                        + "<input type = 'button' value = 'Close' onclick = 'window.close();'>" 
+                pop.document.write("<br><br><center>"
+                        + "<input type = 'button' value = 'Close' onclick = 'window.close();'>"
                         + "</center>");
                 pop.document.write("</body></html>");
         }
         // ==============================================================
-        
+
         function getNewProfilesStats(sender, message) {
         	 var stats = gadgets.json.parse(message);
              // display the action item table and update it
              $("#actions").show();
              if (message === 0) {
-	                document.getElementById("add_profiles").innerHTML = "No Profiles found";             	
+	                document.getElementById("add_profiles").innerHTML = "No Profiles found";
              }
         	 else {
 	                document.getElementById("add_profiles").innerHTML = "<a style='font-size:11px;' href='javascript:addNewProfiles();'>Add " + message + " to list</a>";
         	 }
         }
-        
+
         function addNewProfiles() {
-             document.getElementById("add_profiles").innerHTML = "Adding profiles...";		                    
-             document.getElementById("list_profiles").innerHTML = "Merging into list...";		                    
+             document.getElementById("add_profiles").innerHTML = "Adding profiles...";
+             document.getElementById("list_profiles").innerHTML = "Merging into list...";
              readIdsFromDB(function(existingIds) {
              	gadgets.pubsub.subscribe("JSONPersonIds", getNewIdsCallback(existingIds));
              });
         }
-        
+
         function getNewIdsCallback(existingIds) {
         	return function(sender, message) {
 		        // extract the array of incoming person IDs
@@ -101,7 +101,7 @@
 	            var addedListSize = getListSize(newIds);
 
 	            var priorListSize = getListSize(existingIds);
-	            
+
 	            // merge the incoming and existing person ID arrays
 	            // existing array already populated
 	        	for (var baseURI in newIds) {
@@ -110,7 +110,7 @@
 	        		}
 	       			existingIds[baseURI] = dedupeArray(existingIds[baseURI].concat(newIds[baseURI]));
 	        	}
-	
+
 	            var newListSize = getListSize(existingIds);
 
 	            showCurrentListSize(newListSize);
@@ -122,63 +122,63 @@
 				}
 		        else {
 		            document.getElementById("add_profiles").innerHTML = (addedListSize == 1 ? "Profile already in list" : "Profiles already in list");
-		        }		                
+		        }
         	};
         }
         // ==============================================================
-        
+
         function getListSize(ids) {
             var cnt = 0;
         	for (var baseURI in ids) {
         		cnt += ids[baseURI].length;
         	}
         	return cnt;
-        }   
+        }
         // ==============================================================
-                        
+
         function showCurrentListSize(count) {
         	if (count > 0) {
         		document.getElementById("list_profiles").innerHTML = "<a href='javascript:gadgets.views.requestNavigateTo(\"canvas\");'>" + count + " Profiles in list</a>";
         	}
         	else {
         		document.getElementById("list_profiles").innerHTML = "List is currently empty";
-        	}		                            		
+        	}
         }
 
         function showToolVersion(canvasMode) {
-                
+
                 // fetch the extended state
                 osapi.appdata.get({'userId':'@viewer', 'appId':'@app', 'fields':['extended']} )
-                        .execute(function(result) {                        
+                        .execute(function(result) {
                                 if (os.osapi.getViewerFromResult(result).extended == "True") {
                                         if (canvasMode) {
                                                 document.getElementById("extended_functions").style.display = "inline-block";
                                                 document.getElementById("extended_functions").style.padding = "0 0 0 20px";
-                                                document.getElementById("canvas_help").innerHTML =  
+                                                document.getElementById("canvas_help").innerHTML =
                                                             'Create a UCSF Chatter group or email list that includes the people below. '
-                                                          + 'To manage your UCSF Chatter group after you create it, such as adding or ' 
+                                                          + 'To manage your UCSF Chatter group after you create it, such as adding or '
                                                           + 'removing members, go to UCSF Chatter directly.' ;
 
-                                        }                                                
+                                        }
                                 }
                                 else {
                                         // this is what people who have limited functionality (only chatter group) see
                                         if (canvasMode) {
                                                 document.getElementById("basic_functions").style.display = "inline-block";
                                                 document.getElementById("basic_functions").style.padding = "0 0 0 20px";
-                                                document.getElementById("canvas_help").innerHTML =  
+                                                document.getElementById("canvas_help").innerHTML =
                                                             'Create a UCSF Chatter group that includes the people below. '
-                                                          + 'To manage your group after you create it, such as adding or ' 
+                                                          + 'To manage your group after you create it, such as adding or '
                                                           + 'removing members, go to UCSF Chatter directly.' ;
-                                        }                                                
+                                        }
                                 }
                                 // if we are not in canvas mode, show the On/Off state correctly
-                                if (!canvasMode) {   
+                                if (!canvasMode) {
                                 	readCountFromDB( function(count) {
                                 		showCurrentListSize(count);
-                                	});                             	
+                                	});
                                 	gadgets.pubsub.subscribe("PersonResultCount", getNewProfilesStats);
-                                }        
+                                }
                         });
         }
         // ==============================================================
@@ -192,16 +192,16 @@
         	}
         	return uriList;
         }
-        
-        // first argument is an map of data, 
-    	// second argument is the callback function to execute after updating the data    	    	     
-   	function saveData(ids, callback) {   
+
+        // first argument is an map of data,
+    	// second argument is the callback function to execute after updating the data
+   	function saveData(ids, callback) {
             	osapi.appdata.update({'userId': '@viewer', 'appId':'@app', 'data': {'count' : '' + getListSize(ids), 'ids' : gadgets.json.stringify(ids)}}).execute(callback);
 	    }
         // ==============================================================
-        
+
 	    function readCountFromDB(callback) {
-	        osapi.appdata.get({'userId':'@viewer', 'appId':'@app', 'fields':'count'}).execute(function(result) {	                        
+	        osapi.appdata.get({'userId':'@viewer', 'appId':'@app', 'fields':'count'}).execute(function(result) {
 			 	// a map of {baseURI1 : ["string", "string"], baseURI2 : ["string", "string"]}
 	        	var count = os.osapi.getViewerFromResult(result).count || 0;
 	        	callback(count);
@@ -209,59 +209,59 @@
 	    }
 
 	    function readIdsFromDB(callback) {
-	        osapi.appdata.get({'userId':'@viewer', 'appId':'@app', 'fields':'ids'}).execute(function(result) {	                        
+	        osapi.appdata.get({'userId':'@viewer', 'appId':'@app', 'fields':'ids'}).execute(function(result) {
 			 	// a map of {baseURI1 : ["string", "string"], baseURI2 : ["string", "string"]}
 	        	var existingIds = os.osapi.getViewerFromResult(result).ids || "{}";
 	        	callback(gadgets.json.parse(existingIds));
 	        });
 	    }
-        // ==============================================================        
+        // ==============================================================
 
 	    function deleteList() {
 		    osapi.appdata['delete']({'userId':'@viewer', 'appId':'@app', 'fields': ['ids', 'count']} )
 		            .execute(function(result){
-		            if (result.error) { 
+		            if (result.error) {
 		                    alert("Error " + result.error.code + " deleting application data: " + result.error.message);
 		            } else {
 		                    document.getElementById("canvas_email_list_textarea").value = "";
 		                    document.getElementById("canvas_full_list_textarea").value = "";
 		                    document.getElementById("canvas_profile_list").innerHTML = "";
 		                    document.getElementById("number_selected").innerHTML = "Select Profiles";
-		            }                                
+		            }
 		    }); /* end osapi.appdata.delete */
-	    }    
-        // ==============================================================        
-        
+	    }
+        // ==============================================================
+
         function dedupeArray(arrHasDupes) {
 			var deduped = [];
 			$.each(arrHasDupes, function(i, el){
 			    if($.inArray(el, deduped) === -1) deduped.push(el);
 			});
-			return deduped;       
+			return deduped;
         }
-        // ==============================================================     
+        // ==============================================================
 
-        function displayProfileList(existingIds) {    
+        function displayProfileList(existingIds) {
         	var uris = toURIList(existingIds);
 // put these as individual fields in an ontology.js file
-// pass in as options to getRdf call        	
+// pass in as options to getRdf call
 var fullName = 'http://profiles.catalyst.harvard.edu/ontology/prns#fullName';
 var preferredTitle = 'http://vivoweb.org/ontology/core#preferredTitle';
-var email = 'http://vivoweb.org/ontology/core#email';          
+var email = 'http://vivoweb.org/ontology/core#email';
                 var strTable="<table cellspacing='0' cellpadding='0' width='640'><tr>";
-                
+
                 // build the table header row
                 strTable += "<td align='left' valign='top' class='tool_table_cell'>" + "<u><b>Name</b></u></td>";
                 strTable += "<td align='left' valign='top' class='tool_table_cell'>" + "<u><b>Title</b></u></td>";
                 strTable += "<td align='left' valign='top' class='tool_table_cell'>" + "<u><b>Email&nbsp;Address</b></u></td>";
                 strTable += "</tr>";
-                
+
                 for (i in uris) {
                     //strTable += "<tr id='" + uris[i] + "'><div id='displayPerson_" + i + "'></div></tr>";
                     strTable += "<tr id='" + uris[i] + "'></tr>";
-                }                
+                }
                 strTable += "</table>";
-                        
+
                 // dispay the empty table in canvas view
                 document.getElementById("canvas_profile_list").innerHTML = strTable;
                 document.getElementById("number_selected").innerHTML = "Your list includes (" + uris.length + ")" + " selected profiles";
@@ -269,14 +269,14 @@ var email = 'http://vivoweb.org/ontology/core#email';
                 // initialize the export divs
                 document.getElementById("canvas_email_list_textarea").value = "";
                 document.getElementById("canvas_full_list_textarea").value = "";
-      
+
                 // load in groups of ten
                 var batchSize = 10;
                 var batchCount = Math.floor(uris.length/batchSize) + (uris.length % batchSize == 0 ? 0 : 1);
                 for (i = 0; i < uris.length; i += batchSize) {
                         var ids = '';
                         for (j = 0; j < batchSize && i+j < uris.length; j++) {
-                             ids += (j > 0 ? ',' : '') + uris[i + j];             
+                             ids += (j > 0 ? ',' : '') + uris[i + j];
                         }
                         osapi.rdf.getRDF(ids).execute(function(data) {
                                 var people = data.list;
@@ -286,16 +286,16 @@ var email = 'http://vivoweb.org/ontology/core#email';
                                 for (var j = 0; j < people.length; j++) {
                                         var base = people[j].base;
                                         people[j] = jsonldHelper.getItem(people[j]);
-                                        
+
                                         // put in div now so people can see progress
                                         var table_row = "<td align='left' valign='top' class='tool_table_cell'>" + people[j][fullName] + "</td>";
                                         table_row += "<td align='left' valign='top' class='tool_table_cell'>" + people[j][preferredTitle] + "</td>";
                                         table_row += "<td align='left' valign='top' class='tool_table_cell email'>" + (people[j][email] ? people[j][email] : "") + "</td>";
-                             
+
                                         document.getElementById(base + people[j]['@id']).innerHTML = table_row;
                                 }
                                 // see if we are done and if so turn off progress bar and
-                                // add to export lists 
+                                // add to export lists
                                 if (--batchCount == 0) {
                                         var full_list = "";
                                         var email_list = "";
@@ -305,49 +305,49 @@ var email = 'http://vivoweb.org/ontology/core#email';
                                                 }
                                                 var row = "";
                                                 $("td", tr).each(function(fld_index, td){
-                                                        var txt = $(td).text(); 
+                                                        var txt = $(td).text();
                                                         row += txt + ";";
                                                         if(fld_index == 2 && txt != "") {
                                                                 email_list += txt + "\n";
                                                         }
                                                 });
                                                 full_list += row + "\n";
-                                                
+
                                         });
                                         document.getElementById("canvas_full_list_textarea").value = full_list;
                                         document.getElementById("canvas_email_list_textarea").value = email_list;
-                                        
+
                                      document.getElementById("progress").style.display="none";
                                 }
                         });
                 }
         } /* end displayProfileList */
-        
-        // ==============================================================                
-                
+
+        // ==============================================================
+
         function copyEmailDivToClipboard() {
-                
+
                 $("#canvas_email_list").show();
                 $("#canvas_email_list_text").show();
                 $("#canvas_full_list").hide();
                 $("#canvas_full_list_text").hide();
-                $("#canvas_profile_list").hide();        
+                $("#canvas_profile_list").hide();
         }
-        // ==============================================================                
-                
+        // ==============================================================
+
         function copyFullDivToClipboard() {
                 $("#canvas_full_list").show();
                 $("#canvas_full_list_text").show();
                 $("#canvas_email_list").hide();
                 $("#canvas_email_list_text").hide();
                 $("#canvas_profile_list").hide();
-        }        
-        // ==============================================================                        
+        }
+        // ==============================================================
         var root = (typeof ENV_LOCAL_URL === 'undefined')? "": ENV_LOCAL_URL;
-        var chatterProxyURL = root + "/chatter/ChatterProxyService.svc"; 
+        var chatterProxyURL = root + "/chatter/ChatterProxyService.svc";
 
         function getNodeIdFromURI(uri) {
-           if (typeof uri === 'string') { 
+           if (typeof uri === 'string') {
                    var c = uri.split('/');
                    return c[c.length-1];
            }
@@ -355,11 +355,11 @@ var email = 'http://vivoweb.org/ontology/core#email';
                var retval = [];
                for ( i = 0; i < uri.length; i++) {
                         retval[i] = getNodeIdFromURI(uri[i]);
-               } 
+               }
                 return retval;
            }
         }
-        
+
         function createGroup(name, description, ownerId, users) {
                 document.getElementById("progress").style.display="block";
 
@@ -368,11 +368,11 @@ var email = 'http://vivoweb.org/ontology/core#email';
                         "description": description,
                         "ownerId": ownerId,
                         "users": users};
-                        
+
             sendRequest(false, false, chatterProxyURL + "/group/new", params, function(data) {
                 document.getElementById("progress").style.display="none";
                     if(data.Success) {
-                                showMessage("<strong>Success! Your UCSF Chatter group '" + name + "' has been created.</strong><br> " 
+                                showMessage("<strong>Success! Your UCSF Chatter group '" + name + "' has been created.</strong><br> "
                                                 + "<a target='_blank' href='" + data.URL + "'>Go to UCSF Chatter to start working with your group.</a>");
                                 $("input#goup_name").val("");
                         }
@@ -384,10 +384,10 @@ var email = 'http://vivoweb.org/ontology/core#email';
                         showMessage("Server error " + obj.rc + " : " + obj.errors, true);
             });
         }
-                        
-        // ==============================================================                        
+
+        // ==============================================================
         function sendRequest(cache, signed, url, post_params, success, error) {
-          var params = {};                         
+          var params = {};
           if (signed) {
             params[gadgets.io.RequestParameters.AUTHORIZATION] = gadgets.io.AuthorizationType.SIGNED;
           }
@@ -397,35 +397,35 @@ var email = 'http://vivoweb.org/ontology/core#email';
           if(cache == false) {
                   params[gadgets.io.RequestParameters.REFRESH_INTERVAL] = 0;
           }
-                            
+
           gadgets.io.makeRequest(url, function(obj) {
                   if(obj.data != null) {
                           success(obj.data);
                 }
-                else if(obj.errors != null) {                                  
+                else if(obj.errors != null) {
                           if(error) {
                                   error(obj);
                           }
                 }
-          } 
+          }
           , params);
         }
-        
-        // ==============================================================                                
+
+        // ==============================================================
         function showMessage(msg, isError) {
                 $("div.message").html(msg);
                 if(isError == true) {
-                        $("div.message").removeClass("info");        
+                        $("div.message").removeClass("info");
                         $("div.message").addClass("error");
                 }
                 else {
-                        $("div.message").removeClass("error");        
+                        $("div.message").removeClass("error");
                         $("div.message").addClass("info");
                 }
-                $("div.message").removeClass("hidden");        
+                $("div.message").removeClass("hidden");
         }
-        
-        // ==============================================================                        
+
+        // ==============================================================
         function getUserList() {
                 var items = [];
                 $("div#canvas_profile_list tr").each( function(index, elem) {
@@ -433,15 +433,15 @@ var email = 'http://vivoweb.org/ontology/core#email';
                         if(id != null && id != "") {
                                 items.push(getNodeIdFromURI(id));
                         }
-                }); 
-                
+                });
+
                 return items.join(',');
         }
-        // ==============================================================                        
+        // ==============================================================
         </script>]]></Content>
     <Content type="html" view="small" preferred_height="75" preferred_width="190"><![CDATA[<!--HTML-->
     <!DOCTYPE html>
-                
+
         <table id="button_and_help" cellspacing="6" cellpadding="5" style="display:block;">
                 <tr>
                         <td class="tool_table_cell_small" style="width:145px">Add profiles to your list</td>
@@ -458,12 +458,12 @@ var email = 'http://vivoweb.org/ontology/core#email';
                         <td class="tool_table_cell_small" valign="top" style="padding-top:4px"><span id="list_profiles" onClick="gadgetEventTrack('list_profiles')">Loading...</span></td>
                 </tr>
         </table>
-        
+
         <script type="text/javascript">
                 function init() {
                         showToolVersion(false);
-                }        
-                
+                }
+
                 gadgets.util.registerOnLoadHandler(init);
         </script>]]></Content>
     <Content type="html" view="canvas" preferred_height="600" preferred_width="700"><![CDATA[<!--HTML-->
@@ -499,9 +499,9 @@ var email = 'http://vivoweb.org/ontology/core#email';
                      a, a:visited { color: #0088CC; text-decoration: none; }
                     a:hover { color: #005580; text-decoration: underline; }
                 p { width: 640px; }
-                  
+
            </style>
-    
+
     <!-- top menu links -->
         <div style="width:640px;">
                 <p id="number_selected" class="tool_title_orange" style="margin-left:20px;margin-top:20px\9;">
@@ -510,7 +510,7 @@ var email = 'http://vivoweb.org/ontology/core#email';
                 <p class="tool_body" style="margin-left:20px; margin-bottom:10px;">
                         <div id="extended_functions" style="display:none;">
                                 <a href="" id="create_group">Create UCSF Chatter Group</a>&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;
-                                <a href="javascript:gadgetEventTrack('export_email');copyEmailDivToClipboard();">Export email addresses only</a>&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp; 
+                                <a href="javascript:gadgetEventTrack('export_email');copyEmailDivToClipboard();">Export email addresses only</a>&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;
                                 <a href="javascript:gadgetEventTrack('export_all_data');copyFullDivToClipboard();">Export all data</a>&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;
                                 <a href="" id="compose-email">Compose email to list</a><p>
                         </div>
@@ -519,7 +519,7 @@ var email = 'http://vivoweb.org/ontology/core#email';
                         </div>
                         <a href="javascript:gadgetEventTrack('delete_list');deleteList();" style="margin-left:20px;">Delete list</a>
                 </p>
-                
+
                 <p id="progress" style="margin-left:20px;">
                 <br><br>
                 <img src="images/waiting.gif">
@@ -527,73 +527,73 @@ var email = 'http://vivoweb.org/ontology/core#email';
                 <b>This may take a minute or two, based on the size of your selected Profiles list.</b></p>
         </div>
         <div id="create_group" class="hidden">
-                <div class="message hidden"><strong>Success! Your UCSF Chatter group has been created.</strong><br> 
+                <div class="message hidden"><strong>Success! Your UCSF Chatter group has been created.</strong><br>
                         Go to UCSF Chatter to start working with your group.</div>
-                <table><tr>                
+                <table><tr>
                 <td nowrap valign="top">UCSF Chatter Group Name:</td>
                 <td><input id="group_name" type="text" style="width:218px"></input><br><br></td></tr><tr>
                 <td nowrap valign="top" align="right">Group Description:</td>
                 <td><textarea id="group_description" rows="4" cols="25"></textarea><br><br></td></tr><tr><td>&nbsp;</td>
                 <td><input id="create" type="button" value="Create"></input>
-                <input id="close" type="button" value="Cancel/Close"></input></td></tr></table> 
+                <input id="close" type="button" value="Cancel/Close"></input></td></tr></table>
         </div>
-        
+
         <div id="canvas_email_list" style="display:none; background:#FFF; width:670px; height:50px; margin-left:20px;">
         Copy and paste the email addresses below into an Excel spreadsheet or email client "To" field.
         <input type="button" style="height:22px; font-size:10; margin-left:40px; margin-top: 6px;" value="Close" onClick="document.getElementById('canvas_email_list').style.display='none';document.getElementById('canvas_email_list_text').style.display='none';document.getElementById('canvas_profile_list').style.display='block';"></button>
         </div>
-        
+
         <!-- holds the email address list to be copied to the clipboard -->
         <div id="canvas_email_list_text" style="display:none; width:658px; height:450px; color:#000; margin:0px 5px 0px 5px;">
         <textarea id="canvas_email_list_textarea" rows="27" cols="78" style="border:1px solid #000; margin: 0px 8px 0px 8px;">
         </textarea>
         </div>
-        
+
         <div id="canvas_full_list" style="display:none; background:#FFF; width:640px; height:50px; margin-left: 20px;">
         Copy and paste the profile data below into an Excel spreadsheet or external text editor.
         <input type="button" style="height:22px; font-size:10; margin-left:40px; margin-top: 6px;" value="Close" onClick="document.getElementById('canvas_full_list').style.display='none';document.getElementById('canvas_full_list_text').style.display='none';document.getElementById('canvas_profile_list').style.display='block';"></button>
         </div>
-        
+
         <!-- holds the full profile list to be copied to the clipboard -->
         <div id="canvas_full_list_text" style="display:none; width:640px; height:450px; color:#000; margin:0px 5px 0px 5px;">
         <textarea id="canvas_full_list_textarea" rows="27" cols="78" style="border:1px solid #000; margin: 0px 8px 0px 8px;">
         </textarea>
-        </div>        
-        
+        </div>
+
         <!-- holds the visible profile details list -->
         <div id="canvas_profile_list" style="display:none; margin-left:20px; height:463px; height:443px\9; width: 660px; overflow:auto;"></div>
-        
+
         <script type="text/javascript">
                 function init() {
                         // update UI
                         showToolVersion(true);
-                        readIdsFromDB(displayProfileList);                
+                        readIdsFromDB(displayProfileList);
                         document.getElementById("canvas_profile_list").style.display="block";
-                        
+
                         $("a#create_group").click(function(event){
                             event.preventDefault();
-                                $("div.message").addClass("hidden");        
+                                $("div.message").addClass("hidden");
                                 $("div#create_group").removeClass("hidden");
-                        }); 
+                        });
                         $("input#close").click(function(event){
                                 $("div#create_group").addClass("hidden");
                         });
-                         
+
                         $("input#create").click(function(event){
-                                $("div.message").addClass("hidden");        
+                                $("div.message").addClass("hidden");
                                 var name = $("div#create_group input#group_name").val();
                                 var description = $("div#create_group #group_description").val();
                                 if(name == null || name == '') {
                                         showMessage("Please enter a group name.", true);
                                 }
-                                else {                                
+                                else {
                                         osapi.people.getViewer({ fields: ['id'] }).execute(function(result) {
                                                 var users = getUserList();
                                                 createGroup(name, description, getNodeIdFromURI(result.id), users);
-                                        });                        
+                                        });
                                 }
                         });
-                         
+
                         $("#compose-email").click(function(event){
                         var emails = [];
                         var emailElem = $("td.email");
@@ -602,8 +602,8 @@ var email = 'http://vivoweb.org/ontology/core#email';
                                         event.preventDefault();
                                         return false;
                                 }
-                        }        
-                        
+                        }
+
                                 emailElem.each(function(index, elem) {
                                         var email = $.trim($(elem).text());
                                         if(email != '') {
@@ -618,7 +618,7 @@ var email = 'http://vivoweb.org/ontology/core#email';
                                 }
                         });
                 }
-                
+
                 gadgets.util.registerOnLoadHandler(init);
         </script>]]></Content>
-</Module>
\ No newline at end of file
+</Module>
diff --git a/legacy/opensocial/sample-gadgets/RDFTest.xml b/legacy/opensocial/sample-gadgets/RDFTest.xml
index b8aadab00..8ae820097 100644
--- a/legacy/opensocial/sample-gadgets/RDFTest.xml
+++ b/legacy/opensocial/sample-gadgets/RDFTest.xml
@@ -11,7 +11,7 @@
       <script type="text/javascript" src="js/jquery-1.4.4.js"></script>
       <script type="text/javascript" src="js/prettyprint.js" ></script>
       <script type="text/javascript">
-      
+
 	// use pretty print!
         function loadPeople() {
 	    osapi.people.getViewer().execute(function(result) {
@@ -41,7 +41,7 @@
    	    });
       }
 
-        function onLoadPeopleOsapi(person, divId) {          
+        function onLoadPeopleOsapi(person, divId) {
           html = new Array();
           html.push('<ul>');
           html.push('<li>You are looking at ' + person.displayName + '</li>');
@@ -50,11 +50,11 @@
           document.getElementById(divId).innerHTML = html.join('');
         }
 
-        function onLoadPeopleRdf(person, divId) {          
+        function onLoadPeopleRdf(person, divId) {
           html = new Array();
           html.push('<ul>');
           html.push('<li>You are looking at ' + person.label + '</li>');
-          html.push('<li>Their URI is ' + (person.uri || person._about) + '</li>');	    
+          html.push('<li>Their URI is ' + (person.uri || person._about) + '</li>');
           html.push('<li>Their email is ' + person.primaryEmail + '</li>');
           html.push('</ul>');
           var ppTable = prettyPrint(person);
@@ -70,7 +70,7 @@
   function submitform() {
 	var rdfurl = document.getElementById('rdfurl');
 	if (ndx == 0 || priorurl[ndx] != rdfurl.value) {
-        priorurl[ndx++] = rdfurl.value; 
+        priorurl[ndx++] = rdfurl.value;
       }
 	    document.getElementById('rdf').innerHTML = '...fetching content...';
 	    osapi.rdf.getRDF(rdfurl.value).execute(function(result) {
@@ -107,4 +107,4 @@
         <div id='rdf'></div>
       </div>     ]]>
    </Content>
-</Module>
\ No newline at end of file
+</Module>
diff --git a/legacy/opensocial/sample-gadgets/SearchExample.xml b/legacy/opensocial/sample-gadgets/SearchExample.xml
index 7ef016ca0..69423f50e 100644
--- a/legacy/opensocial/sample-gadgets/SearchExample.xml
+++ b/legacy/opensocial/sample-gadgets/SearchExample.xml
@@ -7,45 +7,45 @@
 	<Content type="html"><![CDATA[<!--HTML-->
     <!-- #includes -->
     <!DOCTYPE html>
-    
+
     <style>
 
     .gadget_text {
     	font-family: Verdana, Arial;
     	font-size: 11px;
     }
-    
+
     .gadgets-gadget-chrome {
     	margin-left: 8px;
     }
-    
+
     </style>
-    
+
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.js"></script>
 
     <pre><div id="content" class="gadget_text"></div></pre>
     <script>
-    
-function parseXml(xml) {	
+
+function parseXml(xml) {
 	if (jQuery.browser.msie) {
-		var xmlDoc = new ActiveXObject("Microsoft.XMLDOM"); 
+		var xmlDoc = new ActiveXObject("Microsoft.XMLDOM");
 		xmlDoc.loadXML(xml);
 		xml = xmlDoc;
 	}
-	
+
 	return xml;
-}    
+}
 
 function handleResponse(obj) {
   var ids = [];
   var theXML = obj.text;
-  
+
   // IE hack
-  theXML = parseXml(theXML); 
+  theXML = parseXml(theXML);
 
   // JB hack
- 	$("#content").append( "Additional search results for " + gadgets.util.getUrlParameters()['keyword'] )  
-  
+ 	$("#content").append( "Additional search results for " + gadgets.util.getUrlParameters()['keyword'] )
+
   gadgets.window.adjustHeight();
 };
 
diff --git a/legacy/opensocial/sample-gadgets/SlideShare.xml b/legacy/opensocial/sample-gadgets/SlideShare.xml
index 9e876e55e..0054ae7bc 100644
--- a/legacy/opensocial/sample-gadgets/SlideShare.xml
+++ b/legacy/opensocial/sample-gadgets/SlideShare.xml
@@ -15,30 +15,30 @@
     <Content type="html" view="default, home, profile" preferred_height="470" preferred_width="670"><![CDATA[<!--HTML-->
     <!DOCTYPE html>
     <base target="_blank"/>
-    
-    <!-- TODO: Fix height for OSDE. Should be removed --> 
+
+    <!-- TODO: Fix height for OSDE. Should be removed -->
     <!--script type="text/javascript">
     	gadgets.window.adjustHeight(700);
     </script-->
-    
+
     <!-- #includes -->
     <link rel="stylesheet" href="css/gadget.css" type="text/css" media="screen, projection">
-    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.js"></script>    
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.js"></script>
     <script type="text/javascript" src="js/os.js" ></script>
-    
+
     <!-- Styles -->
     <style type="text/css">
     	.slideshare_title {	font-family: Arial, helvetica; font-size: 14px;}
-    	.slideshare_body { font-family: Arial, helvetica; font-size: 11px;}    
+    	.slideshare_body { font-family: Arial, helvetica; font-size: 11px;}
     	.slideshare_credit { font-family: Arial, helvetica; font-size: 10px;}
     	.ss-link{ margin:10px 0px 10px 0px; }
     	a, a:visited { color: #0088CC; text-decoration: none; }
     	a:hover { color: #005580; text-decoration: underline; }
     </style>
-    
+
     <script type="text/javascript">
-	    
-	    function gotoSlideshare() {    		
+
+	    function gotoSlideshare() {
 	        var action = 'go_to_slideshare';
 	        var href = $('div.ss-link a').attr('href');
     		gadgets.pubsub.subscribe("analytics", function(sender, message){
@@ -48,14 +48,14 @@
     		});
     		gadgetEventTrack(action, href);
 	    }
-	    
+
 	    function gadgetEventTrack(action, label, value) {
     		var message = {'action' : action};
     		if (label) {message.label = label;}
     		if (value) {message.value = value;}
     		gadgets.pubsub.publish("analytics", message);
 		}
-	    
+
 	    // ========================================
 	    function getUserNameAndPreview(userId){
 			osapi.appdata.get({'userId': userId, 'groupId': '@self', 'appId':'@app', 'fields': ['username']})
@@ -65,15 +65,15 @@
 		    		$('input[name=username]').val(username);
 		    		if(username != null && username != "") { // only render flash if there's a username
 		    			preview(username);
-		    		}	    				
+		    		}
 		    });
 		}
 	    // ========================================
-    
+
 	    // ========================================
 		function preview(username){
     		var url = "http://static.slidesharecdn.com/swf/multiwidget.swf";
-    			
+
  			$('#preview').html(
 	 			'<div style="width:577px;margin:auto;">' +
 		    		'<object style="margin:0px" width="600" height="428" ' +
@@ -87,36 +87,36 @@
 		    		'<param name="flashVars" value="feedurl=user/'+ username + '&widgettitle=Slides%20by%20'+ username +'"/>' +
 		    		'<embed src="http://static.slidesharecdn.com/swf/multiwidget.swf" ' +
 		    				' name="slideshow" ' +
-		    				' flashVars="feedurl=user/'+ username + '&widgettitle=Slides%20by%20'+ username +'"' + 
+		    				' flashVars="feedurl=user/'+ username + '&widgettitle=Slides%20by%20'+ username +'"' +
 		    				' type="application/x-shockwave-flash"' +
-		    				' pluginspage="http://www.adobe.com/go/getflashplayer"' + 
-		    				' allowscriptaccess="always"' + 
-		    				' allowfullscreen="true"' + 
+		    				' pluginspage="http://www.adobe.com/go/getflashplayer"' +
+		    				' allowscriptaccess="always"' +
+		    				' allowfullscreen="true"' +
 		    				' width="600" ' +
 		    				' height="428">' +
 		    				'</embed>' +
 		    		'</object>' +
 		    	'<div class="ss-link">Having trouble seeing this? <a href="http://www.slideshare.net/'+ username + '" target="_top">View at SlideShare</a><div/>' +
 		    	'</div>'
-	 		);   	
-	 		
+	 		);
+
 	    	$('div.ss-link a').click(function(event){
 	    	    event.preventDefault();
-	    		gotoSlideshare();	    		
-	    	}); //click	 					
+	    		gotoSlideshare();
+	    	}); //click
 	    }
 	    // ========================================
-	    
+
 	     // ========================================
    		gadgets.util.registerOnLoadHandler(function(){
 	    	var viewName=gadgets.views.getCurrentView().getName();
-	    	
+
 	    	if(viewName=='home'){
 	    		var innerDiv=$('#inner_home_settings').html();
 	    		$('#settings').html(innerDiv);
-	    		
+
 	    		$('#secondHeader').show();
-	    		
+
 	    		getUserNameAndPreview('@viewer');
 
 		    	$('span.save').click(function(){
@@ -124,7 +124,7 @@
 	    			osapi.appdata.update({'userId': '@viewer', 'groupId': '@self', 'appId':'@app', 'data':{'username':username} })
 	    				.execute(function(response){
 	    				});
-	    				
+
 	    				$('#preview').html('');
 	    				if(username != null && username != "") {
 	    					preview(username);
@@ -133,18 +133,18 @@
 	    	}
 	    	else{
 	    		getUserNameAndPreview('@owner');
-	    	}	    	
-    	}); // registerOnLoadHandler    	
+	    	}
+    	}); // registerOnLoadHandler
     	// ========================================
-    	
+
 	</script>
-	    	
-	    	
+
+
 	<div id="secondHeader" style="display:none; margin:0px 10px 0px 10px;">
 		<span class="slideshare_title"><b>SlideShare: A great way to share presentations</b></span>
 	</div>
-	
-	<div id="settings" style="clear:both; margin:0px 10px 0px 10px;">	 
+
+	<div id="settings" style="clear:both; margin:0px 10px 0px 10px;">
     </div>
     <br>
     <div id="preview">
@@ -152,18 +152,18 @@
     <br><br>
     ]]>
     </Content>
-    <Content type="html" view="home" preferred_height="670" preferred_width="700"><![CDATA[<!--HTML-->	
+    <Content type="html" view="home" preferred_height="670" preferred_width="700"><![CDATA[<!--HTML-->
 		<div id="inner_home_settings" style="display:none;">
 			<p class="slideshare_body">
 			If you already have a SlideShare account and have uploaded presentations, simply follow these steps:<br>
 			</p>
 			<p class="slideshare_body" style="padding-left:20px;">
 			<ol>
-				<li class="slideshare_body">Enter your SlideShare Username below and click Save/Preview. 
+				<li class="slideshare_body">Enter your SlideShare Username below and click Save/Preview.
 				Any public presentations that you've uploaded to SlideShare will be shown in the preview below.</li>
 				<li class="slideshare_body">Make sure these presentations are the ones you want to share on your profile.</li>
 				<li class="slideshare_body">Click the "Show" link (above, upper right) to make the presentations publicly available within your profile.</li>
-				<li class="slideshare_body">To remove the presentations, delete your SlideShare Username and click Save/Preview. 
+				<li class="slideshare_body">To remove the presentations, delete your SlideShare Username and click Save/Preview.
 				Make sure to "Hide" your presentations from the public if you delete your SlideShare Username.</li>
 			</ol>
 			</p>
@@ -172,11 +172,11 @@
 				&nbsp;&nbsp;&nbsp;</span>
 				<span class="save slideshare_body" style="text-decoration:underline;cursor:pointer;color:#44F; display:inline;" title="Save this Username and preview the presentations.">Save/Preview</span>
 				<br><br>
-				<span class="slideshare_body">Don't have a SlideShare account yet? 
+				<span class="slideshare_body">Don't have a SlideShare account yet?
 				Go to <a href="http://www.slideshare.net" target="_blank" style="font-size:12px;text-decoration:none; cursor:pointer;color:#44F;" title="Go to the SlideShare Web site">
 				SlideShare</a> now to create an account and upload presentations.</span>
 			</div>
 		</div>
 		]]>
 	</Content>
-</Module>
\ No newline at end of file
+</Module>
diff --git a/legacy/opensocial/sample-gadgets/Twitter.xml b/legacy/opensocial/sample-gadgets/Twitter.xml
index 42a3327b2..a926b8bdf 100644
--- a/legacy/opensocial/sample-gadgets/Twitter.xml
+++ b/legacy/opensocial/sample-gadgets/Twitter.xml
@@ -12,14 +12,14 @@
         <Require feature="dynamic-height" />
     </ModulePrefs>
     <Content type="html" view="default, home, profile"><![CDATA[<!--HTML-->
-	    <!DOCTYPE html>    
+	    <!DOCTYPE html>
 	    <!-- #includes -->
 	    <link rel="stylesheet" href="css/gadget.css" type="text/css" media="screen, projection">
-	    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.js"></script>    
-	    <script type="text/javascript" src="js/jquery.blockUI.js"></script>    
+	    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.js"></script>
+	    <script type="text/javascript" src="js/jquery.blockUI.js"></script>
 		<script charset="utf-8" src="http://widgets.twimg.com/j/2/widget.js"></script>
 	    <script type="text/javascript" src="js/os.js" ></script>
-    
+
 	    <script type="text/javascript">
 	        var ucsf = ucsf || {};
 	        ucsf.twitter = {};
@@ -29,7 +29,7 @@
 	    		if (value) {message.value = value;}
 	    		gadgets.pubsub.publish("analytics", message);
 			};
-			
+
 			ucsf.twitter.getUsername=function(callback) {
 				osapi.appdata.get({'userId': '@owner', 'groupId': '@self', 'appId':'@app', 'fields': ['twitter_username']})
 			    	.execute(function(response){
@@ -40,12 +40,12 @@
 			    		}
 			    	});
 			}
-			
+
 			ucsf.twitter.render=function(username) {
 				$("#twitter-wjs").remove();
 				$(".twitter-gadget .content").empty();
 				$(".twitter-gadget .content").append('<a width="520" height="300" class="twitter-timeline" href="https://twitter.com/'+username+'" data-screen-name="'+username+'" data-widget-id="320982656688996353">Tweets by @'+username+'</a>')
-				
+
 				var fjs=document.getElementsByTagName("script")[0];
 				var p=/^http:/.test(document.location)?'http':'https';
 				js=document.createElement("script");
@@ -53,41 +53,41 @@
 				js.src=p+"://platform.twitter.com/widgets.js";
 				fjs.parentNode.insertBefore(js,fjs);
 			}
-			
+
 	        ucsf.twitter.preview=function(widget_id) {
 				if(widget_id) {
 					ucsf.twitter.render(widget_id);
-				}				    			
-	        }		
+				}
+	        }
 		</script>
 	]]></Content>
-    <Content type="html" view="profile" preferred_width="670"><![CDATA[<!--HTML-->	
+    <Content type="html" view="profile" preferred_width="670"><![CDATA[<!--HTML-->
 	    <script type="text/javascript">
 	        ucsf.twitter.profilePageInit = function() {
 	        	gadgets.window.adjustHeight(300);
 	        	ucsf.twitter.getUsername(ucsf.twitter.preview);
 	        }
-    		gadgets.util.registerOnLoadHandler(ucsf.twitter.profilePageInit);    		
-		</script>	
-		
+    		gadgets.util.registerOnLoadHandler(ucsf.twitter.profilePageInit);
+		</script>
+
 	    <!-- Styles -->
-	    <style type="text/css">	    
-	    	.twitter-gadget .content {text-align: center;}	    	
+	    <style type="text/css">
+	    	.twitter-gadget .content {text-align: center;}
 	    </style>
-		
+
 		<div class="twitter-gadget">
 			<div class="content">
-			</div>			
+			</div>
 		</div>
 	]]></Content>
-    <Content type="html" view="home" preferred_width="700"><![CDATA[<!--HTML-->	
-    	<script type="text/javascript">	        
+    <Content type="html" view="home" preferred_width="700"><![CDATA[<!--HTML-->
+    	<script type="text/javascript">
 	        $(document).ready(function () {
 		        $(".twitter-gadget .save").click(function() {
 		        	$(".twitter-gadget").block({ message: "Saving..." });
 	    			osapi.appdata.update({'userId': '@owner', 'groupId': '@self', 'appId':'@app', 'data':{'twitter_username':$('.twitter-gadget input').val()} }).execute(function(response){
 	    				$(".twitter-gadget").unblock();
-	    			});		        	
+	    			});
 		        });
 		        $(".twitter-gadget .preview").click(function() {
 		        	var username = $('.twitter-gadget input').val();
@@ -102,7 +102,7 @@
 		        	}
 		        });
 	        });
-	        	        
+
 	        ucsf.twitter.homePageInit = function() {
 	        	gadgets.window.adjustHeight(50);
 	           	ucsf.twitter.getUsername(function(username) {
@@ -110,24 +110,24 @@
 	        		$('.twitter-gadget .content').show();
 		        	gadgets.window.adjustHeight(350);
 	    			ucsf.twitter.preview(username);
-	           	});	        
+	           	});
 	        }
-    		gadgets.util.registerOnLoadHandler(ucsf.twitter.homePageInit);    		
+    		gadgets.util.registerOnLoadHandler(ucsf.twitter.homePageInit);
 		</script>
-		
+
 	    <!-- Styles -->
-	    <style type="text/css">	    
-	    	.twitter-gadget {margin-top: 10px;}	
+	    <style type="text/css">
+	    	.twitter-gadget {margin-top: 10px;}
 	    	.twitter-gadget input {width: 400px;}
 	    	.twitter-gadget .label {margin-right: 10px;font-weight: bold;}
 	    	.twitter-gadget .preview, .twitter-gadget .save {margin-left: 10px;color: #3B6394; cursor:pointer;}
-	    	.twitter-gadget .content {margin-top: 10px; margin-left: 20px;}	    	
+	    	.twitter-gadget .content {margin-top: 10px; margin-left: 20px;}
 	    </style>
-	    
-		<div class="twitter-gadget">  
+
+		<div class="twitter-gadget">
 			<span class="label">Widget Id:</span><input type="text" name="keywords"></input><span class="preview">Preview</span><span class="save">Save</span>
-			<div class="content" style="display:none">								
+			<div class="content" style="display:none">
 			</div>
 		</div>
 	]]></Content>
-</Module>
\ No newline at end of file
+</Module>
diff --git a/legacy/opensocial/sample-gadgets/WEB-INF/web.xml b/legacy/opensocial/sample-gadgets/WEB-INF/web.xml
index a2d19ee59..9bb6aa3f2 100644
--- a/legacy/opensocial/sample-gadgets/WEB-INF/web.xml
+++ b/legacy/opensocial/sample-gadgets/WEB-INF/web.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app 
-    version="2.5" 
+<web-app
+    version="2.5"
     xmlns="http://java.sun.com/xml/ns/javaee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
     >
-</web-app>
\ No newline at end of file
+</web-app>
diff --git a/legacy/opensocial/shindig_orng_tables.sql b/legacy/opensocial/shindig_orng_tables.sql
index 344b63d86..a79d3e402 100644
--- a/legacy/opensocial/shindig_orng_tables.sql
+++ b/legacy/opensocial/shindig_orng_tables.sql
@@ -104,23 +104,23 @@ DROP PROCEDURE IF EXISTS `orng_registerAppPerson`;
 DROP PROCEDURE IF EXISTS `orng_upsertAppData`;
 DROP PROCEDURE IF EXISTS `orng_deleteAppData`;
 
-DELIMITER // 
+DELIMITER //
 CREATE PROCEDURE orng_registerAppPerson (uid varchar(255), aid INT, v BOOL)
 BEGIN
 	IF (v)
 	THEN
 		INSERT INTO orng_app_registry (appId, personId, createdDT) values (aid, uid, now());
-	ELSE 
+	ELSE
 		DELETE FROM orng_app_registry where appId = aid AND personId = uid;
-	END IF;	
-END // 
-DELIMITER ; 
+	END IF;
+END //
+DELIMITER ;
 
-DELIMITER // 
+DELIMITER //
 CREATE PROCEDURE orng_upsertAppData(uid varchar(255), aid INT, kn varchar(255),v varchar(4000))
 BEGIN
 	DECLARE cnt int;
-	SELECT count(*) FROM orng_appdata WHERE userId = uid AND appId = aid and keyname = kn INTO cnt; 
+	SELECT count(*) FROM orng_appdata WHERE userId = uid AND appId = aid and keyname = kn INTO cnt;
 	IF (cnt > 0)
 	THEN
 		UPDATE orng_appdata set `value` = v, updatedDT = NOW() WHERE userId = uid AND appId = aid and keyname = kn;
@@ -128,26 +128,26 @@ BEGIN
 		INSERT INTO orng_appdata (userId, appId, keyname, `value`) values (uid, aid, kn, v);
 	END IF;
 		-- if keyname is VISIBLE, do more
-	IF (kn = 'VISIBLE' AND v = 'Y') 
+	IF (kn = 'VISIBLE' AND v = 'Y')
 	THEN
 		CALL orng_registerAppPerson(uid, aid, 1);
 	ELSEIF (kn = 'VISIBLE' )
 	THEN
 		CALL orng_registerAppPerson(uid, aid, 0);
 	END IF;
-END // 
-DELIMITER ;					
+END //
+DELIMITER ;
 
-DELIMITER // 
+DELIMITER //
 CREATE PROCEDURE orng_deleteAppData(uid varchar(255), aid INT, kn varchar(255))
 BEGIN
 	DELETE FROM orng_appdata WHERE userId = uid AND appId = aid and keyname = kn;
 		-- if keyname is VISIBLE, do more
-	IF (kn = 'VISIBLE' ) 
+	IF (kn = 'VISIBLE' )
 	THEN
 		CALL orng_registerAppPerson(uid, aid, 0);
 	END IF;
-END // 
+END //
 DELIMITER ;
 
 
diff --git a/legacy/solr/README.txt b/legacy/solr/README.txt
index e2f233f38..8c8dcfce7 100644
--- a/legacy/solr/README.txt
+++ b/legacy/solr/README.txt
@@ -9,20 +9,20 @@ additions-to-solr-war contains files that will be are merged into the war by the
     log4j-1.2.16.jar
     slf4j-api-1.6.1.jar
     slf4j-log4j12-1.6.1.jar
-       The Solr WAR file does not include logging JARs, assuming that they will be provided 
-       by the supporting container: Tomcat or equivalent. But we want the WAR to be 
-       self-contained, so we provide the JARs. We also want to reduce the amount of logging 
+       The Solr WAR file does not include logging JARs, assuming that they will be provided
+       by the supporting container: Tomcat or equivalent. But we want the WAR to be
+       self-contained, so we provide the JARs. We also want to reduce the amount of logging
        messages, so we provide a log4j.properties.
     jts-1.13.jar
        Don't know.
-       
+
 template.context.xml is the basis for a Tomcat context fragment. The build script will
-   modify this so it provides a JNDI reference to the Solr home directory, and disables 
+   modify this so it provides a JNDI reference to the Solr home directory, and disables
    persistence across Tomcat restarts.
-   
+
    Non-Tomcat containers will likely ignore this.
-   
+
 homeDirectoryTemplate is a modified version of the example home directory provided by Solr.
    Don't know what those modifications are, but they certainly include our own version of
    conf/schema.xml.
-       
+
diff --git a/legacy/utilities/buildutils/jarUsageScanner.rb b/legacy/utilities/buildutils/jarUsageScanner.rb
index d5dcb428d..2b43d1003 100644
--- a/legacy/utilities/buildutils/jarUsageScanner.rb
+++ b/legacy/utilities/buildutils/jarUsageScanner.rb
@@ -11,7 +11,7 @@ The list of JARs should be created by running the jarlist target of the build fi
 That will use JarJar to create a list of JAR file that are not directly referenced
 by the classes in the build. But what about JARs that are needed by a call using
 reflection? Like Class.forName("this.that.theOther"). We know this is how the MySQL
-driver is loaded (so we need mysql-connector-java-5.1.16-bin.jar). Are there any 
+driver is loaded (so we need mysql-connector-java-5.1.16-bin.jar). Are there any
 others? This script will try to find them.
 
 The jarlist target includes a list of JARs that we know are needed, such as the MySQL
@@ -20,7 +20,7 @@ list, and the target run again, in case they depend on other JARs in turn.
 
 --------------------------------------------------------------------------------
 
-One of the tricks that this script uses is to prune the list of packages to 
+One of the tricks that this script uses is to prune the list of packages to
 search for. If a JAR contains both "this.that.other" and "this.that", then we
 only need to search for "this.that", since it will reveal uses of "this.that.other"
 as well.
@@ -28,24 +28,24 @@ as well.
 --------------------------------------------------------------------------------
 
 pass the name of the file that contains the JAR names
-pass the root directory of the combined vitro/vivo distro 
+pass the root directory of the combined vitro/vivo distro
 	(appbase)
-	
+
 --------------------------------------------------------------------------------
 
 Search all of the *.java, *.jsp, *.js, *.tld, *.xml files for mention of these package names
 	For each hit, print the file path, line number, the package name and the JAR name.
-	
+
 To search files:
 	find -X . -name \*.db -or -name \*pot | xargs grep 'org\.package\.name'
 	grep -H -n -f file_with_package_patterns
-	
+
 	or can we do this all with grep on each string?
 		grep -r --include=*.jsp
-		
+
 	grep -H -n -r --include=*.javaxd --include=*.jsp org\.package\.name .
 		and precede the output with a header that lists the package
-	
+
 --------------------------------------------------------------------------------
 --------------------------------------------------------------------------------
 =end
@@ -121,7 +121,7 @@ def print_package_names_for_jars
 		package_array.each do |package_name|
 			puts "      #{package_name}"
 		end
-		puts 
+		puts
 	end
 end
 
@@ -172,9 +172,9 @@ if File.expand_path($0) == File.expand_path(__FILE__)
 	if ARGV.length != 2
 		raise("usage is: ruby jarUsageScanner.rb <jar_names_file> <scan_base_directory>")
 	end
-  
+
 	@jar_names_file, @scan_base_directory = ARGV
-  
+
 	if !File.file?(@jar_names_file)
 		raise "File does not exist: '#{@jar_names_file}'."
 	end
@@ -184,9 +184,9 @@ if File.expand_path($0) == File.expand_path(__FILE__)
 	end
 
 	print_args
-	
+
 	figure_package_names_from_jars
 	print_package_names_for_jars
-	
+
 	show_packages_in_source_files
-end
\ No newline at end of file
+end
diff --git a/legacy/utilities/buildutils/src/com/tonicsystems/jarjar/KlugedDepFind.java b/legacy/utilities/buildutils/src/com/tonicsystems/jarjar/KlugedDepFind.java
index 6ed1e64d8..d0bba341c 100644
--- a/legacy/utilities/buildutils/src/com/tonicsystems/jarjar/KlugedDepFind.java
+++ b/legacy/utilities/buildutils/src/com/tonicsystems/jarjar/KlugedDepFind.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/** 
+/**
  * This class is created to work around a known bug in JarJar which did not get fixed in release 1.1.
  * See the comments in edu.cornell.mannlib.vitro.utilities.jarlist.JarLister
  */
diff --git a/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/containerneutral/CheckContainerNeutrality.java b/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/containerneutral/CheckContainerNeutrality.java
index e07786726..66596dd16 100644
--- a/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/containerneutral/CheckContainerNeutrality.java
+++ b/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/containerneutral/CheckContainerNeutrality.java
@@ -38,34 +38,34 @@ import org.xml.sax.SAXException;
 /**
  * Look at web.xml, and check for conditions that violate the Servlet 2.4 spec,
  * but that might not be noticed because Tomcat doesn't complain.
- * 
+ *
  * ------
- * 
+ *
  * Values of the <dispatcher/> tag:
- * 
+ *
  * The spec permits only these values: "FORWARD", "REQUEST", "INCLUDE", "ERROR",
  * but Tomcat also allows the lower-case equivalents. GlassFish or WebLogic will
  * barf on lower-case.
- * 
+ *
  * Check to see that only the upper-case values are used.
- * 
+ *
  * ------
- * 
+ *
  * Existence of Servlet classes:
- * 
+ *
  * The spec allows the container to either load all servlets at startup, or to
  * load them when requested. Since Tomcat only loads servlet when requested, it
  * doesn't notice or complain if web.xml cites a <servlet-class/> that doesn't
  * exist, as long as it is never invoked. On the other hand, WebLogic loads all
  * serlvets at startup, and will barf if the class is not found.
- * 
+ *
  * Check each <servlet-class/> to insure that the class can be loaded and
  * instantiated and assigned to HttpServlet.
- * 
+ *
  * ------
- * 
+ *
  * Embedded URIs in taglibs.
- * 
+ *
  * I can't find this definitively in the JSP spec, but some containers complain
  * if web.xml specifies a <taglib-uri/> that conflicts with the <uri/> embedded
  * in the taglib itself. As far as I can see in the spec, the embedded <uri/>
@@ -73,51 +73,51 @@ import org.xml.sax.SAXException;
  * "Implicit Map Entries From TLDs", which in turn is only relevant for TLDs
  * packaged in JAR files. So, I can't find support for this complaint, but it
  * seems a reasonable one.
- * 
+ *
  * Check each <taglib/> specified in web.xml. If the taglib has an embedded
  * <uri/> tag, it should match the <taglib-uri/> from web.xml.
- * 
+ *
  * ------
- * 
+ *
  * Existence of Listener and Filter classes.
- * 
+ *
  * As far as I can tell, there is no ambiguity here, and every container will
  * complain if any of the <listener-class/> or <filter-class/> entries are
  * unsuitable. I check them anyway, since the mechanism was already assembled
  * for checking <servlet-class/> entries.
- * 
+ *
  * Check each <listener-class/> to insure that the class can be loaded and
  * instantiated and assigned to ServletContextListener.
- * 
+ *
  * Check each <filter-class/> to insure that the class can be loaded and
  * instantiated and assigned to Filter.
- * 
+ *
  * ------
- * 
+ *
  * A <servlet/> tag for every <servlet-mapping/> tag
- * 
+ *
  * I can't find a mention of this in the spec, but Tomcat complains and refuses
  * to load the app if there is a <servlet-mapping/> tag whose <servlet-name/> is
  * not matched by a <servlet-name/> in a <servlet/> tag.
- * 
+ *
  * Get sets of all <servlet-name/> tags that are specified in <servlet/> and
  * <servlet-mapping/> tags. There should not be any names in the
  * servlet-mappings that are not in the servlets.
- * 
+ *
  * ---------------------------------------------------------------------
- * 
+ *
  * Although this class is executed as a JUnit test, it doesn't have the usual
  * structure for a unit test.
- * 
+ *
  * In order to produce the most diagnostic information, the test does not abort
  * on the first failure. Rather, failure messages are accumulated until all
  * checks have been performed, and the test list all such messages on failure.
- * 
+ *
  * ---------------------------------------------------------------------
- * 
+ *
  * Since this is not executed as part of the standard Vitro unit tests, it also
  * cannot use the standard logging mechanism. Log4J has not been initialized.
- * 
+ *
  */
 public class CheckContainerNeutrality {
 	private static final String PROPERTY_WEBAPP_DIR = "CheckContainerNeutrality.webapp.dir";
diff --git a/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/jarlist/JarLister.java b/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/jarlist/JarLister.java
index 3bea77e6e..43f11a0c3 100644
--- a/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/jarlist/JarLister.java
+++ b/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/jarlist/JarLister.java
@@ -24,23 +24,23 @@ import com.tonicsystems.jarjar.KlugedDepFind;
 
 /**
  * This takes the place of the JarJar main routine, in doing a Find operation.
- * 
+ *
  * One thing this lets us do is to call KlugedDepFind instead of DepFind.
  * KlugedDepFind was created because JarJar had a known bug that wasn't fixed in
  * the latest release. (see http://code.google.com/p/jarjar/issues/detail?id=6).
  * I had to put KlugedDepFind into the com.tonicsystems.jarjar package so it
  * wauld have access to DepFindVisitor, which is package-private.
- * 
+ *
  * The other thing we can do is to provide a custom DepHandler which records the
  * dependencies directly instead of writing them to a file which we would need
  * to parse. Since we have the dependencies in a data structure, it's easy to
  * walk the tree and find out what JARs are required, even through several
  * layers of dependency.
- * 
+ *
  * When calling this, pass 2 arguments. The first is the path to the JAR which
  * contains the Vitro (or VIVO) classes. The second is the path to the directory
  * that contains the JARs. (shouldn't end with a slash)
- * 
+ *
  * There is a list of JARs which we know we need but which aren't shown by the
  * analysis. For example, the MySQL driver is loaded dynamically by name, so an
  * analysis of the class files in the JARs won't show that it is used. For now,
@@ -50,9 +50,9 @@ import com.tonicsystems.jarjar.KlugedDepFind;
 public class JarLister {
 	/**
 	 * <pre>
-	 * 
+	 *
 	 * What I originally wanted to do was this:
-	 * 
+	 *
 	 * <target name="jarlist" depends="jar" description="Figure out what JARs are needed">
 	 *   <java classname="com.tonicsystems.jarjar.Main" fork="no" failonerror="true">
 	 *     <classpath refid="utility.run.classpath" />
@@ -62,9 +62,9 @@ public class JarLister {
 	 *     <arg value="${appbase.dir}/lib/*" />
 	 *   </java>
 	 * </target>
-	 * 
+	 *
 	 * I ended up with this instead:
-	 * 
+	 *
 	 * <target name="jarlist" depends="jar" description="Figure out what JARs are needed">
 	 *   <java classname="edu.cornell.mannlib.vitro.utilities.jarlist.JarLister" fork="no" failonerror="true">
 	 *     <classpath refid="utility.run.classpath" />
@@ -73,7 +73,7 @@ public class JarLister {
 	 *     <arg value="${appbase.dir}/config/jarlist/known_dependencies.txt" />
 	 *   </java>
 	 * </target>
-	 * 
+	 *
 	 * </pre>
 	 */
 
diff --git a/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/revisioninfo/ProcessRunner.java b/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/revisioninfo/ProcessRunner.java
index 4ac15d59d..abd9569bd 100644
--- a/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/revisioninfo/ProcessRunner.java
+++ b/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/revisioninfo/ProcessRunner.java
@@ -12,9 +12,9 @@ import java.util.Map;
 
 /**
  * A harness that runs a system-level command.
- * 
+ *
  * No provision is made for standard input.
- * 
+ *
  * The standard output and standard error streams are asynchronously read, so
  * the sub-process will not block on full buffers. Warning: if either of these
  * streams contain more data than can fit into a String, then we will have a
@@ -40,7 +40,7 @@ public class ProcessRunner {
 
 	/**
 	 * Run the command.
-	 * 
+	 *
 	 * @param command
 	 *            a list containing the operating system program and its
 	 *            arguments. See
diff --git a/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/revisioninfo/RevisionInfoBuilder.java b/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/revisioninfo/RevisionInfoBuilder.java
index 92f21f8d1..bd47039eb 100644
--- a/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/revisioninfo/RevisionInfoBuilder.java
+++ b/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/revisioninfo/RevisionInfoBuilder.java
@@ -17,15 +17,15 @@ import edu.cornell.mannlib.vitro.utilities.revisioninfo.ProcessRunner.ProcessExc
 /**
  * Get release and revision information to display on screen. Put this
  * information into a single line and append it to the specified file.
- * 
+ *
  * Ask Git for the information. If Git is available, and if this is a working
  * directory, then we can build the info from the responses we get from
  * "git describe", "git symbolic-ref" and "git log".
- * 
+ *
  * If that doesn't work, read the information from the "revisionInfo" file in
  * the product directory. Presumably, that file was created when the source was
  * exported from Git.
- * 
+ *
  * If that doesn't work either, return something like this:
  * "productName ~ unknown ~ unknown"
  */
@@ -123,7 +123,7 @@ public class RevisionInfoBuilder {
 		if (revision == null) {
 			System.out.println("Couldn't get commit ID from Git");
 		}
-		
+
 		if ((revision == null) && (release == null)) {
 			return null;
 		}
diff --git a/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/testing/VitroTestRunListener.java b/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/testing/VitroTestRunListener.java
index 44db6571d..46e5570b6 100644
--- a/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/testing/VitroTestRunListener.java
+++ b/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/testing/VitroTestRunListener.java
@@ -25,10 +25,10 @@ import edu.cornell.mannlib.vitro.utilities.testing.VitroTestRunner.ReportLevel;
  * Listen to events as they come from the JUnit test runner. The events from the
  * lifecycle methods are broken down into semantic chunks and executed. Three
  * levels of output are available.
- * 
+ *
  * On the surface, JUnit treats "failures" (failed assertions) the same as
  * "errors" (unexpected exceptions). We're going to distinguish between them.
- * 
+ *
  * @author jeb228
  */
 public class VitroTestRunListener extends RunListener {
@@ -303,10 +303,10 @@ public class VitroTestRunListener extends RunListener {
 	/**
 	 * Trim the stack trace: don't show the line saying "23 more", and don't
 	 * show the lines about org.junit or java.lang.reflect or sun.reflect.
-	 * 
+	 *
 	 * Once we hit some "client code", we won't trim any futher lines even if
 	 * they belong to org.junit, or the others.
-	 * 
+	 *
 	 * If we have nested exceptions, the process repeats for each "Caused by"
 	 * section.
 	 */
diff --git a/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/testing/VitroTestRunner.java b/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/testing/VitroTestRunner.java
index f30d0d0d4..3636287d1 100644
--- a/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/testing/VitroTestRunner.java
+++ b/legacy/utilities/buildutils/src/edu/cornell/mannlib/vitro/utilities/testing/VitroTestRunner.java
@@ -16,7 +16,7 @@ import org.junit.runner.JUnitCore;
  * It runs the tests with a variety of reporting detail, depending on the level
  * selected. If the level selector is absent or unrecognized, the medium level
  * is used.
- * 
+ *
  * @author jeb228
  */
 public class VitroTestRunner {
diff --git a/legacy/utilities/rdbmigration/src/edu/cornell/mannlib/vivo/utilities/rdbmigration/RdbMigrator.java b/legacy/utilities/rdbmigration/src/edu/cornell/mannlib/vivo/utilities/rdbmigration/RdbMigrator.java
index 58644e125..d03e71b7d 100644
--- a/legacy/utilities/rdbmigration/src/edu/cornell/mannlib/vivo/utilities/rdbmigration/RdbMigrator.java
+++ b/legacy/utilities/rdbmigration/src/edu/cornell/mannlib/vivo/utilities/rdbmigration/RdbMigrator.java
@@ -55,7 +55,7 @@ public class RdbMigrator {
 	/**
 	 * Confirm all of the parameters. Ask the user for approval. Do the
 	 * migration.
-	 * 
+	 *
 	 * @throws UserDeclinedException
 	 *             If the user decides not to continue.
 	 */
diff --git a/legacy/utilities/sdb_to_tdb/README.txt b/legacy/utilities/sdb_to_tdb/README.txt
index 3b23497e0..e33a07229 100644
--- a/legacy/utilities/sdb_to_tdb/README.txt
+++ b/legacy/utilities/sdb_to_tdb/README.txt
@@ -3,17 +3,17 @@ A tool to convert triples from SDB to TDB.
 Unlike the RDF-migration tool, this tool is not tied to the VIVO
 properties files. Instead, you must provide:
 * The URL for the SDB, including username and password parameters
-* The directory path for the TDB. 
-     The directory must exist. 
+* The directory path for the TDB.
+     The directory must exist.
      The directory must be empty, unless the "force" optiopn is used.
 
 Examples:
 
-   java -jar sdb2tdb.jar \ 
-   		jdbc:mysql://localhost/vitrodb?user=vivoUser&password=vivoPass \ 
+   java -jar sdb2tdb.jar \
+   		jdbc:mysql://localhost/vitrodb?user=vivoUser&password=vivoPass \
    		/usr/local/my/tdb
-   		
+
    java -Xms512m -Xmx4096m -jar .work/sdb2tdb.jar \
         'jdbc:mysql://localhost/weill17?user=vivoUser&password=vivoPass' \
          /Users/jeb228/Testing/instances/weill-develop/vivo_home/contentTdb \
-         force   
\ No newline at end of file
+         force
diff --git a/legacy/utilities/sdb_to_tdb/src/edu/cornell/mannlib/vitro/utilities/sdb2tdb/Sdb2Tdb.java b/legacy/utilities/sdb_to_tdb/src/edu/cornell/mannlib/vitro/utilities/sdb2tdb/Sdb2Tdb.java
index e697b0e80..807beb8ce 100644
--- a/legacy/utilities/sdb_to_tdb/src/edu/cornell/mannlib/vitro/utilities/sdb2tdb/Sdb2Tdb.java
+++ b/legacy/utilities/sdb_to_tdb/src/edu/cornell/mannlib/vitro/utilities/sdb2tdb/Sdb2Tdb.java
@@ -40,25 +40,25 @@ import org.apache.jena.tdb.TDBFactory;
 /**
  * Copy all of the data from an SDB triple-store to a TDB triple-store. See
  * README.txt for more details.
- * 
+ *
  * Examples of invoking it:
- * 
+ *
  * <pre>
- *    java -jar sdb2tdb.jar \ 
- *    		'jdbc:mysql://localhost/vitrodb?user=vivoUser&password=vivoPass'\ 
+ *    java -jar sdb2tdb.jar \
+ *    		'jdbc:mysql://localhost/vitrodb?user=vivoUser&password=vivoPass'\
  *    		/usr/local/my/tdb
- *    
+ *
  *    java -Xms2048m -Xmx2048m -jar .work/sdb2tdb.jar \
  *          'jdbc:mysql://localhost/weill17?user=vivoUser&password=vivoPass' \
  *          /Users/jeb228/Testing/instances/weill-develop/vivo_home/contentTdb \
  *          force
  * </pre>
- * 
+ *
  * Each graph is copied separately. Small graphs are simply loaded into memory
  * and transferred. Large graphs are read to produce a streaming result set
  * which is written to a temporary file. That file is then read into a TDB
  * model.
- * 
+ *
  * This has been tested with graphs up to 6 million triples without crashing.
  */
 public class Sdb2Tdb {
diff --git a/legacy/utilities/solrtester/src/edu/cornell/mannlib/vitro/utilities/solrtest/SolrConfigTester.java b/legacy/utilities/solrtester/src/edu/cornell/mannlib/vitro/utilities/solrtest/SolrConfigTester.java
index ede77f24c..baf22d9b6 100644
--- a/legacy/utilities/solrtester/src/edu/cornell/mannlib/vitro/utilities/solrtest/SolrConfigTester.java
+++ b/legacy/utilities/solrtester/src/edu/cornell/mannlib/vitro/utilities/solrtest/SolrConfigTester.java
@@ -226,22 +226,22 @@ public class SolrConfigTester {
 
 /**
  * TODO
- * 
+ *
  * <pre>
  * // ** Let's index a document into our embedded server
- * 
+ *
  * SolrInputDocument newDoc = new SolrInputDocument();
  * newDoc.addField(&quot;title&quot;, &quot;Test Document 1&quot;);
  * newDoc.addField(&quot;id&quot;, &quot;doc-1&quot;);
  * newDoc.addField(&quot;text&quot;, &quot;Hello world!&quot;);
  * server.add(newDoc);
  * server.commit();
- * 
+ *
  * // ** And now let's query for it
- * 
+ *
  * params.set(&quot;q&quot;, &quot;title:test&quot;);
  * QueryResponse qResp = server.query(params);
- * 
+ *
  * SolrDocumentList docList = qResp.getResults();
  * System.out.println(&quot;Num docs: &quot; + docList.getNumFound());
  * SolrDocument doc = docList.get(0);
diff --git a/legacy/utilities/testrunner/test-user-model.owl b/legacy/utilities/testrunner/test-user-model.owl
index a84b13707..4e1da1fdb 100644
--- a/legacy/utilities/testrunner/test-user-model.owl
+++ b/legacy/utilities/testrunner/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/legacy/webapp/config/example.build.properties b/legacy/webapp/config/example.build.properties
index ed1b16b39..e8c9b73a0 100644
--- a/legacy/webapp/config/example.build.properties
+++ b/legacy/webapp/config/example.build.properties
@@ -4,14 +4,14 @@
 #
 # This file is provided as example.build.properties.
 #
-# Save a copy of this file as build.properties, and edit the properties as 
+# Save a copy of this file as build.properties, and edit the properties as
 # needed for your installation.
 #
 # -----------------------------------------------------------------------------
 
 #
-# The base install directory for your Tomcat server. The Vitro application 
-# will be deployed in the /webapps directory below this base. 
+# The base install directory for your Tomcat server. The Vitro application
+# will be deployed in the /webapps directory below this base.
 #
 tomcat.home = /usr/local/tomcat
 
@@ -33,4 +33,4 @@ vitro.home = /usr/local/vitro/home
 # 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 = 
+#languages.addToBuild =
diff --git a/legacy/webapp/config/example.runtime.properties b/legacy/webapp/config/example.runtime.properties
index 882026b55..9822be25e 100644
--- a/legacy/webapp/config/example.runtime.properties
+++ b/legacy/webapp/config/example.runtime.properties
@@ -4,25 +4,25 @@
 #
 # This file is provided as example.runtime.properties.
 #
-# Save a copy of this file as runtime.properties in your Vitro home directory, 
+# Save a copy of this file as runtime.properties in your Vitro home directory,
 # and edit the properties as needed for your installation.
 #
 # -----------------------------------------------------------------------------
 
-# 
-# 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 
+#
+# 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/
 #
 Vitro.defaultNamespace = http://vivo.mydomain.edu/individual/
 
-# 
+#
 # URL of Solr context used in local Vitro search. This will usually consist of:
 #     scheme + server_name + port + vitro_webapp_name + "solr"
 # In the standard installation, the Solr context will be on the same server as Vitro,
@@ -33,7 +33,7 @@ Vitro.defaultNamespace = http://vivo.mydomain.edu/individual/
 vitro.local.solr.url = http://localhost:8080/vitrosolr
 
 #
-# 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.
 #
@@ -41,8 +41,8 @@ email.smtpHost = smtp.my.domain.edu
 email.replyTo = vivoAdmin@my.domain.edu
 
 #
-# The basic parameters for a MySQL database connection. Change the end of the 
-# URL to reflect your database name (if it is not "vitro"). Change the username 
+# The basic parameters for a MySQL database connection. Change the end of the
+# URL to reflect your database name (if it is not "vitro"). Change the username
 # and password to match the authorized user you created in MySQL.
 #
 VitroConnection.DataSource.url = jdbc:mysql://localhost/vitro
@@ -63,7 +63,7 @@ VitroConnection.DataSource.pool.maxActive = 40
 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
@@ -71,8 +71,8 @@ VitroConnection.DataSource.driver = com.mysql.jdbc.Driver
 VitroConnection.DataSource.validationQuery = SELECT 1
 
 #
-# 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 
+# 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 = root@myDomain.com
@@ -94,7 +94,7 @@ argon2.memory = 1024
 argon2.time = 1000
 
 #
-# 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 is the name of that property.
 #
@@ -104,11 +104,11 @@ selfEditing.idMatchingProperty = http://vitro.mydomain.edu/ns#networkId
 # If an external authentication system like Shibboleth or CUWebAuth is to be
 # used, these properties say how the login button should be labeled, and which
 # HTTP header will contain the user ID from the authentication system. If such
-# as system is not to be used, leave these commented out. Consult the 
-# installation instructions for more details. 
+# as system is not to be used, leave these commented out. Consult the
+# installation instructions for more details.
 #
 #externalAuth.buttonText = Log in using BearCat Shibboleth
-#externalAuth.netIdHeaderName = remote_userID 
+#externalAuth.netIdHeaderName = remote_userID
 
 #
 # Types of individual for which we can create proxy editors.
@@ -116,39 +116,39 @@ selfEditing.idMatchingProperty = http://vitro.mydomain.edu/ns#networkId
 proxy.eligibleTypeList = http://www.w3.org/2002/07/owl#Thing
 
 #
-# 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 = true
 
 #
-# 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.
 #
-# For more information, see 
+# For more information, see
 # https://wiki.duraspace.org/display/VIVO/Use+HTTP+caching+to+improve+performance
 #
 # 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
 
 #
-# 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.
 #
diff --git a/legacy/webapp/config/jarlist/known_dependencies.txt b/legacy/webapp/config/jarlist/known_dependencies.txt
index 1db0d99de..ab5629c72 100644
--- a/legacy/webapp/config/jarlist/known_dependencies.txt
+++ b/legacy/webapp/config/jarlist/known_dependencies.txt
@@ -1,10 +1,10 @@
 #
 # A list of JARs that we know to be required by the source code (and notes on where they are required).
 #
-# The "jarlist" target of the build script will work on the assumption that these JARs and any JARs 
+# The "jarlist" target of the build script will work on the assumption that these JARs and any JARs
 # that they depend on are required by the app.
 #
-# For example, the JDBC drivers are never explicitly included, but instead are invoked using Class.forName(), 
+# For example, the JDBC drivers are never explicitly included, but instead are invoked using Class.forName(),
 # so they are required even though the "jarlist" target won't find any such requirement.
 #
 
diff --git a/legacy/webapp/config/licenser/known_exceptions.txt b/legacy/webapp/config/licenser/known_exceptions.txt
index e7cbc989d..e0281e4c6 100644
--- a/legacy/webapp/config/licenser/known_exceptions.txt
+++ b/legacy/webapp/config/licenser/known_exceptions.txt
@@ -1,8 +1,8 @@
 #
-# A list of files and directories that are known exceptions to the 
+# A list of files and directories that are known exceptions to the
 # license-insertion process.
 #
-# Files will only be altered if they contain a "magic" license place-holder, 
+# Files will only be altered if they contain a "magic" license place-holder,
 # but if they match one of the file-matchers and don't contain a place-holder,
 # the process will write a warning.
 #
@@ -96,7 +96,7 @@ webapp/web/src/rpc/*
 webapp/web/src/selection/*
 webapp/web/src/storage/*
 webapp/web/src/storage.js
-webapp/web/src/string/* 
+webapp/web/src/string/*
 webapp/web/src/string.js
 webapp/web/src/style.js
 webapp/web/src/svg.js
diff --git a/legacy/webapp/config/licenser/licenser.properties b/legacy/webapp/config/licenser/licenser.properties
index e295c2d0f..72a6293ff 100644
--- a/legacy/webapp/config/licenser/licenser.properties
+++ b/legacy/webapp/config/licenser/licenser.properties
@@ -1,14 +1,14 @@
 # --------------------------------------------------------------------------
 #  Properties for running the licenser utility in Vitro core.
 # --------------------------------------------------------------------------
-  
+
 # 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 = 
+target_dir =
 
 # A list of filename globs that match the files we want to license,
 # delimited by commas with optional white-space.
@@ -18,9 +18,9 @@ file_matchers = *.java, *.jsp, *.tld, *.xsl, *.xslt, *.css, *.js, *.ftl, *.xml
 # (relative to the source_dir)
 skip_directories = ./bin, ./.svn, ./**/.svn, ./webapp/.build
 
-# 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. 
+# 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 = webapp/config/licenser/known_exceptions.txt
 
diff --git a/legacy/webapp/config/log4j.properties b/legacy/webapp/config/log4j.properties
index 3d3b93c64..354a118a4 100644
--- a/legacy/webapp/config/log4j.properties
+++ b/legacy/webapp/config/log4j.properties
@@ -2,7 +2,7 @@
 # This file sets the log levels for the Vitro webapp.
 #
 # There are 8 principal logging levels, as follows:
-#     <-- more messages ALL TRACE DEBUG INFO WARN ERROR FATAL OFF fewer messages --> 
+#     <-- more messages ALL TRACE DEBUG INFO WARN ERROR FATAL OFF fewer messages -->
 #
 # The default logging level is specified on the rootLogger. Other levels can be
 # set for individual classes or packages as desired.
@@ -22,7 +22,7 @@
 #
 # The "production" version of this file is log4j.properties.
 # debug.log4j.properties exists will be used instead, if it exists, but is not stored in Subversion.
- 
+
 log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender
 log4j.appender.AllAppender.File= $${catalina.base}/logs/${webapp.name}.all.log
 log4j.appender.AllAppender.MaxFileSize=10MB
diff --git a/legacy/webapp/context.xml b/legacy/webapp/context.xml
index a6d3ab65d..edebfebcf 100644
--- a/legacy/webapp/context.xml
+++ b/legacy/webapp/context.xml
@@ -1,7 +1,7 @@
 <Context>
   <!-- $This file is distributed under the terms of the license in LICENSE$ -->
     <!--
-        Disable the attempt to persist sessions when Tomcat shuts down. 
+        Disable the attempt to persist sessions when Tomcat shuts down.
     -->
     <Manager pathname="" />
 </Context>
diff --git a/legacy/webapp/languages/es_GO/i18n/all_es_GO.properties b/legacy/webapp/languages/es_GO/i18n/all_es_GO.properties
index 490c286cf..5d6e7ee1d 100644
--- a/legacy/webapp/languages/es_GO/i18n/all_es_GO.properties
+++ b/legacy/webapp/languages/es_GO/i18n/all_es_GO.properties
@@ -76,7 +76,7 @@ imageUpload.errorUnrecognizedFileType = ''{0}'' no es un tipo de archivo de imag
 imageUpload.errorNoPhotoSelected = Por favor, busque y seleccione una foto.
 imageUpload.errorBadMultipartRequest = Error al analizar la solicitud de varias partes para subir una imagen.
 imageUpload.errorFormFieldMissing = El formulario no contiene a {0} ''campo'' ".
-					
+
 #
 # User Accounts pages
 #
diff --git a/legacy/webapp/languages/es_GO/templates/freemarker/search-help_es_GO.ftl b/legacy/webapp/languages/es_GO/templates/freemarker/search-help_es_GO.ftl
index 84e17b5ea..7d60e023b 100644
--- a/legacy/webapp/languages/es_GO/templates/freemarker/search-help_es_GO.ftl
+++ b/legacy/webapp/languages/es_GO/templates/freemarker/search-help_es_GO.ftl
@@ -6,7 +6,7 @@
         <a href="#" onClick="history.back();return false;" title="regresar a los resultados">regresar a los resultados</a>
     </span>
 <#else>
-    <h3>Consejos Para la Búsqueda</h3>        
+    <h3>Consejos Para la Búsqueda</h3>
 </#if>
 <ul class="searchTips">
     <li>Debe ser sencillo. Utilice corto, único a menos que las búsquedas están regresando muchos resultados.</li>
@@ -14,30 +14,30 @@
     <li>A excepción de los operadores booleanos, búsquedas <strong>no distinguen</strong> entre mayúsculas y minúsculas, por lo que "Ginebra" y "ginebra" son equivalentes</li>
     <li>Si no está seguro de la ortografía correcta, ponga ~ al final de su término de búsqueda -- por ejemplo, <i>cabage~</i> encuentra <i>cabbage</i>, <i>steven~</i> encuentra <i>Stephen</i> y <i>Stefan</i> (así como otros nombres similares).</li>
 </ul>
-    
-<h4><a id="advTipsLink" href="#">Consejos Avanzados</a></h4>    
+
+<h4><a id="advTipsLink" href="#">Consejos Avanzados</a></h4>
 <ul id="advanced" class="searchTips" style="visibility:hidden">
     <li>Cuando se introduce más de un término, la búsqueda devolverá resultados que contengan todas ellas a menos que agregue el operador booleano "OR" -- por ejemplo, <i>pollo</i> OR <i>huevos</i>.</li>
     <li>"NOT" puede ayudar búsquedas límite -- por ejemplo, <i>clima</i> NOT <i>cambiar</i>.</li>
     <li>Las búsquedas de frases se pueden combinar con operadores booleanos -- por exemplo, "<i>cambio climático</i>" OR "<i>calentamiento global</i>".</li>
     <li>Asimismo, se encuentra cerca variaciones de palabras -- por exemplo, <i>secuencia</i> emparejas <i>secuencias</i> y <i>secuenciación</i>.</li>
     <li>Utilice el carácter comodín * para que coincida con una variación aún mayor -- por exemplo, <i>nano*</i> emparejas <i>nanotechnology</i> y <i>nanofabrication</i>.</li>
-    <li>Search utiliza versiones acortadas de palabras -- por exemplo, una búsqueda de "cogni*" no encuentra nada, mientras que la "cogn*" encuentra tanto <i>cognitivo</i> and <i>cognición</i>.</li> 
+    <li>Search utiliza versiones acortadas de palabras -- por exemplo, una búsqueda de "cogni*" no encuentra nada, mientras que la "cogn*" encuentra tanto <i>cognitivo</i> and <i>cognición</i>.</li>
 </ul>
 <a id="closeLink" href="#"  style="visibility:hidden;font-size:.825em;padding-left:8px">Close</a>
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/search.css" />')}
 <script type="text/javascript">
     $(document).ready(function(){
         $('a#advTipsLink').click(function() {
-           $('ul#advanced').css("visibility","visible"); 
+           $('ul#advanced').css("visibility","visible");
            $('a#closeLink').css("visibility","visible");
            $('a#closeLink').click(function() {
-              $('ul#advanced').css("visibility","hidden"); 
+              $('ul#advanced').css("visibility","hidden");
               $('a#closeLink').css("visibility","hidden");
               return false;
            });
            return false;
         });
     });
-    
-</script>
\ No newline at end of file
+
+</script>
diff --git a/legacy/webapp/languages/es_GO/templates/freemarker/termsOfUse_es_GO.ftl b/legacy/webapp/languages/es_GO/templates/freemarker/termsOfUse_es_GO.ftl
index d65b40479..c8a37305b 100644
--- a/legacy/webapp/languages/es_GO/templates/freemarker/termsOfUse_es_GO.ftl
+++ b/legacy/webapp/languages/es_GO/templates/freemarker/termsOfUse_es_GO.ftl
@@ -2,22 +2,22 @@
 
 <section id="terms" role="region">
     <h2>Condiciones de uso</h2>
-    
+
     <h3>Aviso legal</h3>
 
     <p>Este ${termsOfUse.siteName} sitio web contiene material&mdash;información de texto, la publicación
     citas, enlaces e imágenes&mdash;proporcionado por ${termsOfUse.siteHost} y varios terceros, tanto de los
     individuos y las organizaciones, comerciales y de otro tipo. En la medida de derecho de autor, la información
     presentada en el sitio web VIVO y disponible como Resource Description Framework (RDF) datos de VIVO en
-    ${termsOfUse.siteHost} se destina para uso público y se distribuye libremente bajo los términos de la 
+    ${termsOfUse.siteHost} se destina para uso público y se distribuye libremente bajo los términos de la
     <a href="http://creativecommons.org/licenses/by/3.0/" target="_blank" title="creative commons">Creative Commons
     CC-BY 3.0</a> licencia, que le permite copiar, distribuir, mostrar y hacer que los derivados de esta
     información, siempre le das crédito a ${termsOfUse.siteHost}. Cualquier información que no sea derecho de autor
-    está disponible para usted en virtud de una 
+    está disponible para usted en virtud de una
     <a href="http://creativecommons.org/publicdomain/zero/1.0/"  target="_blank" title="cco waiver">exención
     CC0</a>. Sin embargo, los documentos originales, imágenes o páginas web adjuntas o vinculado desde VIVO podrán
     contener información con derechos de autor y sólo deben ser utilizados o distribuidos en los términos que se
-    incluyen con cada fuente o de acuerdo con los principios del uso justo.</p>    
+    incluyen con cada fuente o de acuerdo con los principios del uso justo.</p>
 
     <h3>Descargo de responsabilidad</h3>
 
@@ -28,14 +28,14 @@
     ${termsOfUse.siteHost?cap_first} renuncia a cualquier garantía con respecto a la información proporcionada. Si
     usted confía en dicha información es a su propio riesgo. En ningún caso ${termsOfUse.siteHost} será responsable
     ante usted por daños o pérdidas que resulten de o causados ​​por el sitio web ${termsOfUse.siteName} o su
-    contenido.</p> 
+    contenido.</p>
 
     <h3>Renuncia de aprobación</h3>
 
     <p>La referencia en este documento a cualquier producto comercial específico, proceso o servicio por nombre
-    comercial, marca, fabricante, o de otro modo, no constituye necesariamente ni implica un endoso o recomendación 
-    por parte de ${termsOfUse.siteHost}. Los puntos de vista y opiniones de los autores expresadas en este documento 
-    no representan ni reflejan necesariamente las de Cornell y no podrá ser utilizado para fines publicitarios o 
-    endoso de productos.</p> 
-    
-</section>
\ No newline at end of file
+    comercial, marca, fabricante, o de otro modo, no constituye necesariamente ni implica un endoso o recomendación
+    por parte de ${termsOfUse.siteHost}. Los puntos de vista y opiniones de los autores expresadas en este documento
+    no representan ni reflejan necesariamente las de Cornell y no podrá ser utilizado para fines publicitarios o
+    endoso de productos.</p>
+
+</section>
diff --git a/legacy/webapp/languages/es_GO/templates/freemarker/userAccounts-acctCreatedEmail_es_GO.ftl b/legacy/webapp/languages/es_GO/templates/freemarker/userAccounts-acctCreatedEmail_es_GO.ftl
index 7171b596a..e4b3173eb 100644
--- a/legacy/webapp/languages/es_GO/templates/freemarker/userAccounts-acctCreatedEmail_es_GO.ftl
+++ b/legacy/webapp/languages/es_GO/templates/freemarker/userAccounts-acctCreatedEmail_es_GO.ftl
@@ -3,7 +3,7 @@
 <#-- Confirmation that an account has been created. -->
 
 <#assign subject = "Su cuenta ${siteName} ha sido creado." />
- 
+
 <#assign html>
 <html>
     <head>
@@ -51,13 +51,13 @@ ${userAccount.firstName} ${userAccount.lastName}
 
 Enhorabuena!
 
-Hemos creado la nueva cuenta en ${siteName}, 
+Hemos creado la nueva cuenta en ${siteName},
 asociada con ${userAccount.emailAddress}.
 
 Si no has solicitado esta nueva cuenta puede ignorar este mensaje.
 Esta solicitud caducará si no se hubiere pronunciado sobre durante 30 días.
 
-Pega el siguiente enlace en la barra de direcciones de su navegador para 
+Pega el siguiente enlace en la barra de direcciones de su navegador para
 crear su contraseña para su nueva cuenta usando nuestro servidor seguro.
 
 ${passwordLink}
diff --git a/legacy/webapp/languages/es_GO/templates/freemarker/userAccounts-passwordCreatedEmail_es_GO.ftl b/legacy/webapp/languages/es_GO/templates/freemarker/userAccounts-passwordCreatedEmail_es_GO.ftl
index aef99f07a..92a64d054 100644
--- a/legacy/webapp/languages/es_GO/templates/freemarker/userAccounts-passwordCreatedEmail_es_GO.ftl
+++ b/legacy/webapp/languages/es_GO/templates/freemarker/userAccounts-passwordCreatedEmail_es_GO.ftl
@@ -34,7 +34,7 @@ ${userAccount.firstName} ${userAccount.lastName}
 
 Contraseña creado con éxito.
 
-Su nueva contraseña asociada con ${userAccount.emailAddress} 
+Su nueva contraseña asociada con ${userAccount.emailAddress}
 se ha creado.
 
 Gracias.
diff --git a/legacy/webapp/languages/es_GO/templates/freemarker/userAccounts-passwordResetCompleteEmail_es_GO.ftl b/legacy/webapp/languages/es_GO/templates/freemarker/userAccounts-passwordResetCompleteEmail_es_GO.ftl
index 775073a6d..56cb4317d 100644
--- a/legacy/webapp/languages/es_GO/templates/freemarker/userAccounts-passwordResetCompleteEmail_es_GO.ftl
+++ b/legacy/webapp/languages/es_GO/templates/freemarker/userAccounts-passwordResetCompleteEmail_es_GO.ftl
@@ -35,7 +35,7 @@ ${userAccount.firstName} ${userAccount.lastName}
 
 Contraseña cambiada con éxito.
 
-Su nueva contraseña asociada con ${userAccount.emailAddress} 
+Su nueva contraseña asociada con ${userAccount.emailAddress}
 ha sido cambiado.
 
 Gracias.
diff --git a/legacy/webapp/languages/es_GO/templates/freemarker/userAccounts-passwordResetPendingEmail_es_GO.ftl b/legacy/webapp/languages/es_GO/templates/freemarker/userAccounts-passwordResetPendingEmail_es_GO.ftl
index c80f9c7c2..eb470a37b 100644
--- a/legacy/webapp/languages/es_GO/templates/freemarker/userAccounts-passwordResetPendingEmail_es_GO.ftl
+++ b/legacy/webapp/languages/es_GO/templates/freemarker/userAccounts-passwordResetPendingEmail_es_GO.ftl
@@ -13,28 +13,28 @@
         <p>
             Estimado ${userAccount.firstName} ${userAccount.lastName}:
         </p>
-        
+
         <p>
-            Hemos recibido una solicitud para restablecer la contraseña de su cuenta ${siteName} 
+            Hemos recibido una solicitud para restablecer la contraseña de su cuenta ${siteName}
             (${userAccount.emailAddress}).
         </p>
-        
+
         <p>
             Por favor, siga las siguientes instrucciones para proceder con su restablecimiento de contraseña.
         </p>
-        
+
         <p>
             Si no has solicitado esta nueva cuenta puede ignorar este mensaje.
             Esta solicitud caducará si no se hubiere pronunciado en un plazo de 30 días.
         </p>
-        
+
         <p>
-            Haga clic en el enlace de abajo o pegarlo en la barra de direcciones de su navegador para 
+            Haga clic en el enlace de abajo o pegarlo en la barra de direcciones de su navegador para
             restablecer su contraseña usando nuestro servidor seguro.
         </p>
-        
+
         <p>${passwordLink}</p>
-        
+
         <p>¡Gracias!</p>
     </body>
 </html>
@@ -42,7 +42,7 @@
 
 <#assign text>
 Estimado ${userAccount.firstName} ${userAccount.lastName}:
-        
+
 Hemos recibido una solicitud para restablecer la contraseña de su cuenta ${siteName}
 (${userAccount.emailAddress}).
 
@@ -51,11 +51,11 @@ Por favor, siga las siguientes instrucciones para proceder con su restablecimien
 Si no has solicitado esta nueva cuenta puede ignorar este mensaje.
 Esta solicitud caducará si no se hubiere pronunciado en un plazo de 30 días.
 
-Pega el siguiente enlace en la barra de direcciones de su navegador para 
+Pega el siguiente enlace en la barra de direcciones de su navegador para
 restablecer su contraseña usando nuestro servidor seguro.
 
 ${passwordLink}
-        
+
 ¡Gracias!
 </#assign>
 
diff --git a/webapp/src/main/webResources/WEB-INF/resources/revisionInfo.txt b/webapp/src/main/webResources/WEB-INF/resources/revisionInfo.txt
index 6221cbb37..498d4012e 100644
--- a/webapp/src/main/webResources/WEB-INF/resources/revisionInfo.txt
+++ b/webapp/src/main/webResources/WEB-INF/resources/revisionInfo.txt
@@ -1,2 +1,2 @@
 ${build.timestamp}
-Vitro ~ ${project.version} ~ ${buildNumber}
\ No newline at end of file
+Vitro ~ ${project.version} ~ ${buildNumber}
diff --git a/webapp/src/main/webapp/WEB-INF/dwr.xml b/webapp/src/main/webapp/WEB-INF/dwr.xml
index 7e7491ddc..6c4694875 100755
--- a/webapp/src/main/webapp/WEB-INF/dwr.xml
+++ b/webapp/src/main/webapp/WEB-INF/dwr.xml
@@ -11,30 +11,30 @@
     <!-- creator: "new" "scripted" "spring"  -->
     <!-- scope: "application" "session" "request" "page" -->
     <!-- that the "request" scope is only useful for static methods -->
-  
+
       <create creator="new" javascript="PropertyDWR" scope="page">
           <param name="class" value="edu.cornell.mannlib.vitro.webapp.dwr.PropertyDWR"/>
       </create>
-      
+
       <create creator="new" javascript="EntityDWR" scope="page">
           <param name="class" value="edu.cornell.mannlib.vitro.webapp.dwr.EntityDWR" />
-      </create>         
+      </create>
 
       <create creator="new" javascript="VClassDWR" scope="page">
           <param name="class" value="edu.cornell.mannlib.vitro.webapp.dwr.VClassDWR"/>
       </create>
-      
-    <!-- Convert blocks define how a types are moved between java 
-         land and java script land -->    
+
+    <!-- Convert blocks define how a types are moved between java
+         land and java script land -->
 
     <convert converter="bean" match="edu.cornell.mannlib.vitro.webapp.beans.VClass">
         <param name="include" value="name,URI,groupURI,hidden,shortDef,hiddenFromPublicDisplay,hiddenFromEditDisplay"/>
     </convert>
-                                           
+
     <convert converter="bean" match="edu.cornell.mannlib.vitro.webapp.beans.Individual">
         <param name="include" value="name,moniker,URI,vClassURI"/>
     </convert>
-    
+
     <convert converter="bean" match="edu.cornell.mannlib.vitro.webapp.beans.PropertyInstance"/>
 
     <!--<convert converter="object" match="edu.cornell.mannlib.vitro.beans.Entity">-->
diff --git a/webapp/src/main/webapp/WEB-INF/resources/shortview_config.n3 b/webapp/src/main/webapp/WEB-INF/resources/shortview_config.n3
index 879421b09..0d969074f 100644
--- a/webapp/src/main/webapp/WEB-INF/resources/shortview_config.n3
+++ b/webapp/src/main/webapp/WEB-INF/resources/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,6 +8,6 @@
 # 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://wiki.duraspace.org/display/VIVO/Using+Short+Views+in+Release+1.5
 #
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 90bbfa468..3acf9d7ad 100644
--- a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
+++ b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
@@ -1,7 +1,7 @@
 #
 # ServletContextListeners for Vitro, to be instantiated and run by the StartupManager.
-# 
-# For more information, 
+#
+# For more information,
 #     https://wiki.duraspace.org/display/VIVO/The+StartupManager
 #
 
@@ -53,7 +53,7 @@ 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 
+# 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
 
@@ -63,7 +63,7 @@ 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 
+# 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
 
diff --git a/webapp/src/main/webapp/WEB-INF/tlds/StringProcessorTag.tld b/webapp/src/main/webapp/WEB-INF/tlds/StringProcessorTag.tld
index a719f3179..bfa582f2e 100644
--- a/webapp/src/main/webapp/WEB-INF/tlds/StringProcessorTag.tld
+++ b/webapp/src/main/webapp/WEB-INF/tlds/StringProcessorTag.tld
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
-<taglib 
-    xmlns="http://java.sun.com/xml/ns/j2ee" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" 
+<taglib
+    xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
     version="2.0">
-         
+
      <tlib-version>1.0</tlib-version>
      <uri>http://vitro.mannlib.cornell.edu/vitro/tags/StringProcessorTag</uri>
-     
+
 <!--
 		This taglib is for processing the output using a UnaryFunctor<String,String>
 		found in the request scope.
@@ -16,13 +16,13 @@
 
 	<tag>
 		<name>process</name>
-		<tag-class>edu.cornell.mannlib.vitro.webapp.web.jsptags.StringProcessorTag</tag-class>		
+		<tag-class>edu.cornell.mannlib.vitro.webapp.web.jsptags.StringProcessorTag</tag-class>
         <display-name>String Processor</display-name>
         <description>
             Processes output using "StringProcessor" from request.
         </description>
-        
+
 		<body-content>scriptless</body-content>
     </tag>
-    
-</taglib>
\ No newline at end of file
+
+</taglib>
diff --git a/webapp/src/main/webapp/WEB-INF/tlds/VitroUtils.tld b/webapp/src/main/webapp/WEB-INF/tlds/VitroUtils.tld
index 7eba93c69..6c4df0b24 100644
--- a/webapp/src/main/webapp/WEB-INF/tlds/VitroUtils.tld
+++ b/webapp/src/main/webapp/WEB-INF/tlds/VitroUtils.tld
@@ -2,9 +2,9 @@
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <taglib
-    xmlns="http://java.sun.com/xml/ns/j2ee" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" 
+    xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
     version="2.0">
 
      <display-name>Vitro Utilities taglib</display-name>
@@ -20,21 +20,21 @@
         <display-name>Confirm that the user is authorized for the actions that this page requires.</display-name>
         <description>
         	Confirm that the user is authorized to perform all of the RequestedActions that
-        	this page requires. If any of the actions is not authorized, the user will be 
+        	this page requires. If any of the actions is not authorized, the user will be
         	redirected to the appropriate page.
-        	
-        	The actions must be found in the "requestedActions" attribute of the request. 
-        	The attribute may be a RequestedAction or an array of RequestedActions. 
-        	
+
+        	The actions must be found in the "requestedActions" attribute of the request.
+        	The attribute may be a RequestedAction or an array of RequestedActions.
+
         	If the user is not authorized because he is not logged in, he will be directed
         	to the login page, with the current request stored as a post-login destination.
-        	
+
         	If the user is logged in but without sufficient authorization, he will be
-        	directed to the home page, which will display an "insufficient authorization" 
+        	directed to the home page, which will display an "insufficient authorization"
         	message.
         </description>
         <tag-class>edu.cornell.mannlib.vitro.webapp.web.jsptags.ConfirmAuthorization</tag-class>
 		<body-content>empty</body-content>
 	</tag>
 
-</taglib>
\ No newline at end of file
+</taglib>
diff --git a/webapp/src/main/webapp/WEB-INF/tlds/c.tld b/webapp/src/main/webapp/WEB-INF/tlds/c.tld
index 22698c97d..0ce3afb00 100644
--- a/webapp/src/main/webapp/WEB-INF/tlds/c.tld
+++ b/webapp/src/main/webapp/WEB-INF/tlds/c.tld
@@ -4,7 +4,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
     version="2.0">
-    
+
   <description>JSTL 1.1 core library</description>
   <display-name>JSTL core</display-name>
   <tlib-version>1.1</tlib-version>
@@ -74,7 +74,7 @@ not the body content should be processed.
         <description>
 Name of the exported scoped variable for the
 resulting value of the test condition. The type
-of the scoped variable is Boolean.        
+of the scoped variable is Boolean.
         </description>
         <name>var</name>
         <required>false</required>
@@ -322,7 +322,7 @@ visibility.
   <tag>
     <description>
         Like &lt;%= ... &gt;, but for expressions.
-    </description> 
+    </description>
     <name>out</name>
     <tag-class>org.apache.taglibs.standard.tag.rt.core.OutTag</tag-class>
     <body-content>JSP</body-content>
diff --git a/webapp/src/main/webapp/WEB-INF/tlds/database.tld b/webapp/src/main/webapp/WEB-INF/tlds/database.tld
index c21eb69d3..30d0fd892 100644
--- a/webapp/src/main/webapp/WEB-INF/tlds/database.tld
+++ b/webapp/src/main/webapp/WEB-INF/tlds/database.tld
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" 
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
   "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
 <taglib>
 	<tlibversion>1.0</tlibversion>
diff --git a/webapp/src/main/webapp/WEB-INF/tlds/fn.tld b/webapp/src/main/webapp/WEB-INF/tlds/fn.tld
index 12d4ca8e8..71c5220cd 100644
--- a/webapp/src/main/webapp/WEB-INF/tlds/fn.tld
+++ b/webapp/src/main/webapp/WEB-INF/tlds/fn.tld
@@ -4,7 +4,7 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
   version="2.0">
-    
+
   <description>JSTL 1.1 functions library</description>
   <display-name>JSTL functions</display-name>
   <tlib-version>1.1</tlib-version>
@@ -201,7 +201,7 @@
     <function-signature>java.lang.String trim(java.lang.String)</function-signature>
     <example>
       Name: ${fn.trim(name)}
-    </example>  
+    </example>
   </function>
 
 </taglib>
diff --git a/webapp/src/main/webapp/WEB-INF/tlds/form.tld b/webapp/src/main/webapp/WEB-INF/tlds/form.tld
index 2ad5be7a1..e7ce18299 100644
--- a/webapp/src/main/webapp/WEB-INF/tlds/form.tld
+++ b/webapp/src/main/webapp/WEB-INF/tlds/form.tld
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" 
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
   "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
 <taglib>
 	<tlibversion>1.0</tlibversion>
@@ -13,7 +13,7 @@
 		how dynamic content should be retrieved from persistent
 		storage.
 	</info>
-	
+
 	<tag>
 		<name>option</name>
 		<tagclass>edu.cornell.mannlib.vedit.tags.OptionTag</tagclass>
@@ -22,7 +22,7 @@
 			<name>name</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-		</attribute>		
+		</attribute>
 	</tag>
 
 	<tag>
@@ -33,9 +33,9 @@
 			<name>name</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-		</attribute>		
+		</attribute>
 	</tag>
-	
+
 	<tag>
 		<name>dynamicFields</name>
 		<tagclass>edu.cornell.mannlib.vedit.tags.DynamicFieldsTag</tagclass>
@@ -51,7 +51,7 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 	</tag>
-	
+
 	<tag>
 		<name>error</name>
 		<tagclass>edu.cornell.mannlib.vedit.tags.ErrorTag</tagclass>
@@ -60,7 +60,7 @@
 			<name>name</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
-		</attribute>		
+		</attribute>
 	</tag>
-	
+
 </taglib>
diff --git a/webapp/src/main/webapp/WEB-INF/tlds/taglibs-mailer.tld b/webapp/src/main/webapp/WEB-INF/tlds/taglibs-mailer.tld
index 68d74d4f7..6b00826ea 100644
--- a/webapp/src/main/webapp/WEB-INF/tlds/taglibs-mailer.tld
+++ b/webapp/src/main/webapp/WEB-INF/tlds/taglibs-mailer.tld
@@ -6,16 +6,16 @@
   <jspversion>1.1</jspversion>
   <shortname>mailer</shortname>
   <uri>http://jakarta.apache.org/taglibs/mailer-1.1</uri>
-  <info>This custom tag library is used to send e-mail.E-mail can be sent in three ways.  The first way requires the name of the 
-     SMTP host to use. The second requires the name of a JNDI Resource for a 
-     JavaMail Session.  The third requires the name of a JNDI Resource for a 
+  <info>This custom tag library is used to send e-mail.E-mail can be sent in three ways.  The first way requires the name of the
+     SMTP host to use. The second requires the name of a JNDI Resource for a
+     JavaMail Session.  The third requires the name of a JNDI Resource for a
      JavaMail MimePartDataSource.  Refer to your servlet container documentation
-     to determine which of these three methods you should use. During the 
-     creation of an e-mail message, the addresses are checked for the correct 
-     format.  After the e-mail message has been created the send tag spawns a 
+     to determine which of these three methods you should use. During the
+     creation of an e-mail message, the addresses are checked for the correct
+     format.  After the e-mail message has been created the send tag spawns a
      thread to send the message in the background so that the user does not have
      to wait for the SMTP host if it is busy.
-   
+
 &lt;!-- Create a message by entering the name of the SMTP host. --&gt;
 &lt;!-- The default for this attribute is localhost; for a host other --&gt;
 &lt;!-- than localhost supply it's name with the server attribute --&gt;
@@ -42,13 +42,13 @@ from="bar@home.net" subject="mail taglib"&gt;
     &lt;mt:message&gt;[body of message]&lt;/mt:message&gt;
     &lt;mt:send/&gt;
 &lt;/mt:mail&gt;
-How e-mail is delivered depends on the JavaMail SMTP host settings.  The 
-     JavaMail SMTP host can be configured by your Servlet Container so that 
-     bounced or undeliverable e-mails are returned to the sender by setting the 
+How e-mail is delivered depends on the JavaMail SMTP host settings.  The
+     JavaMail SMTP host can be configured by your Servlet Container so that
+     bounced or undeliverable e-mails are returned to the sender by setting the
      folowing properties.NameTypeDescriptionmail.smtp.dsn.notifyStringProperty determines if the user will be notified of undeliverable mail.
-        Either NEVER, or some combination of SUCCESS, FAILURE, and DELAY 
+        Either NEVER, or some combination of SUCCESS, FAILURE, and DELAY
         (separated by commas).
-     mail.smtp.dsn.retStringDetermines what part of the undeliverable message will be returned in 
+     mail.smtp.dsn.retStringDetermines what part of the undeliverable message will be returned in
         the message to the sender.  Either FULL or HDRS.
      mail.smtp.sendpartialboolean
        If set to true, and a message has some valid and some invalid addresses,
@@ -249,6 +249,6 @@ How e-mail is delivered depends on the JavaMail SMTP host settings.  The
 
 
 
-       
+
 
 
diff --git a/webapp/src/main/webapp/WEB-INF/tlds/taglibs-random.tld b/webapp/src/main/webapp/WEB-INF/tlds/taglibs-random.tld
index bf0a52297..12baee068 100644
--- a/webapp/src/main/webapp/WEB-INF/tlds/taglibs-random.tld
+++ b/webapp/src/main/webapp/WEB-INF/tlds/taglibs-random.tld
@@ -7,10 +7,10 @@
   <shortname>random</shortname>
   <uri>http://jakarta.apache.org/taglibs/random-1.0</uri>
   <info>
-     The Random tag library creates random strings and random numbers. You may 
-     specify a set of allowable characters as well as the length for randomly 
-     generated strings. You may specify a range of allowable integers or a 
-     random floating point number between zero and one for randomly generated 
+     The Random tag library creates random strings and random numbers. You may
+     specify a set of allowable characters as well as the length for randomly
+     generated strings. You may specify a range of allowable integers or a
+     random floating point number between zero and one for randomly generated
      numbers.  </info>
   <tag>
     <name>string</name>
@@ -83,6 +83,6 @@
 
 
 
-       
+
 
 
diff --git a/webapp/src/main/webapp/WEB-INF/tlds/taglibs-string.tld b/webapp/src/main/webapp/WEB-INF/tlds/taglibs-string.tld
index f22ea31f8..55206fd06 100644
--- a/webapp/src/main/webapp/WEB-INF/tlds/taglibs-string.tld
+++ b/webapp/src/main/webapp/WEB-INF/tlds/taglibs-string.tld
@@ -7,9 +7,9 @@
   <shortname>string</shortname>
   <uri>http://jakarta.apache.org/taglibs/string-1.1</uri>
   <info>
-    The String taglibrary provides a host of tags for manipulating 
-    java.lang.Strings. The style is that the String to act upon is the 
-    body of the tag, and attributes are used as parameters for the 
+    The String taglibrary provides a host of tags for manipulating
+    java.lang.Strings. The style is that the String to act upon is the
+    body of the tag, and attributes are used as parameters for the
     manipulation.
   </info>
   <tag>
diff --git a/webapp/src/main/webapp/WEB-INF/tlds/vitroForm.tld b/webapp/src/main/webapp/WEB-INF/tlds/vitroForm.tld
index 2226c0117..168ab51c0 100644
--- a/webapp/src/main/webapp/WEB-INF/tlds/vitroForm.tld
+++ b/webapp/src/main/webapp/WEB-INF/tlds/vitroForm.tld
@@ -123,7 +123,7 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
     </tag>
-    
+
     <tag>
 		<name>input</name>
         <display-name>Input Element Formatting</display-name>
@@ -156,7 +156,7 @@
     		<name>labelClass</name>
     		<required>false</required>
     		<rtexprvalue>true</rtexprvalue>
-    	</attribute>    	
+    	</attribute>
         <attribute>
 			<name>cssClass</name>
 			<required>false</required>
@@ -218,5 +218,5 @@
     		<rtexprvalue>true</rtexprvalue>
     	</attribute>
     </tag>
-    
-</taglib>
\ No newline at end of file
+
+</taglib>
diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml
index 3297931ec..706e999d6 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/admin/conceptRepair.jsp b/webapp/src/main/webapp/admin/conceptRepair.jsp
index 4cd19515b..5406e4c24 100644
--- a/webapp/src/main/webapp/admin/conceptRepair.jsp
+++ b/webapp/src/main/webapp/admin/conceptRepair.jsp
@@ -15,14 +15,14 @@
 <%
     String conceptIdStr = request.getParameter("conceptId");
     if (conceptIdStr != null) {
-    	
-    	String describeQueryStr = 
+
+    	String describeQueryStr =
     		"PREFIX afn: <http://jena.apache.org/ARQ/function#> \n\n" +
     		"DESCRIBE ?bnode \n" +
     	    "WHERE { \n" +
     		"    FILTER(afn:bnode(?bnode) = \"" + conceptIdStr + "\")\n" +
     	    "}";
-    	    
+
     	OntModel ontModel = ModelAccess.on(getServletContext()).getOntModel(ModelNames.FULL_ASSERTIONS);
     	Model conceptDescription = ModelFactory.createDefaultModel();
     	try {
@@ -30,15 +30,15 @@
     		Query describeQuery = QueryFactory.create(describeQueryStr, Syntax.syntaxARQ);
     		QueryExecution qe = QueryExecutionFactory.create(describeQuery, ontModel);
     		qe.execDescribe(conceptDescription);
-    		
+
     		conceptDescription.add(ontModel.listStatements((Resource) null, (Property) null, ontModel.createResource(new AnonId(conceptIdStr))));
-    		
+
     	} finally {
     		ontModel.leaveCriticalSection();
     	}
-    	
-    	
-    	
+
+
+
     	List<String> actionStrList = (request.getParameterValues("action") != null)
     	   ? Arrays.asList(request.getParameterValues("action"))
     	   : new ArrayList<String>();
@@ -54,7 +54,7 @@
     		conceptDescription.write(response.getOutputStream(), "TTL");
     		return;
     	}
-    	
+
     }
 
 %>
@@ -83,7 +83,7 @@
     <form action="" method="post">
         <p>Concept bnode id: <input name="conceptId"/></p>
         <p><input type="checkbox" name="action" value="describe"/> describe concept</p>
-        <p><input type="checkbox" name="action" value="remove"/> remove concept</p> 
+        <p><input type="checkbox" name="action" value="remove"/> remove concept</p>
         <p><input type="submit" value="Perform action"/></p>
     </form>
-</body></html>    
+</body></html>
diff --git a/webapp/src/main/webapp/admin/gotoIndividual.jsp b/webapp/src/main/webapp/admin/gotoIndividual.jsp
index e1960ecc2..08f8d10c1 100644
--- a/webapp/src/main/webapp/admin/gotoIndividual.jsp
+++ b/webapp/src/main/webapp/admin/gotoIndividual.jsp
@@ -19,16 +19,16 @@ if( request.getParameter("uri") != null ){
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>  <!-- gotoIndividual.jsp -->           
-    <link rel="stylesheet" type="text/css" href="<c:url value="/${themeDir}css/screen.css"/>" media="screen"/>  
+<head>  <!-- gotoIndividual.jsp -->
+    <link rel="stylesheet" type="text/css" href="<c:url value="/${themeDir}css/screen.css"/>" media="screen"/>
     <link rel="stylesheet" type="text/css" href="<c:url value="/${themeDir}css/formedit.css" />" media="screen"/>
-    
+
     <title>Enter a URI</title>
 </head>
 <body class="formsEdit">
 <div id="wrap">
 
-<% /* BJL23 put this is in a catch block because it seems to fail ungracefully for 
+<% /* BJL23 put this is in a catch block because it seems to fail ungracefully for
       some clones */ %>
 
 <form>
@@ -38,4 +38,4 @@ if( request.getParameter("uri") != null ){
 
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/webapp/src/main/webapp/admin/log4j.jsp b/webapp/src/main/webapp/admin/log4j.jsp
index 747cfa21f..d0b6ff6f3 100644
--- a/webapp/src/main/webapp/admin/log4j.jsp
+++ b/webapp/src/main/webapp/admin/log4j.jsp
@@ -105,7 +105,7 @@ try {
     }
     out.write("</table>\r\n");
     out.write("<input type=submit value=\"Submit changes to logging levels\">");
-    out.write("</form>\n");  
+    out.write("</form>\n");
 
     out.write("</BODY></HTML>\r\n");
     out.flush();
@@ -132,4 +132,4 @@ try {
           appenders.addAll( getAllAppenders(logger.getParent()));
         return appenders;
     }
-%>
\ No newline at end of file
+%>
diff --git a/webapp/src/main/webapp/admin/removeBadRestrictions.jsp b/webapp/src/main/webapp/admin/removeBadRestrictions.jsp
index eb5407fd1..0f8a44237 100644
--- a/webapp/src/main/webapp/admin/removeBadRestrictions.jsp
+++ b/webapp/src/main/webapp/admin/removeBadRestrictions.jsp
@@ -60,15 +60,15 @@
     	}
     	return removedStmts;
     }
-    
+
     private Model describeBnode(String bnodeId) {
-        String describeQueryStr = 
+        String describeQueryStr =
             "PREFIX afn: <http://jena.apache.org/ARQ/function#> \n\n" +
             "DESCRIBE ?bnode \n" +
             "WHERE { \n" +
             "    FILTER(afn:bnode(?bnode) = \"" + bnodeId + "\")\n" +
             "}";
-            
+
     	OntModel ontModel = ModelAccess.on(getServletContext()).getOntModel(ModelNames.FULL_ASSERTIONS);
         Model conceptDescription = ModelFactory.createDefaultModel();
         try {
@@ -76,14 +76,14 @@
             Query describeQuery = QueryFactory.create(describeQueryStr, Syntax.syntaxARQ);
             QueryExecution qe = QueryExecutionFactory.create(describeQuery, ontModel);
             qe.execDescribe(conceptDescription);
-            
+
             conceptDescription.add(ontModel.listStatements((Resource) null, (Property) null, ontModel.createResource(new AnonId(bnodeId))));
             return conceptDescription;
         } finally {
             ontModel.leaveCriticalSection();
         }
     }
-    
+
 %>
 
 
@@ -118,4 +118,4 @@
     <form action="" method="post">
         <p><input name="execute" type="submit" value="Remove now"/></p>
     </form>
-</body></html>    
+</body></html>
diff --git a/webapp/src/main/webapp/admin/removeResourceDescription.jsp b/webapp/src/main/webapp/admin/removeResourceDescription.jsp
index 71404702f..e3943cdc2 100644
--- a/webapp/src/main/webapp/admin/removeResourceDescription.jsp
+++ b/webapp/src/main/webapp/admin/removeResourceDescription.jsp
@@ -14,10 +14,10 @@
 <%
     String resourceURIStr = request.getParameter("resourceURI");
     if (resourceURIStr != null) {
-        
-        String describeQueryStr = 
+
+        String describeQueryStr =
             "DESCRIBE <" + resourceURIStr + ">";
-            
+
     	OntModel ontModel = ModelAccess.on(getServletContext()).getOntModel(ModelNames.FULL_ASSERTIONS);
         Model resourceDescription = ModelFactory.createDefaultModel();
         try {
@@ -25,15 +25,15 @@
             Query describeQuery = QueryFactory.create(describeQueryStr, Syntax.syntaxARQ);
             QueryExecution qe = QueryExecutionFactory.create(describeQuery, ontModel);
             qe.execDescribe(resourceDescription);
-            
+
             resourceDescription.add(ontModel.listStatements((Resource) null, (Property) null, ontModel.getResource(resourceURIStr)));
-            
+
         } finally {
             ontModel.leaveCriticalSection();
         }
-        
-        
-        
+
+
+
         List<String> actionStrList = (request.getParameterValues("action") != null)
            ? Arrays.asList(request.getParameterValues("action"))
            : new ArrayList<String>();
@@ -49,7 +49,7 @@
             resourceDescription.write(response.getOutputStream(), "TTL");
             return;
         }
-        
+
     }
 
 %>
@@ -78,8 +78,8 @@
     <form action="" method="post">
         <p>Resource URI: <input name="resourceURI"/></p>
         <p><input type="checkbox" name="action" value="describe"/> describe resource</p>
-        <p><input type="checkbox" name="action" value="remove"/> remove resource</p> 
+        <p><input type="checkbox" name="action" value="remove"/> remove resource</p>
         <p><input type="submit" value="Perform action"/></p>
     </form>
-</body></html>    
-    
\ No newline at end of file
+</body></html>
+
diff --git a/webapp/src/main/webapp/admin/sparql.jsp b/webapp/src/main/webapp/admin/sparql.jsp
index 1aaeeba08..30bd33dd9 100644
--- a/webapp/src/main/webapp/admin/sparql.jsp
+++ b/webapp/src/main/webapp/admin/sparql.jsp
@@ -63,7 +63,7 @@ td {
 			<form action="sparqlquery">
 				<div>
 					<textarea id="query" name="query" rows="20" cols="111" class="maxWidth">
-							
+
 						</textarea>
 				</div>
 				<p>
diff --git a/webapp/src/main/webapp/config/listViewConfig-dataDefault.xml b/webapp/src/main/webapp/config/listViewConfig-dataDefault.xml
index 87f324c26..8d80c3e8d 100644
--- a/webapp/src/main/webapp/config/listViewConfig-dataDefault.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-dataDefault.xml
@@ -1,16 +1,16 @@
 <?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 
+
+                ?subject ?property ?value
                 FILTER isLiteral(?value)
         } ORDER BY ?value
     </query-select>
diff --git a/webapp/src/main/webapp/config/listViewConfig-default.xml b/webapp/src/main/webapp/config/listViewConfig-default.xml
index 3c2846473..109c9b4e5 100644
--- a/webapp/src/main/webapp/config/listViewConfig-default.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-default.xml
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<!-- Default list view config file for object properties 
-    
+<!-- Default list view config file for object properties
+
      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 vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
-        
+
         SELECT <collated> ?subclass </collated>
-               ?object 
-               ?label 
+               ?object
+               ?label
                ?localName
         WHERE {
             ?subject ?property ?object .
             LET (?localName := REPLACE(STR(?object),"^.*(#)(.*)$", "$2"))
-                
+
             OPTIONAL {
                 <precise-subquery>?subject ?property ?object .</precise-subquery>
                 ?object rdfs:label ?label .
             }
-            
-            <collated> 
+
+            <collated>
             OPTIONAL {
                 <precise-subquery>?subject ?property ?object .</precise-subquery>
                 ?object a ?subclass .
                 # Require the subclasses retrieved to be in a classgroup, since others are not generally
                 # for display. See vivo-dev-all thread titled "Internal Entity and mostSpecificType,"
                 # Aug 9-10, 2011.
-                # ?subclass vitro:inClassGroup ?classgroup 
-            } 
-            FILTER ( REPLACE(STR(?subclass),"^(.*)(#)(.*)$", "$1$2") != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" )   
-            </collated>       
-        
+                # ?subclass vitro:inClassGroup ?classgroup
+            }
+            FILTER ( REPLACE(STR(?subclass),"^(.*)(#)(.*)$", "$1$2") != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" )
+            </collated>
+
         } ORDER BY <collated> ?subclass </collated> ASC( ?label ) ASC( ?label ) ASC( ?localName )
     </query-select>
 
diff --git a/webapp/src/main/webapp/config/listViewConfig-hasElement.xml b/webapp/src/main/webapp/config/listViewConfig-hasElement.xml
index bb17073dd..de0754a17 100644
--- a/webapp/src/main/webapp/config/listViewConfig-hasElement.xml
+++ b/webapp/src/main/webapp/config/listViewConfig-hasElement.xml
@@ -8,8 +8,8 @@
 <list-view-config>
     <query-select>
         PREFIX display: &lt;http://vitro.mannlib.cornell.edu/ontologies/display/1.1#&gt;
-        
-        
+
+
         SELECT ?menuItem
                (REPLACE(STR(?menuItem),"^.*(#)(.*)$", "$2") AS ?menuItemName)
                ?linkText
diff --git a/webapp/src/main/webapp/css/account/account.css b/webapp/src/main/webapp/css/account/account.css
index d291ab786..fa6f230e2 100644
--- a/webapp/src/main/webapp/css/account/account.css
+++ b/webapp/src/main/webapp/css/account/account.css
@@ -7,7 +7,7 @@
     line-height: 1.5em;
     border: 1px dotted #E2C822;
     background-color: #FFF9D7;
-    padding: .5em;  
+    padding: .5em;
     margin-bottom: 20px;
 }
 input#externalAuthChkBox {
@@ -25,22 +25,22 @@ input#externalAuthChkBox {
     height: 60px;
 }
 .account-alpha-browse {
-    width: 10px; 
+    width: 10px;
     height: 22px;
-    float: right; 
-    padding-right: 10px; 
+    float: right;
+    padding-right: 10px;
 }
 .sort-asc {
      width: 9px;
      height:10px;
-     padding-top: 4px; 
+     padding-top: 4px;
      background: url(../../images/account/sort-asc.gif) 0 4px no-repeat;
      display: block;
 }
 .sort-desc {
      width: 9px;
      height:10px;
-     padding-bottom: 4px; 
+     padding-bottom: 4px;
      background: url(../../images/account/sort-desc.gif) 0 4px no-repeat;
      display: block;
 }
@@ -126,12 +126,12 @@ padding-right: 5px;
     font-style:bold;
     width:280px;
     margin-left:10px;
-    line-height:15px; 
+    line-height:15px;
     margin-top:-8px !important;
 }
 #associated,
 #associationOptions {
-    float:right; 
+    float:right;
     display:none;
 }
 #associated label {
@@ -145,7 +145,7 @@ padding-right: 5px;
     margin-left:8px;
 }
 #associateProfileBackgroundOne {
-    background-color:#fff; 
+    background-color:#fff;
     padding:7px 0 5px 0;
     margin-left:-8px;
     margin-right:-8px;
@@ -163,7 +163,7 @@ padding-right: 5px;
 #associateProfileBackgroundTwo {
     background-color:#f1f2ee;
     padding:7px 94px 33px 0;
-    margin-top:-129px; 
+    margin-top:-129px;
     margin-right:-8px;
     z-index:-100;
     border:1px solid #ccc;
@@ -177,10 +177,10 @@ padding-right: 5px;
 }
 #associateProfileBackgroundThree {
     background-color:#f1f2ee;
-    padding:7px 94px 26px 12px; 
-    margin-top:-129px; 
+    padding:7px 94px 26px 12px;
+    margin-top:-129px;
     margin-left:-12px;
-    margin-right:-8px; 
+    margin-right:-8px;
     z-index:-100;
     border:1px solid #ccc;
     border-left:none;
@@ -195,7 +195,7 @@ padding-right: 5px;
     margin-top:-3px;
     margin-left:-12px;
     margin-right:-8px;
-    z-index:-100; 
+    z-index:-100;
     border:1px solid #ccc;
     border-top:none;
     border-bottom-left-radius: 5px;
@@ -288,7 +288,7 @@ section.proxy-profile h4 {
     -webkit-border-radius: 10px;
     overflow: hidden;
     margin-bottom: 20px;
-    
+
 }
 .list-proxy-profile {
     background-color: #F7F7F4;
@@ -322,7 +322,7 @@ section.proxy-profile h4 {
     color: #7F8993;
     padding-left: 25px;
     height: 20px;
-    
+
 }
 #list-relation label {
     color: #064D68;
@@ -341,7 +341,7 @@ p.selected-editors {
     border-top: 1px solid #E0DFDF;
     padding-left: 1.2em;
 }
-img.photo-profile, 
+img.photo-profile,
 img.photo-proxy {
     border: 1px solid #DDE4E3;
     float: left;
@@ -400,4 +400,4 @@ img.loading-profileMyAccoount {
 span.unlinkedAccount,
 a.disable-delete {
 	padding-left:24px;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/css/admin.css b/webapp/src/main/webapp/css/admin.css
index 5650ef766..3ba89017f 100644
--- a/webapp/src/main/webapp/css/admin.css
+++ b/webapp/src/main/webapp/css/admin.css
@@ -50,8 +50,8 @@
     font-size: 13px;
     line-height: 1.3em;
     padding: 25px 5px 5px 13px;
-    background: #fff url('../images/siteAdmin/addClassBubble.png') 0 0 no-repeat; 
+    background: #fff url('../images/siteAdmin/addClassBubble.png') 0 0 no-repeat;
     color: #797979;
     padding-bottom: 0;
     margin-bottom: 0;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/css/browseClassGroups.css b/webapp/src/main/webapp/css/browseClassGroups.css
index 5f89655d0..172625d63 100644
--- a/webapp/src/main/webapp/css/browseClassGroups.css
+++ b/webapp/src/main/webapp/css/browseClassGroups.css
@@ -39,7 +39,7 @@ ul#browse-classgroups li {
     border-bottom: 1px solid #dde4e3;
     font-size: 18px;
     width: 200px;
-    line-height: 1.5em;     
+    line-height: 1.5em;
 }
 ul#browse-classgroups li:last-child {
     border-bottom: none
@@ -51,7 +51,7 @@ ul#browse-classgroups a {
     color: #5e6363;
     text-decoration: none;
     padding-top: 8px;
-    padding-bottom: 8px;     
+    padding-bottom: 8px;
 }
 ul#browse-classgroups .count-classes {
     font-size: 14px
@@ -127,4 +127,4 @@ svg text {
 }
 svg rect {
     cursor: pointer;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/css/browseIndex.css b/webapp/src/main/webapp/css/browseIndex.css
index 66436e3ab..0a13c48dd 100644
--- a/webapp/src/main/webapp/css/browseIndex.css
+++ b/webapp/src/main/webapp/css/browseIndex.css
@@ -32,15 +32,15 @@
 .individualList a.externalLink {
     font-weight: normal;
 }
-.individualList ul { 
+.individualList ul {
     margin-left: 0;
 }
-.individualList li { 
+.individualList li {
     list-style-type: none;
     margin-bottom: .5em;
 }
-.individualList li a { 
-    font-weight: normal; 
+.individualList li a {
+    font-weight: normal;
     margin-right: .4em;
 }
 .individualList .display-title {
diff --git a/webapp/src/main/webapp/css/classHierarchy.css b/webapp/src/main/webapp/css/classHierarchy.css
index c446c84e9..24e16a285 100644
--- a/webapp/src/main/webapp/css/classHierarchy.css
+++ b/webapp/src/main/webapp/css/classHierarchy.css
@@ -19,7 +19,7 @@ table.classHierarchy .classDetail,
 td.classDetail {
     width:90px;
     color:#064D68;
-    white-space: nowrap; 
+    white-space: nowrap;
 }
 table.subclassTable {
     margin-left:15px;
diff --git a/webapp/src/main/webapp/css/developer/developerPanel.css b/webapp/src/main/webapp/css/developer/developerPanel.css
index e7187a716..3903028b1 100644
--- a/webapp/src/main/webapp/css/developer/developerPanel.css
+++ b/webapp/src/main/webapp/css/developer/developerPanel.css
@@ -3,7 +3,7 @@
 /* Styles for the developer panel. */
 
 div.developer {
-	background-color: #f7dd8a; 
+	background-color: #f7dd8a;
 	padding: 0px 10px 0px 10px;
 	font-variant: small-caps;
 }
@@ -36,12 +36,12 @@ div.developer div.within {
 	padding-left: 1.5em;
 }
 
-div.developer input[type="text"] { 
-	padding: 2px 10px 2px 10px; 
+div.developer input[type="text"] {
+	padding: 2px 10px 2px 10px;
 	line-height: 1em;
-	margin: 2px 2px 2px 2px; 
+	margin: 2px 2px 2px 2px;
 }
-	
+
 div.developer input[type="text"]:disabled {
 	background-color: #f8eeae;
 }
diff --git a/webapp/src/main/webapp/css/dump.css b/webapp/src/main/webapp/css/dump.css
index 72ffb21a1..07de0177f 100644
--- a/webapp/src/main/webapp/css/dump.css
+++ b/webapp/src/main/webapp/css/dump.css
@@ -4,13 +4,13 @@
 
 .div.dump {
     margin-top: 1em;
-    border-top: 2px solid #ccc; 
+    border-top: 2px solid #ccc;
     padding-top: .75em;
 }
 
 .dump ul li.variable {
     margin-bottom: .5em;
-    border-bottom: 1px solid #ccc; 
+    border-bottom: 1px solid #ccc;
     padding-top: .75em;
     padding-bottom: .75em;
 }
@@ -24,13 +24,13 @@
 }
 
 .dump ul li p {
-    margin-bottom: .25em;  
+    margin-bottom: .25em;
 }
 
 .dump ul li.item {
     margin-bottom: 1.25em;
 }
 
-.dump ul li.item .value { 
+.dump ul li.item .value {
     margin-left: 1.5em;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/css/edit.css b/webapp/src/main/webapp/css/edit.css
index ca3d1679b..97cc87f4d 100644
--- a/webapp/src/main/webapp/css/edit.css
+++ b/webapp/src/main/webapp/css/edit.css
@@ -1,8 +1,8 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
 label {
-    display: block; 
-    margin-top: .5em; 
+    display: block;
+    margin-top: .5em;
 }
 label.inline,
 div.sparqlform label {
@@ -48,7 +48,7 @@ form dl dt, form dl dd {
   font-weight: bold;
   color: #cc0000;
 }
-.inlineForm input, 
+.inlineForm input,
 .inlineForm label {
   display: inline;
 }
@@ -66,7 +66,7 @@ p.submit {
     line-height: 16px;
     min-height: 100px;
     display: inline;
-} 
+}
 .editingForm {
     margin-top: 0;
     margin-bottom: 0;
@@ -140,7 +140,7 @@ td.verticalfieldlabel {
 }
 tr.form-row-even {
     background-color: #e9f0ff;
-    border-color: #eec; 
+    border-color: #eec;
     font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
     font-size: 10px;
     border-width: 1px;
@@ -148,7 +148,7 @@ tr.form-row-even {
 }
 tr.form-row-odd {
     background-color: #e9f9ff;
-    border-color: #eec; 
+    border-color: #eec;
     font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
     font-size: 10px;
     border-width: 1px;
@@ -156,7 +156,7 @@ tr.form-row-odd {
 }
 .form-editingRow {
     background-color: #ff9;
-    border-color: #eec; 
+    border-color: #eec;
     font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
     font-size: 10px;
     border-width: 1px;
@@ -185,7 +185,7 @@ table.form-background td form {
 }
 .form-table-head {
     background-color: #ccf;
-    border-color: #eec; 
+    border-color: #eec;
     font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
     font-size: 10px;
     border-width: 1px;
@@ -326,12 +326,12 @@ div.adr {
     display: none;
     height: 0;
 }
-.notice{ 
-    padding: .8em; 
-    margin-bottom: 1em; 
+.notice{
+    padding: .8em;
+    margin-bottom: 1em;
     border: 1px solid #ddd;
     display: block;
-    background: #FFF6BF; 
+    background: #FFF6BF;
     color: #7F7034;
 }
 .note {
diff --git a/webapp/src/main/webapp/css/individual/individual-property-groups.css b/webapp/src/main/webapp/css/individual/individual-property-groups.css
index cf596406a..cc4b7cf1b 100644
--- a/webapp/src/main/webapp/css/individual/individual-property-groups.css
+++ b/webapp/src/main/webapp/css/individual/individual-property-groups.css
@@ -5,15 +5,15 @@ span#toggleContainer {
     padding:10px 8px 0 0;
     font-size: 0.85em;
 }
-section.property-group  { 
+section.property-group  {
     padding-top: 15px;
-    border-top:none; 
+    border-top:none;
 }
-section.property-group h2 { 
-    padding: 8px 10px 4px 12px; 
+section.property-group h2 {
+    padding: 8px 10px 4px 12px;
 }
 .scroll-up {
-   position: absolute; 
+   position: absolute;
    width: 21px;
    height: 30px;
    top: 8px; /* changed for redesign, was 0 */
@@ -24,10 +24,10 @@ section.property-group > div {
 /*    display:none; */
 }
 section.property-group h2 {
-    font-size: 1.15em !important; 
-    color: #5e6363 !important; 
+    font-size: 1.15em !important;
+    color: #5e6363 !important;
     font-weight: normal !important;
-    background: #fafaf9 !important; 
+    background: #fafaf9 !important;
 }
 ul.propertyTabsList  {
     margin-left: 4px;
@@ -70,4 +70,4 @@ li.groupTabSpacer {
 }
 div.additionalItems {
 	margin-top: 0 !important;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/css/individual/individual.css b/webapp/src/main/webapp/css/individual/individual.css
index 0e0eaf01b..b9eb1a178 100644
--- a/webapp/src/main/webapp/css/individual/individual.css
+++ b/webapp/src/main/webapp/css/individual/individual.css
@@ -37,7 +37,7 @@
     overflow: hidden;
 }
 #individual-intro h1 {
-    padding-bottom: 8px;  
+    padding-bottom: 8px;
 }
 #individual-intro span.display-title {
     padding-left: 10px;
@@ -151,7 +151,7 @@ h1.fn .display-title {
     border: 1px solid #dfebe5;
 }
 .scroll-up {
-   position: absolute; 
+   position: absolute;
    width: 21px;
    height: 30px;
    top: 0;
@@ -275,7 +275,7 @@ input#uriLink {
 a.manageLinks {
     display:none;
 }
-a#manageLabels { 
+a#manageLabels {
     margin-left:20px;
     font-size:0.7em;
 }
@@ -291,7 +291,7 @@ ul.tinyMCEDisc {
 ol.tinyMCENumeric {
     list-style-type: decimal;
 }
-ul.tinyMCEDisc li, 
+ul.tinyMCEDisc li,
 ol.tinyMCENumeric li {
     padding: 0 !important;
     margin-left: 30px;
@@ -303,4 +303,4 @@ img.invalidFormatImg {
 .invalidFormatText {
 	 font-size:10px;
 	 color:#A12424;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/css/individual/menuManagement-menuItems.css b/webapp/src/main/webapp/css/individual/menuManagement-menuItems.css
index b525bdffa..879a3e7c9 100644
--- a/webapp/src/main/webapp/css/individual/menuManagement-menuItems.css
+++ b/webapp/src/main/webapp/css/individual/menuManagement-menuItems.css
@@ -17,4 +17,4 @@ ul.menuItems.dragNdrop li {
 }
 span.controls {
     float: right;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/css/jquery_plugins/jquery.realperson.css b/webapp/src/main/webapp/css/jquery_plugins/jquery.realperson.css
index 5fc4bf943..bb5a7b1ec 100644
--- a/webapp/src/main/webapp/css/jquery_plugins/jquery.realperson.css
+++ b/webapp/src/main/webapp/css/jquery_plugins/jquery.realperson.css
@@ -1,10 +1,10 @@
 /* http://keith-wood.name/realPerson.html
    Real Person Form Submission for jQuery v1.0.1.
    Written by Keith Wood (kwood{at}iinet.com.au) June 2009.
-   Dual licensed under the GPL (http://dev.jquery.com/browser/trunk/jquery/GPL-LICENSE.txt) and 
-   MIT (http://dev.jquery.com/browser/trunk/jquery/MIT-LICENSE.txt) licenses. 
+   Dual licensed under the GPL (http://dev.jquery.com/browser/trunk/jquery/GPL-LICENSE.txt) and
+   MIT (http://dev.jquery.com/browser/trunk/jquery/MIT-LICENSE.txt) licenses.
    Please attribute the author if you use it. */
-   
+
 /* Real Person jQuery plugin styles v1.0.1. */
 .realperson-challenge {
 	display: inline-block;
@@ -28,8 +28,8 @@
 	text-align: center;
 	cursor: pointer;
 }
-.realpersonLabel { 
-    display: block; 
+.realpersonLabel {
+    display: block;
 }
 #defaultReal {
     margin-left: 20px;
diff --git a/webapp/src/main/webapp/css/jquery_plugins/qtip/jquery.qtip.min.css b/webapp/src/main/webapp/css/jquery_plugins/qtip/jquery.qtip.min.css
index 5adc4b755..cc23717c7 100644
--- a/webapp/src/main/webapp/css/jquery_plugins/qtip/jquery.qtip.min.css
+++ b/webapp/src/main/webapp/css/jquery_plugins/qtip/jquery.qtip.min.css
@@ -1 +1 @@
-#qtip-overlay.blurs,.qtip-close{cursor:pointer}.qtip{position:absolute;left:-28000px;top:-28000px;display:none;max-width:280px;min-width:50px;font-size:10.5px;line-height:12px;direction:ltr;box-shadow:none;padding:0}.qtip-content,.qtip-titlebar{position:relative;overflow:hidden}.qtip-content{padding:5px 9px;text-align:left;word-wrap:break-word}.qtip-titlebar{padding:5px 35px 5px 10px;border-width:0 0 1px;font-weight:700}.qtip-titlebar+.qtip-content{border-top-width:0!important}.qtip-close{position:absolute;right:-9px;top:-9px;z-index:11;outline:0;border:1px solid transparent}.qtip-titlebar .qtip-close{right:4px;top:50%;margin-top:-9px}* html .qtip-titlebar .qtip-close{top:16px}.qtip-icon .ui-icon,.qtip-titlebar .ui-icon{display:block;text-indent:-1000em;direction:ltr}.qtip-icon,.qtip-icon .ui-icon{-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;text-decoration:none}.qtip-icon .ui-icon{width:18px;height:14px;line-height:14px;text-align:center;text-indent:0;font:normal 700 10px/13px Tahoma,sans-serif;color:inherit;background:-100em -100em no-repeat}.qtip-default{border:1px solid #F1D031;background-color:#FFFFA3;color:#555}.qtip-default .qtip-titlebar{background-color:#FFEF93}.qtip-default .qtip-icon{border-color:#CCC;background:#F1F1F1;color:#777}.qtip-default .qtip-titlebar .qtip-close{border-color:#AAA;color:#111}.qtip-light{background-color:#fff;border-color:#E2E2E2;color:#454545}.qtip-light .qtip-titlebar{background-color:#f1f1f1}.qtip-dark{background-color:#505050;border-color:#303030;color:#f3f3f3}.qtip-dark .qtip-titlebar{background-color:#404040}.qtip-dark .qtip-icon{border-color:#444}.qtip-dark .qtip-titlebar .ui-state-hover{border-color:#303030}.qtip-cream{background-color:#FBF7AA;border-color:#F9E98E;color:#A27D35}.qtip-red,.qtip-red .qtip-icon,.qtip-red .qtip-titlebar .ui-state-hover{border-color:#D95252}.qtip-cream .qtip-titlebar{background-color:#F0DE7D}.qtip-cream .qtip-close .qtip-icon{background-position:-82px 0}.qtip-red{background-color:#F78B83;color:#912323}.qtip-red .qtip-titlebar{background-color:#F06D65}.qtip-red .qtip-close .qtip-icon{background-position:-102px 0}.qtip-green{background-color:#CAED9E;border-color:#90D93F;color:#3F6219}.qtip-green .qtip-titlebar{background-color:#B0DE78}.qtip-green .qtip-close .qtip-icon{background-position:-42px 0}.qtip-blue{background-color:#E5F6FE;border-color:#ADD9ED;color:#5E99BD}.qtip-blue .qtip-titlebar{background-color:#D0E9F5}.qtip-blue .qtip-close .qtip-icon{background-position:-2px 0}.qtip-shadow{-webkit-box-shadow:1px 1px 3px 1px rgba(0,0,0,.15);-moz-box-shadow:1px 1px 3px 1px rgba(0,0,0,.15);box-shadow:1px 1px 3px 1px rgba(0,0,0,.15)}.qtip-bootstrap,.qtip-rounded,.qtip-tipsy{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}.qtip-rounded .qtip-titlebar{-moz-border-radius:4px 4px 0 0;-webkit-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.qtip-youtube{-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-webkit-box-shadow:0 0 3px #333;-moz-box-shadow:0 0 3px #333;box-shadow:0 0 3px #333;color:#fff;border:0 solid transparent;background:#4A4A4A;background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0,#4A4A4A),color-stop(100%,#000));background-image:-webkit-linear-gradient(top,#4A4A4A 0,#000 100%);background-image:-moz-linear-gradient(top,#4A4A4A 0,#000 100%);background-image:-ms-linear-gradient(top,#4A4A4A 0,#000 100%);background-image:-o-linear-gradient(top,#4A4A4A 0,#000 100%)}.qtip-youtube .qtip-titlebar{background-color:#4A4A4A;background-color:rgba(0,0,0,0)}.qtip-youtube .qtip-content{padding:.75em;font:12px arial,sans-serif;filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr=#4a4a4a, EndColorStr=#000000);-ms-filter:"progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#4a4a4a,EndColorStr=#000000);"}.qtip-youtube .qtip-icon{border-color:#222}.qtip-youtube .qtip-titlebar .ui-state-hover{border-color:#303030}.qtip-jtools{background:#232323;background:rgba(0,0,0,.7);background-image:-webkit-gradient(linear,left top,left bottom,from(#717171),to(#232323));background-image:-moz-linear-gradient(top,#717171,#232323);background-image:-webkit-linear-gradient(top,#717171,#232323);background-image:-ms-linear-gradient(top,#717171,#232323);background-image:-o-linear-gradient(top,#717171,#232323);border:2px solid #ddd;border:2px solid rgba(241,241,241,1);-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-webkit-box-shadow:0 0 12px #333;-moz-box-shadow:0 0 12px #333;box-shadow:0 0 12px #333}.qtip-jtools .qtip-titlebar{background-color:transparent;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171, endColorstr=#4A4A4A);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171,endColorstr=#4A4A4A)"}.qtip-jtools .qtip-content{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A, endColorstr=#232323);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A,endColorstr=#232323)"}.qtip-jtools .qtip-content,.qtip-jtools .qtip-titlebar{background:0 0;color:#fff;border:0 dashed transparent}.qtip-jtools .qtip-icon{border-color:#555}.qtip-jtools .qtip-titlebar .ui-state-hover{border-color:#333}.qtip-cluetip{-webkit-box-shadow:4px 4px 5px rgba(0,0,0,.4);-moz-box-shadow:4px 4px 5px rgba(0,0,0,.4);box-shadow:4px 4px 5px rgba(0,0,0,.4);background-color:#D9D9C2;color:#111;border:0 dashed transparent}.qtip-cluetip .qtip-titlebar{background-color:#87876A;color:#fff;border:0 dashed transparent}.qtip-cluetip .qtip-icon{border-color:#808064}.qtip-cluetip .qtip-titlebar .ui-state-hover{border-color:#696952;color:#696952}.qtip-tipsy{background:#000;background:rgba(0,0,0,.87);color:#fff;border:0 solid transparent;font-size:11px;font-family:'Lucida Grande',sans-serif;font-weight:700;line-height:16px;text-shadow:0 1px #000}.qtip-tipsy .qtip-titlebar{padding:6px 35px 0 10px;background-color:transparent}.qtip-tipsy .qtip-content{padding:6px 10px}.qtip-tipsy .qtip-icon{border-color:#222;text-shadow:none}.qtip-tipsy .qtip-titlebar .ui-state-hover{border-color:#303030}.qtip-tipped{border:3px solid #959FA9;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;background-color:#F9F9F9;color:#454545;font-weight:400;font-family:serif}.qtip-tipped .qtip-titlebar{border-bottom-width:0;color:#fff;background:#3A79B8;background-image:-webkit-gradient(linear,left top,left bottom,from(#3A79B8),to(#2E629D));background-image:-webkit-linear-gradient(top,#3A79B8,#2E629D);background-image:-moz-linear-gradient(top,#3A79B8,#2E629D);background-image:-ms-linear-gradient(top,#3A79B8,#2E629D);background-image:-o-linear-gradient(top,#3A79B8,#2E629D);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8, endColorstr=#2E629D);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8,endColorstr=#2E629D)"}.qtip-tipped .qtip-icon{border:2px solid #285589;background:#285589}.qtip-tipped .qtip-icon .ui-icon{background-color:#FBFBFB;color:#555}.qtip-bootstrap{font-size:14px;line-height:20px;color:#333;padding:1px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.qtip-bootstrap .qtip-titlebar{padding:8px 14px;margin:0;font-size:14px;font-weight:400;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.qtip-bootstrap .qtip-titlebar .qtip-close{right:11px;top:45%;border-style:none}.qtip-bootstrap .qtip-content{padding:9px 14px}.qtip-bootstrap .qtip-icon{background:0 0}.qtip-bootstrap .qtip-icon .ui-icon{width:auto;height:auto;float:right;font-size:20px;font-weight:700;line-height:18px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}#qtip-overlay,#qtip-overlay div{left:0;top:0;width:100%;height:100%}.qtip-bootstrap .qtip-icon .ui-icon:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}.qtip:not(.ie9haxors) div.qtip-content,.qtip:not(.ie9haxors) div.qtip-titlebar{filter:none;-ms-filter:none}.qtip .qtip-tip{margin:0 auto;overflow:hidden;z-index:10}.qtip .qtip-tip,x:-o-prefocus{visibility:hidden}.qtip .qtip-tip,.qtip .qtip-tip .qtip-vml,.qtip .qtip-tip canvas{position:absolute;color:#123456;background:0 0;border:0 dashed transparent}.qtip .qtip-tip canvas{top:0;left:0}.qtip .qtip-tip .qtip-vml{behavior:url(#default#VML);display:inline-block;visibility:visible}#qtip-overlay{position:fixed}#qtip-overlay div{position:absolute;background-color:#000;opacity:.7;filter:alpha(opacity=70);-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"}.qtipmodal-ie6fix{position:absolute!important}
\ No newline at end of file
+#qtip-overlay.blurs,.qtip-close{cursor:pointer}.qtip{position:absolute;left:-28000px;top:-28000px;display:none;max-width:280px;min-width:50px;font-size:10.5px;line-height:12px;direction:ltr;box-shadow:none;padding:0}.qtip-content,.qtip-titlebar{position:relative;overflow:hidden}.qtip-content{padding:5px 9px;text-align:left;word-wrap:break-word}.qtip-titlebar{padding:5px 35px 5px 10px;border-width:0 0 1px;font-weight:700}.qtip-titlebar+.qtip-content{border-top-width:0!important}.qtip-close{position:absolute;right:-9px;top:-9px;z-index:11;outline:0;border:1px solid transparent}.qtip-titlebar .qtip-close{right:4px;top:50%;margin-top:-9px}* html .qtip-titlebar .qtip-close{top:16px}.qtip-icon .ui-icon,.qtip-titlebar .ui-icon{display:block;text-indent:-1000em;direction:ltr}.qtip-icon,.qtip-icon .ui-icon{-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;text-decoration:none}.qtip-icon .ui-icon{width:18px;height:14px;line-height:14px;text-align:center;text-indent:0;font:normal 700 10px/13px Tahoma,sans-serif;color:inherit;background:-100em -100em no-repeat}.qtip-default{border:1px solid #F1D031;background-color:#FFFFA3;color:#555}.qtip-default .qtip-titlebar{background-color:#FFEF93}.qtip-default .qtip-icon{border-color:#CCC;background:#F1F1F1;color:#777}.qtip-default .qtip-titlebar .qtip-close{border-color:#AAA;color:#111}.qtip-light{background-color:#fff;border-color:#E2E2E2;color:#454545}.qtip-light .qtip-titlebar{background-color:#f1f1f1}.qtip-dark{background-color:#505050;border-color:#303030;color:#f3f3f3}.qtip-dark .qtip-titlebar{background-color:#404040}.qtip-dark .qtip-icon{border-color:#444}.qtip-dark .qtip-titlebar .ui-state-hover{border-color:#303030}.qtip-cream{background-color:#FBF7AA;border-color:#F9E98E;color:#A27D35}.qtip-red,.qtip-red .qtip-icon,.qtip-red .qtip-titlebar .ui-state-hover{border-color:#D95252}.qtip-cream .qtip-titlebar{background-color:#F0DE7D}.qtip-cream .qtip-close .qtip-icon{background-position:-82px 0}.qtip-red{background-color:#F78B83;color:#912323}.qtip-red .qtip-titlebar{background-color:#F06D65}.qtip-red .qtip-close .qtip-icon{background-position:-102px 0}.qtip-green{background-color:#CAED9E;border-color:#90D93F;color:#3F6219}.qtip-green .qtip-titlebar{background-color:#B0DE78}.qtip-green .qtip-close .qtip-icon{background-position:-42px 0}.qtip-blue{background-color:#E5F6FE;border-color:#ADD9ED;color:#5E99BD}.qtip-blue .qtip-titlebar{background-color:#D0E9F5}.qtip-blue .qtip-close .qtip-icon{background-position:-2px 0}.qtip-shadow{-webkit-box-shadow:1px 1px 3px 1px rgba(0,0,0,.15);-moz-box-shadow:1px 1px 3px 1px rgba(0,0,0,.15);box-shadow:1px 1px 3px 1px rgba(0,0,0,.15)}.qtip-bootstrap,.qtip-rounded,.qtip-tipsy{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}.qtip-rounded .qtip-titlebar{-moz-border-radius:4px 4px 0 0;-webkit-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.qtip-youtube{-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-webkit-box-shadow:0 0 3px #333;-moz-box-shadow:0 0 3px #333;box-shadow:0 0 3px #333;color:#fff;border:0 solid transparent;background:#4A4A4A;background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0,#4A4A4A),color-stop(100%,#000));background-image:-webkit-linear-gradient(top,#4A4A4A 0,#000 100%);background-image:-moz-linear-gradient(top,#4A4A4A 0,#000 100%);background-image:-ms-linear-gradient(top,#4A4A4A 0,#000 100%);background-image:-o-linear-gradient(top,#4A4A4A 0,#000 100%)}.qtip-youtube .qtip-titlebar{background-color:#4A4A4A;background-color:rgba(0,0,0,0)}.qtip-youtube .qtip-content{padding:.75em;font:12px arial,sans-serif;filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr=#4a4a4a, EndColorStr=#000000);-ms-filter:"progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#4a4a4a,EndColorStr=#000000);"}.qtip-youtube .qtip-icon{border-color:#222}.qtip-youtube .qtip-titlebar .ui-state-hover{border-color:#303030}.qtip-jtools{background:#232323;background:rgba(0,0,0,.7);background-image:-webkit-gradient(linear,left top,left bottom,from(#717171),to(#232323));background-image:-moz-linear-gradient(top,#717171,#232323);background-image:-webkit-linear-gradient(top,#717171,#232323);background-image:-ms-linear-gradient(top,#717171,#232323);background-image:-o-linear-gradient(top,#717171,#232323);border:2px solid #ddd;border:2px solid rgba(241,241,241,1);-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-webkit-box-shadow:0 0 12px #333;-moz-box-shadow:0 0 12px #333;box-shadow:0 0 12px #333}.qtip-jtools .qtip-titlebar{background-color:transparent;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171, endColorstr=#4A4A4A);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171,endColorstr=#4A4A4A)"}.qtip-jtools .qtip-content{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A, endColorstr=#232323);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A,endColorstr=#232323)"}.qtip-jtools .qtip-content,.qtip-jtools .qtip-titlebar{background:0 0;color:#fff;border:0 dashed transparent}.qtip-jtools .qtip-icon{border-color:#555}.qtip-jtools .qtip-titlebar .ui-state-hover{border-color:#333}.qtip-cluetip{-webkit-box-shadow:4px 4px 5px rgba(0,0,0,.4);-moz-box-shadow:4px 4px 5px rgba(0,0,0,.4);box-shadow:4px 4px 5px rgba(0,0,0,.4);background-color:#D9D9C2;color:#111;border:0 dashed transparent}.qtip-cluetip .qtip-titlebar{background-color:#87876A;color:#fff;border:0 dashed transparent}.qtip-cluetip .qtip-icon{border-color:#808064}.qtip-cluetip .qtip-titlebar .ui-state-hover{border-color:#696952;color:#696952}.qtip-tipsy{background:#000;background:rgba(0,0,0,.87);color:#fff;border:0 solid transparent;font-size:11px;font-family:'Lucida Grande',sans-serif;font-weight:700;line-height:16px;text-shadow:0 1px #000}.qtip-tipsy .qtip-titlebar{padding:6px 35px 0 10px;background-color:transparent}.qtip-tipsy .qtip-content{padding:6px 10px}.qtip-tipsy .qtip-icon{border-color:#222;text-shadow:none}.qtip-tipsy .qtip-titlebar .ui-state-hover{border-color:#303030}.qtip-tipped{border:3px solid #959FA9;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;background-color:#F9F9F9;color:#454545;font-weight:400;font-family:serif}.qtip-tipped .qtip-titlebar{border-bottom-width:0;color:#fff;background:#3A79B8;background-image:-webkit-gradient(linear,left top,left bottom,from(#3A79B8),to(#2E629D));background-image:-webkit-linear-gradient(top,#3A79B8,#2E629D);background-image:-moz-linear-gradient(top,#3A79B8,#2E629D);background-image:-ms-linear-gradient(top,#3A79B8,#2E629D);background-image:-o-linear-gradient(top,#3A79B8,#2E629D);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8, endColorstr=#2E629D);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8,endColorstr=#2E629D)"}.qtip-tipped .qtip-icon{border:2px solid #285589;background:#285589}.qtip-tipped .qtip-icon .ui-icon{background-color:#FBFBFB;color:#555}.qtip-bootstrap{font-size:14px;line-height:20px;color:#333;padding:1px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.qtip-bootstrap .qtip-titlebar{padding:8px 14px;margin:0;font-size:14px;font-weight:400;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.qtip-bootstrap .qtip-titlebar .qtip-close{right:11px;top:45%;border-style:none}.qtip-bootstrap .qtip-content{padding:9px 14px}.qtip-bootstrap .qtip-icon{background:0 0}.qtip-bootstrap .qtip-icon .ui-icon{width:auto;height:auto;float:right;font-size:20px;font-weight:700;line-height:18px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}#qtip-overlay,#qtip-overlay div{left:0;top:0;width:100%;height:100%}.qtip-bootstrap .qtip-icon .ui-icon:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}.qtip:not(.ie9haxors) div.qtip-content,.qtip:not(.ie9haxors) div.qtip-titlebar{filter:none;-ms-filter:none}.qtip .qtip-tip{margin:0 auto;overflow:hidden;z-index:10}.qtip .qtip-tip,x:-o-prefocus{visibility:hidden}.qtip .qtip-tip,.qtip .qtip-tip .qtip-vml,.qtip .qtip-tip canvas{position:absolute;color:#123456;background:0 0;border:0 dashed transparent}.qtip .qtip-tip canvas{top:0;left:0}.qtip .qtip-tip .qtip-vml{behavior:url(#default#VML);display:inline-block;visibility:visible}#qtip-overlay{position:fixed}#qtip-overlay div{position:absolute;background-color:#000;opacity:.7;filter:alpha(opacity=70);-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"}.qtipmodal-ie6fix{position:absolute!important}
diff --git a/webapp/src/main/webapp/css/login.css b/webapp/src/main/webapp/css/login.css
index 850823d67..68cd37dc7 100644
--- a/webapp/src/main/webapp/css/login.css
+++ b/webapp/src/main/webapp/css/login.css
@@ -2,13 +2,13 @@
 
 /* styles for log in */
 
-#login-form label, 
+#login-form label,
 #login-form input.text,
 #login-form #password,
 #login-form #confirmPassword,
 #login-form label.label-remember-me,
 #vivoAccountError {
-    display: block;  
+    display: block;
 }
 #login-form p.submit {
     float: left;
@@ -63,8 +63,8 @@ h3.internal-auth {
     margin-bottom: 0;
     padding-bottom: 0;
     text-decoration: none;
-    cursor: hand; 
-    cursor: pointer; 
+    cursor: hand;
+    cursor: pointer;
     text-align: center;
     line-height: 1.4em;
 }
@@ -87,4 +87,4 @@ p.password-note {
 .or {
     display: inline;
     vertical-align: middle;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/css/menupage/menuManagement.css b/webapp/src/main/webapp/css/menupage/menuManagement.css
index 4e08d7672..32c85afcb 100644
--- a/webapp/src/main/webapp/css/menupage/menuManagement.css
+++ b/webapp/src/main/webapp/css/menupage/menuManagement.css
@@ -50,4 +50,4 @@ ul#selectedClasses li {
 }
 #error-alert{
     height: auto !important;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/css/menupage/menupage.css b/webapp/src/main/webapp/css/menupage/menupage.css
index 31bf51e0b..51afcc95f 100644
--- a/webapp/src/main/webapp/css/menupage/menupage.css
+++ b/webapp/src/main/webapp/css/menupage/menupage.css
@@ -73,7 +73,7 @@ ul#find-filters li {
     padding-right: 15px;
     border-right: 1px solid #E4EAE9;
 }
-ul#find-filters li:last-child { 
+ul#find-filters li:last-child {
     border-bottom: 0;
     border-right: none;
 }
diff --git a/webapp/src/main/webapp/css/menupage/pageList.css b/webapp/src/main/webapp/css/menupage/pageList.css
index 35927f1f1..6a5acc706 100644
--- a/webapp/src/main/webapp/css/menupage/pageList.css
+++ b/webapp/src/main/webapp/css/menupage/pageList.css
@@ -3,11 +3,11 @@
 .menuFlag {
 	width:67px;
 	height:18px;
-	background: url("../../images/checkMark.png") no-repeat left center;  
+	background: url("../../images/checkMark.png") no-repeat left center;
 }
 th#isMenuPage {
     width: 86px;
 }
 th#iconColumns {
     width: 90px;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/css/menupage/pageManagement.css b/webapp/src/main/webapp/css/menupage/pageManagement.css
index 516fe67e0..aa59bd015 100644
--- a/webapp/src/main/webapp/css/menupage/pageManagement.css
+++ b/webapp/src/main/webapp/css/menupage/pageManagement.css
@@ -2,7 +2,7 @@
 
 .pageContent {
     padding-left:6px;
-    padding-top:2px;   
+    padding-top:2px;
 }
 
 .pageContentContainer {
@@ -40,8 +40,8 @@
     border-color:#ccc;
 }
 .arrow {
-	width:13px; 
-	height:9px; 
+	width:13px;
+	height:9px;
 	display:block;
 }
 .expandArrow {
@@ -107,7 +107,7 @@ input.doneWithContent {
     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;
@@ -138,7 +138,7 @@ form#managePage textarea {
     width:98.5%;
 }
 #internal-class {
-    padding: 10px 0 2px 10px; 
+    padding: 10px 0 2px 10px;
     background: #f0f0f0;
     margin-right: .4em;
     margin-bottom: .8em;
diff --git a/webapp/src/main/webapp/css/menupage/sparqlresults.css b/webapp/src/main/webapp/css/menupage/sparqlresults.css
index d441cb9e8..ba9e9d7f5 100644
--- a/webapp/src/main/webapp/css/menupage/sparqlresults.css
+++ b/webapp/src/main/webapp/css/menupage/sparqlresults.css
@@ -12,4 +12,4 @@ border:1px solid #000000;
 
 .resultHeading {
 font-weight:bold;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/css/revision.css b/webapp/src/main/webapp/css/revision.css
index 375288706..604f976b5 100644
--- a/webapp/src/main/webapp/css/revision.css
+++ b/webapp/src/main/webapp/css/revision.css
@@ -10,7 +10,7 @@
 }
 #revision-levels {
     width: 375px;
-    float: left; 
+    float: left;
 }
 #revision-levels caption {
     padding: 10px 0 12px 0;
diff --git a/webapp/src/main/webapp/css/search.css b/webapp/src/main/webapp/css/search.css
index 3cbb96822..ec0639e9a 100644
--- a/webapp/src/main/webapp/css/search.css
+++ b/webapp/src/main/webapp/css/search.css
@@ -3,16 +3,16 @@
 /* Search form styles */
 
 /* Class and subclass refinement links */
-.searchTOC {    
-    margin-bottom: 1.5em; 
+.searchTOC {
+    margin-bottom: 1.5em;
 }
 /* Search results */
 .advancedSearchForm .form-button,
-.searchhits li {    
+.searchhits li {
     margin-top: 1em;
 }
-.searchhits li a {    
-    margin-right: .4em; 
+.searchhits li a {
+    margin-right: .4em;
 }
 p.snippet {
     font-size: .8em;
@@ -26,8 +26,8 @@ a:visited span.SearchTerm {
     color: #7D7D7D;
 }
 /* bPaging links */
-.searchpages {    
-    margin-top: 2em; 
+.searchpages {
+    margin-top: 2em;
 }
 .searchpages a,
 .searchpages span {
@@ -35,12 +35,12 @@ a:visited span.SearchTerm {
     margin-right: .5em;
 }
 .searchpages a:link,
-.searchpages a:visited {    
+.searchpages a:visited {
     text-decoration: none;
 }
 .searchpages a:hover,
-.searchpages a:active {    
-    text-decoration: underline; 
+.searchpages a:active {
+    text-decoration: underline;
 }
 .searchpages a.prev {
     margin-right: 1em;
@@ -87,4 +87,4 @@ img#downloadIcon {
 }
 .download-url {
 	padding: 5px 25px 5px;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/css/startupStatus.css b/webapp/src/main/webapp/css/startupStatus.css
index 613b1db20..d66c69624 100644
--- a/webapp/src/main/webapp/css/startupStatus.css
+++ b/webapp/src/main/webapp/css/startupStatus.css
@@ -22,7 +22,7 @@
     background-color: #FFDDDD;
 }
 #startup-trace li.warning{
-    background-color: #FFFFDD; 
+    background-color: #FFFFDD;
 }
 #startup-trace li.info {
     background-color: #DDFFDD;
diff --git a/webapp/src/main/webapp/css/uploadImages.css b/webapp/src/main/webapp/css/uploadImages.css
index 9490d68b1..de092d618 100644
--- a/webapp/src/main/webapp/css/uploadImages.css
+++ b/webapp/src/main/webapp/css/uploadImages.css
@@ -27,10 +27,10 @@
     display: block;
     padding-bottom: 10px;
 }
-#photoUploadForm label span {    
+#photoUploadForm label span {
     font-size: .7em;
 }
-#photoUploadForm input {    
+#photoUploadForm input {
     margin-bottom: 10px;
 }
 /* <------ CROP PICTURE*/
@@ -76,4 +76,4 @@
 }
 .or {
     display: inline;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/css/vitro.css b/webapp/src/main/webapp/css/vitro.css
index 92887cc7a..8bafa5922 100644
--- a/webapp/src/main/webapp/css/vitro.css
+++ b/webapp/src/main/webapp/css/vitro.css
@@ -2,13 +2,13 @@
 
 /****************************************
  Vitro base styles
- 
+
  Styles declared here are intended for
  application-wide use.
- 
+
  Original version
  2011-01-12 UI Team
- 
+
  Last updated
  2011-01-13
 *****************************************/
@@ -21,7 +21,7 @@
     display: none !important;
 }
 .disabledSubmit {
-	cursor:default ! important; 
+	cursor:default ! important;
 }
 /* <------ USER FEEDBACK*/
 #error-alert {
@@ -35,7 +35,7 @@
     float:left;
     margin: 0;
     padding: 0;
-    vertical-align: middle;  	
+    vertical-align: middle;
 }
 #error-alert p,
 #confirmation-alert p {
@@ -54,7 +54,7 @@
 }
 #flash-message {
     background-color: #7285a0;
-    padding: .5em;  
+    padding: .5em;
     margin-bottom: 10px;
 }
 .contentNote {
@@ -89,8 +89,8 @@
     width:290px;
 }
 /* <------ SEARCH RESULTS PAGE*/
-.searchTOC {    
-    margin-bottom: 1.5em; 
+.searchTOC {
+    margin-bottom: 1.5em;
     float:right;
     margin-right:35px;
     margin-left:45px;
@@ -99,9 +99,9 @@
 /*    border: 1px solid #dde4e3;*/
     padding-top:4px;
     color: #fff;
-    background: #5e6363; 
+    background: #5e6363;
 }
-.searchTOC h4 {    
+.searchTOC h4 {
     color: #fff;
     padding: .2em 0 .2em 0;
 }
@@ -157,58 +157,58 @@ a.close {
 /* ------------------------------------------------->  */
 
 /* LEVEL ONE */
-ul.dropdown { 
-    position: relative; 
+ul.dropdown {
+    position: relative;
 }
 ul.dropdown li,
-ul.language-dropdown li {  
-    float: left; 
-    zoom: 1; 
+ul.language-dropdown li {
+    float: left;
+    zoom: 1;
     padding: 0 !important;
 }
 ul.dropdown li a,
-ul.language-dropdown li a { 
-    display: block; 
+ul.language-dropdown li a {
+    display: block;
     font-size: 1.4em;
 }
-ul.dropdown li#user-menu { 
+ul.dropdown li#user-menu {
     background: url(../images/arrowDownOverAccount.gif) right 9px no-repeat;
     min-width:110px;
     position: relative;
 }
-ul.dropdown li#user-menu a { 
+ul.dropdown li#user-menu a {
     margin-right: 28px;
     margin-left:10px;
 }
 ul.dropdown li#user-menu.hover,
 ul.dropdown li#user-menu:hover,
 ul.language-dropdown li#language-menu.hover,
-ul.language-dropdown li#language-menu:hover { 
-    color: #000 !important; 
-    position: relative; 
+ul.language-dropdown li#language-menu:hover {
+    color: #000 !important;
+    position: relative;
     background: #fff url(../images/arrowDownAccount.gif) right 9px no-repeat;
     border-bottom: 1px solid #cdcfcf;
 }
 ul.dropdown li.hover a,
 ul.dropdown li:hover a,
 ul.language-dropdown li.hover a,
-ul.language-dropdown li:hover a { 
-    color: #000 !important; 
+ul.language-dropdown li:hover a {
+    color: #000 !important;
     margin-left:10px;
 }
 /* LEVEL TWO */
-ul.dropdown ul.sub_menu {  
+ul.dropdown ul.sub_menu {
     background-color: #fff;
     font-size: 1.4em;
-    visibility: hidden; 
-    position: absolute; 
-    top: 100%; 
-    right: 0; 
+    visibility: hidden;
+    position: absolute;
+    top: 100%;
+    right: 0;
     z-index: 999;
     color: #000;
 }
-ul.dropdown ul.sub_menu li { 
-    float: none; 
+ul.dropdown ul.sub_menu li {
+    float: none;
     clear: both;
     padding-left: 14px !important;
     width: 96px;
@@ -216,91 +216,91 @@ ul.dropdown ul.sub_menu li {
     border-bottom: 1px solid #cdcfcf;
     background: #fff url(../images/arrowMenuAccount.gif) 7px 8px no-repeat;
 }
-ul.dropdown ul.sub_menu li:last-child { 
+ul.dropdown ul.sub_menu li:last-child {
     width: 96px;
 }
 /* IE 6 & 7 Needs Inline Block */
 /* ADD IN IE6.css and IE7.css*/
-ul.dropdown ul.sub_menu li a { 
-    width: 90%; 
-    display: inline-block; 
+ul.dropdown ul.sub_menu li a {
+    width: 90%;
+    display: inline-block;
     color: #000 !important;
     background-color: #fff;
     padding: 0;
     padding-left: 0px;
     height: 24px;
 }
-ul.dropdown ul.sub_menu li.inactive { 
+ul.dropdown ul.sub_menu li.inactive {
     color: #aab0ae !important;
     font-size: 1em !important;
-    padding-left: 22px !important; 
-    width: 88px; 
+    padding-left: 22px !important;
+    width: 88px;
 }
 ul.dropdown ul.sub_menu li a:hover,
-ul.dropdown ul.sub_menu li a.hover { 
+ul.dropdown ul.sub_menu li a.hover {
     color: #999 !important;
 }
 /*  LEVEL THREE */
-ul.dropdown ul ul { 
-    left: 100%; top: 0; 
+ul.dropdown ul ul {
+    left: 100%; top: 0;
 }
-ul.dropdown li:hover > ul { 
-    visibility: visible; 
+ul.dropdown li:hover > ul {
+    visibility: visible;
 }
 /* ------------------------------------------------->  */
 /* DROP DOWN LANGUAGE MENU  ------------------------>  */
 /* ------------------------------------------------->  */
-ul.language-dropdown { 
-    position: relative; 
+ul.language-dropdown {
+    position: relative;
 }
-ul.language-dropdown li#language-menu { 
+ul.language-dropdown li#language-menu {
     background: url(../images/arrowDownOverAccount.gif) right 9px no-repeat;
     min-width:110px;
     position: relative;
     margin-right: -10px !important;
 }
-ul.language-dropdown li#language-menu a { 
+ul.language-dropdown li#language-menu a {
     margin-right: 28px;
     margin-left:10px;
 }
 /* LEVEL TWO */
-ul.language-dropdown ul.sub_menu {  
+ul.language-dropdown ul.sub_menu {
     font-size: 1.4em;
-    visibility: hidden; 
-    position: absolute; 
-    top: 100%; 
-    right: 0; 
+    visibility: hidden;
+    position: absolute;
+    top: 100%;
+    right: 0;
     z-index: 999;
     color: #000;
     width: 100%;
 }
-ul.language-dropdown ul.sub_menu li { 
-    float: none; 
+ul.language-dropdown ul.sub_menu li {
+    float: none;
     clear: both;
     padding-left: 14px !important;
-    width: 100%; 
+    width: 100%;
     border-right: none !important;
-    border-bottom: 1px solid #cdcfcf; 
+    border-bottom: 1px solid #cdcfcf;
     background: #fff url('../images/arrowMenuAccount.gif') no-repeat scroll 7px 8px ;
 }
 /* IE 6 & 7 Needs Inline Block */
 /* ADD IN IE6.css and IE7.css*/
-ul.language-dropdown ul.sub_menu li a { 
-    width: 90%; 
-    display: inline-block; 
+ul.language-dropdown ul.sub_menu li a {
+    width: 90%;
+    display: inline-block;
     color: #000 !important;
     background-color: #fff url('../images/arrowMenuAccount.gif') no-repeat scroll 7px 8px ;
     padding: 0;
     padding-left: 0;
     height: 24px;
 }
-ul.language-dropdown ul.sub_menu li.inactive { 
+ul.language-dropdown ul.sub_menu li.inactive {
     color: #aab0ae !important;
     font-size: 1em !important;
     width: 88px;
 }
 ul.language-dropdown ul.sub_menu li a:hover,
-ul.language-dropdown ul.sub_menu li a.hover { 
+ul.language-dropdown ul.sub_menu li a.hover {
     color: #999 !important;
 	opacity: 0.6;
 	filter: alpha(opacity=60); /* For IE8 and earlier */
@@ -327,7 +327,7 @@ p#mngLabelsText {
     margin-bottom:12px;
 }
 
-/* SEARCH HOME------>  */ 
+/* SEARCH HOME------>  */
 #search-home {
 		margin-top: 2em;
 		width: 570px;
@@ -373,10 +373,10 @@ a.filter-search {
 		display: inline-block;
 		width: 39px;
 		height: 43px;
-		z-index: 9999; 
+		z-index: 9999;
 		top: 0;
 		right: 135px;
-		z-index: 9999; 
+		z-index: 9999;
 }
 .filter-default {
 
@@ -389,7 +389,7 @@ a.filter-search {
 		width: 184px;
 		top: 0;
 		right: 135px;
-		z-index: 9998; 
+		z-index: 9998;
 		display: none;
 		list-style-type: none;
 }
@@ -430,7 +430,7 @@ a.filter-search {
 		text-align: center;
 		margin-left: 35px;
 		padding: 0;
-		line-height: 35px;	
+		line-height: 35px;
 }
 #home-stats h4 {
     display: inline;
diff --git a/webapp/src/main/webapp/error.jsp b/webapp/src/main/webapp/error.jsp
index 5ee811843..4bd25405c 100755
--- a/webapp/src/main/webapp/error.jsp
+++ b/webapp/src/main/webapp/error.jsp
@@ -8,7 +8,7 @@
 <%@page import="org.apache.commons.logging.Log"%>
 <%@page import="org.apache.commons.logging.LogFactory"%>
 <%
-   // We have seen that this page can throw its own error. 
+   // We have seen that this page can throw its own error.
    // Before it does so, be sure that we have written the original error to the log.
     Object c = request.getAttribute("javax.servlet.jsp.jspException");
     if (c instanceof Throwable) {
@@ -16,12 +16,12 @@
       Log log = LogFactory.getLog(this.getClass());
       log.error("Error: ", cause);
     }
-   
-   
+
+
             VitroRequest vreq = new VitroRequest(request);
             ApplicationBean appBean = vreq.getAppBean();
-            String themeDir = appBean.getThemeDir();                        
-            
+            String themeDir = appBean.getThemeDir();
+
             request.setAttribute("bodyJsp", "/errorbody.jsp");
             request.setAttribute("title", "Error");
             request.setAttribute("css", "");
@@ -36,7 +36,7 @@
     <body> <!-- generated by error.jsp -->
         <div id="wrap">
             <jsp:include page="/templates/page/freemarkerTransition/identity.jsp" flush="true"/>
-    
+
             <div id="contentwrap">
                 <jsp:include page="/templates/page/freemarkerTransition/menu.jsp" flush="true"/>
                 <p>There was an error in the system; please try again later.</p>
@@ -66,4 +66,4 @@
             <jsp:include page="/templates/page/freemarkerTransition/footer.jsp" flush="true"/>
         </div> <!-- wrap -->
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/webapp/src/main/webapp/i18n/all.properties b/webapp/src/main/webapp/i18n/all.properties
index 47ea21baf..130a0534e 100644
--- a/webapp/src/main/webapp/i18n/all.properties
+++ b/webapp/src/main/webapp/i18n/all.properties
@@ -77,7 +77,7 @@ imageUpload.errorUnrecognizedFileType = ''{0}'' is not a recognized image file t
 imageUpload.errorNoPhotoSelected = Please browse and select a photo.
 imageUpload.errorBadMultipartRequest = Failed to parse the multi-part request for uploading an image.
 imageUpload.errorFormFieldMissing = The form did not contain a ''{0}'' field."
-					
+
 #
 # User Accounts pages
 #
diff --git a/webapp/src/main/webapp/images/placeholders/placeholders.properties b/webapp/src/main/webapp/images/placeholders/placeholders.properties
index 7ebaffd73..a5274b2b7 100644
--- a/webapp/src/main/webapp/images/placeholders/placeholders.properties
+++ b/webapp/src/main/webapp/images/placeholders/placeholders.properties
@@ -12,6 +12,6 @@
 # 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.
 
diff --git a/webapp/src/main/webapp/jenaIngest/csv2rdf.jsp b/webapp/src/main/webapp/jenaIngest/csv2rdf.jsp
index d9bfd5f21..8ae4df814 100644
--- a/webapp/src/main/webapp/jenaIngest/csv2rdf.jsp
+++ b/webapp/src/main/webapp/jenaIngest/csv2rdf.jsp
@@ -20,34 +20,34 @@
     <form action="csv2rdf" method="post" enctype="multipart/form-data">
         <input type="hidden" name="action" value="csv2rdf"/>
 
-	<p><input type="radio" name="separatorChar" value="comma" checked="checked"/> comma separated 
+	<p><input type="radio" name="separatorChar" value="comma" checked="checked"/> comma separated
 	<input type="radio" name="separatorChar" value="tab"/> tab separated </p>
 
     <input type="text" style="width:80%;" name="csvUrl"/>
     <p>CSV file URL (e.g. "file:///")</p>
-    
+
     <p>Or upload a file from your computer:</p>
     <p><input type="file" name="filePath" /></p>
 
     <p/>
-    <p>This tool will automatically generate a mini ontology to represent the 
-    data in the CSV file.  A property will be produced for each column in the 
-    spreadsheet, based on the text in the header for that column.</p><p>In what 
+    <p>This tool will automatically generate a mini ontology to represent the
+    data in the CSV file.  A property will be produced for each column in the
+    spreadsheet, based on the text in the header for that column.</p><p>In what
     namespace should these properties be created?</p>
 	<input type="text" name="tboxNamespace"/>
     <p>Namespace in which to generate properties</p>
 
-<!-- 
+<!--
  <input type="checkbox" name="discardTbox"/> do not add TBox or RBox to result model
 -->
 
     <p>
     <p>Each row in the spreadsheet will produce a resource.  Each of these
-    resources will be a member of a class in the namespace selected above.</p>  
-    <p>What should the local name of this class be? This is normally a word or two 
-    in "camel case" starting with an uppercase letter.  (For example, if the 
-    spreadsheet represents a list of faculty members, you might enter 
-    "FacultyMember" on the next line.)</p> 
+    resources will be a member of a class in the namespace selected above.</p>
+    <p>What should the local name of this class be? This is normally a word or two
+    in "camel case" starting with an uppercase letter.  (For example, if the
+    spreadsheet represents a list of faculty members, you might enter
+    "FacultyMember" on the next line.)</p>
     <input type="text" name="typeName"/>
     <p>Class Local Name for Resources</p>
 
diff --git a/webapp/src/main/webapp/jenaIngest/csv2rdfSelectUri.jsp b/webapp/src/main/webapp/jenaIngest/csv2rdfSelectUri.jsp
index f7b3b985f..322abb0ae 100644
--- a/webapp/src/main/webapp/jenaIngest/csv2rdfSelectUri.jsp
+++ b/webapp/src/main/webapp/jenaIngest/csv2rdfSelectUri.jsp
@@ -39,30 +39,30 @@ function disableProperties(){
         <input type="hidden" name="action" value="renameBNodesURISelect"/>
 
     <h3>Select URI prefix</h3>
-   
+
 	<p>URIs will be constructed using the following base string:</p>
-	<input id="namespace" type="text" style="width:65%;" name="namespaceEtcStr"/> 
+	<input id="namespace" type="text" style="width:65%;" name="namespaceEtcStr"/>
 
     <p/>
-    
-    <p>Each resource will be assigned a URI by taking the above string and 
+
+    <p>Each resource will be assigned a URI by taking the above string and
      adding either a random integer, or a string based on the value of one of the
      the properties of the resource</p>
-    
+
     <input type="radio" value="integer" name="concatenate" checked="checked" onclick="disableProperties()">Use random integer</input>
     <br></br>
-    <input type="radio" value="pattern" name="concatenate" onclick="selectProperties()">Use pattern based on values of </input> 
-  
-    
+    <input type="radio" value="pattern" name="concatenate" onclick="selectProperties()">Use pattern based on values of </input>
+
+
     <% Map<String,LinkedList<String>> propertyMap = (Map) request.getAttribute("propertyMap");
        Set<Entry<String,LinkedList<String>>> set = propertyMap.entrySet();
        Iterator<Entry<String,LinkedList<String>>> itr = set.iterator();
        Entry<String, LinkedList<String>> entry = null;
     %>
-   
+
     <select name="property" id="properties" disabled="disabled">
     <% while(itr.hasNext()){%>
-    
+
     	<%entry = itr.next();
     	Iterator<String> listItr = entry.getValue().iterator();
     	%>
@@ -73,18 +73,18 @@ function disableProperties(){
     <br></br>
     <p>Enter a pattern using $$$ as the placeholder for the value of the property selected above.</p>
     <p>For example, entering dept_$$$ might generate URIs with endings such as dept_Art or dept_Classics.</p>
-    <input id="pattern" disabled="disabled" type="text" style="width:35%;" name="pattern"/> 
-    
+    <input id="pattern" disabled="disabled" type="text" style="width:35%;" name="pattern"/>
+
     <input type="hidden" name="destinationModelName" value="${destinationModelName}"/>
     <input type="hidden" name="csv2rdf" value="${csv2rdf}"/>
-    
+
     <c:forEach var="sourceModelValue" items="${sourceModel}">
         <input type="hidden" name="sourceModelName" value="${sourceModelValue}"/>
     </c:forEach>
-    
+
     <p/>
-    
+
     <input class="submit" type="submit" value="Convert CSV"/>
-    
+
     </form>
-    
+
diff --git a/webapp/src/main/webapp/jenaIngest/executeWorkflow.jsp b/webapp/src/main/webapp/jenaIngest/executeWorkflow.jsp
index 699f44341..2a4c5e7ca 100644
--- a/webapp/src/main/webapp/jenaIngest/executeWorkflow.jsp
+++ b/webapp/src/main/webapp/jenaIngest/executeWorkflow.jsp
@@ -20,9 +20,9 @@
         <input type="hidden" name="action" value="executeWorkflow"/>
 
     <h3>Workflow</h3>
-   
+
         <select name="workflowURI">
-             
+
         <%
               OntModel jenaOntModel = ModelAccess.on(getServletContext()).getOntModel();
               jenaOntModel.enterCriticalSection(Lock.READ);
@@ -39,5 +39,5 @@
 	      }
         %>
         </select>
-  
+
     <input class="submit" type="submit" value="Next &gt;"/>
diff --git a/webapp/src/main/webapp/jenaIngest/exportSelection.jsp b/webapp/src/main/webapp/jenaIngest/exportSelection.jsp
index 16b10920f..a465474c1 100644
--- a/webapp/src/main/webapp/jenaIngest/exportSelection.jsp
+++ b/webapp/src/main/webapp/jenaIngest/exportSelection.jsp
@@ -19,13 +19,13 @@
     <li style="list-style-type:none;"><input type="radio" name="subgraph" value="abox"/> All Instance data (ABox) for the application</li>
     <%VitroRequest vreq = new VitroRequest(request);
     OntologyDao daoObj = vreq.getUnfilteredWebappDaoFactory().getOntologyDao();
-    List ontologiesObj = daoObj.getAllOntologies();  
+    List ontologiesObj = daoObj.getAllOntologies();
     if(ontologiesObj !=null && ontologiesObj.size()>0){
     	Iterator ontItr = ontologiesObj.iterator();
     	while(ontItr.hasNext()){
     		Ontology ont = (Ontology) ontItr.next();%>
     		<li style="list-style-type:none;"><input type="radio" name="subgraph" value=<%=ont.getURI()%>/> <%=ont.getName()%> (TBox)</li>
-    	<%}}%> 
+    	<%}}%>
 </ul>
 <hr/>
 <ul>
diff --git a/webapp/src/main/webapp/jenaIngest/generateTBox.jsp b/webapp/src/main/webapp/jenaIngest/generateTBox.jsp
index f7bdc02e6..b425d44ef 100644
--- a/webapp/src/main/webapp/jenaIngest/generateTBox.jsp
+++ b/webapp/src/main/webapp/jenaIngest/generateTBox.jsp
@@ -32,8 +32,8 @@
     <h3>Select Destination Model for Generated TBox</h3>
 
     <select name="destinationModelName">
-        <option value="vitro:baseOntModel"/>webapp assertions</option>   
-        <option value="vitro:jenaOntModel"/>webapp model</option>   
+        <option value="vitro:baseOntModel"/>webapp assertions</option>
+        <option value="vitro:jenaOntModel"/>webapp model</option>
         <c:forEach var="modelName" items="${modelNames}">
           <option value="${modelName}"/>${modelName}</option>
         </c:forEach>
diff --git a/webapp/src/main/webapp/jenaIngest/ingestMenu.jsp b/webapp/src/main/webapp/jenaIngest/ingestMenu.jsp
index f5de8a253..d57aba541 100644
--- a/webapp/src/main/webapp/jenaIngest/ingestMenu.jsp
+++ b/webapp/src/main/webapp/jenaIngest/ingestMenu.jsp
@@ -23,7 +23,7 @@
     <li><a href="ingest?action=renameBNodes" title="Convert blank nodes to named resources">Name Blank Nodes</a></li>
     <li><a href="ingest?action=smushSingleModel" title="Convert all existing URIs for a resource to a single URI">Smush Resources</a></li>
     <li><a href="ingest?action=mergeResources" title="Merge two resources into one">Merge Resources</a></li>
-    <li><a href="ingest?action=renameResource" title="Change the namespace of resources currently in a specified namespace">Change Namespace of Resources</a></li> 
+    <li><a href="ingest?action=renameResource" title="Change the namespace of resources currently in a specified namespace">Change Namespace of Resources</a></li>
     <li><a href="ingest?action=processStrings" title="Process property value strings">Process Property Value Strings</a></li>
     <li><a href="ingest?action=splitPropertyValues" title="Split property value strings into multiple property values using a regular expression pattern">Split Property Value Strings into Multiple Property Values</a></li>
 </ul>
diff --git a/webapp/src/main/webapp/jenaIngest/listModels.jsp b/webapp/src/main/webapp/jenaIngest/listModels.jsp
index 083722f77..67e052c76 100644
--- a/webapp/src/main/webapp/jenaIngest/listModels.jsp
+++ b/webapp/src/main/webapp/jenaIngest/listModels.jsp
@@ -45,7 +45,7 @@ function init(){
         <input type="hidden" name="modelType" value="${modelType}"/>
         <input type="submit" name="submit" value="Create Model"/>
     </form>
-    
+
             Currently showing <font color="red">${infoLine}</font>
     <ul>
       <c:forEach var="modelName" items="${modelNames}">
@@ -103,7 +103,7 @@ function init(){
             <td>
 			<form action="ingest" method="get">
 			    <input type="hidden" name="action" value="permanentURI" />
-			    <input type="hidden" name="modelName" value="${modelName}" /> 
+			    <input type="hidden" name="modelName" value="${modelName}" />
 				<input type="hidden" name="modelType" value="${modelType}"/>
 				<input type="submit" name="submit" value="generate permanent URIs" /></form>
 			</td>
diff --git a/webapp/src/main/webapp/jenaIngest/loadRDFData.jsp b/webapp/src/main/webapp/jenaIngest/loadRDFData.jsp
index 6596999fc..28c825a8b 100644
--- a/webapp/src/main/webapp/jenaIngest/loadRDFData.jsp
+++ b/webapp/src/main/webapp/jenaIngest/loadRDFData.jsp
@@ -24,4 +24,4 @@
 <br></br>
 <br></br>
 <p><input class="submit" type="submit" name="submit" value="Load Data" /></p>
-</form>
\ No newline at end of file
+</form>
diff --git a/webapp/src/main/webapp/jenaIngest/mergeResources.jsp b/webapp/src/main/webapp/jenaIngest/mergeResources.jsp
index ed2c38965..e52338a8d 100644
--- a/webapp/src/main/webapp/jenaIngest/mergeResources.jsp
+++ b/webapp/src/main/webapp/jenaIngest/mergeResources.jsp
@@ -17,13 +17,13 @@
 
 <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Merge Resources</h2>
 
-<p>This tool allows two resources with different URIs to be collapsed into a 
-   single URI. Any statements using the "duplicate resource URI" will be 
-   rewritten using the "primary resource URI."  If there are multiple 
+<p>This tool allows two resources with different URIs to be collapsed into a
+   single URI. Any statements using the "duplicate resource URI" will be
+   rewritten using the "primary resource URI."  If there are multiple
    statements for a property that can have only a single value, the extra
    statements will be retracted from the model and offered for download.</p>
-<p>This tool operates on the main web application model only, not on any 
-   of the additional Jena models.</p> 
+<p>This tool operates on the main web application model only, not on any
+   of the additional Jena models.</p>
 
 <form id="takeuri" action="ingest" method="get">
     <input type="hidden" name="action" value="mergeResources"/>
diff --git a/webapp/src/main/webapp/jenaIngest/merge_result.jsp b/webapp/src/main/webapp/jenaIngest/merge_result.jsp
index eac8a51e6..1a6e73d20 100644
--- a/webapp/src/main/webapp/jenaIngest/merge_result.jsp
+++ b/webapp/src/main/webapp/jenaIngest/merge_result.jsp
@@ -19,11 +19,11 @@
 
 <p><b><%=result%></b></p>
 
-<%if(!result.equals("resource 1 not present") && !result.equals("resource 2 not present")){ 
+<%if(!result.equals("resource 1 not present") && !result.equals("resource 2 not present")){
 if(!result.equals("No statements merged") && !result.endsWith("statements.")){%>
 <p>Download non-mergeable statements.</p>
 <form action="ingest" method="get">
 <input type="hidden" name="action" value="mergeResult"/>
-<input class="submit"  type="submit" name="Download" value="Download" ></input>  
-</form>        
-<%}} %>
\ No newline at end of file
+<input class="submit"  type="submit" name="Download" value="Download" ></input>
+</form>
+<%}} %>
diff --git a/webapp/src/main/webapp/jenaIngest/notfound.jsp b/webapp/src/main/webapp/jenaIngest/notfound.jsp
index 0365e710e..cd29245f4 100644
--- a/webapp/src/main/webapp/jenaIngest/notfound.jsp
+++ b/webapp/src/main/webapp/jenaIngest/notfound.jsp
@@ -6,4 +6,4 @@
 
 <h2>Individual Not Found</h2>
 
-<p>The individual was not found in the system.</p>
\ No newline at end of file
+<p>The individual was not found in the system.</p>
diff --git a/webapp/src/main/webapp/jenaIngest/permanentURI.jsp b/webapp/src/main/webapp/jenaIngest/permanentURI.jsp
index 4b976da3c..9157d9991 100644
--- a/webapp/src/main/webapp/jenaIngest/permanentURI.jsp
+++ b/webapp/src/main/webapp/jenaIngest/permanentURI.jsp
@@ -15,19 +15,19 @@
 <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Assign Permanent URIs To Resources</h2>
 
 <p>This tool will rename the resources in the selected model to with new
-randomly-generated URIs following the pattern used in the main application.  
-The tool will generate URIs that are not already in use in the main web 
-application model. Statements using the newly-renamed resources will be 
-written to the "model to save."</p> 
+randomly-generated URIs following the pattern used in the main application.
+The tool will generate URIs that are not already in use in the main web
+application model. Statements using the newly-renamed resources will be
+written to the "model to save."</p>
 
-<p>The permanent URIs may be generated in an arbitrary "new namespace for 
+<p>The permanent URIs may be generated in an arbitrary "new namespace for
 resources."  Otherwise, the "use default namespace" option will generate
 URIs exactly of the form created through the GUI interface.</p>
 
 <form action="ingest" method="get" >
 <input type="hidden" name="oldModel" value="${modelName}"/>
 <input type="hidden" name="action" value="permanentURI" />
-<p>Current namespace of resources  
+<p>Current namespace of resources
 <select name=oldNamespace>
 <%List namespaces = (List)request.getAttribute("namespaceList");
 if(namespaces != null) {
diff --git a/webapp/src/main/webapp/jenaIngest/processStrings.jsp b/webapp/src/main/webapp/jenaIngest/processStrings.jsp
index 651b15692..215c9a063 100644
--- a/webapp/src/main/webapp/jenaIngest/processStrings.jsp
+++ b/webapp/src/main/webapp/jenaIngest/processStrings.jsp
@@ -21,7 +21,7 @@
 
     <input type="text" style="width:80%;" name="className"/>
     <p>String processor class</p>
-    
+
     <input type="text" name="methodName"/>
     <p>String processor method</p>
 
@@ -38,7 +38,7 @@
     </select>
     <input type="checkbox" name="processModel" value="TRUE"/> apply changes directly to this model
     <p>model to use</p>
-   
+
     <select name="additionsModel">
 		<option value="">none</option>
 		<forEach var="modelName" items="${modelNames}">
diff --git a/webapp/src/main/webapp/jenaIngest/renameBNodesURISelect.jsp b/webapp/src/main/webapp/jenaIngest/renameBNodesURISelect.jsp
index 14fb4a49b..76b81e8eb 100644
--- a/webapp/src/main/webapp/jenaIngest/renameBNodesURISelect.jsp
+++ b/webapp/src/main/webapp/jenaIngest/renameBNodesURISelect.jsp
@@ -37,27 +37,27 @@ function disableProperties(){
         <input type="hidden" name="action" value="renameBNodesURISelect"/>
 
     <h3>Select URI prefix</h3>
-   
+
     <c:if test="${!empty errorMsg}">
        <p class="notice">${errorMsg}</p>
     </c:if>
-   
+
 	<p>URIs will be constructed using the following base string:</p>
-	<input id="namespace" type="text" style="width:65%;" name="namespaceEtcStr"/> 
+	<input id="namespace" type="text" style="width:65%;" name="namespaceEtcStr"/>
 
      <p/>
 
 <c:choose>
-  <c:when test="${enablePropertyPatternURIs}">    
-    <p>Each resource will be assigned a URI by taking the above string and 
+  <c:when test="${enablePropertyPatternURIs}">
+    <p>Each resource will be assigned a URI by taking the above string and
      adding either a random integer, or a string based on the value of one of the
      the properties of the resource</p>
-    
+
     <input type="radio" value="integer" name="concatenate" checked="checked" onclick="disableProperties()">Use random integer</input>
     <br></br>
-    <input type="radio" value="pattern" name="concatenate" onclick="selectProperties()">Use pattern based on values of </input> 
-  
-    
+    <input type="radio" value="pattern" name="concatenate" onclick="selectProperties()">Use pattern based on values of </input>
+
+
     <% Map<String,LinkedList<String>> propertyMap = (Map) request.getAttribute("propertyMap");
        Set<Entry<String,LinkedList<String>>> set = propertyMap.entrySet();
        Iterator<Entry<String,LinkedList<String>>> itr = set.iterator();
@@ -66,7 +66,7 @@ function disableProperties(){
     <%if(itr.hasNext()){%>
     <select name="property" id="properties" disabled="disabled">
     <% while(itr.hasNext()){%>
-    
+
     	<%entry = itr.next();
     	Iterator<String> listItr = entry.getValue().iterator();
     	%>
@@ -77,21 +77,21 @@ function disableProperties(){
     <br></br>
     <p>Enter a pattern using $$$ as the placeholder for the value of the property selected above.</p>
     <p>For example, entering dept_$$$ might generate URIs with endings such as dept_Art or dept_Classics.</p>
-    <input id="pattern" disabled="disabled" type="text" style="width:35%;" name="pattern"/> 
-    
+    <input id="pattern" disabled="disabled" type="text" style="width:35%;" name="pattern"/>
+
   </c:when>
   <c:otherwise>
-   <p>Each resource will be assigned a URI by taking the above string and 
+   <p>Each resource will be assigned a URI by taking the above string and
      adding a random integer.</p>
    <input type="hidden" value="integer" name="concatenate"/>
   </c:otherwise>
 </c:choose>
-    
+
     <c:forEach var="sourceModelValue" items="${sourceModel}">
         <input type="hidden" name="sourceModelName" value="${sourceModelValue}"/>
     </c:forEach>
-    
-  
+
+
     <h3>Select Destination Model</h3>
 
     <select name="destinationModelName">
@@ -102,6 +102,6 @@ function disableProperties(){
     </select>
 
     <input class="submit" type="submit" value="Rename Blank Nodes"/>
-    
+
     </form>
-    
+
diff --git a/webapp/src/main/webapp/jenaIngest/renameResource.jsp b/webapp/src/main/webapp/jenaIngest/renameResource.jsp
index e1ea10081..149dd4c72 100644
--- a/webapp/src/main/webapp/jenaIngest/renameResource.jsp
+++ b/webapp/src/main/webapp/jenaIngest/renameResource.jsp
@@ -16,12 +16,12 @@
 
 <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Change Namespace of Resources</h2>
 
-<p>This tool will change all resources in the supplied "old namespace" 
+<p>This tool will change all resources in the supplied "old namespace"
 to be in the "new namespace."  Additionally, if the local names do not
-already follow the established "n" + random integer naming convention, 
+already follow the established "n" + random integer naming convention,
 they will be updated to this format.</p>
 
-<p>This tool operates on the main web application model only, not on any 
+<p>This tool operates on the main web application model only, not on any
    of the additional Jena models.</p>
 
 <c:if test="${!empty errorMsg}">
@@ -33,4 +33,4 @@ they will be updated to this format.</p>
 <p>Old namespace: <input id="uri1" type="text" size="52" name="oldNamespace" value="${oldNamespace}" /></p>
 <p>New namespace: <input id="uri2" type="text" size="52" name="newNamespace" value="${newNamespace}" /></p>
 <p><input id="submit" type="submit" name="submit" value="Change namespace" /></p>
-</form>
\ No newline at end of file
+</form>
diff --git a/webapp/src/main/webapp/jenaIngest/renameResult.jsp b/webapp/src/main/webapp/jenaIngest/renameResult.jsp
index 51a6eb344..a6c38dbb6 100644
--- a/webapp/src/main/webapp/jenaIngest/renameResult.jsp
+++ b/webapp/src/main/webapp/jenaIngest/renameResult.jsp
@@ -10,4 +10,4 @@
 <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Rename Resource</h2>
 
 <%String result = (String) request.getAttribute("result");%>
-<p><b><%=result%></b></p>
\ No newline at end of file
+<p><b><%=result%></b></p>
diff --git a/webapp/src/main/webapp/jenaIngest/smushSingleModel.jsp b/webapp/src/main/webapp/jenaIngest/smushSingleModel.jsp
index caa3e3667..a44c20c4e 100644
--- a/webapp/src/main/webapp/jenaIngest/smushSingleModel.jsp
+++ b/webapp/src/main/webapp/jenaIngest/smushSingleModel.jsp
@@ -13,14 +13,14 @@
 <%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
 <% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
-  
+
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Smush Resources</h2>
 
     <form action="ingest" method="get"i>
         <input type="hidden" name="action" value="smushSingleModel"/>
 
     <h3>URI of Property with which To Smush
-	<input type="text" style="width:40%;" name="propertyURI"/> 
+	<input type="text" style="width:40%;" name="propertyURI"/>
 
     <h3>Select Source Models</h3>
 
diff --git a/webapp/src/main/webapp/jenaIngest/sparqlConstruct.jsp b/webapp/src/main/webapp/jenaIngest/sparqlConstruct.jsp
index d9bcb558a..4d705c3e2 100644
--- a/webapp/src/main/webapp/jenaIngest/sparqlConstruct.jsp
+++ b/webapp/src/main/webapp/jenaIngest/sparqlConstruct.jsp
@@ -64,7 +64,7 @@
                   jenaOntModel.leaveCriticalSection();
 	      }
         %>
-</select> 
+</select>
 
 <textarea rows="25" cols="40" name="sparqlQueryStr" class="maxWidth"><c:choose>
     <c:when test="${param.sparqlQueryStr != null}">
@@ -85,7 +85,7 @@ if(prefixes != null){
 		String prefixText = (String) prefixItr.next();
 		if(prefixText.equals("(not yet specified)")){
 			count++;
-			prefixText = "p." + count.toString();		
+			prefixText = "p." + count.toString();
 		}
 		String urlText = (String) prefixItr.next();%>
 PREFIX <%=prefixText%>: <<%=urlText%>><%}}%>
@@ -138,7 +138,7 @@ PREFIX <%=prefixText%>: <<%=urlText%>><%}}%>
 		checked="checked" <%
                         }
                     %> /><%=modelName%></li>
-	<%    
+	<%
     }
 %>
 </ul>
@@ -171,8 +171,8 @@ PREFIX <%=prefixText%>: <<%=urlText%>><%}}%>
 		selected="selected" <%
                  }
                 %> /><%=modelName%></option>
-	<%    
+	<%
     }
 %>
-</select> 
+</select>
 <input id="submit" type="submit" value="Execute CONSTRUCT" />
diff --git a/webapp/src/main/webapp/jenaIngest/splitPropertyValues.jsp b/webapp/src/main/webapp/jenaIngest/splitPropertyValues.jsp
index 8035e9a1f..292ec57db 100644
--- a/webapp/src/main/webapp/jenaIngest/splitPropertyValues.jsp
+++ b/webapp/src/main/webapp/jenaIngest/splitPropertyValues.jsp
@@ -27,22 +27,22 @@
           </c:forEach>
     </ul>
 
-	
+
 	<input type="text" name="propertyURI"/>
-    <p>Property URI for which Values Should Be Split</p>	
+    <p>Property URI for which Values Should Be Split</p>
 
 	<input type="text" name="splitRegex"/>
     <p>Regex Pattern on which To Split</p>
-	
+
 	<input type="text" name="newPropertyURI"/>
     <p>Property URI To Be Used with the Newly-Split Values</p>
-	
+
 	<h3></h3>
-	
+
 	<p>
 	<input type="checkbox" name="trim" value="true"/> trim bordering whitespace
 	</p>
-	
+
     <h3>Select Destination Model</h3>
 
     <select name="destinationModelName">
diff --git a/webapp/src/main/webapp/jenaIngest/workflowStep.jsp b/webapp/src/main/webapp/jenaIngest/workflowStep.jsp
index 69807ffa0..8f1201b84 100644
--- a/webapp/src/main/webapp/jenaIngest/workflowStep.jsp
+++ b/webapp/src/main/webapp/jenaIngest/workflowStep.jsp
@@ -20,11 +20,11 @@
         <input type="hidden" name="action" value="executeWorkflow"/>
 
     <h3>Choose a Workflow Step at Which To Start</h3>
-   
+
         <input type="hidden" name="workflowURI" value="${param.workflowURI}"/>
 
 		<select name="workflowStepURI">
-             
+
         <%
               OntModel jenaOntModel = ModelAccess.on(getServletContext()).getOntModel();
               jenaOntModel.enterCriticalSection(Lock.READ);
@@ -42,5 +42,5 @@
 	      }
         %>
         </select>
-  
+
     <input id="submit" type="submit" value="Execute Workflow"/>
diff --git a/webapp/src/main/webapp/jenaIngest/xmlFileUpload.jsp b/webapp/src/main/webapp/jenaIngest/xmlFileUpload.jsp
index 34111da23..61e24c8da 100644
--- a/webapp/src/main/webapp/jenaIngest/xmlFileUpload.jsp
+++ b/webapp/src/main/webapp/jenaIngest/xmlFileUpload.jsp
@@ -13,11 +13,11 @@
     <h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Load XML and convert to RDF</h2>
 
     <form action="jenaXmlFileUpload" method="post" enctype="multipart/form-data">
-    
+
     <input type="file" name="xmlfile"/>
 
     <p>XML file</p>
-    
+
 	<select name="targetModel">
         <option value="vitro:baseOntModel">webapp assertions</option>
         <c:forEach var="modelName" items="${modelNames}">
@@ -29,4 +29,4 @@
 
         <input id="submit" type="submit" name="submit" value="upload XML and convert to RDF"/>
     </form>
-    
+
diff --git a/webapp/src/main/webapp/js/account/accountAssociateProfile.js b/webapp/src/main/webapp/js/account/accountAssociateProfile.js
index 383dd646b..ec8a4dd74 100644
--- a/webapp/src/main/webapp/js/account/accountAssociateProfile.js
+++ b/webapp/src/main/webapp/js/account/accountAssociateProfile.js
@@ -4,17 +4,17 @@ var associateProfileFields = {
     onLoad: function() {
         if (this.disableFormInUnsupportedBrowsers()) {
             return;
-        }        
+        }
 
         this.mixIn();
-        this.initObjectReferences();                 
+        this.initObjectReferences();
         this.bindEventListeners();
-        this.setInitialState();       
+        this.setInitialState();
     },
 
-    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()) {
@@ -22,17 +22,17 @@ var associateProfileFields = {
                 $('.noIE67').hide();
                 return true;
             }
-        }            
-        return false;      
+        }
+        return false;
     },
 
     mixIn: function() {
         $.extend(this, associateProfileFieldsData);
     },
-    
+
     initObjectReferences: function() {
         this.form = $('#userAccountForm');
-        
+
         // The external auth ID field and messages
         this.externalAuthIdField = $('#externalAuthId');
         this.externalAuthIdInUseMessage = $('#externalAuthIdInUse');
@@ -43,12 +43,12 @@ var associateProfileFields = {
         this.verifyAssociatedProfileLink = $('#verifyProfileLink');
         this.changeAssociatedProfileLink = $('#changeProfileLink');
         this.associatedProfileUriField = $('#associatedProfileUri')
-        
+
         // We want to associate a profile
         this.associationOptionsArea = $('#associationOptions');
         this.associateProfileNameField = $('#associateProfileName');
         this.newProfileClassSelector = $('#newProfileClassUri');
-        
+
         // Container <div> elements to provide background shading -- tlw72
         this.associateProfileBackgroundOneArea = $('#associateProfileBackgroundOne');
     },
@@ -57,32 +57,32 @@ var associateProfileFields = {
         this.idCache = {};
         this.externalAuthIdField.change(function() {
             associateProfileFields.externalAuthIdFieldHasChanged();
-        }); 
+        });
         this.externalAuthIdField.keyup(function() {
             associateProfileFields.externalAuthIdFieldHasChanged();
-        }); 
+        });
         this.externalAuthIdField.bind("propertychange", function() {
             associateProfileFields.externalAuthIdFieldHasChanged();
-        });  
+        });
         this.externalAuthIdField.bind("input", function() {
             associateProfileFields.externalAuthIdFieldHasChanged();
         });
-              
+
         this.verifyAssociatedProfileLink.click(function() {
             associateProfileFields.openVerifyWindow();
             return false;
-        });   
-        
+        });
+
         this.changeAssociatedProfileLink.click(function() {
             associateProfileFields.showAssociatingOptionsArea();
             return false;
-        });   
-        
+        });
+
         this.newProfileClassSelector.change(function() {
             associateProfileFields.newProfileClassHasChanged();
         });
-        
-        this.acCache = {};  
+
+        this.acCache = {};
         this.associateProfileNameField.autocomplete({
             minLength: 3,
             source: function(request, response) {
@@ -97,22 +97,22 @@ var associateProfileFields = {
                         action: "autoCompleteProfile",
                         term: request.term,
                         externalAuthId: associateProfileFields.externalAuthIdField.val()
-                    }, 
+                    },
                     complete: function(xhr, status) {
                         var results = jQuery.parseJSON(xhr.responseText);
-                        associateProfileFields.acCache[request.term] = results;  
+                        associateProfileFields.acCache[request.term] = results;
                         response(results);
                     }
                 });
             },
             select: function(event, ui) {
-                associateProfileFields.showAssociatedProfileArea(ui.item.label, ui.item.uri, ui.item.url); 
+                associateProfileFields.showAssociatedProfileArea(ui.item.label, ui.item.uri, ui.item.url);
             }
         });
 
-        
+
     },
-    
+
     setInitialState: function() {
         if (this.externalAuthIdField.val().length == 0) {
             this.hideAllOptionals();
@@ -122,15 +122,15 @@ var associateProfileFields = {
             this.showAssociatingOptionsArea();
         }
     },
-    
+
     externalAuthIdFieldHasChanged: function() {
         var externalAuthId = this.externalAuthIdField.val();
-        
+
         if (externalAuthId.length == 0) {
             this.hideAllOptionals();
             return;
         }
-        
+
         if (externalAuthId in this.idCache) {
             var results = this.idCache[externalAuthId];
             this.applyAjaxResultsForExternalAuthIdField(results)
@@ -147,7 +147,7 @@ var associateProfileFields = {
             },
             complete: function(xhr, status) {
                 var results = $.parseJSON(xhr.responseText);
-                associateProfileFields.idCache[externalAuthId] = results;  
+                associateProfileFields.idCache[externalAuthId] = results;
                 associateProfileFields.applyAjaxResultsForExternalAuthIdField(results);
             }
         });
@@ -162,11 +162,11 @@ var associateProfileFields = {
             this.showAssociatingOptionsArea();
         }
     },
-        
+
     openVerifyWindow: function() {
         window.open(this.verifyUrl, 'verifyMatchWindow', 'width=640,height=640,scrollbars=yes,resizable=yes,status=yes,toolbar=no,menubar=no,location=no');
     },
-    
+
     newProfileClassHasChanged: function() {
         if (this.newProfileClassSelector.val().length == 0) {
             this.associateProfileNameField.attr("disabled",false);
@@ -175,24 +175,24 @@ var associateProfileFields = {
             this.associateProfileNameField.attr("disabled","disabled");
         }
     },
-    
+
     hideAllOptionals: function() {
         this.hideExternalAuthInUseMessage();
         this.hideAssociatedProfileArea();
         this.hideAssociatingOptionsArea();
     },
-    
+
     hideExternalAuthInUseMessage: function() {
         this.externalAuthIdInUseMessage.hide();
     },
-    
+
     hideAssociatedProfileArea: function() {
         this.associatedArea.hide();
         this.associateProfileBackgroundOneArea.css("background-color","#fff");
         this.associateProfileBackgroundOneArea.css("border","none");
         this.associatedProfileUriField.val('');
     },
-    
+
     hideAssociatingOptionsArea: function() {
         this.associationOptionsArea.hide();
         this.associateProfileBackgroundOneArea.css("background-color","#fff");
@@ -200,14 +200,14 @@ var associateProfileFields = {
         this.associateProfileNameField.val('');
         this.newProfileClassSelector.get(0).selectedIndex = 0;
     },
-    
+
     showExternalAuthInUseMessage: function() {
         this.hideAssociatedProfileArea();
         this.hideAssociatingOptionsArea();
 
         this.externalAuthIdInUseMessage.show();
     },
-    
+
     showAssociatedProfileArea: function(name, uri, url) {
         this.hideExternalAuthInUseMessage();
         this.hideAssociatingOptionsArea();
@@ -221,7 +221,7 @@ var associateProfileFields = {
             this.associateProfileBackgroundOneArea.css("border","1px solid #ccc");
         }
     },
-    
+
     showAssociatingOptionsArea: function() {
         this.hideExternalAuthInUseMessage();
         this.hideAssociatedProfileArea();
@@ -233,10 +233,10 @@ var associateProfileFields = {
             this.associateProfileBackgroundOneArea.css("border","1px solid #ccc");
         }
     }
-    
+
 }
- 
-$(document).ready(function() {   
+
+$(document).ready(function() {
     associateProfileFields.onLoad();
-}); 
-        
+});
+
diff --git a/webapp/src/main/webapp/js/account/accountExternalAuthFlag.js b/webapp/src/main/webapp/js/account/accountExternalAuthFlag.js
index 2df24211c..a450284b5 100644
--- a/webapp/src/main/webapp/js/account/accountExternalAuthFlag.js
+++ b/webapp/src/main/webapp/js/account/accountExternalAuthFlag.js
@@ -1,7 +1,7 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
-  
+
 // Change form actions in account main page
-    
+
 $(document).ready(function(){
 
     // The externalAuthOnly checkbox drives the display of the password and re-set
@@ -15,7 +15,7 @@ $(document).ready(function(){
             $('input[name=confirmPassword]').val("");
             $('input[name=initialPassword]').val("");
             $('input[name=newPassword]').val("");
-         } 
+         }
          else {
          // if not checked, display them
             $('#passwordContainer').removeClass('hidden');
@@ -23,4 +23,4 @@ $(document).ready(function(){
          }
     });
 
-});
\ No newline at end of file
+});
diff --git a/webapp/src/main/webapp/js/account/accountListenerSetup.js b/webapp/src/main/webapp/js/account/accountListenerSetup.js
index d6b436bf2..5b88e0508 100644
--- a/webapp/src/main/webapp/js/account/accountListenerSetup.js
+++ b/webapp/src/main/webapp/js/account/accountListenerSetup.js
@@ -1,17 +1,17 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
-  
+
 // Sets up event listeners so that the submit button gets enabled only if the user has changed
 // an existing value.
 //
 // Used with both the userAccounts--myAccounts.ftl and userAccounts--edit.ftl.
-    
+
 $(document).ready(function(){
 
     var theForm = $('form').last();
     var theSubmitButton = theForm.find(':submit');
 
     theSubmitButton.addClass("disabledSubmit");
-    
+
     function disableSubmit() {
         theSubmitButton.removeAttr('disabled');
         theSubmitButton.removeClass("disabledSubmit");
@@ -35,7 +35,7 @@ $(document).ready(function(){
             disableSubmit()
         });
     });
-    
+
     $('.remove-proxy').click(function(){
         disableSubmit()
     })
diff --git a/webapp/src/main/webapp/js/account/accountProxyCommon.js b/webapp/src/main/webapp/js/account/accountProxyCommon.js
index bf8128c7c..a92d0cd77 100644
--- a/webapp/src/main/webapp/js/account/accountProxyCommon.js
+++ b/webapp/src/main/webapp/js/account/accountProxyCommon.js
@@ -4,32 +4,32 @@
  * A collection of building blocks for the proxy-management UI.
  */
 
-/* 
+/*
  * ----------------------------------------------------------------------------
  * itemElement
  * ----------------------------------------------------------------------------
- * Display information about an entity according to the template. The entity 
+ * Display information about an entity according to the template. The entity
  * can be either:
  *    a profile -- Individual to be edited.
- *    a proxy   -- User Account to do the editing, optionally with info from a 
+ *    a proxy   -- User Account to do the editing, optionally with info from a
  *                   profile associated with that individual.
- * 
+ *
  * You provide:
- *   template -- the HTML text that determines how the element should look. 
+ *   template -- the HTML text that determines how the element should look.
  *             The template must be a single HTML element, which may contain
  *             any number of sub-elements. It needs to have a single outer
  *             wrapper, however.
  *   uri, label, classLabel, imageUrl -- as described below
- *   remove -- a function that we can call when the user clicks on the remove 
+ *   remove -- a function that we can call when the user clicks on the remove
  *             link or button. We will pass a reference to this struct.
  * ----------------------------------------------------------------------------
  * The template must inlude a link or button with attribute templatePart="remove"
- * 
+ *
  * The template may include tokens to be replaced, from the following:
- *    %uri% -- the URI of the individual being displayed 
+ *    %uri% -- the URI of the individual being displayed
  *    %label& -- the label of the individual.
  *    %classLabel% -- the label of the most specific class of the individual.
- *    %imageUrl% -- the URL that will fetch the image of the individual, 
+ *    %imageUrl% -- the URL that will fetch the image of the individual,
  *                  or a placeholder image.
  * ----------------------------------------------------------------------------
  * This relies on magic names for the styles:
@@ -40,13 +40,13 @@
  */
 function itemElement(template, uri, label, classLabel, imageUrl, removeInfo) {
 	var self = this;
-	
+
 	this.uri = uri;
 	this.label = label;
 	this.classLabel = classLabel;
 	this.imageUrl = imageUrl;
 	this.removeInfo = removeInfo;
-	
+
 	this.toString = function() {
 		return "itemElement: " + content;
 	}
@@ -56,7 +56,7 @@ function itemElement(template, uri, label, classLabel, imageUrl, removeInfo) {
 				              .replace(/%label%/g, this.label)
 				              .replace(/%classLabel%/g, this.classLabel)
 				              .replace(/%imageUrl%/g, this.imageUrl);
-		
+
 		var element = $(content);
 		element.addClass("proxyInfoElement");
 
@@ -71,23 +71,23 @@ function itemElement(template, uri, label, classLabel, imageUrl, removeInfo) {
 }
 
 
-/* 
+/*
  * ----------------------------------------------------------------------------
  * proxyAutoComplete
  * ----------------------------------------------------------------------------
- * Attach the autocomplete funcionality that we like in proxy panels. 
- * 
+ * Attach the autocomplete funcionality that we like in proxy panels.
+ *
  * You provide:
  *   parms -- a map containing the URL and the action code needed for the AJAX call.
  *   excludedUris -- these URIs are always filtered out of the results.
  *   getProxyInfos -- a function that will return an array of itemElements
- *   	    that are already present in the list and so should be filtered out of 
+ *   	    that are already present in the list and so should be filtered out of
  *          the autocomplete response.
  *   addProxyInfo -- a function that we can call when an item is selected.
- *          It will take the selection info, build an itemElement, and add 
+ *          It will take the selection info, build an itemElement, and add
  *          it to the panel.
  *   reportSearchStatus -- a function that we can call when a search is done. It
- *          will accept the length of the search term and the number of results, 
+ *          will accept the length of the search term and the number of results,
  *          and will display it in some way.
  * ----------------------------------------------------------------------------
  * The AJAX request will include a "term" parameter, set to the current search term.
@@ -101,7 +101,7 @@ function itemElement(template, uri, label, classLabel, imageUrl, removeInfo) {
  */
 function proxyAutocomplete(parms, excludedUris, getProxyInfos, addProxyInfo, reportSearchStatus) {
 	var cache = [];
-	
+
 	var filterResults = function(parsed) {
 		var filtered = [];
 		var existingUris = $.map(getProxyInfos(), function(p) {
@@ -122,12 +122,12 @@ function proxyAutocomplete(parms, excludedUris, getProxyInfos, addProxyInfo, rep
 	}
 
     this.minLength = 0,
-    
+
     this.source = function(request, response) {
     	if (request.term.length < 3) {
     		sendResponse(request, response, []);
     		return;
-    	} 
+    	}
         if (request.term in cache) {
         	sendResponse(request, response, filterResults(cache[request.term]));
             return;
@@ -141,12 +141,12 @@ function proxyAutocomplete(parms, excludedUris, getProxyInfos, addProxyInfo, rep
             },
             complete: function(xhr, status) {
                 var results = $.parseJSON(xhr.responseText);
-                cache[request.term] = results; 
+                cache[request.term] = results;
                 sendResponse(request, response, filterResults(results));
             }
         });
     }
-    
+
     this.select = function(event, ui) {
     	addProxyInfo(ui.item);
         event.preventDefault();
diff --git a/webapp/src/main/webapp/js/account/accountProxyItemsPanel.js b/webapp/src/main/webapp/js/account/accountProxyItemsPanel.js
index 2c733f092..b1ae3cc47 100644
--- a/webapp/src/main/webapp/js/account/accountProxyItemsPanel.js
+++ b/webapp/src/main/webapp/js/account/accountProxyItemsPanel.js
@@ -4,18 +4,18 @@
  * ----------------------------------------------------------------------------
  * proxyItemsPanel
  * ----------------------------------------------------------------------------
- * Display an AJAX-enabled list of proxy-related items (either proxies or 
- * profiles). 
- * 
- * The list may start out with a population of items. items may be added by 
+ * Display an AJAX-enabled list of proxy-related items (either proxies or
+ * profiles).
+ *
+ * The list may start out with a population of items. items may be added by
  * selecting them in the auto-complete box. Items may be removed by clicking
  * the "remove" link next to that item.
- * 
+ *
  * A hidden field will hold the URI for each item, so when the form is submitted,
  * the controller can determine the list of items.
  * ----------------------------------------------------------------------------
  * You provide:
- *   p -- the DOM element that contains the template and the data. 
+ *   p -- the DOM element that contains the template and the data.
  *         It also contains the autocomplete field, with a status element and
  *         perhaps 1 or more excluded URIs
  * ----------------------------------------------------------------------------
@@ -43,14 +43,14 @@ function proxyItemsPanel(panel, contextInfo)  {
 
 	this.displayItemData = function() {
 		$(".proxyInfoElement", dataContainerElement).remove();
-		
+
 		for (i = 0; i < self.itemData.length; i++) {
 			self.itemData[i].element().appendTo(dataContainerElement);
 		}
 	}
 
 	var getItemData = function() {
-		return self.itemData;	
+		return self.itemData;
 	}
 
 	this.removeItem = function(info) {
@@ -65,7 +65,7 @@ function proxyItemsPanel(panel, contextInfo)  {
 	}
 
 	this.addItemData = function(selection) {
-		var info = new itemElement(self.templateHtml, selection.uri, selection.label, 
+		var info = new itemElement(self.templateHtml, selection.uri, selection.label,
 				selection.classLabel, selection.imageUrl, self.removeItem);
         self.itemData.unshift(info);
         self.displayItemData();
@@ -95,7 +95,7 @@ function proxyItemsPanel(panel, contextInfo)  {
 	        }
 	    });
 	}
-	
+
 	var parseOriginalData = function() {
 		var dataDivs = $("div[name='data']", dataContainerElement)
 		var data = [];
@@ -175,7 +175,7 @@ $(document).ready(function() {
 		}
 		this["proxyItemsPanel"] = new proxyItemsPanel(this, context);
 	});
-	
+
 	$("section[name='proxyProxiesPanel']").each(function(i) {
 		var context = {
 			baseUrl: proxyContextInfo.baseUrl,
@@ -185,32 +185,32 @@ $(document).ready(function() {
 		}
 		this["proxyItemsPanel"] = new proxyItemsPanel(this, context);
 	});
-	
+
 	//Add progress indicator for autocomplete input fields
-	
+
 	var progressImage;
-	
+
 	$('#addProfileEditor').click(function(event){
         progressImage = $(event.target).closest("section").find(".loading-profileMyAccoount")
     });
-    
+
     $('#selectProfileEditors').click(function(event){
         progressImage = $(event.target).closest("section").find(".loading-relateEditor")
     });
-    
+
     $('#selectProfiles').click(function(event){
         progressImage = $(event.target).closest("section").find(".loading-relateProfile")
     });
-    
+
     $('#addProfile').click(function(event){
         progressImage = $(event.target).closest("section").find(".loading-addProfile")
     });
-    
-    
+
+
     $(document).ajaxStart(function(){
       progressImage.removeClass('hidden').css('display', 'inline-block');
     });
-    
+
     $(document).ajaxStop(function(){
       progressImage.hide().addClass('hidden');
     });
diff --git a/webapp/src/main/webapp/js/account/accountUtils.js b/webapp/src/main/webapp/js/account/accountUtils.js
index c84e44a1f..fe11902e4 100644
--- a/webapp/src/main/webapp/js/account/accountUtils.js
+++ b/webapp/src/main/webapp/js/account/accountUtils.js
@@ -1,13 +1,13 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
-  
+
 // Change form actions in account main page
 function changeAction(form, url) {
     form.action = url;
     return true;
-} 
-    
+}
+
 $(document).ready(function(){
-    
+
     // If filtering by role, make sure the role is included as a parameter (1) when the
     // page count changes or (2) when the next or previous links are clicked.
     if ( $('#roleFilterUri').val().length > 0 ) {
@@ -25,7 +25,7 @@ $(document).ready(function(){
     //Accounts per page
     //Hide if javascript is enabled
     $('input[name="accounts-per-page"]').addClass('hidden');
-    
+
     $('.accounts-per-page').change(function() {
         // ensure both accounts-per-page select elements are
         // set to the same value before submitting
@@ -33,26 +33,26 @@ $(document).ready(function(){
         $('.accounts-per-page').val(selectedValue);
         $('#account-display').submit();
     });
-    
+
     //Delete accounts
     //Show is javascript is enabled
     $('input:checkbox[name=delete-all]').removeClass('hidden');
-    
+
     $('input:checkbox[name=delete-all]').click(function(){
          if ( this.checked ) {
          // if checked, select all the checkboxes
          $('input:checkbox[name=deleteAccount]').prop('checked','checked');
-            
+
          } else {
          // if not checked, deselect all the checkboxes
            $('input:checkbox[name=deleteAccount]').prop('checked', null);
          }
     });
-    
+
     $('input:checkbox[name=deleteAccount]').click(function(){
         $('input:checkbox[name=delete-all]').prop('checked', null);
     });
-      
+
     // Confirmation alert for account deletion in userAccounts-list.ftl template
     $('input[name="delete-account"]').click(function(){
         var countAccount = $('input:checkbox[name=deleteAccount]:checked').length;
@@ -63,7 +63,7 @@ $(document).ready(function(){
             return answer;
         }
     });
-    
+
     //Select role and filter
     $('#roleFilterUri').bind('change', function () {
         var url = $(this).val(); // get selected value
@@ -72,4 +72,4 @@ $(document).ready(function(){
         }
         return false;
     });
-});
\ No newline at end of file
+});
diff --git a/webapp/src/main/webapp/js/account/proxyUtils.js b/webapp/src/main/webapp/js/account/proxyUtils.js
index 4e831d174..e19b8556e 100644
--- a/webapp/src/main/webapp/js/account/proxyUtils.js
+++ b/webapp/src/main/webapp/js/account/proxyUtils.js
@@ -1,5 +1,5 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
-    
+
 $(document).ready(function(){
     // Get the i18n variables from the template
     $.extend(this, i18nStrings);
@@ -8,7 +8,7 @@ $(document).ready(function(){
         $(this).val('');
         $("span[name='proxySelectorSearchStatus']").text('')
     });
-    
+
     //Alert when user doesn't select an editor and a profile after submitting from for relating proxy-profiles
     $('input[name="createRelationship"]').click(function(){
         var $proxyUri = $('#add-relation input[name="proxyUri"]').val();
@@ -16,16 +16,16 @@ $(document).ready(function(){
 
        if ($proxyUri == undefined || $profileUri == undefined){
            $('#error-alert').removeClass('hidden');
-           
+
            var $errorAlert = $('#error-alert p').html();
-           
+
            if ($errorAlert !=""){
                return false;
            }else{
                $('#error-alert p').append(i18nStrings.selectEditorAndProfile);
                return false;
            }
-       }     
+       }
     });
 });
 
diff --git a/webapp/src/main/webapp/js/amplify/amplify.store.min.js b/webapp/src/main/webapp/js/amplify/amplify.store.min.js
index 7bd55c9bf..363d0862a 100644
--- a/webapp/src/main/webapp/js/amplify/amplify.store.min.js
+++ b/webapp/src/main/webapp/js/amplify/amplify.store.min.js
@@ -1,10 +1,10 @@
 /*!
  * Amplify Store - Persistent Client-Side Storage 1.1.0
- * 
+ *
  * Copyright 2011 appendTo LLC. (http://appendto.com/team)
  * Dual licensed under the MIT or GPL licenses.
  * http://appendto.com/open-source-licenses
- * 
+ *
  * http://amplifyjs.com
  */
-(function(a,b){function e(a,e){c.addType(a,function(f,g,h){var i,j,k,l,m=g,n=(new Date).getTime();if(!f){m={},l=[],k=0;try{f=e.length;while(f=e.key(k++))d.test(f)&&(j=JSON.parse(e.getItem(f)),j.expires&&j.expires<=n?l.push(f):m[f.replace(d,"")]=j.data);while(f=l.pop())e.removeItem(f)}catch(o){}return m}f="__amplify__"+f;if(g===b){i=e.getItem(f),j=i?JSON.parse(i):{expires:-1};if(j.expires&&j.expires<=n)e.removeItem(f);else return j.data}else if(g===null)e.removeItem(f);else{j=JSON.stringify({data:g,expires:h.expires?n+h.expires:null});try{e.setItem(f,j)}catch(o){c[a]();try{e.setItem(f,j)}catch(o){throw c.error()}}}return m})}var c=a.store=function(a,b,d,e){var e=c.type;d&&d.type&&d.type in c.types&&(e=d.type);return c.types[e](a,b,d||{})};c.types={},c.type=null,c.addType=function(a,b){c.type||(c.type=a),c.types[a]=b,c[a]=function(b,d,e){e=e||{},e.type=a;return c(b,d,e)}},c.error=function(){return"amplify.store quota exceeded"};var d=/^__amplify__/;for(var f in{localStorage:1,sessionStorage:1})try{window[f].getItem&&e(f,window[f])}catch(g){}if(window.globalStorage)try{e("globalStorage",window.globalStorage[window.location.hostname]),c.type==="sessionStorage"&&(c.type="globalStorage")}catch(g){}(function(){if(!c.types.localStorage){var a=document.createElement("div"),d="amplify";a.style.display="none",document.getElementsByTagName("head")[0].appendChild(a);try{a.addBehavior("#default#userdata"),a.load(d)}catch(e){a.parentNode.removeChild(a);return}c.addType("userData",function(e,f,g){a.load(d);var h,i,j,k,l,m=f,n=(new Date).getTime();if(!e){m={},l=[],k=0;while(h=a.XMLDocument.documentElement.attributes[k++])i=JSON.parse(h.value),i.expires&&i.expires<=n?l.push(h.name):m[h.name]=i.data;while(e=l.pop())a.removeAttribute(e);a.save(d);return m}e=e.replace(/[^-._0-9A-Za-z\xb7\xc0-\xd6\xd8-\xf6\xf8-\u037d\u37f-\u1fff\u200c-\u200d\u203f\u2040\u2070-\u218f]/g,"-");if(f===b){h=a.getAttribute(e),i=h?JSON.parse(h):{expires:-1};if(i.expires&&i.expires<=n)a.removeAttribute(e);else return i.data}else f===null?a.removeAttribute(e):(j=a.getAttribute(e),i=JSON.stringify({data:f,expires:g.expires?n+g.expires:null}),a.setAttribute(e,i));try{a.save(d)}catch(o){j===null?a.removeAttribute(e):a.setAttribute(e,j),c.userData();try{a.setAttribute(e,i),a.save(d)}catch(o){j===null?a.removeAttribute(e):a.setAttribute(e,j);throw c.error()}}return m})}})(),function(){function e(a){return a===b?b:JSON.parse(JSON.stringify(a))}var a={},d={};c.addType("memory",function(c,f,g){if(!c)return e(a);if(f===b)return e(a[c]);d[c]&&(clearTimeout(d[c]),delete d[c]);if(f===null){delete a[c];return null}a[c]=f,g.expires&&(d[c]=setTimeout(function(){delete a[c],delete d[c]},g.expires));return f})}()})(this.amplify=this.amplify||{})
\ No newline at end of file
+(function(a,b){function e(a,e){c.addType(a,function(f,g,h){var i,j,k,l,m=g,n=(new Date).getTime();if(!f){m={},l=[],k=0;try{f=e.length;while(f=e.key(k++))d.test(f)&&(j=JSON.parse(e.getItem(f)),j.expires&&j.expires<=n?l.push(f):m[f.replace(d,"")]=j.data);while(f=l.pop())e.removeItem(f)}catch(o){}return m}f="__amplify__"+f;if(g===b){i=e.getItem(f),j=i?JSON.parse(i):{expires:-1};if(j.expires&&j.expires<=n)e.removeItem(f);else return j.data}else if(g===null)e.removeItem(f);else{j=JSON.stringify({data:g,expires:h.expires?n+h.expires:null});try{e.setItem(f,j)}catch(o){c[a]();try{e.setItem(f,j)}catch(o){throw c.error()}}}return m})}var c=a.store=function(a,b,d,e){var e=c.type;d&&d.type&&d.type in c.types&&(e=d.type);return c.types[e](a,b,d||{})};c.types={},c.type=null,c.addType=function(a,b){c.type||(c.type=a),c.types[a]=b,c[a]=function(b,d,e){e=e||{},e.type=a;return c(b,d,e)}},c.error=function(){return"amplify.store quota exceeded"};var d=/^__amplify__/;for(var f in{localStorage:1,sessionStorage:1})try{window[f].getItem&&e(f,window[f])}catch(g){}if(window.globalStorage)try{e("globalStorage",window.globalStorage[window.location.hostname]),c.type==="sessionStorage"&&(c.type="globalStorage")}catch(g){}(function(){if(!c.types.localStorage){var a=document.createElement("div"),d="amplify";a.style.display="none",document.getElementsByTagName("head")[0].appendChild(a);try{a.addBehavior("#default#userdata"),a.load(d)}catch(e){a.parentNode.removeChild(a);return}c.addType("userData",function(e,f,g){a.load(d);var h,i,j,k,l,m=f,n=(new Date).getTime();if(!e){m={},l=[],k=0;while(h=a.XMLDocument.documentElement.attributes[k++])i=JSON.parse(h.value),i.expires&&i.expires<=n?l.push(h.name):m[h.name]=i.data;while(e=l.pop())a.removeAttribute(e);a.save(d);return m}e=e.replace(/[^-._0-9A-Za-z\xb7\xc0-\xd6\xd8-\xf6\xf8-\u037d\u37f-\u1fff\u200c-\u200d\u203f\u2040\u2070-\u218f]/g,"-");if(f===b){h=a.getAttribute(e),i=h?JSON.parse(h):{expires:-1};if(i.expires&&i.expires<=n)a.removeAttribute(e);else return i.data}else f===null?a.removeAttribute(e):(j=a.getAttribute(e),i=JSON.stringify({data:f,expires:g.expires?n+g.expires:null}),a.setAttribute(e,i));try{a.save(d)}catch(o){j===null?a.removeAttribute(e):a.setAttribute(e,j),c.userData();try{a.setAttribute(e,i),a.save(d)}catch(o){j===null?a.removeAttribute(e):a.setAttribute(e,j);throw c.error()}}return m})}})(),function(){function e(a){return a===b?b:JSON.parse(JSON.stringify(a))}var a={},d={};c.addType("memory",function(c,f,g){if(!c)return e(a);if(f===b)return e(a[c]);d[c]&&(clearTimeout(d[c]),delete d[c]);if(f===null){delete a[c];return null}a[c]=f,g.expires&&(d[c]=setTimeout(function(){delete a[c],delete d[c]},g.expires));return f})}()})(this.amplify=this.amplify||{})
diff --git a/webapp/src/main/webapp/js/betterDateInput.js b/webapp/src/main/webapp/js/betterDateInput.js
index 22dde0fcd..6dd01de08 100644
--- a/webapp/src/main/webapp/js/betterDateInput.js
+++ b/webapp/src/main/webapp/js/betterDateInput.js
@@ -3,7 +3,7 @@
 
    example of usage:
    <form action="" method="get"><div>
-   <input type="text" size="10" id="dateField" onblur="magicDate(this)" 
+   <input type="text" size="10" id="dateField" onblur="magicDate(this)"
           onfocus="if (this.className != 'error') this.select()">
    <div id="dateFieldMsg">mm/dd/yyyy</div>
    </div></form>
@@ -36,7 +36,7 @@ var weekdayNames = "Sunday Monday Tuesday Wednesday Thursday Friday Saturday".sp
    an error if 0 or more than 1 matches
 */
 function parseMonth(month) {
-    var matches = monthNames.filter(function(item) { 
+    var matches = monthNames.filter(function(item) {
         return new RegExp("^" + month, "i").test(item);
     });
     if (matches.length == 0) {
@@ -61,22 +61,22 @@ function parseWeekday(weekday) {
     return weekdayNames.indexOf(matches[0]);
 }
 
-/* Array of objects, each has 're', a regular expression and 'handler', a 
-   function for creating a date from something that matches the regular 
-   expression. Handlers may throw errors if string is unparseable. 
+/* Array of objects, each has 're', a regular expression and 'handler', a
+   function for creating a date from something that matches the regular
+   expression. Handlers may throw errors if string is unparseable.
 */
 var dateParsePatterns = [
     // Today
     {   re: /^tod/i,
-        handler: function() { 
+        handler: function() {
             return new Date();
-        } 
+        }
     },
     // Tomorrow
     {   re: /^tom/i,
         handler: function() {
-            var d = new Date(); 
-            d.setDate(d.getDate() + 1); 
+            var d = new Date();
+            d.setDate(d.getDate() + 1);
             return d;
         }
     },
@@ -89,7 +89,7 @@ var dateParsePatterns = [
         }
     },
     // 4th
-    {   re: /^(\d{1,2})(st|nd|rd|th)?$/i, 
+    {   re: /^(\d{1,2})(st|nd|rd|th)?$/i,
         handler: function(bits) {
             var d = new Date();
             d.setDate(parseInt(bits[1], 10));
@@ -97,7 +97,7 @@ var dateParsePatterns = [
         }
     },
     // 4th Jan
-    {   re: /^(\d{1,2})(?:st|nd|rd|th)? (\w+)$/i, 
+    {   re: /^(\d{1,2})(?:st|nd|rd|th)? (\w+)$/i,
         handler: function(bits) {
             var d = new Date();
             d.setDate(parseInt(bits[1], 10));
@@ -116,7 +116,7 @@ var dateParsePatterns = [
         }
     },
     // Jan 4th
-    {   re: /^(\w+) (\d{1,2})(?:st|nd|rd|th)?$/i, 
+    {   re: /^(\w+) (\d{1,2})(?:st|nd|rd|th)?$/i,
         handler: function(bits) {
             var d = new Date();
             d.setDate(parseInt(bits[2], 10));
diff --git a/webapp/src/main/webapp/js/browseClassGroups.js b/webapp/src/main/webapp/js/browseClassGroups.js
index 96dfda2c7..295fef255 100644
--- a/webapp/src/main/webapp/js/browseClassGroups.js
+++ b/webapp/src/main/webapp/js/browseClassGroups.js
@@ -8,20 +8,20 @@ var browseClassGroups = {
         this.initObjects();
         this.bindEventListeners();
     },
-    
+
     // Add variables from browse template
     mergeFromTemplate: function() {
         $.extend(this, browseData);
         $.extend(this, i18nStrings);
     },
-    
+
     // Create references to frequently used elements for convenience
     initObjects: function() {
         this.vClassesInClassGroup = $('ul#classes-in-classgroup');
         this.browseClassGroupLinks = $('#browse-classgroups li a');
         this.browseClasses = $('#browse-classes');
     },
-    
+
     // Event listeners. Called on page load
     bindEventListeners: function() {
         // Listener for classGroup switching
@@ -31,7 +31,7 @@ var browseClassGroups = {
             browseClassGroups.getVClasses(uri, individualCount);
             return false;
         });
-        
+
         // Call the bar chart highlighter listener
         this.chartHighlighterListener();
     },
@@ -49,14 +49,14 @@ var browseClassGroups = {
             $('#visual-graph svg path').eq(classIndex).attr('fill', '#999');
         })
     },
-    
+
     // Load classes and chart for default class group as defined by template
     defaultClassGroup: function() {
         if ( this.defaultBrowseClassGroupURI != "false" ) {
             this.getVClasses(this.defaultBrowseClassGroupUri, this.defaultBrowseClassGroupCount);
         }
     },
-    
+
     // Where all the magic happens -- gonna fetch me some classes
     getVClasses: function(classgroupUri, classGroupIndivCount) {
         url = this.dataServiceUrl + encodeURIComponent(classgroupUri);
@@ -65,16 +65,16 @@ var browseClassGroups = {
         this.vClassesInClassGroup.empty();
         $('a.browse-superclass').remove();
         $('#visual-graph').empty();
-        
+
         var values = [],
             labels = [],
             uris = [],
             classList = [],
             populatedClasses = 0;
             potentialSuperClasses = [];
-        
+
         $.getJSON(url, function(results) {
-            
+
             $.each(results.classes, function(i, item) {
                 name = results.classes[i].name;
                 uri = results.classes[i].URI;
@@ -86,63 +86,63 @@ var browseClassGroups = {
                     if ( indivCount == classGroupIndivCount ) {
                         potentialSuperClasses.push(populatedClasses);
                     }
-                    
+
                     values.push(parseInt(indivCount, 10));
                     labels.push(name);
                     uris.push(uri);
-                    
+
                     // Build the content of each list item, piecing together each component
                     listItem = '<li role="listitem">';
-                    listItem += '<a href="'+ indexUrl +'" title="' + browseClassGroups.browseAllString + ' ' 
-                                + name + ' ' + browseClassGroups.contentString + '">'+ name +'</a>'; 
+                    listItem += '<a href="'+ indexUrl +'" title="' + browseClassGroups.browseAllString + ' '
+                                + name + ' ' + browseClassGroups.contentString + '">'+ name +'</a>';
                     listItem += '</li>';
-                    
+
                     // Add the list item to the array of classes
                     classList.push(listItem);
-                    
+
                     populatedClasses++;
                 }
             })
-            
+
             // Test for number of potential super classes. If only 1, then remove it from all arrays
             // But only do so if there are at least 2 classes in the list to begin with
             if ( classList.length > 1 && potentialSuperClasses.length == 1 ){
                 // Grab the URI of the super class before splicing
                 superClassUri = uris[potentialSuperClasses];
-                
+
                 values.splice(potentialSuperClasses, 1);
                 labels.splice(potentialSuperClasses, 1);
                 uris.splice(potentialSuperClasses, 1);
                 classList.splice(potentialSuperClasses, 1);
-                
+
                 browseAllUrl = browseClassGroups.baseUrl +'/individuallist?vclassId='+ encodeURIComponent(superClassUri);
-                browseAllLink = '<a class="browse-superclass" href="'+ browseAllUrl +'" title="' 
-                                + browseClassGroups.browseAllString + ' ' + results.classGroupName 
+                browseAllLink = '<a class="browse-superclass" href="'+ browseAllUrl +'" title="'
+                                + browseClassGroups.browseAllString + ' ' + results.classGroupName
                                 + '">' + browseClassGroups.browseAllString + ' &raquo;</a>';
                 browseClassGroups.browseClasses.prepend(browseAllLink);
             }
-            
+
             // Add the classes to the DOM
             $.each(classList, function(i, listItem) {
                 browseClassGroups.vClassesInClassGroup.append(listItem);
             })
-            
+
             // Set selected class group
             browseClassGroups.selectedClassGroup(results.classGroupUri);
-            
+
             // Update the graph
             graphClassGroups.barchart(values, labels, uris);
-            
+
             // Call the bar highlighter listener
             browseClassGroups.chartHighlighterListener();
         });
     },
-    
+
     // Toggle the active class group so it's clear which is selected
     selectedClassGroup: function(classGroupUri) {
         // Remove active class on all vClasses
         $('#browse-classgroups li a.selected').removeClass('selected');
-        
+
         // Add active class for requested vClass
         $('#browse-classgroups li a[data-uri="'+ classGroupUri +'"]').addClass('selected');
     }
@@ -152,12 +152,12 @@ var graphClassGroups = {
     // Build the bar chart using gRaphael
     barchart: function(values, labels, uris) {
         var height = values.length * 37;
-        
+
         // Create the canvas
         var r = Raphael("visual-graph", 225, height + 10);
-        
+
         var chart = r.g.hbarchart(0, 16, 225, height, [values], {type:"soft", singleColor:"#999"});
-        
+
         // Was unable to append <a> within <svg> -- was always hidden and couldn't get it to display
         // so using jQuery click to add links
         $('rect').click(function() {
@@ -166,17 +166,17 @@ var graphClassGroups = {
             var link = browseClassGroups.baseUrl + '/individuallist?vclassId=' + encodeURIComponent(uri);
             window.location = link;
         });
-        
+
         // Add title attributes to each <rect> in the bar chart
         $('rect').each(function() {
             var index = $('rect').index(this);
             var label = labels[index];
             var title = browseClassGroups.browseAllString + ' ' + label + ' ' + browseClassGroups.contentString;
-            
+
             // Add a title attribute
             $(this).attr('title', title);
         });
-        
+
         // On hover
         // 1. Change bar color
         // 2. Highlight class name in main list
@@ -199,4 +199,4 @@ var graphClassGroups = {
 $(document).ready(function() {
     browseClassGroups.onLoad();
     browseClassGroups.defaultClassGroup();
-});
\ No newline at end of file
+});
diff --git a/webapp/src/main/webapp/js/browserUtils.js b/webapp/src/main/webapp/js/browserUtils.js
index 60a192364..dfab34cce 100644
--- a/webapp/src/main/webapp/js/browserUtils.js
+++ b/webapp/src/main/webapp/js/browserUtils.js
@@ -4,12 +4,12 @@ var vitro;
 // vitro == null: true
 // vitro === null: false (only true if undefined)
 // typeof vitro == 'undefined': true
-if (!vitro) { 
+if (!vitro) {
     vitro = {};
 }
 
 vitro.browserUtils = {
-    
+
     isIELessThan8: function() {
         var version;
         if (navigator.appVersion.indexOf("MSIE") == -1) {
@@ -18,7 +18,7 @@ vitro.browserUtils = {
         else {
             version = parseFloat(navigator.appVersion.split("MSIE")[1]);
             return version < 8;
-        }    
+        }
     }
 };
 
diff --git a/webapp/src/main/webapp/js/commentForm.js b/webapp/src/main/webapp/js/commentForm.js
index bafb45258..e85b26bc4 100644
--- a/webapp/src/main/webapp/js/commentForm.js
+++ b/webapp/src/main/webapp/js/commentForm.js
@@ -10,7 +10,7 @@ function ValidateForm(formName) {
 
     // Check for Email formatting
     if (document.forms[formName].EmailFields) {
-        errorList = '\n' + i18nStrings.pleaseFormatEmail + '\n\n \"userid@institution.edu\" \n\n' 
+        errorList = '\n' + i18nStrings.pleaseFormatEmail + '\n\n \"userid@institution.edu\" \n\n'
                     + i18nStrings.enterValidAddress;
         // build array of required fields
         emailStr = document.forms[formName].EmailFields.value;
@@ -43,4 +43,4 @@ function ValidateForm(formName) {
     }
 
     return true;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/js/commentsForm.jsp b/webapp/src/main/webapp/js/commentsForm.jsp
index b9ffbf8e8..711d26e19 100644
--- a/webapp/src/main/webapp/js/commentsForm.jsp
+++ b/webapp/src/main/webapp/js/commentsForm.jsp
@@ -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$ --%>
 
 <%
     String contextPath = request.getContextPath();
diff --git a/webapp/src/main/webapp/js/customFormUtils.js b/webapp/src/main/webapp/js/customFormUtils.js
index 552d4c1c9..f60974bda 100644
--- a/webapp/src/main/webapp/js/customFormUtils.js
+++ b/webapp/src/main/webapp/js/customFormUtils.js
@@ -5,16 +5,16 @@ var vitro;
 // vitro == null: true
 // vitro === null: false (only true if undefined)
 // typeof vitro == 'undefined': true
-if (!vitro) { 
+if (!vitro) {
 	vitro = {};
 }
 
 vitro.customFormUtils = {
-		
+
 	hideForm: function() {
 		this.hideFields(this.form);
 	},
-	
+
 	clearFormData: function() {
 		this.clearFields(this.form);
 	},
@@ -26,7 +26,7 @@ vitro.customFormUtils = {
     	this.clearFields(el);
         el.hide();
     },
-    
+
     // Clear data from form elements in element el
     clearFields: function(el) {
     	el.find(':input[type!="hidden"][type!="submit"][type!="button"]').each(function() {
@@ -34,12 +34,12 @@ vitro.customFormUtils = {
             // Remove a validation error associated with this element.
             // For now we can remove the error elements. Later we may include them in
             // the markup, for customized positioning, in which case we will empty them
-            // but not remove them here. See findValidationErrors().  
+            // but not remove them here. See findValidationErrors().
             $('[id=' + $(this).attr('id') + '_validationError]').remove();
         });
-    	    
+
     },
-       
+
     // Return true iff there are validation errors on the form
     //Updating to include new functionality where errors are on top of page
     findValidationErrors: function() {
@@ -48,28 +48,28 @@ vitro.customFormUtils = {
     		return true;
     	}
         return this.form.find('.validationError').length > 0;
-    	
+
 // RY For now, we just need to look for the presence of the error elements.
 // Later, however, we may generate empty error messages in the markup, for
-// customized positioning, in which case we need to look for whether they have 
+// customized positioning, in which case we need to look for whether they have
 // content. See clearFormData().
 //    	var foundErrors = false,
 //    	    errors = this.form.find('.validationError'),
 //    	    numErrors = errors.length,
 //    	    i,
 //    	    error;
-//    	
+//
 //    	for (i = 0; foundErrors == false && i < numErrors; i++) {
 //    		error = errors[i];
 //    		if (error.html() != '') {
 //    			foundErrors = true;
 //    		}
 //    	}
-//    	
+//
 //    	return foundErrors;
     },
-    
+
     capitalize: function(word) {
         return word.substring(0, 1).toUpperCase() + word.substring(1);
     }
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/js/detect.js b/webapp/src/main/webapp/js/detect.js
index d487b6b52..38e95ceaf 100755
--- a/webapp/src/main/webapp/js/detect.js
+++ b/webapp/src/main/webapp/js/detect.js
@@ -8,7 +8,7 @@ function compareVersions(sVersion1, sVersion2) {
 
     var aVersion1 = sVersion1.split(".");
     var aVersion2 = sVersion2.split(".");
-    
+
     if (aVersion1.length > aVersion2.length) {
         for (var i=0; i < aVersion1.length - aVersion2.length; i++) {
             aVersion2.push("0");
@@ -16,18 +16,18 @@ function compareVersions(sVersion1, sVersion2) {
     } else if (aVersion1.length < aVersion2.length) {
         for (var i=0; i < aVersion2.length - aVersion1.length; i++) {
             aVersion1.push("0");
-        }    
+        }
     }
-    
+
     for (var i=0; i < aVersion1.length; i++) {
- 
+
         if (aVersion1[i] < aVersion2[i]) {
             return -1;
         } else if (aVersion1[i] > aVersion2[i]) {
             return 1;
-        }    
+        }
     }
-    
+
     return 0;
 
 }
@@ -52,10 +52,10 @@ if (isOpera) {
     isMinOpera7_5 = fOperaVersion >= 7.5;
 }
 
-var isKHTML = sUserAgent.indexOf("KHTML") > -1 
-              || sUserAgent.indexOf("Konqueror") > -1 
-              || sUserAgent.indexOf("AppleWebKit") > -1; 
-              
+var isKHTML = sUserAgent.indexOf("KHTML") > -1
+              || sUserAgent.indexOf("Konqueror") > -1
+              || sUserAgent.indexOf("AppleWebKit") > -1;
+
 var isMinSafari1 = isMinSafari1_2 = false;
 var isMinKonq2_2 = isMinKonq3 = isMinKonq3_1 = isMinKonq3_2 = false;
 
@@ -78,14 +78,14 @@ if (isKHTML) {
         isMinKonq3 = compareVersions(RegExp["$1"], "3.0") >= 0;
         isMinKonq3_1 = compareVersions(RegExp["$1"], "3.1") >= 0;
         isMinKonq3_2 = compareVersions(RegExp["$1"], "3.2") >= 0;
-    } 
-    
+    }
+
 }
 
-var isIE = sUserAgent.indexOf("compatible") > -1 
+var isIE = sUserAgent.indexOf("compatible") > -1
            && sUserAgent.indexOf("MSIE") > -1
            && !isOpera;
-           
+
 var isMinIE4 = isMinIE5 = isMinIE5_5 = isMinIE6 = false;
 
 if (isIE) {
@@ -112,9 +112,9 @@ if (isMoz) {
     isMinMoz1_5 = compareVersions(RegExp["$1"], "1.5") >= 0;
 }
 
-var isNS4 = !isIE && !isOpera && !isMoz && !isKHTML 
-            && (sUserAgent.indexOf("Mozilla") == 0) 
-            && (navigator.appName == "Netscape") 
+var isNS4 = !isIE && !isOpera && !isMoz && !isKHTML
+            && (sUserAgent.indexOf("Mozilla") == 0)
+            && (navigator.appName == "Netscape")
             && (fAppVersion >= 4.0 && fAppVersion < 5.0);
 
 var isMinNS4 = isMinNS4_5 = isMinNS4_7 = isMinNS4_8 = false;
@@ -127,7 +127,7 @@ if (isNS4) {
 }
 
 var isWin = (navigator.platform == "Win32") || (navigator.platform == "Windows");
-var isMac = (navigator.platform == "Mac68K") || (navigator.platform == "MacPPC") 
+var isMac = (navigator.platform == "Mac68K") || (navigator.platform == "MacPPC")
             || (navigator.platform == "Macintosh");
 
 var isUnix = (navigator.platform == "X11") && !isWin && !isMac;
@@ -137,28 +137,28 @@ var isMac68K = isMacPPC = false;
 var isSunOS = isMinSunOS4 = isMinSunOS5 = isMinSunOS5_5 = false;
 
 if (isWin) {
-    isWin95 = sUserAgent.indexOf("Win95") > -1 
+    isWin95 = sUserAgent.indexOf("Win95") > -1
               || sUserAgent.indexOf("Windows 95") > -1;
-    isWin98 = sUserAgent.indexOf("Win98") > -1 
+    isWin98 = sUserAgent.indexOf("Win98") > -1
               || sUserAgent.indexOf("Windows 98") > -1;
-    isWinME = sUserAgent.indexOf("Win 9x 4.90") > -1 
+    isWinME = sUserAgent.indexOf("Win 9x 4.90") > -1
               || sUserAgent.indexOf("Windows ME") > -1;
-    isWin2K = sUserAgent.indexOf("Windows NT 5.0") > -1 
+    isWin2K = sUserAgent.indexOf("Windows NT 5.0") > -1
               || sUserAgent.indexOf("Windows 2000") > -1;
-    isWinXP = sUserAgent.indexOf("Windows NT 5.1") > -1 
+    isWinXP = sUserAgent.indexOf("Windows NT 5.1") > -1
               || sUserAgent.indexOf("Windows XP") > -1;
-    isWinNT4 = sUserAgent.indexOf("WinNT") > -1 
-              || sUserAgent.indexOf("Windows NT") > -1 
-              || sUserAgent.indexOf("WinNT4.0") > -1 
-              || sUserAgent.indexOf("Windows NT 4.0") > -1 
+    isWinNT4 = sUserAgent.indexOf("WinNT") > -1
+              || sUserAgent.indexOf("Windows NT") > -1
+              || sUserAgent.indexOf("WinNT4.0") > -1
+              || sUserAgent.indexOf("Windows NT 4.0") > -1
               && (!isWinME && !isWin2K && !isWinXP);
-} 
+}
 
 if (isMac) {
-    isMac68K = sUserAgent.indexOf("Mac_68000") > -1 
+    isMac68K = sUserAgent.indexOf("Mac_68000") > -1
                || sUserAgent.indexOf("68K") > -1;
-    isMacPPC = sUserAgent.indexOf("Mac_PowerPC") > -1 
-               || sUserAgent.indexOf("PPC") > -1;  
+    isMacPPC = sUserAgent.indexOf("Mac_PowerPC") > -1
+               || sUserAgent.indexOf("PPC") > -1;
 }
 
 if (isUnix) {
diff --git a/webapp/src/main/webapp/js/developer/developerPanel.js b/webapp/src/main/webapp/js/developer/developerPanel.js
index d4bc63070..b92f2abdf 100644
--- a/webapp/src/main/webapp/js/developer/developerPanel.js
+++ b/webapp/src/main/webapp/js/developer/developerPanel.js
@@ -2,7 +2,7 @@
 
 function DeveloperPanel(developerAjaxUrl) {
 	this.setupDeveloperPanel = updateDeveloperPanel;
-	
+
 	function updateDeveloperPanel(data) {
 	    $.ajax({
 	        url: developerAjaxUrl,
@@ -18,31 +18,31 @@ function DeveloperPanel(developerAjaxUrl) {
 	        }
 	    });
 	}
-		
+
 	function updatePanelContents(contents) {
 		document.getElementById("developerPanel").innerHTML = contents;
 	}
-	
+
     function initializeTabs() {
         $("#developerTabs").tabs();
     }
-    
+
 	function addBehaviorToElements() {
 		$( "#developerPanelClickMe" ).click(openPanel);
 	    $( "#developerPanelSaveButton" ).click(saveSettings);
 	    $( "#developerPanelBody input:checkbox" ).change(updateDisabledFields);
 	}
-	
+
 	function openPanel() {
 		$( "#developerPanelClickText" ).hide();
 		$( "#developerPanelBody" ).show();
 	}
-	
+
 	function saveSettings() {
 		$( "#developerPanelBody" ).hide();
 		updateDeveloperPanel(collectFormData());
 	}
-	
+
 	function updateDisabledFields() {
 		var developerEnabled = document.getElementById("developer_enabled").checked;
 		document.getElementById("developer_permitAnonymousControl").disabled = !developerEnabled;
@@ -59,23 +59,23 @@ function DeveloperPanel(developerAjaxUrl) {
 		document.getElementById("developer_searchDeletions_enable").disabled = !developerEnabled;
 		document.getElementById("developer_searchEngine_enable").disabled = !developerEnabled;
 		document.getElementById("developer_authorization_logDecisions_enable").disabled = !developerEnabled;
-	
+
 		var rdfServiceEnabled = developerEnabled && document.getElementById("developer_loggingRDFService_enable").checked;
 		document.getElementById("developer_loggingRDFService_stackTrace").disabled = !rdfServiceEnabled;
 		document.getElementById("developer_loggingRDFService_queryRestriction").disabled = !rdfServiceEnabled;
 		document.getElementById("developer_loggingRDFService_stackRestriction").disabled = !rdfServiceEnabled;
-	
+
 		var searchIndexEnabled = developerEnabled && document.getElementById("developer_searchIndex_enable").checked;
 		document.getElementById("developer_searchIndex_showDocuments").disabled = !searchIndexEnabled;
 		document.getElementById("developer_searchIndex_uriOrNameRestriction").disabled = !searchIndexEnabled;
 		document.getElementById("developer_searchIndex_documentRestriction").disabled = !searchIndexEnabled;
-		
+
 		var searchEngineEnabled = developerEnabled && document.getElementById("developer_searchEngine_enable").checked;
 		document.getElementById("developer_searchEngine_addStackTrace").disabled = !searchEngineEnabled;
 		document.getElementById("developer_searchEngine_addResults").disabled = !searchEngineEnabled;
 		document.getElementById("developer_searchEngine_queryRestriction").disabled = !searchEngineEnabled;
 		document.getElementById("developer_searchEngine_stackRestriction").disabled = !searchEngineEnabled;
-		
+
 		var authLoggingEnabled = developerEnabled && document.getElementById("developer_authorization_logDecisions_enable").checked;
 		document.getElementById("developer_authorization_logDecisions_skipInconclusive").disabled = !authLoggingEnabled;
 		document.getElementById("developer_authorization_logDecisions_addIdentifiers").disabled = !authLoggingEnabled;
@@ -94,17 +94,17 @@ function DeveloperPanel(developerAjaxUrl) {
 			});
 		return data;
 	}
-}	
+}
 
 /*
  * Relies on the global variables for the AJAX URL and the CSS files.
  */
-$(document).ready(function() {   
+$(document).ready(function() {
 	$.each(developerCssLinks, function(index, value){
         var cssLink = $("<link rel='stylesheet' type='text/css' href='" + value + "'>");
-        $("head").append(cssLink); 
-    });	
+        $("head").append(cssLink);
+    });
 
-	new DeveloperPanel(developerAjaxUrl).setupDeveloperPanel();	
-}); 
+	new DeveloperPanel(developerAjaxUrl).setupDeveloperPanel();
+});
 
diff --git a/webapp/src/main/webapp/js/edit/entityRetry.js b/webapp/src/main/webapp/js/edit/entityRetry.js
index 041efddf9..5fe19bac8 100644
--- a/webapp/src/main/webapp/js/edit/entityRetry.js
+++ b/webapp/src/main/webapp/js/edit/entityRetry.js
@@ -16,9 +16,9 @@ function confirmDelete() {
 
 <script language="javascript" type="text/javascript">
 
-if( vitroJsLoaded == null ){ 
+if( vitroJsLoaded == null ){
 
-  alert("seminar.js needs to have the code from vitro.js loaded first"); 
+  alert("seminar.js needs to have the code from vitro.js loaded first");
 
 }
 
@@ -32,7 +32,7 @@ function monikerInit(){
 //      $('monikerSelectAlt').disabled = true;
 //   }
 
-  $('Moniker').onchange = checkMonikers;  
+  $('Moniker').onchange = checkMonikers;
 
   update();
 
@@ -45,7 +45,7 @@ function update(){ //updates moniker list when type is changed
   dwr.util.useLoadingMessage();
 
   EntityDWR.monikers(createList,  document.getElementById("VClassURI").value );
-  
+
 }
 
 
@@ -74,16 +74,16 @@ function getCurrentMoniker() {
 
 function checkMonikers(){ //checks if monikers is on [new moniker] and enables alt field
 
-  var sel = $('Moniker');  
+  var sel = $('Moniker');
 
   if( sel.value == "" || sel.options.length <= 1){
     $('MonikerSelectAlt').disabled = false;
 
   }else{
 
-    $('MonikerSelectAlt').disabled = true; 
+    $('MonikerSelectAlt').disabled = true;
 
-  }        
+  }
 
 }
 
@@ -137,7 +137,7 @@ function fillList(id, data, selectedtext) {
 <script language="javascript" type="text/javascript" src="js/tiny_mce/tiny_mce.js"></script>
 <script language="javascript" type="text/javascript">
 	// Notice: The simple theme does not use all options some of them are limited to the advanced theme
-	
+
 	tinyMCE.init({
 		theme : "advanced",
 		mode : "exact",
@@ -152,7 +152,7 @@ function fillList(id, data, selectedtext) {
 		width : "95%",
 		valid_elements : "a[href|target|name|title],br,p,i,em,cite,strong/b,u,sub,sup,ul,ol,li,h2,h3,h4,h5,h6",
 		forced_root_block: false
-		
+
 		// elements : "elm1,elm2",
 		// save_callback : "customSave",
 		// content_css : "example_advanced.css",
@@ -162,7 +162,7 @@ function fillList(id, data, selectedtext) {
 		// invalid_elements : "li",
 		// theme_advanced_styles : "Header 1=header1;Header 2=header2;Header 3=header3;Table Row=tableRow1", // Theme specific setting CSS classes
 	});
-	
+
 </script>
 
 <script type="text/javascript">
@@ -171,10 +171,10 @@ function fillList(id, data, selectedtext) {
 	/*
 	dojo.require("dojo.dom.*");
 	*/
-	
+
 	nextId=99999;
 	// fix this with separate values per type
-	
+
 	function getAllChildren(theNode, childArray) {
 		var ImmediateChildren = theNode.childNodes;
 		if (ImmediateChildren) {
@@ -184,10 +184,10 @@ function fillList(id, data, selectedtext) {
 			}
 		}
 	}
-	
+
 	function addLine(baseNode, typeStr)
 	{
-		baseId = baseNode.id.substr(0,baseNode.id.length-7);	
+		baseId = baseNode.id.substr(0,baseNode.id.length-7);
 		newTaName = document.getElementById(baseId+"genTaName").firstChild.nodeValue;
 		theList = document.getElementById(baseId+"ul");
 		nextId++;
@@ -214,28 +214,28 @@ function fillList(id, data, selectedtext) {
 		theTaTa.style.display="block";
 		theTa = document.getElementById(TrId+"ta");
 		theTa.style.display="block";
-		
+
 		// scroll the window to make sure the user sees our new textarea
 		var coors = findPos(theTaTa);
 		window.scrollTo(coors[0]-150,coors[1]-150);
-		
+
 		// switch the textarea to a TinyMCE instance
-		tinyMCE.execCommand('mceAddControl',false,TrId+"tata");			
-		
+		tinyMCE.execCommand('mceAddControl',false,TrId+"tata");
+
 		return false;
 	}
-	
+
 	function deleteLine(deleteLinkNode, typeStr) {
-	
+
 		TrId = deleteLinkNode.id.substr(0,deleteLinkNode.id.length-10);
 		clickedRowContentValue = document.getElementById(TrId+"contentValue");
 		clickedRowContentValue.style.textDecoration="line-through";
-		
+
 		//tinyMCE.execCommand('mceAddControl',false,TrId+'tata');
 		//tinyMCE.activeEditor.setContent('', {format : 'raw'});
 		//tinyMCE.execCommand('mceSetContent',false,'');
 		//tinyMCE.execCommand('mceRemoveControl',false,TrId+'tata');
-		
+
 		document.getElementById(TrId+'tata').innerHTML = '';
 		clickedRowEditLink = document.getElementById(TrId+"editLink");
 		clickedRowEditLink.style.display="none";
@@ -243,9 +243,9 @@ function fillList(id, data, selectedtext) {
 		clickedRowDeleteLink.style.display="none";
 		clickedRowUndeleteLink = document.getElementById(TrId+"undeleteLink");
 		clickedRowUndeleteLink.style.display="inline";
-	
+
 	}
-	
+
 	function undeleteLine(undeleteLinkNode, typeStr) {
 		index = undeleteLinkNode.id.substr(0,undeleteLinkNode.id.length-12);
 		theContentValue=document.getElementById(index+"contentValue");
@@ -261,7 +261,7 @@ function fillList(id, data, selectedtext) {
 		clickedRowUndeleteLink = document.getElementById(TrId+"undeleteLink");
 		clickedRowUndeleteLink.style.display="none";
 	}
-	
+
 	function convertLiToTextarea(linkNode, typeStr) {
 		LiId = linkNode.id.substr(0,linkNode.id.length-8);
 		theLic = document.getElementById(LiId+"content");
@@ -271,8 +271,8 @@ function fillList(id, data, selectedtext) {
 		tinyMCE.execCommand('mceAddControl',false,LiId+'tata');
 		return false;
 	}
-	
-	function backToLi(okLinkNode) { 
+
+	function backToLi(okLinkNode) {
 		index = okLinkNode.id.substr(0,okLinkNode.id.length-6);
 		textareaDivId = index+"ta";
 		liDivId = index+"contentValue";
@@ -286,7 +286,7 @@ function fillList(id, data, selectedtext) {
 		theLi.parentNode.style.display = 'block';
 		return false;
 	}
-	
+
 	function cancelBackToLi(cancelLinkNode) {
 		index = cancelLinkNode.id.substr(0,cancelLinkNode.id.length-10);
 		textareaDivId = index+"ta";
@@ -305,7 +305,7 @@ function fillList(id, data, selectedtext) {
 		}
 		return false;
 	}
-	
+
 	function submitPage() {
 		theForm = document.getElementById("editForm");
 		theButtonWeWantToClick = document.getElementById("primaryAction");
@@ -316,7 +316,7 @@ function fillList(id, data, selectedtext) {
 		theForm.appendChild(theHiddenInput);
 		theForm.submit();
 	}
-		
+
 	function findPos(obj)
 	{
 		var curleft = curtop = 0;
@@ -354,4 +354,4 @@ function fillList(id, data, selectedtext) {
     $(document).ready(function() {
         monikerSelection.monikerListener();
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/webapp/src/main/webapp/js/edit/initTinyMce.js b/webapp/src/main/webapp/js/edit/initTinyMce.js
index 62e23ab16..16ffcb7e0 100644
--- a/webapp/src/main/webapp/js/edit/initTinyMce.js
+++ b/webapp/src/main/webapp/js/edit/initTinyMce.js
@@ -6,9 +6,9 @@ var initTinyMCE = {
         this.mergeFromTemplate();
         this.initObjects();
         this.initEditor();
-       
+
     },
-    
+
     // Add variables from menupage template
     mergeFromTemplate: function() {
         $.extend(this, customFormData);
@@ -19,7 +19,7 @@ var initTinyMCE = {
     // Create references to frequently used elements for convenience
     initEditor: function() {
     	initTinyMCE.wsywigFields.tinymce(initTinyMCE.tinyMCEData);
-    	
+
     }
 };
 
diff --git a/webapp/src/main/webapp/js/ents_edit.js b/webapp/src/main/webapp/js/ents_edit.js
index c588d8f29..bb5776ee6 100644
--- a/webapp/src/main/webapp/js/ents_edit.js
+++ b/webapp/src/main/webapp/js/ents_edit.js
@@ -20,7 +20,7 @@ dojo.require("dojo.event.*");
 
   The html form for tasks 3 and 4 is from a div with id="propertydiv" on
   the ents_edit.JSP ( <-- notice, it's on the JSP ).  See the js function
-  getForm().  
+  getForm().
 
   There was a problem where the DWR calls were throwing error messages
   for larger (but not unreasonably large) sets of entity data.  Updating to DWR
@@ -33,7 +33,7 @@ dojo.require("dojo.event.*");
   2006-11-21 bdc34: removing the 'new entity' button, added comments
  */
 
-var gEntityUri; //used to hold the URI of the entity being edited 
+var gEntityUri; //used to hold the URI of the entity being edited
 var gProperty; // used to hold property on form
 var gEntity; //entity that this page is editing
 var editingNewProp = false; //true when editing a new property
@@ -41,7 +41,7 @@ var editingNewProp = false; //true when editing a new property
 var gVClassUri = null;
 
 //hash: PropertyDWR.propertyId+"D" or "R" (for domain or range)  -->  obj: PropertyDWR
-var gPropertyHash; 
+var gPropertyHash;
 
 //holds the xhtmlrequest so we can do an abort
 var gEntRequest = null;
@@ -49,8 +49,8 @@ var gEntRequest = null;
 var justwritenProp = null;
 var justwritenTr   = null;
 
-if( vitroJsLoaded === undefined || vitroJsLoaded === null ){ 
-  alert("ents_edit.js needs to have the code from vitro.js loaded first"); 
+if( vitroJsLoaded === undefined || vitroJsLoaded === null ){
+  alert("ents_edit.js needs to have the code from vitro.js loaded first");
 }
 
 var rowId = 1;
@@ -104,11 +104,11 @@ function updateEntityAndPropHash(){
     if( entityObj != null && 'URI' in entityObj )
         PropertyDWR.getAllPossiblePropInstForIndividual(entityObj.URI, { callback:setPropertyHash });
     //else
-        //alert("could not find an individual, usually this means that there is no type for the URI"); 
+        //alert("could not find an individual, usually this means that there is no type for the URI");
   };
-  
+
   /* This is the method that builds the gPropertyHash. It is called by setGEntity() */
-  var setPropertyHash = function(propArray) {  
+  var setPropertyHash = function(propArray) {
     if( propArray == null || propArray.length < 1  ) {
     	gPropertyHash = null; /* propArray might be null if we have no properties in the system */
     }else{
@@ -119,12 +119,12 @@ function updateEntityAndPropHash(){
             hashid = hashid + 'D';
           } else {
             hashid = hashid + 'R';
-          }            
+          }
           gPropertyHash[ hashid ] = propArray[i];
     	}
     }
   };
-  
+
   //get the gEntity and then build the gPropertyHash
   EntityDWR.entityByURI(gEntityURI, { callback:setGEntity });
 }
@@ -144,7 +144,7 @@ function doNoPropsWarning(){
 }
 
 /*****************************************************************
-because dwr calls are async we have a callback 
+because dwr calls are async we have a callback
 *****************************************************************/
 function updateTable(callback) {
   var cb = callback;
@@ -153,7 +153,7 @@ function updateTable(callback) {
      /* This makes the row that gets added to the ents_edit form for each ents2ents object.  */
      addRows(dwr.util.byId("propbody"), props,
              [getDomain, getProperty, getRange, getEdit, getDelete],
-             makeTr);  
+             makeTr);
      var newPropTr = dwr.util.byId("justwritenTr");
      if( newPropTr != null ){
        Fat.fade_element( "justwritenTr" );
@@ -184,7 +184,7 @@ var getDelete = function(prop)  {
   var quote = new RegExp('\'','g');
   var dquote = new RegExp('"','g');
   return '<input type="button" value="Delete" class="form-button" ' +
-  'onclick="deleteProp(' + 
+  'onclick="deleteProp(' +
   '\'' + cleanForString(prop.subjectEntURI) + '\', ' +
   '\'' + cleanForString(prop.propertyURI)    + '\', ' +
   '\'' + cleanForString(prop.objectEntURI)   + '\', ' +
@@ -215,7 +215,7 @@ This makeTr is a function with access to a closure that
    includes the vars previousPropName and currentClass.
    All of this work is to get the table row color to change when
    we start drawing a row for a property that is different than the
-   previous row.  
+   previous row.
 *****************************************************************/
 var makeTr = (function(){ /* outer func */
     // the reason for the outer func is to capture these values in a closure
@@ -278,7 +278,7 @@ function deleteProp( subjectURI, predicateURI, objectURI, objectName, predicateN
 }
 
 /*****************************************************************
- adds the editing form <tr> to the propeties table 
+ adds the editing form <tr> to the propeties table
 *****************************************************************/
 function appendPropForm(tr, colspan ){
   var form = getForm();
@@ -288,27 +288,27 @@ function appendPropForm(tr, colspan ){
   var td = tr.insertCell(-1);
   td.appendChild( form );
 
-  if( colspan !== undefined && colspan > 0){ 
-      td.colSpan=colspan; 
+  if( colspan !== undefined && colspan > 0){
+      td.colSpan=colspan;
   }
   form.style.display="block";
 }
 
 /*****************************************************************
-This gets called when the button to make a new property 
-for the entity is pressed. 
+This gets called when the button to make a new property
+for the entity is pressed.
 *****************************************************************/
 function newProp() {
   if( gPropertyHash == null || gPropertyHash.length < 1 ) {
     	/* propArray might be null if we have no properties in the system */
-    	doNoPropsWarning();    	
+    	doNoPropsWarning();
     }else{
   	var innerNew = function (){
       var newP = {};
     	newP.domainClass = gEntity.vClassId;
     	newP.subjectName = gEntity.name;
     	newP.subjectEntURI = gEntity.URI;
-        
+
     	fillForm( newP );
     	editingNewProp = true;
     	fillRangeVClassList();
@@ -316,7 +316,7 @@ function newProp() {
         var tr = table.insertRow(0);
     	tr.id = "newrow";
     	appendPropForm( tr, tableMaxColspan( table ) );
- 
+
       //table.insertBefore(tr, table.rows[0]);
   	};
   	updateTable( innerNew );
@@ -324,26 +324,26 @@ function newProp() {
 }
 
 /****************************************************************
- Fills out the property edit form with the given property 
+ Fills out the property edit form with the given property
 *****************************************************************/
 function fillForm(aprop)  {
   clearProp();
   gProperty = aprop;
   var vclass = gProperty.domainClass;
-  
+
   dwr.util.setValues(gProperty);
 
   toggleDisabled("newPropButton");
-  
-  fillPropList(vclass); // this will also fill the vclass and ents lists      
+
+  fillPropList(vclass); // this will also fill the vclass and ents lists
 }
 
 /****************************************************************
  This will fill the select list will all of the properties found
- in  the gPropertyHash and then trigger a update of the vClasList 
+ in  the gPropertyHash and then trigger a update of the vClasList
 ******************************************************************/
-function fillPropList(classId) {  
-  /* This function fills up the form's select list with options 
+function fillPropList(classId) {
+  /* This function fills up the form's select list with options
      Notice that the option id is the propertyid + 'D' or 'R'
      so that domain and range properties can be distinguished  */
   var propList = dwr.util.byId("propertyList");
@@ -369,7 +369,7 @@ function fillPropList(classId) {
     }
     var opt = new Option(text, value);
     if( gProperty.propertyURI == prop.propertyURI ){
-      opt.selected = true; 
+      opt.selected = true;
     }
     propList.options[propList.options.length] = opt;
   }
@@ -378,29 +378,29 @@ function fillPropList(classId) {
 }
 
 /*****************************************************************
- Fill up the range VClass list on the property editing form. 
+ Fill up the range VClass list on the property editing form.
  If propId is null then the one on the property select list will be used
 *****************************************************************/
 function fillRangeVClassList( propId ){
   //If propId is null then the one on the property select list will be used
   if( propId == null ) { propId = dwr.util.getValue("propertyList");}
-	
+
   //clear the list and put the loading message up
   var vclassListEle = dwr.util.byId("vClassList");
   clear(vclassListEle);
   vclassListEle.options[vclassListEle.options.length] = new Option("Loading...",-10);
   //vclassListEle.options[0].selected = true;
   //vclassListEle.options[vclassListEle.options.length] = new Option("Crapping...",-15);
-	
-  var prop = gPropertyHash[propId];	
-	
+
+  var prop = gPropertyHash[propId];
+
   VClassDWR.getVClasses(prop.domainClassURI, prop.propertyURI, prop.subjectSide,
                           function(vclasses){
                               addVClassOptions( vclasses );
                           }
                     );
-}		
-	
+}
+
 /****************************************************************
  Adds vClasses to the vClassList and trigger an update of
  the entitiesList.
@@ -424,15 +424,15 @@ function addVClassOptions( vclassArray  ){
 
   addOptions("vClassList", vclassArray,
              function(vclass){ return vclass.URI; },
-             function(vclass){ 
+             function(vclass){
                var count = "";
-               if( vclass.entityCount != null && 
+               if( vclass.entityCount != null &&
                    vclass.entityCount >= 0){
                  count = " ("+vclass.entityCount+")";
                }
                return vclass.name+count;
              });
-               
+
   //attempt to set the selected option to the current vclass
   var vclassURI = null;
   var prop = gPropertyHash[ dwr.util.getValue("propertyList") ];
@@ -456,8 +456,8 @@ function addVClassOptions( vclassArray  ){
 
 /*****************************************************************
   Fill up the entity list in a property editing form.
-  The propId should have the id + 'D' or 'R' to 
-  indicate domain or range. 
+  The propId should have the id + 'D' or 'R' to
+  indicate domain or range.
 *****************************************************************/
 function fillEntsList( vclassEle ){
   if( vclassEle == null )
@@ -468,11 +468,11 @@ function fillEntsList( vclassEle ){
     return;
   else
     gVClassUri = vclassUri;
-    
+
   var entsListEle = dwr.util.byId("entitiesList");
   clear(entsListEle);
   entityOptToSelect = null;
-    
+
   entsListEle.disabled = true;
   entsListEle.options[entsListEle.options.length] = new Option("Loading...",-12);
   entsListEle.options[entsListEle.options.length-1].selected = true;
@@ -487,7 +487,7 @@ function fillEntsList( vclassEle ){
     error: function(type, data, evt){
        if( type == null ){ type = "none" ; }
        if( data == null ){ data = "none" ; }
-       if( evt == null ){ evt = "none" ; }       
+       if( evt == null ){ evt = "none" ; }
        alert("An error occurred while attempting to get the individuals of vclass "
                + vclassUri + "\ntype: " + type +"\ndata: "+
                data +"\nevt: " + evt );
@@ -501,7 +501,7 @@ function fillEntsList( vclassEle ){
     mimetype: "text/json"
    };
    abortExistingEntRequest();
-   gEntRequest = dojo.io.bind(bindArgs);   
+   gEntRequest = dojo.io.bind(bindArgs);
   } else {
     clear(entsListEle);
   }
@@ -523,7 +523,7 @@ function addEntOptions( entArray ){
   if( entArray != null && entArray[entArray.length-1].nextUrl != null ){
     contObj = entArray.pop();
   }
-  
+
   var CUTOFF = 110; //shorten entity names longer then this value.
   var foundEntity = false;
   var text;
@@ -543,7 +543,7 @@ function addEntOptions( entArray ){
   if( contObj != null ){
     entsListEle.item(0).text = entsListEle.item(0).text + ".";
     addMoreEntOptions( contObj );
-  } else {    
+  } else {
     gEntRequests = [];
     entsListEle.disabled = false;
     if( entsListEle.length > 0 && entsListEle.item(0).value == -12){
@@ -557,7 +557,7 @@ function addEntOptions( entArray ){
 var entityOptToSelect =null;
 
 /*
- * Add more entity options to the list if there are more on the request 
+ * Add more entity options to the list if there are more on the request
  *
 example of a continueObj
 {"nextUrl":"http://localhost:8080/vivo/dataService?getEntitiesByVClass=1&vclassId=318",
@@ -570,7 +570,7 @@ function addMoreEntOptions( continueObj ){
     error: function(type, data, evt){
         if( type == null ){ type = "none" ; }
         if( data == null ){ data = "none" ; }
-        if( evt == null ){ evt = "none" ; }       
+        if( evt == null ){ evt = "none" ; }
         alert("An error addMoreEntOptions()"+"\ntype: " + type +"\ndata: "+
               data +"\nevt: " + evt );
       },
@@ -578,9 +578,9 @@ function addMoreEntOptions( continueObj ){
         addEntOptions( data );
       },
     mimetype: "text/json"
-    };    
+    };
     abortExistingEntRequest();
-    gEntRequest = dojo.io.bind(bindArgs);    
+    gEntRequest = dojo.io.bind(bindArgs);
   }
 }
 
@@ -596,7 +596,7 @@ If the last item in the JSON array has an id then you don't have to go back
 for more results.
 
 Example:
-[ ... 
+[ ...
  {"moniker":"recent journal article", "name":"{beta}2 and {beta}4
      Subunits of BK Channels Confer Differential Sensitivity to Acute
      Modulation by Steroid Hormones.", "vClassId":318, "id":18120},
@@ -606,11 +606,11 @@ Example:
 */
 
 /****************************************************************
-Check to see if property edit form is valid 
+Check to see if property edit form is valid
 *****************************************************************/
 function validateForm(){
   var dateEx = "\nDates should be in the format YYYY-MM-DD";
-  /* used to check dates here */ 
+  /* used to check dates here */
   return true;
 }
 
@@ -631,13 +631,13 @@ function writeProp()  {
   var selected = dwr.util.getValue("entitiesList");
   newP.subjectEntURI= gEntity.URI;
   newP.objectEntURI = selected ;
-  
+
   var callback = function(result){
     editingNewProp = false;
     justwritenProp = newP;
     update();  };
 
-  if( editingNewProp ){    
+  if( editingNewProp ){
     newP.ents2entsId = -1;
     PropertyDWR.insertProp(newP, { callback:callback } );
   } else {
@@ -665,7 +665,7 @@ function disy( obj, note ){ alert( (note!==null?note:"") + dwr.util.toDescriptiv
 
 /* attempts to get the URI of the entity being edited */
 function getEntityUriFromPage(){
-  return document.getElementById("entityUriForDwr").nodeValue;      
+  return document.getElementById("entityUriForDwr").nodeValue;
 }
 
 function abortExistingEntRequest(){
@@ -676,5 +676,5 @@ function abortExistingEntRequest(){
         alert("No abort function found on gEntRequest");
     }
     gEntRequest = null;
- }    
+ }
 }
diff --git a/webapp/src/main/webapp/js/ents_retry.js b/webapp/src/main/webapp/js/ents_retry.js
index 002b4e400..179ee52aa 100644
--- a/webapp/src/main/webapp/js/ents_retry.js
+++ b/webapp/src/main/webapp/js/ents_retry.js
@@ -1,8 +1,8 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
-if( vitroJsLoaded == null ){ 
+if( vitroJsLoaded == null ){
 
-  alert("seminar.js needs to have the code from vitro.js loaded first"); 
+  alert("seminar.js needs to have the code from vitro.js loaded first");
 
 }
 
@@ -20,7 +20,7 @@ function init(){
 //      $('monikerSelectAlt').disabled = true;
 //   }
 
-  $('monikerSelect').onchange = checkMonikers;  
+  $('monikerSelect').onchange = checkMonikers;
 
   update();
 
@@ -33,7 +33,7 @@ function update(){ //updates moniker list when type is changed
   dwr.util.useLoadingMessage();
 
   EntityDWR.monikers(createList,  document.getElementById("field2Value").value );
-  
+
 }
 
 
@@ -59,16 +59,16 @@ function createList(data) { //puts options in moniker select list
 
 function checkMonikers(){ //checks if monikers is on [new moniker] and enables alt field
 
-  var sel = $('monikerSelect');  
+  var sel = $('monikerSelect');
 
   if( sel.value == "" || sel.options.length <= 1){
     $('monikerSelectAlt').disabled = false;
 
   }else{
 
-    $('monikerSelectAlt').disabled = true; 
+    $('monikerSelectAlt').disabled = true;
 
-  }        
+  }
 
 }
 
diff --git a/webapp/src/main/webapp/js/extensions/String.js b/webapp/src/main/webapp/js/extensions/String.js
index 27e271b51..7ce4d8dd6 100644
--- a/webapp/src/main/webapp/js/extensions/String.js
+++ b/webapp/src/main/webapp/js/extensions/String.js
@@ -5,14 +5,14 @@ String.prototype.capitalize = function() {
 };
 
 String.prototype.capitalizeWords = function() {
-	var words = this.split(/\s+/), 
+	var words = this.split(/\s+/),
 		wordCount = words.length,
 		i,
 		newWords = [];
-	
+
 	for (i = 0; i < wordCount; i++) {
 		newWords.push(words[i].capitalize());
 	}
-	
-	return newWords.join(' ');	
+
+	return newWords.join(' ');
 };
diff --git a/webapp/src/main/webapp/js/html5.js b/webapp/src/main/webapp/js/html5.js
index 3587bf734..f16d56a7b 100644
--- a/webapp/src/main/webapp/js/html5.js
+++ b/webapp/src/main/webapp/js/html5.js
@@ -3,4 +3,4 @@
 /*@cc_on(function(m,c){var z="abbr|article|aside|audio|canvas|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video";function n(d){for(var a=-1;++a<o;)d.createElement(i[a])}function p(d,a){for(var e=-1,b=d.length,j,q=[];++e<b;){j=d[e];if((a=j.media||a)!="screen")q.push(p(j.imports,a),j.cssText)}return q.join("")}var g=c.createElement("div");g.innerHTML="<z>i</z>";if(g.childNodes.length!==1){var i=z.split("|"),o=i.length,s=RegExp("(^|\\s)("+z+")",
 "gi"),t=RegExp("<(/*)("+z+")","gi"),u=RegExp("(^|[^\\n]*?\\s)("+z+")([^\\n]*)({[\\n\\w\\W]*?})","gi"),r=c.createDocumentFragment(),k=c.documentElement;g=k.firstChild;var h=c.createElement("body"),l=c.createElement("style"),f;n(c);n(r);g.insertBefore(l,
 g.firstChild);l.media="print";m.attachEvent("onbeforeprint",function(){var d=-1,a=p(c.styleSheets,"all"),e=[],b;for(f=f||c.body;(b=u.exec(a))!=null;)e.push((b[1]+b[2]+b[3]).replace(s,"$1.iepp_$2")+b[4]);for(l.styleSheet.cssText=e.join("\n");++d<o;){a=c.getElementsByTagName(i[d]);e=a.length;for(b=-1;++b<e;)if(a[b].className.indexOf("iepp_")<0)a[b].className+=" iepp_"+i[d]}r.appendChild(f);k.appendChild(h);h.className=f.className;h.innerHTML=f.innerHTML.replace(t,"<$1font")});m.attachEvent("onafterprint",
-function(){h.innerHTML="";k.removeChild(h);k.appendChild(f);l.styleSheet.cssText=""})}})(this,document);@*/
\ No newline at end of file
+function(){h.innerHTML="";k.removeChild(h);k.appendChild(f);l.styleSheet.cssText=""})}})(this,document);@*/
diff --git a/webapp/src/main/webapp/js/imageUpload/cropImage.js b/webapp/src/main/webapp/js/imageUpload/cropImage.js
index 7afd56577..439d892a8 100644
--- a/webapp/src/main/webapp/js/imageUpload/cropImage.js
+++ b/webapp/src/main/webapp/js/imageUpload/cropImage.js
@@ -11,11 +11,11 @@
 			minSize: [ 115, 115 ],
 			boxWidth: 650,
 			aspectRatio: 1
-			
+
 		});
-		
-		
-		
+
+
+
 
 		var bounds = jcrop_api.getBounds();
 		var boundx = bounds[0];
@@ -41,7 +41,7 @@
 				$('input[name=h]').val(Math.round(coords.h));
 			}
 		};
-		
+
 	});
 
-}(jQuery));
\ No newline at end of file
+}(jQuery));
diff --git a/webapp/src/main/webapp/js/imageUpload/imageUploadUtils.js b/webapp/src/main/webapp/js/imageUpload/imageUploadUtils.js
index 38d863a4e..557fddb00 100644
--- a/webapp/src/main/webapp/js/imageUpload/imageUploadUtils.js
+++ b/webapp/src/main/webapp/js/imageUpload/imageUploadUtils.js
@@ -7,4 +7,4 @@ $(document).ready(function(){
       var answer = confirm(i18n_confirmDelete);
       return answer;
   });
-});
\ No newline at end of file
+});
diff --git a/webapp/src/main/webapp/js/individual/individualUriRdf.js b/webapp/src/main/webapp/js/individual/individualUriRdf.js
index 0446d9127..fcbb9bd95 100644
--- a/webapp/src/main/webapp/js/individual/individualUriRdf.js
+++ b/webapp/src/main/webapp/js/individual/individualUriRdf.js
@@ -1,7 +1,7 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
 $(document).ready(function(){
-    
+
     $.extend(this, i18nStringsUriRdf);
 
     $('head').append('<style id="uriIconCSS">.qtip { font-size: 14px; max-width: none !important; } .uriIconTip { background-color: #f1f2ee; } </style>');
@@ -87,4 +87,4 @@ $(document).ready(function(){
         $('#uriIcon').qtip("hide");
         return false;
     });
-});
\ No newline at end of file
+});
diff --git a/webapp/src/main/webapp/js/individual/manageLabelsForIndividual.js b/webapp/src/main/webapp/js/individual/manageLabelsForIndividual.js
index b229b61ec..075a487a2 100644
--- a/webapp/src/main/webapp/js/individual/manageLabelsForIndividual.js
+++ b/webapp/src/main/webapp/js/individual/manageLabelsForIndividual.js
@@ -3,14 +3,14 @@
 var manageLabels = {
 
     /* *** Initial page setup *** */
-   
+
     onLoad: function() {
-    
-            this.mixIn();    
+
+            this.mixIn();
             this.initObjects();
             this.initPage();
-      
-            var selectedRadio;       
+
+            var selectedRadio;
         },
 
     mixIn: function() {
@@ -19,12 +19,12 @@ var manageLabels = {
         $.extend(this, customFormData);
         $.extend(this, i18nStrings);
     },
-    
+
     initObjects:function() {
         this.addLabelForm = $('#addLabelForm');
         this.showFormButtonWrapper = $('#showAddForm');
         this.showFormButton = $("#showAddFormButton");
-        //button to return to profile - div with only cancel 
+        //button to return to profile - div with only cancel
         this.showCancelOnlyButton = $("#showCancelOnly");
         this.addLabelCancel = this.addLabelForm.find(".cancel");
         this.submit = this.addLabelForm.find('input#submit');
@@ -34,12 +34,12 @@ var manageLabels = {
 
     // Initial page setup. Called only at page load.
     initPage: function() {
-    	
+
         var disableSubmit = true;
         if(this.submissionErrorsExist == "false") {
         	//hide the form to add label
         	this.addLabelForm.hide();
-        	
+
         	//If the number of available locales is zero, then hide the ability to show the form as well
         	if(this.numberAvailableLocales == 0) {
             	manageLabels.showFormButtonWrapper.hide();
@@ -48,67 +48,67 @@ var manageLabels = {
         		//if the add label button is visible, don't need cancel only link
         		this.showCancelOnlyButton.hide();
         	}
-        	
+
         } else {
         	//Display the form
         	this.onShowAddForm();
-        	
+
         	//Also make sure the save button is enabled in case there is a value selected for the drop down
         	if(this.labelLanguage.val() != "") {
         		disableSubmit = false;
         	}
-        
+
         }
-        
-       
-       
+
+
+
         if(disableSubmit) {
         	//disable submit until user selects a language
             this.submit.attr('disabled', 'disabled');
             this.submit.addClass('disabledSubmit');
         }
-       
+
         this.bindEventListeners();
-                       
+
     },
-    
+
     bindEventListeners: function() {
-               
+
         this.labelLanguage.change( function() {
         	//if language selected, allow submission, otherwise disallow
         	var selectedLanguage = manageLabels.labelLanguage.val();
         	if(selectedLanguage != "") {
         		manageLabels.submit.attr('disabled', false);
-        		manageLabels.submit.removeClass('disabledSubmit');      
+        		manageLabels.submit.removeClass('disabledSubmit');
         	} else {
         		manageLabels.submit.attr('disabled', 'disabled');
-        		manageLabels.submit.addClass('disabledSubmit');     
+        		manageLabels.submit.addClass('disabledSubmit');
         	}
         });
-        
+
         //enable form to add label to be displayed or hidden
         this.showFormButton.click(function() {
         	//clear the inputs for the label if the button is being clicked
         	manageLabels.clearAddForm();
         	manageLabels.onShowAddForm();
         });
-        
+
         //Check for clicking on existing labels list remove links
         //Note addition will refresh the page and removing will remove the item so adding event listeners
         //to remove links should keep remove link events in synch with page
-       
+
         this.existingLabelsList.find("a.remove").click(function(event) {
         	var message = "Are you sure you wish to delete this label?"
         	if (!confirm(message)) {
                 return false;
             }
-            
+
         	//First check with confirmation whether or not they want to delete
         	manageLabels.processLabelDeletion(this);
         	return false;
         });
-        
-        
+
+
         this.addLabelForm.find("a.cancel").click(function(event){
         	event.preventDefault();
         	//clear the add form
@@ -125,7 +125,7 @@ var manageLabels = {
     	manageLabels.addLabelForm.find("input[type='text'],select").val("");
     	//set the button for save to be disabled again
     	manageLabels.submit.attr('disabled', 'disabled');
-		manageLabels.submit.addClass('disabledSubmit');     
+		manageLabels.submit.addClass('disabledSubmit');
     },
     onShowAddForm:function() {
     	manageLabels.addLabelForm.show();
@@ -136,15 +136,15 @@ var manageLabels = {
     		manageLabels.showFormButtonWrapper.show();
     	});
     },
-    
+
     onHideAddForm:function() {
     	manageLabels.addLabelForm.hide();
     	manageLabels.showFormButtonWrapper.show();
     	//manageLabels.addLabelCancel.unbind("click");
     },
-    //Remove label                  
+    //Remove label
     processLabelDeletion: function(selectedLink) {
-    	
+
         // PrimitiveDelete only handles one statement, so we have to use PrimitiveRdfEdit to handle multiple
         // retractions if they exist. But PrimitiveRdfEdit also handles assertions, so pass an empty string
         // for "additions"
@@ -156,14 +156,14 @@ var manageLabels = {
         }
         var retract = "<" + manageLabels.individualUri + "> <http://www.w3.org/2000/01/rdf-schema#label> "
                         + "\"" + $(selectedLink).attr('labelValue') + "\"" + $(selectedLink).attr('tagOrType') + " ." ;
-            
-    
+
+
 
         retract = retract.substring(0,retract.length -1);
 
         $.ajax({
             url: manageLabels.processingUrl,
-            type: 'POST', 
+            type: 'POST',
             data: {
                 additions: add,
                 retractions: retract
@@ -171,7 +171,7 @@ var manageLabels = {
             dataType: 'json',
             context: selectedLink, // context for callback
             complete: function(request, status) {
-                
+
                 if (status == 'success') {
                 	//Remove the label from the list
                 	manageLabels.removeLabelFromList(selectedLink);
@@ -180,10 +180,10 @@ var manageLabels = {
                 else {
                 	//Instead of alert, write error to template
                     alert(manageLabels.errorProcessingLabels);
-       
+
                 }
             }
-        });        
+        });
 
     },
     removeLabelFromList:function(selectedLink) {
@@ -197,7 +197,7 @@ var manageLabels = {
     		if(removeLinks.length == 0) {
     			//if there aren't any other labels for this language, also remove the heading
     			manageLabels.existingLabelsList.find("h3[languageName='" + languageName + "']").remove();
-    			
+
     		}
     		//Check to see if there is only one label left on the page, if so remove or hide the remove link
     		if(allRemoveLinks.length == 1) {
@@ -206,8 +206,8 @@ var manageLabels = {
     			//whereas remove executes an ajax query and the page isn't reloaded
     		}
     	}
-    	
-    	
+
+
     },
     //Determine if there are new locales that can be added to the options once a delete has occurred
     updateLocaleSelection:function() {
@@ -220,9 +220,9 @@ var manageLabels = {
     			existingLanguages[languageCode] = true;
     		}
     	});
-    	
+
     	//Now check against full list, if any in full list not represented, will need to include in dropdown
-    	//This is a list of 
+    	//This is a list of
     	var availableLocalesList = [];
     	var listLen = selectLocalesFullList.length;
     	var i;
@@ -235,7 +235,7 @@ var manageLabels = {
     			availableLocalesList.push(possibleLanguageInfo);
     		}
     	}
-    	
+
     	//Now sort this list by the label property on the object
     	 availableLocalesList.sort(function(a, b) {
     	        var compA = a["label"];
@@ -248,10 +248,10 @@ var manageLabels = {
     		 //hide the cancel only button
     		 manageLabels.showCancelOnlyButton.hide();
     	 }
-    	 
+
     	 //Now replace dropdown with this new list
     	 manageLabels.generateLocalesDropdown(availableLocalesList);
-    	
+
     },
     generateLocalesDropdown:function(availableLocalesList) {
     	//First check if there are any available locales left, if not then hide the entire add form
@@ -275,7 +275,7 @@ var manageLabels = {
     		//because the form thought there were no available locales
     	}
     },
-    
+
     addLocaleInfo:function(localeInfo) {
     	//Add code to dropdown
     	//Would we need to regenerate alphabetically? Argh.
@@ -284,6 +284,6 @@ var manageLabels = {
 
 };
 
-$(document).ready(function() {   
+$(document).ready(function() {
     manageLabels.onLoad();
-}); 
+});
diff --git a/webapp/src/main/webapp/js/individual/menuManagement.js b/webapp/src/main/webapp/js/individual/menuManagement.js
index ef02d8f76..e48f9786b 100644
--- a/webapp/src/main/webapp/js/individual/menuManagement.js
+++ b/webapp/src/main/webapp/js/individual/menuManagement.js
@@ -9,32 +9,32 @@ var menuManagement = {
         this.initObjects();
         this.initMenuItemsDD();
     },
-    
+
     // Add variables from menupage template
     mergeFromTemplate: function() {
         $.extend(this, menuManagementData);
         $.extend(this, i18nStrings);
     },
-    
+
     // Create references to frequently used elements for convenience
     initObjects: function() {
         this.menuItemsList = $('ul.menuItems');
     },
-        
+
     // Drag-and-drop
     initMenuItemsDD: function() {
         var menuItems = this.menuItemsList.children('li');
-        
+
         if (menuItems.length < 2) {
             return;
         }
-        
+
         this.menuItemsList.addClass('dragNdrop');
-        
+
         menuItems.attr('title', menuManagement.dragDropMenus);
-        
-        
-        
+
+
+
            /*$("#loading").ajaxStart(function(){
                $(this).show();
              });
@@ -42,23 +42,23 @@ var menuManagement = {
                 $(this).hide();
               });*/
 
-        
+
         this.menuItemsList.sortable({
-            cursor: 'move',				
+            cursor: 'move',
             update: function(event, ui) {
                 menuManagement.reorderMenuItems(event, ui);
             }
         });
     },
-    
+
     // Reorder menu items. Called after menu item drag-and-drop
     reorderMenuItems: function(event, ui) {
         var menuItems = $('li.menuItem').map(function(index, el) {
             return $(this).data('menuItemUri');
         }).get();
-        
-        
-     
+
+
+
 
         $.ajax({
             url: menuManagement.reorderUrl,
@@ -73,11 +73,11 @@ var menuManagement = {
                 var pos;
                 $('.menuItem').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.
-                    menuManagement.setPosition(this, pos);  
-          
-                });      
+                    menuManagement.setPosition(this, pos);
+
+                });
             },
             error: function(request, status, error) {
                 // ui is undefined after removal of a menu item.
@@ -85,61 +85,61 @@ var menuManagement = {
                     // 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 = menuManagement.getPosition(ui.item),
-                        nextpos = pos + 1, 
+                        nextpos = pos + 1,
                         menuItems = menuManagement.menuItemsList,
                         next = menuManagement.findMenuItem('position', nextpos);
-                    
+
                     if (next.length) {
                         ui.item.insertBefore(next);
                     }
                     else {
                         ui.item.appendTo(menuItems);
                     }
-                    
+
                     alert(menuManagement.reorderingFailed);
                 }
             }
         });
     },
-    
+
     // On page load, associate data with each menu item list element. Then we don't
     // have to keep retrieving data from or modifying the DOM as we manipulate the
     // menu items.
     initMenuItemData: function() {
         $('.menuItem').each(function(index) {
-            $(this).data(menuItemData[index]);    
-            
+            $(this).data(menuItemData[index]);
+
             // RY We might still need position to put back an element after reordering
             // failure. Position might already have been reset? Check.
             // We also may need position to implement undo links: we want the removed menu item
             // to show up in the list, but it has no position.
-            $(this).data('position', index+1);      
+            $(this).data('position', index+1);
         });
     },
 
     getPosition: function(menuItem) {
         return $(menuItem).data('position');
     },
-    
+
     setPosition: function(menuItem, pos) {
         $(menuItem).data('position', pos);
     },
-    
+
     findMenuItem: function(key, value) {
         var matchingMenuItem = $(); // if we don't find one, return an empty jQuery set
-        
+
         $('.menuItem').each(function() {
             var menuItem = $(this);
             if ( menuItem.data(key) === value ) {
-                matchingMenuItem = menuItem; 
+                matchingMenuItem = menuItem;
                 return false; // stop the loop
             }
         });
-         
-        return matchingMenuItem;       
+
+        return matchingMenuItem;
     }
 };
 
-$(document).ready(function() {   
+$(document).ready(function() {
     menuManagement.onLoad();
-}); 
\ No newline at end of file
+});
diff --git a/webapp/src/main/webapp/js/individual/moreLessController.js b/webapp/src/main/webapp/js/individual/moreLessController.js
index 7fde69d35..7d70435af 100644
--- a/webapp/src/main/webapp/js/individual/moreLessController.js
+++ b/webapp/src/main/webapp/js/individual/moreLessController.js
@@ -1,15 +1,15 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
 $(document).ready(function(){
-    
+
     $.fn.exists = function () {
         return this.length !== 0;
     }
-    
+
     $.fn.moreLess = function () {
         $(this).each
     }
-    
+
     var togglePropDisplay = {
         showMore: function($toggleLink, $itemContainer) {
             $toggleLink.click(function() {
@@ -20,7 +20,7 @@ $(document).ready(function(){
                 return false;
             });
         },
-        
+
         showLess: function($toggleLink, $itemContainer) {
             $toggleLink.click(function() {
                 $itemContainer.hide();
@@ -31,61 +31,61 @@ $(document).ready(function(){
             });
         }
     };
-    
+
     // var $propList = $('.property-list').not('>li>ul');
     var $propList = $('.property-list:not(:has(>li>ul))');
     $propList.each(function() {
-	    var limit = $(this).attr("displayLimit"); 
+	    var limit = $(this).attr("displayLimit");
         var $additionalItems = $(this).find('li:gt(' + (limit - 1) + ')');
         if ( $additionalItems.exists() ) {
             // create container for additional elements
             var $itemContainer = $('<div class="additionalItems" />').appendTo(this);
-            
+
             // create toggle link
             var $toggleLink = $('<a class="more-less" href="#show more content" title="' + i18nStrings.showMoreContent + '">' + i18nStrings.displayMoreEllipsis + '</a>').appendTo(this);
-            
+
             $additionalItems.appendTo($itemContainer);
-            
+
             $itemContainer.hide();
-            
+
             togglePropDisplay.showMore($toggleLink, $itemContainer);
         }
     });
-    
+
     var $subPropList = $('.subclass-property-list');
     $subPropList.each(function() {
-		var limit = $(this).parent().parent().attr("displayLimit"); 
+		var limit = $(this).parent().parent().attr("displayLimit");
         var $additionalItems = $(this).find('li:gt(' + (limit - 1) + ')');
         if ( $additionalItems.exists() ) {
             // create container for additional elements
             var $itemContainer = $('<div class="additionalItems" />').appendTo(this);
-            
+
             // create toggle link
             var $toggleLink = $('<a class="more-less" href="#show more content" title="' + i18nStrings.showMoreContent + '">' + i18nStrings.displayMoreEllipsis + '</a>').appendTo(this);
-            
+
             $additionalItems.appendTo($itemContainer);
-            
+
             $itemContainer.hide();
-            
+
             togglePropDisplay.showMore($toggleLink, $itemContainer);
         }
     });
-    
+
     var $subPropSibs = $subPropList.closest('li').last().nextAll();
     var $subPropParent = $subPropList.closest('li').last().parent();
     var $additionalItems = $subPropSibs.slice(3);
     if ( $additionalItems.length > 0 ) {
         // create container for additional elements
         var $itemContainer = $('<div class="additionalItems" />').appendTo($subPropParent);
-        
+
         // create toggle link
         var $toggleLink = $('<a class="more-less" href="#show more content" title="' + i18nStrings.showMoreContent + '">' + i18nStrings.displayMoreEllipsis + '</a>').appendTo($subPropParent);
-        
+
         $additionalItems.appendTo($itemContainer);
-        
+
         $itemContainer.hide();
-        
+
         togglePropDisplay.showMore($toggleLink, $itemContainer);
     }
-    
+
 });
diff --git a/webapp/src/main/webapp/js/individual/propertyGroupControls.js b/webapp/src/main/webapp/js/individual/propertyGroupControls.js
index 1a1b4940d..d9636abb6 100644
--- a/webapp/src/main/webapp/js/individual/propertyGroupControls.js
+++ b/webapp/src/main/webapp/js/individual/propertyGroupControls.js
@@ -1,12 +1,12 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
 $(document).ready(function(){
-        
+
     $.extend(this, individualLocalName);
     adjustFontSize();
     padSectionBottoms();
     checkLocationHash();
-    
+
     // ensures that shorter property group sections don't cause the page to "jump around"
     // when the tabs are clicked
     function padSectionBottoms() {
@@ -22,9 +22,9 @@ $(document).ready(function(){
     $.each($('li.clickable'), function() {
         var groupName = $(this).attr("groupName");
         var $propertyGroupLi = $(this);
-        
+
         $(this).click(function() {
-            
+
             if ( $propertyGroupLi.attr("class") == "nonSelectedGroupTab clickable" ) {
                 $.each($('li.selectedGroupTab'), function() {
                     $(this).removeClass("selectedGroupTab clickable");
@@ -41,24 +41,24 @@ $(document).ready(function(){
                 var $visibleSection = $('section.property-group:visible');
                 $visibleSection.hide();
                 $('h2[pgroup=tabs]').addClass("hidden");
-                $('nav#scroller').addClass("hidden"); 
+                $('nav#scroller').addClass("hidden");
                 $('section#' + groupName).show();
             }
             manageLocalStorage();
             return false;
         });
     });
-    
+
     function processViewAllTab() {
         $.each($('section.property-group'), function() {
             $(this).css("margin-bottom", "1px");
             $(this).children('h2').css("margin-top", "-15px").css("border-bottom","1px solid #DFEBE5").css("padding","12px 25px 10px 20px");
-            $(this).show(); 
+            $(this).show();
             $('h2[pgroup=tabs]').removeClass("hidden");
-            $('nav#scroller').removeClass("hidden"); 
-        });        
+            $('nav#scroller').removeClass("hidden");
+        });
     }
-   
+
     // If users click a marker on the home page map, they are taken to the profile
     // page of the corresponding country. The url contains the word "Research" in
     // the location hash. Use this to select the Research tab, which displays the
@@ -67,7 +67,7 @@ $(document).ready(function(){
         if ( location.hash ) {
             // remove the trailing white space
             location.hash = location.hash.replace(/\s+/g, '');
-            if ( location.hash.indexOf("map") >= 0 ) {  
+            if ( location.hash.indexOf("map") >= 0 ) {
                 // get the name of the group that contains the geographicFocusOf property.
                 var tabName = $('h3#geographicFocusOf').parent('article').parent('div').attr("id");
                 tabName = tabName.replace("Group","");
@@ -84,15 +84,15 @@ $(document).ready(function(){
                     $firstTab.addClass("nonSelectedGroupTab clickable");
                     $('section.property-group:visible').hide();
                     // show the selected tab section
-                    $('section#' + tabName).show();                
+                    $('section#' + tabName).show();
                 }
                 // if there is a more link, "click" more to show all the researchers
-                // we need the timeout delay so that the more link can get rendered                
+                // we need the timeout delay so that the more link can get rendered
                 setTimeout(geoFocusExpand,250);
             }
             else {
                 retrieveLocalStorage();
-            }            
+            }
         }
         else {
             retrieveLocalStorage();
@@ -100,7 +100,7 @@ $(document).ready(function(){
     }
 
     function geoFocusExpand() {
-        // if the ontology is set to collate by subclass, $list.length will be > 0 
+        // if the ontology is set to collate by subclass, $list.length will be > 0
         // this ensures both possibilities are covered
         var $list = $('ul#geographicFocusOfList').find('ul');
         if ( $list.length > 0 )
@@ -113,7 +113,7 @@ $(document).ready(function(){
             $more.click();
         }
     }
-    
+
     //  Next two functions --  keep track of which property group tab was selected,
     //  so if we return from a custom form or a related individual, even via the back button,
     //  the same property group will be selected as before.
@@ -151,19 +151,19 @@ $(document).ready(function(){
     }
 
     function retrieveLocalStorage() {
-        
+
         var localName = this.individualLocalName;
         var selectedTab = amplify.store(individualLocalName);
-        
+
         if ( selectedTab != undefined ) {
             var groupName = selectedTab[0];
-            
-            // unlikely, but it's possible a tab that was previously selected and stored won't be 
-            // displayed because the object properties would have been deleted (in non-edit mode). 
-            // So ensure that the tab in local storage has been rendered on the page.     
-            if ( $("ul.propertyTabsList li[groupName='" + groupName + "']").length ) { 
+
+            // unlikely, but it's possible a tab that was previously selected and stored won't be
+            // displayed because the object properties would have been deleted (in non-edit mode).
+            // So ensure that the tab in local storage has been rendered on the page.
+            if ( $("ul.propertyTabsList li[groupName='" + groupName + "']").length ) {
                 // if the selected tab is the default first one, don't do anything
-                if ( $('li.clickable').first().attr("groupName") != groupName ) {   
+                if ( $('li.clickable').first().attr("groupName") != groupName ) {
                     // deselect the default first tab
                     var $firstTab = $('li.clickable').first();
                     $firstTab.removeClass("selectedGroupTab clickable");
@@ -184,7 +184,7 @@ $(document).ready(function(){
             }
         }
     }
-    // if there are so many tabs that they wrap to a second line, adjust the font size to 
+    // if there are so many tabs that they wrap to a second line, adjust the font size to
     //prevent wrapping
     function adjustFontSize() {
         var width = 0;
diff --git a/webapp/src/main/webapp/js/jquery-ui/js/jquery-ui-1.12.1.min.js b/webapp/src/main/webapp/js/jquery-ui/js/jquery-ui-1.12.1.min.js
index 25398a167..862a64986 100644
--- a/webapp/src/main/webapp/js/jquery-ui/js/jquery-ui-1.12.1.min.js
+++ b/webapp/src/main/webapp/js/jquery-ui/js/jquery-ui-1.12.1.min.js
@@ -10,4 +10,4 @@ this.isMultiLine=o||!a&&this._isContentEditable(this.element),this.valueMethod=t
 },_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options,o=this.document[0];return this.relativeContainer=null,n.containment?"window"===n.containment?(this.containment=[t(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,t(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,t(window).scrollLeft()+t(window).width()-this.helperProportions.width-this.margins.left,t(window).scrollTop()+(t(window).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):"document"===n.containment?(this.containment=[0,0,t(o).width()-this.helperProportions.width-this.margins.left,(t(o).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):n.containment.constructor===Array?(this.containment=n.containment,void 0):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=t(n.containment),s=i[0],s&&(e=/(scroll|auto)/.test(i.css("overflow")),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(e?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(e?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=i),void 0):(this.containment=null,void 0)},_convertPositionTo:function(t,e){e||(e=this.position);var i="absolute"===t?1:-1,s=this._isRootNode(this.scrollParent[0]);return{top:e.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.offset.scroll.top:s?0:this.offset.scroll.top)*i,left:e.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.offset.scroll.left:s?0:this.offset.scroll.left)*i}},_generatePosition:function(t,e){var i,s,n,o,a=this.options,r=this._isRootNode(this.scrollParent[0]),h=t.pageX,l=t.pageY;return r&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),e&&(this.containment&&(this.relativeContainer?(s=this.relativeContainer.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,t.pageX-this.offset.click.left<i[0]&&(h=i[0]+this.offset.click.left),t.pageY-this.offset.click.top<i[1]&&(l=i[1]+this.offset.click.top),t.pageX-this.offset.click.left>i[2]&&(h=i[2]+this.offset.click.left),t.pageY-this.offset.click.top>i[3]&&(l=i[3]+this.offset.click.top)),a.grid&&(n=a.grid[1]?this.originalPageY+Math.round((l-this.originalPageY)/a.grid[1])*a.grid[1]:this.originalPageY,l=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-a.grid[1]:n+a.grid[1]:n,o=a.grid[0]?this.originalPageX+Math.round((h-this.originalPageX)/a.grid[0])*a.grid[0]:this.originalPageX,h=i?o-this.offset.click.left>=i[0]||o-this.offset.click.left>i[2]?o:o-this.offset.click.left>=i[0]?o-a.grid[0]:o+a.grid[0]:o),"y"===a.axis&&(h=this.originalPageX),"x"===a.axis&&(l=this.originalPageY)),{top:l-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:r?0:this.offset.scroll.top),left:h-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:r?0:this.offset.scroll.left)}},_clear:function(){this._removeClass(this.helper,"ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_trigger:function(e,i,s){return s=s||this._uiHash(),t.ui.plugin.call(this,e,[i,s,this],!0),/^(drag|start|stop)/.test(e)&&(this.positionAbs=this._convertPositionTo("absolute"),s.offset=this.positionAbs),t.Widget.prototype._trigger.call(this,e,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),t.ui.plugin.add("draggable","connectToSortable",{start:function(e,i,s){var n=t.extend({},i,{item:s.element});s.sortables=[],t(s.options.connectToSortable).each(function(){var i=t(this).sortable("instance");i&&!i.options.disabled&&(s.sortables.push(i),i.refreshPositions(),i._trigger("activate",e,n))})},stop:function(e,i,s){var n=t.extend({},i,{item:s.element});s.cancelHelperRemoval=!1,t.each(s.sortables,function(){var t=this;t.isOver?(t.isOver=0,s.cancelHelperRemoval=!0,t.cancelHelperRemoval=!1,t._storedCSS={position:t.placeholder.css("position"),top:t.placeholder.css("top"),left:t.placeholder.css("left")},t._mouseStop(e),t.options.helper=t.options._helper):(t.cancelHelperRemoval=!0,t._trigger("deactivate",e,n))})},drag:function(e,i,s){t.each(s.sortables,function(){var n=!1,o=this;o.positionAbs=s.positionAbs,o.helperProportions=s.helperProportions,o.offset.click=s.offset.click,o._intersectsWith(o.containerCache)&&(n=!0,t.each(s.sortables,function(){return this.positionAbs=s.positionAbs,this.helperProportions=s.helperProportions,this.offset.click=s.offset.click,this!==o&&this._intersectsWith(this.containerCache)&&t.contains(o.element[0],this.element[0])&&(n=!1),n})),n?(o.isOver||(o.isOver=1,s._parent=i.helper.parent(),o.currentItem=i.helper.appendTo(o.element).data("ui-sortable-item",!0),o.options._helper=o.options.helper,o.options.helper=function(){return i.helper[0]},e.target=o.currentItem[0],o._mouseCapture(e,!0),o._mouseStart(e,!0,!0),o.offset.click.top=s.offset.click.top,o.offset.click.left=s.offset.click.left,o.offset.parent.left-=s.offset.parent.left-o.offset.parent.left,o.offset.parent.top-=s.offset.parent.top-o.offset.parent.top,s._trigger("toSortable",e),s.dropped=o.element,t.each(s.sortables,function(){this.refreshPositions()}),s.currentItem=s.element,o.fromOutside=s),o.currentItem&&(o._mouseDrag(e),i.position=o.position)):o.isOver&&(o.isOver=0,o.cancelHelperRemoval=!0,o.options._revert=o.options.revert,o.options.revert=!1,o._trigger("out",e,o._uiHash(o)),o._mouseStop(e,!0),o.options.revert=o.options._revert,o.options.helper=o.options._helper,o.placeholder&&o.placeholder.remove(),i.helper.appendTo(s._parent),s._refreshOffsets(e),i.position=s._generatePosition(e,!0),s._trigger("fromSortable",e),s.dropped=!1,t.each(s.sortables,function(){this.refreshPositions()}))})}}),t.ui.plugin.add("draggable","cursor",{start:function(e,i,s){var n=t("body"),o=s.options;n.css("cursor")&&(o._cursor=n.css("cursor")),n.css("cursor",o.cursor)},stop:function(e,i,s){var n=s.options;n._cursor&&t("body").css("cursor",n._cursor)}}),t.ui.plugin.add("draggable","opacity",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("opacity")&&(o._opacity=n.css("opacity")),n.css("opacity",o.opacity)},stop:function(e,i,s){var n=s.options;n._opacity&&t(i.helper).css("opacity",n._opacity)}}),t.ui.plugin.add("draggable","scroll",{start:function(t,e,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(e,i,s){var n=s.options,o=!1,a=s.scrollParentNotHidden[0],r=s.document[0];a!==r&&"HTML"!==a.tagName?(n.axis&&"x"===n.axis||(s.overflowOffset.top+a.offsetHeight-e.pageY<n.scrollSensitivity?a.scrollTop=o=a.scrollTop+n.scrollSpeed:e.pageY-s.overflowOffset.top<n.scrollSensitivity&&(a.scrollTop=o=a.scrollTop-n.scrollSpeed)),n.axis&&"y"===n.axis||(s.overflowOffset.left+a.offsetWidth-e.pageX<n.scrollSensitivity?a.scrollLeft=o=a.scrollLeft+n.scrollSpeed:e.pageX-s.overflowOffset.left<n.scrollSensitivity&&(a.scrollLeft=o=a.scrollLeft-n.scrollSpeed))):(n.axis&&"x"===n.axis||(e.pageY-t(r).scrollTop()<n.scrollSensitivity?o=t(r).scrollTop(t(r).scrollTop()-n.scrollSpeed):t(window).height()-(e.pageY-t(r).scrollTop())<n.scrollSensitivity&&(o=t(r).scrollTop(t(r).scrollTop()+n.scrollSpeed))),n.axis&&"y"===n.axis||(e.pageX-t(r).scrollLeft()<n.scrollSensitivity?o=t(r).scrollLeft(t(r).scrollLeft()-n.scrollSpeed):t(window).width()-(e.pageX-t(r).scrollLeft())<n.scrollSensitivity&&(o=t(r).scrollLeft(t(r).scrollLeft()+n.scrollSpeed)))),o!==!1&&t.ui.ddmanager&&!n.dropBehaviour&&t.ui.ddmanager.prepareOffsets(s,e)}}),t.ui.plugin.add("draggable","snap",{start:function(e,i,s){var n=s.options;s.snapElements=[],t(n.snap.constructor!==String?n.snap.items||":data(ui-draggable)":n.snap).each(function(){var e=t(this),i=e.offset();this!==s.element[0]&&s.snapElements.push({item:this,width:e.outerWidth(),height:e.outerHeight(),top:i.top,left:i.left})})},drag:function(e,i,s){var n,o,a,r,h,l,c,u,d,p,f=s.options,g=f.snapTolerance,m=i.offset.left,_=m+s.helperProportions.width,v=i.offset.top,b=v+s.helperProportions.height;for(d=s.snapElements.length-1;d>=0;d--)h=s.snapElements[d].left-s.margins.left,l=h+s.snapElements[d].width,c=s.snapElements[d].top-s.margins.top,u=c+s.snapElements[d].height,h-g>_||m>l+g||c-g>b||v>u+g||!t.contains(s.snapElements[d].item.ownerDocument,s.snapElements[d].item)?(s.snapElements[d].snapping&&s.options.snap.release&&s.options.snap.release.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=!1):("inner"!==f.snapMode&&(n=g>=Math.abs(c-b),o=g>=Math.abs(u-v),a=g>=Math.abs(h-_),r=g>=Math.abs(l-m),n&&(i.position.top=s._convertPositionTo("relative",{top:c-s.helperProportions.height,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h-s.helperProportions.width}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l}).left)),p=n||o||a||r,"outer"!==f.snapMode&&(n=g>=Math.abs(c-v),o=g>=Math.abs(u-b),a=g>=Math.abs(h-m),r=g>=Math.abs(l-_),n&&(i.position.top=s._convertPositionTo("relative",{top:c,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u-s.helperProportions.height,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l-s.helperProportions.width}).left)),!s.snapElements[d].snapping&&(n||o||a||r||p)&&s.options.snap.snap&&s.options.snap.snap.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=n||o||a||r||p)}}),t.ui.plugin.add("draggable","stack",{start:function(e,i,s){var n,o=s.options,a=t.makeArray(t(o.stack)).sort(function(e,i){return(parseInt(t(e).css("zIndex"),10)||0)-(parseInt(t(i).css("zIndex"),10)||0)});a.length&&(n=parseInt(t(a[0]).css("zIndex"),10)||0,t(a).each(function(e){t(this).css("zIndex",n+e)}),this.css("zIndex",n+a.length))}}),t.ui.plugin.add("draggable","zIndex",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("zIndex")&&(o._zIndex=n.css("zIndex")),n.css("zIndex",o.zIndex)},stop:function(e,i,s){var n=s.options;n._zIndex&&t(i.helper).css("zIndex",n._zIndex)}}),t.ui.draggable,t.widget("ui.resizable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,classes:{"ui-resizable-se":"ui-icon ui-icon-gripsmall-diagonal-se"},containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(t){return parseFloat(t)||0},_isNumber:function(t){return!isNaN(parseFloat(t))},_hasScroll:function(e,i){if("hidden"===t(e).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return e[s]>0?!0:(e[s]=1,n=e[s]>0,e[s]=0,n)},_create:function(){var e,i=this.options,s=this;this._addClass("ui-resizable"),t.extend(this,{_aspectRatio:!!i.aspectRatio,aspectRatio:i.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:i.helper||i.ghost||i.animate?i.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(t("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,e={marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom"),marginLeft:this.originalElement.css("marginLeft")},this.element.css(e),this.originalElement.css("margin",0),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css(e),this._proportionallyResize()),this._setupHandles(),i.autoHide&&t(this.element).on("mouseenter",function(){i.disabled||(s._removeClass("ui-resizable-autohide"),s._handles.show())}).on("mouseleave",function(){i.disabled||s.resizing||(s._addClass("ui-resizable-autohide"),s._handles.hide())}),this._mouseInit()},_destroy:function(){this._mouseDestroy();var e,i=function(e){t(e).removeData("resizable").removeData("ui-resizable").off(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_setOption:function(t,e){switch(this._super(t,e),t){case"handles":this._removeHandles(),this._setupHandles();break;default:}},_setupHandles:function(){var e,i,s,n,o,a=this.options,r=this;if(this.handles=a.handles||(t(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=t(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),s=this.handles.split(","),this.handles={},i=0;s.length>i;i++)e=t.trim(s[i]),n="ui-resizable-"+e,o=t("<div>"),this._addClass(o,"ui-resizable-handle "+n),o.css({zIndex:a.zIndex}),this.handles[e]=".ui-resizable-"+e,this.element.append(o);this._renderAxis=function(e){var i,s,n,o;e=e||this.element;for(i in this.handles)this.handles[i].constructor===String?this.handles[i]=this.element.children(this.handles[i]).first().show():(this.handles[i].jquery||this.handles[i].nodeType)&&(this.handles[i]=t(this.handles[i]),this._on(this.handles[i],{mousedown:r._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(s=t(this.handles[i],this.element),o=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),e.css(n,o),this._proportionallyResize()),this._handles=this._handles.add(this.handles[i])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.on("mouseover",function(){r.resizing||(this.className&&(o=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),r.axis=o&&o[1]?o[1]:"se")}),a.autoHide&&(this._handles.hide(),this._addClass("ui-resizable-autohide"))},_removeHandles:function(){this._handles.remove()},_mouseCapture:function(e){var i,s,n=!1;for(i in this.handles)s=t(this.handles[i])[0],(s===e.target||t.contains(s,e.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(e){var i,s,n,o=this.options,a=this.element;return this.resizing=!0,this._renderProxy(),i=this._num(this.helper.css("left")),s=this._num(this.helper.css("top")),o.containment&&(i+=t(o.containment).scrollLeft()||0,s+=t(o.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:i,top:s},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:a.width(),height:a.height()},this.originalSize=this._helper?{width:a.outerWidth(),height:a.outerHeight()}:{width:a.width(),height:a.height()},this.sizeDiff={width:a.outerWidth()-a.width(),height:a.outerHeight()-a.height()},this.originalPosition={left:i,top:s},this.originalMousePosition={left:e.pageX,top:e.pageY},this.aspectRatio="number"==typeof o.aspectRatio?o.aspectRatio:this.originalSize.width/this.originalSize.height||1,n=t(".ui-resizable-"+this.axis).css("cursor"),t("body").css("cursor","auto"===n?this.axis+"-resize":n),this._addClass("ui-resizable-resizing"),this._propagate("start",e),!0},_mouseDrag:function(e){var i,s,n=this.originalMousePosition,o=this.axis,a=e.pageX-n.left||0,r=e.pageY-n.top||0,h=this._change[o];return this._updatePrevProperties(),h?(i=h.apply(this,[e,a,r]),this._updateVirtualBoundaries(e.shiftKey),(this._aspectRatio||e.shiftKey)&&(i=this._updateRatio(i,e)),i=this._respectSize(i,e),this._updateCache(i),this._propagate("resize",e),s=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),t.isEmptyObject(s)||(this._updatePrevProperties(),this._trigger("resize",e,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(e){this.resizing=!1;var i,s,n,o,a,r,h,l=this.options,c=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&this._hasScroll(i[0],"left")?0:c.sizeDiff.height,o=s?0:c.sizeDiff.width,a={width:c.helper.width()-o,height:c.helper.height()-n},r=parseFloat(c.element.css("left"))+(c.position.left-c.originalPosition.left)||null,h=parseFloat(c.element.css("top"))+(c.position.top-c.originalPosition.top)||null,l.animate||this.element.css(t.extend(a,{top:h,left:r})),c.helper.height(c.size.height),c.helper.width(c.size.width),this._helper&&!l.animate&&this._proportionallyResize()),t("body").css("cursor","auto"),this._removeClass("ui-resizable-resizing"),this._propagate("stop",e),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var t={};return this.position.top!==this.prevPosition.top&&(t.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(t.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(t.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(t.height=this.size.height+"px"),this.helper.css(t),t},_updateVirtualBoundaries:function(t){var e,i,s,n,o,a=this.options;o={minWidth:this._isNumber(a.minWidth)?a.minWidth:0,maxWidth:this._isNumber(a.maxWidth)?a.maxWidth:1/0,minHeight:this._isNumber(a.minHeight)?a.minHeight:0,maxHeight:this._isNumber(a.maxHeight)?a.maxHeight:1/0},(this._aspectRatio||t)&&(e=o.minHeight*this.aspectRatio,s=o.minWidth/this.aspectRatio,i=o.maxHeight*this.aspectRatio,n=o.maxWidth/this.aspectRatio,e>o.minWidth&&(o.minWidth=e),s>o.minHeight&&(o.minHeight=s),o.maxWidth>i&&(o.maxWidth=i),o.maxHeight>n&&(o.maxHeight=n)),this._vBoundaries=o},_updateCache:function(t){this.offset=this.helper.offset(),this._isNumber(t.left)&&(this.position.left=t.left),this._isNumber(t.top)&&(this.position.top=t.top),this._isNumber(t.height)&&(this.size.height=t.height),this._isNumber(t.width)&&(this.size.width=t.width)},_updateRatio:function(t){var e=this.position,i=this.size,s=this.axis;return this._isNumber(t.height)?t.width=t.height*this.aspectRatio:this._isNumber(t.width)&&(t.height=t.width/this.aspectRatio),"sw"===s&&(t.left=e.left+(i.width-t.width),t.top=null),"nw"===s&&(t.top=e.top+(i.height-t.height),t.left=e.left+(i.width-t.width)),t},_respectSize:function(t){var e=this._vBoundaries,i=this.axis,s=this._isNumber(t.width)&&e.maxWidth&&e.maxWidth<t.width,n=this._isNumber(t.height)&&e.maxHeight&&e.maxHeight<t.height,o=this._isNumber(t.width)&&e.minWidth&&e.minWidth>t.width,a=this._isNumber(t.height)&&e.minHeight&&e.minHeight>t.height,r=this.originalPosition.left+this.originalSize.width,h=this.originalPosition.top+this.originalSize.height,l=/sw|nw|w/.test(i),c=/nw|ne|n/.test(i);return o&&(t.width=e.minWidth),a&&(t.height=e.minHeight),s&&(t.width=e.maxWidth),n&&(t.height=e.maxHeight),o&&l&&(t.left=r-e.minWidth),s&&l&&(t.left=r-e.maxWidth),a&&c&&(t.top=h-e.minHeight),n&&c&&(t.top=h-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_getPaddingPlusBorderDimensions:function(t){for(var e=0,i=[],s=[t.css("borderTopWidth"),t.css("borderRightWidth"),t.css("borderBottomWidth"),t.css("borderLeftWidth")],n=[t.css("paddingTop"),t.css("paddingRight"),t.css("paddingBottom"),t.css("paddingLeft")];4>e;e++)i[e]=parseFloat(s[e])||0,i[e]+=parseFloat(n[e])||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var t,e=0,i=this.helper||this.element;this._proportionallyResizeElements.length>e;e++)t=this._proportionallyResizeElements[e],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(t)),t.css({height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var e=this.element,i=this.options;this.elementOffset=e.offset(),this._helper?(this.helper=this.helper||t("<div style='overflow:hidden;'></div>"),this._addClass(this.helper,this._helper),this.helper.css({width:this.element.outerWidth(),height:this.element.outerHeight(),position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize,s=this.originalPosition;return{left:s.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},sw:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,i,s]))},ne:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},nw:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,i,s]))}},_propagate:function(e,i){t.ui.plugin.call(this,e,[i,this.ui()]),"resize"!==e&&this._trigger(e,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),t.ui.plugin.add("resizable","animate",{stop:function(e){var i=t(this).resizable("instance"),s=i.options,n=i._proportionallyResizeElements,o=n.length&&/textarea/i.test(n[0].nodeName),a=o&&i._hasScroll(n[0],"left")?0:i.sizeDiff.height,r=o?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-a},l=parseFloat(i.element.css("left"))+(i.position.left-i.originalPosition.left)||null,c=parseFloat(i.element.css("top"))+(i.position.top-i.originalPosition.top)||null;i.element.animate(t.extend(h,c&&l?{top:c,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseFloat(i.element.css("width")),height:parseFloat(i.element.css("height")),top:parseFloat(i.element.css("top")),left:parseFloat(i.element.css("left"))};n&&n.length&&t(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",e)}})}}),t.ui.plugin.add("resizable","containment",{start:function(){var e,i,s,n,o,a,r,h=t(this).resizable("instance"),l=h.options,c=h.element,u=l.containment,d=u instanceof t?u.get(0):/parent/.test(u)?c.parent().get(0):u;d&&(h.containerElement=t(d),/document/.test(u)||u===document?(h.containerOffset={left:0,top:0},h.containerPosition={left:0,top:0},h.parentData={element:t(document),left:0,top:0,width:t(document).width(),height:t(document).height()||document.body.parentNode.scrollHeight}):(e=t(d),i=[],t(["Top","Right","Left","Bottom"]).each(function(t,s){i[t]=h._num(e.css("padding"+s))}),h.containerOffset=e.offset(),h.containerPosition=e.position(),h.containerSize={height:e.innerHeight()-i[3],width:e.innerWidth()-i[1]},s=h.containerOffset,n=h.containerSize.height,o=h.containerSize.width,a=h._hasScroll(d,"left")?d.scrollWidth:o,r=h._hasScroll(d)?d.scrollHeight:n,h.parentData={element:d,left:s.left,top:s.top,width:a,height:r}))},resize:function(e){var i,s,n,o,a=t(this).resizable("instance"),r=a.options,h=a.containerOffset,l=a.position,c=a._aspectRatio||e.shiftKey,u={top:0,left:0},d=a.containerElement,p=!0;d[0]!==document&&/static/.test(d.css("position"))&&(u=h),l.left<(a._helper?h.left:0)&&(a.size.width=a.size.width+(a._helper?a.position.left-h.left:a.position.left-u.left),c&&(a.size.height=a.size.width/a.aspectRatio,p=!1),a.position.left=r.helper?h.left:0),l.top<(a._helper?h.top:0)&&(a.size.height=a.size.height+(a._helper?a.position.top-h.top:a.position.top),c&&(a.size.width=a.size.height*a.aspectRatio,p=!1),a.position.top=a._helper?h.top:0),n=a.containerElement.get(0)===a.element.parent().get(0),o=/relative|absolute/.test(a.containerElement.css("position")),n&&o?(a.offset.left=a.parentData.left+a.position.left,a.offset.top=a.parentData.top+a.position.top):(a.offset.left=a.element.offset().left,a.offset.top=a.element.offset().top),i=Math.abs(a.sizeDiff.width+(a._helper?a.offset.left-u.left:a.offset.left-h.left)),s=Math.abs(a.sizeDiff.height+(a._helper?a.offset.top-u.top:a.offset.top-h.top)),i+a.size.width>=a.parentData.width&&(a.size.width=a.parentData.width-i,c&&(a.size.height=a.size.width/a.aspectRatio,p=!1)),s+a.size.height>=a.parentData.height&&(a.size.height=a.parentData.height-s,c&&(a.size.width=a.size.height*a.aspectRatio,p=!1)),p||(a.position.left=a.prevPosition.left,a.position.top=a.prevPosition.top,a.size.width=a.prevSize.width,a.size.height=a.prevSize.height)},stop:function(){var e=t(this).resizable("instance"),i=e.options,s=e.containerOffset,n=e.containerPosition,o=e.containerElement,a=t(e.helper),r=a.offset(),h=a.outerWidth()-e.sizeDiff.width,l=a.outerHeight()-e.sizeDiff.height;e._helper&&!i.animate&&/relative/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l}),e._helper&&!i.animate&&/static/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),t.ui.plugin.add("resizable","alsoResize",{start:function(){var e=t(this).resizable("instance"),i=e.options;t(i.alsoResize).each(function(){var e=t(this);e.data("ui-resizable-alsoresize",{width:parseFloat(e.width()),height:parseFloat(e.height()),left:parseFloat(e.css("left")),top:parseFloat(e.css("top"))})})},resize:function(e,i){var s=t(this).resizable("instance"),n=s.options,o=s.originalSize,a=s.originalPosition,r={height:s.size.height-o.height||0,width:s.size.width-o.width||0,top:s.position.top-a.top||0,left:s.position.left-a.left||0};t(n.alsoResize).each(function(){var e=t(this),s=t(this).data("ui-resizable-alsoresize"),n={},o=e.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];t.each(o,function(t,e){var i=(s[e]||0)+(r[e]||0);i&&i>=0&&(n[e]=i||null)}),e.css(n)})},stop:function(){t(this).removeData("ui-resizable-alsoresize")}}),t.ui.plugin.add("resizable","ghost",{start:function(){var e=t(this).resizable("instance"),i=e.size;e.ghost=e.originalElement.clone(),e.ghost.css({opacity:.25,display:"block",position:"relative",height:i.height,width:i.width,margin:0,left:0,top:0}),e._addClass(e.ghost,"ui-resizable-ghost"),t.uiBackCompat!==!1&&"string"==typeof e.options.ghost&&e.ghost.addClass(this.options.ghost),e.ghost.appendTo(e.helper)},resize:function(){var e=t(this).resizable("instance");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=t(this).resizable("instance");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}}),t.ui.plugin.add("resizable","grid",{resize:function(){var e,i=t(this).resizable("instance"),s=i.options,n=i.size,o=i.originalSize,a=i.originalPosition,r=i.axis,h="number"==typeof s.grid?[s.grid,s.grid]:s.grid,l=h[0]||1,c=h[1]||1,u=Math.round((n.width-o.width)/l)*l,d=Math.round((n.height-o.height)/c)*c,p=o.width+u,f=o.height+d,g=s.maxWidth&&p>s.maxWidth,m=s.maxHeight&&f>s.maxHeight,_=s.minWidth&&s.minWidth>p,v=s.minHeight&&s.minHeight>f;s.grid=h,_&&(p+=l),v&&(f+=c),g&&(p-=l),m&&(f-=c),/^(se|s|e)$/.test(r)?(i.size.width=p,i.size.height=f):/^(ne)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.top=a.top-d):/^(sw)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.left=a.left-u):((0>=f-c||0>=p-l)&&(e=i._getPaddingPlusBorderDimensions(this)),f-c>0?(i.size.height=f,i.position.top=a.top-d):(f=c-e.height,i.size.height=f,i.position.top=a.top+o.height-f),p-l>0?(i.size.width=p,i.position.left=a.left-u):(p=l-e.width,i.size.width=p,i.position.left=a.left+o.width-p))}}),t.ui.resizable,t.widget("ui.dialog",{version:"1.12.1",options:{appendTo:"body",autoOpen:!0,buttons:[],classes:{"ui-dialog":"ui-corner-all","ui-dialog-titlebar":"ui-corner-all"},closeOnEscape:!0,closeText:"Close",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(e){var i=t(this).css(e).offset().top;0>i&&t(this).css("top",e.top-i)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),null==this.options.title&&null!=this.originalTitle&&(this.options.title=this.originalTitle),this.options.disabled&&(this.options.disabled=!1),this._createWrapper(),this.element.show().removeAttr("title").appendTo(this.uiDialog),this._addClass("ui-dialog-content","ui-widget-content"),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&t.fn.draggable&&this._makeDraggable(),this.options.resizable&&t.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var e=this.options.appendTo;return e&&(e.jquery||e.nodeType)?t(e):this.document.find(e||"body").eq(0)},_destroy:function(){var t,e=this.originalPosition;this._untrackInstance(),this._destroyOverlay(),this.element.removeUniqueId().css(this.originalCss).detach(),this.uiDialog.remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),t=e.parent.children().eq(e.index),t.length&&t[0]!==this.element[0]?t.before(this.element):e.parent.append(this.element)},widget:function(){return this.uiDialog
 },disable:t.noop,enable:t.noop,close:function(e){var i=this;this._isOpen&&this._trigger("beforeClose",e)!==!1&&(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),this.opener.filter(":focusable").trigger("focus").length||t.ui.safeBlur(t.ui.safeActiveElement(this.document[0])),this._hide(this.uiDialog,this.options.hide,function(){i._trigger("close",e)}))},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(e,i){var s=!1,n=this.uiDialog.siblings(".ui-front:visible").map(function(){return+t(this).css("z-index")}).get(),o=Math.max.apply(null,n);return o>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",o+1),s=!0),s&&!i&&this._trigger("focus",e),s},open:function(){var e=this;return this._isOpen?(this._moveToTop()&&this._focusTabbable(),void 0):(this._isOpen=!0,this.opener=t(t.ui.safeActiveElement(this.document[0])),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){e._focusTabbable(),e._trigger("focus")}),this._makeFocusTarget(),this._trigger("open"),void 0)},_focusTabbable:function(){var t=this._focusedElement;t||(t=this.element.find("[autofocus]")),t.length||(t=this.element.find(":tabbable")),t.length||(t=this.uiDialogButtonPane.find(":tabbable")),t.length||(t=this.uiDialogTitlebarClose.filter(":tabbable")),t.length||(t=this.uiDialog),t.eq(0).trigger("focus")},_keepFocus:function(e){function i(){var e=t.ui.safeActiveElement(this.document[0]),i=this.uiDialog[0]===e||t.contains(this.uiDialog[0],e);i||this._focusTabbable()}e.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=t("<div>").hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._addClass(this.uiDialog,"ui-dialog","ui-widget ui-widget-content ui-front"),this._on(this.uiDialog,{keydown:function(e){if(this.options.closeOnEscape&&!e.isDefaultPrevented()&&e.keyCode&&e.keyCode===t.ui.keyCode.ESCAPE)return e.preventDefault(),this.close(e),void 0;if(e.keyCode===t.ui.keyCode.TAB&&!e.isDefaultPrevented()){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");e.target!==n[0]&&e.target!==this.uiDialog[0]||e.shiftKey?e.target!==s[0]&&e.target!==this.uiDialog[0]||!e.shiftKey||(this._delay(function(){n.trigger("focus")}),e.preventDefault()):(this._delay(function(){s.trigger("focus")}),e.preventDefault())}},mousedown:function(t){this._moveToTop(t)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var e;this.uiDialogTitlebar=t("<div>"),this._addClass(this.uiDialogTitlebar,"ui-dialog-titlebar","ui-widget-header ui-helper-clearfix"),this._on(this.uiDialogTitlebar,{mousedown:function(e){t(e.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.trigger("focus")}}),this.uiDialogTitlebarClose=t("<button type='button'></button>").button({label:t("<a>").text(this.options.closeText).html(),icon:"ui-icon-closethick",showLabel:!1}).appendTo(this.uiDialogTitlebar),this._addClass(this.uiDialogTitlebarClose,"ui-dialog-titlebar-close"),this._on(this.uiDialogTitlebarClose,{click:function(t){t.preventDefault(),this.close(t)}}),e=t("<span>").uniqueId().prependTo(this.uiDialogTitlebar),this._addClass(e,"ui-dialog-title"),this._title(e),this.uiDialogTitlebar.prependTo(this.uiDialog),this.uiDialog.attr({"aria-labelledby":e.attr("id")})},_title:function(t){this.options.title?t.text(this.options.title):t.html("&#160;")},_createButtonPane:function(){this.uiDialogButtonPane=t("<div>"),this._addClass(this.uiDialogButtonPane,"ui-dialog-buttonpane","ui-widget-content ui-helper-clearfix"),this.uiButtonSet=t("<div>").appendTo(this.uiDialogButtonPane),this._addClass(this.uiButtonSet,"ui-dialog-buttonset"),this._createButtons()},_createButtons:function(){var e=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),t.isEmptyObject(i)||t.isArray(i)&&!i.length?(this._removeClass(this.uiDialog,"ui-dialog-buttons"),void 0):(t.each(i,function(i,s){var n,o;s=t.isFunction(s)?{click:s,text:i}:s,s=t.extend({type:"button"},s),n=s.click,o={icon:s.icon,iconPosition:s.iconPosition,showLabel:s.showLabel,icons:s.icons,text:s.text},delete s.click,delete s.icon,delete s.iconPosition,delete s.showLabel,delete s.icons,"boolean"==typeof s.text&&delete s.text,t("<button></button>",s).button(o).appendTo(e.uiButtonSet).on("click",function(){n.apply(e.element[0],arguments)})}),this._addClass(this.uiDialog,"ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),void 0)},_makeDraggable:function(){function e(t){return{position:t.position,offset:t.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){i._addClass(t(this),"ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,e(n))},drag:function(t,s){i._trigger("drag",t,e(s))},stop:function(n,o){var a=o.offset.left-i.document.scrollLeft(),r=o.offset.top-i.document.scrollTop();s.position={my:"left top",at:"left"+(a>=0?"+":"")+a+" "+"top"+(r>=0?"+":"")+r,of:i.window},i._removeClass(t(this),"ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,e(o))}})},_makeResizable:function(){function e(t){return{originalPosition:t.originalPosition,originalSize:t.originalSize,position:t.position,size:t.size}}var i=this,s=this.options,n=s.resizable,o=this.uiDialog.css("position"),a="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:a,start:function(s,n){i._addClass(t(this),"ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,e(n))},resize:function(t,s){i._trigger("resize",t,e(s))},stop:function(n,o){var a=i.uiDialog.offset(),r=a.left-i.document.scrollLeft(),h=a.top-i.document.scrollTop();s.height=i.uiDialog.height(),s.width=i.uiDialog.width(),s.position={my:"left top",at:"left"+(r>=0?"+":"")+r+" "+"top"+(h>=0?"+":"")+h,of:i.window},i._removeClass(t(this),"ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,e(o))}}).css("position",o)},_trackFocus:function(){this._on(this.widget(),{focusin:function(e){this._makeFocusTarget(),this._focusedElement=t(e.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var e=this._trackingInstances(),i=t.inArray(this,e);-1!==i&&e.splice(i,1)},_trackingInstances:function(){var t=this.document.data("ui-dialog-instances");return t||(t=[],this.document.data("ui-dialog-instances",t)),t},_minHeight:function(){var t=this.options;return"auto"===t.height?t.minHeight:Math.min(t.minHeight,t.height)},_position:function(){var t=this.uiDialog.is(":visible");t||this.uiDialog.show(),this.uiDialog.position(this.options.position),t||this.uiDialog.hide()},_setOptions:function(e){var i=this,s=!1,n={};t.each(e,function(t,e){i._setOption(t,e),t in i.sizeRelatedOptions&&(s=!0),t in i.resizableRelatedOptions&&(n[t]=e)}),s&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",n)},_setOption:function(e,i){var s,n,o=this.uiDialog;"disabled"!==e&&(this._super(e,i),"appendTo"===e&&this.uiDialog.appendTo(this._appendTo()),"buttons"===e&&this._createButtons(),"closeText"===e&&this.uiDialogTitlebarClose.button({label:t("<a>").text(""+this.options.closeText).html()}),"draggable"===e&&(s=o.is(":data(ui-draggable)"),s&&!i&&o.draggable("destroy"),!s&&i&&this._makeDraggable()),"position"===e&&this._position(),"resizable"===e&&(n=o.is(":data(ui-resizable)"),n&&!i&&o.resizable("destroy"),n&&"string"==typeof i&&o.resizable("option","handles",i),n||i===!1||this._makeResizable()),"title"===e&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var t,e,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),t=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),e=Math.max(0,s.minHeight-t),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-t):"none","auto"===s.height?this.element.css({minHeight:e,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-t)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var e=t(this);return t("<div>").css({position:"absolute",width:e.outerWidth(),height:e.outerHeight()}).appendTo(e.parent()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(e){return t(e.target).closest(".ui-dialog").length?!0:!!t(e.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var e=!0;this._delay(function(){e=!1}),this.document.data("ui-dialog-overlays")||this._on(this.document,{focusin:function(t){e||this._allowInteraction(t)||(t.preventDefault(),this._trackingInstances()[0]._focusTabbable())}}),this.overlay=t("<div>").appendTo(this._appendTo()),this._addClass(this.overlay,null,"ui-widget-overlay ui-front"),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var t=this.document.data("ui-dialog-overlays")-1;t?this.document.data("ui-dialog-overlays",t):(this._off(this.document,"focusin"),this.document.removeData("ui-dialog-overlays")),this.overlay.remove(),this.overlay=null}}}),t.uiBackCompat!==!1&&t.widget("ui.dialog",t.ui.dialog,{options:{dialogClass:""},_createWrapper:function(){this._super(),this.uiDialog.addClass(this.options.dialogClass)},_setOption:function(t,e){"dialogClass"===t&&this.uiDialog.removeClass(this.options.dialogClass).addClass(e),this._superApply(arguments)}}),t.ui.dialog,t.widget("ui.droppable",{version:"1.12.1",widgetEventPrefix:"drop",options:{accept:"*",addClasses:!0,greedy:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var e,i=this.options,s=i.accept;this.isover=!1,this.isout=!0,this.accept=t.isFunction(s)?s:function(t){return t.is(s)},this.proportions=function(){return arguments.length?(e=arguments[0],void 0):e?e:e={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},this._addToManager(i.scope),i.addClasses&&this._addClass("ui-droppable")},_addToManager:function(e){t.ui.ddmanager.droppables[e]=t.ui.ddmanager.droppables[e]||[],t.ui.ddmanager.droppables[e].push(this)},_splice:function(t){for(var e=0;t.length>e;e++)t[e]===this&&t.splice(e,1)},_destroy:function(){var e=t.ui.ddmanager.droppables[this.options.scope];this._splice(e)},_setOption:function(e,i){if("accept"===e)this.accept=t.isFunction(i)?i:function(t){return t.is(i)};else if("scope"===e){var s=t.ui.ddmanager.droppables[this.options.scope];this._splice(s),this._addToManager(i)}this._super(e,i)},_activate:function(e){var i=t.ui.ddmanager.current;this._addActiveClass(),i&&this._trigger("activate",e,this.ui(i))},_deactivate:function(e){var i=t.ui.ddmanager.current;this._removeActiveClass(),i&&this._trigger("deactivate",e,this.ui(i))},_over:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this._addHoverClass(),this._trigger("over",e,this.ui(i)))},_out:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this._removeHoverClass(),this._trigger("out",e,this.ui(i)))},_drop:function(e,i){var s=i||t.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var i=t(this).droppable("instance");return i.options.greedy&&!i.options.disabled&&i.options.scope===s.options.scope&&i.accept.call(i.element[0],s.currentItem||s.element)&&v(s,t.extend(i,{offset:i.element.offset()}),i.options.tolerance,e)?(n=!0,!1):void 0}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this._removeActiveClass(),this._removeHoverClass(),this._trigger("drop",e,this.ui(s)),this.element):!1):!1},ui:function(t){return{draggable:t.currentItem||t.element,helper:t.helper,position:t.position,offset:t.positionAbs}},_addHoverClass:function(){this._addClass("ui-droppable-hover")},_removeHoverClass:function(){this._removeClass("ui-droppable-hover")},_addActiveClass:function(){this._addClass("ui-droppable-active")},_removeActiveClass:function(){this._removeClass("ui-droppable-active")}});var v=t.ui.intersect=function(){function t(t,e,i){return t>=e&&e+i>t}return function(e,i,s,n){if(!i.offset)return!1;var o=(e.positionAbs||e.position.absolute).left+e.margins.left,a=(e.positionAbs||e.position.absolute).top+e.margins.top,r=o+e.helperProportions.width,h=a+e.helperProportions.height,l=i.offset.left,c=i.offset.top,u=l+i.proportions().width,d=c+i.proportions().height;switch(s){case"fit":return o>=l&&u>=r&&a>=c&&d>=h;case"intersect":return o+e.helperProportions.width/2>l&&u>r-e.helperProportions.width/2&&a+e.helperProportions.height/2>c&&d>h-e.helperProportions.height/2;case"pointer":return t(n.pageY,c,i.proportions().height)&&t(n.pageX,l,i.proportions().width);case"touch":return(a>=c&&d>=a||h>=c&&d>=h||c>a&&h>d)&&(o>=l&&u>=o||r>=l&&u>=r||l>o&&r>u);default:return!1}}}();t.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(e,i){var s,n,o=t.ui.ddmanager.droppables[e.options.scope]||[],a=i?i.type:null,r=(e.currentItem||e.element).find(":data(ui-droppable)").addBack();t:for(s=0;o.length>s;s++)if(!(o[s].options.disabled||e&&!o[s].accept.call(o[s].element[0],e.currentItem||e.element))){for(n=0;r.length>n;n++)if(r[n]===o[s].element[0]){o[s].proportions().height=0;continue t}o[s].visible="none"!==o[s].element.css("display"),o[s].visible&&("mousedown"===a&&o[s]._activate.call(o[s],i),o[s].offset=o[s].element.offset(),o[s].proportions({width:o[s].element[0].offsetWidth,height:o[s].element[0].offsetHeight}))}},drop:function(e,i){var s=!1;return t.each((t.ui.ddmanager.droppables[e.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&v(e,this,this.options.tolerance,i)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],e.currentItem||e.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(e,i){e.element.parentsUntil("body").on("scroll.droppable",function(){e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)})},drag:function(e,i){e.options.refreshPositions&&t.ui.ddmanager.prepareOffsets(e,i),t.each(t.ui.ddmanager.droppables[e.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,o,a=v(e,this,this.options.tolerance,i),r=!a&&this.isover?"isout":a&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,o=this.element.parents(":data(ui-droppable)").filter(function(){return t(this).droppable("instance").options.scope===n}),o.length&&(s=t(o[0]).droppable("instance"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(e,i){e.element.parentsUntil("body").off("scroll.droppable"),e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)}},t.uiBackCompat!==!1&&t.widget("ui.droppable",t.ui.droppable,{options:{hoverClass:!1,activeClass:!1},_addActiveClass:function(){this._super(),this.options.activeClass&&this.element.addClass(this.options.activeClass)},_removeActiveClass:function(){this._super(),this.options.activeClass&&this.element.removeClass(this.options.activeClass)},_addHoverClass:function(){this._super(),this.options.hoverClass&&this.element.addClass(this.options.hoverClass)},_removeHoverClass:function(){this._super(),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass)}}),t.ui.droppable,t.widget("ui.progressbar",{version:"1.12.1",options:{classes:{"ui-progressbar":"ui-corner-all","ui-progressbar-value":"ui-corner-left","ui-progressbar-complete":"ui-corner-right"},max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.attr({role:"progressbar","aria-valuemin":this.min}),this._addClass("ui-progressbar","ui-widget ui-widget-content"),this.valueDiv=t("<div>").appendTo(this.element),this._addClass(this.valueDiv,"ui-progressbar-value","ui-widget-header"),this._refreshValue()},_destroy:function(){this.element.removeAttr("role aria-valuemin aria-valuemax aria-valuenow"),this.valueDiv.remove()},value:function(t){return void 0===t?this.options.value:(this.options.value=this._constrainedValue(t),this._refreshValue(),void 0)},_constrainedValue:function(t){return void 0===t&&(t=this.options.value),this.indeterminate=t===!1,"number"!=typeof t&&(t=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,t))},_setOptions:function(t){var e=t.value;delete t.value,this._super(t),this.options.value=this._constrainedValue(e),this._refreshValue()},_setOption:function(t,e){"max"===t&&(e=Math.max(this.min,e)),this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var e=this.options.value,i=this._percentage();this.valueDiv.toggle(this.indeterminate||e>this.min).width(i.toFixed(0)+"%"),this._toggleClass(this.valueDiv,"ui-progressbar-complete",null,e===this.options.max)._toggleClass("ui-progressbar-indeterminate",null,this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=t("<div>").appendTo(this.valueDiv),this._addClass(this.overlayDiv,"ui-progressbar-overlay"))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":e}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==e&&(this.oldValue=e,this._trigger("change")),e===this.options.max&&this._trigger("complete")}}),t.widget("ui.selectable",t.ui.mouse,{version:"1.12.1",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var e=this;this._addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){e.elementPos=t(e.element[0]).offset(),e.selectees=t(e.options.filter,e.element[0]),e._addClass(e.selectees,"ui-selectee"),e.selectees.each(function(){var i=t(this),s=i.offset(),n={left:s.left-e.elementPos.left,top:s.top-e.elementPos.top};t.data(this,"selectable-item",{element:this,$element:i,left:n.left,top:n.top,right:n.left+i.outerWidth(),bottom:n.top+i.outerHeight(),startselected:!1,selected:i.hasClass("ui-selected"),selecting:i.hasClass("ui-selecting"),unselecting:i.hasClass("ui-unselecting")})})},this.refresh(),this._mouseInit(),this.helper=t("<div>"),this._addClass(this.helper,"ui-selectable-helper")},_destroy:function(){this.selectees.removeData("selectable-item"),this._mouseDestroy()},_mouseStart:function(e){var i=this,s=this.options;this.opos=[e.pageX,e.pageY],this.elementPos=t(this.element[0]).offset(),this.options.disabled||(this.selectees=t(s.filter,this.element[0]),this._trigger("start",e),t(s.appendTo).append(this.helper),this.helper.css({left:e.pageX,top:e.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=t.data(this,"selectable-item");s.startselected=!0,e.metaKey||e.ctrlKey||(i._removeClass(s.$element,"ui-selected"),s.selected=!1,i._addClass(s.$element,"ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",e,{unselecting:s.element}))}),t(e.target).parents().addBack().each(function(){var s,n=t.data(this,"selectable-item");return n?(s=!e.metaKey&&!e.ctrlKey||!n.$element.hasClass("ui-selected"),i._removeClass(n.$element,s?"ui-unselecting":"ui-selected")._addClass(n.$element,s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",e,{selecting:n.element}):i._trigger("unselecting",e,{unselecting:n.element}),!1):void 0}))},_mouseDrag:function(e){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,o=this.opos[0],a=this.opos[1],r=e.pageX,h=e.pageY;return o>r&&(i=r,r=o,o=i),a>h&&(i=h,h=a,a=i),this.helper.css({left:o,top:a,width:r-o,height:h-a}),this.selectees.each(function(){var i=t.data(this,"selectable-item"),l=!1,c={};i&&i.element!==s.element[0]&&(c.left=i.left+s.elementPos.left,c.right=i.right+s.elementPos.left,c.top=i.top+s.elementPos.top,c.bottom=i.bottom+s.elementPos.top,"touch"===n.tolerance?l=!(c.left>r||o>c.right||c.top>h||a>c.bottom):"fit"===n.tolerance&&(l=c.left>o&&r>c.right&&c.top>a&&h>c.bottom),l?(i.selected&&(s._removeClass(i.$element,"ui-selected"),i.selected=!1),i.unselecting&&(s._removeClass(i.$element,"ui-unselecting"),i.unselecting=!1),i.selecting||(s._addClass(i.$element,"ui-selecting"),i.selecting=!0,s._trigger("selecting",e,{selecting:i.element}))):(i.selecting&&((e.metaKey||e.ctrlKey)&&i.startselected?(s._removeClass(i.$element,"ui-selecting"),i.selecting=!1,s._addClass(i.$element,"ui-selected"),i.selected=!0):(s._removeClass(i.$element,"ui-selecting"),i.selecting=!1,i.startselected&&(s._addClass(i.$element,"ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",e,{unselecting:i.element}))),i.selected&&(e.metaKey||e.ctrlKey||i.startselected||(s._removeClass(i.$element,"ui-selected"),i.selected=!1,s._addClass(i.$element,"ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",e,{unselecting:i.element})))))}),!1}},_mouseStop:function(e){var i=this;return this.dragged=!1,t(".ui-unselecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");i._removeClass(s.$element,"ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",e,{unselected:s.element})}),t(".ui-selecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");i._removeClass(s.$element,"ui-selecting")._addClass(s.$element,"ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",e,{selected:s.element})}),this._trigger("stop",e),this.helper.remove(),!1}}),t.widget("ui.selectmenu",[t.ui.formResetMixin,{version:"1.12.1",defaultElement:"<select>",options:{appendTo:null,classes:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"},disabled:null,icons:{button:"ui-icon-triangle-1-s"},position:{my:"left top",at:"left bottom",collision:"none"},width:!1,change:null,close:null,focus:null,open:null,select:null},_create:function(){var e=this.element.uniqueId().attr("id");this.ids={element:e,button:e+"-button",menu:e+"-menu"},this._drawButton(),this._drawMenu(),this._bindFormResetHandler(),this._rendered=!1,this.menuItems=t()},_drawButton:function(){var e,i=this,s=this._parseOption(this.element.find("option:selected"),this.element[0].selectedIndex);this.labels=this.element.labels().attr("for",this.ids.button),this._on(this.labels,{click:function(t){this.button.focus(),t.preventDefault()}}),this.element.hide(),this.button=t("<span>",{tabindex:this.options.disabled?-1:0,id:this.ids.button,role:"combobox","aria-expanded":"false","aria-autocomplete":"list","aria-owns":this.ids.menu,"aria-haspopup":"true",title:this.element.attr("title")}).insertAfter(this.element),this._addClass(this.button,"ui-selectmenu-button ui-selectmenu-button-closed","ui-button ui-widget"),e=t("<span>").appendTo(this.button),this._addClass(e,"ui-selectmenu-icon","ui-icon "+this.options.icons.button),this.buttonItem=this._renderButtonItem(s).appendTo(this.button),this.options.width!==!1&&this._resizeButton(),this._on(this.button,this._buttonEvents),this.button.one("focusin",function(){i._rendered||i._refreshMenu()})},_drawMenu:function(){var e=this;this.menu=t("<ul>",{"aria-hidden":"true","aria-labelledby":this.ids.button,id:this.ids.menu}),this.menuWrap=t("<div>").append(this.menu),this._addClass(this.menuWrap,"ui-selectmenu-menu","ui-front"),this.menuWrap.appendTo(this._appendTo()),this.menuInstance=this.menu.menu({classes:{"ui-menu":"ui-corner-bottom"},role:"listbox",select:function(t,i){t.preventDefault(),e._setSelection(),e._select(i.item.data("ui-selectmenu-item"),t)},focus:function(t,i){var s=i.item.data("ui-selectmenu-item");null!=e.focusIndex&&s.index!==e.focusIndex&&(e._trigger("focus",t,{item:s}),e.isOpen||e._select(s,t)),e.focusIndex=s.index,e.button.attr("aria-activedescendant",e.menuItems.eq(s.index).attr("id"))}}).menu("instance"),this.menuInstance._off(this.menu,"mouseleave"),this.menuInstance._closeOnDocumentClick=function(){return!1},this.menuInstance._isDivider=function(){return!1}},refresh:function(){this._refreshMenu(),this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(this._getSelectedItem().data("ui-selectmenu-item")||{})),null===this.options.width&&this._resizeButton()},_refreshMenu:function(){var t,e=this.element.find("option");this.menu.empty(),this._parseOptions(e),this._renderMenu(this.menu,this.items),this.menuInstance.refresh(),this.menuItems=this.menu.find("li").not(".ui-selectmenu-optgroup").find(".ui-menu-item-wrapper"),this._rendered=!0,e.length&&(t=this._getSelectedItem(),this.menuInstance.focus(null,t),this._setAria(t.data("ui-selectmenu-item")),this._setOption("disabled",this.element.prop("disabled")))},open:function(t){this.options.disabled||(this._rendered?(this._removeClass(this.menu.find(".ui-state-active"),null,"ui-state-active"),this.menuInstance.focus(null,this._getSelectedItem())):this._refreshMenu(),this.menuItems.length&&(this.isOpen=!0,this._toggleAttr(),this._resizeMenu(),this._position(),this._on(this.document,this._documentClick),this._trigger("open",t)))},_position:function(){this.menuWrap.position(t.extend({of:this.button},this.options.position))},close:function(t){this.isOpen&&(this.isOpen=!1,this._toggleAttr(),this.range=null,this._off(this.document),this._trigger("close",t))},widget:function(){return this.button},menuWidget:function(){return this.menu},_renderButtonItem:function(e){var i=t("<span>");return this._setText(i,e.label),this._addClass(i,"ui-selectmenu-text"),i},_renderMenu:function(e,i){var s=this,n="";t.each(i,function(i,o){var a;o.optgroup!==n&&(a=t("<li>",{text:o.optgroup}),s._addClass(a,"ui-selectmenu-optgroup","ui-menu-divider"+(o.element.parent("optgroup").prop("disabled")?" ui-state-disabled":"")),a.appendTo(e),n=o.optgroup),s._renderItemData(e,o)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-selectmenu-item",e)},_renderItem:function(e,i){var s=t("<li>"),n=t("<div>",{title:i.element.attr("title")});return i.disabled&&this._addClass(s,null,"ui-state-disabled"),this._setText(n,i.label),s.append(n).appendTo(e)},_setText:function(t,e){e?t.text(e):t.html("&#160;")},_move:function(t,e){var i,s,n=".ui-menu-item";this.isOpen?i=this.menuItems.eq(this.focusIndex).parent("li"):(i=this.menuItems.eq(this.element[0].selectedIndex).parent("li"),n+=":not(.ui-state-disabled)"),s="first"===t||"last"===t?i["first"===t?"prevAll":"nextAll"](n).eq(-1):i[t+"All"](n).eq(0),s.length&&this.menuInstance.focus(e,s)},_getSelectedItem:function(){return this.menuItems.eq(this.element[0].selectedIndex).parent("li")},_toggle:function(t){this[this.isOpen?"close":"open"](t)},_setSelection:function(){var t;this.range&&(window.getSelection?(t=window.getSelection(),t.removeAllRanges(),t.addRange(this.range)):this.range.select(),this.button.focus())},_documentClick:{mousedown:function(e){this.isOpen&&(t(e.target).closest(".ui-selectmenu-menu, #"+t.ui.escapeSelector(this.ids.button)).length||this.close(e))}},_buttonEvents:{mousedown:function(){var t;window.getSelection?(t=window.getSelection(),t.rangeCount&&(this.range=t.getRangeAt(0))):this.range=document.selection.createRange()},click:function(t){this._setSelection(),this._toggle(t)},keydown:function(e){var i=!0;switch(e.keyCode){case t.ui.keyCode.TAB:case t.ui.keyCode.ESCAPE:this.close(e),i=!1;break;case t.ui.keyCode.ENTER:this.isOpen&&this._selectFocusedItem(e);break;case t.ui.keyCode.UP:e.altKey?this._toggle(e):this._move("prev",e);break;case t.ui.keyCode.DOWN:e.altKey?this._toggle(e):this._move("next",e);break;case t.ui.keyCode.SPACE:this.isOpen?this._selectFocusedItem(e):this._toggle(e);break;case t.ui.keyCode.LEFT:this._move("prev",e);break;case t.ui.keyCode.RIGHT:this._move("next",e);break;case t.ui.keyCode.HOME:case t.ui.keyCode.PAGE_UP:this._move("first",e);break;case t.ui.keyCode.END:case t.ui.keyCode.PAGE_DOWN:this._move("last",e);break;default:this.menu.trigger(e),i=!1}i&&e.preventDefault()}},_selectFocusedItem:function(t){var e=this.menuItems.eq(this.focusIndex).parent("li");e.hasClass("ui-state-disabled")||this._select(e.data("ui-selectmenu-item"),t)},_select:function(t,e){var i=this.element[0].selectedIndex;this.element[0].selectedIndex=t.index,this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(t)),this._setAria(t),this._trigger("select",e,{item:t}),t.index!==i&&this._trigger("change",e,{item:t}),this.close(e)},_setAria:function(t){var e=this.menuItems.eq(t.index).attr("id");this.button.attr({"aria-labelledby":e,"aria-activedescendant":e}),this.menu.attr("aria-activedescendant",e)},_setOption:function(t,e){if("icons"===t){var i=this.button.find("span.ui-icon");this._removeClass(i,null,this.options.icons.button)._addClass(i,null,e.button)}this._super(t,e),"appendTo"===t&&this.menuWrap.appendTo(this._appendTo()),"width"===t&&this._resizeButton()},_setOptionDisabled:function(t){this._super(t),this.menuInstance.option("disabled",t),this.button.attr("aria-disabled",t),this._toggleClass(this.button,null,"ui-state-disabled",t),this.element.prop("disabled",t),t?(this.button.attr("tabindex",-1),this.close()):this.button.attr("tabindex",0)},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e&&e[0]||(e=this.element.closest(".ui-front, dialog")),e.length||(e=this.document[0].body),e},_toggleAttr:function(){this.button.attr("aria-expanded",this.isOpen),this._removeClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"closed":"open"))._addClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"open":"closed"))._toggleClass(this.menuWrap,"ui-selectmenu-open",null,this.isOpen),this.menu.attr("aria-hidden",!this.isOpen)},_resizeButton:function(){var t=this.options.width;return t===!1?(this.button.css("width",""),void 0):(null===t&&(t=this.element.show().outerWidth(),this.element.hide()),this.button.outerWidth(t),void 0)},_resizeMenu:function(){this.menu.outerWidth(Math.max(this.button.outerWidth(),this.menu.width("").outerWidth()+1))},_getCreateOptions:function(){var t=this._super();return t.disabled=this.element.prop("disabled"),t},_parseOptions:function(e){var i=this,s=[];e.each(function(e,n){s.push(i._parseOption(t(n),e))}),this.items=s},_parseOption:function(t,e){var i=t.parent("optgroup");return{element:t,index:e,value:t.val(),label:t.text(),optgroup:i.attr("label")||"",disabled:i.prop("disabled")||t.prop("disabled")}},_destroy:function(){this._unbindFormResetHandler(),this.menuWrap.remove(),this.button.remove(),this.element.show(),this.element.removeUniqueId(),this.labels.attr("for",this.ids.element)}}]),t.widget("ui.slider",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"slide",options:{animate:!1,classes:{"ui-slider":"ui-corner-all","ui-slider-handle":"ui-corner-all","ui-slider-range":"ui-corner-all ui-widget-header"},distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},numPages:5,_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this._calculateNewMax(),this._addClass("ui-slider ui-slider-"+this.orientation,"ui-widget ui-widget-content"),this._refresh(),this._animateOff=!1
 },_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var e,i,s=this.options,n=this.element.find(".ui-slider-handle"),o="<span tabindex='0'></span>",a=[];for(i=s.values&&s.values.length||1,n.length>i&&(n.slice(i).remove(),n=n.slice(0,i)),e=n.length;i>e;e++)a.push(o);this.handles=n.add(t(a.join("")).appendTo(this.element)),this._addClass(this.handles,"ui-slider-handle","ui-state-default"),this.handle=this.handles.eq(0),this.handles.each(function(e){t(this).data("ui-slider-handle-index",e).attr("tabIndex",0)})},_createRange:function(){var e=this.options;e.range?(e.range===!0&&(e.values?e.values.length&&2!==e.values.length?e.values=[e.values[0],e.values[0]]:t.isArray(e.values)&&(e.values=e.values.slice(0)):e.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?(this._removeClass(this.range,"ui-slider-range-min ui-slider-range-max"),this.range.css({left:"",bottom:""})):(this.range=t("<div>").appendTo(this.element),this._addClass(this.range,"ui-slider-range")),("min"===e.range||"max"===e.range)&&this._addClass(this.range,"ui-slider-range-"+e.range)):(this.range&&this.range.remove(),this.range=null)},_setupEvents:function(){this._off(this.handles),this._on(this.handles,this._handleEvents),this._hoverable(this.handles),this._focusable(this.handles)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this._mouseDestroy()},_mouseCapture:function(e){var i,s,n,o,a,r,h,l,c=this,u=this.options;return u.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),i={x:e.pageX,y:e.pageY},s=this._normValueFromMouse(i),n=this._valueMax()-this._valueMin()+1,this.handles.each(function(e){var i=Math.abs(s-c.values(e));(n>i||n===i&&(e===c._lastChangedValue||c.values(e)===u.min))&&(n=i,o=t(this),a=e)}),r=this._start(e,a),r===!1?!1:(this._mouseSliding=!0,this._handleIndex=a,this._addClass(o,null,"ui-state-active"),o.trigger("focus"),h=o.offset(),l=!t(e.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=l?{left:0,top:0}:{left:e.pageX-h.left-o.width()/2,top:e.pageY-h.top-o.height()/2-(parseInt(o.css("borderTopWidth"),10)||0)-(parseInt(o.css("borderBottomWidth"),10)||0)+(parseInt(o.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(e,a,s),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(t){var e={x:t.pageX,y:t.pageY},i=this._normValueFromMouse(e);return this._slide(t,this._handleIndex,i),!1},_mouseStop:function(t){return this._removeClass(this.handles,null,"ui-state-active"),this._mouseSliding=!1,this._stop(t,this._handleIndex),this._change(t,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(t){var e,i,s,n,o;return"horizontal"===this.orientation?(e=this.elementSize.width,i=t.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(e=this.elementSize.height,i=t.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),s=i/e,s>1&&(s=1),0>s&&(s=0),"vertical"===this.orientation&&(s=1-s),n=this._valueMax()-this._valueMin(),o=this._valueMin()+s*n,this._trimAlignValue(o)},_uiHash:function(t,e,i){var s={handle:this.handles[t],handleIndex:t,value:void 0!==e?e:this.value()};return this._hasMultipleValues()&&(s.value=void 0!==e?e:this.values(t),s.values=i||this.values()),s},_hasMultipleValues:function(){return this.options.values&&this.options.values.length},_start:function(t,e){return this._trigger("start",t,this._uiHash(e))},_slide:function(t,e,i){var s,n,o=this.value(),a=this.values();this._hasMultipleValues()&&(n=this.values(e?0:1),o=this.values(e),2===this.options.values.length&&this.options.range===!0&&(i=0===e?Math.min(n,i):Math.max(n,i)),a[e]=i),i!==o&&(s=this._trigger("slide",t,this._uiHash(e,i,a)),s!==!1&&(this._hasMultipleValues()?this.values(e,i):this.value(i)))},_stop:function(t,e){this._trigger("stop",t,this._uiHash(e))},_change:function(t,e){this._keySliding||this._mouseSliding||(this._lastChangedValue=e,this._trigger("change",t,this._uiHash(e)))},value:function(t){return arguments.length?(this.options.value=this._trimAlignValue(t),this._refreshValue(),this._change(null,0),void 0):this._value()},values:function(e,i){var s,n,o;if(arguments.length>1)return this.options.values[e]=this._trimAlignValue(i),this._refreshValue(),this._change(null,e),void 0;if(!arguments.length)return this._values();if(!t.isArray(arguments[0]))return this._hasMultipleValues()?this._values(e):this.value();for(s=this.options.values,n=arguments[0],o=0;s.length>o;o+=1)s[o]=this._trimAlignValue(n[o]),this._change(null,o);this._refreshValue()},_setOption:function(e,i){var s,n=0;switch("range"===e&&this.options.range===!0&&("min"===i?(this.options.value=this._values(0),this.options.values=null):"max"===i&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),t.isArray(this.options.values)&&(n=this.options.values.length),this._super(e,i),e){case"orientation":this._detectOrientation(),this._removeClass("ui-slider-horizontal ui-slider-vertical")._addClass("ui-slider-"+this.orientation),this._refreshValue(),this.options.range&&this._refreshRange(i),this.handles.css("horizontal"===i?"bottom":"left","");break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),s=n-1;s>=0;s--)this._change(null,s);this._animateOff=!1;break;case"step":case"min":case"max":this._animateOff=!0,this._calculateNewMax(),this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_setOptionDisabled:function(t){this._super(t),this._toggleClass(null,"ui-state-disabled",!!t)},_value:function(){var t=this.options.value;return t=this._trimAlignValue(t)},_values:function(t){var e,i,s;if(arguments.length)return e=this.options.values[t],e=this._trimAlignValue(e);if(this._hasMultipleValues()){for(i=this.options.values.slice(),s=0;i.length>s;s+=1)i[s]=this._trimAlignValue(i[s]);return i}return[]},_trimAlignValue:function(t){if(this._valueMin()>=t)return this._valueMin();if(t>=this._valueMax())return this._valueMax();var e=this.options.step>0?this.options.step:1,i=(t-this._valueMin())%e,s=t-i;return 2*Math.abs(i)>=e&&(s+=i>0?e:-e),parseFloat(s.toFixed(5))},_calculateNewMax:function(){var t=this.options.max,e=this._valueMin(),i=this.options.step,s=Math.round((t-e)/i)*i;t=s+e,t>this.options.max&&(t-=i),this.max=parseFloat(t.toFixed(this._precision()))},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_valueMin:function(){return this.options.min},_valueMax:function(){return this.max},_refreshRange:function(t){"vertical"===t&&this.range.css({width:"",left:""}),"horizontal"===t&&this.range.css({height:"",bottom:""})},_refreshValue:function(){var e,i,s,n,o,a=this.options.range,r=this.options,h=this,l=this._animateOff?!1:r.animate,c={};this._hasMultipleValues()?this.handles.each(function(s){i=100*((h.values(s)-h._valueMin())/(h._valueMax()-h._valueMin())),c["horizontal"===h.orientation?"left":"bottom"]=i+"%",t(this).stop(1,1)[l?"animate":"css"](c,r.animate),h.options.range===!0&&("horizontal"===h.orientation?(0===s&&h.range.stop(1,1)[l?"animate":"css"]({left:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({width:i-e+"%"},{queue:!1,duration:r.animate})):(0===s&&h.range.stop(1,1)[l?"animate":"css"]({bottom:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({height:i-e+"%"},{queue:!1,duration:r.animate}))),e=i}):(s=this.value(),n=this._valueMin(),o=this._valueMax(),i=o!==n?100*((s-n)/(o-n)):0,c["horizontal"===this.orientation?"left":"bottom"]=i+"%",this.handle.stop(1,1)[l?"animate":"css"](c,r.animate),"min"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:i+"%"},r.animate),"max"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:100-i+"%"},r.animate),"min"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:i+"%"},r.animate),"max"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:100-i+"%"},r.animate))},_handleEvents:{keydown:function(e){var i,s,n,o,a=t(e.target).data("ui-slider-handle-index");switch(e.keyCode){case t.ui.keyCode.HOME:case t.ui.keyCode.END:case t.ui.keyCode.PAGE_UP:case t.ui.keyCode.PAGE_DOWN:case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(e.preventDefault(),!this._keySliding&&(this._keySliding=!0,this._addClass(t(e.target),null,"ui-state-active"),i=this._start(e,a),i===!1))return}switch(o=this.options.step,s=n=this._hasMultipleValues()?this.values(a):this.value(),e.keyCode){case t.ui.keyCode.HOME:n=this._valueMin();break;case t.ui.keyCode.END:n=this._valueMax();break;case t.ui.keyCode.PAGE_UP:n=this._trimAlignValue(s+(this._valueMax()-this._valueMin())/this.numPages);break;case t.ui.keyCode.PAGE_DOWN:n=this._trimAlignValue(s-(this._valueMax()-this._valueMin())/this.numPages);break;case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:if(s===this._valueMax())return;n=this._trimAlignValue(s+o);break;case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(s===this._valueMin())return;n=this._trimAlignValue(s-o)}this._slide(e,a,n)},keyup:function(e){var i=t(e.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(e,i),this._change(e,i),this._removeClass(t(e.target),null,"ui-state-active"))}}}),t.widget("ui.sortable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(t,e,i){return t>=e&&e+i>t},_isFloating:function(t){return/left|right/.test(t.css("float"))||/inline|table-cell/.test(t.css("display"))},_create:function(){this.containerCache={},this._addClass("ui-sortable"),this.refresh(),this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(t,e){this._super(t,e),"handle"===t&&this._setHandleClassName()},_setHandleClassName:function(){var e=this;this._removeClass(this.element.find(".ui-sortable-handle"),"ui-sortable-handle"),t.each(this.items,function(){e._addClass(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item,"ui-sortable-handle")})},_destroy:function(){this._mouseDestroy();for(var t=this.items.length-1;t>=0;t--)this.items[t].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(e,i){var s=null,n=!1,o=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(e),t(e.target).parents().each(function(){return t.data(this,o.widgetName+"-item")===o?(s=t(this),!1):void 0}),t.data(e.target,o.widgetName+"-item")===o&&(s=t(e.target)),s?!this.options.handle||i||(t(this.options.handle,s).find("*").addBack().each(function(){this===e.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(e,i,s){var n,o,a=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(e),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,a.cursorAt&&this._adjustOffsetFromHelper(a.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),a.containment&&this._setContainment(),a.cursor&&"auto"!==a.cursor&&(o=this.document.find("body"),this.storedCursor=o.css("cursor"),o.css("cursor",a.cursor),this.storedStylesheet=t("<style>*{ cursor: "+a.cursor+" !important; }</style>").appendTo(o)),a.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",a.opacity)),a.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",a.zIndex)),this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",e,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",e,this._uiHash(this));return t.ui.ddmanager&&(t.ui.ddmanager.current=this),t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this.dragging=!0,this._addClass(this.helper,"ui-sortable-helper"),this._mouseDrag(e),!0},_mouseDrag:function(e){var i,s,n,o,a=this.options,r=!1;for(this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-e.pageY<a.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+a.scrollSpeed:e.pageY-this.overflowOffset.top<a.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-a.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-e.pageX<a.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+a.scrollSpeed:e.pageX-this.overflowOffset.left<a.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-a.scrollSpeed)):(e.pageY-this.document.scrollTop()<a.scrollSensitivity?r=this.document.scrollTop(this.document.scrollTop()-a.scrollSpeed):this.window.height()-(e.pageY-this.document.scrollTop())<a.scrollSensitivity&&(r=this.document.scrollTop(this.document.scrollTop()+a.scrollSpeed)),e.pageX-this.document.scrollLeft()<a.scrollSensitivity?r=this.document.scrollLeft(this.document.scrollLeft()-a.scrollSpeed):this.window.width()-(e.pageX-this.document.scrollLeft())<a.scrollSensitivity&&(r=this.document.scrollLeft(this.document.scrollLeft()+a.scrollSpeed))),r!==!1&&t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],o=this._intersectsWithPointer(s),o&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===o?"next":"prev"]()[0]!==n&&!t.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!t.contains(this.element[0],n):!0)){if(this.direction=1===o?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;this._rearrange(e,s),this._trigger("change",e,this._uiHash());break}return this._contactContainers(e),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),this._trigger("sort",e,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(e,i){if(e){if(t.ui.ddmanager&&!this.options.dropBehaviour&&t.ui.ddmanager.drop(this,e),this.options.revert){var s=this,n=this.placeholder.offset(),o=this.options.axis,a={};o&&"x"!==o||(a.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollLeft)),o&&"y"!==o||(a.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,t(this.helper).animate(a,parseInt(this.options.revert,10)||500,function(){s._clear(e)})}else this._clear(e,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp(new t.Event("mouseup",{target:null})),"original"===this.options.helper?(this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")):this.currentItem.show();for(var e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("deactivate",null,this._uiHash(this)),this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",null,this._uiHash(this)),this.containers[e].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),t.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?t(this.domPosition.prev).after(this.currentItem):t(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},t(i).each(function(){var i=(t(e.item||this).attr(e.attribute||"id")||"").match(e.expression||/(.+)[\-=_](.+)/);i&&s.push((e.key||i[1]+"[]")+"="+(e.key&&e.expression?i[1]:i[2]))}),!s.length&&e.key&&s.push(e.key+"="),s.join("&")},toArray:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},i.each(function(){s.push(t(e.item||this).attr(e.attribute||"id")||"")}),s},_intersectsWith:function(t){var e=this.positionAbs.left,i=e+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,o=t.left,a=o+t.width,r=t.top,h=r+t.height,l=this.offset.click.top,c=this.offset.click.left,u="x"===this.options.axis||s+l>r&&h>s+l,d="y"===this.options.axis||e+c>o&&a>e+c,p=u&&d;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>t[this.floating?"width":"height"]?p:e+this.helperProportions.width/2>o&&a>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&h>n-this.helperProportions.height/2},_intersectsWithPointer:function(t){var e,i,s="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top,t.height),n="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left,t.width),o=s&&n;return o?(e=this._getDragVerticalDirection(),i=this._getDragHorizontalDirection(),this.floating?"right"===i||"down"===e?2:1:e&&("down"===e?2:1)):!1},_intersectsWithSides:function(t){var e=this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),i=this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),s=this._getDragVerticalDirection(),n=this._getDragHorizontalDirection();return this.floating&&n?"right"===n&&i||"left"===n&&!i:s&&("down"===s&&e||"up"===s&&!e)},_getDragVerticalDirection:function(){var t=this.positionAbs.top-this.lastPositionAbs.top;return 0!==t&&(t>0?"down":"up")},_getDragHorizontalDirection:function(){var t=this.positionAbs.left-this.lastPositionAbs.left;return 0!==t&&(t>0?"right":"left")},refresh:function(t){return this._refreshItems(t),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var t=this.options;return t.connectWith.constructor===String?[t.connectWith]:t.connectWith},_getItemsAsjQuery:function(e){function i(){r.push(this)}var s,n,o,a,r=[],h=[],l=this._connectWith();if(l&&e)for(s=l.length-1;s>=0;s--)for(o=t(l[s],this.document[0]),n=o.length-1;n>=0;n--)a=t.data(o[n],this.widgetFullName),a&&a!==this&&!a.options.disabled&&h.push([t.isFunction(a.options.items)?a.options.items.call(a.element):t(a.options.items,a.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),a]);for(h.push([t.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):t(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=h.length-1;s>=0;s--)h[s][0].each(i);return t(r)},_removeCurrentsFromItems:function(){var e=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=t.grep(this.items,function(t){for(var i=0;e.length>i;i++)if(e[i]===t.item[0])return!1;return!0})},_refreshItems:function(e){this.items=[],this.containers=[this];var i,s,n,o,a,r,h,l,c=this.items,u=[[t.isFunction(this.options.items)?this.options.items.call(this.element[0],e,{item:this.currentItem}):t(this.options.items,this.element),this]],d=this._connectWith();if(d&&this.ready)for(i=d.length-1;i>=0;i--)for(n=t(d[i],this.document[0]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&(u.push([t.isFunction(o.options.items)?o.options.items.call(o.element[0],e,{item:this.currentItem}):t(o.options.items,o.element),o]),this.containers.push(o));for(i=u.length-1;i>=0;i--)for(a=u[i][1],r=u[i][0],s=0,l=r.length;l>s;s++)h=t(r[s]),h.data(this.widgetName+"-item",a),c.push({item:h,instance:a,width:0,height:0,left:0,top:0})},refreshPositions:function(e){this.floating=this.items.length?"x"===this.options.axis||this._isFloating(this.items[0].item):!1,this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,o;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?t(this.options.toleranceElement,s.item):s.item,e||(s.width=n.outerWidth(),s.height=n.outerHeight()),o=n.offset(),s.left=o.left,s.top=o.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)o=this.containers[i].element.offset(),this.containers[i].containerCache.left=o.left,this.containers[i].containerCache.top=o.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(e){e=e||this;var i,s=e.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=e.currentItem[0].nodeName.toLowerCase(),n=t("<"+s+">",e.document[0]);return e._addClass(n,"ui-sortable-placeholder",i||e.currentItem[0].className)._removeClass(n,"ui-sortable-helper"),"tbody"===s?e._createTrPlaceholder(e.currentItem.find("tr").eq(0),t("<tr>",e.document[0]).appendTo(n)):"tr"===s?e._createTrPlaceholder(e.currentItem,n):"img"===s&&n.attr("src",e.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(t,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(e.currentItem.innerHeight()-parseInt(e.currentItem.css("paddingTop")||0,10)-parseInt(e.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(e.currentItem.innerWidth()-parseInt(e.currentItem.css("paddingLeft")||0,10)-parseInt(e.currentItem.css("paddingRight")||0,10)))}}),e.placeholder=t(s.placeholder.element.call(e.element,e.currentItem)),e.currentItem.after(e.placeholder),s.placeholder.update(e,e.placeholder)},_createTrPlaceholder:function(e,i){var s=this;e.children().each(function(){t("<td>&#160;</td>",s.document[0]).attr("colspan",t(this).attr("colspan")||1).appendTo(i)})},_contactContainers:function(e){var i,s,n,o,a,r,h,l,c,u,d=null,p=null;for(i=this.containers.length-1;i>=0;i--)if(!t.contains(this.currentItem[0],this.containers[i].element[0]))if(this._intersectsWith(this.containers[i].containerCache)){if(d&&t.contains(this.containers[i].element[0],d.element[0]))continue;d=this.containers[i],p=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",e,this._uiHash(this)),this.containers[i].containerCache.over=0);if(d)if(1===this.containers.length)this.containers[p].containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1);else{for(n=1e4,o=null,c=d.floating||this._isFloating(this.currentItem),a=c?"left":"top",r=c?"width":"height",u=c?"pageX":"pageY",s=this.items.length-1;s>=0;s--)t.contains(this.containers[p].element[0],this.items[s].item[0])&&this.items[s].item[0]!==this.currentItem[0]&&(h=this.items[s].item.offset()[a],l=!1,e[u]-h>this.items[s][r]/2&&(l=!0),n>Math.abs(e[u]-h)&&(n=Math.abs(e[u]-h),o=this.items[s],this.direction=l?"up":"down"));if(!o&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[p])return this.currentContainer.containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash()),this.currentContainer.containerCache.over=1),void 0;o?this._rearrange(e,o,null,!0):this._rearrange(e,null,this.containers[p].element,!0),this._trigger("change",e,this._uiHash()),this.containers[p]._trigger("change",e,this._uiHash(this)),this.currentContainer=this.containers[p],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1}},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||t("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===this.document[0].body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.currentItem.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,"document"===n.containment?this.document.width():this.window.width()-this.helperProportions.width-this.margins.left,("document"===n.containment?this.document.height()||document.body.parentNode.scrollHeight:this.window.height()||this.document[0].body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(e=t(n.containment)[0],i=t(n.containment).offset(),s="hidden"!==t(e).css("overflow"),this.containment=[i.left+(parseInt(t(e).css("borderLeftWidth"),10)||0)+(parseInt(t(e).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(t(e).css("borderTopWidth"),10)||0)+(parseInt(t(e).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(e.scrollWidth,e.offsetWidth):e.offsetWidth)-(parseInt(t(e).css("borderLeftWidth"),10)||0)-(parseInt(t(e).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(e.scrollHeight,e.offsetHeight):e.offsetHeight)-(parseInt(t(e).css("borderTopWidth"),10)||0)-(parseInt(t(e).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():o?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():o?0:n.scrollLeft())*s}},_generatePosition:function(e){var i,s,n=this.options,o=e.pageX,a=e.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(e.pageX-this.offset.click.left<this.containment[0]&&(o=this.containment[0]+this.offset.click.left),e.pageY-this.offset.click.top<this.containment[1]&&(a=this.containment[1]+this.offset.click.top),e.pageX-this.offset.click.left>this.containment[2]&&(o=this.containment[2]+this.offset.click.left),e.pageY-this.offset.click.top>this.containment[3]&&(a=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((a-this.originalPageY)/n.grid[1])*n.grid[1],a=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((o-this.originalPageX)/n.grid[0])*n.grid[0],o=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:a-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:o-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;
-this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){function i(t,e,i){return function(s){i._trigger(t,s,e._uiHash(e))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!e&&n.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||n.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(n.push(function(t){this._trigger("remove",t,this._uiHash())}),n.push(function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)e||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!e){for(s=0;n.length>s;s++)n[s].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){t.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}}),t.widget("ui.spinner",{version:"1.12.1",defaultElement:"<input>",widgetEventPrefix:"spin",options:{classes:{"ui-spinner":"ui-corner-all","ui-spinner-down":"ui-corner-br","ui-spinner-up":"ui-corner-tr"},culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),""!==this.value()&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var e=this._super(),i=this.element;return t.each(["min","max","step"],function(t,s){var n=i.attr(s);null!=n&&n.length&&(e[s]=n)}),e},_events:{keydown:function(t){this._start(t)&&this._keydown(t)&&t.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",t),void 0)},mousewheel:function(t,e){if(e){if(!this.spinning&&!this._start(t))return!1;this._spin((e>0?1:-1)*this.options.step,t),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(t)},100),t.preventDefault()}},"mousedown .ui-spinner-button":function(e){function i(){var e=this.element[0]===t.ui.safeActiveElement(this.document[0]);e||(this.element.trigger("focus"),this.previous=s,this._delay(function(){this.previous=s}))}var s;s=this.element[0]===t.ui.safeActiveElement(this.document[0])?this.previous:this.element.val(),e.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),this._start(e)!==!1&&this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(e){return t(e.currentTarget).hasClass("ui-state-active")?this._start(e)===!1?!1:(this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e),void 0):void 0},"mouseleave .ui-spinner-button":"_stop"},_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap("<span>").parent().append("<a></a><a></a>")},_draw:function(){this._enhance(),this._addClass(this.uiSpinner,"ui-spinner","ui-widget ui-widget-content"),this._addClass("ui-spinner-input"),this.element.attr("role","spinbutton"),this.buttons=this.uiSpinner.children("a").attr("tabIndex",-1).attr("aria-hidden",!0).button({classes:{"ui-button":""}}),this._removeClass(this.buttons,"ui-corner-all"),this._addClass(this.buttons.first(),"ui-spinner-button ui-spinner-up"),this._addClass(this.buttons.last(),"ui-spinner-button ui-spinner-down"),this.buttons.first().button({icon:this.options.icons.up,showLabel:!1}),this.buttons.last().button({icon:this.options.icons.down,showLabel:!1}),this.buttons.height()>Math.ceil(.5*this.uiSpinner.height())&&this.uiSpinner.height()>0&&this.uiSpinner.height(this.uiSpinner.height())},_keydown:function(e){var i=this.options,s=t.ui.keyCode;switch(e.keyCode){case s.UP:return this._repeat(null,1,e),!0;case s.DOWN:return this._repeat(null,-1,e),!0;case s.PAGE_UP:return this._repeat(null,i.page,e),!0;case s.PAGE_DOWN:return this._repeat(null,-i.page,e),!0}return!1},_start:function(t){return this.spinning||this._trigger("start",t)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(t,e,i){t=t||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,e,i)},t),this._spin(e*this.options.step,i)},_spin:function(t,e){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+t*this._increment(this.counter)),this.spinning&&this._trigger("spin",e,{value:i})===!1||(this._value(i),this.counter++)},_increment:function(e){var i=this.options.incremental;return i?t.isFunction(i)?i(e):Math.floor(e*e*e/5e4-e*e/500+17*e/200+1):1},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_adjustValue:function(t){var e,i,s=this.options;return e=null!==s.min?s.min:0,i=t-e,i=Math.round(i/s.step)*s.step,t=e+i,t=parseFloat(t.toFixed(this._precision())),null!==s.max&&t>s.max?s.max:null!==s.min&&s.min>t?s.min:t},_stop:function(t){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",t))},_setOption:function(t,e){var i,s,n;return"culture"===t||"numberFormat"===t?(i=this._parse(this.element.val()),this.options[t]=e,this.element.val(this._format(i)),void 0):(("max"===t||"min"===t||"step"===t)&&"string"==typeof e&&(e=this._parse(e)),"icons"===t&&(s=this.buttons.first().find(".ui-icon"),this._removeClass(s,null,this.options.icons.up),this._addClass(s,null,e.up),n=this.buttons.last().find(".ui-icon"),this._removeClass(n,null,this.options.icons.down),this._addClass(n,null,e.down)),this._super(t,e),void 0)},_setOptionDisabled:function(t){this._super(t),this._toggleClass(this.uiSpinner,null,"ui-state-disabled",!!t),this.element.prop("disabled",!!t),this.buttons.button(t?"disable":"enable")},_setOptions:r(function(t){this._super(t)}),_parse:function(t){return"string"==typeof t&&""!==t&&(t=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(t,10,this.options.culture):+t),""===t||isNaN(t)?null:t},_format:function(t){return""===t?"":window.Globalize&&this.options.numberFormat?Globalize.format(t,this.options.numberFormat,this.options.culture):t},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},isValid:function(){var t=this.value();return null===t?!1:t===this._adjustValue(t)},_value:function(t,e){var i;""!==t&&(i=this._parse(t),null!==i&&(e||(i=this._adjustValue(i)),t=this._format(i))),this.element.val(t),this._refresh()},_destroy:function(){this.element.prop("disabled",!1).removeAttr("autocomplete role aria-valuemin aria-valuemax aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:r(function(t){this._stepUp(t)}),_stepUp:function(t){this._start()&&(this._spin((t||1)*this.options.step),this._stop())},stepDown:r(function(t){this._stepDown(t)}),_stepDown:function(t){this._start()&&(this._spin((t||1)*-this.options.step),this._stop())},pageUp:r(function(t){this._stepUp((t||1)*this.options.page)}),pageDown:r(function(t){this._stepDown((t||1)*this.options.page)}),value:function(t){return arguments.length?(r(this._value).call(this,t),void 0):this._parse(this.element.val())},widget:function(){return this.uiSpinner}}),t.uiBackCompat!==!1&&t.widget("ui.spinner",t.ui.spinner,{_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml())},_uiSpinnerHtml:function(){return"<span>"},_buttonHtml:function(){return"<a></a><a></a>"}}),t.ui.spinner,t.widget("ui.tabs",{version:"1.12.1",delay:300,options:{active:null,classes:{"ui-tabs":"ui-corner-all","ui-tabs-nav":"ui-corner-all","ui-tabs-panel":"ui-corner-bottom","ui-tabs-tab":"ui-corner-top"},collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_isLocal:function(){var t=/#.*$/;return function(e){var i,s;i=e.href.replace(t,""),s=location.href.replace(t,"");try{i=decodeURIComponent(i)}catch(n){}try{s=decodeURIComponent(s)}catch(n){}return e.hash.length>1&&i===s}}(),_create:function(){var e=this,i=this.options;this.running=!1,this._addClass("ui-tabs","ui-widget ui-widget-content"),this._toggleClass("ui-tabs-collapsible",null,i.collapsible),this._processTabs(),i.active=this._initialActive(),t.isArray(i.disabled)&&(i.disabled=t.unique(i.disabled.concat(t.map(this.tabs.filter(".ui-state-disabled"),function(t){return e.tabs.index(t)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(i.active):t(),this._refresh(),this.active.length&&this.load(i.active)},_initialActive:function(){var e=this.options.active,i=this.options.collapsible,s=location.hash.substring(1);return null===e&&(s&&this.tabs.each(function(i,n){return t(n).attr("aria-controls")===s?(e=i,!1):void 0}),null===e&&(e=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===e||-1===e)&&(e=this.tabs.length?0:!1)),e!==!1&&(e=this.tabs.index(this.tabs.eq(e)),-1===e&&(e=i?!1:0)),!i&&e===!1&&this.anchors.length&&(e=0),e},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):t()}},_tabKeydown:function(e){var i=t(t.ui.safeActiveElement(this.document[0])).closest("li"),s=this.tabs.index(i),n=!0;if(!this._handlePageNav(e)){switch(e.keyCode){case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:s++;break;case t.ui.keyCode.UP:case t.ui.keyCode.LEFT:n=!1,s--;break;case t.ui.keyCode.END:s=this.anchors.length-1;break;case t.ui.keyCode.HOME:s=0;break;case t.ui.keyCode.SPACE:return e.preventDefault(),clearTimeout(this.activating),this._activate(s),void 0;case t.ui.keyCode.ENTER:return e.preventDefault(),clearTimeout(this.activating),this._activate(s===this.options.active?!1:s),void 0;default:return}e.preventDefault(),clearTimeout(this.activating),s=this._focusNextTab(s,n),e.ctrlKey||e.metaKey||(i.attr("aria-selected","false"),this.tabs.eq(s).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",s)},this.delay))}},_panelKeydown:function(e){this._handlePageNav(e)||e.ctrlKey&&e.keyCode===t.ui.keyCode.UP&&(e.preventDefault(),this.active.trigger("focus"))},_handlePageNav:function(e){return e.altKey&&e.keyCode===t.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):e.altKey&&e.keyCode===t.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):void 0},_findNextTab:function(e,i){function s(){return e>n&&(e=0),0>e&&(e=n),e}for(var n=this.tabs.length-1;-1!==t.inArray(s(),this.options.disabled);)e=i?e+1:e-1;return e},_focusNextTab:function(t,e){return t=this._findNextTab(t,e),this.tabs.eq(t).trigger("focus"),t},_setOption:function(t,e){return"active"===t?(this._activate(e),void 0):(this._super(t,e),"collapsible"===t&&(this._toggleClass("ui-tabs-collapsible",null,e),e||this.options.active!==!1||this._activate(0)),"event"===t&&this._setupEvents(e),"heightStyle"===t&&this._setupHeightStyle(e),void 0)},_sanitizeSelector:function(t){return t?t.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var e=this.options,i=this.tablist.children(":has(a[href])");e.disabled=t.map(i.filter(".ui-state-disabled"),function(t){return i.index(t)}),this._processTabs(),e.active!==!1&&this.anchors.length?this.active.length&&!t.contains(this.tablist[0],this.active[0])?this.tabs.length===e.disabled.length?(e.active=!1,this.active=t()):this._activate(this._findNextTab(Math.max(0,e.active-1),!1)):e.active=this.tabs.index(this.active):(e.active=!1,this.active=t()),this._refresh()},_refresh:function(){this._setOptionDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-hidden":"true"}),this.active.length?(this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}),this._addClass(this.active,"ui-tabs-active","ui-state-active"),this._getPanelForTab(this.active).show().attr({"aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var e=this,i=this.tabs,s=this.anchors,n=this.panels;this.tablist=this._getList().attr("role","tablist"),this._addClass(this.tablist,"ui-tabs-nav","ui-helper-reset ui-helper-clearfix ui-widget-header"),this.tablist.on("mousedown"+this.eventNamespace,"> li",function(e){t(this).is(".ui-state-disabled")&&e.preventDefault()}).on("focus"+this.eventNamespace,".ui-tabs-anchor",function(){t(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this.tabs=this.tablist.find("> li:has(a[href])").attr({role:"tab",tabIndex:-1}),this._addClass(this.tabs,"ui-tabs-tab","ui-state-default"),this.anchors=this.tabs.map(function(){return t("a",this)[0]}).attr({role:"presentation",tabIndex:-1}),this._addClass(this.anchors,"ui-tabs-anchor"),this.panels=t(),this.anchors.each(function(i,s){var n,o,a,r=t(s).uniqueId().attr("id"),h=t(s).closest("li"),l=h.attr("aria-controls");e._isLocal(s)?(n=s.hash,a=n.substring(1),o=e.element.find(e._sanitizeSelector(n))):(a=h.attr("aria-controls")||t({}).uniqueId()[0].id,n="#"+a,o=e.element.find(n),o.length||(o=e._createPanel(a),o.insertAfter(e.panels[i-1]||e.tablist)),o.attr("aria-live","polite")),o.length&&(e.panels=e.panels.add(o)),l&&h.data("ui-tabs-aria-controls",l),h.attr({"aria-controls":a,"aria-labelledby":r}),o.attr("aria-labelledby",r)}),this.panels.attr("role","tabpanel"),this._addClass(this.panels,"ui-tabs-panel","ui-widget-content"),i&&(this._off(i.not(this.tabs)),this._off(s.not(this.anchors)),this._off(n.not(this.panels)))},_getList:function(){return this.tablist||this.element.find("ol, ul").eq(0)},_createPanel:function(e){return t("<div>").attr("id",e).data("ui-tabs-destroy",!0)},_setOptionDisabled:function(e){var i,s,n;for(t.isArray(e)&&(e.length?e.length===this.anchors.length&&(e=!0):e=!1),n=0;s=this.tabs[n];n++)i=t(s),e===!0||-1!==t.inArray(n,e)?(i.attr("aria-disabled","true"),this._addClass(i,null,"ui-state-disabled")):(i.removeAttr("aria-disabled"),this._removeClass(i,null,"ui-state-disabled"));this.options.disabled=e,this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,e===!0)},_setupEvents:function(e){var i={};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(!0,this.anchors,{click:function(t){t.preventDefault()}}),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(e){var i,s=this.element.parent();"fill"===e?(i=s.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var e=t(this),s=e.css("position");"absolute"!==s&&"fixed"!==s&&(i-=e.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=t(this).outerHeight(!0)}),this.panels.each(function(){t(this).height(Math.max(0,i-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===e&&(i=0,this.panels.each(function(){i=Math.max(i,t(this).height("").height())}).height(i))},_eventHandler:function(e){var i=this.options,s=this.active,n=t(e.currentTarget),o=n.closest("li"),a=o[0]===s[0],r=a&&i.collapsible,h=r?t():this._getPanelForTab(o),l=s.length?this._getPanelForTab(s):t(),c={oldTab:s,oldPanel:l,newTab:r?t():o,newPanel:h};e.preventDefault(),o.hasClass("ui-state-disabled")||o.hasClass("ui-tabs-loading")||this.running||a&&!i.collapsible||this._trigger("beforeActivate",e,c)===!1||(i.active=r?!1:this.tabs.index(o),this.active=a?t():o,this.xhr&&this.xhr.abort(),l.length||h.length||t.error("jQuery UI Tabs: Mismatching fragment identifier."),h.length&&this.load(this.tabs.index(o),e),this._toggle(e,c))},_toggle:function(e,i){function s(){o.running=!1,o._trigger("activate",e,i)}function n(){o._addClass(i.newTab.closest("li"),"ui-tabs-active","ui-state-active"),a.length&&o.options.show?o._show(a,o.options.show,s):(a.show(),s())}var o=this,a=i.newPanel,r=i.oldPanel;this.running=!0,r.length&&this.options.hide?this._hide(r,this.options.hide,function(){o._removeClass(i.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),n()}):(this._removeClass(i.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),r.hide(),n()),r.attr("aria-hidden","true"),i.oldTab.attr({"aria-selected":"false","aria-expanded":"false"}),a.length&&r.length?i.oldTab.attr("tabIndex",-1):a.length&&this.tabs.filter(function(){return 0===t(this).attr("tabIndex")}).attr("tabIndex",-1),a.attr("aria-hidden","false"),i.newTab.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_activate:function(e){var i,s=this._findActive(e);s[0]!==this.active[0]&&(s.length||(s=this.active),i=s.find(".ui-tabs-anchor")[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return e===!1?t():this.tabs.eq(e)},_getIndex:function(e){return"string"==typeof e&&(e=this.anchors.index(this.anchors.filter("[href$='"+t.ui.escapeSelector(e)+"']"))),e},_destroy:function(){this.xhr&&this.xhr.abort(),this.tablist.removeAttr("role").off(this.eventNamespace),this.anchors.removeAttr("role tabIndex").removeUniqueId(),this.tabs.add(this.panels).each(function(){t.data(this,"ui-tabs-destroy")?t(this).remove():t(this).removeAttr("role tabIndex aria-live aria-busy aria-selected aria-labelledby aria-hidden aria-expanded")}),this.tabs.each(function(){var e=t(this),i=e.data("ui-tabs-aria-controls");i?e.attr("aria-controls",i).removeData("ui-tabs-aria-controls"):e.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(e){var i=this.options.disabled;i!==!1&&(void 0===e?i=!1:(e=this._getIndex(e),i=t.isArray(i)?t.map(i,function(t){return t!==e?t:null}):t.map(this.tabs,function(t,i){return i!==e?i:null})),this._setOptionDisabled(i))},disable:function(e){var i=this.options.disabled;if(i!==!0){if(void 0===e)i=!0;else{if(e=this._getIndex(e),-1!==t.inArray(e,i))return;i=t.isArray(i)?t.merge([e],i).sort():[e]}this._setOptionDisabled(i)}},load:function(e,i){e=this._getIndex(e);var s=this,n=this.tabs.eq(e),o=n.find(".ui-tabs-anchor"),a=this._getPanelForTab(n),r={tab:n,panel:a},h=function(t,e){"abort"===e&&s.panels.stop(!1,!0),s._removeClass(n,"ui-tabs-loading"),a.removeAttr("aria-busy"),t===s.xhr&&delete s.xhr};this._isLocal(o[0])||(this.xhr=t.ajax(this._ajaxSettings(o,i,r)),this.xhr&&"canceled"!==this.xhr.statusText&&(this._addClass(n,"ui-tabs-loading"),a.attr("aria-busy","true"),this.xhr.done(function(t,e,n){setTimeout(function(){a.html(t),s._trigger("load",i,r),h(n,e)},1)}).fail(function(t,e){setTimeout(function(){h(t,e)},1)})))},_ajaxSettings:function(e,i,s){var n=this;return{url:e.attr("href").replace(/#.*$/,""),beforeSend:function(e,o){return n._trigger("beforeLoad",i,t.extend({jqXHR:e,ajaxSettings:o},s))}}},_getPanelForTab:function(e){var i=t(e).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+i))}}),t.uiBackCompat!==!1&&t.widget("ui.tabs",t.ui.tabs,{_processTabs:function(){this._superApply(arguments),this._addClass(this.tabs,"ui-tab")}}),t.ui.tabs,t.widget("ui.tooltip",{version:"1.12.1",options:{classes:{"ui-tooltip":"ui-corner-all ui-widget-shadow"},content:function(){var e=t(this).attr("title")||"";return t("<a>").text(e).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,track:!1,close:null,open:null},_addDescribedBy:function(e,i){var s=(e.attr("aria-describedby")||"").split(/\s+/);s.push(i),e.data("ui-tooltip-id",i).attr("aria-describedby",t.trim(s.join(" ")))},_removeDescribedBy:function(e){var i=e.data("ui-tooltip-id"),s=(e.attr("aria-describedby")||"").split(/\s+/),n=t.inArray(i,s);-1!==n&&s.splice(n,1),e.removeData("ui-tooltip-id"),s=t.trim(s.join(" ")),s?e.attr("aria-describedby",s):e.removeAttr("aria-describedby")},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.liveRegion=t("<div>").attr({role:"log","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this.disabledTitles=t([])},_setOption:function(e,i){var s=this;this._super(e,i),"content"===e&&t.each(this.tooltips,function(t,e){s._updateContent(e.element)})},_setOptionDisabled:function(t){this[t?"_disable":"_enable"]()},_disable:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s.element[0],e.close(n,!0)}),this.disabledTitles=this.disabledTitles.add(this.element.find(this.options.items).addBack().filter(function(){var e=t(this);return e.is("[title]")?e.data("ui-tooltip-title",e.attr("title")).removeAttr("title"):void 0}))},_enable:function(){this.disabledTitles.each(function(){var e=t(this);e.data("ui-tooltip-title")&&e.attr("title",e.data("ui-tooltip-title"))}),this.disabledTitles=t([])},open:function(e){var i=this,s=t(e?e.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),e&&"mouseover"===e.type&&s.parents().each(function(){var e,s=t(this);s.data("ui-tooltip-open")&&(e=t.Event("blur"),e.target=e.currentTarget=this,i.close(e,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._registerCloseHandlers(e,s),this._updateContent(s,e))},_updateContent:function(t,e){var i,s=this.options.content,n=this,o=e?e.type:null;return"string"==typeof s||s.nodeType||s.jquery?this._open(e,t,s):(i=s.call(t[0],function(i){n._delay(function(){t.data("ui-tooltip-open")&&(e&&(e.type=o),this._open(e,t,i))})}),i&&this._open(e,t,i),void 0)},_open:function(e,i,s){function n(t){l.of=t,a.is(":hidden")||a.position(l)}var o,a,r,h,l=t.extend({},this.options.position);if(s){if(o=this._find(i))return o.tooltip.find(".ui-tooltip-content").html(s),void 0;i.is("[title]")&&(e&&"mouseover"===e.type?i.attr("title",""):i.removeAttr("title")),o=this._tooltip(i),a=o.tooltip,this._addDescribedBy(i,a.attr("id")),a.find(".ui-tooltip-content").html(s),this.liveRegion.children().hide(),h=t("<div>").html(a.find(".ui-tooltip-content").html()),h.removeAttr("name").find("[name]").removeAttr("name"),h.removeAttr("id").find("[id]").removeAttr("id"),h.appendTo(this.liveRegion),this.options.track&&e&&/^mouse/.test(e.type)?(this._on(this.document,{mousemove:n}),n(e)):a.position(t.extend({of:i},this.options.position)),a.hide(),this._show(a,this.options.show),this.options.track&&this.options.show&&this.options.show.delay&&(r=this.delayedShow=setInterval(function(){a.is(":visible")&&(n(l.of),clearInterval(r))},t.fx.interval)),this._trigger("open",e,{tooltip:a})}},_registerCloseHandlers:function(e,i){var s={keyup:function(e){if(e.keyCode===t.ui.keyCode.ESCAPE){var s=t.Event(e);s.currentTarget=i[0],this.close(s,!0)}}};i[0]!==this.element[0]&&(s.remove=function(){this._removeTooltip(this._find(i).tooltip)}),e&&"mouseover"!==e.type||(s.mouseleave="close"),e&&"focusin"!==e.type||(s.focusout="close"),this._on(!0,i,s)},close:function(e){var i,s=this,n=t(e?e.currentTarget:this.element),o=this._find(n);return o?(i=o.tooltip,o.closing||(clearInterval(this.delayedShow),n.data("ui-tooltip-title")&&!n.attr("title")&&n.attr("title",n.data("ui-tooltip-title")),this._removeDescribedBy(n),o.hiding=!0,i.stop(!0),this._hide(i,this.options.hide,function(){s._removeTooltip(t(this))}),n.removeData("ui-tooltip-open"),this._off(n,"mouseleave focusout keyup"),n[0]!==this.element[0]&&this._off(n,"remove"),this._off(this.document,"mousemove"),e&&"mouseleave"===e.type&&t.each(this.parents,function(e,i){t(i.element).attr("title",i.title),delete s.parents[e]}),o.closing=!0,this._trigger("close",e,{tooltip:i}),o.hiding||(o.closing=!1)),void 0):(n.removeData("ui-tooltip-open"),void 0)},_tooltip:function(e){var i=t("<div>").attr("role","tooltip"),s=t("<div>").appendTo(i),n=i.uniqueId().attr("id");return this._addClass(s,"ui-tooltip-content"),this._addClass(i,"ui-tooltip","ui-widget ui-widget-content"),i.appendTo(this._appendTo(e)),this.tooltips[n]={element:e,tooltip:i}},_find:function(t){var e=t.data("ui-tooltip-id");return e?this.tooltips[e]:null},_removeTooltip:function(t){t.remove(),delete this.tooltips[t.attr("id")]},_appendTo:function(t){var e=t.closest(".ui-front, dialog");return e.length||(e=this.document[0].body),e},_destroy:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur"),o=s.element;n.target=n.currentTarget=o[0],e.close(n,!0),t("#"+i).remove(),o.data("ui-tooltip-title")&&(o.attr("title")||o.attr("title",o.data("ui-tooltip-title")),o.removeData("ui-tooltip-title"))}),this.liveRegion.remove()}}),t.uiBackCompat!==!1&&t.widget("ui.tooltip",t.ui.tooltip,{options:{tooltipClass:null},_tooltip:function(){var t=this._superApply(arguments);return this.options.tooltipClass&&t.tooltip.addClass(this.options.tooltipClass),t}}),t.ui.tooltip});
\ No newline at end of file
+this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){function i(t,e,i){return function(s){i._trigger(t,s,e._uiHash(e))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!e&&n.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||n.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(n.push(function(t){this._trigger("remove",t,this._uiHash())}),n.push(function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)e||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!e){for(s=0;n.length>s;s++)n[s].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){t.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}}),t.widget("ui.spinner",{version:"1.12.1",defaultElement:"<input>",widgetEventPrefix:"spin",options:{classes:{"ui-spinner":"ui-corner-all","ui-spinner-down":"ui-corner-br","ui-spinner-up":"ui-corner-tr"},culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),""!==this.value()&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var e=this._super(),i=this.element;return t.each(["min","max","step"],function(t,s){var n=i.attr(s);null!=n&&n.length&&(e[s]=n)}),e},_events:{keydown:function(t){this._start(t)&&this._keydown(t)&&t.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",t),void 0)},mousewheel:function(t,e){if(e){if(!this.spinning&&!this._start(t))return!1;this._spin((e>0?1:-1)*this.options.step,t),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(t)},100),t.preventDefault()}},"mousedown .ui-spinner-button":function(e){function i(){var e=this.element[0]===t.ui.safeActiveElement(this.document[0]);e||(this.element.trigger("focus"),this.previous=s,this._delay(function(){this.previous=s}))}var s;s=this.element[0]===t.ui.safeActiveElement(this.document[0])?this.previous:this.element.val(),e.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),this._start(e)!==!1&&this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(e){return t(e.currentTarget).hasClass("ui-state-active")?this._start(e)===!1?!1:(this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e),void 0):void 0},"mouseleave .ui-spinner-button":"_stop"},_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap("<span>").parent().append("<a></a><a></a>")},_draw:function(){this._enhance(),this._addClass(this.uiSpinner,"ui-spinner","ui-widget ui-widget-content"),this._addClass("ui-spinner-input"),this.element.attr("role","spinbutton"),this.buttons=this.uiSpinner.children("a").attr("tabIndex",-1).attr("aria-hidden",!0).button({classes:{"ui-button":""}}),this._removeClass(this.buttons,"ui-corner-all"),this._addClass(this.buttons.first(),"ui-spinner-button ui-spinner-up"),this._addClass(this.buttons.last(),"ui-spinner-button ui-spinner-down"),this.buttons.first().button({icon:this.options.icons.up,showLabel:!1}),this.buttons.last().button({icon:this.options.icons.down,showLabel:!1}),this.buttons.height()>Math.ceil(.5*this.uiSpinner.height())&&this.uiSpinner.height()>0&&this.uiSpinner.height(this.uiSpinner.height())},_keydown:function(e){var i=this.options,s=t.ui.keyCode;switch(e.keyCode){case s.UP:return this._repeat(null,1,e),!0;case s.DOWN:return this._repeat(null,-1,e),!0;case s.PAGE_UP:return this._repeat(null,i.page,e),!0;case s.PAGE_DOWN:return this._repeat(null,-i.page,e),!0}return!1},_start:function(t){return this.spinning||this._trigger("start",t)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(t,e,i){t=t||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,e,i)},t),this._spin(e*this.options.step,i)},_spin:function(t,e){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+t*this._increment(this.counter)),this.spinning&&this._trigger("spin",e,{value:i})===!1||(this._value(i),this.counter++)},_increment:function(e){var i=this.options.incremental;return i?t.isFunction(i)?i(e):Math.floor(e*e*e/5e4-e*e/500+17*e/200+1):1},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_adjustValue:function(t){var e,i,s=this.options;return e=null!==s.min?s.min:0,i=t-e,i=Math.round(i/s.step)*s.step,t=e+i,t=parseFloat(t.toFixed(this._precision())),null!==s.max&&t>s.max?s.max:null!==s.min&&s.min>t?s.min:t},_stop:function(t){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",t))},_setOption:function(t,e){var i,s,n;return"culture"===t||"numberFormat"===t?(i=this._parse(this.element.val()),this.options[t]=e,this.element.val(this._format(i)),void 0):(("max"===t||"min"===t||"step"===t)&&"string"==typeof e&&(e=this._parse(e)),"icons"===t&&(s=this.buttons.first().find(".ui-icon"),this._removeClass(s,null,this.options.icons.up),this._addClass(s,null,e.up),n=this.buttons.last().find(".ui-icon"),this._removeClass(n,null,this.options.icons.down),this._addClass(n,null,e.down)),this._super(t,e),void 0)},_setOptionDisabled:function(t){this._super(t),this._toggleClass(this.uiSpinner,null,"ui-state-disabled",!!t),this.element.prop("disabled",!!t),this.buttons.button(t?"disable":"enable")},_setOptions:r(function(t){this._super(t)}),_parse:function(t){return"string"==typeof t&&""!==t&&(t=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(t,10,this.options.culture):+t),""===t||isNaN(t)?null:t},_format:function(t){return""===t?"":window.Globalize&&this.options.numberFormat?Globalize.format(t,this.options.numberFormat,this.options.culture):t},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},isValid:function(){var t=this.value();return null===t?!1:t===this._adjustValue(t)},_value:function(t,e){var i;""!==t&&(i=this._parse(t),null!==i&&(e||(i=this._adjustValue(i)),t=this._format(i))),this.element.val(t),this._refresh()},_destroy:function(){this.element.prop("disabled",!1).removeAttr("autocomplete role aria-valuemin aria-valuemax aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:r(function(t){this._stepUp(t)}),_stepUp:function(t){this._start()&&(this._spin((t||1)*this.options.step),this._stop())},stepDown:r(function(t){this._stepDown(t)}),_stepDown:function(t){this._start()&&(this._spin((t||1)*-this.options.step),this._stop())},pageUp:r(function(t){this._stepUp((t||1)*this.options.page)}),pageDown:r(function(t){this._stepDown((t||1)*this.options.page)}),value:function(t){return arguments.length?(r(this._value).call(this,t),void 0):this._parse(this.element.val())},widget:function(){return this.uiSpinner}}),t.uiBackCompat!==!1&&t.widget("ui.spinner",t.ui.spinner,{_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml())},_uiSpinnerHtml:function(){return"<span>"},_buttonHtml:function(){return"<a></a><a></a>"}}),t.ui.spinner,t.widget("ui.tabs",{version:"1.12.1",delay:300,options:{active:null,classes:{"ui-tabs":"ui-corner-all","ui-tabs-nav":"ui-corner-all","ui-tabs-panel":"ui-corner-bottom","ui-tabs-tab":"ui-corner-top"},collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_isLocal:function(){var t=/#.*$/;return function(e){var i,s;i=e.href.replace(t,""),s=location.href.replace(t,"");try{i=decodeURIComponent(i)}catch(n){}try{s=decodeURIComponent(s)}catch(n){}return e.hash.length>1&&i===s}}(),_create:function(){var e=this,i=this.options;this.running=!1,this._addClass("ui-tabs","ui-widget ui-widget-content"),this._toggleClass("ui-tabs-collapsible",null,i.collapsible),this._processTabs(),i.active=this._initialActive(),t.isArray(i.disabled)&&(i.disabled=t.unique(i.disabled.concat(t.map(this.tabs.filter(".ui-state-disabled"),function(t){return e.tabs.index(t)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(i.active):t(),this._refresh(),this.active.length&&this.load(i.active)},_initialActive:function(){var e=this.options.active,i=this.options.collapsible,s=location.hash.substring(1);return null===e&&(s&&this.tabs.each(function(i,n){return t(n).attr("aria-controls")===s?(e=i,!1):void 0}),null===e&&(e=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===e||-1===e)&&(e=this.tabs.length?0:!1)),e!==!1&&(e=this.tabs.index(this.tabs.eq(e)),-1===e&&(e=i?!1:0)),!i&&e===!1&&this.anchors.length&&(e=0),e},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):t()}},_tabKeydown:function(e){var i=t(t.ui.safeActiveElement(this.document[0])).closest("li"),s=this.tabs.index(i),n=!0;if(!this._handlePageNav(e)){switch(e.keyCode){case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:s++;break;case t.ui.keyCode.UP:case t.ui.keyCode.LEFT:n=!1,s--;break;case t.ui.keyCode.END:s=this.anchors.length-1;break;case t.ui.keyCode.HOME:s=0;break;case t.ui.keyCode.SPACE:return e.preventDefault(),clearTimeout(this.activating),this._activate(s),void 0;case t.ui.keyCode.ENTER:return e.preventDefault(),clearTimeout(this.activating),this._activate(s===this.options.active?!1:s),void 0;default:return}e.preventDefault(),clearTimeout(this.activating),s=this._focusNextTab(s,n),e.ctrlKey||e.metaKey||(i.attr("aria-selected","false"),this.tabs.eq(s).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",s)},this.delay))}},_panelKeydown:function(e){this._handlePageNav(e)||e.ctrlKey&&e.keyCode===t.ui.keyCode.UP&&(e.preventDefault(),this.active.trigger("focus"))},_handlePageNav:function(e){return e.altKey&&e.keyCode===t.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):e.altKey&&e.keyCode===t.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):void 0},_findNextTab:function(e,i){function s(){return e>n&&(e=0),0>e&&(e=n),e}for(var n=this.tabs.length-1;-1!==t.inArray(s(),this.options.disabled);)e=i?e+1:e-1;return e},_focusNextTab:function(t,e){return t=this._findNextTab(t,e),this.tabs.eq(t).trigger("focus"),t},_setOption:function(t,e){return"active"===t?(this._activate(e),void 0):(this._super(t,e),"collapsible"===t&&(this._toggleClass("ui-tabs-collapsible",null,e),e||this.options.active!==!1||this._activate(0)),"event"===t&&this._setupEvents(e),"heightStyle"===t&&this._setupHeightStyle(e),void 0)},_sanitizeSelector:function(t){return t?t.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var e=this.options,i=this.tablist.children(":has(a[href])");e.disabled=t.map(i.filter(".ui-state-disabled"),function(t){return i.index(t)}),this._processTabs(),e.active!==!1&&this.anchors.length?this.active.length&&!t.contains(this.tablist[0],this.active[0])?this.tabs.length===e.disabled.length?(e.active=!1,this.active=t()):this._activate(this._findNextTab(Math.max(0,e.active-1),!1)):e.active=this.tabs.index(this.active):(e.active=!1,this.active=t()),this._refresh()},_refresh:function(){this._setOptionDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-hidden":"true"}),this.active.length?(this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}),this._addClass(this.active,"ui-tabs-active","ui-state-active"),this._getPanelForTab(this.active).show().attr({"aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var e=this,i=this.tabs,s=this.anchors,n=this.panels;this.tablist=this._getList().attr("role","tablist"),this._addClass(this.tablist,"ui-tabs-nav","ui-helper-reset ui-helper-clearfix ui-widget-header"),this.tablist.on("mousedown"+this.eventNamespace,"> li",function(e){t(this).is(".ui-state-disabled")&&e.preventDefault()}).on("focus"+this.eventNamespace,".ui-tabs-anchor",function(){t(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this.tabs=this.tablist.find("> li:has(a[href])").attr({role:"tab",tabIndex:-1}),this._addClass(this.tabs,"ui-tabs-tab","ui-state-default"),this.anchors=this.tabs.map(function(){return t("a",this)[0]}).attr({role:"presentation",tabIndex:-1}),this._addClass(this.anchors,"ui-tabs-anchor"),this.panels=t(),this.anchors.each(function(i,s){var n,o,a,r=t(s).uniqueId().attr("id"),h=t(s).closest("li"),l=h.attr("aria-controls");e._isLocal(s)?(n=s.hash,a=n.substring(1),o=e.element.find(e._sanitizeSelector(n))):(a=h.attr("aria-controls")||t({}).uniqueId()[0].id,n="#"+a,o=e.element.find(n),o.length||(o=e._createPanel(a),o.insertAfter(e.panels[i-1]||e.tablist)),o.attr("aria-live","polite")),o.length&&(e.panels=e.panels.add(o)),l&&h.data("ui-tabs-aria-controls",l),h.attr({"aria-controls":a,"aria-labelledby":r}),o.attr("aria-labelledby",r)}),this.panels.attr("role","tabpanel"),this._addClass(this.panels,"ui-tabs-panel","ui-widget-content"),i&&(this._off(i.not(this.tabs)),this._off(s.not(this.anchors)),this._off(n.not(this.panels)))},_getList:function(){return this.tablist||this.element.find("ol, ul").eq(0)},_createPanel:function(e){return t("<div>").attr("id",e).data("ui-tabs-destroy",!0)},_setOptionDisabled:function(e){var i,s,n;for(t.isArray(e)&&(e.length?e.length===this.anchors.length&&(e=!0):e=!1),n=0;s=this.tabs[n];n++)i=t(s),e===!0||-1!==t.inArray(n,e)?(i.attr("aria-disabled","true"),this._addClass(i,null,"ui-state-disabled")):(i.removeAttr("aria-disabled"),this._removeClass(i,null,"ui-state-disabled"));this.options.disabled=e,this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,e===!0)},_setupEvents:function(e){var i={};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(!0,this.anchors,{click:function(t){t.preventDefault()}}),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(e){var i,s=this.element.parent();"fill"===e?(i=s.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var e=t(this),s=e.css("position");"absolute"!==s&&"fixed"!==s&&(i-=e.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=t(this).outerHeight(!0)}),this.panels.each(function(){t(this).height(Math.max(0,i-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===e&&(i=0,this.panels.each(function(){i=Math.max(i,t(this).height("").height())}).height(i))},_eventHandler:function(e){var i=this.options,s=this.active,n=t(e.currentTarget),o=n.closest("li"),a=o[0]===s[0],r=a&&i.collapsible,h=r?t():this._getPanelForTab(o),l=s.length?this._getPanelForTab(s):t(),c={oldTab:s,oldPanel:l,newTab:r?t():o,newPanel:h};e.preventDefault(),o.hasClass("ui-state-disabled")||o.hasClass("ui-tabs-loading")||this.running||a&&!i.collapsible||this._trigger("beforeActivate",e,c)===!1||(i.active=r?!1:this.tabs.index(o),this.active=a?t():o,this.xhr&&this.xhr.abort(),l.length||h.length||t.error("jQuery UI Tabs: Mismatching fragment identifier."),h.length&&this.load(this.tabs.index(o),e),this._toggle(e,c))},_toggle:function(e,i){function s(){o.running=!1,o._trigger("activate",e,i)}function n(){o._addClass(i.newTab.closest("li"),"ui-tabs-active","ui-state-active"),a.length&&o.options.show?o._show(a,o.options.show,s):(a.show(),s())}var o=this,a=i.newPanel,r=i.oldPanel;this.running=!0,r.length&&this.options.hide?this._hide(r,this.options.hide,function(){o._removeClass(i.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),n()}):(this._removeClass(i.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),r.hide(),n()),r.attr("aria-hidden","true"),i.oldTab.attr({"aria-selected":"false","aria-expanded":"false"}),a.length&&r.length?i.oldTab.attr("tabIndex",-1):a.length&&this.tabs.filter(function(){return 0===t(this).attr("tabIndex")}).attr("tabIndex",-1),a.attr("aria-hidden","false"),i.newTab.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_activate:function(e){var i,s=this._findActive(e);s[0]!==this.active[0]&&(s.length||(s=this.active),i=s.find(".ui-tabs-anchor")[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return e===!1?t():this.tabs.eq(e)},_getIndex:function(e){return"string"==typeof e&&(e=this.anchors.index(this.anchors.filter("[href$='"+t.ui.escapeSelector(e)+"']"))),e},_destroy:function(){this.xhr&&this.xhr.abort(),this.tablist.removeAttr("role").off(this.eventNamespace),this.anchors.removeAttr("role tabIndex").removeUniqueId(),this.tabs.add(this.panels).each(function(){t.data(this,"ui-tabs-destroy")?t(this).remove():t(this).removeAttr("role tabIndex aria-live aria-busy aria-selected aria-labelledby aria-hidden aria-expanded")}),this.tabs.each(function(){var e=t(this),i=e.data("ui-tabs-aria-controls");i?e.attr("aria-controls",i).removeData("ui-tabs-aria-controls"):e.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(e){var i=this.options.disabled;i!==!1&&(void 0===e?i=!1:(e=this._getIndex(e),i=t.isArray(i)?t.map(i,function(t){return t!==e?t:null}):t.map(this.tabs,function(t,i){return i!==e?i:null})),this._setOptionDisabled(i))},disable:function(e){var i=this.options.disabled;if(i!==!0){if(void 0===e)i=!0;else{if(e=this._getIndex(e),-1!==t.inArray(e,i))return;i=t.isArray(i)?t.merge([e],i).sort():[e]}this._setOptionDisabled(i)}},load:function(e,i){e=this._getIndex(e);var s=this,n=this.tabs.eq(e),o=n.find(".ui-tabs-anchor"),a=this._getPanelForTab(n),r={tab:n,panel:a},h=function(t,e){"abort"===e&&s.panels.stop(!1,!0),s._removeClass(n,"ui-tabs-loading"),a.removeAttr("aria-busy"),t===s.xhr&&delete s.xhr};this._isLocal(o[0])||(this.xhr=t.ajax(this._ajaxSettings(o,i,r)),this.xhr&&"canceled"!==this.xhr.statusText&&(this._addClass(n,"ui-tabs-loading"),a.attr("aria-busy","true"),this.xhr.done(function(t,e,n){setTimeout(function(){a.html(t),s._trigger("load",i,r),h(n,e)},1)}).fail(function(t,e){setTimeout(function(){h(t,e)},1)})))},_ajaxSettings:function(e,i,s){var n=this;return{url:e.attr("href").replace(/#.*$/,""),beforeSend:function(e,o){return n._trigger("beforeLoad",i,t.extend({jqXHR:e,ajaxSettings:o},s))}}},_getPanelForTab:function(e){var i=t(e).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+i))}}),t.uiBackCompat!==!1&&t.widget("ui.tabs",t.ui.tabs,{_processTabs:function(){this._superApply(arguments),this._addClass(this.tabs,"ui-tab")}}),t.ui.tabs,t.widget("ui.tooltip",{version:"1.12.1",options:{classes:{"ui-tooltip":"ui-corner-all ui-widget-shadow"},content:function(){var e=t(this).attr("title")||"";return t("<a>").text(e).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,track:!1,close:null,open:null},_addDescribedBy:function(e,i){var s=(e.attr("aria-describedby")||"").split(/\s+/);s.push(i),e.data("ui-tooltip-id",i).attr("aria-describedby",t.trim(s.join(" ")))},_removeDescribedBy:function(e){var i=e.data("ui-tooltip-id"),s=(e.attr("aria-describedby")||"").split(/\s+/),n=t.inArray(i,s);-1!==n&&s.splice(n,1),e.removeData("ui-tooltip-id"),s=t.trim(s.join(" ")),s?e.attr("aria-describedby",s):e.removeAttr("aria-describedby")},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.liveRegion=t("<div>").attr({role:"log","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this.disabledTitles=t([])},_setOption:function(e,i){var s=this;this._super(e,i),"content"===e&&t.each(this.tooltips,function(t,e){s._updateContent(e.element)})},_setOptionDisabled:function(t){this[t?"_disable":"_enable"]()},_disable:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s.element[0],e.close(n,!0)}),this.disabledTitles=this.disabledTitles.add(this.element.find(this.options.items).addBack().filter(function(){var e=t(this);return e.is("[title]")?e.data("ui-tooltip-title",e.attr("title")).removeAttr("title"):void 0}))},_enable:function(){this.disabledTitles.each(function(){var e=t(this);e.data("ui-tooltip-title")&&e.attr("title",e.data("ui-tooltip-title"))}),this.disabledTitles=t([])},open:function(e){var i=this,s=t(e?e.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),e&&"mouseover"===e.type&&s.parents().each(function(){var e,s=t(this);s.data("ui-tooltip-open")&&(e=t.Event("blur"),e.target=e.currentTarget=this,i.close(e,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._registerCloseHandlers(e,s),this._updateContent(s,e))},_updateContent:function(t,e){var i,s=this.options.content,n=this,o=e?e.type:null;return"string"==typeof s||s.nodeType||s.jquery?this._open(e,t,s):(i=s.call(t[0],function(i){n._delay(function(){t.data("ui-tooltip-open")&&(e&&(e.type=o),this._open(e,t,i))})}),i&&this._open(e,t,i),void 0)},_open:function(e,i,s){function n(t){l.of=t,a.is(":hidden")||a.position(l)}var o,a,r,h,l=t.extend({},this.options.position);if(s){if(o=this._find(i))return o.tooltip.find(".ui-tooltip-content").html(s),void 0;i.is("[title]")&&(e&&"mouseover"===e.type?i.attr("title",""):i.removeAttr("title")),o=this._tooltip(i),a=o.tooltip,this._addDescribedBy(i,a.attr("id")),a.find(".ui-tooltip-content").html(s),this.liveRegion.children().hide(),h=t("<div>").html(a.find(".ui-tooltip-content").html()),h.removeAttr("name").find("[name]").removeAttr("name"),h.removeAttr("id").find("[id]").removeAttr("id"),h.appendTo(this.liveRegion),this.options.track&&e&&/^mouse/.test(e.type)?(this._on(this.document,{mousemove:n}),n(e)):a.position(t.extend({of:i},this.options.position)),a.hide(),this._show(a,this.options.show),this.options.track&&this.options.show&&this.options.show.delay&&(r=this.delayedShow=setInterval(function(){a.is(":visible")&&(n(l.of),clearInterval(r))},t.fx.interval)),this._trigger("open",e,{tooltip:a})}},_registerCloseHandlers:function(e,i){var s={keyup:function(e){if(e.keyCode===t.ui.keyCode.ESCAPE){var s=t.Event(e);s.currentTarget=i[0],this.close(s,!0)}}};i[0]!==this.element[0]&&(s.remove=function(){this._removeTooltip(this._find(i).tooltip)}),e&&"mouseover"!==e.type||(s.mouseleave="close"),e&&"focusin"!==e.type||(s.focusout="close"),this._on(!0,i,s)},close:function(e){var i,s=this,n=t(e?e.currentTarget:this.element),o=this._find(n);return o?(i=o.tooltip,o.closing||(clearInterval(this.delayedShow),n.data("ui-tooltip-title")&&!n.attr("title")&&n.attr("title",n.data("ui-tooltip-title")),this._removeDescribedBy(n),o.hiding=!0,i.stop(!0),this._hide(i,this.options.hide,function(){s._removeTooltip(t(this))}),n.removeData("ui-tooltip-open"),this._off(n,"mouseleave focusout keyup"),n[0]!==this.element[0]&&this._off(n,"remove"),this._off(this.document,"mousemove"),e&&"mouseleave"===e.type&&t.each(this.parents,function(e,i){t(i.element).attr("title",i.title),delete s.parents[e]}),o.closing=!0,this._trigger("close",e,{tooltip:i}),o.hiding||(o.closing=!1)),void 0):(n.removeData("ui-tooltip-open"),void 0)},_tooltip:function(e){var i=t("<div>").attr("role","tooltip"),s=t("<div>").appendTo(i),n=i.uniqueId().attr("id");return this._addClass(s,"ui-tooltip-content"),this._addClass(i,"ui-tooltip","ui-widget ui-widget-content"),i.appendTo(this._appendTo(e)),this.tooltips[n]={element:e,tooltip:i}},_find:function(t){var e=t.data("ui-tooltip-id");return e?this.tooltips[e]:null},_removeTooltip:function(t){t.remove(),delete this.tooltips[t.attr("id")]},_appendTo:function(t){var e=t.closest(".ui-front, dialog");return e.length||(e=this.document[0].body),e},_destroy:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur"),o=s.element;n.target=n.currentTarget=o[0],e.close(n,!0),t("#"+i).remove(),o.data("ui-tooltip-title")&&(o.attr("title")||o.attr("title",o.data("ui-tooltip-title")),o.removeData("ui-tooltip-title"))}),this.liveRegion.remove()}}),t.uiBackCompat!==!1&&t.widget("ui.tooltip",t.ui.tooltip,{options:{tooltipClass:null},_tooltip:function(){var t=this._superApply(arguments);return this.options.tooltipClass&&t.tooltip.addClass(this.options.tooltipClass),t}}),t.ui.tooltip});
diff --git a/webapp/src/main/webapp/js/jquery.fix.clone.js b/webapp/src/main/webapp/js/jquery.fix.clone.js
index 84f11baa4..8709369f8 100644
--- a/webapp/src/main/webapp/js/jquery.fix.clone.js
+++ b/webapp/src/main/webapp/js/jquery.fix.clone.js
@@ -23,4 +23,4 @@
   };
 }) (jQuery.fn.clone);
 
-// Generated by SDoc 
\ No newline at end of file
+// Generated by SDoc
diff --git a/webapp/src/main/webapp/js/jquery_plugins/jcrop/jquery.Jcrop.css b/webapp/src/main/webapp/js/jquery_plugins/jcrop/jquery.Jcrop.css
index 31636fee2..d681e9e17 100644
--- a/webapp/src/main/webapp/js/jquery_plugins/jcrop/jquery.Jcrop.css
+++ b/webapp/src/main/webapp/js/jquery_plugins/jcrop/jquery.Jcrop.css
@@ -162,4 +162,4 @@
 .jcrop-holder img,
 img.jcrop-preview {
 	max-width: none;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/js/jquery_plugins/jcrop/jquery.Jcrop.js b/webapp/src/main/webapp/js/jquery_plugins/jcrop/jquery.Jcrop.js
index 7eaaaba98..868625d7d 100644
--- a/webapp/src/main/webapp/js/jquery_plugins/jcrop/jquery.Jcrop.js
+++ b/webapp/src/main/webapp/js/jquery_plugins/jcrop/jquery.Jcrop.js
@@ -1691,4 +1691,4 @@
     };
 
     // }}}
-}(jQuery));
\ No newline at end of file
+}(jQuery));
diff --git a/webapp/src/main/webapp/js/jquery_plugins/jquery-autocomplete/jquery.autocomplete.css b/webapp/src/main/webapp/js/jquery_plugins/jquery-autocomplete/jquery.autocomplete.css
index 91b622833..416cde1ba 100644
--- a/webapp/src/main/webapp/js/jquery_plugins/jquery-autocomplete/jquery.autocomplete.css
+++ b/webapp/src/main/webapp/js/jquery_plugins/jquery-autocomplete/jquery.autocomplete.css
@@ -19,15 +19,15 @@
 	padding: 2px 5px;
 	cursor: default;
 	display: block;
-	/* 
-	if width will be 100% horizontal scrollbar will apear 
+	/*
+	if width will be 100% horizontal scrollbar will apear
 	when scroll mode will be used
 	*/
 	/*width: 100%;*/
 	font: menu;
 	font-size: 12px;
-	/* 
-	it is very important, if line-height not setted or setted 
+	/*
+	it is very important, if line-height not setted or setted
 	in relative units scroll will be broken in firefox
 	*/
 	line-height: 16px;
diff --git a/webapp/src/main/webapp/js/jquery_plugins/jquery-autocomplete/jquery.autocomplete.pack.js b/webapp/src/main/webapp/js/jquery_plugins/jquery-autocomplete/jquery.autocomplete.pack.js
index f29c140eb..5f71463ac 100644
--- a/webapp/src/main/webapp/js/jquery_plugins/jquery-autocomplete/jquery.autocomplete.pack.js
+++ b/webapp/src/main/webapp/js/jquery_plugins/jquery-autocomplete/jquery.autocomplete.pack.js
@@ -10,4 +10,4 @@
  * Revision: $Id: jquery.autocomplete.js 5329 2008-04-27 13:07:34Z joern.zaefferer $
  *
  */
-eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}(';(3($){$.48.1l({1Y:3(b,d){5 c=V b=="1p";d=$.1l({},$.C.1K,{S:c?b:Y,u:c?Y:b,1z:c?$.C.1K.1z:10,T:d&&!d.1t?10:3L},d);d.1o=d.1o||3(a){6 a};d.1j=d.1j||d.1H;6 F.H(3(){1D $.C(F,d)})},L:3(a){6 F.17("L",a)},1u:3(a){6 F.12("1u",[a])},1Z:3(){6 F.12("1Z")},1X:3(a){6 F.12("1X",[a])},1V:3(){6 F.12("1V")}});$.C=3(n,p){5 s={2H:38,2E:40,2y:46,2u:9,2r:13,2o:27,2k:3p,2h:33,2d:34,2s:8};5 t=$(n).39("1Y","32").J(p.2N);5 o;5 l="";5 m=$.C.2S(p);5 r=0;5 j;5 h={1v:A};5 k=$.C.2M(p,n,1S,h);t.3P(3(a){j=a.2K;3O(a.2K){K s.2H:a.1c();4(k.M()){k.2C()}z{X(0,B)}N;K s.2E:a.1c();4(k.M()){k.2w()}z{X(0,B)}N;K s.2h:a.1c();4(k.M()){k.2t()}z{X(0,B)}N;K s.2d:a.1c();4(k.M()){k.28()}z{X(0,B)}N;K p.18&&$.1m(p.Z)==","&&s.2k:K s.2u:K s.2r:4(1S()){4(!p.18)t.2q();a.1c()}N;K s.2o:k.U();N;3y:1J(o);o=1I(X,p.1z);N}}).3v(3(){}).1G(3(){r++}).2q(3(){r=0;4(!h.1v){2j()}}).2i(3(){4(r++>1&&!k.M()){X(0,B)}}).17("1u",3(){5 c=(1k.7>1)?1k[1]:Y;3 1E(q,a){5 b;4(a&&a.7){11(5 i=0;i<a.7;i++){4(a[i].L.P()==q.P()){b=a[i];N}}}4(V c=="3")c(b);z t.12("L",b&&[b.u,b.O])}$.H(1n(t.I()),3(i,a){1P(a,1E,1E)})}).17("1Z",3(){m.1g()}).17("1X",3(){$.1l(p,1k[1]);4("u"2a 1k[1])m.1b()}).17("1V",3(){k.1Q();t.1Q()});3 1S(){5 b=k.26();4(!b)6 A;5 v=b.L;l=v;4(p.18){5 a=1n(t.I());4(a.7>1){v=a.1f(0,a.7-1).31(p.Z)+p.Z+v}v+=p.Z}t.I(v);19();t.12("L",[b.u,b.O]);6 B}3 X(b,c){4(j==s.2y){k.U();6}5 a=t.I();4(!c&&a==l)6;l=a;a=1h(a);4(a.7>=p.1T){t.J(p.1U);4(!p.1A)a=a.P();1P(a,2U,19)}z{1y();k.U()}};3 1n(b){4(!b){6[""]}5 d=b.20(p.Z);5 c=[];$.H(d,3(i,a){4($.1m(a))c[i]=$.1m(a)});6 c}3 1h(a){4(!p.18)6 a;5 b=1n(a);6 b[b.7-1]}3 1x(q,a){4(p.1x&&(1h(t.I()).P()==q.P())&&j!=s.2s){t.I(t.I()+a.44(1h(l).7));$.C.2T(n,l.7,l.7+a.7)}};3 2j(){1J(o);o=1I(19,43)};3 19(){k.U();1J(o);1y();4(p.2R){t.1u(3(a){4(!a)t.I("")})}};3 2U(q,a){4(a&&a.7&&r){1y();k.2Q(a,q);1x(q,a[0].O);k.1W()}z{19()}};3 1P(f,d,g){4(!p.1A)f=f.P();5 e=m.2P(f);4(e&&e.7){d(f,e)}z 4((V p.S=="1p")&&(p.S.7>0)){5 c={42:+1D 41()};$.H(p.2O,3(a,b){c[a]=V b=="3"?b():b});$.3Z({3Y:"3X",3W:"1Y"+n.3T,2L:p.2L,S:p.S,u:$.1l({q:1h(f),3S:p.T},c),3Q:3(a){5 b=p.1s&&p.1s(a)||1s(a);m.1a(f,b);d(f,b)}})}z{k.2J();g(f)}};3 1s(c){5 d=[];5 b=c.20("\\n");11(5 i=0;i<b.7;i++){5 a=$.1m(b[i]);4(a){a=a.20("|");d[d.7]={u:a,O:a[0],L:p.1r&&p.1r(a,a[0])||a[0]}}}6 d};3 1y(){t.1q(p.1U)}};$.C.1K={2N:"3M",2F:"3K",1U:"3J",1T:1,1z:3I,1A:A,1e:B,1O:A,1d:10,T:3H,2R:A,2O:{},1N:B,1H:3(a){6 a[0]},1j:Y,1x:A,D:0,18:A,Z:", ",1o:3(b,a){6 b.2B(1D 3F("(?![^&;]+;)(?!<[^<>]*)("+a.2B(/([\\^\\$\\(\\)\\[\\]\\{\\}\\*\\.\\+\\?\\|\\\\])/2A,"\\\\$1")+")(?![^<>]*>)(?![^&;]+;)","2A"),"<2z>$1</2z>")},1t:B,1w:3E};$.C.2S=3(g){5 h={};5 j=0;3 1e(s,a){4(!g.1A)s=s.P();5 i=s.3D(a);4(i==-1)6 A;6 i==0||g.1O};3 1a(q,a){4(j>g.1d){1g()}4(!h[q]){j++}h[q]=a}3 1b(){4(!g.u)6 A;5 f={},2x=0;4(!g.S)g.1d=1;f[""]=[];11(5 i=0,2v=g.u.7;i<2v;i++){5 c=g.u[i];c=(V c=="1p")?[c]:c;5 d=g.1j(c,i+1,g.u.7);4(d===A)1M;5 e=d.3C(0).P();4(!f[e])f[e]=[];5 b={O:d,u:c,L:g.1r&&g.1r(c)||d};f[e].1B(b);4(2x++<g.T){f[""].1B(b)}};$.H(f,3(i,a){g.1d++;1a(i,a)})}1I(1b,25);3 1g(){h={};j=0}6{1g:1g,1a:1a,1b:1b,2P:3(q){4(!g.1d||!j)6 Y;4(!g.S&&g.1O){5 a=[];11(5 k 2a h){4(k.7>0){5 c=h[k];$.H(c,3(i,x){4(1e(x.O,q)){a.1B(x)}})}}6 a}z 4(h[q]){6 h[q]}z 4(g.1e){11(5 i=q.7-1;i>=g.1T;i--){5 c=h[q.3B(0,i)];4(c){5 a=[];$.H(c,3(i,x){4(1e(x.O,q)){a[a.7]=x}});6 a}}}6 Y}}};$.C.2M=3(e,g,f,k){5 h={G:"3A"};5 j,w=-1,u,1i="",1L=B,E,y;3 2p(){4(!1L)6;E=$("<3z/>").U().J(e.2F).Q("3x","3w").1C(2n.2m);y=$("<3u>").1C(E).3t(3(a){4(W(a).2l&&W(a).2l.3r()==\'2f\'){w=$("1F",y).1q(h.G).3q(W(a));$(W(a)).J(h.G)}}).2i(3(a){$(W(a)).J(h.G);f();g.1G();6 A}).3o(3(){k.1v=B}).3n(3(){k.1v=A});4(e.D>0)E.Q("D",e.D);1L=A}3 W(a){5 b=a.W;3m(b&&b.3s!="2f")b=b.3l;4(!b)6[];6 b}3 R(b){j.1f(w,w+1).1q(h.G);2g(b);5 a=j.1f(w,w+1).J(h.G);4(e.1t){5 c=0;j.1f(0,w).H(3(){c+=F.15});4((c+a[0].15-y.14())>y[0].3k){y.14(c+a[0].15-y.3j())}z 4(c<y.14()){y.14(c)}}};3 2g(a){w+=a;4(w<0){w=j.16()-1}z 4(w>=j.16()){w=0}}3 2e(a){6 e.T&&e.T<a?e.T:a}3 2W(){y.2G();5 b=2e(u.7);11(5 i=0;i<b;i++){4(!u[i])1M;5 a=e.1H(u[i].u,i+1,b,u[i].O,1i);4(a===A)1M;5 c=$("<1F>").3i(e.1o(a,1i)).J(i%2==0?"3h":"3g").1C(y)[0];$.u(c,"2c",u[i])}j=y.3f("1F");4(e.1N){j.1f(0,1).J(h.G);w=0}y.3e()}6{2Q:3(d,q){2p();u=d;1i=q;2W()},2w:3(){R(1)},2C:3(){R(-1)},2t:3(){4(w!=0&&w-8<0){R(-w)}z{R(-8)}},28:3(){4(w!=j.16()-1&&w+8>j.16()){R(j.16()-1-w)}z{R(8)}},U:3(){E&&E.U();w=-1},M:3(){6 E&&E.3d(":M")},3G:3(){6 F.M()&&(j.2b("."+h.G)[0]||e.1N&&j[0])},1W:3(){5 a=$(g).3c();E.Q({D:V e.D=="1p"||e.D>0?e.D:$(g).D(),2D:a.2D+g.15,1R:a.1R}).1W();4(e.1t){y.14(0);y.Q({29:e.1w,3b:\'3a\'});4($.3N.37&&V 2n.2m.36.29==="35"){5 c=0;j.H(3(){c+=F.15});5 b=c>e.1w;y.Q(\'3R\',b?e.1w:c);4(!b){j.D(y.D()-24(j.Q("2I-1R"))-24(j.Q("2I-3U")))}}}},26:3(){5 a=j&&j.2b("."+h.G).1q(h.G);6 a&&a.7&&$.u(a[0],"2c")},2J:3(){y&&y.2G()},1Q:3(){E&&E.3V()}}};$.C.2T=3(b,a,c){4(b.23){5 d=b.23();d.30(B);d.2Z("22",a);d.2Y("22",c);d.2X()}z 4(b.21){b.21(a,c)}z{4(b.2V){b.2V=a;b.47=c}}b.1G()}})(45);',62,257,'|||function|if|var|return|length|||||||||||||||||||||||data||active||list|else|false|true|Autocompleter|width|element|this|ACTIVE|each|val|addClass|case|result|visible|break|value|toLowerCase|css|moveSelect|url|max|hide|typeof|target|onChange|null|multipleSeparator||for|trigger||scrollTop|offsetHeight|size|bind|multiple|hideResultsNow|add|populate|preventDefault|cacheLength|matchSubset|slice|flush|lastWord|term|formatMatch|arguments|extend|trim|trimWords|highlight|string|removeClass|formatResult|parse|scroll|search|mouseDownOnSelect|scrollHeight|autoFill|stopLoading|delay|matchCase|push|appendTo|new|findValueCallback|li|focus|formatItem|setTimeout|clearTimeout|defaults|needsInit|continue|selectFirst|matchContains|request|unbind|left|selectCurrent|minChars|loadingClass|unautocomplete|show|setOptions|autocomplete|flushCache|split|setSelectionRange|character|createTextRange|parseInt||selected||pageDown|maxHeight|in|filter|ac_data|PAGEDOWN|limitNumberOfItems|LI|movePosition|PAGEUP|click|hideResults|COMMA|nodeName|body|document|ESC|init|blur|RETURN|BACKSPACE|pageUp|TAB|ol|next|nullData|DEL|strong|gi|replace|prev|top|DOWN|resultsClass|empty|UP|padding|emptyList|keyCode|dataType|Select|inputClass|extraParams|load|display|mustMatch|Cache|Selection|receiveData|selectionStart|fillList|select|moveEnd|moveStart|collapse|join|off|||undefined|style|msie||attr|auto|overflow|offset|is|bgiframe|find|ac_odd|ac_event|html|innerHeight|clientHeight|parentNode|while|mouseup|mousedown|188|index|toUpperCase|tagName|mouseover|ul|keypress|absolute|position|default|div|ac_over|substr|charAt|indexOf|180|RegExp|current|100|400|ac_loading|ac_results|150|ac_input|browser|switch|keydown|success|height|limit|name|right|remove|port|abort|mode|ajax||Date|timestamp|200|substring|jQuery||selectionEnd|fn'.split('|'),0,{}))
\ No newline at end of file
+eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}(';(3($){$.48.1l({1Y:3(b,d){5 c=V b=="1p";d=$.1l({},$.C.1K,{S:c?b:Y,u:c?Y:b,1z:c?$.C.1K.1z:10,T:d&&!d.1t?10:3L},d);d.1o=d.1o||3(a){6 a};d.1j=d.1j||d.1H;6 F.H(3(){1D $.C(F,d)})},L:3(a){6 F.17("L",a)},1u:3(a){6 F.12("1u",[a])},1Z:3(){6 F.12("1Z")},1X:3(a){6 F.12("1X",[a])},1V:3(){6 F.12("1V")}});$.C=3(n,p){5 s={2H:38,2E:40,2y:46,2u:9,2r:13,2o:27,2k:3p,2h:33,2d:34,2s:8};5 t=$(n).39("1Y","32").J(p.2N);5 o;5 l="";5 m=$.C.2S(p);5 r=0;5 j;5 h={1v:A};5 k=$.C.2M(p,n,1S,h);t.3P(3(a){j=a.2K;3O(a.2K){K s.2H:a.1c();4(k.M()){k.2C()}z{X(0,B)}N;K s.2E:a.1c();4(k.M()){k.2w()}z{X(0,B)}N;K s.2h:a.1c();4(k.M()){k.2t()}z{X(0,B)}N;K s.2d:a.1c();4(k.M()){k.28()}z{X(0,B)}N;K p.18&&$.1m(p.Z)==","&&s.2k:K s.2u:K s.2r:4(1S()){4(!p.18)t.2q();a.1c()}N;K s.2o:k.U();N;3y:1J(o);o=1I(X,p.1z);N}}).3v(3(){}).1G(3(){r++}).2q(3(){r=0;4(!h.1v){2j()}}).2i(3(){4(r++>1&&!k.M()){X(0,B)}}).17("1u",3(){5 c=(1k.7>1)?1k[1]:Y;3 1E(q,a){5 b;4(a&&a.7){11(5 i=0;i<a.7;i++){4(a[i].L.P()==q.P()){b=a[i];N}}}4(V c=="3")c(b);z t.12("L",b&&[b.u,b.O])}$.H(1n(t.I()),3(i,a){1P(a,1E,1E)})}).17("1Z",3(){m.1g()}).17("1X",3(){$.1l(p,1k[1]);4("u"2a 1k[1])m.1b()}).17("1V",3(){k.1Q();t.1Q()});3 1S(){5 b=k.26();4(!b)6 A;5 v=b.L;l=v;4(p.18){5 a=1n(t.I());4(a.7>1){v=a.1f(0,a.7-1).31(p.Z)+p.Z+v}v+=p.Z}t.I(v);19();t.12("L",[b.u,b.O]);6 B}3 X(b,c){4(j==s.2y){k.U();6}5 a=t.I();4(!c&&a==l)6;l=a;a=1h(a);4(a.7>=p.1T){t.J(p.1U);4(!p.1A)a=a.P();1P(a,2U,19)}z{1y();k.U()}};3 1n(b){4(!b){6[""]}5 d=b.20(p.Z);5 c=[];$.H(d,3(i,a){4($.1m(a))c[i]=$.1m(a)});6 c}3 1h(a){4(!p.18)6 a;5 b=1n(a);6 b[b.7-1]}3 1x(q,a){4(p.1x&&(1h(t.I()).P()==q.P())&&j!=s.2s){t.I(t.I()+a.44(1h(l).7));$.C.2T(n,l.7,l.7+a.7)}};3 2j(){1J(o);o=1I(19,43)};3 19(){k.U();1J(o);1y();4(p.2R){t.1u(3(a){4(!a)t.I("")})}};3 2U(q,a){4(a&&a.7&&r){1y();k.2Q(a,q);1x(q,a[0].O);k.1W()}z{19()}};3 1P(f,d,g){4(!p.1A)f=f.P();5 e=m.2P(f);4(e&&e.7){d(f,e)}z 4((V p.S=="1p")&&(p.S.7>0)){5 c={42:+1D 41()};$.H(p.2O,3(a,b){c[a]=V b=="3"?b():b});$.3Z({3Y:"3X",3W:"1Y"+n.3T,2L:p.2L,S:p.S,u:$.1l({q:1h(f),3S:p.T},c),3Q:3(a){5 b=p.1s&&p.1s(a)||1s(a);m.1a(f,b);d(f,b)}})}z{k.2J();g(f)}};3 1s(c){5 d=[];5 b=c.20("\\n");11(5 i=0;i<b.7;i++){5 a=$.1m(b[i]);4(a){a=a.20("|");d[d.7]={u:a,O:a[0],L:p.1r&&p.1r(a,a[0])||a[0]}}}6 d};3 1y(){t.1q(p.1U)}};$.C.1K={2N:"3M",2F:"3K",1U:"3J",1T:1,1z:3I,1A:A,1e:B,1O:A,1d:10,T:3H,2R:A,2O:{},1N:B,1H:3(a){6 a[0]},1j:Y,1x:A,D:0,18:A,Z:", ",1o:3(b,a){6 b.2B(1D 3F("(?![^&;]+;)(?!<[^<>]*)("+a.2B(/([\\^\\$\\(\\)\\[\\]\\{\\}\\*\\.\\+\\?\\|\\\\])/2A,"\\\\$1")+")(?![^<>]*>)(?![^&;]+;)","2A"),"<2z>$1</2z>")},1t:B,1w:3E};$.C.2S=3(g){5 h={};5 j=0;3 1e(s,a){4(!g.1A)s=s.P();5 i=s.3D(a);4(i==-1)6 A;6 i==0||g.1O};3 1a(q,a){4(j>g.1d){1g()}4(!h[q]){j++}h[q]=a}3 1b(){4(!g.u)6 A;5 f={},2x=0;4(!g.S)g.1d=1;f[""]=[];11(5 i=0,2v=g.u.7;i<2v;i++){5 c=g.u[i];c=(V c=="1p")?[c]:c;5 d=g.1j(c,i+1,g.u.7);4(d===A)1M;5 e=d.3C(0).P();4(!f[e])f[e]=[];5 b={O:d,u:c,L:g.1r&&g.1r(c)||d};f[e].1B(b);4(2x++<g.T){f[""].1B(b)}};$.H(f,3(i,a){g.1d++;1a(i,a)})}1I(1b,25);3 1g(){h={};j=0}6{1g:1g,1a:1a,1b:1b,2P:3(q){4(!g.1d||!j)6 Y;4(!g.S&&g.1O){5 a=[];11(5 k 2a h){4(k.7>0){5 c=h[k];$.H(c,3(i,x){4(1e(x.O,q)){a.1B(x)}})}}6 a}z 4(h[q]){6 h[q]}z 4(g.1e){11(5 i=q.7-1;i>=g.1T;i--){5 c=h[q.3B(0,i)];4(c){5 a=[];$.H(c,3(i,x){4(1e(x.O,q)){a[a.7]=x}});6 a}}}6 Y}}};$.C.2M=3(e,g,f,k){5 h={G:"3A"};5 j,w=-1,u,1i="",1L=B,E,y;3 2p(){4(!1L)6;E=$("<3z/>").U().J(e.2F).Q("3x","3w").1C(2n.2m);y=$("<3u>").1C(E).3t(3(a){4(W(a).2l&&W(a).2l.3r()==\'2f\'){w=$("1F",y).1q(h.G).3q(W(a));$(W(a)).J(h.G)}}).2i(3(a){$(W(a)).J(h.G);f();g.1G();6 A}).3o(3(){k.1v=B}).3n(3(){k.1v=A});4(e.D>0)E.Q("D",e.D);1L=A}3 W(a){5 b=a.W;3m(b&&b.3s!="2f")b=b.3l;4(!b)6[];6 b}3 R(b){j.1f(w,w+1).1q(h.G);2g(b);5 a=j.1f(w,w+1).J(h.G);4(e.1t){5 c=0;j.1f(0,w).H(3(){c+=F.15});4((c+a[0].15-y.14())>y[0].3k){y.14(c+a[0].15-y.3j())}z 4(c<y.14()){y.14(c)}}};3 2g(a){w+=a;4(w<0){w=j.16()-1}z 4(w>=j.16()){w=0}}3 2e(a){6 e.T&&e.T<a?e.T:a}3 2W(){y.2G();5 b=2e(u.7);11(5 i=0;i<b;i++){4(!u[i])1M;5 a=e.1H(u[i].u,i+1,b,u[i].O,1i);4(a===A)1M;5 c=$("<1F>").3i(e.1o(a,1i)).J(i%2==0?"3h":"3g").1C(y)[0];$.u(c,"2c",u[i])}j=y.3f("1F");4(e.1N){j.1f(0,1).J(h.G);w=0}y.3e()}6{2Q:3(d,q){2p();u=d;1i=q;2W()},2w:3(){R(1)},2C:3(){R(-1)},2t:3(){4(w!=0&&w-8<0){R(-w)}z{R(-8)}},28:3(){4(w!=j.16()-1&&w+8>j.16()){R(j.16()-1-w)}z{R(8)}},U:3(){E&&E.U();w=-1},M:3(){6 E&&E.3d(":M")},3G:3(){6 F.M()&&(j.2b("."+h.G)[0]||e.1N&&j[0])},1W:3(){5 a=$(g).3c();E.Q({D:V e.D=="1p"||e.D>0?e.D:$(g).D(),2D:a.2D+g.15,1R:a.1R}).1W();4(e.1t){y.14(0);y.Q({29:e.1w,3b:\'3a\'});4($.3N.37&&V 2n.2m.36.29==="35"){5 c=0;j.H(3(){c+=F.15});5 b=c>e.1w;y.Q(\'3R\',b?e.1w:c);4(!b){j.D(y.D()-24(j.Q("2I-1R"))-24(j.Q("2I-3U")))}}}},26:3(){5 a=j&&j.2b("."+h.G).1q(h.G);6 a&&a.7&&$.u(a[0],"2c")},2J:3(){y&&y.2G()},1Q:3(){E&&E.3V()}}};$.C.2T=3(b,a,c){4(b.23){5 d=b.23();d.30(B);d.2Z("22",a);d.2Y("22",c);d.2X()}z 4(b.21){b.21(a,c)}z{4(b.2V){b.2V=a;b.47=c}}b.1G()}})(45);',62,257,'|||function|if|var|return|length|||||||||||||||||||||||data||active||list|else|false|true|Autocompleter|width|element|this|ACTIVE|each|val|addClass|case|result|visible|break|value|toLowerCase|css|moveSelect|url|max|hide|typeof|target|onChange|null|multipleSeparator||for|trigger||scrollTop|offsetHeight|size|bind|multiple|hideResultsNow|add|populate|preventDefault|cacheLength|matchSubset|slice|flush|lastWord|term|formatMatch|arguments|extend|trim|trimWords|highlight|string|removeClass|formatResult|parse|scroll|search|mouseDownOnSelect|scrollHeight|autoFill|stopLoading|delay|matchCase|push|appendTo|new|findValueCallback|li|focus|formatItem|setTimeout|clearTimeout|defaults|needsInit|continue|selectFirst|matchContains|request|unbind|left|selectCurrent|minChars|loadingClass|unautocomplete|show|setOptions|autocomplete|flushCache|split|setSelectionRange|character|createTextRange|parseInt||selected||pageDown|maxHeight|in|filter|ac_data|PAGEDOWN|limitNumberOfItems|LI|movePosition|PAGEUP|click|hideResults|COMMA|nodeName|body|document|ESC|init|blur|RETURN|BACKSPACE|pageUp|TAB|ol|next|nullData|DEL|strong|gi|replace|prev|top|DOWN|resultsClass|empty|UP|padding|emptyList|keyCode|dataType|Select|inputClass|extraParams|load|display|mustMatch|Cache|Selection|receiveData|selectionStart|fillList|select|moveEnd|moveStart|collapse|join|off|||undefined|style|msie||attr|auto|overflow|offset|is|bgiframe|find|ac_odd|ac_event|html|innerHeight|clientHeight|parentNode|while|mouseup|mousedown|188|index|toUpperCase|tagName|mouseover|ul|keypress|absolute|position|default|div|ac_over|substr|charAt|indexOf|180|RegExp|current|100|400|ac_loading|ac_results|150|ac_input|browser|switch|keydown|success|height|limit|name|right|remove|port|abort|mode|ajax||Date|timestamp|200|substring|jQuery||selectionEnd|fn'.split('|'),0,{}))
diff --git a/webapp/src/main/webapp/js/jquery_plugins/jquery.MultiFile.js b/webapp/src/main/webapp/js/jquery_plugins/jquery.MultiFile.js
index 14ba18f65..949b13d6b 100644
--- a/webapp/src/main/webapp/js/jquery_plugins/jquery.MultiFile.js
+++ b/webapp/src/main/webapp/js/jquery_plugins/jquery.MultiFile.js
@@ -1,7 +1,7 @@
 /*
  ### jQuery Multiple File Upload Plugin v1.28 - 2008-05-02 ###
  By Diego A., http://www.fyneworks.com, diego@fyneworks.com
- 
+
  Project: http://jquery.com/plugins/project/MultiFile/
  Website: http://www.fyneworks.com/jquery/multiple-file-upload/
  Forums:  http://www.nabble.com/jQuery-Multiple-File-Upload-f20931.html
@@ -11,59 +11,59 @@
 	12-April-2007: v1.1
 	Added events and file extension validation
 	See website for details.
-	
+
 	06-June-2007: v1.2
 	Now works in Opera.
-	
+
 	12-June-2007: v1.21
 	Preserves name of file input so all current server-side
 	functions don't need to be changed on new installations.
-	
+
 	24-June-2007: v1.22
 	Now works perfectly in Opera, thanks to Adrian Wróbel <adrian [dot] wrobel [at] gmail.com>
-	
+
 	10-Jan-2008: v1.24
 	Fixed bug in event trigger - sending incorrect parameters to event handlers
-	
+
 	14-Jan-2008: v1.24
 	Fixed bug 1251: http://plugins.jquery.com/project/comments/add/1251
-	
+
 	25-Jan-2008: v1.24
 	Implemented feature request: http://plugins.jquery.com/node/1363
 	The plugin now automatically intercepts ajaxSubmit function (form plugin)
 	and disbales empty file input elements for submission
-	
+
 	08-Feb-2008: v1.25
 	Fixed bug: http://plugins.jquery.com/node/1495
 	The last change caused the plugin to disabled input files that shouldn't have been ignored
 	Now, every newly created input file (by this plugin) is marked by the MultiFile class.
-	
+
 	11-Feb-2008: v1.25
 	Fixed bug: http://plugins.jquery.com/node/1495
 	Plugin would override element ID everytime.
-	
+
 	11-Feb-2008: v1.26
 	Modified plugin structure. After selecting and removing a file, the plugin would
 	remove the original element from DOM. Now the plugin works back on its own tracks
 	and removes the	last generated element.
 	This will resolve compatibility issues with validation plugins and custom code.
-	
+
 	12-Feb-2008: v1.26
 	Try to clear elements using the browser's native behaviour: .reset()
 	This works around security policies in IE6 and Opera.
-	
+
 	17-Mar-2008: v1.27
 	Added properties/methods for easier form integration
 	$.MultiFile.autoIntercept - array of known jQuery plugins to intercept (default: 'submit', 'ajaxSubmit', 'validate');
 	$.MultiFile.intercept - intercepts a jQuery plugin / anonymous function
 	$.MultiFile.disableEmpty - disable empty inputs (required for some upload scripts)
 	$.MultiFile.reEnableEmpty - re-enables empty inputs
-	
+
 	17-Mar-2008: v1.28
 	MAJOR FIX - OPERA BUG
 	MASTER.labels was a readyonly property and cause the script to fail.
 	Renamed to MASTER.eLBL. Problem solved!
-	
+
 	29-Apr-2008: v1.28
 	Added validation to stop duplicate selections
 	Extracted default configuration to $.MultiFile.options
@@ -77,7 +77,7 @@
 /*# AVOID COLLISIONS #*/
 ;if(jQuery) (function($){
 /*# AVOID COLLISIONS #*/
- 
+
  // extend jQuery - $.MultiFile hook
  $.extend($, {
   MultiFile: function( o /* Object */ ){
@@ -85,9 +85,9 @@
    return $("input:file.multi").MultiFile(o);
   }
  });
- 
+
 	//===
-	
+
 	// extend $.MultiFile - default options
  $.extend($.MultiFile, {
   options: {
@@ -97,7 +97,7 @@
 				if($.blockUI){
 					$.blockUI({
       message: s.replace(/\n/gi,'<br/>'),
-						css: { 
+						css: {
 							border:'none', padding:'15px', size:'12.0pt',
 							backgroundColor:'#900', color:'#fff',
 							opacity:'.8','-webkit-border-radius': '10px','-moz-border-radius': '10px'
@@ -120,9 +120,9 @@
 			}
 		}
  });
- 
+
 	//===
-	
+
  // extend $.MultiFile - global methods
  $.extend($.MultiFile, {
   disableEmpty: function(){
@@ -161,52 +161,52 @@
 			};// for each method
 		}
  });
- 
+
 	//===
-	
+
  // extend jQuery function library
  $.extend($.fn, {
-   
+
 			// Use this function to clear values of file inputs
 			// This doesn't always work: $(element).val('').attr('value', '')[0].value = '';
 			reset: function(){ return this.each(function(){ try{ this.reset(); }catch(e){} }); },
-				
+
    // MultiFile function
    MultiFile: function( o /* Object */ ){
-				
+
     //### http://plugins.jquery.com/node/1363
     // utility method to integrate this plugin with others...
     if($.MultiFile.autoIntercept){
 				 $.MultiFile.intercept( $.MultiFile.autoIntercept /* array of methods to intercept */ );
 					$.MultiFile.autoIntercept = null; /* only run this once */
 				};
-				
+
 				//===
-				
+
     // Bind to each element in current jQuery object
     return $(this).each(function(group_count){
      if(this._MultiFile) return; this._MultiFile = true;
-     
+
        // BUG 1251 FIX: http://plugins.jquery.com/project/comments/add/1251
        // variable group_count would repeat itself on multiple calls to the plugin.
        // this would cause a conflict with multiple elements
        // changes scope of variable to global so id will be unique over n calls
 							window.MultiFile = (window.MultiFile || 0) + 1;
        group_count = window.MultiFile;
-       
+
        // Copy parent attributes - Thanks to Jonas Wagner
        // we will use this one to create new input elements
        var MASTER = this, xCLONE = $(MASTER).clone();
-       
+
 							//===
-       
+
        //# USE CONFIGURATION
        if(typeof o=='number') o = {max:o};
        if(typeof o=='string') o = {accept:o};
        o = $.extend({},
 								$.MultiFile.options,
         ($.metadata ? $(MASTER).metadata()/*NEW metadata plugin*/ :
-        ($.meta ? $(MASTER).data()/*OLD metadata plugin*/ : 
+        ($.meta ? $(MASTER).data()/*OLD metadata plugin*/ :
         null/*metadata plugin not available*/)) || {},
 								o || {}
 							);
@@ -226,15 +226,15 @@
         o.accept = (MASTER.className.match(/\b(accept\-[\w\|]+)\b/gi)) || '';
         o.accept = new String(o.accept).replace(/^(accept|ext)\-/i,'');
        };
-							
+
 							//===
-       
+
        // APPLY CONFIGURATION
        $.extend(MASTER, o || {});
        MASTER.STRING = $.extend({},$.MultiFile.options.STRING,MASTER.STRING);
-							
+
 							//===
-       
+
        //#########################################
        // PRIVATE PROPERTIES/METHODS
        $.extend(MASTER, {
@@ -251,37 +251,37 @@
 									return true;
 								}
        });
-       
+
 							//===
-       
+
        // Setup dynamic regular expression for extension validation
        // - thanks to John-Paul Bader: http://smyck.de/2006/08/11/javascript-dynamic-regular-expresions/
        if(String(MASTER.accept).length>1){
         MASTER.rxAccept = new RegExp('\\.('+(MASTER.accept?MASTER.accept:'')+')$','gi');
        };
-       
+
 							//===
-       
+
 							// Create wrapper to hold our file list
        MASTER.wrapID = MASTER.instanceKey+'_wrap'; // Wrapper ID?
        $(MASTER).wrap('<div id="'+MASTER.wrapID+'"></div>');
        MASTER.eWRP = $('#'+MASTER.wrapID+'');
-       
+
 							//===
-       
+
        // MASTER MUST have a name
 							MASTER.name = MASTER.name || 'file[]';
-       
+
 							//===
-       
+
        // Create a wrapper for the labels
 							// * OPERA BUG: NO_MODIFICATION_ALLOWED_ERR ('labels' is a read-only property)
        // this changes allows us to keep the files in the order they were selected
 							MASTER.eWRP.append( '<span id="'+MASTER.wrapID+'_labels"></span>' );
 							MASTER.eLBL = $('#'+MASTER.wrapID+'_labels');
-       
+
 							//===
-       
+
        // Bind a new element
        MASTER.addSlave = function( slave, slave_count ){
         // Keep track of how many elements have been displayed
@@ -290,14 +290,14 @@
         slave.MASTER = MASTER;
 								// Count slaves
         slave.i = slave_count;
-								
+
 								// BUG FIX: http://plugins.jquery.com/node/1495
  							// Clear identifying properties from clones
 								if(slave.i>0) slave.id = slave.name = null;
-        
+
 								// Define element's ID and name (upload components need this!)
         slave.id = slave.id || MASTER.generateID(slave.i);
-        
+
 								//slave.name = (slave.name || $(MASTER).attr('name') || 'file');// + (slave.i>0?slave.i:''); // same name as master element
 								// 2008-Apr-29: New customizable naming convention (see url below)
 								// http://groups.google.com/group/jquery-dev/browse_frm/thread/765c73e41b34f924#
@@ -307,31 +307,31 @@
 								 /*group count*/.replace(/\$g/gi,   (group_count>0?group_count:''))
 								 /*slave count*/.replace(/\$i/gi,   (slave_count>0?slave_count:''))
 								);
-								
+
  							// Clear value
 								$(slave).val('').attr('value','')[0].value = '';
-        
+
         // If we've reached maximum number, disable input slave
         if( (MASTER.max > 0) && ((MASTER.n-1) > (MASTER.max)) )//{ // MASTER.n Starts at 1, so subtract 1 to find true count
          slave.disabled = true;
         //};
-        
+
         // Remember most recent slave
         MASTER.eCur = MASTER.slaves[slave.i] = slave;
-        
+
         /// now let's use jQuery
         slave = $(slave);
-        
+
         // Triggered when a file is selected
         $(slave).change(function(){
-          
+
           //# Trigger Event! onFileSelect
           if(!MASTER.trigger('onFileSelect', this, MASTER)) return false;
           //# End Event!
-          
+
 										//# Retrive value of selected file from element
           var ERROR = '', v = String(this.value || ''/*.attr('value)*/);
-										
+
           // check extension
           if(MASTER.accept){
            if(v!=''){
@@ -340,7 +340,7 @@
 												}
            }
           };
-          
+
           // Disallow duplicates
 										for(var f=0;f<MASTER.slaves.length;f++){
 											if(MASTER.slaves[f]!=this){
@@ -349,7 +349,7 @@
 												}
 											}
           };
-										
+
           // Create a new file input element
           //var newEle = $('<input name="'+($(MASTER).attr('name') || '')+'" type="file"/>');
           var newEle = xCLONE.clone();// Copy parent attributes - Thanks to Jonas Wagner
@@ -357,15 +357,15 @@
 										// we can disable the empty ones before submission
 										// See: http://plugins.jquery.com/node/1495
 										newEle.addClass('MultiFile');
-          
+
 										// Handle error
 										if(ERROR!=''){
 												// Handle error
 												MASTER.error(ERROR);
-												
+
 												// Clear element value (DOES NOT WORK in some browsers)
             //slave.reset().val('').attr('value', '')[0].value = '';
-												
+
 												// 2007-06-24: BUG FIX - Thanks to Adrian Wróbel <adrian [dot] wrobel [at] gmail.com>
 												// Ditch the trouble maker and add a fresh new element
             MASTER.n--;
@@ -374,58 +374,58 @@
             slave.remove();
             return false;
 										};
-          
+
           // Hide this element (NB: display:none is evil!)
           $(this).css({ position:'absolute', top: '-3000px' });
-          
+
           // Add new element to the form
           MASTER.eLBL.before(newEle);//.append(newEle);
-          
+
           // Update list
           MASTER.addToList( this );
-          
+
           // Bind functionality
           MASTER.addSlave( newEle[0], this.i+1 );
-          
+
           //# Trigger Event! afterFileSelect
           if(!MASTER.trigger('afterFileSelect', this, MASTER)) return false;
           //# End Event!
-          
+
         }); // slave.change()
-				    
+
        };// MASTER.addSlave
        // Bind a new element
-       
-       
-       
+
+
+
        // Add a new file to the list
        MASTER.addToList = function( slave ){
-        
+
         //# Trigger Event! onFileAppend
         if(!MASTER.trigger('onFileAppend', slave, MASTER)) return false;
         //# End Event!
-        
+
         // Create label elements
         var
          r = $('<div></div>'),
          v = String(slave.value || ''/*.attr('value)*/),
          a = $('<span class="file" title="'+MASTER.STRING.selected.replace('$file', v)+'">'+v.match(/[^\/\\]+$/gi)[0]+'</span>'),
          b = $('<a href="#'+MASTER.wrapID+'">'+MASTER.STRING.remove+'</a>');
-        
+
         // Insert label
         MASTER.eLBL.append(
          r.append('[', b, ']&nbsp;', a)//.prepend(slave.i+': ')
         );
-        
+
         b.click(function(){
-         
+
           //# Trigger Event! onFileRemove
           if(!MASTER.trigger('onFileRemove', slave, MASTER)) return false;
           //# End Event!
-          
+
           MASTER.n--;
           MASTER.eCur.disabled = false;
-										
+
 										// Remove element, remove label, point to current
 										if(slave.i==0){
 											$(MASTER.eCur).remove();
@@ -435,40 +435,40 @@
 											$(slave).remove();
 										};
           $(this).parent().remove();
-										
+
           // Show most current element again (move into view) and clear selection
 										$(MASTER.eCur).css({ position:'', top: '' }).reset().val('').attr('value', '')[0].value = '';
-          
+
           //# Trigger Event! afterFileRemove
           if(!MASTER.trigger('afterFileRemove', slave, MASTER)) return false;
           //# End Event!
 
-          
+
           return false;
         });
-        
+
         //# Trigger Event! afterFileAppend
         if(!MASTER.trigger('afterFileAppend', slave, MASTER)) return false;
         //# End Event!
-        
+
        }; // MASTER.addToList
        // Add element to selected files list
-       
-       
-       
+
+
+
        // Bind functionality to the first element
        if(!MASTER.MASTER) MASTER.addSlave(MASTER, 0);
-       
+
        // Increment control count
        //MASTER.I++; // using window.MultiFile
        MASTER.n++;
-       
+
     });
     // each element
-   
+
    }
    // MultiFile function
- 
+
  });
  // extend jQuery function library
 
@@ -478,8 +478,8 @@
  ### Default implementation ###
  The plugin will attach itself to file inputs
  with the class 'multi' when the page loads
- 
- Use the jQuery start plugin to 
+
+ Use the jQuery start plugin to
 */
 /*
 if($.start){ $.start('MultiFile', $.MultiFile) }
diff --git a/webapp/src/main/webapp/js/jquery_plugins/jquery.MultiFile.pack.js b/webapp/src/main/webapp/js/jquery_plugins/jquery.MultiFile.pack.js
index 99e796411..aa5e5f7b6 100644
--- a/webapp/src/main/webapp/js/jquery_plugins/jquery.MultiFile.pack.js
+++ b/webapp/src/main/webapp/js/jquery_plugins/jquery.MultiFile.pack.js
@@ -1,9 +1,9 @@
 /*
  ### jQuery Multiple File Upload Plugin v1.28 - 2008-05-02 ###
  By Diego A., http://www.fyneworks.com, diego@fyneworks.com
- 
+
  Project: http://jquery.com/plugins/project/MultiFile/
  Website: http://www.fyneworks.com/jquery/multiple-file-upload/
  Forums:  http://www.nabble.com/jQuery-Multiple-File-Upload-f20931.html
 */
-eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}(';2(1n)(3($){$.y($,{5:3(o){7 $("17:m.1s").5(o)}});$.y($.5,{X:{k:\'\',h:-1,1I:3(s){2($.1A){$.1A({2s:s.u(/\\n/l,\'<27/>\'),11:{Z:\'23\',1Z:\'1T\',1Q:\'12.1K\',2K:\'#2G\',2A:\'#2x\',2w:\'.8\',\'-2r-Z-1v\':\'1u\',\'-2h-Z-1v\':\'1u\'}});J.2b($.29,28)}T{26(s)}},1m:\'$D\',A:{E:\'E\',1j:\'20 1X 1W a $W m.\\1P 1N...\',M:\'1L M: $m\',1d:\'1J m 2J 2I 2F M:\\n$m\'}}});$.y($.5,{1b:3(){$(\'17:m\').H(3(){t a=$(6);2(a.1c()==\'\')a.1C(\'16\').H(3(){6.S=R})})},15:3(){$(\'17:m.16\').2p(\'16\').H(3(){6.S=q})},L:[\'2m\',\'2j\',\'2g\'],19:{},1t:3(b,c,d){t e,j;d=d||[];2(d.1r.1q().1p("1o")<0)d=[d];2(13(b)==\'3\'){$.5.1b();j=b.1l(c||J,d);$.5.15();7 j};2(b.1r.1q().1p("1o")<0)b=[b];1k(t i=0;i<b.10;i++){e=b[i]+\'\';2(e)(3(a){$.5.19[a]=$.Y[a]||3(){};$.Y[a]=3(){$.5.1b();j=$.5.19[a].1l(6,25);$.5.15();7 j}})(e)}}});$.y($.Y,{1a:3(){7 6.H(3(){24{6.1a()}22(e){}})},5:3(o){2($.5.L){$.5.1t($.5.L);$.5.L=N};7 $(6).H(3(e){2(6.1i)7;6.1i=R;J.5=(J.5||0)+1;e=J.5;t g=6,1h=$(g).1g();2(13 o==\'1V\')o={h:o};2(13 o==\'1U\')o={k:o};o=$.y({},$.5.X,($.1e?$(g).1e():($.1S?$(g).1R():N))||{},o||{});2(!(o.h>0)){o.h=$(g).C(\'1O\');2(!(o.h>0)){o.h=(p(g.1f.x(/\\b(h|1M)\\-([0-9]+)\\b/l)||[\'\']).x(/[0-9]+/l)||[\'\'])[0];2(!(o.h>0))o.h=-1;T o.h=p(o.h).x(/[0-9]+/l)[0]}};o.h=V 1Y(o.h);o.k=o.k||$(g).C(\'k\')||\'\';2(!o.k){o.k=(g.1f.x(/\\b(k\\-[\\w\\|]+)\\b/l))||\'\';o.k=V p(o.k).u(/^(k|W)\\-/i,\'\')};$.y(g,o||{});g.A=$.y({},$.5.X.A,g.A);$.y(g,{n:0,K:[],21:[],U:g.B||\'5\'+p(e),1H:3(z){7 g.U+(z>0?\'2H\'+p(z):\'\')},F:3(a,b){t c=g[a],j=$(b).C(\'j\');2(c){t d=c(b,j,g);2(d!=N)7 d}7 R}});2(p(g.k).10>1){g.1G=V 2D(\'\\\\.(\'+(g.k?g.k:\'\')+\')$\',\'l\')};g.G=g.U+\'2z\';$(g).2y(\'<O B="\'+g.G+\'"></O>\');g.1E=$(\'#\'+g.G+\'\');g.D=g.D||\'m[]\';g.1E.18(\'<P B="\'+g.G+\'1D"></P>\');g.14=$(\'#\'+g.G+\'1D\');g.Q=3(c,d){g.n++;c.1B=g;c.i=d;2(c.i>0)c.B=c.D=N;c.B=c.B||g.1H(c.i);c.D=p(g.1m.u(/\\$D/l,$(g).C(\'D\')).u(/\\$B/l,$(g).C(\'B\')).u(/\\$g/l,(e>0?e:\'\')).u(/\\$i/l,(d>0?d:\'\')));$(c).1c(\'\').C(\'j\',\'\')[0].j=\'\';2((g.h>0)&&((g.n-1)>(g.h)))c.S=R;g.I=g.K[c.i]=c;c=$(c);$(c).2v(3(){2(!g.F(\'2u\',6,g))7 q;t a=\'\',v=p(6.j||\'\');2(g.k){2(v!=\'\'){2(!v.x(g.1G)){a=g.A.1j.u(\'$W\',p(v.x(/\\.\\w{1,4}$/l)))}}};1k(t f=0;f<g.K.10;f++){2(g.K[f]!=6){2(g.K[f].j==v){a=g.A.1d.u(\'$m\',v.x(/[^\\/\\\\]+$/l))}}};t b=1h.1g();b.1C(\'5\');2(a!=\'\'){g.1I(a);g.n--;g.Q(b[0],6.i);c.1x().2q(b);c.E();7 q};$(6).11({1w:\'2t\',1y:\'-2o\'});g.14.2n(b);g.1z(6);g.Q(b[0],6.i+1);2(!g.F(\'2l\',6,g))7 q})};g.1z=3(c){2(!g.F(\'2k\',c,g))7 q;t r=$(\'<O></O>\'),v=p(c.j||\'\'),a=$(\'<P 2i="m" 2B="\'+g.A.M.u(\'$m\',v)+\'">\'+v.x(/[^\\/\\\\]+$/l)[0]+\'</P>\'),b=$(\'<a 2C="#\'+g.G+\'">\'+g.A.E+\'</a>\');g.14.18(r.18(\'[\',b,\']&2f;\',a));b.2E(3(){2(!g.F(\'2e\',c,g))7 q;g.n--;g.I.S=q;2(c.i==0){$(g.I).E();g.I=c}T{$(c).E()};$(6).1x().E();$(g.I).11({1w:\'\',1y:\'\'}).1a().1c(\'\').C(\'j\',\'\')[0].j=\'\';2(!g.F(\'2d\',c,g))7 q;7 q});2(!g.F(\'2c\',c,g))7 q};2(!g.1B)g.Q(g,0);g.n++})}});2($.1F)$.1F(\'5\',3(a){a=a||6;$("2a[@2L=\'m\'].1s",a).5()});T $(3(){$.5()})})(1n);',62,172,'||if|function||MultiFile|this|return||||||||||max||value|accept|gi|file|||String|false|||var|replace|||match|extend||STRING|id|attr|name|remove|trigger|wrapID|each|eCur|window|slaves|autoIntercept|selected|null|div|span|addSlave|true|disabled|else|instanceKey|new|ext|options|fn|border|length|css||typeof|eLBL|reEnableEmpty|mfD|input|append|intercepted|reset|disableEmpty|val|duplicate|metadata|className|clone|xCLONE|_MultiFile|denied|for|apply|namePattern|jQuery|Array|indexOf|toString|constructor|multi|intercept|10px|radius|position|parent|top|addToList|blockUI|MASTER|addClass|_labels|eWRP|start|rxAccept|generateID|error|This|0pt|File|limit|again|maxlength|nTry|size|data|meta|15px|string|number|select|cannot|Number|padding|You|files|catch|none|try|arguments|alert|br|2000|unblockUI|INPUT|setTimeout|afterFileAppend|afterFileRemove|onFileRemove|nbsp|validate|moz|class|ajaxSubmit|onFileAppend|afterFileSelect|submit|before|3000px|removeClass|prepend|webkit|message|absolute|onFileSelect|change|opacity|fff|wrap|_wrap|color|title|href|RegExp|click|been|900|_F|already|has|backgroundColor|type'.split('|'),0,{}))
\ No newline at end of file
+eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}(';2(1n)(3($){$.y($,{5:3(o){7 $("17:m.1s").5(o)}});$.y($.5,{X:{k:\'\',h:-1,1I:3(s){2($.1A){$.1A({2s:s.u(/\\n/l,\'<27/>\'),11:{Z:\'23\',1Z:\'1T\',1Q:\'12.1K\',2K:\'#2G\',2A:\'#2x\',2w:\'.8\',\'-2r-Z-1v\':\'1u\',\'-2h-Z-1v\':\'1u\'}});J.2b($.29,28)}T{26(s)}},1m:\'$D\',A:{E:\'E\',1j:\'20 1X 1W a $W m.\\1P 1N...\',M:\'1L M: $m\',1d:\'1J m 2J 2I 2F M:\\n$m\'}}});$.y($.5,{1b:3(){$(\'17:m\').H(3(){t a=$(6);2(a.1c()==\'\')a.1C(\'16\').H(3(){6.S=R})})},15:3(){$(\'17:m.16\').2p(\'16\').H(3(){6.S=q})},L:[\'2m\',\'2j\',\'2g\'],19:{},1t:3(b,c,d){t e,j;d=d||[];2(d.1r.1q().1p("1o")<0)d=[d];2(13(b)==\'3\'){$.5.1b();j=b.1l(c||J,d);$.5.15();7 j};2(b.1r.1q().1p("1o")<0)b=[b];1k(t i=0;i<b.10;i++){e=b[i]+\'\';2(e)(3(a){$.5.19[a]=$.Y[a]||3(){};$.Y[a]=3(){$.5.1b();j=$.5.19[a].1l(6,25);$.5.15();7 j}})(e)}}});$.y($.Y,{1a:3(){7 6.H(3(){24{6.1a()}22(e){}})},5:3(o){2($.5.L){$.5.1t($.5.L);$.5.L=N};7 $(6).H(3(e){2(6.1i)7;6.1i=R;J.5=(J.5||0)+1;e=J.5;t g=6,1h=$(g).1g();2(13 o==\'1V\')o={h:o};2(13 o==\'1U\')o={k:o};o=$.y({},$.5.X,($.1e?$(g).1e():($.1S?$(g).1R():N))||{},o||{});2(!(o.h>0)){o.h=$(g).C(\'1O\');2(!(o.h>0)){o.h=(p(g.1f.x(/\\b(h|1M)\\-([0-9]+)\\b/l)||[\'\']).x(/[0-9]+/l)||[\'\'])[0];2(!(o.h>0))o.h=-1;T o.h=p(o.h).x(/[0-9]+/l)[0]}};o.h=V 1Y(o.h);o.k=o.k||$(g).C(\'k\')||\'\';2(!o.k){o.k=(g.1f.x(/\\b(k\\-[\\w\\|]+)\\b/l))||\'\';o.k=V p(o.k).u(/^(k|W)\\-/i,\'\')};$.y(g,o||{});g.A=$.y({},$.5.X.A,g.A);$.y(g,{n:0,K:[],21:[],U:g.B||\'5\'+p(e),1H:3(z){7 g.U+(z>0?\'2H\'+p(z):\'\')},F:3(a,b){t c=g[a],j=$(b).C(\'j\');2(c){t d=c(b,j,g);2(d!=N)7 d}7 R}});2(p(g.k).10>1){g.1G=V 2D(\'\\\\.(\'+(g.k?g.k:\'\')+\')$\',\'l\')};g.G=g.U+\'2z\';$(g).2y(\'<O B="\'+g.G+\'"></O>\');g.1E=$(\'#\'+g.G+\'\');g.D=g.D||\'m[]\';g.1E.18(\'<P B="\'+g.G+\'1D"></P>\');g.14=$(\'#\'+g.G+\'1D\');g.Q=3(c,d){g.n++;c.1B=g;c.i=d;2(c.i>0)c.B=c.D=N;c.B=c.B||g.1H(c.i);c.D=p(g.1m.u(/\\$D/l,$(g).C(\'D\')).u(/\\$B/l,$(g).C(\'B\')).u(/\\$g/l,(e>0?e:\'\')).u(/\\$i/l,(d>0?d:\'\')));$(c).1c(\'\').C(\'j\',\'\')[0].j=\'\';2((g.h>0)&&((g.n-1)>(g.h)))c.S=R;g.I=g.K[c.i]=c;c=$(c);$(c).2v(3(){2(!g.F(\'2u\',6,g))7 q;t a=\'\',v=p(6.j||\'\');2(g.k){2(v!=\'\'){2(!v.x(g.1G)){a=g.A.1j.u(\'$W\',p(v.x(/\\.\\w{1,4}$/l)))}}};1k(t f=0;f<g.K.10;f++){2(g.K[f]!=6){2(g.K[f].j==v){a=g.A.1d.u(\'$m\',v.x(/[^\\/\\\\]+$/l))}}};t b=1h.1g();b.1C(\'5\');2(a!=\'\'){g.1I(a);g.n--;g.Q(b[0],6.i);c.1x().2q(b);c.E();7 q};$(6).11({1w:\'2t\',1y:\'-2o\'});g.14.2n(b);g.1z(6);g.Q(b[0],6.i+1);2(!g.F(\'2l\',6,g))7 q})};g.1z=3(c){2(!g.F(\'2k\',c,g))7 q;t r=$(\'<O></O>\'),v=p(c.j||\'\'),a=$(\'<P 2i="m" 2B="\'+g.A.M.u(\'$m\',v)+\'">\'+v.x(/[^\\/\\\\]+$/l)[0]+\'</P>\'),b=$(\'<a 2C="#\'+g.G+\'">\'+g.A.E+\'</a>\');g.14.18(r.18(\'[\',b,\']&2f;\',a));b.2E(3(){2(!g.F(\'2e\',c,g))7 q;g.n--;g.I.S=q;2(c.i==0){$(g.I).E();g.I=c}T{$(c).E()};$(6).1x().E();$(g.I).11({1w:\'\',1y:\'\'}).1a().1c(\'\').C(\'j\',\'\')[0].j=\'\';2(!g.F(\'2d\',c,g))7 q;7 q});2(!g.F(\'2c\',c,g))7 q};2(!g.1B)g.Q(g,0);g.n++})}});2($.1F)$.1F(\'5\',3(a){a=a||6;$("2a[@2L=\'m\'].1s",a).5()});T $(3(){$.5()})})(1n);',62,172,'||if|function||MultiFile|this|return||||||||||max||value|accept|gi|file|||String|false|||var|replace|||match|extend||STRING|id|attr|name|remove|trigger|wrapID|each|eCur|window|slaves|autoIntercept|selected|null|div|span|addSlave|true|disabled|else|instanceKey|new|ext|options|fn|border|length|css||typeof|eLBL|reEnableEmpty|mfD|input|append|intercepted|reset|disableEmpty|val|duplicate|metadata|className|clone|xCLONE|_MultiFile|denied|for|apply|namePattern|jQuery|Array|indexOf|toString|constructor|multi|intercept|10px|radius|position|parent|top|addToList|blockUI|MASTER|addClass|_labels|eWRP|start|rxAccept|generateID|error|This|0pt|File|limit|again|maxlength|nTry|size|data|meta|15px|string|number|select|cannot|Number|padding|You|files|catch|none|try|arguments|alert|br|2000|unblockUI|INPUT|setTimeout|afterFileAppend|afterFileRemove|onFileRemove|nbsp|validate|moz|class|ajaxSubmit|onFileAppend|afterFileSelect|submit|before|3000px|removeClass|prepend|webkit|message|absolute|onFileSelect|change|opacity|fff|wrap|_wrap|color|title|href|RegExp|click|been|900|_F|already|has|backgroundColor|type'.split('|'),0,{}))
diff --git a/webapp/src/main/webapp/js/jquery_plugins/jquery.bgiframe.pack.js b/webapp/src/main/webapp/js/jquery_plugins/jquery.bgiframe.pack.js
index 90dee9ad1..a3dd28eb6 100644
--- a/webapp/src/main/webapp/js/jquery_plugins/jquery.bgiframe.pack.js
+++ b/webapp/src/main/webapp/js/jquery_plugins/jquery.bgiframe.pack.js
@@ -1,5 +1,5 @@
 /* Copyright (c) 2006 Brandon Aaron (http://brandonaaron.net)
- * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) 
+ * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
  * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
  *
  * $LastChangedDate: 2007-07-21 18:44:59 -0500 (Sat, 21 Jul 2007) $
@@ -7,4 +7,4 @@
  *
  * Version 2.1.1
  */
-eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(b($){$.m.E=$.m.g=b(s){h($.x.10&&/6.0/.I(D.B)){s=$.w({c:\'3\',5:\'3\',8:\'3\',d:\'3\',k:M,e:\'F:i;\'},s||{});C a=b(n){f n&&n.t==r?n+\'4\':n},p=\'<o Y="g"W="0"R="-1"e="\'+s.e+\'"\'+\'Q="P:O;N:L;z-H:-1;\'+(s.k!==i?\'G:J(K=\\\'0\\\');\':\'\')+\'c:\'+(s.c==\'3\'?\'7(((l(2.9.j.A)||0)*-1)+\\\'4\\\')\':a(s.c))+\';\'+\'5:\'+(s.5==\'3\'?\'7(((l(2.9.j.y)||0)*-1)+\\\'4\\\')\':a(s.5))+\';\'+\'8:\'+(s.8==\'3\'?\'7(2.9.S+\\\'4\\\')\':a(s.8))+\';\'+\'d:\'+(s.d==\'3\'?\'7(2.9.v+\\\'4\\\')\':a(s.d))+\';\'+\'"/>\';f 2.T(b(){h($(\'> o.g\',2).U==0)2.V(q.X(p),2.u)})}f 2}})(Z);',62,63,'||this|auto|px|left||expression|width|parentNode||function|top|height|src|return|bgiframe|if|false|currentStyle|opacity|parseInt|fn||iframe|html|document|Number||constructor|firstChild|offsetHeight|extend|browser|borderLeftWidth||borderTopWidth|userAgent|var|navigator|bgIframe|javascript|filter|index|test|Alpha|Opacity|absolute|true|position|block|display|style|tabindex|offsetWidth|each|length|insertBefore|frameborder|createElement|class|jQuery|msie'.split('|'),0,{}))
\ No newline at end of file
+eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(b($){$.m.E=$.m.g=b(s){h($.x.10&&/6.0/.I(D.B)){s=$.w({c:\'3\',5:\'3\',8:\'3\',d:\'3\',k:M,e:\'F:i;\'},s||{});C a=b(n){f n&&n.t==r?n+\'4\':n},p=\'<o Y="g"W="0"R="-1"e="\'+s.e+\'"\'+\'Q="P:O;N:L;z-H:-1;\'+(s.k!==i?\'G:J(K=\\\'0\\\');\':\'\')+\'c:\'+(s.c==\'3\'?\'7(((l(2.9.j.A)||0)*-1)+\\\'4\\\')\':a(s.c))+\';\'+\'5:\'+(s.5==\'3\'?\'7(((l(2.9.j.y)||0)*-1)+\\\'4\\\')\':a(s.5))+\';\'+\'8:\'+(s.8==\'3\'?\'7(2.9.S+\\\'4\\\')\':a(s.8))+\';\'+\'d:\'+(s.d==\'3\'?\'7(2.9.v+\\\'4\\\')\':a(s.d))+\';\'+\'"/>\';f 2.T(b(){h($(\'> o.g\',2).U==0)2.V(q.X(p),2.u)})}f 2}})(Z);',62,63,'||this|auto|px|left||expression|width|parentNode||function|top|height|src|return|bgiframe|if|false|currentStyle|opacity|parseInt|fn||iframe|html|document|Number||constructor|firstChild|offsetHeight|extend|browser|borderLeftWidth||borderTopWidth|userAgent|var|navigator|bgIframe|javascript|filter|index|test|Alpha|Opacity|absolute|true|position|block|display|style|tabindex|offsetWidth|each|length|insertBefore|frameborder|createElement|class|jQuery|msie'.split('|'),0,{}))
diff --git a/webapp/src/main/webapp/js/jquery_plugins/jquery.realperson.js b/webapp/src/main/webapp/js/jquery_plugins/jquery.realperson.js
index 256ccc830..cfc1b06a7 100644
--- a/webapp/src/main/webapp/js/jquery_plugins/jquery.realperson.js
+++ b/webapp/src/main/webapp/js/jquery_plugins/jquery.realperson.js
@@ -1,8 +1,8 @@
 /* http://keith-wood.name/realPerson.html
    Real Person Form Submission for jQuery v1.0.1.
    Written by Keith Wood (kwood{at}iinet.com.au) June 2009.
-   Dual licensed under the GPL (http://dev.jquery.com/browser/trunk/jquery/GPL-LICENSE.txt) and 
-   MIT (http://dev.jquery.com/browser/trunk/jquery/MIT-LICENSE.txt) licenses. 
+   Dual licensed under the GPL (http://dev.jquery.com/browser/trunk/jquery/GPL-LICENSE.txt) and
+   MIT (http://dev.jquery.com/browser/trunk/jquery/MIT-LICENSE.txt) licenses.
    Please attribute the author if you use it. */
 
 (function($) { // Hide scope, no $ conflict
diff --git a/webapp/src/main/webapp/js/jquery_plugins/jquery.scrollTo-min.js b/webapp/src/main/webapp/js/jquery_plugins/jquery.scrollTo-min.js
index 5e7877810..f242cb948 100644
--- a/webapp/src/main/webapp/js/jquery_plugins/jquery.scrollTo-min.js
+++ b/webapp/src/main/webapp/js/jquery_plugins/jquery.scrollTo-min.js
@@ -8,4 +8,4 @@
  *
  * http://flesler.blogspot.com/2007/10/jqueryscrollto.html
  */
-;(function(d){var k=d.scrollTo=function(a,i,e){d(window).scrollTo(a,i,e)};k.defaults={axis:'xy',duration:parseFloat(d.fn.jquery)>=1.3?0:1};k.window=function(a){return d(window)._scrollable()};d.fn._scrollable=function(){return this.map(function(){var a=this,i=!a.nodeName||d.inArray(a.nodeName.toLowerCase(),['iframe','#document','html','body'])!=-1;if(!i)return a;var e=(a.contentWindow||a).document||a.ownerDocument||a;return d.browser.safari||e.compatMode=='BackCompat'?e.body:e.documentElement})};d.fn.scrollTo=function(n,j,b){if(typeof j=='object'){b=j;j=0}if(typeof b=='function')b={onAfter:b};if(n=='max')n=9e9;b=d.extend({},k.defaults,b);j=j||b.speed||b.duration;b.queue=b.queue&&b.axis.length>1;if(b.queue)j/=2;b.offset=p(b.offset);b.over=p(b.over);return this._scrollable().each(function(){var q=this,r=d(q),f=n,s,g={},u=r.is('html,body');switch(typeof f){case'number':case'string':if(/^([+-]=)?\d+(\.\d+)?(px|%)?$/.test(f)){f=p(f);break}f=d(f,this);case'object':if(f.is||f.style)s=(f=d(f)).offset()}d.each(b.axis.split(''),function(a,i){var e=i=='x'?'Left':'Top',h=e.toLowerCase(),c='scroll'+e,l=q[c],m=k.max(q,i);if(s){g[c]=s[h]+(u?0:l-r.offset()[h]);if(b.margin){g[c]-=parseInt(f.css('margin'+e))||0;g[c]-=parseInt(f.css('border'+e+'Width'))||0}g[c]+=b.offset[h]||0;if(b.over[h])g[c]+=f[i=='x'?'width':'height']()*b.over[h]}else{var o=f[h];g[c]=o.slice&&o.slice(-1)=='%'?parseFloat(o)/100*m:o}if(/^\d+$/.test(g[c]))g[c]=g[c]<=0?0:Math.min(g[c],m);if(!a&&b.queue){if(l!=g[c])t(b.onAfterFirst);delete g[c]}});t(b.onAfter);function t(a){r.animate(g,j,b.easing,a&&function(){a.call(this,n,b)})}}).end()};k.max=function(a,i){var e=i=='x'?'Width':'Height',h='scroll'+e;if(!d(a).is('html,body'))return a[h]-d(a)[e.toLowerCase()]();var c='client'+e,l=a.ownerDocument.documentElement,m=a.ownerDocument.body;return Math.max(l[h],m[h])-Math.min(l[c],m[c])};function p(a){return typeof a=='object'?a:{top:a,left:a}}})(jQuery);
\ No newline at end of file
+;(function(d){var k=d.scrollTo=function(a,i,e){d(window).scrollTo(a,i,e)};k.defaults={axis:'xy',duration:parseFloat(d.fn.jquery)>=1.3?0:1};k.window=function(a){return d(window)._scrollable()};d.fn._scrollable=function(){return this.map(function(){var a=this,i=!a.nodeName||d.inArray(a.nodeName.toLowerCase(),['iframe','#document','html','body'])!=-1;if(!i)return a;var e=(a.contentWindow||a).document||a.ownerDocument||a;return d.browser.safari||e.compatMode=='BackCompat'?e.body:e.documentElement})};d.fn.scrollTo=function(n,j,b){if(typeof j=='object'){b=j;j=0}if(typeof b=='function')b={onAfter:b};if(n=='max')n=9e9;b=d.extend({},k.defaults,b);j=j||b.speed||b.duration;b.queue=b.queue&&b.axis.length>1;if(b.queue)j/=2;b.offset=p(b.offset);b.over=p(b.over);return this._scrollable().each(function(){var q=this,r=d(q),f=n,s,g={},u=r.is('html,body');switch(typeof f){case'number':case'string':if(/^([+-]=)?\d+(\.\d+)?(px|%)?$/.test(f)){f=p(f);break}f=d(f,this);case'object':if(f.is||f.style)s=(f=d(f)).offset()}d.each(b.axis.split(''),function(a,i){var e=i=='x'?'Left':'Top',h=e.toLowerCase(),c='scroll'+e,l=q[c],m=k.max(q,i);if(s){g[c]=s[h]+(u?0:l-r.offset()[h]);if(b.margin){g[c]-=parseInt(f.css('margin'+e))||0;g[c]-=parseInt(f.css('border'+e+'Width'))||0}g[c]+=b.offset[h]||0;if(b.over[h])g[c]+=f[i=='x'?'width':'height']()*b.over[h]}else{var o=f[h];g[c]=o.slice&&o.slice(-1)=='%'?parseFloat(o)/100*m:o}if(/^\d+$/.test(g[c]))g[c]=g[c]<=0?0:Math.min(g[c],m);if(!a&&b.queue){if(l!=g[c])t(b.onAfterFirst);delete g[c]}});t(b.onAfter);function t(a){r.animate(g,j,b.easing,a&&function(){a.call(this,n,b)})}}).end()};k.max=function(a,i){var e=i=='x'?'Width':'Height',h='scroll'+e;if(!d(a).is('html,body'))return a[h]-d(a)[e.toLowerCase()]();var c='client'+e,l=a.ownerDocument.documentElement,m=a.ownerDocument.body;return Math.max(l[h],m[h])-Math.min(l[c],m[c])};function p(a){return typeof a=='object'?a:{top:a,left:a}}})(jQuery);
diff --git a/webapp/src/main/webapp/js/jquery_plugins/qtip/jquery.qtip.min.js b/webapp/src/main/webapp/js/jquery_plugins/qtip/jquery.qtip.min.js
index d2f28c560..9743c31a8 100644
--- a/webapp/src/main/webapp/js/jquery_plugins/qtip/jquery.qtip.min.js
+++ b/webapp/src/main/webapp/js/jquery_plugins/qtip/jquery.qtip.min.js
@@ -2,4 +2,4 @@
 
 !function(a,b,c){!function(a){"use strict";"function"==typeof define&&define.amd?define(["jquery"],a):jQuery&&!jQuery.fn.qtip&&a(jQuery)}(function(d){"use strict";function e(a,b,c,e){this.id=c,this.target=a,this.tooltip=F,this.elements={target:a},this._id=S+"-"+c,this.timers={img:{}},this.options=b,this.plugins={},this.cache={event:{},target:d(),disabled:E,attr:e,onTooltip:E,lastClass:""},this.rendered=this.destroyed=this.disabled=this.waiting=this.hiddenDuringWait=this.positioning=this.triggering=E}function f(a){return a===F||"object"!==d.type(a)}function g(a){return!(d.isFunction(a)||a&&a.attr||a.length||"object"===d.type(a)&&(a.jquery||a.then))}function h(a){var b,c,e,h;return f(a)?E:(f(a.metadata)&&(a.metadata={type:a.metadata}),"content"in a&&(b=a.content,f(b)||b.jquery||b.done?(c=g(b)?E:b,b=a.content={text:c}):c=b.text,"ajax"in b&&(e=b.ajax,h=e&&e.once!==E,delete b.ajax,b.text=function(a,b){var f=c||d(this).attr(b.options.content.attr)||"Loading...",g=d.ajax(d.extend({},e,{context:b})).then(e.success,F,e.error).then(function(a){return a&&h&&b.set("content.text",a),a},function(a,c,d){b.destroyed||0===a.status||b.set("content.text",c+": "+d)});return h?f:(b.set("content.text",f),g)}),"title"in b&&(d.isPlainObject(b.title)&&(b.button=b.title.button,b.title=b.title.text),g(b.title||E)&&(b.title=E))),"position"in a&&f(a.position)&&(a.position={my:a.position,at:a.position}),"show"in a&&f(a.show)&&(a.show=a.show.jquery?{target:a.show}:a.show===D?{ready:D}:{event:a.show}),"hide"in a&&f(a.hide)&&(a.hide=a.hide.jquery?{target:a.hide}:{event:a.hide}),"style"in a&&f(a.style)&&(a.style={classes:a.style}),d.each(R,function(){this.sanitize&&this.sanitize(a)}),a)}function i(a,b){for(var c,d=0,e=a,f=b.split(".");e=e[f[d++]];)d<f.length&&(c=e);return[c||a,f.pop()]}function j(a,b){var c,d,e;for(c in this.checks)if(this.checks.hasOwnProperty(c))for(d in this.checks[c])this.checks[c].hasOwnProperty(d)&&(e=new RegExp(d,"i").exec(a))&&(b.push(e),("builtin"===c||this.plugins[c])&&this.checks[c][d].apply(this.plugins[c]||this,b))}function k(a){return V.concat("").join(a?"-"+a+" ":" ")}function l(a,b){return b>0?setTimeout(d.proxy(a,this),b):void a.call(this)}function m(a){this.tooltip.hasClass(aa)||(clearTimeout(this.timers.show),clearTimeout(this.timers.hide),this.timers.show=l.call(this,function(){this.toggle(D,a)},this.options.show.delay))}function n(a){if(!this.tooltip.hasClass(aa)&&!this.destroyed){var b=d(a.relatedTarget),c=b.closest(W)[0]===this.tooltip[0],e=b[0]===this.options.show.target[0];if(clearTimeout(this.timers.show),clearTimeout(this.timers.hide),this!==b[0]&&"mouse"===this.options.position.target&&c||this.options.hide.fixed&&/mouse(out|leave|move)/.test(a.type)&&(c||e))try{a.preventDefault(),a.stopImmediatePropagation()}catch(f){}else this.timers.hide=l.call(this,function(){this.toggle(E,a)},this.options.hide.delay,this)}}function o(a){!this.tooltip.hasClass(aa)&&this.options.hide.inactive&&(clearTimeout(this.timers.inactive),this.timers.inactive=l.call(this,function(){this.hide(a)},this.options.hide.inactive))}function p(a){this.rendered&&this.tooltip[0].offsetWidth>0&&this.reposition(a)}function q(a,c,e){d(b.body).delegate(a,(c.split?c:c.join("."+S+" "))+"."+S,function(){var a=y.api[d.attr(this,U)];a&&!a.disabled&&e.apply(a,arguments)})}function r(a,c,f){var g,i,j,k,l,m=d(b.body),n=a[0]===b?m:a,o=a.metadata?a.metadata(f.metadata):F,p="html5"===f.metadata.type&&o?o[f.metadata.name]:F,q=a.data(f.metadata.name||"qtipopts");try{q="string"==typeof q?d.parseJSON(q):q}catch(r){}if(k=d.extend(D,{},y.defaults,f,"object"==typeof q?h(q):F,h(p||o)),i=k.position,k.id=c,"boolean"==typeof k.content.text){if(j=a.attr(k.content.attr),k.content.attr===E||!j)return E;k.content.text=j}if(i.container.length||(i.container=m),i.target===E&&(i.target=n),k.show.target===E&&(k.show.target=n),k.show.solo===D&&(k.show.solo=i.container.closest("body")),k.hide.target===E&&(k.hide.target=n),k.position.viewport===D&&(k.position.viewport=i.container),i.container=i.container.eq(0),i.at=new A(i.at,D),i.my=new A(i.my),a.data(S))if(k.overwrite)a.qtip("destroy",!0);else if(k.overwrite===E)return E;return a.attr(T,c),k.suppress&&(l=a.attr("title"))&&a.removeAttr("title").attr(ca,l).attr("title",""),g=new e(a,k,c,!!j),a.data(S,g),g}function s(a){return a.charAt(0).toUpperCase()+a.slice(1)}function t(a,b){var d,e,f=b.charAt(0).toUpperCase()+b.slice(1),g=(b+" "+va.join(f+" ")+f).split(" "),h=0;if(ua[b])return a.css(ua[b]);for(;d=g[h++];)if((e=a.css(d))!==c)return ua[b]=d,e}function u(a,b){return Math.ceil(parseFloat(t(a,b)))}function v(a,b){this._ns="tip",this.options=b,this.offset=b.offset,this.size=[b.width,b.height],this.qtip=a,this.init(a)}function w(a,b){this.options=b,this._ns="-modal",this.qtip=a,this.init(a)}function x(a){this._ns="ie6",this.qtip=a,this.init(a)}var y,z,A,B,C,D=!0,E=!1,F=null,G="x",H="y",I="width",J="height",K="top",L="left",M="bottom",N="right",O="center",P="flipinvert",Q="shift",R={},S="qtip",T="data-hasqtip",U="data-qtip-id",V=["ui-widget","ui-tooltip"],W="."+S,X="click dblclick mousedown mouseup mousemove mouseleave mouseenter".split(" "),Y=S+"-fixed",Z=S+"-default",$=S+"-focus",_=S+"-hover",aa=S+"-disabled",ba="_replacedByqTip",ca="oldtitle",da={ie:function(){var a,c;for(a=4,c=b.createElement("div");(c.innerHTML="<!--[if gt IE "+a+"]><i></i><![endif]-->")&&c.getElementsByTagName("i")[0];a+=1);return a>4?a:NaN}(),iOS:parseFloat((""+(/CPU.*OS ([0-9_]{1,5})|(CPU like).*AppleWebKit.*Mobile/i.exec(navigator.userAgent)||[0,""])[1]).replace("undefined","3_2").replace("_",".").replace("_",""))||E};z=e.prototype,z._when=function(a){return d.when.apply(d,a)},z.render=function(a){if(this.rendered||this.destroyed)return this;var b=this,c=this.options,e=this.cache,f=this.elements,g=c.content.text,h=c.content.title,i=c.content.button,j=c.position,k=[];return d.attr(this.target[0],"aria-describedby",this._id),e.posClass=this._createPosClass((this.position={my:j.my,at:j.at}).my),this.tooltip=f.tooltip=d("<div/>",{id:this._id,"class":[S,Z,c.style.classes,e.posClass].join(" "),width:c.style.width||"",height:c.style.height||"",tracking:"mouse"===j.target&&j.adjust.mouse,role:"alert","aria-live":"polite","aria-atomic":E,"aria-describedby":this._id+"-content","aria-hidden":D}).toggleClass(aa,this.disabled).attr(U,this.id).data(S,this).appendTo(j.container).append(f.content=d("<div />",{"class":S+"-content",id:this._id+"-content","aria-atomic":D})),this.rendered=-1,this.positioning=D,h&&(this._createTitle(),d.isFunction(h)||k.push(this._updateTitle(h,E))),i&&this._createButton(),d.isFunction(g)||k.push(this._updateContent(g,E)),this.rendered=D,this._setWidget(),d.each(R,function(a){var c;"render"===this.initialize&&(c=this(b))&&(b.plugins[a]=c)}),this._unassignEvents(),this._assignEvents(),this._when(k).then(function(){b._trigger("render"),b.positioning=E,b.hiddenDuringWait||!c.show.ready&&!a||b.toggle(D,e.event,E),b.hiddenDuringWait=E}),y.api[this.id]=this,this},z.destroy=function(a){function b(){if(!this.destroyed){this.destroyed=D;var a,b=this.target,c=b.attr(ca);this.rendered&&this.tooltip.stop(1,0).find("*").remove().end().remove(),d.each(this.plugins,function(){this.destroy&&this.destroy()});for(a in this.timers)this.timers.hasOwnProperty(a)&&clearTimeout(this.timers[a]);b.removeData(S).removeAttr(U).removeAttr(T).removeAttr("aria-describedby"),this.options.suppress&&c&&b.attr("title",c).removeAttr(ca),this._unassignEvents(),this.options=this.elements=this.cache=this.timers=this.plugins=this.mouse=F,delete y.api[this.id]}}return this.destroyed?this.target:(a===D&&"hide"!==this.triggering||!this.rendered?b.call(this):(this.tooltip.one("tooltiphidden",d.proxy(b,this)),!this.triggering&&this.hide()),this.target)},B=z.checks={builtin:{"^id$":function(a,b,c,e){var f=c===D?y.nextid:c,g=S+"-"+f;f!==E&&f.length>0&&!d("#"+g).length?(this._id=g,this.rendered&&(this.tooltip[0].id=this._id,this.elements.content[0].id=this._id+"-content",this.elements.title[0].id=this._id+"-title")):a[b]=e},"^prerender":function(a,b,c){c&&!this.rendered&&this.render(this.options.show.ready)},"^content.text$":function(a,b,c){this._updateContent(c)},"^content.attr$":function(a,b,c,d){this.options.content.text===this.target.attr(d)&&this._updateContent(this.target.attr(c))},"^content.title$":function(a,b,c){return c?(c&&!this.elements.title&&this._createTitle(),void this._updateTitle(c)):this._removeTitle()},"^content.button$":function(a,b,c){this._updateButton(c)},"^content.title.(text|button)$":function(a,b,c){this.set("content."+b,c)},"^position.(my|at)$":function(a,b,c){"string"==typeof c&&(this.position[b]=a[b]=new A(c,"at"===b))},"^position.container$":function(a,b,c){this.rendered&&this.tooltip.appendTo(c)},"^show.ready$":function(a,b,c){c&&(!this.rendered&&this.render(D)||this.toggle(D))},"^style.classes$":function(a,b,c,d){this.rendered&&this.tooltip.removeClass(d).addClass(c)},"^style.(width|height)":function(a,b,c){this.rendered&&this.tooltip.css(b,c)},"^style.widget|content.title":function(){this.rendered&&this._setWidget()},"^style.def":function(a,b,c){this.rendered&&this.tooltip.toggleClass(Z,!!c)},"^events.(render|show|move|hide|focus|blur)$":function(a,b,c){this.rendered&&this.tooltip[(d.isFunction(c)?"":"un")+"bind"]("tooltip"+b,c)},"^(show|hide|position).(event|target|fixed|inactive|leave|distance|viewport|adjust)":function(){if(this.rendered){var a=this.options.position;this.tooltip.attr("tracking","mouse"===a.target&&a.adjust.mouse),this._unassignEvents(),this._assignEvents()}}}},z.get=function(a){if(this.destroyed)return this;var b=i(this.options,a.toLowerCase()),c=b[0][b[1]];return c.precedance?c.string():c};var ea=/^position\.(my|at|adjust|target|container|viewport)|style|content|show\.ready/i,fa=/^prerender|show\.ready/i;z.set=function(a,b){if(this.destroyed)return this;var c,e=this.rendered,f=E,g=this.options;return"string"==typeof a?(c=a,a={},a[c]=b):a=d.extend({},a),d.each(a,function(b,c){if(e&&fa.test(b))return void delete a[b];var h,j=i(g,b.toLowerCase());h=j[0][j[1]],j[0][j[1]]=c&&c.nodeType?d(c):c,f=ea.test(b)||f,a[b]=[j[0],j[1],c,h]}),h(g),this.positioning=D,d.each(a,d.proxy(j,this)),this.positioning=E,this.rendered&&this.tooltip[0].offsetWidth>0&&f&&this.reposition("mouse"===g.position.target?F:this.cache.event),this},z._update=function(a,b){var c=this,e=this.cache;return this.rendered&&a?(d.isFunction(a)&&(a=a.call(this.elements.target,e.event,this)||""),d.isFunction(a.then)?(e.waiting=D,a.then(function(a){return e.waiting=E,c._update(a,b)},F,function(a){return c._update(a,b)})):a===E||!a&&""!==a?E:(a.jquery&&a.length>0?b.empty().append(a.css({display:"block",visibility:"visible"})):b.html(a),this._waitForContent(b).then(function(a){c.rendered&&c.tooltip[0].offsetWidth>0&&c.reposition(e.event,!a.length)}))):E},z._waitForContent=function(a){var b=this.cache;return b.waiting=D,(d.fn.imagesLoaded?a.imagesLoaded():(new d.Deferred).resolve([])).done(function(){b.waiting=E}).promise()},z._updateContent=function(a,b){this._update(a,this.elements.content,b)},z._updateTitle=function(a,b){this._update(a,this.elements.title,b)===E&&this._removeTitle(E)},z._createTitle=function(){var a=this.elements,b=this._id+"-title";a.titlebar&&this._removeTitle(),a.titlebar=d("<div />",{"class":S+"-titlebar "+(this.options.style.widget?k("header"):"")}).append(a.title=d("<div />",{id:b,"class":S+"-title","aria-atomic":D})).insertBefore(a.content).delegate(".qtip-close","mousedown keydown mouseup keyup mouseout",function(a){d(this).toggleClass("ui-state-active ui-state-focus","down"===a.type.substr(-4))}).delegate(".qtip-close","mouseover mouseout",function(a){d(this).toggleClass("ui-state-hover","mouseover"===a.type)}),this.options.content.button&&this._createButton()},z._removeTitle=function(a){var b=this.elements;b.title&&(b.titlebar.remove(),b.titlebar=b.title=b.button=F,a!==E&&this.reposition())},z._createPosClass=function(a){return S+"-pos-"+(a||this.options.position.my).abbrev()},z.reposition=function(c,e){if(!this.rendered||this.positioning||this.destroyed)return this;this.positioning=D;var f,g,h,i,j=this.cache,k=this.tooltip,l=this.options.position,m=l.target,n=l.my,o=l.at,p=l.viewport,q=l.container,r=l.adjust,s=r.method.split(" "),t=k.outerWidth(E),u=k.outerHeight(E),v=0,w=0,x=k.css("position"),y={left:0,top:0},z=k[0].offsetWidth>0,A=c&&"scroll"===c.type,B=d(a),C=q[0].ownerDocument,F=this.mouse;if(d.isArray(m)&&2===m.length)o={x:L,y:K},y={left:m[0],top:m[1]};else if("mouse"===m)o={x:L,y:K},(!r.mouse||this.options.hide.distance)&&j.origin&&j.origin.pageX?c=j.origin:!c||c&&("resize"===c.type||"scroll"===c.type)?c=j.event:F&&F.pageX&&(c=F),"static"!==x&&(y=q.offset()),C.body.offsetWidth!==(a.innerWidth||C.documentElement.clientWidth)&&(g=d(b.body).offset()),y={left:c.pageX-y.left+(g&&g.left||0),top:c.pageY-y.top+(g&&g.top||0)},r.mouse&&A&&F&&(y.left-=(F.scrollX||0)-B.scrollLeft(),y.top-=(F.scrollY||0)-B.scrollTop());else{if("event"===m?c&&c.target&&"scroll"!==c.type&&"resize"!==c.type?j.target=d(c.target):c.target||(j.target=this.elements.target):"event"!==m&&(j.target=d(m.jquery?m:this.elements.target)),m=j.target,m=d(m).eq(0),0===m.length)return this;m[0]===b||m[0]===a?(v=da.iOS?a.innerWidth:m.width(),w=da.iOS?a.innerHeight:m.height(),m[0]===a&&(y={top:(p||m).scrollTop(),left:(p||m).scrollLeft()})):R.imagemap&&m.is("area")?f=R.imagemap(this,m,o,R.viewport?s:E):R.svg&&m&&m[0].ownerSVGElement?f=R.svg(this,m,o,R.viewport?s:E):(v=m.outerWidth(E),w=m.outerHeight(E),y=m.offset()),f&&(v=f.width,w=f.height,g=f.offset,y=f.position),y=this.reposition.offset(m,y,q),(da.iOS>3.1&&da.iOS<4.1||da.iOS>=4.3&&da.iOS<4.33||!da.iOS&&"fixed"===x)&&(y.left-=B.scrollLeft(),y.top-=B.scrollTop()),(!f||f&&f.adjustable!==E)&&(y.left+=o.x===N?v:o.x===O?v/2:0,y.top+=o.y===M?w:o.y===O?w/2:0)}return y.left+=r.x+(n.x===N?-t:n.x===O?-t/2:0),y.top+=r.y+(n.y===M?-u:n.y===O?-u/2:0),R.viewport?(h=y.adjusted=R.viewport(this,y,l,v,w,t,u),g&&h.left&&(y.left+=g.left),g&&h.top&&(y.top+=g.top),h.my&&(this.position.my=h.my)):y.adjusted={left:0,top:0},j.posClass!==(i=this._createPosClass(this.position.my))&&(j.posClass=i,k.removeClass(j.posClass).addClass(i)),this._trigger("move",[y,p.elem||p],c)?(delete y.adjusted,e===E||!z||isNaN(y.left)||isNaN(y.top)||"mouse"===m||!d.isFunction(l.effect)?k.css(y):d.isFunction(l.effect)&&(l.effect.call(k,this,d.extend({},y)),k.queue(function(a){d(this).css({opacity:"",height:""}),da.ie&&this.style.removeAttribute("filter"),a()})),this.positioning=E,this):this},z.reposition.offset=function(a,c,e){function f(a,b){c.left+=b*a.scrollLeft(),c.top+=b*a.scrollTop()}if(!e[0])return c;var g,h,i,j,k=d(a[0].ownerDocument),l=!!da.ie&&"CSS1Compat"!==b.compatMode,m=e[0];do"static"!==(h=d.css(m,"position"))&&("fixed"===h?(i=m.getBoundingClientRect(),f(k,-1)):(i=d(m).position(),i.left+=parseFloat(d.css(m,"borderLeftWidth"))||0,i.top+=parseFloat(d.css(m,"borderTopWidth"))||0),c.left-=i.left+(parseFloat(d.css(m,"marginLeft"))||0),c.top-=i.top+(parseFloat(d.css(m,"marginTop"))||0),g||"hidden"===(j=d.css(m,"overflow"))||"visible"===j||(g=d(m)));while(m=m.offsetParent);return g&&(g[0]!==k[0]||l)&&f(g,1),c};var ga=(A=z.reposition.Corner=function(a,b){a=(""+a).replace(/([A-Z])/," $1").replace(/middle/gi,O).toLowerCase(),this.x=(a.match(/left|right/i)||a.match(/center/)||["inherit"])[0].toLowerCase(),this.y=(a.match(/top|bottom|center/i)||["inherit"])[0].toLowerCase(),this.forceY=!!b;var c=a.charAt(0);this.precedance="t"===c||"b"===c?H:G}).prototype;ga.invert=function(a,b){this[a]=this[a]===L?N:this[a]===N?L:b||this[a]},ga.string=function(a){var b=this.x,c=this.y,d=b!==c?"center"===b||"center"!==c&&(this.precedance===H||this.forceY)?[c,b]:[b,c]:[b];return a!==!1?d.join(" "):d},ga.abbrev=function(){var a=this.string(!1);return a[0].charAt(0)+(a[1]&&a[1].charAt(0)||"")},ga.clone=function(){return new A(this.string(),this.forceY)},z.toggle=function(a,c){var e=this.cache,f=this.options,g=this.tooltip;if(c){if(/over|enter/.test(c.type)&&e.event&&/out|leave/.test(e.event.type)&&f.show.target.add(c.target).length===f.show.target.length&&g.has(c.relatedTarget).length)return this;e.event=d.event.fix(c)}if(this.waiting&&!a&&(this.hiddenDuringWait=D),!this.rendered)return a?this.render(1):this;if(this.destroyed||this.disabled)return this;var h,i,j,k=a?"show":"hide",l=this.options[k],m=this.options.position,n=this.options.content,o=this.tooltip.css("width"),p=this.tooltip.is(":visible"),q=a||1===l.target.length,r=!c||l.target.length<2||e.target[0]===c.target;return(typeof a).search("boolean|number")&&(a=!p),h=!g.is(":animated")&&p===a&&r,i=h?F:!!this._trigger(k,[90]),this.destroyed?this:(i!==E&&a&&this.focus(c),!i||h?this:(d.attr(g[0],"aria-hidden",!a),a?(this.mouse&&(e.origin=d.event.fix(this.mouse)),d.isFunction(n.text)&&this._updateContent(n.text,E),d.isFunction(n.title)&&this._updateTitle(n.title,E),!C&&"mouse"===m.target&&m.adjust.mouse&&(d(b).bind("mousemove."+S,this._storeMouse),C=D),o||g.css("width",g.outerWidth(E)),this.reposition(c,arguments[2]),o||g.css("width",""),l.solo&&("string"==typeof l.solo?d(l.solo):d(W,l.solo)).not(g).not(l.target).qtip("hide",new d.Event("tooltipsolo"))):(clearTimeout(this.timers.show),delete e.origin,C&&!d(W+'[tracking="true"]:visible',l.solo).not(g).length&&(d(b).unbind("mousemove."+S),C=E),this.blur(c)),j=d.proxy(function(){a?(da.ie&&g[0].style.removeAttribute("filter"),g.css("overflow",""),"string"==typeof l.autofocus&&d(this.options.show.autofocus,g).focus(),this.options.show.target.trigger("qtip-"+this.id+"-inactive")):g.css({display:"",visibility:"",opacity:"",left:"",top:""}),this._trigger(a?"visible":"hidden")},this),l.effect===E||q===E?(g[k](),j()):d.isFunction(l.effect)?(g.stop(1,1),l.effect.call(g,this),g.queue("fx",function(a){j(),a()})):g.fadeTo(90,a?1:0,j),a&&l.target.trigger("qtip-"+this.id+"-inactive"),this))},z.show=function(a){return this.toggle(D,a)},z.hide=function(a){return this.toggle(E,a)},z.focus=function(a){if(!this.rendered||this.destroyed)return this;var b=d(W),c=this.tooltip,e=parseInt(c[0].style.zIndex,10),f=y.zindex+b.length;return c.hasClass($)||this._trigger("focus",[f],a)&&(e!==f&&(b.each(function(){this.style.zIndex>e&&(this.style.zIndex=this.style.zIndex-1)}),b.filter("."+$).qtip("blur",a)),c.addClass($)[0].style.zIndex=f),this},z.blur=function(a){return!this.rendered||this.destroyed?this:(this.tooltip.removeClass($),this._trigger("blur",[this.tooltip.css("zIndex")],a),this)},z.disable=function(a){return this.destroyed?this:("toggle"===a?a=!(this.rendered?this.tooltip.hasClass(aa):this.disabled):"boolean"!=typeof a&&(a=D),this.rendered&&this.tooltip.toggleClass(aa,a).attr("aria-disabled",a),this.disabled=!!a,this)},z.enable=function(){return this.disable(E)},z._createButton=function(){var a=this,b=this.elements,c=b.tooltip,e=this.options.content.button,f="string"==typeof e,g=f?e:"Close tooltip";b.button&&b.button.remove(),e.jquery?b.button=e:b.button=d("<a />",{"class":"qtip-close "+(this.options.style.widget?"":S+"-icon"),title:g,"aria-label":g}).prepend(d("<span />",{"class":"ui-icon ui-icon-close",html:"&times;"})),b.button.appendTo(b.titlebar||c).attr("role","button").click(function(b){return c.hasClass(aa)||a.hide(b),E})},z._updateButton=function(a){if(!this.rendered)return E;var b=this.elements.button;a?this._createButton():b.remove()},z._setWidget=function(){var a=this.options.style.widget,b=this.elements,c=b.tooltip,d=c.hasClass(aa);c.removeClass(aa),aa=a?"ui-state-disabled":"qtip-disabled",c.toggleClass(aa,d),c.toggleClass("ui-helper-reset "+k(),a).toggleClass(Z,this.options.style.def&&!a),b.content&&b.content.toggleClass(k("content"),a),b.titlebar&&b.titlebar.toggleClass(k("header"),a),b.button&&b.button.toggleClass(S+"-icon",!a)},z._storeMouse=function(a){return(this.mouse=d.event.fix(a)).type="mousemove",this},z._bind=function(a,b,c,e,f){if(a&&c&&b.length){var g="."+this._id+(e?"-"+e:"");return d(a).bind((b.split?b:b.join(g+" "))+g,d.proxy(c,f||this)),this}},z._unbind=function(a,b){return a&&d(a).unbind("."+this._id+(b?"-"+b:"")),this},z._trigger=function(a,b,c){var e=new d.Event("tooltip"+a);return e.originalEvent=c&&d.extend({},c)||this.cache.event||F,this.triggering=a,this.tooltip.trigger(e,[this].concat(b||[])),this.triggering=E,!e.isDefaultPrevented()},z._bindEvents=function(a,b,c,e,f,g){var h=c.filter(e).add(e.filter(c)),i=[];h.length&&(d.each(b,function(b,c){var e=d.inArray(c,a);e>-1&&i.push(a.splice(e,1)[0])}),i.length&&(this._bind(h,i,function(a){var b=this.rendered?this.tooltip[0].offsetWidth>0:!1;(b?g:f).call(this,a)}),c=c.not(h),e=e.not(h))),this._bind(c,a,f),this._bind(e,b,g)},z._assignInitialEvents=function(a){function b(a){return this.disabled||this.destroyed?E:(this.cache.event=a&&d.event.fix(a),this.cache.target=a&&d(a.target),clearTimeout(this.timers.show),void(this.timers.show=l.call(this,function(){this.render("object"==typeof a||c.show.ready)},c.prerender?0:c.show.delay)))}var c=this.options,e=c.show.target,f=c.hide.target,g=c.show.event?d.trim(""+c.show.event).split(" "):[],h=c.hide.event?d.trim(""+c.hide.event).split(" "):[];this._bind(this.elements.target,["remove","removeqtip"],function(){this.destroy(!0)},"destroy"),/mouse(over|enter)/i.test(c.show.event)&&!/mouse(out|leave)/i.test(c.hide.event)&&h.push("mouseleave"),this._bind(e,"mousemove",function(a){this._storeMouse(a),this.cache.onTarget=D}),this._bindEvents(g,h,e,f,b,function(){return this.timers?void clearTimeout(this.timers.show):E}),(c.show.ready||c.prerender)&&b.call(this,a)},z._assignEvents=function(){var c=this,e=this.options,f=e.position,g=this.tooltip,h=e.show.target,i=e.hide.target,j=f.container,k=f.viewport,l=d(b),q=d(a),r=e.show.event?d.trim(""+e.show.event).split(" "):[],s=e.hide.event?d.trim(""+e.hide.event).split(" "):[];d.each(e.events,function(a,b){c._bind(g,"toggle"===a?["tooltipshow","tooltiphide"]:["tooltip"+a],b,null,g)}),/mouse(out|leave)/i.test(e.hide.event)&&"window"===e.hide.leave&&this._bind(l,["mouseout","blur"],function(a){/select|option/.test(a.target.nodeName)||a.relatedTarget||this.hide(a)}),e.hide.fixed?i=i.add(g.addClass(Y)):/mouse(over|enter)/i.test(e.show.event)&&this._bind(i,"mouseleave",function(){clearTimeout(this.timers.show)}),(""+e.hide.event).indexOf("unfocus")>-1&&this._bind(j.closest("html"),["mousedown","touchstart"],function(a){var b=d(a.target),c=this.rendered&&!this.tooltip.hasClass(aa)&&this.tooltip[0].offsetWidth>0,e=b.parents(W).filter(this.tooltip[0]).length>0;b[0]===this.target[0]||b[0]===this.tooltip[0]||e||this.target.has(b[0]).length||!c||this.hide(a)}),"number"==typeof e.hide.inactive&&(this._bind(h,"qtip-"+this.id+"-inactive",o,"inactive"),this._bind(i.add(g),y.inactiveEvents,o)),this._bindEvents(r,s,h,i,m,n),this._bind(h.add(g),"mousemove",function(a){if("number"==typeof e.hide.distance){var b=this.cache.origin||{},c=this.options.hide.distance,d=Math.abs;(d(a.pageX-b.pageX)>=c||d(a.pageY-b.pageY)>=c)&&this.hide(a)}this._storeMouse(a)}),"mouse"===f.target&&f.adjust.mouse&&(e.hide.event&&this._bind(h,["mouseenter","mouseleave"],function(a){return this.cache?void(this.cache.onTarget="mouseenter"===a.type):E}),this._bind(l,"mousemove",function(a){this.rendered&&this.cache.onTarget&&!this.tooltip.hasClass(aa)&&this.tooltip[0].offsetWidth>0&&this.reposition(a)})),(f.adjust.resize||k.length)&&this._bind(d.event.special.resize?k:q,"resize",p),f.adjust.scroll&&this._bind(q.add(f.container),"scroll",p)},z._unassignEvents=function(){var c=this.options,e=c.show.target,f=c.hide.target,g=d.grep([this.elements.target[0],this.rendered&&this.tooltip[0],c.position.container[0],c.position.viewport[0],c.position.container.closest("html")[0],a,b],function(a){return"object"==typeof a});e&&e.toArray&&(g=g.concat(e.toArray())),f&&f.toArray&&(g=g.concat(f.toArray())),this._unbind(g)._unbind(g,"destroy")._unbind(g,"inactive")},d(function(){q(W,["mouseenter","mouseleave"],function(a){var b="mouseenter"===a.type,c=d(a.currentTarget),e=d(a.relatedTarget||a.target),f=this.options;b?(this.focus(a),c.hasClass(Y)&&!c.hasClass(aa)&&clearTimeout(this.timers.hide)):"mouse"===f.position.target&&f.position.adjust.mouse&&f.hide.event&&f.show.target&&!e.closest(f.show.target[0]).length&&this.hide(a),c.toggleClass(_,b)}),q("["+U+"]",X,o)}),y=d.fn.qtip=function(a,b,e){var f=(""+a).toLowerCase(),g=F,i=d.makeArray(arguments).slice(1),j=i[i.length-1],k=this[0]?d.data(this[0],S):F;return!arguments.length&&k||"api"===f?k:"string"==typeof a?(this.each(function(){var a=d.data(this,S);if(!a)return D;if(j&&j.timeStamp&&(a.cache.event=j),!b||"option"!==f&&"options"!==f)a[f]&&a[f].apply(a,i);else{if(e===c&&!d.isPlainObject(b))return g=a.get(b),E;a.set(b,e)}}),g!==F?g:this):"object"!=typeof a&&arguments.length?void 0:(k=h(d.extend(D,{},a)),this.each(function(a){var b,c;return c=d.isArray(k.id)?k.id[a]:k.id,c=!c||c===E||c.length<1||y.api[c]?y.nextid++:c,b=r(d(this),c,k),b===E?D:(y.api[c]=b,d.each(R,function(){"initialize"===this.initialize&&this(b)}),void b._assignInitialEvents(j))}))},d.qtip=e,y.api={},d.each({attr:function(a,b){if(this.length){var c=this[0],e="title",f=d.data(c,"qtip");if(a===e&&f&&f.options&&"object"==typeof f&&"object"==typeof f.options&&f.options.suppress)return arguments.length<2?d.attr(c,ca):(f&&f.options.content.attr===e&&f.cache.attr&&f.set("content.text",b),this.attr(ca,b))}return d.fn["attr"+ba].apply(this,arguments)},clone:function(a){var b=d.fn["clone"+ba].apply(this,arguments);return a||b.filter("["+ca+"]").attr("title",function(){return d.attr(this,ca)}).removeAttr(ca),b}},function(a,b){if(!b||d.fn[a+ba])return D;var c=d.fn[a+ba]=d.fn[a];d.fn[a]=function(){return b.apply(this,arguments)||c.apply(this,arguments)}}),d.ui||(d["cleanData"+ba]=d.cleanData,d.cleanData=function(a){for(var b,c=0;(b=d(a[c])).length;c++)if(b.attr(T))try{b.triggerHandler("removeqtip")}catch(e){}d["cleanData"+ba].apply(this,arguments)}),y.version="3.0.3",y.nextid=0,y.inactiveEvents=X,y.zindex=15e3,y.defaults={prerender:E,id:E,overwrite:D,suppress:D,content:{text:D,attr:"title",title:E,button:E},position:{my:"top left",at:"bottom right",target:E,container:E,viewport:E,adjust:{x:0,y:0,mouse:D,scroll:D,resize:D,method:"flipinvert flipinvert"},effect:function(a,b){d(this).animate(b,{duration:200,queue:E})}},show:{target:E,event:"mouseenter",effect:D,delay:90,solo:E,ready:E,autofocus:E},hide:{target:E,event:"mouseleave",effect:D,delay:0,fixed:E,inactive:E,leave:"window",distance:E},style:{classes:"",widget:E,width:E,height:E,def:D},events:{render:F,move:F,show:F,hide:F,toggle:F,visible:F,hidden:F,focus:F,blur:F}};var ha,ia,ja,ka,la,ma="margin",na="border",oa="color",pa="background-color",qa="transparent",ra=" !important",sa=!!b.createElement("canvas").getContext,ta=/rgba?\(0, 0, 0(, 0)?\)|transparent|#123456/i,ua={},va=["Webkit","O","Moz","ms"];sa?(ka=a.devicePixelRatio||1,la=function(){var a=b.createElement("canvas").getContext("2d");return a.backingStorePixelRatio||a.webkitBackingStorePixelRatio||a.mozBackingStorePixelRatio||a.msBackingStorePixelRatio||a.oBackingStorePixelRatio||1}(),ja=ka/la):ia=function(a,b,c){return"<qtipvml:"+a+' xmlns="urn:schemas-microsoft.com:vml" class="qtip-vml" '+(b||"")+' style="behavior: url(#default#VML); '+(c||"")+'" />'},d.extend(v.prototype,{init:function(a){var b,c;c=this.element=a.elements.tip=d("<div />",{"class":S+"-tip"}).prependTo(a.tooltip),sa?(b=d("<canvas />").appendTo(this.element)[0].getContext("2d"),b.lineJoin="miter",b.miterLimit=1e5,b.save()):(b=ia("shape",'coordorigin="0,0"',"position:absolute;"),this.element.html(b+b),a._bind(d("*",c).add(c),["click","mousedown"],function(a){a.stopPropagation()},this._ns)),a._bind(a.tooltip,"tooltipmove",this.reposition,this._ns,this),this.create()},_swapDimensions:function(){this.size[0]=this.options.height,this.size[1]=this.options.width},_resetDimensions:function(){this.size[0]=this.options.width,this.size[1]=this.options.height},_useTitle:function(a){var b=this.qtip.elements.titlebar;return b&&(a.y===K||a.y===O&&this.element.position().top+this.size[1]/2+this.options.offset<b.outerHeight(D))},_parseCorner:function(a){var b=this.qtip.options.position.my;return a===E||b===E?a=E:a===D?a=new A(b.string()):a.string||(a=new A(a),a.fixed=D),a},_parseWidth:function(a,b,c){var d=this.qtip.elements,e=na+s(b)+"Width";return(c?u(c,e):u(d.content,e)||u(this._useTitle(a)&&d.titlebar||d.content,e)||u(d.tooltip,e))||0},_parseRadius:function(a){var b=this.qtip.elements,c=na+s(a.y)+s(a.x)+"Radius";return da.ie<9?0:u(this._useTitle(a)&&b.titlebar||b.content,c)||u(b.tooltip,c)||0},_invalidColour:function(a,b,c){var d=a.css(b);return!d||c&&d===a.css(c)||ta.test(d)?E:d},_parseColours:function(a){var b=this.qtip.elements,c=this.element.css("cssText",""),e=na+s(a[a.precedance])+s(oa),f=this._useTitle(a)&&b.titlebar||b.content,g=this._invalidColour,h=[];return h[0]=g(c,pa)||g(f,pa)||g(b.content,pa)||g(b.tooltip,pa)||c.css(pa),h[1]=g(c,e,oa)||g(f,e,oa)||g(b.content,e,oa)||g(b.tooltip,e,oa)||b.tooltip.css(e),d("*",c).add(c).css("cssText",pa+":"+qa+ra+";"+na+":0"+ra+";"),h},_calculateSize:function(a){var b,c,d,e=a.precedance===H,f=this.options.width,g=this.options.height,h="c"===a.abbrev(),i=(e?f:g)*(h?.5:1),j=Math.pow,k=Math.round,l=Math.sqrt(j(i,2)+j(g,2)),m=[this.border/i*l,this.border/g*l];return m[2]=Math.sqrt(j(m[0],2)-j(this.border,2)),m[3]=Math.sqrt(j(m[1],2)-j(this.border,2)),b=l+m[2]+m[3]+(h?0:m[0]),c=b/l,d=[k(c*f),k(c*g)],e?d:d.reverse()},_calculateTip:function(a,b,c){c=c||1,b=b||this.size;var d=b[0]*c,e=b[1]*c,f=Math.ceil(d/2),g=Math.ceil(e/2),h={br:[0,0,d,e,d,0],bl:[0,0,d,0,0,e],tr:[0,e,d,0,d,e],tl:[0,0,0,e,d,e],tc:[0,e,f,0,d,e],bc:[0,0,d,0,f,e],rc:[0,0,d,g,0,e],lc:[d,0,d,e,0,g]};return h.lt=h.br,h.rt=h.bl,h.lb=h.tr,h.rb=h.tl,h[a.abbrev()]},_drawCoords:function(a,b){a.beginPath(),a.moveTo(b[0],b[1]),a.lineTo(b[2],b[3]),a.lineTo(b[4],b[5]),a.closePath()},create:function(){var a=this.corner=(sa||da.ie)&&this._parseCorner(this.options.corner);return this.enabled=!!this.corner&&"c"!==this.corner.abbrev(),this.enabled&&(this.qtip.cache.corner=a.clone(),this.update()),this.element.toggle(this.enabled),this.corner},update:function(b,c){if(!this.enabled)return this;var e,f,g,h,i,j,k,l,m=this.qtip.elements,n=this.element,o=n.children(),p=this.options,q=this.size,r=p.mimic,s=Math.round;b||(b=this.qtip.cache.corner||this.corner),r===E?r=b:(r=new A(r),r.precedance=b.precedance,"inherit"===r.x?r.x=b.x:"inherit"===r.y?r.y=b.y:r.x===r.y&&(r[b.precedance]=b[b.precedance])),f=r.precedance,b.precedance===G?this._swapDimensions():this._resetDimensions(),e=this.color=this._parseColours(b),e[1]!==qa?(l=this.border=this._parseWidth(b,b[b.precedance]),p.border&&1>l&&!ta.test(e[1])&&(e[0]=e[1]),this.border=l=p.border!==D?p.border:l):this.border=l=0,k=this.size=this._calculateSize(b),n.css({width:k[0],height:k[1],lineHeight:k[1]+"px"}),j=b.precedance===H?[s(r.x===L?l:r.x===N?k[0]-q[0]-l:(k[0]-q[0])/2),s(r.y===K?k[1]-q[1]:0)]:[s(r.x===L?k[0]-q[0]:0),s(r.y===K?l:r.y===M?k[1]-q[1]-l:(k[1]-q[1])/2)],sa?(g=o[0].getContext("2d"),g.restore(),g.save(),g.clearRect(0,0,6e3,6e3),h=this._calculateTip(r,q,ja),i=this._calculateTip(r,this.size,ja),o.attr(I,k[0]*ja).attr(J,k[1]*ja),o.css(I,k[0]).css(J,k[1]),this._drawCoords(g,i),g.fillStyle=e[1],g.fill(),g.translate(j[0]*ja,j[1]*ja),this._drawCoords(g,h),g.fillStyle=e[0],g.fill()):(h=this._calculateTip(r),h="m"+h[0]+","+h[1]+" l"+h[2]+","+h[3]+" "+h[4]+","+h[5]+" xe",j[2]=l&&/^(r|b)/i.test(b.string())?8===da.ie?2:1:0,o.css({coordsize:k[0]+l+" "+k[1]+l,antialias:""+(r.string().indexOf(O)>-1),left:j[0]-j[2]*Number(f===G),top:j[1]-j[2]*Number(f===H),width:k[0]+l,height:k[1]+l}).each(function(a){var b=d(this);b[b.prop?"prop":"attr"]({coordsize:k[0]+l+" "+k[1]+l,path:h,fillcolor:e[0],filled:!!a,stroked:!a}).toggle(!(!l&&!a)),!a&&b.html(ia("stroke",'weight="'+2*l+'px" color="'+e[1]+'" miterlimit="1000" joinstyle="miter"'))})),a.opera&&setTimeout(function(){m.tip.css({display:"inline-block",visibility:"visible"})},1),c!==E&&this.calculate(b,k)},calculate:function(a,b){if(!this.enabled)return E;var c,e,f=this,g=this.qtip.elements,h=this.element,i=this.options.offset,j={};
 return a=a||this.corner,c=a.precedance,b=b||this._calculateSize(a),e=[a.x,a.y],c===G&&e.reverse(),d.each(e,function(d,e){var h,k,l;e===O?(h=c===H?L:K,j[h]="50%",j[ma+"-"+h]=-Math.round(b[c===H?0:1]/2)+i):(h=f._parseWidth(a,e,g.tooltip),k=f._parseWidth(a,e,g.content),l=f._parseRadius(a),j[e]=Math.max(-f.border,d?k:i+(l>h?l:-h)))}),j[a[c]]-=b[c===G?0:1],h.css({margin:"",top:"",bottom:"",left:"",right:""}).css(j),j},reposition:function(a,b,d){function e(a,b,c,d,e){a===Q&&j.precedance===b&&k[d]&&j[c]!==O?j.precedance=j.precedance===G?H:G:a!==Q&&k[d]&&(j[b]=j[b]===O?k[d]>0?d:e:j[b]===d?e:d)}function f(a,b,e){j[a]===O?p[ma+"-"+b]=o[a]=g[ma+"-"+b]-k[b]:(h=g[e]!==c?[k[b],-g[b]]:[-k[b],g[b]],(o[a]=Math.max(h[0],h[1]))>h[0]&&(d[b]-=k[b],o[b]=E),p[g[e]!==c?e:b]=o[a])}if(this.enabled){var g,h,i=b.cache,j=this.corner.clone(),k=d.adjusted,l=b.options.position.adjust.method.split(" "),m=l[0],n=l[1]||l[0],o={left:E,top:E,x:0,y:0},p={};this.corner.fixed!==D&&(e(m,G,H,L,N),e(n,H,G,K,M),j.string()===i.corner.string()&&i.cornerTop===k.top&&i.cornerLeft===k.left||this.update(j,E)),g=this.calculate(j),g.right!==c&&(g.left=-g.right),g.bottom!==c&&(g.top=-g.bottom),g.user=this.offset,o.left=m===Q&&!!k.left,o.left&&f(G,L,N),o.top=n===Q&&!!k.top,o.top&&f(H,K,M),this.element.css(p).toggle(!(o.x&&o.y||j.x===O&&o.y||j.y===O&&o.x)),d.left-=g.left.charAt?g.user:m!==Q||o.top||!o.left&&!o.top?g.left+this.border:0,d.top-=g.top.charAt?g.user:n!==Q||o.left||!o.left&&!o.top?g.top+this.border:0,i.cornerLeft=k.left,i.cornerTop=k.top,i.corner=j.clone()}},destroy:function(){this.qtip._unbind(this.qtip.tooltip,this._ns),this.qtip.elements.tip&&this.qtip.elements.tip.find("*").remove().end().remove()}}),ha=R.tip=function(a){return new v(a,a.options.style.tip)},ha.initialize="render",ha.sanitize=function(a){if(a.style&&"tip"in a.style){var b=a.style.tip;"object"!=typeof b&&(b=a.style.tip={corner:b}),/string|boolean/i.test(typeof b.corner)||(b.corner=D)}},B.tip={"^position.my|style.tip.(corner|mimic|border)$":function(){this.create(),this.qtip.reposition()},"^style.tip.(height|width)$":function(a){this.size=[a.width,a.height],this.update(),this.qtip.reposition()},"^content.title|style.(classes|widget)$":function(){this.update()}},d.extend(D,y.defaults,{style:{tip:{corner:D,mimic:E,width:6,height:6,border:D,offset:0}}});var wa,xa,ya="qtip-modal",za="."+ya;xa=function(){function a(a){if(d.expr[":"].focusable)return d.expr[":"].focusable;var b,c,e,f=!isNaN(d.attr(a,"tabindex")),g=a.nodeName&&a.nodeName.toLowerCase();return"area"===g?(b=a.parentNode,c=b.name,a.href&&c&&"map"===b.nodeName.toLowerCase()?(e=d("img[usemap=#"+c+"]")[0],!!e&&e.is(":visible")):!1):/input|select|textarea|button|object/.test(g)?!a.disabled:"a"===g?a.href||f:f}function c(a){j.length<1&&a.length?a.not("body").blur():j.first().focus()}function e(a){if(h.is(":visible")){var b,e=d(a.target),g=f.tooltip,i=e.closest(W);b=i.length<1?E:parseInt(i[0].style.zIndex,10)>parseInt(g[0].style.zIndex,10),b||e.closest(W)[0]===g[0]||c(e)}}var f,g,h,i=this,j={};d.extend(i,{init:function(){return h=i.elem=d("<div />",{id:"qtip-overlay",html:"<div></div>",mousedown:function(){return E}}).hide(),d(b.body).bind("focusin"+za,e),d(b).bind("keydown"+za,function(a){f&&f.options.show.modal.escape&&27===a.keyCode&&f.hide(a)}),h.bind("click"+za,function(a){f&&f.options.show.modal.blur&&f.hide(a)}),i},update:function(b){f=b,j=b.options.show.modal.stealfocus!==E?b.tooltip.find("*").filter(function(){return a(this)}):[]},toggle:function(a,e,j){var k=a.tooltip,l=a.options.show.modal,m=l.effect,n=e?"show":"hide",o=h.is(":visible"),p=d(za).filter(":visible:not(:animated)").not(k);return i.update(a),e&&l.stealfocus!==E&&c(d(":focus")),h.toggleClass("blurs",l.blur),e&&h.appendTo(b.body),h.is(":animated")&&o===e&&g!==E||!e&&p.length?i:(h.stop(D,E),d.isFunction(m)?m.call(h,e):m===E?h[n]():h.fadeTo(parseInt(j,10)||90,e?1:0,function(){e||h.hide()}),e||h.queue(function(a){h.css({left:"",top:""}),d(za).length||h.detach(),a()}),g=e,f.destroyed&&(f=F),i)}}),i.init()},xa=new xa,d.extend(w.prototype,{init:function(a){var b=a.tooltip;return this.options.on?(a.elements.overlay=xa.elem,b.addClass(ya).css("z-index",y.modal_zindex+d(za).length),a._bind(b,["tooltipshow","tooltiphide"],function(a,c,e){var f=a.originalEvent;if(a.target===b[0])if(f&&"tooltiphide"===a.type&&/mouse(leave|enter)/.test(f.type)&&d(f.relatedTarget).closest(xa.elem[0]).length)try{a.preventDefault()}catch(g){}else(!f||f&&"tooltipsolo"!==f.type)&&this.toggle(a,"tooltipshow"===a.type,e)},this._ns,this),a._bind(b,"tooltipfocus",function(a,c){if(!a.isDefaultPrevented()&&a.target===b[0]){var e=d(za),f=y.modal_zindex+e.length,g=parseInt(b[0].style.zIndex,10);xa.elem[0].style.zIndex=f-1,e.each(function(){this.style.zIndex>g&&(this.style.zIndex-=1)}),e.filter("."+$).qtip("blur",a.originalEvent),b.addClass($)[0].style.zIndex=f,xa.update(c);try{a.preventDefault()}catch(h){}}},this._ns,this),void a._bind(b,"tooltiphide",function(a){a.target===b[0]&&d(za).filter(":visible").not(b).last().qtip("focus",a)},this._ns,this)):this},toggle:function(a,b,c){return a&&a.isDefaultPrevented()?this:void xa.toggle(this.qtip,!!b,c)},destroy:function(){this.qtip.tooltip.removeClass(ya),this.qtip._unbind(this.qtip.tooltip,this._ns),xa.toggle(this.qtip,E),delete this.qtip.elements.overlay}}),wa=R.modal=function(a){return new w(a,a.options.show.modal)},wa.sanitize=function(a){a.show&&("object"!=typeof a.show.modal?a.show.modal={on:!!a.show.modal}:"undefined"==typeof a.show.modal.on&&(a.show.modal.on=D))},y.modal_zindex=y.zindex-200,wa.initialize="render",B.modal={"^show.modal.(on|blur)$":function(){this.destroy(),this.init(),this.qtip.elems.overlay.toggle(this.qtip.tooltip[0].offsetWidth>0)}},d.extend(D,y.defaults,{show:{modal:{on:E,effect:D,blur:D,stealfocus:D,escape:D}}}),R.viewport=function(c,d,e,f,g,h,i){function j(a,b,c,e,f,g,h,i,j){var k=d[f],s=u[a],t=v[a],w=c===Q,x=s===f?j:s===g?-j:-j/2,y=t===f?i:t===g?-i:-i/2,z=q[f]+r[f]-(n?0:m[f]),A=z-k,B=k+j-(h===I?o:p)-z,C=x-(u.precedance===a||s===u[b]?y:0)-(t===O?i/2:0);return w?(C=(s===f?1:-1)*x,d[f]+=A>0?A:B>0?-B:0,d[f]=Math.max(-m[f]+r[f],k-C,Math.min(Math.max(-m[f]+r[f]+(h===I?o:p),k+C),d[f],"center"===s?k-x:1e9))):(e*=c===P?2:0,A>0&&(s!==f||B>0)?(d[f]-=C+e,l.invert(a,f)):B>0&&(s!==g||A>0)&&(d[f]-=(s===O?-C:C)+e,l.invert(a,g)),d[f]<q[f]&&-d[f]>B&&(d[f]=k,l=u.clone())),d[f]-k}var k,l,m,n,o,p,q,r,s=e.target,t=c.elements.tooltip,u=e.my,v=e.at,w=e.adjust,x=w.method.split(" "),y=x[0],z=x[1]||x[0],A=e.viewport,B=e.container,C={left:0,top:0};return A.jquery&&s[0]!==a&&s[0]!==b.body&&"none"!==w.method?(m=B.offset()||C,n="static"===B.css("position"),k="fixed"===t.css("position"),o=A[0]===a?A.width():A.outerWidth(E),p=A[0]===a?A.height():A.outerHeight(E),q={left:k?0:A.scrollLeft(),top:k?0:A.scrollTop()},r=A.offset()||C,"shift"===y&&"shift"===z||(l=u.clone()),C={left:"none"!==y?j(G,H,y,w.x,L,N,I,f,h):0,top:"none"!==z?j(H,G,z,w.y,K,M,J,g,i):0,my:l}):C},R.polys={polygon:function(a,b){var c,d,e,f={width:0,height:0,position:{top:1e10,right:0,bottom:0,left:1e10},adjustable:E},g=0,h=[],i=1,j=1,k=0,l=0;for(g=a.length;g--;)c=[parseInt(a[--g],10),parseInt(a[g+1],10)],c[0]>f.position.right&&(f.position.right=c[0]),c[0]<f.position.left&&(f.position.left=c[0]),c[1]>f.position.bottom&&(f.position.bottom=c[1]),c[1]<f.position.top&&(f.position.top=c[1]),h.push(c);if(d=f.width=Math.abs(f.position.right-f.position.left),e=f.height=Math.abs(f.position.bottom-f.position.top),"c"===b.abbrev())f.position={left:f.position.left+f.width/2,top:f.position.top+f.height/2};else{for(;d>0&&e>0&&i>0&&j>0;)for(d=Math.floor(d/2),e=Math.floor(e/2),b.x===L?i=d:b.x===N?i=f.width-d:i+=Math.floor(d/2),b.y===K?j=e:b.y===M?j=f.height-e:j+=Math.floor(e/2),g=h.length;g--&&!(h.length<2);)k=h[g][0]-f.position.left,l=h[g][1]-f.position.top,(b.x===L&&k>=i||b.x===N&&i>=k||b.x===O&&(i>k||k>f.width-i)||b.y===K&&l>=j||b.y===M&&j>=l||b.y===O&&(j>l||l>f.height-j))&&h.splice(g,1);f.position={left:h[0][0],top:h[0][1]}}return f},rect:function(a,b,c,d){return{width:Math.abs(c-a),height:Math.abs(d-b),position:{left:Math.min(a,c),top:Math.min(b,d)}}},_angles:{tc:1.5,tr:7/4,tl:5/4,bc:.5,br:.25,bl:.75,rc:2,lc:1,c:0},ellipse:function(a,b,c,d,e){var f=R.polys._angles[e.abbrev()],g=0===f?0:c*Math.cos(f*Math.PI),h=d*Math.sin(f*Math.PI);return{width:2*c-Math.abs(g),height:2*d-Math.abs(h),position:{left:a+g,top:b+h},adjustable:E}},circle:function(a,b,c,d){return R.polys.ellipse(a,b,c,c,d)}},R.svg=function(a,c,e){for(var f,g,h,i,j,k,l,m,n,o=c[0],p=d(o.ownerSVGElement),q=o.ownerDocument,r=(parseInt(c.css("stroke-width"),10)||0)/2;!o.getBBox;)o=o.parentNode;if(!o.getBBox||!o.parentNode)return E;switch(o.nodeName){case"ellipse":case"circle":m=R.polys.ellipse(o.cx.baseVal.value,o.cy.baseVal.value,(o.rx||o.r).baseVal.value+r,(o.ry||o.r).baseVal.value+r,e);break;case"line":case"polygon":case"polyline":for(l=o.points||[{x:o.x1.baseVal.value,y:o.y1.baseVal.value},{x:o.x2.baseVal.value,y:o.y2.baseVal.value}],m=[],k=-1,i=l.numberOfItems||l.length;++k<i;)j=l.getItem?l.getItem(k):l[k],m.push.apply(m,[j.x,j.y]);m=R.polys.polygon(m,e);break;default:m=o.getBBox(),m={width:m.width,height:m.height,position:{left:m.x,top:m.y}}}return n=m.position,p=p[0],p.createSVGPoint&&(g=o.getScreenCTM(),l=p.createSVGPoint(),l.x=n.left,l.y=n.top,h=l.matrixTransform(g),n.left=h.x,n.top=h.y),q!==b&&"mouse"!==a.position.target&&(f=d((q.defaultView||q.parentWindow).frameElement).offset(),f&&(n.left+=f.left,n.top+=f.top)),q=d(q),n.left+=q.scrollLeft(),n.top+=q.scrollTop(),m},R.imagemap=function(a,b,c){b.jquery||(b=d(b));var e,f,g,h,i,j=(b.attr("shape")||"rect").toLowerCase().replace("poly","polygon"),k=d('img[usemap="#'+b.parent("map").attr("name")+'"]'),l=d.trim(b.attr("coords")),m=l.replace(/,$/,"").split(",");if(!k.length)return E;if("polygon"===j)h=R.polys.polygon(m,c);else{if(!R.polys[j])return E;for(g=-1,i=m.length,f=[];++g<i;)f.push(parseInt(m[g],10));h=R.polys[j].apply(this,f.concat(c))}return e=k.offset(),e.left+=Math.ceil((k.outerWidth(E)-k.width())/2),e.top+=Math.ceil((k.outerHeight(E)-k.height())/2),h.position.left+=e.left,h.position.top+=e.top,h};var Aa,Ba='<iframe class="qtip-bgiframe" frameborder="0" tabindex="-1" src="javascript:\'\';"  style="display:block; position:absolute; z-index:-1; filter:alpha(opacity=0); -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";"></iframe>';d.extend(x.prototype,{_scroll:function(){var b=this.qtip.elements.overlay;b&&(b[0].style.top=d(a).scrollTop()+"px")},init:function(c){var e=c.tooltip;d("select, object").length<1&&(this.bgiframe=c.elements.bgiframe=d(Ba).appendTo(e),c._bind(e,"tooltipmove",this.adjustBGIFrame,this._ns,this)),this.redrawContainer=d("<div/>",{id:S+"-rcontainer"}).appendTo(b.body),c.elements.overlay&&c.elements.overlay.addClass("qtipmodal-ie6fix")&&(c._bind(a,["scroll","resize"],this._scroll,this._ns,this),c._bind(e,["tooltipshow"],this._scroll,this._ns,this)),this.redraw()},adjustBGIFrame:function(){var a,b,c=this.qtip.tooltip,d={height:c.outerHeight(E),width:c.outerWidth(E)},e=this.qtip.plugins.tip,f=this.qtip.elements.tip;b=parseInt(c.css("borderLeftWidth"),10)||0,b={left:-b,top:-b},e&&f&&(a="x"===e.corner.precedance?[I,L]:[J,K],b[a[1]]-=f[a[0]]()),this.bgiframe.css(b).css(d)},redraw:function(){if(this.qtip.rendered<1||this.drawing)return this;var a,b,c,d,e=this.qtip.tooltip,f=this.qtip.options.style,g=this.qtip.options.position.container;return this.qtip.drawing=1,f.height&&e.css(J,f.height),f.width?e.css(I,f.width):(e.css(I,"").appendTo(this.redrawContainer),b=e.width(),1>b%2&&(b+=1),c=e.css("maxWidth")||"",d=e.css("minWidth")||"",a=(c+d).indexOf("%")>-1?g.width()/100:0,c=(c.indexOf("%")>-1?a:1*parseInt(c,10))||b,d=(d.indexOf("%")>-1?a:1*parseInt(d,10))||0,b=c+d?Math.min(Math.max(b,d),c):b,e.css(I,Math.round(b)).appendTo(g)),this.drawing=0,this},destroy:function(){this.bgiframe&&this.bgiframe.remove(),this.qtip._unbind([a,this.qtip.tooltip],this._ns)}}),Aa=R.ie6=function(a){return 6===da.ie?new x(a):E},Aa.initialize="render",B.ie6={"^content|style$":function(){this.redraw()}}})}(window,document);
-//# sourceMappingURL=jquery.qtip.min.map
\ No newline at end of file
+//# sourceMappingURL=jquery.qtip.min.map
diff --git a/webapp/src/main/webapp/js/jquery_plugins/supersleight.js b/webapp/src/main/webapp/js/jquery_plugins/supersleight.js
index c79fe54a7..bc462af35 100644
--- a/webapp/src/main/webapp/js/jquery_plugins/supersleight.js
+++ b/webapp/src/main/webapp/js/jquery_plugins/supersleight.js
@@ -94,4 +94,4 @@ var supersleight = function() {
 // limit to part of the page ... pass an ID to limitTo:
 // supersleight.limitTo('top');
 // optional path to a transparent GIF image, apply positioning, limitTo
-supersleight.init();
\ No newline at end of file
+supersleight.init();
diff --git a/webapp/src/main/webapp/js/jquery_plugins/ui.datepicker.css b/webapp/src/main/webapp/js/jquery_plugins/ui.datepicker.css
index 073b179d6..098f888c8 100644
--- a/webapp/src/main/webapp/js/jquery_plugins/ui.datepicker.css
+++ b/webapp/src/main/webapp/js/jquery_plugins/ui.datepicker.css
@@ -205,4 +205,4 @@ img.datepicker_trigger {
     left: -4px; /*must have*/
     width: 200px; /*must have*/
     height: 200px; /*must have*/
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/js/jquery_plugins/ui.datepicker.js b/webapp/src/main/webapp/js/jquery_plugins/ui.datepicker.js
index 828524428..343403090 100644
--- a/webapp/src/main/webapp/js/jquery_plugins/ui.datepicker.js
+++ b/webapp/src/main/webapp/js/jquery_plugins/ui.datepicker.js
@@ -5,7 +5,7 @@
    Dual licensed under the MIT (MIT-LICENSE.txt)
    and GPL (GPL-LICENSE.txt) licenses.
    Date: 09-03-2007  */
-   
+
 ;(function($) { // hide the namespace
 
 /* Date picker manager.
@@ -75,7 +75,7 @@ function Datepicker() {
 		calculateWeek: this.iso8601Week, // How to calculate the week of the year,
 			// takes a Date and returns the number of the week for it
 		shortYearCutoff: '+10', // Short year values < this are in the current century,
-			// > this are in the previous century, 
+			// > this are in the previous century,
 			// string value starting with '+' for current year + value
 		showStatus: false, // True to show status bar at bottom, false to not show it
 		statusForDate: this.dateStatus, // Function to provide status text for a date -
@@ -108,7 +108,7 @@ $.extend(Datepicker.prototype, {
 		if (this.debug)
 			console.log.apply('', arguments);
 	},
-	
+
 	/* Register a new date picker instance - with custom settings. */
 	_register: function(inst) {
 		var id = this._nextId++;
@@ -121,7 +121,7 @@ $.extend(Datepicker.prototype, {
 		return this._inst[id] || id;
 	},
 
-	/* Override the default settings for all instances of the date picker. 
+	/* Override the default settings for all instances of the date picker.
 	   @param  settings  object - the new settings to use as defaults (anonymous object)
 	   @return the manager object */
 	setDefaults: function(settings) {
@@ -147,7 +147,7 @@ $.extend(Datepicker.prototype, {
 			}
 		}
 		var nodeName = target.nodeName.toLowerCase();
-		var instSettings = (inlineSettings ? 
+		var instSettings = (inlineSettings ?
 			$.extend(settings || {}, inlineSettings || {}) : settings);
 		if (nodeName == 'input') {
 			var inst = (inst && !inlineSettings ? inst :
@@ -318,9 +318,9 @@ $.extend(Datepicker.prototype, {
 			input.wrap('<span class="datepicker_wrap">');
 			var buttonText = inst._get('buttonText');
 			var buttonImage = inst._get('buttonImage');
-			var trigger = $(inst._get('buttonImageOnly') ? 
+			var trigger = $(inst._get('buttonImageOnly') ?
 				$('<img>').addClass('datepicker_trigger').attr({ src: buttonImage, alt: buttonText, title: buttonText }) :
-				$('<button>').addClass('datepicker_trigger').attr({ type: 'button' }).html(buttonImage != '' ? 
+				$('<button>').addClass('datepicker_trigger').attr({ type: 'button' }).html(buttonImage != '' ?
 						$('<img>').attr({ src:buttonImage, alt:buttonText, title:buttonText }) : buttonText));
 			if (isRTL)
 				input.before(trigger);
@@ -361,7 +361,7 @@ $.extend(Datepicker.prototype, {
 	_inlineShow: function(inst) {
 		var numMonths = inst._getNumberOfMonths(); // fix width for dynamic number of date pickers
 		inst._datepickerDiv.width(numMonths[1] * $('.datepicker', inst._datepickerDiv[0]).width());
-	}, 
+	},
 
 	/* Pop-up the date picker in a "dialog" box.
 	   @param  input     element - ignored
@@ -506,7 +506,7 @@ $.extend(Datepicker.prototype, {
 				(isFixed && $.browser.opera ? document.documentElement.scrollTop : 0)) + 'px');
 		}
 	},
-	
+
 	/* Find an object's position on the screen. */
 	_findPos: function(obj) {
         while (obj && (obj.type == 'hidden' || obj.nodeType != 1)) {
@@ -627,7 +627,7 @@ $.extend(Datepicker.prototype, {
 			if (!this._stayOpen) {
 				$('.datepicker td').removeClass('datepicker_currentDay');
 				$(td).addClass('datepicker_currentDay');
-			} 
+			}
 			this._stayOpen = !this._stayOpen;
 		}
 		inst._selectedDay = inst._currentDay = $('a', td).html();
@@ -694,7 +694,7 @@ $.extend(Datepicker.prototype, {
 		var day = date.getDay();
 		return [(day > 0 && day < 6), ''];
 	},
-	
+
 	/* Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
 	   @param  date  Date - the date to get the week for
 	   @return  number - the number of the week within the year that contains this date */
@@ -715,7 +715,7 @@ $.extend(Datepicker.prototype, {
 		}
 		return Math.floor(((checkDate - firstMon) / 86400000) / 7) + 1; // Weeks to given date
 	},
-	
+
 	/* Provide status text for a particular date.
 	   @param  date  the date to get the status for
 	   @param  inst  the current datepicker instance
@@ -768,7 +768,7 @@ $.extend(Datepicker.prototype, {
 			var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match);
 			if (matches)
 				iFormat++;
-			return matches;	
+			return matches;
 		};
 		// Extract a number from the string value
 		var getNumber = function(match) {
@@ -819,14 +819,14 @@ $.extend(Datepicker.prototype, {
 					case 'd':
 						day = getNumber('d');
 						break;
-					case 'D': 
+					case 'D':
 						getName('D', dayNamesShort, dayNames);
 						break;
-					case 'm': 
+					case 'm':
 						month = getNumber('m');
 						break;
 					case 'M':
-						month = getName('M', monthNamesShort, monthNames); 
+						month = getName('M', monthNamesShort, monthNames);
 						break;
 					case 'y':
 						year = getNumber('y');
@@ -887,7 +887,7 @@ $.extend(Datepicker.prototype, {
 			var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match);
 			if (matches)
 				iFormat++;
-			return matches;	
+			return matches;
 		};
 		// Format a number, with leading zero if necessary
 		var formatNumber = function(match, value) {
@@ -909,19 +909,19 @@ $.extend(Datepicker.prototype, {
 				else
 					switch (format.charAt(iFormat)) {
 						case 'd':
-							output += formatNumber('d', date.getDate()); 
+							output += formatNumber('d', date.getDate());
 							break;
-						case 'D': 
+						case 'D':
 							output += formatName('D', date.getDay(), dayNamesShort, dayNames);
 							break;
-						case 'm': 
-							output += formatNumber('m', date.getMonth() + 1); 
+						case 'm':
+							output += formatNumber('m', date.getMonth() + 1);
 							break;
 						case 'M':
-							output += formatName('M', date.getMonth(), monthNamesShort, monthNames); 
+							output += formatName('M', date.getMonth(), monthNamesShort, monthNames);
 							break;
 						case 'y':
-							output += (lookAhead('y') ? date.getFullYear() : 
+							output += (lookAhead('y') ? date.getFullYear() :
 								(date.getYear() % 100 < 10 ? '0' : '') + date.getYear() % 100);
 							break;
 						case "'":
@@ -951,7 +951,7 @@ $.extend(Datepicker.prototype, {
 			else
 				switch (format.charAt(iFormat)) {
 					case 'd' || 'm' || 'y':
-						chars += '0123456789'; 
+						chars += '0123456789';
 						break;
 					case 'D' || 'M':
 						return null; // Accept anything
@@ -997,7 +997,7 @@ $.extend(DatepickerInstance.prototype, {
 	_setDateFromField: function(input) {
 		this._input = $(input);
 		var dateFormat = this._get('dateFormat');
-		var dates = this._input ? this._input.val().split(this._get('rangeSeparator')) : null; 
+		var dates = this._input ? this._input.val().split(this._get('rangeSeparator')) : null;
 		this._endDay = this._endMonth = this._endYear = null;
 		var date = defaultDate = this._getDefaultDate();
 		if (dates.length > 0) {
@@ -1023,7 +1023,7 @@ $.extend(DatepickerInstance.prototype, {
 		this._currentYear = (dates[0] ? date.getFullYear() : 0);
 		this._adjustDate();
 	},
-	
+
 	/* Retrieve the default date shown on opening. */
 	_getDefaultDate: function() {
 		var date = this._determineDate('defaultDate', new Date());
@@ -1054,7 +1054,7 @@ $.extend(DatepickerInstance.prototype, {
 					case 'w' : case 'W' :
 						day += (matches[1] * 7); break;
 					case 'm' : case 'M' :
-						month += (matches[1] - 0); 
+						month += (matches[1] - 0);
 						day = Math.min(day, getDaysInMonth(year, month));
 						break;
 					case 'y': case 'Y' :
@@ -1110,7 +1110,7 @@ $.extend(DatepickerInstance.prototype, {
 		var isRTL = this._get('isRTL');
 		// build the date picker HTML
 		var clear = (this._get('mandatory') ? '' :
-			'<div class="datepicker_clear"><a onclick="jQuery.datepicker._clearDate(' + this._id + ');"' + 
+			'<div class="datepicker_clear"><a onclick="jQuery.datepicker._clearDate(' + this._id + ');"' +
 			(showStatus ? this._addStatus(this._get('clearStatus') || '&#xa0;') : '') + '>' +
 			this._get('clearText') + '</a></div>');
 		var controls = '<div class="datepicker_control">' + (isRTL ? '' : clear) +
@@ -1140,7 +1140,7 @@ $.extend(DatepickerInstance.prototype, {
 			}
 		}
 		// controls and links
-		var prev = '<div class="datepicker_prev">' + (this._canAdjustMonth(-1, drawYear, drawMonth) ? 
+		var prev = '<div class="datepicker_prev">' + (this._canAdjustMonth(-1, drawYear, drawMonth) ?
 			'<a onclick="jQuery.datepicker._adjustDate(' + this._id + ', -' + stepMonths + ', \'M\');"' +
 			(showStatus ? this._addStatus(this._get('prevStatus') || '&#xa0;') : '') + '>' +
 			this._get('prevText') + '</a>' :
@@ -1164,7 +1164,7 @@ $.extend(DatepickerInstance.prototype, {
 				html += '<div class="datepicker_oneMonth' + (col == 0 ? ' datepicker_newRow' : '') + '">' +
 					this._generateMonthYearHeader(drawMonth, drawYear, minDate, maxDate,
 					selectedDate, row > 0 || col > 0) + // draw month headers
-					'<table class="datepicker" cellpadding="0" cellspacing="0"><thead>' + 
+					'<table class="datepicker" cellpadding="0" cellspacing="0"><thead>' +
 					'<tr class="datepicker_titleRow">' +
 					(showWeeks ? '<td>' + this._get('weekHeader') + '</td>' : '');
 				var firstDay = this._get('firstDay');
@@ -1179,7 +1179,7 @@ $.extend(DatepickerInstance.prototype, {
 						status.replace(/D/, dayNamesShort[day]));
 					html += '<td' + ((dow + firstDay + 6) % 7 >= 5 ? ' class="datepicker_weekEndCell"' : '') + '>' +
 						(!changeFirstDay ? '<span' :
-						'<a onclick="jQuery.datepicker._changeFirstDay(' + this._id + ', ' + day + ');"') + 
+						'<a onclick="jQuery.datepicker._changeFirstDay(' + this._id + ', ' + day + ');"') +
 						(showStatus ? this._addStatus(status) : '') + ' title="' + dayNames[day] + '">' +
 						dayNamesMin[day] + (changeFirstDay ? '</a>' : '</span>') + '</td>';
 				}
@@ -1238,15 +1238,15 @@ $.extend(DatepickerInstance.prototype, {
 				}
 				html += '</tbody></table></div>';
 			}
-		html += (showStatus ? '<div style="clear: both;"></div><div id="datepicker_status_' + this._id + 
+		html += (showStatus ? '<div style="clear: both;"></div><div id="datepicker_status_' + this._id +
 			'" class="datepicker_status">' + (this._get('initStatus') || '&#xa0;') + '</div>' : '') +
 			(!closeAtTop && !this._inline ? controls : '') +
-			'<div style="clear: both;"></div>' + 
-			($.browser.msie && parseInt($.browser.version) < 7 && !this._inline ? 
+			'<div style="clear: both;"></div>' +
+			($.browser.msie && parseInt($.browser.version) < 7 && !this._inline ?
 			'<iframe src="javascript:false;" class="datepicker_cover"></iframe>' : '');
 		return html;
 	},
-	
+
 	/* Generate the month and year header. */
 	_generateMonthYearHeader: function(drawMonth, drawYear, minDate, maxDate, selectedDate, secondary) {
 		minDate = (this._rangeStart && minDate && selectedDate < minDate ? selectedDate : minDate);
@@ -1256,7 +1256,7 @@ $.extend(DatepickerInstance.prototype, {
 		var monthNames = this._get('monthNames');
 		if (secondary || !this._get('changeMonth'))
 			html += monthNames[drawMonth] + '&#xa0;';
-			
+
 		else {
 			var inMinYear = (minDate && minDate.getFullYear() == drawYear);
 			var inMaxYear = (maxDate && maxDate.getFullYear() == drawYear);
@@ -1331,7 +1331,7 @@ $.extend(DatepickerInstance.prototype, {
 		this._drawMonth = this._selectedMonth = date.getMonth();
 		this._drawYear = this._selectedYear = date.getFullYear();
 	},
-	
+
 	/* Determine the number of months to show. */
 	_getNumberOfMonths: function() {
 		var numMonths = this._get('numberOfMonths');
@@ -1379,7 +1379,7 @@ $.extend(DatepickerInstance.prototype, {
 		var maxDate = this._getMinMaxDate('max');
 		return ((!minDate || date >= minDate) && (!maxDate || date <= maxDate));
 	},
-	
+
 	/* Provide the configuration settings for formatting/parsing. */
 	_getFormatConfig: function() {
 		var shortYearCutoff = this._get('shortYearCutoff');
@@ -1429,11 +1429,11 @@ $.fn.datepicker = function(options){
 };
 
 $.datepicker = new Datepicker(); // singleton instance
-	
+
 /* Initialise the date picker. */
 $(document).ready(function() {
 	$(document.body).append($.datepicker._datepickerDiv)
 		.mousedown($.datepicker._checkExternalClick);
 });
 
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/webapp/src/main/webapp/js/languageMenuUtils.js b/webapp/src/main/webapp/js/languageMenuUtils.js
index 0061ac329..d57c0aee2 100644
--- a/webapp/src/main/webapp/js/languageMenuUtils.js
+++ b/webapp/src/main/webapp/js/languageMenuUtils.js
@@ -1,24 +1,24 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
 $(function() {
-		
+
 	$.extend(this, i18nStringsLangMenu);
 	var theText = this.selectLanguage;
 	var imgHTML = "";
-    $("ul.language-dropdown li#language-menu").hover(function(){ 
+    $("ul.language-dropdown li#language-menu").hover(function(){
 		$("a#lang-link").html(theText);
         $(this).addClass("hover");
         $('ul:first',this).css('visibility', 'visible');
         $("ul.language-dropdown ul.sub_menu li").css('width', ($("ul.language-dropdown").width() - 4) + 'px');
-    
+
     }, function(){
     	$("a#lang-link").html(imgHTML);
         $(this).removeClass("hover");
-        $('ul:first',this).css('visibility', 'hidden');    
+        $('ul:first',this).css('visibility', 'hidden');
     });
-    
+
     $("ul.language-dropdown li ul li:has(ul)").find("a:first").append(" &raquo; ");
-	
+
 	$("ul.language-dropdown ul.sub_menu li").each(function() {
 		if ( $(this).attr("status") == "selected" ) {
 			$("a#lang-link").html($(this).children("a").html());
@@ -26,4 +26,4 @@ $(function() {
 		}
 	});
 
-});
\ No newline at end of file
+});
diff --git a/webapp/src/main/webapp/js/login/loginUtils.js b/webapp/src/main/webapp/js/login/loginUtils.js
index ad8feb7f8..0b4f8daee 100644
--- a/webapp/src/main/webapp/js/login/loginUtils.js
+++ b/webapp/src/main/webapp/js/login/loginUtils.js
@@ -4,16 +4,16 @@ $(document).ready(function(){
 
     // login form is hidden by default; use JavaScript to reveal
     $("#login").removeClass('hidden');
-  
+
     // focus on email or newpassword field
     $('.focus').focus();
-    
+
     // fade in error alerts
-    $('section#error-alert').css('display', 'none').fadeIn(1500); 
-    
+    $('section#error-alert').css('display', 'none').fadeIn(1500);
+
     // toggle vivo account authentication form
     $('h3.internal-auth').click(function() {
         $('.vivoAccount').toggle();
     });
-    
-});
\ No newline at end of file
+
+});
diff --git a/webapp/src/main/webapp/js/menupage/browseByVClass.js b/webapp/src/main/webapp/js/menupage/browseByVClass.js
index 816cc54d7..4aec58fa6 100644
--- a/webapp/src/main/webapp/js/menupage/browseByVClass.js
+++ b/webapp/src/main/webapp/js/menupage/browseByVClass.js
@@ -8,13 +8,13 @@ var browseByVClass = {
         this.bindEventListeners();
         this.defaultVClass();
     },
-    
+
     // Add variables from menupage template
     mergeFromTemplate: function() {
         $.extend(this, menupageData);
         $.extend(this, i18nStrings);
     },
-    
+
     // Create references to frequently used elements for convenience
     initObjects: function() {
         this.vgraphVClasses = $('#vgraph-classes');
@@ -26,7 +26,7 @@ var browseByVClass = {
         this.individualsInVClass = $('#individuals-in-class ul');
         this.individualsContainer = $('#individuals-in-class');
     },
-    
+
     // Event listeners. Called on page load
     bindEventListeners: function() {
         // Listeners for vClass switching
@@ -34,13 +34,13 @@ var browseByVClass = {
             var uri = $(this).attr('data-uri');
             browseByVClass.getIndividuals(uri);
         });
-        
+
         this.browseVClassLinks.click(function() {
             var uri = $(this).attr('data-uri');
             browseByVClass.getIndividuals(uri);
             return false;
         });
-        
+
         // Listener for alpha switching
         this.alphaIndexLinks.click(function() {
             var uri = $('#browse-classes li a.selected').attr('data-uri');
@@ -48,20 +48,20 @@ var browseByVClass = {
             browseByVClass.getIndividuals(uri, alpha);
             return false;
         });
-        
+
         // save the selected vclass in location hash so we can reset the selection
         // if the user navigates with the back button
         this.browseVClasses.children('li').each( function() {
            $(this).find('a').click(function () {
                 // the extra space is needed to prevent odd scrolling behavior
                 location.hash = $(this).attr('data-uri') + ' ';
-           }); 
+           });
         });
 
         // Call the pagination listener
         this.paginationListener();
     },
-    
+
     // Listener for page switching -- separate from the rest because it needs to be callable
     paginationListener: function() {
         $('.pagination li a').click(function() {
@@ -72,13 +72,13 @@ var browseByVClass = {
             return false;
         });
     },
-    
+
     // Load individuals for default class as specified by menupage template
     defaultVClass: function() {
         if ( this.defaultBrowseVClassURI != "false" ) {
             if ( location.hash ) {
                 // remove the trailing white space
-                location.hash = location.hash.replace(/\s+/g, '');                
+                location.hash = location.hash.replace(/\s+/g, '');
                 this.getIndividuals(location.hash.substring(1,location.hash.length), "all", 1, false);
             }
             else {
@@ -86,7 +86,7 @@ var browseByVClass = {
             }
         }
     },
-    
+
     // Where all the magic happens -- gonna fetch me some individuals
     getIndividuals: function(vclassUri, alpha, page, scroll) {
         var url = this.dataServiceUrl + encodeURIComponent(vclassUri);
@@ -101,7 +101,7 @@ var browseByVClass = {
         if ( typeof scroll === "undefined" ) {
             scroll = true;
         }
-        
+
         // Scroll to #menupage-intro page unless told otherwise
         if ( scroll != false ) {
             // only scroll back up if we're past the top of the #browse-by section
@@ -111,10 +111,10 @@ var browseByVClass = {
                 $.scrollTo('#menupage-intro', 500);
             }
         }
-        
+
         $.getJSON(url, function(results) {
             var individualList = "";
-            
+
             // Catch exceptions when empty individuals result set is returned
             // This is very likely to happen now since we don't have individual counts for each letter and always allow the result set to be filtered by any letter
             if ( results.individuals.length == 0 ) {
@@ -125,20 +125,20 @@ var browseByVClass = {
                     var individual = results.individuals[i];
                     individualList += individual.shortViewHtml;
                 })
-                
+
                 // Remove existing content
                 browseByVClass.wipeSlate();
-                
+
                 // And then add the new content
                 browseByVClass.individualsInVClass.append(individualList);
-                
+
                 // Check to see if we're dealing with pagination
                 if ( results.pages.length ) {
                     var pages = results.pages;
                     browseByVClass.pagination(pages, page);
                 }
             }
-            
+
             // Set selected class, alpha and page
             // Do this whether or not there are any results
             $('h3.selected-class').text(results.vclass.name);
@@ -146,7 +146,7 @@ var browseByVClass = {
             browseByVClass.selectedAlpha(alpha);
         });
     },
-    
+
     // getPageScroll() by quirksmode.org
     getPageScroll: function() {
         var xScroll, yScroll;
@@ -162,18 +162,18 @@ var browseByVClass = {
         }
         return new Array(xScroll,yScroll)
     },
-    
+
     // Print out the pagination nav if called
     pagination: function(pages, page) {
         var pagination = '<div class="pagination menupage">';
         pagination += '<h3>' + browseByVClass.pageString + '</h3>';
         pagination += '<ul>';
         $.each(pages, function(i, item) {
-            var anchorOpen = '<a class="round" href="#" title="' + browseByVClass.viewPageString + ' ' 
+            var anchorOpen = '<a class="round" href="#" title="' + browseByVClass.viewPageString + ' '
             + pages[i].text + ' '
             + browseByVClass.ofTheResults + ' " data-page="'+ pages[i].index +'">';
             var anchorClose = '</a>';
-            
+
             pagination += '<li class="round';
             // Test for active page
             if ( pages[i].text == page) {
@@ -188,18 +188,18 @@ var browseByVClass = {
             pagination += '</li>';
         })
         pagination += '</ul>';
-        
+
         // Add the pagination above and below the list of individuals and call the listener
         browseByVClass.individualsContainer.prepend(pagination);
         browseByVClass.individualsContainer.append(pagination);
         browseByVClass.paginationListener();
     },
-    
+
     // Toggle the active class so it's clear which is selected
     selectedVClass: function(vclassUri) {
         // Remove active class on all vClasses
         $('#browse-classes li a.selected').removeClass('selected');
-        
+
         // Add active class for requested vClass
         $('#browse-classes li a[data-uri="'+ vclassUri +'"]').addClass('selected');
     },
@@ -212,38 +212,38 @@ var browseByVClass = {
         }
         // Remove active class on all letters
         $('#alpha-browse-individuals li a.selected').removeClass('selected');
-        
+
         // Add active class for requested alpha
         $('#alpha-browse-individuals li a[data-alpha="'+ alpha +'"]').addClass('selected');
-        
+
         return alpha;
     },
-    
+
     // Wipe the currently displayed individuals, no-content message, and existing pagination
     wipeSlate: function() {
         browseByVClass.individualsInVClass.empty();
         $('p.no-individuals').remove();
         $('.pagination').remove();
     },
-    
+
     // When no individuals are returned for the AJAX request, print a reasonable message for the user
     emptyResultSet: function(vclass, alpha) {
         var nothingToSeeHere;
-        
+
         this.wipeSlate();
         var alpha = this.selectedAlpha(alpha);
-        
+
         if ( alpha != "all" ) {
             nothingToSeeHere = '<p class="no-individuals">' + browseByVClass.thereAreNo + ' ' + vclass.name + ' ' + browseByVClass.indNamesStartWith + ' <em>'+ alpha.toUpperCase() +'</em>.</p> <p class="no-individuals">' + browseByVClass.tryAnotherLetter + '</p>';
         } else {
             nothingToSeeHere = '<p class="no-individuals">' + browseByVClass.thereAreNo + ' ' + vclass.name + ' ' + browseByVClass.indsInSystem + '</p> <p class="no-individuals">' + browseByVClass.selectAnotherClass + '</p>';
         }
 
-        browseByVClass.individualsContainer.prepend(nothingToSeeHere);   
+        browseByVClass.individualsContainer.prepend(nothingToSeeHere);
     }
-    
+
 };
 
 $(document).ready(function() {
     browseByVClass.onLoad();
-});
\ No newline at end of file
+});
diff --git a/webapp/src/main/webapp/js/menupage/menumanagement_edit.js b/webapp/src/main/webapp/js/menupage/menumanagement_edit.js
index 412382440..1b1761236 100644
--- a/webapp/src/main/webapp/js/menupage/menumanagement_edit.js
+++ b/webapp/src/main/webapp/js/menupage/menumanagement_edit.js
@@ -20,17 +20,17 @@ var menuManagementEdit = {
         this.allClassesSelectedCheckbox = $('#allSelected');
         this.displayInternalMessage = $('#internal-class label em');
     },
-    bindEventListeners: function() {        
+    bindEventListeners: function() {
         // Listeners for vClass switching
         this.changeContentType.click(function() {
            menuManagementEdit.showClassGroups();
-         
+
            return false;
         });
         this.selectClassGroupDropdown.change(function() {
             menuManagementEdit.chooseClassGroup();
         });
-        
+
         // Listeners for template field
         this.defaultTemplateRadio.click(function(){
             menuManagementEdit.customTemplate.addClass('hidden');
@@ -39,7 +39,7 @@ var menuManagementEdit = {
             // If checked, hide this input element
             menuManagementEdit.customTemplate.removeClass('hidden');
         });
-        $("form").submit(function () { 
+        $("form").submit(function () {
             var validationError = menuManagementEdit.validateMenuItemForm();
             if (validationError == "") {
                    $(this).submit();
@@ -48,10 +48,10 @@ var menuManagementEdit = {
                    $('#error-alert p').html(validationError);
                    $.scrollTo({ top:0, left:0}, 500)
                    return false;
-               } 
+               }
          });
     },
-    updateInternalClassMessage:function(classGroupName) { //User has changed content type 
+    updateInternalClassMessage:function(classGroupName) { //User has changed content type
         //Set content type within internal class message
         this.displayInternalMessage.filter(":first").html(classGroupName);
     },
@@ -70,7 +70,7 @@ var menuManagementEdit = {
         this.existingContentType.removeClass("hidden");
         //Show the classes in the class group
         this.classesForClassGroup.removeClass("hidden");
-        
+
     },
     toggleClassSelection: function() {
         // Check/unckeck all classes for selection
@@ -91,29 +91,29 @@ var menuManagementEdit = {
     },
     validateMenuItemForm: function() {
         var validationError = "";
-        
+
         // Check menu name
         if ($('input[type=text][name=menuName]').val() == "") {
             validationError += menuManagementEdit.supplyName + "<br />";
             }
-        // Check pretty url     
+        // Check pretty url
         if ($('input[type=text][name=prettyUrl]').val() == "") {
             validationError += menuManagementEdit.supplyPrettyUrl + "<br />";
         }
         if ($('input[type=text][name=prettyUrl]').val().charAt(0) != "/") {
             validationError += menuManagementEdit.startUrlWithSlash + "<br />";
         }
-        
+
         // Check custom template
         if ($('input:radio[name=selectedTemplate]:checked').val() == "custom") {
             if ($('input[name=customTemplate]').val() == "") {
-                validationError += menuManagementEdit.supplyTemplate + "<br />"; 
+                validationError += menuManagementEdit.supplyTemplate + "<br />";
             }
         }
-        
+
         // if no class group selected, this is an error
         if ($('#selectClassGroup').val() =='-1') {
-            validationError += menuManagementEdit.supplyContentType + "<br />"; 
+            validationError += menuManagementEdit.supplyContentType + "<br />";
         } else {
             //class group has been selected, make sure there is at least one class selected
             var allSelected = $('input[name="allSelected"]:checked').length;
@@ -123,52 +123,52 @@ var menuManagementEdit = {
                 validationError += menuManagementEdit.selectContentType + "<br />";
             }
         }
-      
-       
+
+
         //check select class group
-       
+
         return validationError;
     },
-    chooseClassGroup: function() {        
+    chooseClassGroup: function() {
         var url = "dataservice?getVClassesForVClassGroup=1&classgroupUri=";
         var vclassUri = this.selectClassGroupDropdown.val();
         url += encodeURIComponent(vclassUri);
         //Make ajax call to retrieve vclasses
         $.getJSON(url, function(results) {
-  
+
           if ( results.classes.length == 0 ) {
-     
+
           } else {
               //update existing content type with correct class group name and hide class group select again
               var _this = menuManagementEdit;
               menuManagementEdit.hideClassGroups();
-      
+
               menuManagementEdit.selectedGroupForPage.html(results.classGroupName);
               //update content type in message to "display x within my institution"
               menuManagementEdit.updateInternalClassMessage(results.classGroupName);
               //retrieve classes for class group and display with all selected
               var selectedClassesList = menuManagementEdit.classesForClassGroup.children('ul#selectedClasses');
-              
+
               selectedClassesList.empty();
               selectedClassesList.append('<li class="ui-state-default"> <input type="checkbox" name="allSelected" id="allSelected" value="all" checked="checked" /> <label class="inline" for="All"> ' + menuManagementEdit.allCapitalized + '</label> </li>');
-              
+
               $.each(results.classes, function(i, item) {
                   var thisClass = results.classes[i];
                   var thisClassName = thisClass.name;
                   //When first selecting new content type, all classes should be selected
-                  appendHtml = ' <li class="ui-state-default">' + 
-                          '<input type="checkbox" checked="checked" name="classInClassGroup" value="' + thisClass.URI + '" />' +  
-                         '<label class="inline" for="' + thisClassName + '"> ' + thisClassName + '</label>' + 
+                  appendHtml = ' <li class="ui-state-default">' +
+                          '<input type="checkbox" checked="checked" name="classInClassGroup" value="' + thisClass.URI + '" />' +
+                         '<label class="inline" for="' + thisClassName + '"> ' + thisClassName + '</label>' +
                           '</li>';
                   selectedClassesList.append(appendHtml);
               });
               menuManagementEdit.toggleClassSelection();
           }
- 
+
         });
     }
 };
 
-$(document).ready(function() {   
+$(document).ready(function() {
     menuManagementEdit.onLoad();
-});
\ No newline at end of file
+});
diff --git a/webapp/src/main/webapp/js/menupage/pageManagementUtils.js b/webapp/src/main/webapp/js/menupage/pageManagementUtils.js
index d8d41c832..99ed88d00 100644
--- a/webapp/src/main/webapp/js/menupage/pageManagementUtils.js
+++ b/webapp/src/main/webapp/js/menupage/pageManagementUtils.js
@@ -1,5 +1,5 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
-  
+
 var pageManagementUtils = {
 	dataGetterLabelToURI:null,//initialized by custom data
 	dataGetterURIToLabel:null, //initialized from custom data
@@ -10,7 +10,7 @@ var pageManagementUtils = {
 	onLoad:function(){
 		if (this.disableFormInUnsupportedBrowsers()) {
             return;
-        }   
+        }
 		this.mixIn();
 		this.initReverseURIToLabel();
 		this.initDataGetterProcessors();
@@ -21,7 +21,7 @@ var pageManagementUtils = {
 	    if(this.isEdit()) {
 	    	this.initExistingContent();
 	    }
-	}, 
+	},
 	isEdit:function() {
 		if(pageManagementUtils.menuAction != null && pageManagementUtils.menuAction == "Edit") {
 			return true;
@@ -38,11 +38,11 @@ var pageManagementUtils = {
 		if(pageManagementUtils.addMenuItem != null && pageManagementUtils.addMenuItem == "true") {
 			return true;
 		}
-		return false;	
+		return false;
 	},
 	initExistingContent:function() {
 		this.generateExistingContentSections();
-		//display more content button - will need to review how to hit save etc. 
+		//display more content button - will need to review how to hit save etc.
         //Don't need to display this b/c already in appended section
 		//pageManagementUtils.moreContentButton.show();
 		//Need to have additional save button
@@ -57,13 +57,13 @@ var pageManagementUtils = {
 				}
 			}
 		} else {
-			//Error condition.  
+			//Error condition.
 		}
 	},
 	initDataGetterProcessors:function() {
 		//data getter processor map should come in from custom data
 		//Go through each and initialize with their class
-		
+
 		if(pageManagementUtils.processDataGetterUtils != null) {
 			var dataGetterProcessorMap = pageManagementUtils.dataGetterProcessorMap = pageManagementUtils.processDataGetterUtils.dataGetterProcessorMap;
 			$.each(dataGetterProcessorMap, function(key, dataGetterProcessorObject) {
@@ -71,11 +71,11 @@ var pageManagementUtils = {
 				dataGetterProcessorObject.initProcessor(pageManagementUtils.dataGetterLabelToURI[key]);
 			})
 		}
-	
+
 	},
-    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()) {
@@ -83,8 +83,8 @@ var pageManagementUtils = {
                 $('.noIE67').hide();
                 return true;
             }
-        }            
-        return false;      
+        }
+        return false;
     },
 
     mixIn: function() {
@@ -94,7 +94,7 @@ var pageManagementUtils = {
         // Get the custom form data from the page
         $.extend(this, customFormData);
         $.extend(this, i18nStrings);
-        
+
     },
 	initObjects:function(){
 		this.counter = 0;
@@ -118,7 +118,7 @@ var pageManagementUtils = {
         this.classesForClassGroup = $('section#classesInSelectedGroup');
         this.selectedGroupForPage = $('#selectedContentTypeValue');
         this.allClassesSelectedCheckbox = $('#allSelected');
-        
+
         this.displayInternalMessage = $('#internal-class label em');
         this.pageContentSubmissionInputs = $("#pageContentSubmissionInputs");
         this.headerBar = $("section#headerBar");
@@ -140,7 +140,7 @@ var pageManagementUtils = {
 		//right side components
 	    this.contentTypeSelectOptions.eq(0).prop('selected', 'selected');
 	    $('select#selectClassGroup option').eq(0).prop('selected', 'selected');
-	    
+
 	    //Why would you want to hide this? This hides everything
 	   // $("section#pageDetails").hide();
 	    this.headerBar.hide();
@@ -168,10 +168,10 @@ var pageManagementUtils = {
 	/*
 	//for search individuals - remember this populates the template class dropdown
 	populateClassForSearchDropdown:function() {
-	
+
         //Run ajax query
         var url = "dataservice?getAllVClasses=1";
-       
+
         //Make ajax call to retrieve vclasses
         $.getJSON(url, function(results) {
         	//Moved the function to processClassGroupDataGetterContent
@@ -181,7 +181,7 @@ var pageManagementUtils = {
 	},
 	displayAllClassesForSearchDropdown:function(results) {
 		 if ( results.classes.length == 0 ) {
-	            
+
         } else {
         	var appendHtml = "";
             $.each(results.classes, function(i, item) {
@@ -190,36 +190,36 @@ var pageManagementUtils = {
                 //Create options for the dropdown
                 appendHtml += "<option value='" + thisClass.URI + "'>" + thisClassName + "</option>";
             });
-        
+
             //if there are options to add
             if(appendHtml != "") {
             	pageManagementUtils.searchAllClassesDropdown.html(appendHtml);
             }
-         
+
         }
 	},*/
 	bindEventListeners:function(){
-		
+
 	    this.defaultTemplateRadio.click( function() {
 	            pageManagementUtils.customTemplate.addClass('hidden');
 	            //Also clear custom template value so as not to submit it
 	            pageManagementUtils.clearInputs(pageManagementUtils.customTemplate);
-	            pageManagementUtils.rightSideDiv.show(); 
+	            pageManagementUtils.rightSideDiv.show();
 	            //Check to see if there is already content on page, in which case save should be enabled
 	        	var pageContentSections = $("section[class='pageContent']");
 	        	if(pageContentSections.length == 0) {
 	        		pageManagementUtils.disablePageSave();
-	        	} 
+	        	}
 	    });
 
 	    this.customTemplateRadio.click( function() {
-	            pageManagementUtils.handleSelectCustomTemplate();  
+	            pageManagementUtils.handleSelectCustomTemplate();
 	    });
-	
+
 	    this.selfContainedTemplateRadio.click( function() {
 	            pageManagementUtils.customTemplate.removeClass('hidden');
-	            pageManagementUtils.rightSideDiv.hide(); 
-	            pageManagementUtils.enablePageSave();           
+	            pageManagementUtils.rightSideDiv.hide();
+	            pageManagementUtils.enablePageSave();
 	    });
 
 	    this.isMenuCheckbox.click( function() {
@@ -228,15 +228,15 @@ var pageManagementUtils = {
 	        }
 	        else {
 	            pageManagementUtils.menuSection.hide();
-	        }            
+	        }
 	    });
-	
+
 	    //Collapses the current content and creates a new section of content
 	    //Resets the content to be cloned to default settings
 	    this.doneButton.click( function() {
 	       pageManagementUtils.handleClickDone();
 	    });
-	
+
 	    this.cancelLink.click( function() {
 	        pageManagementUtils.clearSourceTemplateValues();
 	        pageManagementUtils.headerBar.hide();
@@ -253,34 +253,34 @@ var pageManagementUtils = {
 	    this.selectClassGroupDropdown.change(function() {
             pageManagementUtils.chooseClassGroup();
         });
-	    
-	    
-	    
+
+
+
 	    this.contentTypeSelect.change( function() {
 	    	pageManagementUtils.handleContentTypeSelect();
 	    });
-	    
-	    
+
+
 	    //Submission: validate as well as create appropriate hidden json inputs
-	    $("form").submit(function (event) { 
+	    $("form").submit(function (event) {
            pageManagementUtils.handleFormSubmission(event);
          });
-    
+
 	},
 	handleSelectCustomTemplate: function() {
-		pageManagementUtils.customTemplate.removeClass('hidden');            
+		pageManagementUtils.customTemplate.removeClass('hidden');
         pageManagementUtils.rightSideDiv.show();
         //Check to see if there is already content on page, in which case save should be enabled
         var pageContentSections = $("section[class='pageContent']");
     	if(pageContentSections.length == 0) {
     		pageManagementUtils.disablePageSave();
-    	}          
+    	}
 	},
-	
+
 	handleClickDone:function() {
 		var selectedType = pageManagementUtils.contentTypeSelect.val();
 		var selectedTypeText = $("#typeSelect option:selected").text();
-		
+
 		//Hide all sections
 		pageManagementUtils.classGroupSection.hide();
 		pageManagementUtils.fixedHTMLSection.hide();
@@ -308,7 +308,7 @@ var pageManagementUtils = {
 	   //Enable save button now that some content has been selected
 	   pageManagementUtils.enablePageSave();
 	   pageManagementUtils.contentTypeSelect.focus();
-	
+
 	},
 	//Form submission
 	handleFormSubmission:function(event) {
@@ -331,7 +331,7 @@ var pageManagementUtils = {
             $('#error-alert p').html(validationError);
             event.preventDefault();
             return false;
-        } 	
+        }
 	},
 	checkMenuTitleSubmission:function() {
 		var isMenu = pageManagementUtils.isMenuCheckbox.is(":checked");
@@ -347,7 +347,7 @@ var pageManagementUtils = {
 			pageManagementUtils.menuLinkText.val("");
 		}
 	},
-	
+
 	//Select content type - this is content type specific
 	//TODO: Find better way to refactor this and/or see if any of this display functionality can be moved into content type processing
 	handleContentTypeSelect:function() {
@@ -383,7 +383,7 @@ var pageManagementUtils = {
             	pageManagementUtils.fixedHTMLSection.hide();
             	pageManagementUtils.searchIndividualsSection.show();
             }
-           
+
             pageManagementUtils.headerBar.show();
             pageManagementUtils.classesForClassGroup.addClass('hidden');
             $('div#selfContainedDiv').hide();
@@ -405,7 +405,7 @@ var pageManagementUtils = {
         //Disable save button until the user has clicked done or cancel from the addition
         pageManagementUtils.disablePageSave();
         //If the default template is selected, there is already content on the page, and the user is selecting new content
-        //display alert message that they must select a custom template and select 
+        //display alert message that they must select a custom template and select
         pageManagementUtils.checkTemplateForMultipleContent(_this.contentTypeSelect.val());
 	},
 	disablePageSave:function() {
@@ -443,7 +443,7 @@ var pageManagementUtils = {
 		$el.find("textarea").val("");
 		//resetting class group section as well so selection is reset if type changes
 		$el.find("select option:eq(0)").prop("selected", "selected");
-		
+
 	},
 	checkTemplateForMultipleContent:function(contentTypeSelected) {
 		if(contentTypeSelected != "") {
@@ -455,7 +455,7 @@ var pageManagementUtils = {
 	    		alert(pageManagementUtils.multipleContentWithDefaultTemplateError);
 	    		//pick custom template
 	    		 $('input:radio[name=selectedTemplate][value="custom"]').prop("checked", true);
-	    		 pageManagementUtils.handleSelectCustomTemplate();  
+	    		 pageManagementUtils.handleSelectCustomTemplate();
 
 	    	}
 		}
@@ -467,16 +467,16 @@ var pageManagementUtils = {
         var ctr = pageManagementUtils.counter;
         var counter = pageManagementUtils.counter;
         var varOrClass;
-        
+
         //Clone the object, renaming ids and copying text area values as well
         $newContentObj = pageManagementUtils.createCloneObject(contentType, counter);
 
         // Get rid of the cancel link; it'll be replaced by a delete link
         $newContentObj.find('span#cancelContent' + counter).html('');
-        
+
         if ( contentType == "sparqlQuery" || contentType == "fixedHtml" || contentType == "searchIndividuals") {
         	varOrClass = $newContentObj.find('input[name="saveToVar"]').val();
-        } 
+        }
         else if ( contentType == "browseClassGroup" ) {
         	$newContentObj.find('section#classesInSelectedGroup' + counter).removeClass('hidden');
         	varOrClass = $newContentObj.find('select#selectClassGroup' + counter + ' option:selected').text();
@@ -489,9 +489,9 @@ var pageManagementUtils = {
         pageManagementUtils.bindClonedContentEventHandlers($newContentObj);
         pageManagementUtils.createClonedContentContainer($newContentObj, counter, contentTypeLabel, varOrClass);
         //previously increased by 10, just increasing by 1 here
-        pageManagementUtils.counter++;  
+        pageManagementUtils.counter++;
     },
-    
+
     //For binding content type specific event handlers should they exist
     bindClonedContentEventHandlers:function($newContentObj) {
     	var dataGetterProcessorObj = pageManagementUtils.getDataGetterProcessorObject($newContentObj);
@@ -506,9 +506,9 @@ var pageManagementUtils = {
         $newDivContainer = $("<div></div>", {
             id: "divContainer" + counter,
             "class": "pageContentContainer",
-            html: "<span class='pageContentTypeLabel'>" + contentTypeLabel + " - " + varOrClass 
-                        + "</span><span id='clickable" + counter 
-                        + "' class='pageContentExpand'><div id='woof' class='arrow expandArrow'></div></span><div id='innerContainer" + counter 
+            html: "<span class='pageContentTypeLabel'>" + contentTypeLabel + " - " + varOrClass
+                        + "</span><span id='clickable" + counter
+                        + "' class='pageContentExpand'><div id='woof' class='arrow expandArrow'></div></span><div id='innerContainer" + counter
                         + "' class='pageContentWrapper'><span class='deleteLinkContainer'>&nbsp;" + pageManagementUtils.orString + "&nbsp;<a id='remove" + counter   // changed button to a link
                         + "' href='' >" + pageManagementUtils.deleteString + "</a></span></div>"
         });
@@ -519,7 +519,7 @@ var pageManagementUtils = {
         pageManagementUtils.bindClonedContentContainerEvents($newDivContainer, counter);
         //Append the new container to the section storing these containers
         $newDivContainer.appendTo($('section#contentDivs'));
-        //place new content object        
+        //place new content object
         $newContentObj.prependTo($innerDiv);
     },
     bindClonedContentDoneEvent:function($newContentObj) {
@@ -532,8 +532,8 @@ var pageManagementUtils = {
                 thisArrowDiv.removeClass("collapseArrow");
                 thisArrowDiv.addClass("expandArrow");
                 window.setTimeout('pageManagementUtils.adjustSaveButtonHeight()', 223);
-         
-        });	
+
+        });
     },
     bindClonedContentContainerEvents:function($newDivContainer, counter) {
     	 var $clickableSpan = $newDivContainer.children('span#clickable' + counter);
@@ -554,11 +554,11 @@ var pageManagementUtils = {
                 arrowDiv.removeClass("expandArrow");
                 arrowDiv.addClass("collapseArrow");
             }
-            window.setTimeout('pageManagementUtils.adjustSaveButtonHeight()', 223);             
+            window.setTimeout('pageManagementUtils.adjustSaveButtonHeight()', 223);
         });
-        
+
         //remove button
-        $newRemoveLink = $innerDiv.find('a#remove' + counter); 
+        $newRemoveLink = $innerDiv.find('a#remove' + counter);
         //remove the content entirely
         $newRemoveLink.click(function(event) {
         	//if content type of what is being deleted is browse class group, then
@@ -579,8 +579,8 @@ var pageManagementUtils = {
     createCloneObject:function(contentType, counter) {
     	var originalObjectPath = 'section#' + contentType;
     	var $newContentObj = $(originalObjectPath).clone();
- 	    $newContentObj.removeClass("contentSectionContainer"); 
- 	    $newContentObj.addClass("pageContent"); 
+ 	    $newContentObj.removeClass("contentSectionContainer");
+ 	    $newContentObj.addClass("pageContent");
  	    $newContentObj.attr("contentNumber", counter);
  	    //Save content type
 	    $newContentObj.attr("contentType", contentType);
@@ -600,10 +600,10 @@ var pageManagementUtils = {
     		var originalTextAreaName = $(this).attr("name");
     		$newAncestorObject.find("textarea[name='" + originalTextAreaName + "']").val(originalTextAreaValue);
     	});
-    }, 
+    },
     //given an object and a counter, rename all the ids
     renameIdsInClone:function($newContentObj, counter) {
-    	$newContentObj.find("[id]").each(function(index, el) { 
+    	$newContentObj.find("[id]").each(function(index, el) {
     		var originalId = $(this).attr("id");
     		var newId = originalId + counter;
     		$(this).attr("id", newId);
@@ -613,7 +613,7 @@ var pageManagementUtils = {
   //For edit, need to have text passed in
     //Returns new content object itself
     cloneContentAreaForEdit: function(contentType, contentTypeLabel, labelText) {
-           var counter = pageManagementUtils.counter;           
+           var counter = pageManagementUtils.counter;
            //Clone the object, renaming ids and copying text area values as well
            $newContentObj = pageManagementUtils.createCloneObject(contentType, counter);
            //Attach done event
@@ -622,9 +622,9 @@ var pageManagementUtils = {
        		//create cloned content container
            pageManagementUtils.createClonedContentContainer($newContentObj, counter, contentTypeLabel, labelText);
            //previously increased by 10, just increasing by 1 here
-           pageManagementUtils.counter++;  
+           pageManagementUtils.counter++;
            return $newContentObj;
-    }, 
+    },
     //To actually generate the content for existing values
     generateExistingContentSections:function() {
     	if(pageManagementUtils.menuAction == "Edit") {
@@ -644,7 +644,7 @@ var pageManagementUtils = {
 	    				//Get the Label for the URI
 	    				var contentType = pageManagementUtils.dataGetterURIToLabel[dataGetterClass];
 	    				var contentTypeForCloning = pageManagementUtils.processDataGetterUtils.getContentTypeForCloning(contentType);
-	    				//Get the processor class for this type 
+	    				//Get the processor class for this type
 	    				var dataGetterProcessorObject = pageManagementUtils.processDataGetterUtils.dataGetterProcessorMap[contentType];
 	    				var contentTypeLabel = dataGetterProcessorObject.retrieveContentLabel();
 	    				var additionalLabelText = dataGetterProcessorObject.retrieveAdditionalLabelText(JSONContentObject);
@@ -662,9 +662,9 @@ var pageManagementUtils = {
 	    				//error condition
 	    			}
     			}
-    			
+
     		}
-    		
+
     	}
     },
     //What's the label of the content type from the drop down
@@ -681,7 +681,7 @@ var pageManagementUtils = {
     		$("<input type='hidden' name='URI' value='" + uri + "'>").appendTo($newContentObj);
     	}
     },
-    
+
     //Adjust save button height
     adjustSaveButtonHeight:function() {
         if ( $("div#leftSide").css("height") != undefined ) {
@@ -693,7 +693,7 @@ var pageManagementUtils = {
     },
     /***Class group selection***/
     //Copied from menu management edit javascript
-  //Class group 
+  //Class group
     resetClassGroupSection:function() {
     	//doing this in clear inputs instead which will be triggered
     	//every time content type is changed AS well as on  more content button after
@@ -701,7 +701,7 @@ var pageManagementUtils = {
     	//$('select#selectClassGroup option').eq(0).prop('selected', 'selected');
     	 pageManagementUtils.classesForClassGroup.addClass('hidden');
     },
-    chooseClassGroup: function() {        
+    chooseClassGroup: function() {
         var url = "dataservice?getVClassesForVClassGroup=1&classgroupUri=";
         var vclassUri = this.selectClassGroupDropdown.val();
         url += encodeURIComponent(vclassUri);
@@ -714,45 +714,45 @@ var pageManagementUtils = {
     },
     displayClassesForClassGroup:function(results) {
         if ( results.classes.length == 0 ) {
-            
+
         } else {
             //update existing content type with correct class group name and hide class group select again
         //   pageManagementUtils.hideClassGroups();
-    
+
             pageManagementUtils.selectedGroupForPage.html(results.classGroupName);
             //update content type in message to "display x within my institution"
             //SPECIFIC TO VIVO: So include in internal CLASS section instead
             pageManagementUtils.updateInternalClassMessage(results.classGroupName);
             //retrieve classes for class group and display with all selected
             var selectedClassesList =  pageManagementUtils.classesForClassGroup.children('ul#selectedClasses');
-            
+
             selectedClassesList.empty();
             selectedClassesList.append('<li class="ui-state-default"> <input type="checkbox" name="allSelected" id="allSelected" value="all" checked="checked" /> <label class="inline" for="All"> ' + pageManagementUtils.allCapitalized + '</label> </li>');
-            
+
             $.each(results.classes, function(i, item) {
                 var thisClass = results.classes[i];
                 var thisClassName = thisClass.name;
                 //For the class group, ALL classes should be selected
-                appendHtml = ' <li class="ui-state-default">' + 
-                        '<input type="checkbox" checked="checked" name="classInClassGroup" value="' + thisClass.URI + '" />' +  
-                       '<label class="inline" for="' + thisClassName + '"> ' + thisClassName + '</label>' + 
+                appendHtml = ' <li class="ui-state-default">' +
+                        '<input type="checkbox" checked="checked" name="classInClassGroup" value="' + thisClass.URI + '" />' +
+                       '<label class="inline" for="' + thisClassName + '"> ' + thisClassName + '</label>' +
                         '</li>';
                 selectedClassesList.append(appendHtml);
             });
             pageManagementUtils.toggleClassSelection();
-            
-            
+
+
             //From NEW code
             if (pageManagementUtils.selectClassGroupDropdown.val() == "" ) {
           	  pageManagementUtils.classesForClassGroup.addClass('hidden');
 	            $("div#leftSide").css("height","");
-	            
+
 	  	        }
 	  	     else {
 	  	    	 	pageManagementUtils.classesForClassGroup.removeClass('hidden');
 	  	            if ( $("div#leftSide").height() < $("div#rightSide").height() ) {
 	  	                $("div#leftSide").css("height",$("div#rightSide").height() + "px");
-	  	            }          
+	  	            }
 	  	     }
         }
     },
@@ -776,11 +776,11 @@ var pageManagementUtils = {
             $(this).closest("ul").find('input:checkbox[name=allSelected]').prop('checked', null);
         });
     }, //This is SPECIFIC to VIVO so should be moved there
-    updateInternalClassMessage:function(classGroupName) { //User has changed content type 
+    updateInternalClassMessage:function(classGroupName) { //User has changed content type
         //Set content type within internal class message
         this.displayInternalMessage.filter(":first").html(classGroupName);
     },
-    
+
     /**On submission**/
     //On submission, generates the content for the input that will return the serialized JSON objects representing
     //each of the content types
@@ -831,13 +831,13 @@ var pageManagementUtils = {
 				//ERROR handling
 		    	alert(pageManagementUtils.mapProcessorError);
 				return null;
-			} 
+			}
 		}
     	alert(pageManagementUtils.codeProcessingError);
     	//Error handling here
     	return null;
     },
-  
+
     //Get the data getter processor
     getDataGetterProcessorObject:function(pageContentSection) {
     	var dataGetterType = pageManagementUtils.processDataGetterUtils.selectDataGetterType(pageContentSection);
@@ -856,7 +856,7 @@ var pageManagementUtils = {
     handleRemoveBrowseClassGroupPageContent:function() {
     	if(pageManagementUtils.contentTypeSelect.find("option[value='browseClassGroup']").length == 0) {
 	    	//if removed, add browse class group back
-	    	var classGroupOption = '<option value="browseClassGroup">Browse Class Group</option>';           
+	    	var classGroupOption = '<option value="browseClassGroup">Browse Class Group</option>';
 	    	pageManagementUtils.contentTypeSelect.find('option:eq(0)').after(classGroupOption);
     	}
     },
@@ -871,28 +871,28 @@ var pageManagementUtils = {
     /***Validation***/
     validateMenuItemForm: function() {
         var validationError = "";
-        
+
         // Check menu name
         if ($('input[type=text][name=pageName]').val() == "") {
             validationError += pageManagementUtils.supplyName + "<br />";
             }
-        // Check pretty url     
+        // Check pretty url
         if ($('input[type=text][name=prettyUrl]').val() == "") {
             validationError += pageManagementUtils.supplyPrettyUrl + "<br />";
         }
         if ($('input[type=text][name=prettyUrl]').val().charAt(0) != "/") {
             validationError += pageManagementUtils.startUrlWithSlash + "<br />";
         }
-        
+
         // Check custom template and self contained template
         var selectedTemplateValue = $('input:radio[name=selectedTemplate]:checked').val();
         if (selectedTemplateValue == "custom" || selectedTemplateValue == "selfContained") {
             if ($('input[name=customTemplate]').val() == "") {
-                validationError += pageManagementUtils.supplyTemplate + "<br />"; 
+                validationError += pageManagementUtils.supplyTemplate + "<br />";
             }
         }
-        
-       
+
+
         return validationError;
     },
     //Validation across different content types
@@ -937,27 +937,27 @@ var pageManagementUtils = {
             $("input[name='selfContainedTemplate']").val($("input[name='customTemplate']").val());
         }
     },
-    
+
     setUsesSelfContainedTemplateInput:function() {
     	//On form submission attach hidden input to form if the custom template selection is picked
         if ( pageManagementUtils.isSelfContainedTemplateChecked() ) {
         	$("<input name='isSelfContainedTemplate' value='true'>").appendTo($("form"));
         }
     },
-    
+
     //If any content is defined, keep the selContained radio button hidden
     checkSelfContainedRadio:function() {
         if ( pageManagementUtils.savedContentDivs.html().length == 0 ) {
             $('div#selfContainedDiv').show();
         }
-        
+
     },
     isSelfContainedTemplateChecked:function() {
     	return pageManagementUtils.selfContainedTemplateRadio.is(':checked');
     }
 
 }
-    
+
 $(document).ready(function() {
    pageManagementUtils.onLoad();
 });
diff --git a/webapp/src/main/webapp/js/menupage/processClassGroupDataGetterContent.js b/webapp/src/main/webapp/js/menupage/processClassGroupDataGetterContent.js
index 38bb7c13a..b4adc2a3d 100644
--- a/webapp/src/main/webapp/js/menupage/processClassGroupDataGetterContent.js
+++ b/webapp/src/main/webapp/js/menupage/processClassGroupDataGetterContent.js
@@ -9,16 +9,16 @@ var processClassGroupDataGetterContent = {
 	initProcessor:function(dataGetterClassInput) {
 		this.dataGetterClass = dataGetterClassInput;
 	},
-	
+
 	//Do we need a separate content type for each of the others?
 	processPageContentSection:function(pageContentSection) {
-		//Will look at classes etc. 
+		//Will look at classes etc.
 		var classGroup = pageContentSection.find("select[name='selectClassGroup']").val();
 		//query model should also be an input, ensure class group URI is saved as URI and not string
 		var returnObject = {classGroup:classGroup, dataGetterClass:this.dataGetterClass};
 		return returnObject;
 	},
-	//For an existing set of content where form is already set, fill in the values 
+	//For an existing set of content where form is already set, fill in the values
 	populatePageContentSection:function(existingContentObject, pageContentSection) {
 		var classGroupValue = existingContentObject["classGroup"];
 		pageContentSection.find("select[name='selectClassGroup']").val(classGroupValue);
@@ -52,29 +52,29 @@ var processClassGroupDataGetterContent = {
 	//Page content section specific methods
 	displayClassesForClassGroup:function(results, pageContentSection) {
         if ( results.classes.length == 0 ) {
-            
+
         } else {
            var contentNumber = pageContentSection.attr("contentNumber");
         	var classesForClassGroup = pageContentSection.find('section[name="classesInSelectedGroup"]');
-        	
+
             //retrieve classes for class group and display with all selected
             var selectedClassesList = classesForClassGroup.children('ul[name="selectedClasses"]');
-            
+
             selectedClassesList.empty();
             var newId = "allSelected" + contentNumber;
             selectedClassesList.append('<li class="ui-state-default"> <input type="checkbox" name="allSelected" id="' + contentNumber + '" value="all" checked="checked" /> <label class="inline" for="All"> ' + i18nStringsBrowseGroups.allCapitalized + '</label> </li>');
-            
+
             $.each(results.classes, function(i, item) {
                 var thisClass = results.classes[i];
                 var thisClassName = thisClass.name;
                 //For the class group, ALL classes should be selected
-                appendHtml = ' <li class="ui-state-default">' + 
-                        '<input type="checkbox" checked="checked" name="classInClassGroup" value="' + thisClass.URI + '" />' +  
-                       '<label class="inline" for="' + thisClassName + '"> ' + thisClassName + '</label>' + 
+                appendHtml = ' <li class="ui-state-default">' +
+                        '<input type="checkbox" checked="checked" name="classInClassGroup" value="' + thisClass.URI + '" />' +
+                       '<label class="inline" for="' + thisClassName + '"> ' + thisClassName + '</label>' +
                         '</li>';
                 selectedClassesList.append(appendHtml);
             });
-            
+
             //Need a way of handling this without it being in the internal class data getter
             var displayInternalMessage = pageContentSection.find('label[for="display-internalClass"] em');
             if(displayInternalMessage != null) {
@@ -84,8 +84,8 @@ var processClassGroupDataGetterContent = {
     	 	classesForClassGroup.removeClass('hidden');
             if ( $("div#leftSide").height() < $("div#rightSide").height() ) {
                 $("div#leftSide").css("height",$("div#rightSide").height() + "px");
-            }          
-	  	     
+            }
+
         }
     },
 	//Toggle class selection already deals with names but want to attach that event
@@ -118,7 +118,7 @@ var processClassGroupDataGetterContent = {
              processClassGroupDataGetterContent.chooseClassGroup(pageContentSection);
          });
     },
-    chooseClassGroup: function(pageContentSection) {        
+    chooseClassGroup: function(pageContentSection) {
     	var selectClassGroupDropdown =  pageContentSection.find("select[name='selectClassGroup']");
         var url = "dataservice?getVClassesForVClassGroup=1&classgroupUri=";
         var vclassUri = selectClassGroupDropdown.val();
@@ -131,11 +131,11 @@ var processClassGroupDataGetterContent = {
         	processClassGroupDataGetterContent.displayClassesForClassGroup(results, pageContentSection);
         });
     },
-    //Validation on form submit: Check to see that class group has been selected 
+    //Validation on form submit: Check to see that class group has been selected
     validateFormSubmission: function(pageContentSection, pageContentSectionLabel) {
     	var validationError = "";
     	 if (pageContentSection.find('select[name="selectClassGroup"]').val() =='-1') {
-             validationError += pageContentSectionLabel + ": " + i18nStringsBrowseGroups.supplyClassGroup + " <br />"; 
+             validationError += pageContentSectionLabel + ": " + i18nStringsBrowseGroups.supplyClassGroup + " <br />";
          } else {
              //class group has been selected, make sure there is at least one class selected
              var allSelected = pageContentSection.find('input[name="allSelected"]:checked').length;
@@ -147,7 +147,7 @@ var processClassGroupDataGetterContent = {
          }
     	 return validationError;
     }
-	   
-		
-		
-} 
\ No newline at end of file
+
+
+
+}
diff --git a/webapp/src/main/webapp/js/menupage/processDataGetterUtils.js b/webapp/src/main/webapp/js/menupage/processDataGetterUtils.js
index f1222211f..663948041 100644
--- a/webapp/src/main/webapp/js/menupage/processDataGetterUtils.js
+++ b/webapp/src/main/webapp/js/menupage/processDataGetterUtils.js
@@ -6,8 +6,8 @@
 
 //This will need to be overridden or extended, what have you.. in VIVO
 var processDataGetterUtils = {
-		dataGetterProcessorMap:{"browseClassGroup": processClassGroupDataGetterContent, 
-								"sparqlQuery": processSparqlDataGetterContent, 
+		dataGetterProcessorMap:{"browseClassGroup": processClassGroupDataGetterContent,
+								"sparqlQuery": processSparqlDataGetterContent,
 								"fixedHtml":processFixedHTMLDataGetterContent,
 								"individualsForClasses":processIndividualsForClassesDataGetterContent,
 								"searchIndividuals":processSearchDataGetterContent},
@@ -23,8 +23,8 @@ var processDataGetterUtils = {
 				if(allClassesSelected.length == 0) {
 					contentType = "individualsForClasses";
 				}
-			} 
-			
+			}
+
 			return contentType;
 	    },
 	    isRelatedToBrowseClassGroup:function(contentType) {
@@ -33,7 +33,7 @@ var processDataGetterUtils = {
 	    getContentTypeForCloning:function(contentType) {
 	    	if(contentType == "browseClassGroup" || contentType == "individualsForClasses") {
 	    		return "browseClassGroup";
-	    	} 
+	    	}
 	    	return contentType;
 	    }
-};
\ No newline at end of file
+};
diff --git a/webapp/src/main/webapp/js/menupage/processFixedHTMLDataGetterContent.js b/webapp/src/main/webapp/js/menupage/processFixedHTMLDataGetterContent.js
index c4eb11ea2..f261417c4 100644
--- a/webapp/src/main/webapp/js/menupage/processFixedHTMLDataGetterContent.js
+++ b/webapp/src/main/webapp/js/menupage/processFixedHTMLDataGetterContent.js
@@ -12,14 +12,14 @@ var processFixedHTMLDataGetterContent = {
 	processPageContentSection:function(pageContentSection) {
 		var saveToVarValue = pageContentSection.find("input[name='saveToVar']").val();
 		var htmlValue = pageContentSection.find("textarea[name='htmlValue']").val();
-	    //JSON parsing on the server side does not handle single quotes, as it appears it thinks the string has 
+	    //JSON parsing on the server side does not handle single quotes, as it appears it thinks the string has
 	    //ended.  Different data getter types may handle apostrophes/single quotes differently
 		//In this case, this is HTML so it simply html Encodes any apostrophes
 		htmlValue = processFixedHTMLDataGetterContent.encodeQuotes(htmlValue);
 		var returnObject = {saveToVar:saveToVarValue, htmlValue:htmlValue, dataGetterClass:this.dataGetterClass};
 		return returnObject;
 	},
-	//For an existing set of content where form is already set, fill in the values 
+	//For an existing set of content where form is already set, fill in the values
 	populatePageContentSection:function(existingContentObject, pageContentSection) {
 		var saveToVarValue = existingContentObject["saveToVar"];
 		var htmlValue = existingContentObject["htmlValue"];
@@ -38,7 +38,7 @@ var processFixedHTMLDataGetterContent = {
 		var saveToVarValue = existingContentObject["saveToVar"];
 		return saveToVarValue;
 	},
-    //Validation on form submit: Check to see that class group has been selected 
+    //Validation on form submit: Check to see that class group has been selected
     validateFormSubmission: function(pageContentSection, pageContentSectionLabel) {
     	var validationError = "";
     	//Check that query and saveToVar have been input
@@ -72,6 +72,6 @@ var processFixedHTMLDataGetterContent = {
     replaceEncodedWithEscapedQuotes: function(inputStr) {
     	return inputStr.replace(/&#39;/g, "\'").replace(/&quot;/g, "\"");
     }
-		
-		
-}
\ No newline at end of file
+
+
+}
diff --git a/webapp/src/main/webapp/js/menupage/processIndividualsForClassesDataGetterContent.js b/webapp/src/main/webapp/js/menupage/processIndividualsForClassesDataGetterContent.js
index 09c0ea7b8..e3b1a5153 100644
--- a/webapp/src/main/webapp/js/menupage/processIndividualsForClassesDataGetterContent.js
+++ b/webapp/src/main/webapp/js/menupage/processIndividualsForClassesDataGetterContent.js
@@ -8,7 +8,7 @@ var processIndividualsForClassesDataGetterContent = {
 	},
 	//Do we need a separate content type for each of the others?
 	processPageContentSection:function(pageContentSection) {
-		//Will look at classes etc. 
+		//Will look at classes etc.
 		var classGroup = pageContentSection.find("select[name='selectClassGroup']").val();
 		//query model should also be an input
 		//Get classes selected
@@ -24,7 +24,7 @@ var processIndividualsForClassesDataGetterContent = {
 	retrieveContentLabel:function() {
 		return processClassGroupDataGetterContent.retrieveContentLabel();
 	},
-	//For an existing set of content where form is already set, fill in the values 
+	//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);
@@ -38,7 +38,7 @@ var processIndividualsForClassesDataGetterContent = {
 			pageContentSection.find("input[name='classInClassGroup'][value='" + classSelected + "']").prop("checked", "checked");
 		}
 		//If number of classes selected is not equal to total number of classes, uncheck all
-		
+
 		var results =existingContentObject["results"];
 		if(results != null && results.classGroupName != null) {
 	    	var resultsClasses = results["classes"];
@@ -54,9 +54,9 @@ var processIndividualsForClassesDataGetterContent = {
 	retrieveAdditionalLabelText:function(existingContentObject) {
 		return processClassGroupDataGetterContent.retrieveAdditionalLabelText(existingContentObject);
 	},
-	 //Validation on form submit: Check to see that class group has been selected 
+	 //Validation on form submit: Check to see that class group has been selected
     validateFormSubmission: function(pageContentSection, pageContentSectionLabel) {
     	return processClassGroupDataGetterContent.validateFormSubmission(pageContentSection, pageContentSectionLabel);
     }
-		
-}
\ No newline at end of file
+
+}
diff --git a/webapp/src/main/webapp/js/menupage/processSearchDataGetterContent.js b/webapp/src/main/webapp/js/menupage/processSearchDataGetterContent.js
index 09152ee8c..e1606f90f 100644
--- a/webapp/src/main/webapp/js/menupage/processSearchDataGetterContent.js
+++ b/webapp/src/main/webapp/js/menupage/processSearchDataGetterContent.js
@@ -8,31 +8,31 @@ var processSearchDataGetterContent = {
 	//can use this if expect to initialize from elsewhere
 	initProcessor:function(dataGetterClass) {
 		this.dataGetterClass =dataGetterClass;
-		
+
 	},
-	
+
 	processPageContentSection:function(pageContentSection) {
-		
+
 		var variableValue = pageContentSection.find("input[name='saveToVar']").val();
 		var vclassUriValue = pageContentSection.find("select[name='vclassUri']").val();
-		
+
 
 		//query model should also be an input
 		//set query model to query model here - vitro:contentDisplayModel
 		var returnObject = {saveToVar:variableValue, vclassUri:vclassUriValue, dataGetterClass:this.dataGetterClass};
 		return returnObject;
 	},
-	//For an existing set of content where form is already set, fill in the values 
+	//For an existing set of content where form is already set, fill in the values
 	populatePageContentSection:function(existingContentObject, pageContentSection) {
 		var saveToVarValue = existingContentObject["saveToVar"];
 		var vclassUriValue = existingContentObject["vclassUri"];
-		
-		
+
+
 		//Now find and set value
 		pageContentSection.find("input[name='saveToVar']").val(saveToVarValue);
 		//set value of query
 		pageContentSection.find("select[name='vclassUri']").val(vclassUriValue);
-		
+
 	},
 	//For the label of the content section for editing, need to add additional value
 	retrieveContentLabel:function() {
@@ -43,7 +43,7 @@ var processSearchDataGetterContent = {
 		var saveToVarValue = existingContentObject["saveToVar"];
 		return saveToVarValue;
 	},
-    //Validation on form submit: Check to see that class group has been selected 
+    //Validation on form submit: Check to see that class group has been selected
     validateFormSubmission: function(pageContentSection, pageContentSectionLabel) {
     	var validationError = "";
     	//Check that vclassuri and saveToVar have been input
@@ -57,9 +57,9 @@ var processSearchDataGetterContent = {
     	if(processSearchDataGetterContent.stringHasDoubleQuote(variableValue)) {
     		validationError += pageContentSectionLabel + ": " + i18nStringsSearchIndividuals.noDoubleQuotes + " <br />";
     	}
-    	
+
     	//validation for search individuals
-    	
+
 		var vclassUriValue = pageContentSection.find("select[name='vclassUri']").val();
 		if(vclassUriValue == "") {
 			validationError += pageContentSectionLabel + ": " + i18nStringsSearchIndividuals.selectClass + " <br />";
@@ -81,6 +81,6 @@ var processSearchDataGetterContent = {
 
     	return inputStr.replace(/&#39;/g, "\'").replace(/&quot;/g, "\"");
     }
-		
-		
-};
\ No newline at end of file
+
+
+};
diff --git a/webapp/src/main/webapp/js/menupage/processSparqlDataGetterContent.js b/webapp/src/main/webapp/js/menupage/processSparqlDataGetterContent.js
index 41156152b..baf460776 100644
--- a/webapp/src/main/webapp/js/menupage/processSparqlDataGetterContent.js
+++ b/webapp/src/main/webapp/js/menupage/processSparqlDataGetterContent.js
@@ -10,7 +10,7 @@ var processSparqlDataGetterContent = {
 		this.dataGetterClass =dataGetterClass;
 	},
 	processPageContentSection:function(pageContentSection) {
-		
+
 		var variableValue = pageContentSection.find("input[name='saveToVar']").val();
 		var queryValue = pageContentSection.find("textarea[name='query']").val();
 		queryValue = processSparqlDataGetterContent.encodeQuotes(queryValue);
@@ -21,15 +21,15 @@ var processSparqlDataGetterContent = {
 		var returnObject = {saveToVar:variableValue, query:queryValue, dataGetterClass:this.dataGetterClass, queryModel:queryModel};
 		return returnObject;
 	},
-	//For an existing set of content where form is already set, fill in the values 
+	//For an existing set of content where form is already set, fill in the values
 	populatePageContentSection:function(existingContentObject, pageContentSection) {
 		var saveToVarValue = existingContentObject["saveToVar"];
 		var queryValue = existingContentObject["query"];
 		//replace any encoded quotes with escaped quotes that will show up as quotes in the textarea
 		queryValue = processSparqlDataGetterContent.replaceEncodedWithEscapedQuotes(queryValue);
 		var queryModelValue = existingContentObject["queryModel"];
-		
-		
+
+
 		//Now find and set value
 		pageContentSection.find("input[name='saveToVar']").val(saveToVarValue);
 		pageContentSection.find("textarea[name='query']").val(queryValue);
@@ -44,7 +44,7 @@ var processSparqlDataGetterContent = {
 		var saveToVarValue = existingContentObject["saveToVar"];
 		return saveToVarValue;
 	},
-    //Validation on form submit: Check to see that class group has been selected 
+    //Validation on form submit: Check to see that class group has been selected
     validateFormSubmission: function(pageContentSection, pageContentSectionLabel) {
     	var validationError = "";
     	//Check that query and saveToVar have been input
@@ -68,9 +68,9 @@ var processSparqlDataGetterContent = {
     	}
     	if(processSparqlDataGetterContent.stringHasDoubleQuote(queryModelValue)) {
     		validationError += pageContentSectionLabel + ": The query model should not have a double quote . <br />";
-	
+
     	}*/
-    	
+
 		var queryValue = pageContentSection.find("textarea[name='query']").val();
 		if(queryValue == "") {
 			validationError += pageContentSectionLabel + ": " + i18nStringsSparqlQuery.supplyQuery + " <br />";
@@ -92,6 +92,6 @@ var processSparqlDataGetterContent = {
 
     	return inputStr.replace(/&#39;/g, "\'").replace(/&quot;/g, "\"");
     }
-		
-		
-};
\ No newline at end of file
+
+
+};
diff --git a/webapp/src/main/webapp/js/openSocial/orng.js b/webapp/src/main/webapp/js/openSocial/orng.js
index 3bcc7ab81..146ac2d43 100644
--- a/webapp/src/main/webapp/js/openSocial/orng.js
+++ b/webapp/src/main/webapp/js/openSocial/orng.js
@@ -3,16 +3,16 @@
 /*
     ORNG Shindig Helper functions for gadget-to-container commands
  */
- 
+
  // dummy function so google analytics does not break for institutions who do not use it
- 
+
 _gaq = {};
-_gaq.push = function(data) {    // 
+_gaq.push = function(data) {    //
  };
 
 // pubsub
 gadgets.pubsubrouter.init(function(id) {
-    return my.gadgets[shindig.container.gadgetService.getGadgetIdFromModuleId(id)].url; 
+    return my.gadgets[shindig.container.gadgetService.getGadgetIdFromModuleId(id)].url;
   }, {
     onSubscribe: function(sender, channel) {
       setTimeout("my.onSubscribe('" + sender + "', '" + channel + "')", 3000);
@@ -26,14 +26,14 @@ gadgets.pubsubrouter.init(function(id) {
     },
     onPublish: function(sender, channel, message) {
       // return true to reject the request.
-      
+
       // track with google analytics
       if (sender != '..' ) {
           var moduleId = shindig.container.gadgetService.getGadgetIdFromModuleId(sender);
       }
-      
+
       if (channel == 'VISIBLE') {
-	      var statusId = document.getElementById(sender + '_status');	      
+	      var statusId = document.getElementById(sender + '_status');
           if (statusId) {
             // only act on these in HOME view since they are only  meant to be seen when viewer=owner
             if (my.gadgets[moduleId].view != 'home') {
@@ -71,7 +71,7 @@ gadgets.pubsubrouter.init(function(id) {
       }
       else if (channel == 'added' && my.gadgets[moduleId].view == 'home') {
           if (message == 'Y') {
-            _gaq.push(['_trackEvent', my.gadgets[moduleId].name, 'SHOW', 'profile_edit_view']);    
+            _gaq.push(['_trackEvent', my.gadgets[moduleId].name, 'SHOW', 'profile_edit_view']);
             // find out whose page we are on, if any
         	var userId = gadgets.util.getUrlParameters()['uri'] || document.URL.replace('/display/', '/individual/');
             osapi.activities.create(
@@ -81,12 +81,12 @@ gadgets.pubsubrouter.init(function(id) {
 		    }).execute(function(response){});
 		  }
 		  else {
-            _gaq.push(['_trackEvent', my.gadgets[moduleId].name, 'HIDE', 'profile_edit_view']);    
+            _gaq.push(['_trackEvent', my.gadgets[moduleId].name, 'HIDE', 'profile_edit_view']);
 		  }
       }
       else if (channel == 'status') {
           // message should be of the form 'COLOR:Message Content'
-	      var statusId = document.getElementById(sender + '_status');	      
+	      var statusId = document.getElementById(sender + '_status');
           if (statusId) {
             var messageSplit = message.split(':');
             if (messageSplit.length == 2) {
@@ -100,22 +100,22 @@ gadgets.pubsubrouter.init(function(id) {
       }
       else if (channel == 'analytics') {
           // publish to google analytics
-          // message should be JSON encoding object with required action and optional label and value 
+          // message should be JSON encoding object with required action and optional label and value
           // as documented here: http://code.google.com/apis/analytics/docs/tracking/eventTrackerGuide.html
           // note that event category will be set to the gadget name automatically by this code
-          // Note: message will be already converted to an object 
+          // Note: message will be already converted to an object
           if (message.hasOwnProperty('value')) {
-            _gaq.push(['_trackEvent', my.gadgets[moduleId].name, message.action, message.label, message.value]);    
+            _gaq.push(['_trackEvent', my.gadgets[moduleId].name, message.action, message.label, message.value]);
           }
           else if (message.hasOwnProperty('label')) {
-            _gaq.push(['_trackEvent', my.gadgets[moduleId].name, message.action, message.label]);    
+            _gaq.push(['_trackEvent', my.gadgets[moduleId].name, message.action, message.label]);
           }
           else {
-            _gaq.push(['_trackEvent', my.gadgets[moduleId].name, message.action]);    
+            _gaq.push(['_trackEvent', my.gadgets[moduleId].name, message.action]);
           }
       }
       else if (channel == 'profile') {
-          _gaq.push(['_trackEvent', my.gadgets[moduleId].name, 'go_to_profile', message]);    
+          _gaq.push(['_trackEvent', my.gadgets[moduleId].name, 'go_to_profile', message]);
           document.location.href = '/' + location.pathname.split('/')[1] + '/display/n' + message;
 	  }
       else if (channel == 'hide') {
@@ -141,7 +141,7 @@ my.findGadgetsAttachingTo = function(chromeId) {
     }
     return retval;
 };
-    
+
 my.removeGadgets = function(gadgetsToRemove) {
     for (var i = 0; i < gadgetsToRemove.length; i++) {
         for (var j = 0; j < my.gadgets.length; j++) {
@@ -153,7 +153,7 @@ my.removeGadgets = function(gadgetsToRemove) {
     }
 };
 
-my.onSubscribe = function(sender, channel) {     
+my.onSubscribe = function(sender, channel) {
      // lookup pubsub data based on channel and if a match is found, publish the data to that channel after a delay
      if (my.pubsubData[channel]) {
         gadgets.pubsubrouter.publish(channel, my.pubsubData[channel]);
@@ -178,12 +178,12 @@ my.removeParameterFromURL = function(url, parameter) {
 };
 
  // publish the people
-my.CallSuccess = function(result) {    
+my.CallSuccess = function(result) {
      gadgets.pubsubrouter.publish('person', result);
 };
- 
+
  // alert message on some failure
-my.CallFailed = function(error) {    
+my.CallFailed = function(error) {
      alert(error.get_message());
 };
 
@@ -204,7 +204,7 @@ my.requestGadgetMetaData = function(view, opt_callback) {
       if (my.gadgets[moduleId].view == view) {
 	    request.gadgets[request.gadgets.length] = {'url': my.gadgets[moduleId].url, 'moduleId': moduleId};
 	  }
-    }    
+    }
 
     var makeRequestParams = {
       "CONTENT_TYPE" : "JSON",
@@ -242,9 +242,9 @@ my.generateGadgets = function (metadata) {
             'title': metadata.gadgets[i].title, 'userPrefs': metadata.gadgets[i].userPrefs,
             'height': height, 'width': width, 'debug': my.debug};
 
-        // do a shallow merge of the opt_params from the database.  This will overwrite anything with the same name, and we like that 
+        // do a shallow merge of the opt_params from the database.  This will overwrite anything with the same name, and we like that
         for (var attrname in my.gadgets[moduleId].opt_params) {
-            opt_params[attrname] = my.gadgets[moduleId].opt_params[attrname]; 
+            opt_params[attrname] = my.gadgets[moduleId].opt_params[attrname];
         }
 
         my.renderableGadgets[moduleId] = shindig.container.createGadget(opt_params);
@@ -271,7 +271,7 @@ my.init = function() {
 	shindig.container = new ORNGContainer();
 
 	shindig.container.gadgetService = new ORNGGadgetService();
-	shindig.container.layoutManager = new ORNGLayoutManager();    
+	shindig.container.layoutManager = new ORNGLayoutManager();
 
 	shindig.container.setNoCache(my.noCache);
 
@@ -306,7 +306,7 @@ ORNGContainer.prototype.createGadget = function (opt_params) {
     }
 }
 
-//ORNGLayoutManager. 
+//ORNGLayoutManager.
 ORNGLayoutManager = function() {
 	shindig.LayoutManager.call(this);
 };
@@ -337,9 +337,9 @@ ORNGGadgetService.prototype.setTitle = function (title) {
     if (my.gadgets[moduleId].view == 'canvas') {
         ORNGGadgetService.setCanvasTitle(title);
     }
-    else {    	
+    else {
     	var element = document.getElementById(this.f + '_title');
-       	element.innerHTML = my.renderableGadgets[moduleId].getTitleHtml(title); 
+       	element.innerHTML = my.renderableGadgets[moduleId].getTitleHtml(title);
     }
 };
 
@@ -352,15 +352,15 @@ ORNGGadgetService.prototype.requestNavigateTo = function(view, opt_params) {
     var url = urlTemplate || 'OpenSocial.aspx?';
 
     url += window.location.search.substring(1);
-    
+
     // remove appId if present
     url = my.removeParameterFromURL(url, 'appId');
-    
+
     // Add appId if the URL Template begins with the word 'Gadget'
     if (urlTemplate.indexOf('Gadget') == 0) {
         var moduleId = shindig.container.gadgetService.getGadgetIdFromModuleId(this.f);
         var appId = my.gadgets[moduleId].appId;
-        url += '&appId=' + appId;    
+        url += '&appId=' + appId;
     }
 
 	if (opt_params) {
@@ -434,10 +434,10 @@ ORNGGadget.prototype.getTitleBarContent = function(continuation) {
 	    continuation(
 	      '<div id="' + this.cssClassTitleBar + '-' + this.id +
 	      '" class="' + this.cssClassTitleBar + '"><span class="' +
-	      this.cssClassTitleButtonBar + '">' + 
+	      this.cssClassTitleButtonBar + '">' +
 	      '</span> <span id="' +
-	      this.getIframeId() + '_title" class="' + this.cssClassTitle + '">' + 
-	      this.getTitleHtml(this.title) + '</span><span id="' + 
+	      this.getIframeId() + '_title" class="' + this.cssClassTitle + '">' +
+	      this.getTitleHtml(this.title) + '</span><span id="' +
 		  this.getIframeId() + '_status" class="gadgets-gadget-status"></span></div>');
 	  }
 };
@@ -481,7 +481,7 @@ ORNGToggleGadget.prototype.handleToggle = function (track) {
 
             if (my.gadgets[this.id].view == 'home') {
                 if (track) {
-                    // record in google analytics     
+                    // record in google analytics
                     _gaq.push(['_trackEvent', my.gadgets[this.id].name,
 						'OPEN_IN_EDIT', 'profile_edit_view']);
                 }
@@ -504,7 +504,7 @@ ORNGToggleGadget.prototype.handleToggle = function (track) {
 									});
                 }
                 if (track) {
-                    // record in google analytics     
+                    // record in google analytics
                     _gaq.push(['_trackEvent', my.gadgets[this.id].name, 'OPEN']);
                 }
             }
@@ -518,11 +518,11 @@ ORNGToggleGadget.prototype.handleToggle = function (track) {
             gadgetImg.src = '/' + location.pathname.split('/')[1] + '/themes/wilma/images/green_plus_sign.gif'
             if (track) {
                 if (my.gadgets[this.id].view == 'home') {
-                    // record in google analytics     
+                    // record in google analytics
                     _gaq.push(['_trackEvent', my.gadgets[this.id].name,
 							'CLOSE_IN_EDIT', 'profile_edit_view']);
                 } else {
-                    // record in google analytics     
+                    // record in google analytics
                     _gaq.push(['_trackEvent', my.gadgets[this.id].name, 'CLOSE']);
                 }
             }
@@ -569,7 +569,7 @@ ORNGToggleGadget.prototype.finishRender = function(chrome) {
 	window.frames[this.getIframeId()].location = this.getIframeUrl();
 	if (this.start_closed) {
 		this.handleToggle(false);
-	} 
+	}
 	else if (chrome && this.width) {
 		chrome.style.width = this.width + 'px';
 	}
diff --git a/webapp/src/main/webapp/js/pageDeletion.js b/webapp/src/main/webapp/js/pageDeletion.js
index 2295d616b..df873b89d 100644
--- a/webapp/src/main/webapp/js/pageDeletion.js
+++ b/webapp/src/main/webapp/js/pageDeletion.js
@@ -1,5 +1,5 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
-  
+
 $.extend(this, i18nStrings);
 
 var pageDeletion = {
@@ -7,11 +7,11 @@ var pageDeletion = {
 	onLoad:function(){
 		if (this.disableFormInUnsupportedBrowsers()) {
             return;
-        }   
-		
+        }
+
 	    this.initObjects();
 	    this.bindEventListeners();
-	}, 
+	},
 	initObjects:function() {
 		this.deleteLinks = $("a[cmd='deletePage']");
 	},
@@ -29,9 +29,9 @@ var pageDeletion = {
 			}
 		});
 	},
-	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()) {
@@ -39,8 +39,8 @@ var pageDeletion = {
                 $('.noIE67').hide();
                 return true;
             }
-        }            
-        return false;      
+        }
+        return false;
     }
 };
 
diff --git a/webapp/src/main/webapp/js/raphael/g.bar.js b/webapp/src/main/webapp/js/raphael/g.bar.js
index 293717b25..ce66efeff 100644
--- a/webapp/src/main/webapp/js/raphael/g.bar.js
+++ b/webapp/src/main/webapp/js/raphael/g.bar.js
@@ -46,7 +46,7 @@ Raphael.fn.g.barchart = function (x, y, width, height, values, opts) {
         }
         total = Math.max.apply(Math, opts.stacked ? stacktotal : total);
     }
-    
+
     total = (opts.to) || total;
     var barwidth = width / (len * (100 + gutter) + gutter) * 100,
         barhgutter = barwidth * gutter / 100,
@@ -251,7 +251,7 @@ Raphael.fn.g.hbarchart = function (x, y, width, height, values, opts) {
         }
         total = Math.max.apply(Math, opts.stacked ? stacktotal : total);
     }
-    
+
     total = (opts.to) || total;
     var barheight = Math.floor(height / (len * (100 + gutter) + gutter) * 100),
         bargutter = Math.floor(barheight * gutter / 100),
@@ -402,4 +402,4 @@ Raphael.fn.g.hbarchart = function (x, y, width, height, values, opts) {
     chart.bars = bars;
     chart.covers = covers;
     return chart;
-};
\ No newline at end of file
+};
diff --git a/webapp/src/main/webapp/js/raphael/g.raphael.js b/webapp/src/main/webapp/js/raphael/g.raphael.js
index 1dba1686b..72f00fdcb 100644
--- a/webapp/src/main/webapp/js/raphael/g.raphael.js
+++ b/webapp/src/main/webapp/js/raphael/g.raphael.js
@@ -4,4 +4,4 @@
  * Copyright (c) 2009 Dmitry Baranovskiy (http://g.raphaeljs.com)
  * Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license.
  */
-(function(){var a=Math.max,c=Math.min;Raphael.fn.g=Raphael.fn.g||{};Raphael.fn.g.markers={disc:"disc",o:"disc",flower:"flower",f:"flower",diamond:"diamond",d:"diamond",square:"square",s:"square",triangle:"triangle",t:"triangle",star:"star","*":"star",cross:"cross",x:"cross",plus:"plus","+":"plus",arrow:"arrow","->":"arrow"};Raphael.fn.g.shim={stroke:"none",fill:"#000","fill-opacity":0};Raphael.fn.g.txtattr={font:"12px Arial, sans-serif"};Raphael.fn.g.colors=[];var e=[0.6,0.2,0.05,0.1333,0.75,0];for(var b=0;b<10;b++){if(b<e.length){Raphael.fn.g.colors.push("hsb("+e[b]+", .75, .75)");}else{Raphael.fn.g.colors.push("hsb("+e[b-e.length]+", 1, .5)");}}Raphael.fn.g.text=function(f,h,g){return this.text(f,h,g).attr(this.g.txtattr);};Raphael.fn.g.labelise=function(f,h,g){if(f){return(f+"").replace(/(##+(?:\.#+)?)|(%%+(?:\.%+)?)/g,function(i,k,j){if(k){return(+h).toFixed(k.replace(/^#+\.?/g,"").length);}if(j){return(h*100/g).toFixed(j.replace(/^%+\.?/g,"").length)+"%";}});}else{return(+h).toFixed(0);}};Raphael.fn.g.finger=function(l,k,g,m,h,i,j){if((h&&!m)||(!h&&!g)){return j?"":this.path();}i={square:"square",sharp:"sharp",soft:"soft"}[i]||"round";var o;m=Math.round(m);g=Math.round(g);l=Math.round(l);k=Math.round(k);switch(i){case"round":if(!h){var f=~~(m/2);if(g<f){f=g;o=["M",l+0.5,k+0.5-~~(m/2),"l",0,0,"a",f,~~(m/2),0,0,1,0,m,"l",0,0,"z"];}else{o=["M",l+0.5,k+0.5-f,"l",g-f,0,"a",f,f,0,1,1,0,m,"l",f-g,0,"z"];}}else{f=~~(g/2);if(m<f){f=m;o=["M",l-~~(g/2),k,"l",0,0,"a",~~(g/2),f,0,0,1,g,0,"l",0,0,"z"];}else{o=["M",l-f,k,"l",0,f-m,"a",f,f,0,1,1,g,0,"l",0,m-f,"z"];}}break;case"sharp":if(!h){var n=~~(m/2);o=["M",l,k+n,"l",0,-m,a(g-n,0),0,c(n,g),n,-c(n,g),n+(n*2<m),"z"];}else{n=~~(g/2);o=["M",l+n,k,"l",-g,0,0,-a(m-n,0),n,-c(n,m),n,c(n,m),n,"z"];}break;case"square":if(!h){o=["M",l,k+~~(m/2),"l",0,-m,g,0,0,m,"z"];}else{o=["M",l+~~(g/2),k,"l",1-g,0,0,-m,g-1,0,"z"];}break;case"soft":if(!h){f=c(g,Math.round(m/5));o=["M",l+0.5,k+0.5-~~(m/2),"l",g-f,0,"a",f,f,0,0,1,f,f,"l",0,m-f*2,"a",f,f,0,0,1,-f,f,"l",f-g,0,"z"];}else{f=c(Math.round(g/5),m);o=["M",l-~~(g/2),k,"l",0,f-m,"a",f,f,0,0,1,f,-f,"l",g-2*f,0,"a",f,f,0,0,1,f,f,"l",0,m-f,"z"];}}if(j){return o.join(",");}else{return this.path(o);}};Raphael.fn.g.disc=function(f,h,g){return this.circle(f,h,g);};Raphael.fn.g.line=function(f,h,g){return this.rect(f-g,h-g/5,2*g,2*g/5);};Raphael.fn.g.square=function(f,h,g){g=g*0.7;return this.rect(f-g,h-g,2*g,2*g);};Raphael.fn.g.triangle=function(f,h,g){g*=1.75;return this.path("M".concat(f,",",h,"m0-",g*0.58,"l",g*0.5,",",g*0.87,"-",g,",0z"));};Raphael.fn.g.diamond=function(f,h,g){return this.path(["M",f,h-g,"l",g,g,-g,g,-g,-g,g,-g,"z"]);};Raphael.fn.g.flower=function(j,h,f,g){f=f*1.25;var o=f,m=o*0.5;g=+g<3||!g?5:g;var p=["M",j,h+m,"Q"],l;for(var k=1;k<g*2+1;k++){l=k%2?o:m;p=p.concat([+(j+l*Math.sin(k*Math.PI/g)).toFixed(3),+(h+l*Math.cos(k*Math.PI/g)).toFixed(3)]);}p.push("z");return this.path(p.join(","));};Raphael.fn.g.star=function(f,n,m,h,g){h=h||m*0.382;g=g||5;var l=["M",f,n+h,"L"],k;for(var j=1;j<g*2;j++){k=j%2?m:h;l=l.concat([(f+k*Math.sin(j*Math.PI/g)),(n+k*Math.cos(j*Math.PI/g))]);}l.push("z");return this.path(l.join(","));};Raphael.fn.g.cross=function(f,h,g){g=g/2.5;return this.path("M".concat(f-g,",",h,"l",[-g,-g,g,-g,g,g,g,-g,g,g,-g,g,g,g,-g,g,-g,-g,-g,g,-g,-g,"z"]));};Raphael.fn.g.plus=function(f,h,g){g=g/2;return this.path("M".concat(f-g/2,",",h-g/2,"l",[0,-g,g,0,0,g,g,0,0,g,-g,0,0,g,-g,0,0,-g,-g,0,0,-g,"z"]));};Raphael.fn.g.arrow=function(f,h,g){return this.path("M".concat(f-g*0.7,",",h-g*0.4,"l",[g*0.6,0,0,-g*0.4,g,g*0.8,-g,g*0.8,0,-g*0.4,-g*0.6,0],"z"));};Raphael.fn.g.tag=function(f,m,l,k,i){k=k||0;i=i==null?5:i;l=l==null?"$9.99":l;var h=0.5522*i,g=this.set(),j=3;g.push(this.path().attr({fill:"#000",stroke:"#000"}));g.push(this.text(f,m,l).attr(this.g.txtattr).attr({fill:"#fff","font-family":"Helvetica, Arial"}));g.update=function(){this.rotate(0,f,m);var o=this[1].getBBox();if(o.height>=i*2){this[0].attr({path:["M",f,m+i,"a",i,i,0,1,1,0,-i*2,i,i,0,1,1,0,i*2,"m",0,-i*2-j,"a",i+j,i+j,0,1,0,0,(i+j)*2,"L",f+i+j,m+o.height/2+j,"l",o.width+2*j,0,0,-o.height-2*j,-o.width-2*j,0,"L",f,m-i-j].join(",")});}else{var n=Math.sqrt(Math.pow(i+j,2)-Math.pow(o.height/2+j,2));this[0].attr({path:["M",f,m+i,"c",-h,0,-i,h-i,-i,-i,0,-h,i-h,-i,i,-i,h,0,i,i-h,i,i,0,h,h-i,i,-i,i,"M",f+n,m-o.height/2-j,"a",i+j,i+j,0,1,0,0,o.height+2*j,"l",i+j-n+o.width+2*j,0,0,-o.height-2*j,"L",f+n,m-o.height/2-j].join(",")});}this[1].attr({x:f+i+j+o.width/2,y:m});k=(360-k)%360;this.rotate(k,f,m);k>90&&k<270&&this[1].attr({x:f-i-j-o.width/2,y:m,rotation:[180+k,f,m]});return this;};g.update();return g;};Raphael.fn.g.popupit=function(l,k,m,g,t){g=g==null?2:g;t=t||5;l=Math.round(l);k=Math.round(k);var j=m.getBBox(),n=Math.round(j.width/2),i=Math.round(j.height/2),s=[0,n+t*2,0,-n-t*2],o=[-i*2-t*3,-i-t,0,-i-t],f=["M",l-s[g],k-o[g],"l",-t,(g==2)*-t,-a(n-t,0),0,"a",t,t,0,0,1,-t,-t,"l",0,-a(i-t,0),(g==3)*-t,-t,(g==3)*t,-t,0,-a(i-t,0),"a",t,t,0,0,1,t,-t,"l",a(n-t,0),0,t,!g*-t,t,!g*t,a(n-t,0),0,"a",t,t,0,0,1,t,t,"l",0,a(i-t,0),(g==1)*t,t,(g==1)*-t,t,0,a(i-t,0),"a",t,t,0,0,1,-t,t,"l",-a(n-t,0),0,"z"].join(","),q=[{x:l,y:k+t*2+i},{x:l-t*2-n,y:k},{x:l,y:k-t*2-i},{x:l+t*2+n,y:k}][g];m.translate(q.x-n-j.x,q.y-i-j.y);return this.path(f).attr({fill:"#000",stroke:"none"}).insertBefore(m.node?m:m[0]);};Raphael.fn.g.popup=function(f,l,k,g,i){g=g==null?2:g>3?3:g;i=i||5;k=k||"$9.99";var h=this.set(),j=3;h.push(this.path().attr({fill:"#000",stroke:"#000"}));h.push(this.text(f,l,k).attr(this.g.txtattr).attr({fill:"#fff","font-family":"Helvetica, Arial"}));h.update=function(o,n,q){o=o||f;n=n||l;var t=this[1].getBBox(),u=t.width/2,s=t.height/2,y=[0,u+i*2,0,-u-i*2],v=[-s*2-i*3,-s-i,0,-s-i],m=["M",o-y[g],n-v[g],"l",-i,(g==2)*-i,-a(u-i,0),0,"a",i,i,0,0,1,-i,-i,"l",0,-a(s-i,0),(g==3)*-i,-i,(g==3)*i,-i,0,-a(s-i,0),"a",i,i,0,0,1,i,-i,"l",a(u-i,0),0,i,!g*-i,i,!g*i,a(u-i,0),0,"a",i,i,0,0,1,i,i,"l",0,a(s-i,0),(g==1)*i,i,(g==1)*-i,i,0,a(s-i,0),"a",i,i,0,0,1,-i,i,"l",-a(u-i,0),0,"z"].join(","),x=[{x:o,y:n+i*2+s},{x:o-i*2-u,y:n},{x:o,y:n-i*2-s},{x:o+i*2+u,y:n}][g];x.path=m;if(q){this.animate(x,500,">");}else{this.attr(x);}return this;};return h.update(f,l);};Raphael.fn.g.flag=function(f,k,j,i){i=i||0;j=j||"$9.99";var g=this.set(),h=3;g.push(this.path().attr({fill:"#000",stroke:"#000"}));g.push(this.text(f,k,j).attr(this.g.txtattr).attr({fill:"#fff","font-family":"Helvetica, Arial"}));g.update=function(l,o){this.rotate(0,l,o);var n=this[1].getBBox(),m=n.height/2;this[0].attr({path:["M",l,o,"l",m+h,-m-h,n.width+2*h,0,0,n.height+2*h,-n.width-2*h,0,"z"].join(",")});this[1].attr({x:l+m+h+n.width/2,y:o});i=360-i;this.rotate(i,l,o);i>90&&i<270&&this[1].attr({x:l-r-h-n.width/2,y:o,rotation:[180+i,l,o]});return this;};return g.update(f,k);};Raphael.fn.g.label=function(f,i,h){var g=this.set();g.push(this.rect(f,i,10,10).attr({stroke:"none",fill:"#000"}));g.push(this.text(f,i,h).attr(this.g.txtattr).attr({fill:"#fff"}));g.update=function(){var k=this[1].getBBox(),j=c(k.width+10,k.height+10)/2;this[0].attr({x:k.x-j/2,y:k.y-j/2,width:k.width+j,height:k.height+j,r:j});};g.update();return g;};Raphael.fn.g.labelit=function(h){var g=h.getBBox(),f=c(20,g.width+10,g.height+10)/2;return this.rect(g.x-f/2,g.y-f/2,g.width+f,g.height+f,f).attr({stroke:"none",fill:"#000"}).insertBefore(h.node?h:h[0]);};Raphael.fn.g.drop=function(f,k,j,h,i){h=h||30;i=i||0;var g=this.set();g.push(this.path(["M",f,k,"l",h,0,"A",h*0.4,h*0.4,0,1,0,f+h*0.7,k-h*0.7,"z"]).attr({fill:"#000",stroke:"none",rotation:[22.5-i,f,k]}));i=(i+90)*Math.PI/180;g.push(this.text(f+h*Math.sin(i),k+h*Math.cos(i),j).attr(this.g.txtattr).attr({"font-size":h*12/30,fill:"#fff"}));g.drop=g[0];g.text=g[1];return g;};Raphael.fn.g.blob=function(g,m,l,k,i){k=(+k+1?k:45)+90;i=i||12;var f=Math.PI/180,j=i*12/12;var h=this.set();h.push(this.path().attr({fill:"#000",stroke:"none"}));h.push(this.text(g+i*Math.sin((k)*f),m+i*Math.cos((k)*f)-j/2,l).attr(this.g.txtattr).attr({"font-size":j,fill:"#fff"}));h.update=function(t,s,y){t=t||g;s=s||m;var A=this[1].getBBox(),D=a(A.width+j,i*25/12),z=a(A.height+j,i*25/12),o=t+i*Math.sin((k-22.5)*f),B=s+i*Math.cos((k-22.5)*f),q=t+i*Math.sin((k+22.5)*f),C=s+i*Math.cos((k+22.5)*f),F=(q-o)/2,E=(C-B)/2,p=D/2,n=z/2,x=-Math.sqrt(Math.abs(p*p*n*n-p*p*E*E-n*n*F*F)/(p*p*E*E+n*n*F*F)),v=x*p*E/n+(q+o)/2,u=x*-n*F/p+(C+B)/2;if(y){this.animate({x:v,y:u,path:["M",g,m,"L",q,C,"A",p,n,0,1,1,o,B,"z"].join(",")},500,">");}else{this.attr({x:v,y:u,path:["M",g,m,"L",q,C,"A",p,n,0,1,1,o,B,"z"].join(",")});}return this;};h.update(g,m);return h;};Raphael.fn.g.colorValue=function(i,h,g,f){return"hsb("+[c((1-i/h)*0.4,1),g||0.75,f||0.75]+")";};Raphael.fn.g.snapEnds=function(n,o,m){var k=n,p=o;if(k==p){return{from:k,to:p,power:0};}function q(f){return Math.abs(f-0.5)<0.25?~~(f)+0.5:Math.round(f);}var l=(p-k)/m,g=~~(l),j=g,h=0;if(g){while(j){h--;j=~~(l*Math.pow(10,h))/Math.pow(10,h);}h++;}else{while(!g){h=h||1;g=~~(l*Math.pow(10,h))/Math.pow(10,h);h++;}h&&h--;}p=q(o*Math.pow(10,h))/Math.pow(10,h);if(p<o){p=q((o+0.5)*Math.pow(10,h))/Math.pow(10,h);}k=q((n-(h>0?0:0.5))*Math.pow(10,h))/Math.pow(10,h);return{from:k,to:p,power:h};};Raphael.fn.g.axis=function(v,u,o,G,l,J,m,L,n,g){g=g==null?2:g;n=n||"t";J=J||10;var F=n=="|"||n==" "?["M",v+0.5,u,"l",0,0.001]:m==1||m==3?["M",v+0.5,u,"l",0,-o]:["M",v,u+0.5,"l",o,0],z=this.g.snapEnds(G,l,J),K=z.from,B=z.to,I=z.power,H=0,C=this.set();d=(B-K)/J;var s=K,q=I>0?I:0;w=o/J;if(+m==1||+m==3){var h=u,A=(m-1?1:-1)*(g+3+!!(m-1));while(h>=u-o){n!="-"&&n!=" "&&(F=F.concat(["M",v-(n=="+"||n=="|"?g:!(m-1)*g*2),h+0.5,"l",g*2+1,0]));C.push(this.text(v+A,h,(L&&L[H++])||(Math.round(s)==s?s:+s.toFixed(q))).attr(this.g.txtattr).attr({"text-anchor":m-1?"start":"end"}));s+=d;h-=w;}if(Math.round(h+w-(u-o))){n!="-"&&n!=" "&&(F=F.concat(["M",v-(n=="+"||n=="|"?g:!(m-1)*g*2),u-o+0.5,"l",g*2+1,0]));C.push(this.text(v+A,u-o,(L&&L[H])||(Math.round(s)==s?s:+s.toFixed(q))).attr(this.g.txtattr).attr({"text-anchor":m-1?"start":"end"}));}}else{s=K;q=(I>0)*I;A=(m?-1:1)*(g+9+!m);var k=v,w=o/J,D=0,E=0;while(k<=v+o){n!="-"&&n!=" "&&(F=F.concat(["M",k+0.5,u-(n=="+"?g:!!m*g*2),"l",0,g*2+1]));C.push(D=this.text(k,u+A,(L&&L[H++])||(Math.round(s)==s?s:+s.toFixed(q))).attr(this.g.txtattr));var p=D.getBBox();if(E>=p.x-5){C.pop(C.length-1).remove();}else{E=p.x+p.width;}s+=d;k+=w;}if(Math.round(k-w-v-o)){n!="-"&&n!=" "&&(F=F.concat(["M",v+o+0.5,u-(n=="+"?g:!!m*g*2),"l",0,g*2+1]));C.push(this.text(v+o,u+A,(L&&L[H])||(Math.round(s)==s?s:+s.toFixed(q))).attr(this.g.txtattr));}}var M=this.path(F);M.text=C;M.all=this.set([M,C]);M.remove=function(){this.text.remove();this.constructor.prototype.remove.call(this);};return M;};Raphael.el.lighter=function(g){g=g||2;var f=[this.attrs.fill,this.attrs.stroke];this.fs=this.fs||[f[0],f[1]];f[0]=Raphael.rgb2hsb(Raphael.getRGB(f[0]).hex);f[1]=Raphael.rgb2hsb(Raphael.getRGB(f[1]).hex);f[0].b=c(f[0].b*g,1);f[0].s=f[0].s/g;f[1].b=c(f[1].b*g,1);f[1].s=f[1].s/g;this.attr({fill:"hsb("+[f[0].h,f[0].s,f[0].b]+")",stroke:"hsb("+[f[1].h,f[1].s,f[1].b]+")"});};Raphael.el.darker=function(g){g=g||2;var f=[this.attrs.fill,this.attrs.stroke];this.fs=this.fs||[f[0],f[1]];f[0]=Raphael.rgb2hsb(Raphael.getRGB(f[0]).hex);f[1]=Raphael.rgb2hsb(Raphael.getRGB(f[1]).hex);f[0].s=c(f[0].s*g,1);f[0].b=f[0].b/g;f[1].s=c(f[1].s*g,1);f[1].b=f[1].b/g;this.attr({fill:"hsb("+[f[0].h,f[0].s,f[0].b]+")",stroke:"hsb("+[f[1].h,f[1].s,f[1].b]+")"});};Raphael.el.original=function(){if(this.fs){this.attr({fill:this.fs[0],stroke:this.fs[1]});delete this.fs;}};})();
\ No newline at end of file
+(function(){var a=Math.max,c=Math.min;Raphael.fn.g=Raphael.fn.g||{};Raphael.fn.g.markers={disc:"disc",o:"disc",flower:"flower",f:"flower",diamond:"diamond",d:"diamond",square:"square",s:"square",triangle:"triangle",t:"triangle",star:"star","*":"star",cross:"cross",x:"cross",plus:"plus","+":"plus",arrow:"arrow","->":"arrow"};Raphael.fn.g.shim={stroke:"none",fill:"#000","fill-opacity":0};Raphael.fn.g.txtattr={font:"12px Arial, sans-serif"};Raphael.fn.g.colors=[];var e=[0.6,0.2,0.05,0.1333,0.75,0];for(var b=0;b<10;b++){if(b<e.length){Raphael.fn.g.colors.push("hsb("+e[b]+", .75, .75)");}else{Raphael.fn.g.colors.push("hsb("+e[b-e.length]+", 1, .5)");}}Raphael.fn.g.text=function(f,h,g){return this.text(f,h,g).attr(this.g.txtattr);};Raphael.fn.g.labelise=function(f,h,g){if(f){return(f+"").replace(/(##+(?:\.#+)?)|(%%+(?:\.%+)?)/g,function(i,k,j){if(k){return(+h).toFixed(k.replace(/^#+\.?/g,"").length);}if(j){return(h*100/g).toFixed(j.replace(/^%+\.?/g,"").length)+"%";}});}else{return(+h).toFixed(0);}};Raphael.fn.g.finger=function(l,k,g,m,h,i,j){if((h&&!m)||(!h&&!g)){return j?"":this.path();}i={square:"square",sharp:"sharp",soft:"soft"}[i]||"round";var o;m=Math.round(m);g=Math.round(g);l=Math.round(l);k=Math.round(k);switch(i){case"round":if(!h){var f=~~(m/2);if(g<f){f=g;o=["M",l+0.5,k+0.5-~~(m/2),"l",0,0,"a",f,~~(m/2),0,0,1,0,m,"l",0,0,"z"];}else{o=["M",l+0.5,k+0.5-f,"l",g-f,0,"a",f,f,0,1,1,0,m,"l",f-g,0,"z"];}}else{f=~~(g/2);if(m<f){f=m;o=["M",l-~~(g/2),k,"l",0,0,"a",~~(g/2),f,0,0,1,g,0,"l",0,0,"z"];}else{o=["M",l-f,k,"l",0,f-m,"a",f,f,0,1,1,g,0,"l",0,m-f,"z"];}}break;case"sharp":if(!h){var n=~~(m/2);o=["M",l,k+n,"l",0,-m,a(g-n,0),0,c(n,g),n,-c(n,g),n+(n*2<m),"z"];}else{n=~~(g/2);o=["M",l+n,k,"l",-g,0,0,-a(m-n,0),n,-c(n,m),n,c(n,m),n,"z"];}break;case"square":if(!h){o=["M",l,k+~~(m/2),"l",0,-m,g,0,0,m,"z"];}else{o=["M",l+~~(g/2),k,"l",1-g,0,0,-m,g-1,0,"z"];}break;case"soft":if(!h){f=c(g,Math.round(m/5));o=["M",l+0.5,k+0.5-~~(m/2),"l",g-f,0,"a",f,f,0,0,1,f,f,"l",0,m-f*2,"a",f,f,0,0,1,-f,f,"l",f-g,0,"z"];}else{f=c(Math.round(g/5),m);o=["M",l-~~(g/2),k,"l",0,f-m,"a",f,f,0,0,1,f,-f,"l",g-2*f,0,"a",f,f,0,0,1,f,f,"l",0,m-f,"z"];}}if(j){return o.join(",");}else{return this.path(o);}};Raphael.fn.g.disc=function(f,h,g){return this.circle(f,h,g);};Raphael.fn.g.line=function(f,h,g){return this.rect(f-g,h-g/5,2*g,2*g/5);};Raphael.fn.g.square=function(f,h,g){g=g*0.7;return this.rect(f-g,h-g,2*g,2*g);};Raphael.fn.g.triangle=function(f,h,g){g*=1.75;return this.path("M".concat(f,",",h,"m0-",g*0.58,"l",g*0.5,",",g*0.87,"-",g,",0z"));};Raphael.fn.g.diamond=function(f,h,g){return this.path(["M",f,h-g,"l",g,g,-g,g,-g,-g,g,-g,"z"]);};Raphael.fn.g.flower=function(j,h,f,g){f=f*1.25;var o=f,m=o*0.5;g=+g<3||!g?5:g;var p=["M",j,h+m,"Q"],l;for(var k=1;k<g*2+1;k++){l=k%2?o:m;p=p.concat([+(j+l*Math.sin(k*Math.PI/g)).toFixed(3),+(h+l*Math.cos(k*Math.PI/g)).toFixed(3)]);}p.push("z");return this.path(p.join(","));};Raphael.fn.g.star=function(f,n,m,h,g){h=h||m*0.382;g=g||5;var l=["M",f,n+h,"L"],k;for(var j=1;j<g*2;j++){k=j%2?m:h;l=l.concat([(f+k*Math.sin(j*Math.PI/g)),(n+k*Math.cos(j*Math.PI/g))]);}l.push("z");return this.path(l.join(","));};Raphael.fn.g.cross=function(f,h,g){g=g/2.5;return this.path("M".concat(f-g,",",h,"l",[-g,-g,g,-g,g,g,g,-g,g,g,-g,g,g,g,-g,g,-g,-g,-g,g,-g,-g,"z"]));};Raphael.fn.g.plus=function(f,h,g){g=g/2;return this.path("M".concat(f-g/2,",",h-g/2,"l",[0,-g,g,0,0,g,g,0,0,g,-g,0,0,g,-g,0,0,-g,-g,0,0,-g,"z"]));};Raphael.fn.g.arrow=function(f,h,g){return this.path("M".concat(f-g*0.7,",",h-g*0.4,"l",[g*0.6,0,0,-g*0.4,g,g*0.8,-g,g*0.8,0,-g*0.4,-g*0.6,0],"z"));};Raphael.fn.g.tag=function(f,m,l,k,i){k=k||0;i=i==null?5:i;l=l==null?"$9.99":l;var h=0.5522*i,g=this.set(),j=3;g.push(this.path().attr({fill:"#000",stroke:"#000"}));g.push(this.text(f,m,l).attr(this.g.txtattr).attr({fill:"#fff","font-family":"Helvetica, Arial"}));g.update=function(){this.rotate(0,f,m);var o=this[1].getBBox();if(o.height>=i*2){this[0].attr({path:["M",f,m+i,"a",i,i,0,1,1,0,-i*2,i,i,0,1,1,0,i*2,"m",0,-i*2-j,"a",i+j,i+j,0,1,0,0,(i+j)*2,"L",f+i+j,m+o.height/2+j,"l",o.width+2*j,0,0,-o.height-2*j,-o.width-2*j,0,"L",f,m-i-j].join(",")});}else{var n=Math.sqrt(Math.pow(i+j,2)-Math.pow(o.height/2+j,2));this[0].attr({path:["M",f,m+i,"c",-h,0,-i,h-i,-i,-i,0,-h,i-h,-i,i,-i,h,0,i,i-h,i,i,0,h,h-i,i,-i,i,"M",f+n,m-o.height/2-j,"a",i+j,i+j,0,1,0,0,o.height+2*j,"l",i+j-n+o.width+2*j,0,0,-o.height-2*j,"L",f+n,m-o.height/2-j].join(",")});}this[1].attr({x:f+i+j+o.width/2,y:m});k=(360-k)%360;this.rotate(k,f,m);k>90&&k<270&&this[1].attr({x:f-i-j-o.width/2,y:m,rotation:[180+k,f,m]});return this;};g.update();return g;};Raphael.fn.g.popupit=function(l,k,m,g,t){g=g==null?2:g;t=t||5;l=Math.round(l);k=Math.round(k);var j=m.getBBox(),n=Math.round(j.width/2),i=Math.round(j.height/2),s=[0,n+t*2,0,-n-t*2],o=[-i*2-t*3,-i-t,0,-i-t],f=["M",l-s[g],k-o[g],"l",-t,(g==2)*-t,-a(n-t,0),0,"a",t,t,0,0,1,-t,-t,"l",0,-a(i-t,0),(g==3)*-t,-t,(g==3)*t,-t,0,-a(i-t,0),"a",t,t,0,0,1,t,-t,"l",a(n-t,0),0,t,!g*-t,t,!g*t,a(n-t,0),0,"a",t,t,0,0,1,t,t,"l",0,a(i-t,0),(g==1)*t,t,(g==1)*-t,t,0,a(i-t,0),"a",t,t,0,0,1,-t,t,"l",-a(n-t,0),0,"z"].join(","),q=[{x:l,y:k+t*2+i},{x:l-t*2-n,y:k},{x:l,y:k-t*2-i},{x:l+t*2+n,y:k}][g];m.translate(q.x-n-j.x,q.y-i-j.y);return this.path(f).attr({fill:"#000",stroke:"none"}).insertBefore(m.node?m:m[0]);};Raphael.fn.g.popup=function(f,l,k,g,i){g=g==null?2:g>3?3:g;i=i||5;k=k||"$9.99";var h=this.set(),j=3;h.push(this.path().attr({fill:"#000",stroke:"#000"}));h.push(this.text(f,l,k).attr(this.g.txtattr).attr({fill:"#fff","font-family":"Helvetica, Arial"}));h.update=function(o,n,q){o=o||f;n=n||l;var t=this[1].getBBox(),u=t.width/2,s=t.height/2,y=[0,u+i*2,0,-u-i*2],v=[-s*2-i*3,-s-i,0,-s-i],m=["M",o-y[g],n-v[g],"l",-i,(g==2)*-i,-a(u-i,0),0,"a",i,i,0,0,1,-i,-i,"l",0,-a(s-i,0),(g==3)*-i,-i,(g==3)*i,-i,0,-a(s-i,0),"a",i,i,0,0,1,i,-i,"l",a(u-i,0),0,i,!g*-i,i,!g*i,a(u-i,0),0,"a",i,i,0,0,1,i,i,"l",0,a(s-i,0),(g==1)*i,i,(g==1)*-i,i,0,a(s-i,0),"a",i,i,0,0,1,-i,i,"l",-a(u-i,0),0,"z"].join(","),x=[{x:o,y:n+i*2+s},{x:o-i*2-u,y:n},{x:o,y:n-i*2-s},{x:o+i*2+u,y:n}][g];x.path=m;if(q){this.animate(x,500,">");}else{this.attr(x);}return this;};return h.update(f,l);};Raphael.fn.g.flag=function(f,k,j,i){i=i||0;j=j||"$9.99";var g=this.set(),h=3;g.push(this.path().attr({fill:"#000",stroke:"#000"}));g.push(this.text(f,k,j).attr(this.g.txtattr).attr({fill:"#fff","font-family":"Helvetica, Arial"}));g.update=function(l,o){this.rotate(0,l,o);var n=this[1].getBBox(),m=n.height/2;this[0].attr({path:["M",l,o,"l",m+h,-m-h,n.width+2*h,0,0,n.height+2*h,-n.width-2*h,0,"z"].join(",")});this[1].attr({x:l+m+h+n.width/2,y:o});i=360-i;this.rotate(i,l,o);i>90&&i<270&&this[1].attr({x:l-r-h-n.width/2,y:o,rotation:[180+i,l,o]});return this;};return g.update(f,k);};Raphael.fn.g.label=function(f,i,h){var g=this.set();g.push(this.rect(f,i,10,10).attr({stroke:"none",fill:"#000"}));g.push(this.text(f,i,h).attr(this.g.txtattr).attr({fill:"#fff"}));g.update=function(){var k=this[1].getBBox(),j=c(k.width+10,k.height+10)/2;this[0].attr({x:k.x-j/2,y:k.y-j/2,width:k.width+j,height:k.height+j,r:j});};g.update();return g;};Raphael.fn.g.labelit=function(h){var g=h.getBBox(),f=c(20,g.width+10,g.height+10)/2;return this.rect(g.x-f/2,g.y-f/2,g.width+f,g.height+f,f).attr({stroke:"none",fill:"#000"}).insertBefore(h.node?h:h[0]);};Raphael.fn.g.drop=function(f,k,j,h,i){h=h||30;i=i||0;var g=this.set();g.push(this.path(["M",f,k,"l",h,0,"A",h*0.4,h*0.4,0,1,0,f+h*0.7,k-h*0.7,"z"]).attr({fill:"#000",stroke:"none",rotation:[22.5-i,f,k]}));i=(i+90)*Math.PI/180;g.push(this.text(f+h*Math.sin(i),k+h*Math.cos(i),j).attr(this.g.txtattr).attr({"font-size":h*12/30,fill:"#fff"}));g.drop=g[0];g.text=g[1];return g;};Raphael.fn.g.blob=function(g,m,l,k,i){k=(+k+1?k:45)+90;i=i||12;var f=Math.PI/180,j=i*12/12;var h=this.set();h.push(this.path().attr({fill:"#000",stroke:"none"}));h.push(this.text(g+i*Math.sin((k)*f),m+i*Math.cos((k)*f)-j/2,l).attr(this.g.txtattr).attr({"font-size":j,fill:"#fff"}));h.update=function(t,s,y){t=t||g;s=s||m;var A=this[1].getBBox(),D=a(A.width+j,i*25/12),z=a(A.height+j,i*25/12),o=t+i*Math.sin((k-22.5)*f),B=s+i*Math.cos((k-22.5)*f),q=t+i*Math.sin((k+22.5)*f),C=s+i*Math.cos((k+22.5)*f),F=(q-o)/2,E=(C-B)/2,p=D/2,n=z/2,x=-Math.sqrt(Math.abs(p*p*n*n-p*p*E*E-n*n*F*F)/(p*p*E*E+n*n*F*F)),v=x*p*E/n+(q+o)/2,u=x*-n*F/p+(C+B)/2;if(y){this.animate({x:v,y:u,path:["M",g,m,"L",q,C,"A",p,n,0,1,1,o,B,"z"].join(",")},500,">");}else{this.attr({x:v,y:u,path:["M",g,m,"L",q,C,"A",p,n,0,1,1,o,B,"z"].join(",")});}return this;};h.update(g,m);return h;};Raphael.fn.g.colorValue=function(i,h,g,f){return"hsb("+[c((1-i/h)*0.4,1),g||0.75,f||0.75]+")";};Raphael.fn.g.snapEnds=function(n,o,m){var k=n,p=o;if(k==p){return{from:k,to:p,power:0};}function q(f){return Math.abs(f-0.5)<0.25?~~(f)+0.5:Math.round(f);}var l=(p-k)/m,g=~~(l),j=g,h=0;if(g){while(j){h--;j=~~(l*Math.pow(10,h))/Math.pow(10,h);}h++;}else{while(!g){h=h||1;g=~~(l*Math.pow(10,h))/Math.pow(10,h);h++;}h&&h--;}p=q(o*Math.pow(10,h))/Math.pow(10,h);if(p<o){p=q((o+0.5)*Math.pow(10,h))/Math.pow(10,h);}k=q((n-(h>0?0:0.5))*Math.pow(10,h))/Math.pow(10,h);return{from:k,to:p,power:h};};Raphael.fn.g.axis=function(v,u,o,G,l,J,m,L,n,g){g=g==null?2:g;n=n||"t";J=J||10;var F=n=="|"||n==" "?["M",v+0.5,u,"l",0,0.001]:m==1||m==3?["M",v+0.5,u,"l",0,-o]:["M",v,u+0.5,"l",o,0],z=this.g.snapEnds(G,l,J),K=z.from,B=z.to,I=z.power,H=0,C=this.set();d=(B-K)/J;var s=K,q=I>0?I:0;w=o/J;if(+m==1||+m==3){var h=u,A=(m-1?1:-1)*(g+3+!!(m-1));while(h>=u-o){n!="-"&&n!=" "&&(F=F.concat(["M",v-(n=="+"||n=="|"?g:!(m-1)*g*2),h+0.5,"l",g*2+1,0]));C.push(this.text(v+A,h,(L&&L[H++])||(Math.round(s)==s?s:+s.toFixed(q))).attr(this.g.txtattr).attr({"text-anchor":m-1?"start":"end"}));s+=d;h-=w;}if(Math.round(h+w-(u-o))){n!="-"&&n!=" "&&(F=F.concat(["M",v-(n=="+"||n=="|"?g:!(m-1)*g*2),u-o+0.5,"l",g*2+1,0]));C.push(this.text(v+A,u-o,(L&&L[H])||(Math.round(s)==s?s:+s.toFixed(q))).attr(this.g.txtattr).attr({"text-anchor":m-1?"start":"end"}));}}else{s=K;q=(I>0)*I;A=(m?-1:1)*(g+9+!m);var k=v,w=o/J,D=0,E=0;while(k<=v+o){n!="-"&&n!=" "&&(F=F.concat(["M",k+0.5,u-(n=="+"?g:!!m*g*2),"l",0,g*2+1]));C.push(D=this.text(k,u+A,(L&&L[H++])||(Math.round(s)==s?s:+s.toFixed(q))).attr(this.g.txtattr));var p=D.getBBox();if(E>=p.x-5){C.pop(C.length-1).remove();}else{E=p.x+p.width;}s+=d;k+=w;}if(Math.round(k-w-v-o)){n!="-"&&n!=" "&&(F=F.concat(["M",v+o+0.5,u-(n=="+"?g:!!m*g*2),"l",0,g*2+1]));C.push(this.text(v+o,u+A,(L&&L[H])||(Math.round(s)==s?s:+s.toFixed(q))).attr(this.g.txtattr));}}var M=this.path(F);M.text=C;M.all=this.set([M,C]);M.remove=function(){this.text.remove();this.constructor.prototype.remove.call(this);};return M;};Raphael.el.lighter=function(g){g=g||2;var f=[this.attrs.fill,this.attrs.stroke];this.fs=this.fs||[f[0],f[1]];f[0]=Raphael.rgb2hsb(Raphael.getRGB(f[0]).hex);f[1]=Raphael.rgb2hsb(Raphael.getRGB(f[1]).hex);f[0].b=c(f[0].b*g,1);f[0].s=f[0].s/g;f[1].b=c(f[1].b*g,1);f[1].s=f[1].s/g;this.attr({fill:"hsb("+[f[0].h,f[0].s,f[0].b]+")",stroke:"hsb("+[f[1].h,f[1].s,f[1].b]+")"});};Raphael.el.darker=function(g){g=g||2;var f=[this.attrs.fill,this.attrs.stroke];this.fs=this.fs||[f[0],f[1]];f[0]=Raphael.rgb2hsb(Raphael.getRGB(f[0]).hex);f[1]=Raphael.rgb2hsb(Raphael.getRGB(f[1]).hex);f[0].s=c(f[0].s*g,1);f[0].b=f[0].b/g;f[1].s=c(f[1].s*g,1);f[1].b=f[1].b/g;this.attr({fill:"hsb("+[f[0].h,f[0].s,f[0].b]+")",stroke:"hsb("+[f[1].h,f[1].s,f[1].b]+")"});};Raphael.el.original=function(){if(this.fs){this.attr({fill:this.fs[0],stroke:this.fs[1]});delete this.fs;}};})();
diff --git a/webapp/src/main/webapp/js/raphael/raphael.js b/webapp/src/main/webapp/js/raphael/raphael.js
index e5e712619..84d334e38 100644
--- a/webapp/src/main/webapp/js/raphael/raphael.js
+++ b/webapp/src/main/webapp/js/raphael/raphael.js
@@ -4,4 +4,4 @@
  * Copyright (c) 2010 Dmitry Baranovskiy (http://raphaeljs.com)
  * Licensed under the MIT (http://raphaeljs.com/license.html) license.
  */
-(function(){function a(){if(a.is(arguments[0],G)){var b=arguments[0],d=bV[m](a,b.splice(0,3+a.is(b[0],E))),e=d.set();for(var g=0,h=b[w];g<h;g++){var i=b[g]||{};c[f](i.type)&&e[L](d[i.type]().attr(i))}return e}return bV[m](a,arguments)}a.version="1.5.2";var b=/[, ]+/,c={circle:1,rect:1,path:1,ellipse:1,text:1,image:1},d=/\{(\d+)\}/g,e="prototype",f="hasOwnProperty",g=document,h=window,i={was:Object[e][f].call(h,"Raphael"),is:h.Raphael},j=function(){this.customAttributes={}},k,l="appendChild",m="apply",n="concat",o="createTouch"in g,p="",q=" ",r=String,s="split",t="click dblclick mousedown mousemove mouseout mouseover mouseup touchstart touchmove touchend orientationchange touchcancel gesturestart gesturechange gestureend"[s](q),u={mousedown:"touchstart",mousemove:"touchmove",mouseup:"touchend"},v="join",w="length",x=r[e].toLowerCase,y=Math,z=y.max,A=y.min,B=y.abs,C=y.pow,D=y.PI,E="number",F="string",G="array",H="toString",I="fill",J=Object[e][H],K={},L="push",M=/^url\(['"]?([^\)]+?)['"]?\)$/i,N=/^\s*((#[a-f\d]{6})|(#[a-f\d]{3})|rgba?\(\s*([\d\.]+%?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+(?:%?\s*,\s*[\d\.]+)?)%?\s*\)|hsba?\(\s*([\d\.]+(?:deg|\xb0|%)?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+(?:%?\s*,\s*[\d\.]+)?)%?\s*\)|hsla?\(\s*([\d\.]+(?:deg|\xb0|%)?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+(?:%?\s*,\s*[\d\.]+)?)%?\s*\))\s*$/i,O={"NaN":1,Infinity:1,"-Infinity":1},P=/^(?:cubic-)?bezier\(([^,]+),([^,]+),([^,]+),([^\)]+)\)/,Q=y.round,R="setAttribute",S=parseFloat,T=parseInt,U=" progid:DXImageTransform.Microsoft",V=r[e].toUpperCase,W={blur:0,"clip-rect":"0 0 1e9 1e9",cursor:"default",cx:0,cy:0,fill:"#fff","fill-opacity":1,font:"10px \"Arial\"","font-family":"\"Arial\"","font-size":"10","font-style":"normal","font-weight":400,gradient:0,height:0,href:"http://raphaeljs.com/",opacity:1,path:"M0,0",r:0,rotation:0,rx:0,ry:0,scale:"1 1",src:"",stroke:"#000","stroke-dasharray":"","stroke-linecap":"butt","stroke-linejoin":"butt","stroke-miterlimit":0,"stroke-opacity":1,"stroke-width":1,target:"_blank","text-anchor":"middle",title:"Raphael",translation:"0 0",width:0,x:0,y:0},X={along:"along",blur:E,"clip-rect":"csv",cx:E,cy:E,fill:"colour","fill-opacity":E,"font-size":E,height:E,opacity:E,path:"path",r:E,rotation:"csv",rx:E,ry:E,scale:"csv",stroke:"colour","stroke-opacity":E,"stroke-width":E,translation:"csv",width:E,x:E,y:E},Y="replace",Z=/^(from|to|\d+%?)$/,$=/\s*,\s*/,_={hs:1,rg:1},ba=/,?([achlmqrstvxz]),?/gi,bb=/([achlmqstvz])[\s,]*((-?\d*\.?\d*(?:e[-+]?\d+)?\s*,?\s*)+)/ig,bc=/(-?\d*\.?\d*(?:e[-+]?\d+)?)\s*,?\s*/ig,bd=/^r(?:\(([^,]+?)\s*,\s*([^\)]+?)\))?/,be=function(a,b){return a.key-b.key};a.type=h.SVGAngle||g.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1")?"SVG":"VML";if(a.type=="VML"){var bf=g.createElement("div"),bg;bf.innerHTML="<v:shape adj=\"1\"/>";bg=bf.firstChild;bg.style.behavior="url(#default#VML)";if(!(bg&&typeof bg.adj=="object"))return a.type=null;bf=null}a.svg=!(a.vml=a.type=="VML");j[e]=a[e];k=j[e];a._id=0;a._oid=0;a.fn={};a.is=function(a,b){b=x.call(b);if(b=="finite")return!O[f](+a);return b=="null"&&a===null||b==typeof a||b=="object"&&a===Object(a)||b=="array"&&Array.isArray&&Array.isArray(a)||J.call(a).slice(8,-1).toLowerCase()==b};a.angle=function(b,c,d,e,f,g){{if(f==null){var h=b-d,i=c-e;if(!h&&!i)return 0;return((h<0)*180+y.atan(-i/-h)*180/D+360)%360}return a.angle(b,c,f,g)-a.angle(d,e,f,g)}};a.rad=function(a){return a%360*D/180};a.deg=function(a){return a*180/D%360};a.snapTo=function(b,c,d){d=a.is(d,"finite")?d:10;if(a.is(b,G)){var e=b.length;while(e--)if(B(b[e]-c)<=d)return b[e]}else{b=+b;var f=c%b;if(f<d)return c-f;if(f>b-d)return c-f+b}return c};function bh(){var a=[],b=0;for(;b<32;b++)a[b]=(~(~(y.random()*16)))[H](16);a[12]=4;a[16]=(a[16]&3|8)[H](16);return"r-"+a[v]("")}a.setWindow=function(a){h=a;g=h.document};var bi=function(b){if(a.vml){var c=/^\s+|\s+$/g,d;try{var e=new ActiveXObject("htmlfile");e.write("<body>");e.close();d=e.body}catch(a){d=createPopup().document.body}var f=d.createTextRange();bi=bm(function(a){try{d.style.color=r(a)[Y](c,p);var b=f.queryCommandValue("ForeColor");b=(b&255)<<16|b&65280|(b&16711680)>>>16;return"#"+("000000"+b[H](16)).slice(-6)}catch(a){return"none"}})}else{var h=g.createElement("i");h.title="Raphaël Colour Picker";h.style.display="none";g.body[l](h);bi=bm(function(a){h.style.color=a;return g.defaultView.getComputedStyle(h,p).getPropertyValue("color")})}return bi(b)},bj=function(){return"hsb("+[this.h,this.s,this.b]+")"},bk=function(){return"hsl("+[this.h,this.s,this.l]+")"},bl=function(){return this.hex};a.hsb2rgb=function(b,c,d,e){if(a.is(b,"object")&&"h"in b&&"s"in b&&"b"in b){d=b.b;c=b.s;b=b.h;e=b.o}return a.hsl2rgb(b,c,d/2,e)};a.hsl2rgb=function(b,c,d,e){if(a.is(b,"object")&&"h"in b&&"s"in b&&"l"in b){d=b.l;c=b.s;b=b.h}if(b>1||c>1||d>1){b/=360;c/=100;d/=100}var f={},g=["r","g","b"],h,i,j,k,l,m;if(c){d<0.5?h=d*(1+c):h=d+c-d*c;i=2*d-h;for(var n=0;n<3;n++){j=b+1/3*-(n-1);j<0&&j++;j>1&&j--;j*6<1?f[g[n]]=i+(h-i)*6*j:j*2<1?f[g[n]]=h:j*3<2?f[g[n]]=i+(h-i)*(2/3-j)*6:f[g[n]]=i}}else f={r:d,g:d,b:d};f.r*=255;f.g*=255;f.b*=255;f.hex="#"+(16777216|f.b|f.g<<8|f.r<<16).toString(16).slice(1);a.is(e,"finite")&&(f.opacity=e);f.toString=bl;return f};a.rgb2hsb=function(b,c,d){if(c==null&&a.is(b,"object")&&"r"in b&&"g"in b&&"b"in b){d=b.b;c=b.g;b=b.r}if(c==null&&a.is(b,F)){var e=a.getRGB(b);b=e.r;c=e.g;d=e.b}if(b>1||c>1||d>1){b/=255;c/=255;d/=255}var f=z(b,c,d),g=A(b,c,d),h,i,j=f;{if(g==f)return{h:0,s:0,b:f,toString:bj};var k=f-g;i=k/f;b==f?h=(c-d)/k:c==f?h=2+(d-b)/k:h=4+(b-c)/k;h/=6;h<0&&h++;h>1&&h--}return{h:h,s:i,b:j,toString:bj}};a.rgb2hsl=function(b,c,d){if(c==null&&a.is(b,"object")&&"r"in b&&"g"in b&&"b"in b){d=b.b;c=b.g;b=b.r}if(c==null&&a.is(b,F)){var e=a.getRGB(b);b=e.r;c=e.g;d=e.b}if(b>1||c>1||d>1){b/=255;c/=255;d/=255}var f=z(b,c,d),g=A(b,c,d),h,i,j=(f+g)/2,k;if(g==f)k={h:0,s:0,l:j};else{var l=f-g;i=j<0.5?l/(f+g):l/(2-f-g);b==f?h=(c-d)/l:c==f?h=2+(d-b)/l:h=4+(b-c)/l;h/=6;h<0&&h++;h>1&&h--;k={h:h,s:i,l:j}}k.toString=bk;return k};a._path2string=function(){return this.join(",")[Y](ba,"$1")};function bm(a,b,c){function d(){var g=Array[e].slice.call(arguments,0),h=g[v]("►"),i=d.cache=d.cache||{},j=d.count=d.count||[];if(i[f](h))return c?c(i[h]):i[h];j[w]>=1000&&delete i[j.shift()];j[L](h);i[h]=a[m](b,g);return c?c(i[h]):i[h]}return d}a.getRGB=bm(function(b){if(!b||!(!((b=r(b)).indexOf("-")+1)))return{r:-1,g:-1,b:-1,hex:"none",error:1};if(b=="none")return{r:-1,g:-1,b:-1,hex:"none"};!(_[f](b.toLowerCase().substring(0,2))||b.charAt()=="#")&&(b=bi(b));var c,d,e,g,h,i,j,k=b.match(N);if(k){if(k[2]){g=T(k[2].substring(5),16);e=T(k[2].substring(3,5),16);d=T(k[2].substring(1,3),16)}if(k[3]){g=T((i=k[3].charAt(3))+i,16);e=T((i=k[3].charAt(2))+i,16);d=T((i=k[3].charAt(1))+i,16)}if(k[4]){j=k[4][s]($);d=S(j[0]);j[0].slice(-1)=="%"&&(d*=2.55);e=S(j[1]);j[1].slice(-1)=="%"&&(e*=2.55);g=S(j[2]);j[2].slice(-1)=="%"&&(g*=2.55);k[1].toLowerCase().slice(0,4)=="rgba"&&(h=S(j[3]));j[3]&&j[3].slice(-1)=="%"&&(h/=100)}if(k[5]){j=k[5][s]($);d=S(j[0]);j[0].slice(-1)=="%"&&(d*=2.55);e=S(j[1]);j[1].slice(-1)=="%"&&(e*=2.55);g=S(j[2]);j[2].slice(-1)=="%"&&(g*=2.55);(j[0].slice(-3)=="deg"||j[0].slice(-1)=="°")&&(d/=360);k[1].toLowerCase().slice(0,4)=="hsba"&&(h=S(j[3]));j[3]&&j[3].slice(-1)=="%"&&(h/=100);return a.hsb2rgb(d,e,g,h)}if(k[6]){j=k[6][s]($);d=S(j[0]);j[0].slice(-1)=="%"&&(d*=2.55);e=S(j[1]);j[1].slice(-1)=="%"&&(e*=2.55);g=S(j[2]);j[2].slice(-1)=="%"&&(g*=2.55);(j[0].slice(-3)=="deg"||j[0].slice(-1)=="°")&&(d/=360);k[1].toLowerCase().slice(0,4)=="hsla"&&(h=S(j[3]));j[3]&&j[3].slice(-1)=="%"&&(h/=100);return a.hsl2rgb(d,e,g,h)}k={r:d,g:e,b:g};k.hex="#"+(16777216|g|e<<8|d<<16).toString(16).slice(1);a.is(h,"finite")&&(k.opacity=h);return k}return{r:-1,g:-1,b:-1,hex:"none",error:1}},a);a.getColor=function(a){var b=this.getColor.start=this.getColor.start||{h:0,s:1,b:a||0.75},c=this.hsb2rgb(b.h,b.s,b.b);b.h+=0.075;if(b.h>1){b.h=0;b.s-=0.2;b.s<=0&&(this.getColor.start={h:0,s:1,b:b.b})}return c.hex};a.getColor.reset=function(){delete this.start};a.parsePathString=bm(function(b){if(!b)return null;var c={a:7,c:6,h:1,l:2,m:2,q:4,s:4,t:2,v:1,z:0},d=[];a.is(b,G)&&a.is(b[0],G)&&(d=bo(b));d[w]||r(b)[Y](bb,function(a,b,e){var f=[],g=x.call(b);e[Y](bc,function(a,b){b&&f[L](+b)});if(g=="m"&&f[w]>2){d[L]([b][n](f.splice(0,2)));g="l";b=b=="m"?"l":"L"}while(f[w]>=c[g]){d[L]([b][n](f.splice(0,c[g])));if(!c[g])break}});d[H]=a._path2string;return d});a.findDotsAtSegment=function(a,b,c,d,e,f,g,h,i){var j=1-i,k=C(j,3)*a+C(j,2)*3*i*c+j*3*i*i*e+C(i,3)*g,l=C(j,3)*b+C(j,2)*3*i*d+j*3*i*i*f+C(i,3)*h,m=a+2*i*(c-a)+i*i*(e-2*c+a),n=b+2*i*(d-b)+i*i*(f-2*d+b),o=c+2*i*(e-c)+i*i*(g-2*e+c),p=d+2*i*(f-d)+i*i*(h-2*f+d),q=(1-i)*a+i*c,r=(1-i)*b+i*d,s=(1-i)*e+i*g,t=(1-i)*f+i*h,u=90-y.atan((m-o)/(n-p))*180/D;(m>o||n<p)&&(u+=180);return{x:k,y:l,m:{x:m,y:n},n:{x:o,y:p},start:{x:q,y:r},end:{x:s,y:t},alpha:u}};var bn=bm(function(a){if(!a)return{x:0,y:0,width:0,height:0};a=bw(a);var b=0,c=0,d=[],e=[],f;for(var g=0,h=a[w];g<h;g++){f=a[g];if(f[0]=="M"){b=f[1];c=f[2];d[L](b);e[L](c)}else{var i=bv(b,c,f[1],f[2],f[3],f[4],f[5],f[6]);d=d[n](i.min.x,i.max.x);e=e[n](i.min.y,i.max.y);b=f[5];c=f[6]}}var j=A[m](0,d),k=A[m](0,e);return{x:j,y:k,width:z[m](0,d)-j,height:z[m](0,e)-k}}),bo=function(b){var c=[];if(!a.is(b,G)||!a.is(b&&b[0],G))b=a.parsePathString(b);for(var d=0,e=b[w];d<e;d++){c[d]=[];for(var f=0,g=b[d][w];f<g;f++)c[d][f]=b[d][f]}c[H]=a._path2string;return c},bp=bm(function(b){if(!a.is(b,G)||!a.is(b&&b[0],G))b=a.parsePathString(b);var c=[],d=0,e=0,f=0,g=0,h=0;if(b[0][0]=="M"){d=b[0][1];e=b[0][2];f=d;g=e;h++;c[L](["M",d,e])}for(var i=h,j=b[w];i<j;i++){var k=c[i]=[],l=b[i];if(l[0]!=x.call(l[0])){k[0]=x.call(l[0]);switch(k[0]){case"a":k[1]=l[1];k[2]=l[2];k[3]=l[3];k[4]=l[4];k[5]=l[5];k[6]=+(l[6]-d).toFixed(3);k[7]=+(l[7]-e).toFixed(3);break;case"v":k[1]=+(l[1]-e).toFixed(3);break;case"m":f=l[1];g=l[2];default:for(var m=1,n=l[w];m<n;m++)k[m]=+(l[m]-(m%2?d:e)).toFixed(3)}}else{k=c[i]=[];if(l[0]=="m"){f=l[1]+d;g=l[2]+e}for(var o=0,p=l[w];o<p;o++)c[i][o]=l[o]}var q=c[i][w];switch(c[i][0]){case"z":d=f;e=g;break;case"h":d+=+c[i][q-1];break;case"v":e+=+c[i][q-1];break;default:d+=+c[i][q-2];e+=+c[i][q-1]}}c[H]=a._path2string;return c},0,bo),bq=bm(function(b){if(!a.is(b,G)||!a.is(b&&b[0],G))b=a.parsePathString(b);var c=[],d=0,e=0,f=0,g=0,h=0;if(b[0][0]=="M"){d=+b[0][1];e=+b[0][2];f=d;g=e;h++;c[0]=["M",d,e]}for(var i=h,j=b[w];i<j;i++){var k=c[i]=[],l=b[i];if(l[0]!=V.call(l[0])){k[0]=V.call(l[0]);switch(k[0]){case"A":k[1]=l[1];k[2]=l[2];k[3]=l[3];k[4]=l[4];k[5]=l[5];k[6]=+(l[6]+d);k[7]=+(l[7]+e);break;case"V":k[1]=+l[1]+e;break;case"H":k[1]=+l[1]+d;break;case"M":f=+l[1]+d;g=+l[2]+e;default:for(var m=1,n=l[w];m<n;m++)k[m]=+l[m]+(m%2?d:e)}}else for(var o=0,p=l[w];o<p;o++)c[i][o]=l[o];switch(k[0]){case"Z":d=f;e=g;break;case"H":d=k[1];break;case"V":e=k[1];break;case"M":f=c[i][c[i][w]-2];g=c[i][c[i][w]-1];default:d=c[i][c[i][w]-2];e=c[i][c[i][w]-1]}}c[H]=a._path2string;return c},null,bo),br=function(a,b,c,d){return[a,b,c,d,c,d]},bs=function(a,b,c,d,e,f){var g=1/3,h=2/3;return[g*a+h*c,g*b+h*d,g*e+h*c,g*f+h*d,e,f]},bt=function(a,b,c,d,e,f,g,h,i,j){var k=D*120/180,l=D/180*(+e||0),m=[],o,p=bm(function(a,b,c){var d=a*y.cos(c)-b*y.sin(c),e=a*y.sin(c)+b*y.cos(c);return{x:d,y:e}});if(j){G=j[0];H=j[1];E=j[2];F=j[3]}else{o=p(a,b,-l);a=o.x;b=o.y;o=p(h,i,-l);h=o.x;i=o.y;var q=y.cos(D/180*e),r=y.sin(D/180*e),t=(a-h)/2,u=(b-i)/2,x=t*t/(c*c)+u*u/(d*d);if(x>1){x=y.sqrt(x);c=x*c;d=x*d}var z=c*c,A=d*d,C=(f==g?-1:1)*y.sqrt(B((z*A-z*u*u-A*t*t)/(z*u*u+A*t*t))),E=C*c*u/d+(a+h)/2,F=C*-d*t/c+(b+i)/2,G=y.asin(((b-F)/d).toFixed(9)),H=y.asin(((i-F)/d).toFixed(9));G=a<E?D-G:G;H=h<E?D-H:H;G<0&&(G=D*2+G);H<0&&(H=D*2+H);g&&G>H&&(G=G-D*2);!g&&H>G&&(H=H-D*2)}var I=H-G;if(B(I)>k){var J=H,K=h,L=i;H=G+k*(g&&H>G?1:-1);h=E+c*y.cos(H);i=F+d*y.sin(H);m=bt(h,i,c,d,e,0,g,K,L,[H,J,E,F])}I=H-G;var M=y.cos(G),N=y.sin(G),O=y.cos(H),P=y.sin(H),Q=y.tan(I/4),R=4/3*c*Q,S=4/3*d*Q,T=[a,b],U=[a+R*N,b-S*M],V=[h+R*P,i-S*O],W=[h,i];U[0]=2*T[0]-U[0];U[1]=2*T[1]-U[1];{if(j)return[U,V,W][n](m);m=[U,V,W][n](m)[v]()[s](",");var X=[];for(var Y=0,Z=m[w];Y<Z;Y++)X[Y]=Y%2?p(m[Y-1],m[Y],l).y:p(m[Y],m[Y+1],l).x;return X}},bu=function(a,b,c,d,e,f,g,h,i){var j=1-i;return{x:C(j,3)*a+C(j,2)*3*i*c+j*3*i*i*e+C(i,3)*g,y:C(j,3)*b+C(j,2)*3*i*d+j*3*i*i*f+C(i,3)*h}},bv=bm(function(a,b,c,d,e,f,g,h){var i=e-2*c+a-(g-2*e+c),j=2*(c-a)-2*(e-c),k=a-c,l=(-j+y.sqrt(j*j-4*i*k))/2/i,n=(-j-y.sqrt(j*j-4*i*k))/2/i,o=[b,h],p=[a,g],q;B(l)>"1e12"&&(l=0.5);B(n)>"1e12"&&(n=0.5);if(l>0&&l<1){q=bu(a,b,c,d,e,f,g,h,l);p[L](q.x);o[L](q.y)}if(n>0&&n<1){q=bu(a,b,c,d,e,f,g,h,n);p[L](q.x);o[L](q.y)}i=f-2*d+b-(h-2*f+d);j=2*(d-b)-2*(f-d);k=b-d;l=(-j+y.sqrt(j*j-4*i*k))/2/i;n=(-j-y.sqrt(j*j-4*i*k))/2/i;B(l)>"1e12"&&(l=0.5);B(n)>"1e12"&&(n=0.5);if(l>0&&l<1){q=bu(a,b,c,d,e,f,g,h,l);p[L](q.x);o[L](q.y)}if(n>0&&n<1){q=bu(a,b,c,d,e,f,g,h,n);p[L](q.x);o[L](q.y)}return{min:{x:A[m](0,p),y:A[m](0,o)},max:{x:z[m](0,p),y:z[m](0,o)}}}),bw=bm(function(a,b){var c=bq(a),d=b&&bq(b),e={x:0,y:0,bx:0,by:0,X:0,Y:0,qx:null,qy:null},f={x:0,y:0,bx:0,by:0,X:0,Y:0,qx:null,qy:null},g=function(a,b){var c,d;if(!a)return["C",b.x,b.y,b.x,b.y,b.x,b.y];!(a[0]in{T:1,Q:1})&&(b.qx=b.qy=null);switch(a[0]){case"M":b.X=a[1];b.Y=a[2];break;case"A":a=["C"][n](bt[m](0,[b.x,b.y][n](a.slice(1))));break;case"S":c=b.x+(b.x-(b.bx||b.x));d=b.y+(b.y-(b.by||b.y));a=["C",c,d][n](a.slice(1));break;case"T":b.qx=b.x+(b.x-(b.qx||b.x));b.qy=b.y+(b.y-(b.qy||b.y));a=["C"][n](bs(b.x,b.y,b.qx,b.qy,a[1],a[2]));break;case"Q":b.qx=a[1];b.qy=a[2];a=["C"][n](bs(b.x,b.y,a[1],a[2],a[3],a[4]));break;case"L":a=["C"][n](br(b.x,b.y,a[1],a[2]));break;case"H":a=["C"][n](br(b.x,b.y,a[1],b.y));break;case"V":a=["C"][n](br(b.x,b.y,b.x,a[1]));break;case"Z":a=["C"][n](br(b.x,b.y,b.X,b.Y));break}return a},h=function(a,b){if(a[b][w]>7){a[b].shift();var e=a[b];while(e[w])a.splice(b++,0,["C"][n](e.splice(0,6)));a.splice(b,1);k=z(c[w],d&&d[w]||0)}},i=function(a,b,e,f,g){if(a&&b&&a[g][0]=="M"&&b[g][0]!="M"){b.splice(g,0,["M",f.x,f.y]);e.bx=0;e.by=0;e.x=a[g][1];e.y=a[g][2];k=z(c[w],d&&d[w]||0)}};for(var j=0,k=z(c[w],d&&d[w]||0);j<k;j++){c[j]=g(c[j],e);h(c,j);d&&(d[j]=g(d[j],f));d&&h(d,j);i(c,d,e,f,j);i(d,c,f,e,j);var l=c[j],o=d&&d[j],p=l[w],q=d&&o[w];e.x=l[p-2];e.y=l[p-1];e.bx=S(l[p-4])||e.x;e.by=S(l[p-3])||e.y;f.bx=d&&(S(o[q-4])||f.x);f.by=d&&(S(o[q-3])||f.y);f.x=d&&o[q-2];f.y=d&&o[q-1]}return d?[c,d]:c},null,bo),bx=bm(function(b){var c=[];for(var d=0,e=b[w];d<e;d++){var f={},g=b[d].match(/^([^:]*):?([\d\.]*)/);f.color=a.getRGB(g[1]);if(f.color.error)return null;f.color=f.color.hex;g[2]&&(f.offset=g[2]+"%");c[L](f)}for(d=1,e=c[w]-1;d<e;d++){if(!c[d].offset){var h=S(c[d-1].offset||0),i=0;for(var j=d+1;j<e;j++){if(c[j].offset){i=c[j].offset;break}}if(!i){i=100;j=e}i=S(i);var k=(i-h)/(j-d+1);for(;d<j;d++){h+=k;c[d].offset=h+"%"}}}return c}),by=function(b,c,d,e){var f;if(a.is(b,F)||a.is(b,"object")){f=a.is(b,F)?g.getElementById(b):b;if(f.tagName)return c==null?{container:f,width:f.style.pixelWidth||f.offsetWidth,height:f.style.pixelHeight||f.offsetHeight}:{container:f,width:c,height:d}}else return{container:1,x:b,y:c,width:d,height:e}},bz=function(a,b){var c=this;for(var d in b){if(b[f](d)&&!(d in a))switch(typeof b[d]){case"function":(function(b){a[d]=a===c?b:function(){return b[m](c,arguments)}})(b[d]);break;case"object":a[d]=a[d]||{};bz.call(this,a[d],b[d]);break;default:a[d]=b[d];break}}},bA=function(a,b){a==b.top&&(b.top=a.prev);a==b.bottom&&(b.bottom=a.next);a.next&&(a.next.prev=a.prev);a.prev&&(a.prev.next=a.next)},bB=function(a,b){if(b.top===a)return;bA(a,b);a.next=null;a.prev=b.top;b.top.next=a;b.top=a},bC=function(a,b){if(b.bottom===a)return;bA(a,b);a.next=b.bottom;a.prev=null;b.bottom.prev=a;b.bottom=a},bD=function(a,b,c){bA(a,c);b==c.top&&(c.top=a);b.next&&(b.next.prev=a);a.next=b.next;a.prev=b;b.next=a},bE=function(a,b,c){bA(a,c);b==c.bottom&&(c.bottom=a);b.prev&&(b.prev.next=a);a.prev=b.prev;b.prev=a;a.next=b},bF=function(a){return function(){throw new Error("Raphaël: you are calling to method “"+a+"� of removed object")}};a.pathToRelative=bp;if(a.svg){k.svgns="http://www.w3.org/2000/svg";k.xlink="http://www.w3.org/1999/xlink";Q=function(a){return+a+(~(~a)===a)*0.5};var bG=function(a,b){if(b)for(var c in b)b[f](c)&&a[R](c,r(b[c]));else{a=g.createElementNS(k.svgns,a);a.style.webkitTapHighlightColor="rgba(0,0,0,0)";return a}};a[H]=function(){return"Your browser supports SVG.\nYou are running Raphaël "+this.version};var bH=function(a,b){var c=bG("path");b.canvas&&b.canvas[l](c);var d=new bN(c,b);d.type="path";bK(d,{fill:"none",stroke:"#000",path:a});return d},bI=function(a,b,c){var d="linear",e=0.5,f=0.5,h=a.style;b=r(b)[Y](bd,function(a,b,c){d="radial";if(b&&c){e=S(b);f=S(c);var g=(f>0.5)*2-1;C(e-0.5,2)+C(f-0.5,2)>0.25&&(f=y.sqrt(0.25-C(e-0.5,2))*g+0.5)&&f!=0.5&&(f=f.toFixed(5)-0.00001*g)}return p});b=b[s](/\s*\-\s*/);if(d=="linear"){var i=b.shift();i=-S(i);if(isNaN(i))return null;var j=[0,0,y.cos(i*D/180),y.sin(i*D/180)],k=1/(z(B(j[2]),B(j[3]))||1);j[2]*=k;j[3]*=k;if(j[2]<0){j[0]=-j[2];j[2]=0}if(j[3]<0){j[1]=-j[3];j[3]=0}}var m=bx(b);if(!m)return null;var n=a.getAttribute(I);n=n.match(/^url\(#(.*)\)$/);n&&c.defs.removeChild(g.getElementById(n[1]));var o=bG(d+"Gradient");o.id=bh();bG(o,d=="radial"?{fx:e,fy:f}:{x1:j[0],y1:j[1],x2:j[2],y2:j[3]});c.defs[l](o);for(var q=0,t=m[w];q<t;q++){var u=bG("stop");bG(u,{offset:m[q].offset?m[q].offset:q?"100%":"0%","stop-color":m[q].color||"#fff"});o[l](u)}bG(a,{fill:"url(#"+o.id+")",opacity:1,"fill-opacity":1});h.fill=p;h.opacity=1;h.fillOpacity=1;return 1},bJ=function(b){var c=b.getBBox();bG(b.pattern,{patternTransform:a.format("translate({0},{1})",c.x,c.y)})},bK=function(c,d){var e={"":[0],none:[0],"-":[3,1],".":[1,1],"-.":[3,1,1,1],"-..":[3,1,1,1,1,1],". ":[1,3],"- ":[4,3],"--":[8,3],"- .":[4,3,1,3],"--.":[8,3,1,3],"--..":[8,3,1,3,1,3]},h=c.node,i=c.attrs,j=c.rotate(),k=function(a,b){b=e[x.call(b)];if(b){var c=a.attrs["stroke-width"]||"1",f=({round:c,square:c,butt:0})[a.attrs["stroke-linecap"]||d["stroke-linecap"]]||0,g=[],i=b[w];while(i--)g[i]=b[i]*c+(i%2?1:-1)*f;bG(h,{"stroke-dasharray":g[v](",")})}};d[f]("rotation")&&(j=d.rotation);var m=r(j)[s](b);if(m.length-1){m[1]=+m[1];m[2]=+m[2]}else m=null;S(j)&&c.rotate(0,true);for(var n in d){if(d[f](n)){if(!W[f](n))continue;var o=d[n];i[n]=o;switch(n){case"blur":c.blur(o);break;case"rotation":c.rotate(o,true);break;case"href":case"title":case"target":var t=h.parentNode;if(x.call(t.tagName)!="a"){var u=bG("a");t.insertBefore(u,h);u[l](h);t=u}n=="target"&&o=="blank"?t.setAttributeNS(c.paper.xlink,"show","new"):t.setAttributeNS(c.paper.xlink,n,o);break;case"cursor":h.style.cursor=o;break;case"clip-rect":var y=r(o)[s](b);if(y[w]==4){c.clip&&c.clip.parentNode.parentNode.removeChild(c.clip.parentNode);var z=bG("clipPath"),A=bG("rect");z.id=bh();bG(A,{x:y[0],y:y[1],width:y[2],height:y[3]});z[l](A);c.paper.defs[l](z);bG(h,{"clip-path":"url(#"+z.id+")"});c.clip=A}if(!o){var B=g.getElementById(h.getAttribute("clip-path")[Y](/(^url\(#|\)$)/g,p));B&&B.parentNode.removeChild(B);bG(h,{"clip-path":p});delete c.clip}break;case"path":c.type=="path"&&bG(h,{d:o?i.path=bq(o):"M0,0"});break;case"width":h[R](n,o);if(i.fx){n="x";o=i.x}else break;case"x":i.fx&&(o=-i.x-(i.width||0));case"rx":if(n=="rx"&&c.type=="rect")break;case"cx":m&&(n=="x"||n=="cx")&&(m[1]+=o-i[n]);h[R](n,o);c.pattern&&bJ(c);break;case"height":h[R](n,o);if(i.fy){n="y";o=i.y}else break;case"y":i.fy&&(o=-i.y-(i.height||0));case"ry":if(n=="ry"&&c.type=="rect")break;case"cy":m&&(n=="y"||n=="cy")&&(m[2]+=o-i[n]);h[R](n,o);c.pattern&&bJ(c);break;case"r":c.type=="rect"?bG(h,{rx:o,ry:o}):h[R](n,o);break;case"src":c.type=="image"&&h.setAttributeNS(c.paper.xlink,"href",o);break;case"stroke-width":h.style.strokeWidth=o;h[R](n,o);i["stroke-dasharray"]&&k(c,i["stroke-dasharray"]);break;case"stroke-dasharray":k(c,o);break;case"translation":var C=r(o)[s](b);C[0]=+C[0]||0;C[1]=+C[1]||0;if(m){m[1]+=C[0];m[2]+=C[1]}cz.call(c,C[0],C[1]);break;case"scale":C=r(o)[s](b);c.scale(+C[0]||1,+C[1]||+C[0]||1,isNaN(S(C[2]))?null:+C[2],isNaN(S(C[3]))?null:+C[3]);break;case I:var D=r(o).match(M);if(D){z=bG("pattern");var E=bG("image");z.id=bh();bG(z,{x:0,y:0,patternUnits:"userSpaceOnUse",height:1,width:1});bG(E,{x:0,y:0});E.setAttributeNS(c.paper.xlink,"href",D[1]);z[l](E);var F=g.createElement("img");F.style.cssText="position:absolute;left:-9999em;top-9999em";F.onload=function(){bG(z,{width:this.offsetWidth,height:this.offsetHeight});bG(E,{width:this.offsetWidth,height:this.offsetHeight});g.body.removeChild(this);c.paper.safari()};g.body[l](F);F.src=D[1];c.paper.defs[l](z);h.style.fill="url(#"+z.id+")";bG(h,{fill:"url(#"+z.id+")"});c.pattern=z;c.pattern&&bJ(c);break}var G=a.getRGB(o);if(G.error)if((({circle:1,ellipse:1})[f](c.type)||r(o).charAt()!="r")&&bI(h,o,c.paper)){i.gradient=o;i.fill="none";break}else{delete d.gradient;delete i.gradient;!a.is(i.opacity,"undefined")&&a.is(d.opacity,"undefined")&&bG(h,{opacity:i.opacity});!a.is(i["fill-opacity"],"undefined")&&a.is(d["fill-opacity"],"undefined")&&bG(h,{"fill-opacity":i["fill-opacity"]})}G[f]("opacity")&&bG(h,{"fill-opacity":G.opacity>1?G.opacity/100:G.opacity});case"stroke":G=a.getRGB(o);h[R](n,G.hex);n=="stroke"&&G[f]("opacity")&&bG(h,{"stroke-opacity":G.opacity>1?G.opacity/100:G.opacity});break;case"gradient":(({circle:1,ellipse:1})[f](c.type)||r(o).charAt()!="r")&&bI(h,o,c.paper);break;case"opacity":i.gradient&&!i[f]("stroke-opacity")&&bG(h,{"stroke-opacity":o>1?o/100:o});case"fill-opacity":if(i.gradient){var H=g.getElementById(h.getAttribute(I)[Y](/^url\(#|\)$/g,p));if(H){var J=H.getElementsByTagName("stop");J[J[w]-1][R]("stop-opacity",o)}break}default:n=="font-size"&&(o=T(o,10)+"px");var K=n[Y](/(\-.)/g,function(a){return V.call(a.substring(1))});h.style[K]=o;h[R](n,o);break}}}bM(c,d);m?c.rotate(m.join(q)):S(j)&&c.rotate(j,true)},bL=1.2,bM=function(b,c){if(b.type!="text"||!(c[f]("text")||c[f]("font")||c[f]("font-size")||c[f]("x")||c[f]("y")))return;var d=b.attrs,e=b.node,h=e.firstChild?T(g.defaultView.getComputedStyle(e.firstChild,p).getPropertyValue("font-size"),10):10;if(c[f]("text")){d.text=c.text;while(e.firstChild)e.removeChild(e.firstChild);var i=r(c.text)[s]("\n");for(var j=0,k=i[w];j<k;j++)if(i[j]){var m=bG("tspan");j&&bG(m,{dy:h*bL,x:d.x});m[l](g.createTextNode(i[j]));e[l](m)}}else{i=e.getElementsByTagName("tspan");for(j=0,k=i[w];j<k;j++)j&&bG(i[j],{dy:h*bL,x:d.x})}bG(e,{y:d.y});var n=b.getBBox(),o=d.y-(n.y+n.height/2);o&&a.is(o,"finite")&&bG(e,{y:d.y+o})},bN=function(b,c){var d=0,e=0;this[0]=b;this.id=a._oid++;this.node=b;b.raphael=this;this.paper=c;this.attrs=this.attrs||{};this.transformations=[];this._={tx:0,ty:0,rt:{deg:0,cx:0,cy:0},sx:1,sy:1};!c.bottom&&(c.bottom=this);this.prev=c.top;c.top&&(c.top.next=this);c.top=this;this.next=null},bO=bN[e];bN[e].rotate=function(c,d,e){if(this.removed)return this;if(c==null){if(this._.rt.cx)return[this._.rt.deg,this._.rt.cx,this._.rt.cy][v](q);return this._.rt.deg}var f=this.getBBox();c=r(c)[s](b);if(c[w]-1){d=S(c[1]);e=S(c[2])}c=S(c[0]);d!=null&&d!==false?this._.rt.deg=c:this._.rt.deg+=c;e==null&&(d=null);this._.rt.cx=d;this._.rt.cy=e;d=d==null?f.x+f.width/2:d;e=e==null?f.y+f.height/2:e;if(this._.rt.deg){this.transformations[0]=a.format("rotate({0} {1} {2})",this._.rt.deg,d,e);this.clip&&bG(this.clip,{transform:a.format("rotate({0} {1} {2})",-this._.rt.deg,d,e)})}else{this.transformations[0]=p;this.clip&&bG(this.clip,{transform:p})}bG(this.node,{transform:this.transformations[v](q)});return this};bN[e].hide=function(){!this.removed&&(this.node.style.display="none");return this};bN[e].show=function(){!this.removed&&(this.node.style.display="");return this};bN[e].remove=function(){if(this.removed)return;bA(this,this.paper);this.node.parentNode.removeChild(this.node);for(var a in this)delete this[a];this.removed=true};bN[e].getBBox=function(){if(this.removed)return this;if(this.type=="path")return bn(this.attrs.path);if(this.node.style.display=="none"){this.show();var a=true}var b={};try{b=this.node.getBBox()}catch(a){}finally{b=b||{}}if(this.type=="text"){b={x:b.x,y:Infinity,width:0,height:0};for(var c=0,d=this.node.getNumberOfChars();c<d;c++){var e=this.node.getExtentOfChar(c);e.y<b.y&&(b.y=e.y);e.y+e.height-b.y>b.height&&(b.height=e.y+e.height-b.y);e.x+e.width-b.x>b.width&&(b.width=e.x+e.width-b.x)}}a&&this.hide();return b};bN[e].attr=function(b,c){if(this.removed)return this;if(b==null){var d={};for(var e in this.attrs)this.attrs[f](e)&&(d[e]=this.attrs[e]);this._.rt.deg&&(d.rotation=this.rotate());(this._.sx!=1||this._.sy!=1)&&(d.scale=this.scale());d.gradient&&d.fill=="none"&&(d.fill=d.gradient)&&delete d.gradient;return d}if(c==null&&a.is(b,F)){if(b=="translation")return cz.call(this);if(b=="rotation")return this.rotate();if(b=="scale")return this.scale();if(b==I&&this.attrs.fill=="none"&&this.attrs.gradient)return this.attrs.gradient;return this.attrs[b]}if(c==null&&a.is(b,G)){var g={};for(var h=0,i=b.length;h<i;h++)g[b[h]]=this.attr(b[h]);return g}if(c!=null){var j={};j[b]=c}else b!=null&&a.is(b,"object")&&(j=b);for(var k in this.paper.customAttributes)if(this.paper.customAttributes[f](k)&&j[f](k)&&a.is(this.paper.customAttributes[k],"function")){var l=this.paper.customAttributes[k].apply(this,[][n](j[k]));this.attrs[k]=j[k];for(var m in l)l[f](m)&&(j[m]=l[m])}bK(this,j);return this};bN[e].toFront=function(){if(this.removed)return this;this.node.parentNode[l](this.node);var a=this.paper;a.top!=this&&bB(this,a);return this};bN[e].toBack=function(){if(this.removed)return this;if(this.node.parentNode.firstChild!=this.node){this.node.parentNode.insertBefore(this.node,this.node.parentNode.firstChild);bC(this,this.paper);var a=this.paper}return this};bN[e].insertAfter=function(a){if(this.removed)return this;var b=a.node||a[a.length-1].node;b.nextSibling?b.parentNode.insertBefore(this.node,b.nextSibling):b.parentNode[l](this.node);bD(this,a,this.paper);return this};bN[e].insertBefore=function(a){if(this.removed)return this;var b=a.node||a[0].node;b.parentNode.insertBefore(this.node,b);bE(this,a,this.paper);return this};bN[e].blur=function(a){var b=this;if(+a!==0){var c=bG("filter"),d=bG("feGaussianBlur");b.attrs.blur=a;c.id=bh();bG(d,{stdDeviation:+a||1.5});c.appendChild(d);b.paper.defs.appendChild(c);b._blur=c;bG(b.node,{filter:"url(#"+c.id+")"})}else{if(b._blur){b._blur.parentNode.removeChild(b._blur);delete b._blur;delete b.attrs.blur}b.node.removeAttribute("filter")}};var bP=function(a,b,c,d){var e=bG("circle");a.canvas&&a.canvas[l](e);var f=new bN(e,a);f.attrs={cx:b,cy:c,r:d,fill:"none",stroke:"#000"};f.type="circle";bG(e,f.attrs);return f},bQ=function(a,b,c,d,e,f){var g=bG("rect");a.canvas&&a.canvas[l](g);var h=new bN(g,a);h.attrs={x:b,y:c,width:d,height:e,r:f||0,rx:f||0,ry:f||0,fill:"none",stroke:"#000"};h.type="rect";bG(g,h.attrs);return h},bR=function(a,b,c,d,e){var f=bG("ellipse");a.canvas&&a.canvas[l](f);var g=new bN(f,a);g.attrs={cx:b,cy:c,rx:d,ry:e,fill:"none",stroke:"#000"};g.type="ellipse";bG(f,g.attrs);return g},bS=function(a,b,c,d,e,f){var g=bG("image");bG(g,{x:c,y:d,width:e,height:f,preserveAspectRatio:"none"});g.setAttributeNS(a.xlink,"href",b);a.canvas&&a.canvas[l](g);var h=new bN(g,a);h.attrs={x:c,y:d,width:e,height:f,src:b};h.type="image";return h},bT=function(a,b,c,d){var e=bG("text");bG(e,{x:b,y:c,"text-anchor":"middle"});a.canvas&&a.canvas[l](e);var f=new bN(e,a);f.attrs={x:b,y:c,"text-anchor":"middle",text:d,font:W.font,stroke:"none",fill:"#000"};f.type="text";bK(f,f.attrs);return f},bU=function(a,b){this.width=a||this.width;this.height=b||this.height;this.canvas[R]("width",this.width);this.canvas[R]("height",this.height);return this},bV=function(){var b=by[m](0,arguments),c=b&&b.container,d=b.x,e=b.y,f=b.width,h=b.height;if(!c)throw new Error("SVG container not found.");var i=bG("svg");d=d||0;e=e||0;f=f||512;h=h||342;bG(i,{xmlns:"http://www.w3.org/2000/svg",version:1.1,width:f,height:h});if(c==1){i.style.cssText="position:absolute;left:"+d+"px;top:"+e+"px";g.body[l](i)}else c.firstChild?c.insertBefore(i,c.firstChild):c[l](i);c=new j;c.width=f;c.height=h;c.canvas=i;bz.call(c,c,a.fn);c.clear();return c};k.clear=function(){var a=this.canvas;while(a.firstChild)a.removeChild(a.firstChild);this.bottom=this.top=null;(this.desc=bG("desc"))[l](g.createTextNode("Created with Raphaël"));a[l](this.desc);a[l](this.defs=bG("defs"))};k.remove=function(){this.canvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas);for(var a in this)this[a]=bF(a)}}if(a.vml){var bW={M:"m",L:"l",C:"c",Z:"x",m:"t",l:"r",c:"v",z:"x"},bX=/([clmz]),?([^clmz]*)/gi,bY=/ progid:\S+Blur\([^\)]+\)/g,bZ=/-?[^,\s-]+/g,b$=1000+q+1000,b_=10,ca={path:1,rect:1},cb=function(a){var b=/[ahqstv]/ig,c=bq;r(a).match(b)&&(c=bw);b=/[clmz]/g;if(c==bq&&!r(a).match(b)){var d=r(a)[Y](bX,function(a,b,c){var d=[],e=x.call(b)=="m",f=bW[b];c[Y](bZ,function(a){if(e&&d[w]==2){f+=d+bW[b=="m"?"l":"L"];d=[]}d[L](Q(a*b_))});return f+d});return d}var e=c(a),f,g;d=[];for(var h=0,i=e[w];h<i;h++){f=e[h];g=x.call(e[h][0]);g=="z"&&(g="x");for(var j=1,k=f[w];j<k;j++)g+=Q(f[j]*b_)+(j!=k-1?",":p);d[L](g)}return d[v](q)};a[H]=function(){return"Your browser doesn’t support SVG. Falling down to VML.\nYou are running Raphaël "+this.version};bH=function(a,b){var c=cd("group");c.style.cssText="position:absolute;left:0;top:0;width:"+b.width+"px;height:"+b.height+"px";c.coordsize=b.coordsize;c.coordorigin=b.coordorigin;var d=cd("shape"),e=d.style;e.width=b.width+"px";e.height=b.height+"px";d.coordsize=b$;d.coordorigin=b.coordorigin;c[l](d);var f=new bN(d,c,b),g={fill:"none",stroke:"#000"};a&&(g.path=a);f.type="path";f.path=[];f.Path=p;bK(f,g);b.canvas[l](c);return f};bK=function(c,d){c.attrs=c.attrs||{};var e=c.node,h=c.attrs,i=e.style,j,k=(d.x!=h.x||d.y!=h.y||d.width!=h.width||d.height!=h.height||d.r!=h.r)&&c.type=="rect",m=c;for(var n in d)d[f](n)&&(h[n]=d[n]);if(k){h.path=cc(h.x,h.y,h.width,h.height,h.r);c.X=h.x;c.Y=h.y;c.W=h.width;c.H=h.height}d.href&&(e.href=d.href);d.title&&(e.title=d.title);d.target&&(e.target=d.target);d.cursor&&(i.cursor=d.cursor);"blur"in d&&c.blur(d.blur);if(d.path&&c.type=="path"||k)e.path=cb(h.path);d.rotation!=null&&c.rotate(d.rotation,true);if(d.translation){j=r(d.translation)[s](b);cz.call(c,j[0],j[1]);if(c._.rt.cx!=null){c._.rt.cx+=+j[0];c._.rt.cy+=+j[1];c.setBox(c.attrs,j[0],j[1])}}if(d.scale){j=r(d.scale)[s](b);c.scale(+j[0]||1,+j[1]||+j[0]||1,+j[2]||null,+j[3]||null)}if("clip-rect"in d){var o=r(d["clip-rect"])[s](b);if(o[w]==4){o[2]=+o[2]+ +o[0];o[3]=+o[3]+ +o[1];var q=e.clipRect||g.createElement("div"),t=q.style,u=e.parentNode;t.clip=a.format("rect({1}px {2}px {3}px {0}px)",o);if(!e.clipRect){t.position="absolute";t.top=0;t.left=0;t.width=c.paper.width+"px";t.height=c.paper.height+"px";u.parentNode.insertBefore(q,u);q[l](u);e.clipRect=q}}d["clip-rect"]||e.clipRect&&(e.clipRect.style.clip=p)}c.type=="image"&&d.src&&(e.src=d.src);if(c.type=="image"&&d.opacity){e.filterOpacity=U+".Alpha(opacity="+d.opacity*100+")";i.filter=(e.filterMatrix||p)+(e.filterOpacity||p)}d.font&&(i.font=d.font);d["font-family"]&&(i.fontFamily="\""+d["font-family"][s](",")[0][Y](/^['"]+|['"]+$/g,p)+"\"");d["font-size"]&&(i.fontSize=d["font-size"]);d["font-weight"]&&(i.fontWeight=d["font-weight"]);d["font-style"]&&(i.fontStyle=d["font-style"]);if(d.opacity!=null||d["stroke-width"]!=null||d.fill!=null||d.stroke!=null||d["stroke-width"]!=null||d["stroke-opacity"]!=null||d["fill-opacity"]!=null||d["stroke-dasharray"]!=null||d["stroke-miterlimit"]!=null||d["stroke-linejoin"]!=null||d["stroke-linecap"]!=null){e=c.shape||e;var v=e.getElementsByTagName(I)&&e.getElementsByTagName(I)[0],x=false;!v&&(x=v=cd(I));if("fill-opacity"in d||"opacity"in d){var y=((+h["fill-opacity"]+1||2)-1)*((+h.opacity+1||2)-1)*((+a.getRGB(d.fill).o+1||2)-1);y=A(z(y,0),1);v.opacity=y}d.fill&&(v.on=true);if(v.on==null||d.fill=="none")v.on=false;if(v.on&&d.fill){var B=d.fill.match(M);if(B){v.src=B[1];v.type="tile"}else{v.color=a.getRGB(d.fill).hex;v.src=p;v.type="solid";if(a.getRGB(d.fill).error&&(m.type in{circle:1,ellipse:1}||r(d.fill).charAt()!="r")&&bI(m,d.fill)){h.fill="none";h.gradient=d.fill}}}x&&e[l](v);var C=e.getElementsByTagName("stroke")&&e.getElementsByTagName("stroke")[0],D=false;!C&&(D=C=cd("stroke"));if(d.stroke&&d.stroke!="none"||d["stroke-width"]||d["stroke-opacity"]!=null||d["stroke-dasharray"]||d["stroke-miterlimit"]||d["stroke-linejoin"]||d["stroke-linecap"])C.on=true;(d.stroke=="none"||C.on==null||d.stroke==0||d["stroke-width"]==0)&&(C.on=false);var E=a.getRGB(d.stroke);C.on&&d.stroke&&(C.color=E.hex);y=((+h["stroke-opacity"]+1||2)-1)*((+h.opacity+1||2)-1)*((+E.o+1||2)-1);var F=(S(d["stroke-width"])||1)*0.75;y=A(z(y,0),1);d["stroke-width"]==null&&(F=h["stroke-width"]);d["stroke-width"]&&(C.weight=F);F&&F<1&&(y*=F)&&(C.weight=1);C.opacity=y;d["stroke-linejoin"]&&(C.joinstyle=d["stroke-linejoin"]||"miter");C.miterlimit=d["stroke-miterlimit"]||8;d["stroke-linecap"]&&(C.endcap=d["stroke-linecap"]=="butt"?"flat":d["stroke-linecap"]=="square"?"square":"round");if(d["stroke-dasharray"]){var G={"-":"shortdash",".":"shortdot","-.":"shortdashdot","-..":"shortdashdotdot",". ":"dot","- ":"dash","--":"longdash","- .":"dashdot","--.":"longdashdot","--..":"longdashdotdot"};C.dashstyle=G[f](d["stroke-dasharray"])?G[d["stroke-dasharray"]]:p}D&&e[l](C)}if(m.type=="text"){i=m.paper.span.style;h.font&&(i.font=h.font);h["font-family"]&&(i.fontFamily=h["font-family"]);h["font-size"]&&(i.fontSize=h["font-size"]);h["font-weight"]&&(i.fontWeight=h["font-weight"]);h["font-style"]&&(i.fontStyle=h["font-style"]);m.node.string&&(m.paper.span.innerHTML=r(m.node.string)[Y](/</g,"&#60;")[Y](/&/g,"&#38;")[Y](/\n/g,"<br>"));m.W=h.w=m.paper.span.offsetWidth;m.H=h.h=m.paper.span.offsetHeight;m.X=h.x;m.Y=h.y+Q(m.H/2);switch(h["text-anchor"]){case"start":m.node.style["v-text-align"]="left";m.bbx=Q(m.W/2);break;case"end":m.node.style["v-text-align"]="right";m.bbx=-Q(m.W/2);break;default:m.node.style["v-text-align"]="center";break}}};bI=function(a,b){a.attrs=a.attrs||{};var c=a.attrs,d,e="linear",f=".5 .5";a.attrs.gradient=b;b=r(b)[Y](bd,function(a,b,c){e="radial";if(b&&c){b=S(b);c=S(c);C(b-0.5,2)+C(c-0.5,2)>0.25&&(c=y.sqrt(0.25-C(b-0.5,2))*((c>0.5)*2-1)+0.5);f=b+q+c}return p});b=b[s](/\s*\-\s*/);if(e=="linear"){var g=b.shift();g=-S(g);if(isNaN(g))return null}var h=bx(b);if(!h)return null;a=a.shape||a.node;d=a.getElementsByTagName(I)[0]||cd(I);!d.parentNode&&a.appendChild(d);if(h[w]){d.on=true;d.method="none";d.color=h[0].color;d.color2=h[h[w]-1].color;var i=[];for(var j=0,k=h[w];j<k;j++)h[j].offset&&i[L](h[j].offset+q+h[j].color);d.colors&&(d.colors.value=i[w]?i[v]():"0% "+d.color);if(e=="radial"){d.type="gradientradial";d.focus="100%";d.focussize=f;d.focusposition=f}else{d.type="gradient";d.angle=(270-g)%360}}return 1};bN=function(b,c,d){var e=0,f=0,g=0,h=1;this[0]=b;this.id=a._oid++;this.node=b;b.raphael=this;this.X=0;this.Y=0;this.attrs={};this.Group=c;this.paper=d;this._={tx:0,ty:0,rt:{deg:0},sx:1,sy:1};!d.bottom&&(d.bottom=this);this.prev=d.top;d.top&&(d.top.next=this);d.top=this;this.next=null};bO=bN[e];bO.rotate=function(a,c,d){if(this.removed)return this;if(a==null){if(this._.rt.cx)return[this._.rt.deg,this._.rt.cx,this._.rt.cy][v](q);return this._.rt.deg}a=r(a)[s](b);if(a[w]-1){c=S(a[1]);d=S(a[2])}a=S(a[0]);c!=null?this._.rt.deg=a:this._.rt.deg+=a;d==null&&(c=null);this._.rt.cx=c;this._.rt.cy=d;this.setBox(this.attrs,c,d);this.Group.style.rotation=this._.rt.deg;return this};bO.setBox=function(a,b,c){if(this.removed)return this;var d=this.Group.style,e=this.shape&&this.shape.style||this.node.style;a=a||{};for(var g in a)a[f](g)&&(this.attrs[g]=a[g]);b=b||this._.rt.cx;c=c||this._.rt.cy;var h=this.attrs,i,j,k,l;switch(this.type){case"circle":i=h.cx-h.r;j=h.cy-h.r;k=l=h.r*2;break;case"ellipse":i=h.cx-h.rx;j=h.cy-h.ry;k=h.rx*2;l=h.ry*2;break;case"image":i=+h.x;j=+h.y;k=h.width||0;l=h.height||0;break;case"text":this.textpath.v=["m",Q(h.x),", ",Q(h.y-2),"l",Q(h.x)+1,", ",Q(h.y-2)][v](p);i=h.x-Q(this.W/2);j=h.y-this.H/2;k=this.W;l=this.H;break;case"rect":case"path":if(this.attrs.path){var m=bn(this.attrs.path);i=m.x;j=m.y;k=m.width;l=m.height}else{i=0;j=0;k=this.paper.width;l=this.paper.height}break;default:i=0;j=0;k=this.paper.width;l=this.paper.height;break}b=b==null?i+k/2:b;c=c==null?j+l/2:c;var n=b-this.paper.width/2,o=c-this.paper.height/2,q;d.left!=(q=n+"px")&&(d.left=q);d.top!=(q=o+"px")&&(d.top=q);this.X=ca[f](this.type)?-n:i;this.Y=ca[f](this.type)?-o:j;this.W=k;this.H=l;if(ca[f](this.type)){e.left!=(q=-n*b_+"px")&&(e.left=q);e.top!=(q=-o*b_+"px")&&(e.top=q)}else if(this.type=="text"){e.left!=(q=-n+"px")&&(e.left=q);e.top!=(q=-o+"px")&&(e.top=q)}else{d.width!=(q=this.paper.width+"px")&&(d.width=q);d.height!=(q=this.paper.height+"px")&&(d.height=q);e.left!=(q=i-n+"px")&&(e.left=q);e.top!=(q=j-o+"px")&&(e.top=q);e.width!=(q=k+"px")&&(e.width=q);e.height!=(q=l+"px")&&(e.height=q)}};bO.hide=function(){!this.removed&&(this.Group.style.display="none");return this};bO.show=function(){!this.removed&&(this.Group.style.display="block");return this};bO.getBBox=function(){if(this.removed)return this;if(ca[f](this.type))return bn(this.attrs.path);return{x:this.X+(this.bbx||0),y:this.Y,width:this.W,height:this.H}};bO.remove=function(){if(this.removed)return;bA(this,this.paper);this.node.parentNode.removeChild(this.node);this.Group.parentNode.removeChild(this.Group);this.shape&&this.shape.parentNode.removeChild(this.shape);for(var a in this)delete this[a];this.removed=true};bO.attr=function(b,c){if(this.removed)return this;if(b==null){var d={};for(var e in this.attrs)this.attrs[f](e)&&(d[e]=this.attrs[e]);this._.rt.deg&&(d.rotation=this.rotate());(this._.sx!=1||this._.sy!=1)&&(d.scale=this.scale());d.gradient&&d.fill=="none"&&(d.fill=d.gradient)&&delete d.gradient;return d}if(c==null&&a.is(b,"string")){if(b=="translation")return cz.call(this);if(b=="rotation")return this.rotate();if(b=="scale")return this.scale();if(b==I&&this.attrs.fill=="none"&&this.attrs.gradient)return this.attrs.gradient;return this.attrs[b]}if(this.attrs&&c==null&&a.is(b,G)){var g,h={};for(e=0,g=b[w];e<g;e++)h[b[e]]=this.attr(b[e]);return h}var i;if(c!=null){i={};i[b]=c}c==null&&a.is(b,"object")&&(i=b);if(i){for(var j in this.paper.customAttributes)if(this.paper.customAttributes[f](j)&&i[f](j)&&a.is(this.paper.customAttributes[j],"function")){var k=this.paper.customAttributes[j].apply(this,[][n](i[j]));this.attrs[j]=i[j];for(var l in k)k[f](l)&&(i[l]=k[l])}i.text&&this.type=="text"&&(this.node.string=i.text);bK(this,i);i.gradient&&(({circle:1,ellipse:1})[f](this.type)||r(i.gradient).charAt()!="r")&&bI(this,i.gradient);(!ca[f](this.type)||this._.rt.deg)&&this.setBox(this.attrs)}return this};bO.toFront=function(){!this.removed&&this.Group.parentNode[l](this.Group);this.paper.top!=this&&bB(this,this.paper);return this};bO.toBack=function(){if(this.removed)return this;if(this.Group.parentNode.firstChild!=this.Group){this.Group.parentNode.insertBefore(this.Group,this.Group.parentNode.firstChild);bC(this,this.paper)}return this};bO.insertAfter=function(a){if(this.removed)return this;a.constructor==cC&&(a=a[a.length-1]);a.Group.nextSibling?a.Group.parentNode.insertBefore(this.Group,a.Group.nextSibling):a.Group.parentNode[l](this.Group);bD(this,a,this.paper);return this};bO.insertBefore=function(a){if(this.removed)return this;a.constructor==cC&&(a=a[0]);a.Group.parentNode.insertBefore(this.Group,a.Group);bE(this,a,this.paper);return this};bO.blur=function(b){var c=this.node.runtimeStyle,d=c.filter;d=d.replace(bY,p);if(+b!==0){this.attrs.blur=b;c.filter=d+q+U+".Blur(pixelradius="+(+b||1.5)+")";c.margin=a.format("-{0}px 0 0 -{0}px",Q(+b||1.5))}else{c.filter=d;c.margin=0;delete this.attrs.blur}};bP=function(a,b,c,d){var e=cd("group"),f=cd("oval"),g=f.style;e.style.cssText="position:absolute;left:0;top:0;width:"+a.width+"px;height:"+a.height+"px";e.coordsize=b$;e.coordorigin=a.coordorigin;e[l](f);var h=new bN(f,e,a);h.type="circle";bK(h,{stroke:"#000",fill:"none"});h.attrs.cx=b;h.attrs.cy=c;h.attrs.r=d;h.setBox({x:b-d,y:c-d,width:d*2,height:d*2});a.canvas[l](e);return h};function cc(b,c,d,e,f){return f?a.format("M{0},{1}l{2},0a{3},{3},0,0,1,{3},{3}l0,{5}a{3},{3},0,0,1,{4},{3}l{6},0a{3},{3},0,0,1,{4},{4}l0,{7}a{3},{3},0,0,1,{3},{4}z",b+f,c,d-f*2,f,-f,e-f*2,f*2-d,f*2-e):a.format("M{0},{1}l{2},0,0,{3},{4},0z",b,c,d,e,-d)}bQ=function(a,b,c,d,e,f){var g=cc(b,c,d,e,f),h=a.path(g),i=h.attrs;h.X=i.x=b;h.Y=i.y=c;h.W=i.width=d;h.H=i.height=e;i.r=f;i.path=g;h.type="rect";return h};bR=function(a,b,c,d,e){var f=cd("group"),g=cd("oval"),h=g.style;f.style.cssText="position:absolute;left:0;top:0;width:"+a.width+"px;height:"+a.height+"px";f.coordsize=b$;f.coordorigin=a.coordorigin;f[l](g);var i=new bN(g,f,a);i.type="ellipse";bK(i,{stroke:"#000"});i.attrs.cx=b;i.attrs.cy=c;i.attrs.rx=d;i.attrs.ry=e;i.setBox({x:b-d,y:c-e,width:d*2,height:e*2});a.canvas[l](f);return i};bS=function(a,b,c,d,e,f){var g=cd("group"),h=cd("image");g.style.cssText="position:absolute;left:0;top:0;width:"+a.width+"px;height:"+a.height+"px";g.coordsize=b$;g.coordorigin=a.coordorigin;h.src=b;g[l](h);var i=new bN(h,g,a);i.type="image";i.attrs.src=b;i.attrs.x=c;i.attrs.y=d;i.attrs.w=e;i.attrs.h=f;i.setBox({x:c,y:d,width:e,height:f});a.canvas[l](g);return i};bT=function(b,c,d,e){var f=cd("group"),g=cd("shape"),h=g.style,i=cd("path"),j=i.style,k=cd("textpath");f.style.cssText="position:absolute;left:0;top:0;width:"+b.width+"px;height:"+b.height+"px";f.coordsize=b$;f.coordorigin=b.coordorigin;i.v=a.format("m{0},{1}l{2},{1}",Q(c*10),Q(d*10),Q(c*10)+1);i.textpathok=true;h.width=b.width;h.height=b.height;k.string=r(e);k.on=true;g[l](k);g[l](i);f[l](g);var m=new bN(k,f,b);m.shape=g;m.textpath=i;m.type="text";m.attrs.text=e;m.attrs.x=c;m.attrs.y=d;m.attrs.w=1;m.attrs.h=1;bK(m,{font:W.font,stroke:"none",fill:"#000"});m.setBox();b.canvas[l](f);return m};bU=function(a,b){var c=this.canvas.style;a==+a&&(a+="px");b==+b&&(b+="px");c.width=a;c.height=b;c.clip="rect(0 "+a+" "+b+" 0)";return this};var cd;g.createStyleSheet().addRule(".rvml","behavior:url(#default#VML)");try{!g.namespaces.rvml&&g.namespaces.add("rvml","urn:schemas-microsoft-com:vml");cd=function(a){return g.createElement("<rvml:"+a+" class=\"rvml\">")}}catch(a){cd=function(a){return g.createElement("<"+a+" xmlns=\"urn:schemas-microsoft.com:vml\" class=\"rvml\">")}}bV=function(){var b=by[m](0,arguments),c=b.container,d=b.height,e,f=b.width,h=b.x,i=b.y;if(!c)throw new Error("VML container not found.");var k=new j,n=k.canvas=g.createElement("div"),o=n.style;h=h||0;i=i||0;f=f||512;d=d||342;f==+f&&(f+="px");d==+d&&(d+="px");k.width=1000;k.height=1000;k.coordsize=b_*1000+q+b_*1000;k.coordorigin="0 0";k.span=g.createElement("span");k.span.style.cssText="position:absolute;left:-9999em;top:-9999em;padding:0;margin:0;line-height:1;display:inline;";n[l](k.span);o.cssText=a.format("top:0;left:0;width:{0};height:{1};display:inline-block;position:relative;clip:rect(0 {0} {1} 0);overflow:hidden",f,d);if(c==1){g.body[l](n);o.left=h+"px";o.top=i+"px";o.position="absolute"}else c.firstChild?c.insertBefore(n,c.firstChild):c[l](n);bz.call(k,k,a.fn);return k};k.clear=function(){this.canvas.innerHTML=p;this.span=g.createElement("span");this.span.style.cssText="position:absolute;left:-9999em;top:-9999em;padding:0;margin:0;line-height:1;display:inline;";this.canvas[l](this.span);this.bottom=this.top=null};k.remove=function(){this.canvas.parentNode.removeChild(this.canvas);for(var a in this)this[a]=bF(a);return true}}var ce=navigator.userAgent.match(/Version\\x2f(.*?)\s/);navigator.vendor=="Apple Computer, Inc."&&(ce&&ce[1]<4||navigator.platform.slice(0,2)=="iP")?k.safari=function(){var a=this.rect(-99,-99,this.width+99,this.height+99).attr({stroke:"none"});h.setTimeout(function(){a.remove()})}:k.safari=function(){};var cf=function(){this.returnValue=false},cg=function(){return this.originalEvent.preventDefault()},ch=function(){this.cancelBubble=true},ci=function(){return this.originalEvent.stopPropagation()},cj=(function(){{if(g.addEventListener)return function(a,b,c,d){var e=o&&u[b]?u[b]:b,g=function(e){if(o&&u[f](b))for(var g=0,h=e.targetTouches&&e.targetTouches.length;g<h;g++){if(e.targetTouches[g].target==a){var i=e;e=e.targetTouches[g];e.originalEvent=i;e.preventDefault=cg;e.stopPropagation=ci;break}}return c.call(d,e)};a.addEventListener(e,g,false);return function(){a.removeEventListener(e,g,false);return true}};if(g.attachEvent)return function(a,b,c,d){var e=function(a){a=a||h.event;a.preventDefault=a.preventDefault||cf;a.stopPropagation=a.stopPropagation||ch;return c.call(d,a)};a.attachEvent("on"+b,e);var f=function(){a.detachEvent("on"+b,e);return true};return f}}})(),ck=[],cl=function(a){var b=a.clientX,c=a.clientY,d=g.documentElement.scrollTop||g.body.scrollTop,e=g.documentElement.scrollLeft||g.body.scrollLeft,f,h=ck.length;while(h--){f=ck[h];if(o){var i=a.touches.length,j;while(i--){j=a.touches[i];if(j.identifier==f.el._drag.id){b=j.clientX;c=j.clientY;(a.originalEvent?a.originalEvent:a).preventDefault();break}}}else a.preventDefault();b+=e;c+=d;f.move&&f.move.call(f.move_scope||f.el,b-f.el._drag.x,c-f.el._drag.y,b,c,a)}},cm=function(b){a.unmousemove(cl).unmouseup(cm);var c=ck.length,d;while(c--){d=ck[c];d.el._drag={};d.end&&d.end.call(d.end_scope||d.start_scope||d.move_scope||d.el,b)}ck=[]};for(var cn=t[w];cn--;)(function(b){a[b]=bN[e][b]=function(c,d){if(a.is(c,"function")){this.events=this.events||[];this.events.push({name:b,f:c,unbind:cj(this.shape||this.node||g,b,c,d||this)})}return this};a["un"+b]=bN[e]["un"+b]=function(a){var c=this.events,d=c[w];while(d--)if(c[d].name==b&&c[d].f==a){c[d].unbind();c.splice(d,1);!c.length&&delete this.events;return this}return this}})(t[cn]);bO.hover=function(a,b,c,d){return this.mouseover(a,c).mouseout(b,d||c)};bO.unhover=function(a,b){return this.unmouseover(a).unmouseout(b)};bO.drag=function(b,c,d,e,f,h){this._drag={};this.mousedown(function(i){(i.originalEvent||i).preventDefault();var j=g.documentElement.scrollTop||g.body.scrollTop,k=g.documentElement.scrollLeft||g.body.scrollLeft;this._drag.x=i.clientX+k;this._drag.y=i.clientY+j;this._drag.id=i.identifier;c&&c.call(f||e||this,i.clientX+k,i.clientY+j,i);!ck.length&&a.mousemove(cl).mouseup(cm);ck.push({el:this,move:b,end:d,move_scope:e,start_scope:f,end_scope:h})});return this};bO.undrag=function(b,c,d){var e=ck.length;while(e--)ck[e].el==this&&(ck[e].move==b&&ck[e].end==d)&&ck.splice(e++,1);!ck.length&&a.unmousemove(cl).unmouseup(cm)};k.circle=function(a,b,c){return bP(this,a||0,b||0,c||0)};k.rect=function(a,b,c,d,e){return bQ(this,a||0,b||0,c||0,d||0,e||0)};k.ellipse=function(a,b,c,d){return bR(this,a||0,b||0,c||0,d||0)};k.path=function(b){b&&!a.is(b,F)&&!a.is(b[0],G)&&(b+=p);return bH(a.format[m](a,arguments),this)};k.image=function(a,b,c,d,e){return bS(this,a||"about:blank",b||0,c||0,d||0,e||0)};k.text=function(a,b,c){return bT(this,a||0,b||0,r(c))};k.set=function(a){arguments[w]>1&&(a=Array[e].splice.call(arguments,0,arguments[w]));return new cC(a)};k.setSize=bU;k.top=k.bottom=null;k.raphael=a;function co(){return this.x+q+this.y}bO.resetScale=function(){if(this.removed)return this;this._.sx=1;this._.sy=1;this.attrs.scale="1 1"};bO.scale=function(a,b,c,d){if(this.removed)return this;if(a==null&&b==null)return{x:this._.sx,y:this._.sy,toString:co};b=b||a;!(+b)&&(b=a);var e,f,g,h,i=this.attrs;if(a!=0){var j=this.getBBox(),k=j.x+j.width/2,l=j.y+j.height/2,m=B(a/this._.sx),o=B(b/this._.sy);c=+c||c==0?c:k;d=+d||d==0?d:l;var r=this._.sx>0,s=this._.sy>0,t=~(~(a/B(a))),u=~(~(b/B(b))),x=m*t,y=o*u,z=this.node.style,A=c+B(k-c)*x*(k>c==r?1:-1),C=d+B(l-d)*y*(l>d==s?1:-1),D=a*t>b*u?o:m;switch(this.type){case"rect":case"image":var E=i.width*m,F=i.height*o;this.attr({height:F,r:i.r*D,width:E,x:A-E/2,y:C-F/2});break;case"circle":case"ellipse":this.attr({rx:i.rx*m,ry:i.ry*o,r:i.r*D,cx:A,cy:C});break;case"text":this.attr({x:A,y:C});break;case"path":var G=bp(i.path),H=true,I=r?x:m,J=s?y:o;for(var K=0,L=G[w];K<L;K++){var M=G[K],N=V.call(M[0]);{if(N=="M"&&H)continue;H=false}if(N=="A"){M[G[K][w]-2]*=I;M[G[K][w]-1]*=J;M[1]*=m;M[2]*=o;M[5]=+(t+u?!(!(+M[5])):!(+M[5]))}else if(N=="H")for(var O=1,P=M[w];O<P;O++)M[O]*=I;else if(N=="V")for(O=1,P=M[w];O<P;O++)M[O]*=J;else for(O=1,P=M[w];O<P;O++)M[O]*=O%2?I:J}var Q=bn(G);e=A-Q.x-Q.width/2;f=C-Q.y-Q.height/2;G[0][1]+=e;G[0][2]+=f;this.attr({path:G});break}if(this.type in{text:1,image:1}&&(t!=1||u!=1))if(this.transformations){this.transformations[2]="scale("[n](t,",",u,")");this.node[R]("transform",this.transformations[v](q));e=t==-1?-i.x-(E||0):i.x;f=u==-1?-i.y-(F||0):i.y;this.attr({x:e,y:f});i.fx=t-1;i.fy=u-1}else{this.node.filterMatrix=U+".Matrix(M11="[n](t,", M12=0, M21=0, M22=",u,", Dx=0, Dy=0, sizingmethod='auto expand', filtertype='bilinear')");z.filter=(this.node.filterMatrix||p)+(this.node.filterOpacity||p)}else if(this.transformations){this.transformations[2]=p;this.node[R]("transform",this.transformations[v](q));i.fx=0;i.fy=0}else{this.node.filterMatrix=p;z.filter=(this.node.filterMatrix||p)+(this.node.filterOpacity||p)}i.scale=[a,b,c,d][v](q);this._.sx=a;this._.sy=b}return this};bO.clone=function(){if(this.removed)return null;var a=this.attr();delete a.scale;delete a.translation;return this.paper[this.type]().attr(a)};var cp={},cq=function(b,c,d,e,f,g,h,i,j){var k=0,l=100,m=[b,c,d,e,f,g,h,i].join(),n=cp[m],o,p;!n&&(cp[m]=n={data:[]});n.timer&&clearTimeout(n.timer);n.timer=setTimeout(function(){delete cp[m]},2000);if(j!=null){var q=cq(b,c,d,e,f,g,h,i);l=~(~q)*10}for(var r=0;r<l+1;r++){if(n.data[j]>r)p=n.data[r*l];else{p=a.findDotsAtSegment(b,c,d,e,f,g,h,i,r/l);n.data[r]=p}r&&(k+=C(C(o.x-p.x,2)+C(o.y-p.y,2),0.5));if(j!=null&&k>=j)return p;o=p}if(j==null)return k},cr=function(b,c){return function(d,e,f){d=bw(d);var g,h,i,j,k="",l={},m,n=0;for(var o=0,p=d.length;o<p;o++){i=d[o];if(i[0]=="M"){g=+i[1];h=+i[2]}else{j=cq(g,h,i[1],i[2],i[3],i[4],i[5],i[6]);if(n+j>e){if(c&&!l.start){m=cq(g,h,i[1],i[2],i[3],i[4],i[5],i[6],e-n);k+=["C",m.start.x,m.start.y,m.m.x,m.m.y,m.x,m.y];if(f)return k;l.start=k;k=["M",m.x,m.y+"C",m.n.x,m.n.y,m.end.x,m.end.y,i[5],i[6]][v]();n+=j;g=+i[5];h=+i[6];continue}if(!b&&!c){m=cq(g,h,i[1],i[2],i[3],i[4],i[5],i[6],e-n);return{x:m.x,y:m.y,alpha:m.alpha}}}n+=j;g=+i[5];h=+i[6]}k+=i}l.end=k;m=b?n:c?l:a.findDotsAtSegment(g,h,i[1],i[2],i[3],i[4],i[5],i[6],1);m.alpha&&(m={x:m.x,y:m.y,alpha:m.alpha});return m}},cs=cr(1),ct=cr(),cu=cr(0,1);bO.getTotalLength=function(){if(this.type!="path")return;if(this.node.getTotalLength)return this.node.getTotalLength();return cs(this.attrs.path)};bO.getPointAtLength=function(a){if(this.type!="path")return;return ct(this.attrs.path,a)};bO.getSubpath=function(a,b){if(this.type!="path")return;if(B(this.getTotalLength()-b)<"1e-6")return cu(this.attrs.path,a).end;var c=cu(this.attrs.path,b,1);return a?cu(c,a).end:c};a.easing_formulas={linear:function(a){return a},"<":function(a){return C(a,3)},">":function(a){return C(a-1,3)+1},"<>":function(a){a=a*2;if(a<1)return C(a,3)/2;a-=2;return(C(a,3)+2)/2},backIn:function(a){var b=1.70158;return a*a*((b+1)*a-b)},backOut:function(a){a=a-1;var b=1.70158;return a*a*((b+1)*a+b)+1},elastic:function(a){if(a==0||a==1)return a;var b=0.3,c=b/4;return C(2,-10*a)*y.sin((a-c)*(2*D)/b)+1},bounce:function(a){var b=7.5625,c=2.75,d;if(a<1/c)d=b*a*a;else if(a<2/c){a-=1.5/c;d=b*a*a+0.75}else if(a<2.5/c){a-=2.25/c;d=b*a*a+0.9375}else{a-=2.625/c;d=b*a*a+0.984375}return d}};var cv=[],cw=function(){var b=+(new Date);for(var c=0;c<cv[w];c++){var d=cv[c];if(d.stop||d.el.removed)continue;var e=b-d.start,g=d.ms,h=d.easing,i=d.from,j=d.diff,k=d.to,l=d.t,m=d.el,n={},o;if(e<g){var r=h(e/g);for(var s in i)if(i[f](s)){switch(X[s]){case"along":o=r*g*j[s];k.back&&(o=k.len-o);var t=ct(k[s],o);m.translate(j.sx-j.x||0,j.sy-j.y||0);j.x=t.x;j.y=t.y;m.translate(t.x-j.sx,t.y-j.sy);k.rot&&m.rotate(j.r+t.alpha,t.x,t.y);break;case E:o=+i[s]+r*g*j[s];break;case"colour":o="rgb("+[cy(Q(i[s].r+r*g*j[s].r)),cy(Q(i[s].g+r*g*j[s].g)),cy(Q(i[s].b+r*g*j[s].b))][v](",")+")";break;case"path":o=[];for(var u=0,x=i[s][w];u<x;u++){o[u]=[i[s][u][0]];for(var y=1,z=i[s][u][w];y<z;y++)o[u][y]=+i[s][u][y]+r*g*j[s][u][y];o[u]=o[u][v](q)}o=o[v](q);break;case"csv":switch(s){case"translation":var A=r*g*j[s][0]-l.x,B=r*g*j[s][1]-l.y;l.x+=A;l.y+=B;o=A+q+B;break;case"rotation":o=+i[s][0]+r*g*j[s][0];i[s][1]&&(o+=","+i[s][1]+","+i[s][2]);break;case"scale":o=[+i[s][0]+r*g*j[s][0],+i[s][1]+r*g*j[s][1],2 in k[s]?k[s][2]:p,3 in k[s]?k[s][3]:p][v](q);break;case"clip-rect":o=[];u=4;while(u--)o[u]=+i[s][u]+r*g*j[s][u];break}break;default:var C=[].concat(i[s]);o=[];u=m.paper.customAttributes[s].length;while(u--)o[u]=+C[u]+r*g*j[s][u];break}n[s]=o}m.attr(n);m._run&&m._run.call(m)}else{if(k.along){t=ct(k.along,k.len*!k.back);m.translate(j.sx-(j.x||0)+t.x-j.sx,j.sy-(j.y||0)+t.y-j.sy);k.rot&&m.rotate(j.r+t.alpha,t.x,t.y)}(l.x||l.y)&&m.translate(-l.x,-l.y);k.scale&&(k.scale+=p);m.attr(k);cv.splice(c--,1)}}a.svg&&m&&m.paper&&m.paper.safari();cv[w]&&setTimeout(cw)},cx=function(b,c,d,e,f){var g=d-e;c.timeouts.push(setTimeout(function(){a.is(f,"function")&&f.call(c);c.animate(b,g,b.easing)},e))},cy=function(a){return z(A(a,255),0)},cz=function(a,b){if(a==null)return{x:this._.tx,y:this._.ty,toString:co};this._.tx+=+a;this._.ty+=+b;switch(this.type){case"circle":case"ellipse":this.attr({cx:+a+this.attrs.cx,cy:+b+this.attrs.cy});break;case"rect":case"image":case"text":this.attr({x:+a+this.attrs.x,y:+b+this.attrs.y});break;case"path":var c=bp(this.attrs.path);c[0][1]+=+a;c[0][2]+=+b;this.attr({path:c});break}return this};bO.animateWith=function(a,b,c,d,e){for(var f=0,g=cv.length;f<g;f++)cv[f].el.id==a.id&&(b.start=cv[f].start);return this.animate(b,c,d,e)};bO.animateAlong=cA();bO.animateAlongBack=cA(1);function cA(b){return function(c,d,e,f){var g={back:b};a.is(e,"function")?f=e:g.rot=e;c&&c.constructor==bN&&(c=c.attrs.path);c&&(g.along=c);return this.animate(g,d,f)}}function cB(a,b,c,d,e,f){var g=3*b,h=3*(d-b)-g,i=1-g-h,j=3*c,k=3*(e-c)-j,l=1-j-k;function m(a){return((i*a+h)*a+g)*a}function n(a,b){var c=o(a,b);return((l*c+k)*c+j)*c}function o(a,b){var c,d,e,f,j,k;for(e=a,k=0;k<8;k++){f=m(e)-a;if(B(f)<b)return e;j=(3*i*e+2*h)*e+g;if(B(j)<0.000001)break;e=e-f/j}c=0;d=1;e=a;if(e<c)return c;if(e>d)return d;while(c<d){f=m(e);if(B(f-a)<b)return e;a>f?c=e:d=e;e=(d-c)/2+c}return e}return n(a,1/(200*f))}bO.onAnimation=function(a){this._run=a||0;return this};bO.animate=function(c,d,e,g){var h=this;h.timeouts=h.timeouts||[];if(a.is(e,"function")||!e)g=e||null;if(h.removed){g&&g.call(h);return h}var i={},j={},k=false,l={};for(var m in c)if(c[f](m)){if(X[f](m)||h.paper.customAttributes[f](m)){k=true;i[m]=h.attr(m);i[m]==null&&(i[m]=W[m]);j[m]=c[m];switch(X[m]){case"along":var n=cs(c[m]),o=ct(c[m],n*!(!c.back)),p=h.getBBox();l[m]=n/d;l.tx=p.x;l.ty=p.y;l.sx=o.x;l.sy=o.y;j.rot=c.rot;j.back=c.back;j.len=n;c.rot&&(l.r=S(h.rotate())||0);break;case E:l[m]=(j[m]-i[m])/d;break;case"colour":i[m]=a.getRGB(i[m]);var q=a.getRGB(j[m]);l[m]={r:(q.r-i[m].r)/d,g:(q.g-i[m].g)/d,b:(q.b-i[m].b)/d};break;case"path":var t=bw(i[m],j[m]);i[m]=t[0];var u=t[1];l[m]=[];for(var v=0,x=i[m][w];v<x;v++){l[m][v]=[0];for(var y=1,z=i[m][v][w];y<z;y++)l[m][v][y]=(u[v][y]-i[m][v][y])/d}break;case"csv":var A=r(c[m])[s](b),B=r(i[m])[s](b);switch(m){case"translation":i[m]=[0,0];l[m]=[A[0]/d,A[1]/d];break;case"rotation":i[m]=B[1]==A[1]&&B[2]==A[2]?B:[0,A[1],A[2]];l[m]=[(A[0]-i[m][0])/d,0,0];break;case"scale":c[m]=A;i[m]=r(i[m])[s](b);l[m]=[(A[0]-i[m][0])/d,(A[1]-i[m][1])/d,0,0];break;case"clip-rect":i[m]=r(i[m])[s](b);l[m]=[];v=4;while(v--)l[m][v]=(A[v]-i[m][v])/d;break}j[m]=A;break;default:A=[].concat(c[m]);B=[].concat(i[m]);l[m]=[];v=h.paper.customAttributes[m][w];while(v--)l[m][v]=((A[v]||0)-(B[v]||0))/d;break}}}if(k){var G=a.easing_formulas[e];if(!G){G=r(e).match(P);if(G&&G[w]==5){var H=G;G=function(a){return cB(a,+H[1],+H[2],+H[3],+H[4],d)}}else G=function(a){return a}}cv.push({start:c.start||+(new Date),ms:d,easing:G,from:i,diff:l,to:j,el:h,t:{x:0,y:0}});a.is(g,"function")&&(h._ac=setTimeout(function(){g.call(h)},d));cv[w]==1&&setTimeout(cw)}else{var C=[],D;for(var F in c)if(c[f](F)&&Z.test(F)){m={value:c[F]};F=="from"&&(F=0);F=="to"&&(F=100);m.key=T(F,10);C.push(m)}C.sort(be);C[0].key&&C.unshift({key:0,value:h.attrs});for(v=0,x=C[w];v<x;v++)cx(C[v].value,h,d/100*C[v].key,d/100*(C[v-1]&&C[v-1].key||0),C[v-1]&&C[v-1].value.callback);D=C[C[w]-1].value.callback;D&&h.timeouts.push(setTimeout(function(){D.call(h)},d))}return this};bO.stop=function(){for(var a=0;a<cv.length;a++)cv[a].el.id==this.id&&cv.splice(a--,1);for(a=0,ii=this.timeouts&&this.timeouts.length;a<ii;a++)clearTimeout(this.timeouts[a]);this.timeouts=[];clearTimeout(this._ac);delete this._ac;return this};bO.translate=function(a,b){return this.attr({translation:a+" "+b})};bO[H]=function(){return"Raphaël’s object"};a.ae=cv;var cC=function(a){this.items=[];this[w]=0;this.type="set";if(a)for(var b=0,c=a[w];b<c;b++){if(a[b]&&(a[b].constructor==bN||a[b].constructor==cC)){this[this.items[w]]=this.items[this.items[w]]=a[b];this[w]++}}};cC[e][L]=function(){var a,b;for(var c=0,d=arguments[w];c<d;c++){a=arguments[c];if(a&&(a.constructor==bN||a.constructor==cC)){b=this.items[w];this[b]=this.items[b]=a;this[w]++}}return this};cC[e].pop=function(){delete this[this[w]--];return this.items.pop()};for(var cD in bO)bO[f](cD)&&(cC[e][cD]=(function(a){return function(){for(var b=0,c=this.items[w];b<c;b++)this.items[b][a][m](this.items[b],arguments);return this}})(cD));cC[e].attr=function(b,c){if(b&&a.is(b,G)&&a.is(b[0],"object"))for(var d=0,e=b[w];d<e;d++)this.items[d].attr(b[d]);else for(var f=0,g=this.items[w];f<g;f++)this.items[f].attr(b,c);return this};cC[e].animate=function(b,c,d,e){(a.is(d,"function")||!d)&&(e=d||null);var f=this.items[w],g=f,h,i=this,j;e&&(j=function(){!(--f)&&e.call(i)});d=a.is(d,F)?d:j;h=this.items[--g].animate(b,c,d,j);while(g--)this.items[g]&&!this.items[g].removed&&this.items[g].animateWith(h,b,c,d,j);return this};cC[e].insertAfter=function(a){var b=this.items[w];while(b--)this.items[b].insertAfter(a);return this};cC[e].getBBox=function(){var a=[],b=[],c=[],d=[];for(var e=this.items[w];e--;){var f=this.items[e].getBBox();a[L](f.x);b[L](f.y);c[L](f.x+f.width);d[L](f.y+f.height)}a=A[m](0,a);b=A[m](0,b);return{x:a,y:b,width:z[m](0,c)-a,height:z[m](0,d)-b}};cC[e].clone=function(a){a=new cC;for(var b=0,c=this.items[w];b<c;b++)a[L](this.items[b].clone());return a};a.registerFont=function(a){if(!a.face)return a;this.fonts=this.fonts||{};var b={w:a.w,face:{},glyphs:{}},c=a.face["font-family"];for(var d in a.face)a.face[f](d)&&(b.face[d]=a.face[d]);this.fonts[c]?this.fonts[c][L](b):this.fonts[c]=[b];if(!a.svg){b.face["units-per-em"]=T(a.face["units-per-em"],10);for(var e in a.glyphs)if(a.glyphs[f](e)){var g=a.glyphs[e];b.glyphs[e]={w:g.w,k:{},d:g.d&&"M"+g.d[Y](/[mlcxtrv]/g,function(a){return({l:"L",c:"C",x:"z",t:"m",r:"l",v:"c"})[a]||"M"})+"z"};if(g.k)for(var h in g.k)g[f](h)&&(b.glyphs[e].k[h]=g.k[h])}}return a};k.getFont=function(b,c,d,e){e=e||"normal";d=d||"normal";c=+c||({normal:400,bold:700,lighter:300,bolder:800})[c]||400;if(!a.fonts)return;var g=a.fonts[b];if(!g){var h=new RegExp("(^|\\s)"+b[Y](/[^\w\d\s+!~.:_-]/g,p)+"(\\s|$)","i");for(var i in a.fonts)if(a.fonts[f](i)){if(h.test(i)){g=a.fonts[i];break}}}var j;if(g)for(var k=0,l=g[w];k<l;k++){j=g[k];if(j.face["font-weight"]==c&&(j.face["font-style"]==d||!j.face["font-style"])&&j.face["font-stretch"]==e)break}return j};k.print=function(c,d,e,f,g,h,i){h=h||"middle";i=z(A(i||0,1),-1);var j=this.set(),k=r(e)[s](p),l=0,m=p,n;a.is(f,e)&&(f=this.getFont(f));if(f){n=(g||16)/f.face["units-per-em"];var o=f.face.bbox.split(b),q=+o[0],t=+o[1]+(h=="baseline"?o[3]-o[1]+ +f.face.descent:(o[3]-o[1])/2);for(var u=0,v=k[w];u<v;u++){var x=u&&f.glyphs[k[u-1]]||{},y=f.glyphs[k[u]];l+=u?(x.w||f.w)+(x.k&&x.k[k[u]]||0)+f.w*i:0;y&&y.d&&j[L](this.path(y.d).attr({fill:"#000",stroke:"none",translation:[l,0]}))}j.scale(n,n,q,t).translate(c-q,d-t)}return j};a.format=function(b,c){var e=a.is(c,G)?[0][n](c):arguments;b&&a.is(b,F)&&e[w]-1&&(b=b[Y](d,function(a,b){return e[++b]==null?p:e[b]}));return b||p};a.ninja=function(){i.was?h.Raphael=i.is:delete Raphael;return a};a.el=bO;a.st=cC[e];i.was?h.Raphael=a:Raphael=a})()
\ No newline at end of file
+(function(){function a(){if(a.is(arguments[0],G)){var b=arguments[0],d=bV[m](a,b.splice(0,3+a.is(b[0],E))),e=d.set();for(var g=0,h=b[w];g<h;g++){var i=b[g]||{};c[f](i.type)&&e[L](d[i.type]().attr(i))}return e}return bV[m](a,arguments)}a.version="1.5.2";var b=/[, ]+/,c={circle:1,rect:1,path:1,ellipse:1,text:1,image:1},d=/\{(\d+)\}/g,e="prototype",f="hasOwnProperty",g=document,h=window,i={was:Object[e][f].call(h,"Raphael"),is:h.Raphael},j=function(){this.customAttributes={}},k,l="appendChild",m="apply",n="concat",o="createTouch"in g,p="",q=" ",r=String,s="split",t="click dblclick mousedown mousemove mouseout mouseover mouseup touchstart touchmove touchend orientationchange touchcancel gesturestart gesturechange gestureend"[s](q),u={mousedown:"touchstart",mousemove:"touchmove",mouseup:"touchend"},v="join",w="length",x=r[e].toLowerCase,y=Math,z=y.max,A=y.min,B=y.abs,C=y.pow,D=y.PI,E="number",F="string",G="array",H="toString",I="fill",J=Object[e][H],K={},L="push",M=/^url\(['"]?([^\)]+?)['"]?\)$/i,N=/^\s*((#[a-f\d]{6})|(#[a-f\d]{3})|rgba?\(\s*([\d\.]+%?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+(?:%?\s*,\s*[\d\.]+)?)%?\s*\)|hsba?\(\s*([\d\.]+(?:deg|\xb0|%)?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+(?:%?\s*,\s*[\d\.]+)?)%?\s*\)|hsla?\(\s*([\d\.]+(?:deg|\xb0|%)?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+(?:%?\s*,\s*[\d\.]+)?)%?\s*\))\s*$/i,O={"NaN":1,Infinity:1,"-Infinity":1},P=/^(?:cubic-)?bezier\(([^,]+),([^,]+),([^,]+),([^\)]+)\)/,Q=y.round,R="setAttribute",S=parseFloat,T=parseInt,U=" progid:DXImageTransform.Microsoft",V=r[e].toUpperCase,W={blur:0,"clip-rect":"0 0 1e9 1e9",cursor:"default",cx:0,cy:0,fill:"#fff","fill-opacity":1,font:"10px \"Arial\"","font-family":"\"Arial\"","font-size":"10","font-style":"normal","font-weight":400,gradient:0,height:0,href:"http://raphaeljs.com/",opacity:1,path:"M0,0",r:0,rotation:0,rx:0,ry:0,scale:"1 1",src:"",stroke:"#000","stroke-dasharray":"","stroke-linecap":"butt","stroke-linejoin":"butt","stroke-miterlimit":0,"stroke-opacity":1,"stroke-width":1,target:"_blank","text-anchor":"middle",title:"Raphael",translation:"0 0",width:0,x:0,y:0},X={along:"along",blur:E,"clip-rect":"csv",cx:E,cy:E,fill:"colour","fill-opacity":E,"font-size":E,height:E,opacity:E,path:"path",r:E,rotation:"csv",rx:E,ry:E,scale:"csv",stroke:"colour","stroke-opacity":E,"stroke-width":E,translation:"csv",width:E,x:E,y:E},Y="replace",Z=/^(from|to|\d+%?)$/,$=/\s*,\s*/,_={hs:1,rg:1},ba=/,?([achlmqrstvxz]),?/gi,bb=/([achlmqstvz])[\s,]*((-?\d*\.?\d*(?:e[-+]?\d+)?\s*,?\s*)+)/ig,bc=/(-?\d*\.?\d*(?:e[-+]?\d+)?)\s*,?\s*/ig,bd=/^r(?:\(([^,]+?)\s*,\s*([^\)]+?)\))?/,be=function(a,b){return a.key-b.key};a.type=h.SVGAngle||g.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1")?"SVG":"VML";if(a.type=="VML"){var bf=g.createElement("div"),bg;bf.innerHTML="<v:shape adj=\"1\"/>";bg=bf.firstChild;bg.style.behavior="url(#default#VML)";if(!(bg&&typeof bg.adj=="object"))return a.type=null;bf=null}a.svg=!(a.vml=a.type=="VML");j[e]=a[e];k=j[e];a._id=0;a._oid=0;a.fn={};a.is=function(a,b){b=x.call(b);if(b=="finite")return!O[f](+a);return b=="null"&&a===null||b==typeof a||b=="object"&&a===Object(a)||b=="array"&&Array.isArray&&Array.isArray(a)||J.call(a).slice(8,-1).toLowerCase()==b};a.angle=function(b,c,d,e,f,g){{if(f==null){var h=b-d,i=c-e;if(!h&&!i)return 0;return((h<0)*180+y.atan(-i/-h)*180/D+360)%360}return a.angle(b,c,f,g)-a.angle(d,e,f,g)}};a.rad=function(a){return a%360*D/180};a.deg=function(a){return a*180/D%360};a.snapTo=function(b,c,d){d=a.is(d,"finite")?d:10;if(a.is(b,G)){var e=b.length;while(e--)if(B(b[e]-c)<=d)return b[e]}else{b=+b;var f=c%b;if(f<d)return c-f;if(f>b-d)return c-f+b}return c};function bh(){var a=[],b=0;for(;b<32;b++)a[b]=(~(~(y.random()*16)))[H](16);a[12]=4;a[16]=(a[16]&3|8)[H](16);return"r-"+a[v]("")}a.setWindow=function(a){h=a;g=h.document};var bi=function(b){if(a.vml){var c=/^\s+|\s+$/g,d;try{var e=new ActiveXObject("htmlfile");e.write("<body>");e.close();d=e.body}catch(a){d=createPopup().document.body}var f=d.createTextRange();bi=bm(function(a){try{d.style.color=r(a)[Y](c,p);var b=f.queryCommandValue("ForeColor");b=(b&255)<<16|b&65280|(b&16711680)>>>16;return"#"+("000000"+b[H](16)).slice(-6)}catch(a){return"none"}})}else{var h=g.createElement("i");h.title="Raphaël Colour Picker";h.style.display="none";g.body[l](h);bi=bm(function(a){h.style.color=a;return g.defaultView.getComputedStyle(h,p).getPropertyValue("color")})}return bi(b)},bj=function(){return"hsb("+[this.h,this.s,this.b]+")"},bk=function(){return"hsl("+[this.h,this.s,this.l]+")"},bl=function(){return this.hex};a.hsb2rgb=function(b,c,d,e){if(a.is(b,"object")&&"h"in b&&"s"in b&&"b"in b){d=b.b;c=b.s;b=b.h;e=b.o}return a.hsl2rgb(b,c,d/2,e)};a.hsl2rgb=function(b,c,d,e){if(a.is(b,"object")&&"h"in b&&"s"in b&&"l"in b){d=b.l;c=b.s;b=b.h}if(b>1||c>1||d>1){b/=360;c/=100;d/=100}var f={},g=["r","g","b"],h,i,j,k,l,m;if(c){d<0.5?h=d*(1+c):h=d+c-d*c;i=2*d-h;for(var n=0;n<3;n++){j=b+1/3*-(n-1);j<0&&j++;j>1&&j--;j*6<1?f[g[n]]=i+(h-i)*6*j:j*2<1?f[g[n]]=h:j*3<2?f[g[n]]=i+(h-i)*(2/3-j)*6:f[g[n]]=i}}else f={r:d,g:d,b:d};f.r*=255;f.g*=255;f.b*=255;f.hex="#"+(16777216|f.b|f.g<<8|f.r<<16).toString(16).slice(1);a.is(e,"finite")&&(f.opacity=e);f.toString=bl;return f};a.rgb2hsb=function(b,c,d){if(c==null&&a.is(b,"object")&&"r"in b&&"g"in b&&"b"in b){d=b.b;c=b.g;b=b.r}if(c==null&&a.is(b,F)){var e=a.getRGB(b);b=e.r;c=e.g;d=e.b}if(b>1||c>1||d>1){b/=255;c/=255;d/=255}var f=z(b,c,d),g=A(b,c,d),h,i,j=f;{if(g==f)return{h:0,s:0,b:f,toString:bj};var k=f-g;i=k/f;b==f?h=(c-d)/k:c==f?h=2+(d-b)/k:h=4+(b-c)/k;h/=6;h<0&&h++;h>1&&h--}return{h:h,s:i,b:j,toString:bj}};a.rgb2hsl=function(b,c,d){if(c==null&&a.is(b,"object")&&"r"in b&&"g"in b&&"b"in b){d=b.b;c=b.g;b=b.r}if(c==null&&a.is(b,F)){var e=a.getRGB(b);b=e.r;c=e.g;d=e.b}if(b>1||c>1||d>1){b/=255;c/=255;d/=255}var f=z(b,c,d),g=A(b,c,d),h,i,j=(f+g)/2,k;if(g==f)k={h:0,s:0,l:j};else{var l=f-g;i=j<0.5?l/(f+g):l/(2-f-g);b==f?h=(c-d)/l:c==f?h=2+(d-b)/l:h=4+(b-c)/l;h/=6;h<0&&h++;h>1&&h--;k={h:h,s:i,l:j}}k.toString=bk;return k};a._path2string=function(){return this.join(",")[Y](ba,"$1")};function bm(a,b,c){function d(){var g=Array[e].slice.call(arguments,0),h=g[v]("►"),i=d.cache=d.cache||{},j=d.count=d.count||[];if(i[f](h))return c?c(i[h]):i[h];j[w]>=1000&&delete i[j.shift()];j[L](h);i[h]=a[m](b,g);return c?c(i[h]):i[h]}return d}a.getRGB=bm(function(b){if(!b||!(!((b=r(b)).indexOf("-")+1)))return{r:-1,g:-1,b:-1,hex:"none",error:1};if(b=="none")return{r:-1,g:-1,b:-1,hex:"none"};!(_[f](b.toLowerCase().substring(0,2))||b.charAt()=="#")&&(b=bi(b));var c,d,e,g,h,i,j,k=b.match(N);if(k){if(k[2]){g=T(k[2].substring(5),16);e=T(k[2].substring(3,5),16);d=T(k[2].substring(1,3),16)}if(k[3]){g=T((i=k[3].charAt(3))+i,16);e=T((i=k[3].charAt(2))+i,16);d=T((i=k[3].charAt(1))+i,16)}if(k[4]){j=k[4][s]($);d=S(j[0]);j[0].slice(-1)=="%"&&(d*=2.55);e=S(j[1]);j[1].slice(-1)=="%"&&(e*=2.55);g=S(j[2]);j[2].slice(-1)=="%"&&(g*=2.55);k[1].toLowerCase().slice(0,4)=="rgba"&&(h=S(j[3]));j[3]&&j[3].slice(-1)=="%"&&(h/=100)}if(k[5]){j=k[5][s]($);d=S(j[0]);j[0].slice(-1)=="%"&&(d*=2.55);e=S(j[1]);j[1].slice(-1)=="%"&&(e*=2.55);g=S(j[2]);j[2].slice(-1)=="%"&&(g*=2.55);(j[0].slice(-3)=="deg"||j[0].slice(-1)=="°")&&(d/=360);k[1].toLowerCase().slice(0,4)=="hsba"&&(h=S(j[3]));j[3]&&j[3].slice(-1)=="%"&&(h/=100);return a.hsb2rgb(d,e,g,h)}if(k[6]){j=k[6][s]($);d=S(j[0]);j[0].slice(-1)=="%"&&(d*=2.55);e=S(j[1]);j[1].slice(-1)=="%"&&(e*=2.55);g=S(j[2]);j[2].slice(-1)=="%"&&(g*=2.55);(j[0].slice(-3)=="deg"||j[0].slice(-1)=="°")&&(d/=360);k[1].toLowerCase().slice(0,4)=="hsla"&&(h=S(j[3]));j[3]&&j[3].slice(-1)=="%"&&(h/=100);return a.hsl2rgb(d,e,g,h)}k={r:d,g:e,b:g};k.hex="#"+(16777216|g|e<<8|d<<16).toString(16).slice(1);a.is(h,"finite")&&(k.opacity=h);return k}return{r:-1,g:-1,b:-1,hex:"none",error:1}},a);a.getColor=function(a){var b=this.getColor.start=this.getColor.start||{h:0,s:1,b:a||0.75},c=this.hsb2rgb(b.h,b.s,b.b);b.h+=0.075;if(b.h>1){b.h=0;b.s-=0.2;b.s<=0&&(this.getColor.start={h:0,s:1,b:b.b})}return c.hex};a.getColor.reset=function(){delete this.start};a.parsePathString=bm(function(b){if(!b)return null;var c={a:7,c:6,h:1,l:2,m:2,q:4,s:4,t:2,v:1,z:0},d=[];a.is(b,G)&&a.is(b[0],G)&&(d=bo(b));d[w]||r(b)[Y](bb,function(a,b,e){var f=[],g=x.call(b);e[Y](bc,function(a,b){b&&f[L](+b)});if(g=="m"&&f[w]>2){d[L]([b][n](f.splice(0,2)));g="l";b=b=="m"?"l":"L"}while(f[w]>=c[g]){d[L]([b][n](f.splice(0,c[g])));if(!c[g])break}});d[H]=a._path2string;return d});a.findDotsAtSegment=function(a,b,c,d,e,f,g,h,i){var j=1-i,k=C(j,3)*a+C(j,2)*3*i*c+j*3*i*i*e+C(i,3)*g,l=C(j,3)*b+C(j,2)*3*i*d+j*3*i*i*f+C(i,3)*h,m=a+2*i*(c-a)+i*i*(e-2*c+a),n=b+2*i*(d-b)+i*i*(f-2*d+b),o=c+2*i*(e-c)+i*i*(g-2*e+c),p=d+2*i*(f-d)+i*i*(h-2*f+d),q=(1-i)*a+i*c,r=(1-i)*b+i*d,s=(1-i)*e+i*g,t=(1-i)*f+i*h,u=90-y.atan((m-o)/(n-p))*180/D;(m>o||n<p)&&(u+=180);return{x:k,y:l,m:{x:m,y:n},n:{x:o,y:p},start:{x:q,y:r},end:{x:s,y:t},alpha:u}};var bn=bm(function(a){if(!a)return{x:0,y:0,width:0,height:0};a=bw(a);var b=0,c=0,d=[],e=[],f;for(var g=0,h=a[w];g<h;g++){f=a[g];if(f[0]=="M"){b=f[1];c=f[2];d[L](b);e[L](c)}else{var i=bv(b,c,f[1],f[2],f[3],f[4],f[5],f[6]);d=d[n](i.min.x,i.max.x);e=e[n](i.min.y,i.max.y);b=f[5];c=f[6]}}var j=A[m](0,d),k=A[m](0,e);return{x:j,y:k,width:z[m](0,d)-j,height:z[m](0,e)-k}}),bo=function(b){var c=[];if(!a.is(b,G)||!a.is(b&&b[0],G))b=a.parsePathString(b);for(var d=0,e=b[w];d<e;d++){c[d]=[];for(var f=0,g=b[d][w];f<g;f++)c[d][f]=b[d][f]}c[H]=a._path2string;return c},bp=bm(function(b){if(!a.is(b,G)||!a.is(b&&b[0],G))b=a.parsePathString(b);var c=[],d=0,e=0,f=0,g=0,h=0;if(b[0][0]=="M"){d=b[0][1];e=b[0][2];f=d;g=e;h++;c[L](["M",d,e])}for(var i=h,j=b[w];i<j;i++){var k=c[i]=[],l=b[i];if(l[0]!=x.call(l[0])){k[0]=x.call(l[0]);switch(k[0]){case"a":k[1]=l[1];k[2]=l[2];k[3]=l[3];k[4]=l[4];k[5]=l[5];k[6]=+(l[6]-d).toFixed(3);k[7]=+(l[7]-e).toFixed(3);break;case"v":k[1]=+(l[1]-e).toFixed(3);break;case"m":f=l[1];g=l[2];default:for(var m=1,n=l[w];m<n;m++)k[m]=+(l[m]-(m%2?d:e)).toFixed(3)}}else{k=c[i]=[];if(l[0]=="m"){f=l[1]+d;g=l[2]+e}for(var o=0,p=l[w];o<p;o++)c[i][o]=l[o]}var q=c[i][w];switch(c[i][0]){case"z":d=f;e=g;break;case"h":d+=+c[i][q-1];break;case"v":e+=+c[i][q-1];break;default:d+=+c[i][q-2];e+=+c[i][q-1]}}c[H]=a._path2string;return c},0,bo),bq=bm(function(b){if(!a.is(b,G)||!a.is(b&&b[0],G))b=a.parsePathString(b);var c=[],d=0,e=0,f=0,g=0,h=0;if(b[0][0]=="M"){d=+b[0][1];e=+b[0][2];f=d;g=e;h++;c[0]=["M",d,e]}for(var i=h,j=b[w];i<j;i++){var k=c[i]=[],l=b[i];if(l[0]!=V.call(l[0])){k[0]=V.call(l[0]);switch(k[0]){case"A":k[1]=l[1];k[2]=l[2];k[3]=l[3];k[4]=l[4];k[5]=l[5];k[6]=+(l[6]+d);k[7]=+(l[7]+e);break;case"V":k[1]=+l[1]+e;break;case"H":k[1]=+l[1]+d;break;case"M":f=+l[1]+d;g=+l[2]+e;default:for(var m=1,n=l[w];m<n;m++)k[m]=+l[m]+(m%2?d:e)}}else for(var o=0,p=l[w];o<p;o++)c[i][o]=l[o];switch(k[0]){case"Z":d=f;e=g;break;case"H":d=k[1];break;case"V":e=k[1];break;case"M":f=c[i][c[i][w]-2];g=c[i][c[i][w]-1];default:d=c[i][c[i][w]-2];e=c[i][c[i][w]-1]}}c[H]=a._path2string;return c},null,bo),br=function(a,b,c,d){return[a,b,c,d,c,d]},bs=function(a,b,c,d,e,f){var g=1/3,h=2/3;return[g*a+h*c,g*b+h*d,g*e+h*c,g*f+h*d,e,f]},bt=function(a,b,c,d,e,f,g,h,i,j){var k=D*120/180,l=D/180*(+e||0),m=[],o,p=bm(function(a,b,c){var d=a*y.cos(c)-b*y.sin(c),e=a*y.sin(c)+b*y.cos(c);return{x:d,y:e}});if(j){G=j[0];H=j[1];E=j[2];F=j[3]}else{o=p(a,b,-l);a=o.x;b=o.y;o=p(h,i,-l);h=o.x;i=o.y;var q=y.cos(D/180*e),r=y.sin(D/180*e),t=(a-h)/2,u=(b-i)/2,x=t*t/(c*c)+u*u/(d*d);if(x>1){x=y.sqrt(x);c=x*c;d=x*d}var z=c*c,A=d*d,C=(f==g?-1:1)*y.sqrt(B((z*A-z*u*u-A*t*t)/(z*u*u+A*t*t))),E=C*c*u/d+(a+h)/2,F=C*-d*t/c+(b+i)/2,G=y.asin(((b-F)/d).toFixed(9)),H=y.asin(((i-F)/d).toFixed(9));G=a<E?D-G:G;H=h<E?D-H:H;G<0&&(G=D*2+G);H<0&&(H=D*2+H);g&&G>H&&(G=G-D*2);!g&&H>G&&(H=H-D*2)}var I=H-G;if(B(I)>k){var J=H,K=h,L=i;H=G+k*(g&&H>G?1:-1);h=E+c*y.cos(H);i=F+d*y.sin(H);m=bt(h,i,c,d,e,0,g,K,L,[H,J,E,F])}I=H-G;var M=y.cos(G),N=y.sin(G),O=y.cos(H),P=y.sin(H),Q=y.tan(I/4),R=4/3*c*Q,S=4/3*d*Q,T=[a,b],U=[a+R*N,b-S*M],V=[h+R*P,i-S*O],W=[h,i];U[0]=2*T[0]-U[0];U[1]=2*T[1]-U[1];{if(j)return[U,V,W][n](m);m=[U,V,W][n](m)[v]()[s](",");var X=[];for(var Y=0,Z=m[w];Y<Z;Y++)X[Y]=Y%2?p(m[Y-1],m[Y],l).y:p(m[Y],m[Y+1],l).x;return X}},bu=function(a,b,c,d,e,f,g,h,i){var j=1-i;return{x:C(j,3)*a+C(j,2)*3*i*c+j*3*i*i*e+C(i,3)*g,y:C(j,3)*b+C(j,2)*3*i*d+j*3*i*i*f+C(i,3)*h}},bv=bm(function(a,b,c,d,e,f,g,h){var i=e-2*c+a-(g-2*e+c),j=2*(c-a)-2*(e-c),k=a-c,l=(-j+y.sqrt(j*j-4*i*k))/2/i,n=(-j-y.sqrt(j*j-4*i*k))/2/i,o=[b,h],p=[a,g],q;B(l)>"1e12"&&(l=0.5);B(n)>"1e12"&&(n=0.5);if(l>0&&l<1){q=bu(a,b,c,d,e,f,g,h,l);p[L](q.x);o[L](q.y)}if(n>0&&n<1){q=bu(a,b,c,d,e,f,g,h,n);p[L](q.x);o[L](q.y)}i=f-2*d+b-(h-2*f+d);j=2*(d-b)-2*(f-d);k=b-d;l=(-j+y.sqrt(j*j-4*i*k))/2/i;n=(-j-y.sqrt(j*j-4*i*k))/2/i;B(l)>"1e12"&&(l=0.5);B(n)>"1e12"&&(n=0.5);if(l>0&&l<1){q=bu(a,b,c,d,e,f,g,h,l);p[L](q.x);o[L](q.y)}if(n>0&&n<1){q=bu(a,b,c,d,e,f,g,h,n);p[L](q.x);o[L](q.y)}return{min:{x:A[m](0,p),y:A[m](0,o)},max:{x:z[m](0,p),y:z[m](0,o)}}}),bw=bm(function(a,b){var c=bq(a),d=b&&bq(b),e={x:0,y:0,bx:0,by:0,X:0,Y:0,qx:null,qy:null},f={x:0,y:0,bx:0,by:0,X:0,Y:0,qx:null,qy:null},g=function(a,b){var c,d;if(!a)return["C",b.x,b.y,b.x,b.y,b.x,b.y];!(a[0]in{T:1,Q:1})&&(b.qx=b.qy=null);switch(a[0]){case"M":b.X=a[1];b.Y=a[2];break;case"A":a=["C"][n](bt[m](0,[b.x,b.y][n](a.slice(1))));break;case"S":c=b.x+(b.x-(b.bx||b.x));d=b.y+(b.y-(b.by||b.y));a=["C",c,d][n](a.slice(1));break;case"T":b.qx=b.x+(b.x-(b.qx||b.x));b.qy=b.y+(b.y-(b.qy||b.y));a=["C"][n](bs(b.x,b.y,b.qx,b.qy,a[1],a[2]));break;case"Q":b.qx=a[1];b.qy=a[2];a=["C"][n](bs(b.x,b.y,a[1],a[2],a[3],a[4]));break;case"L":a=["C"][n](br(b.x,b.y,a[1],a[2]));break;case"H":a=["C"][n](br(b.x,b.y,a[1],b.y));break;case"V":a=["C"][n](br(b.x,b.y,b.x,a[1]));break;case"Z":a=["C"][n](br(b.x,b.y,b.X,b.Y));break}return a},h=function(a,b){if(a[b][w]>7){a[b].shift();var e=a[b];while(e[w])a.splice(b++,0,["C"][n](e.splice(0,6)));a.splice(b,1);k=z(c[w],d&&d[w]||0)}},i=function(a,b,e,f,g){if(a&&b&&a[g][0]=="M"&&b[g][0]!="M"){b.splice(g,0,["M",f.x,f.y]);e.bx=0;e.by=0;e.x=a[g][1];e.y=a[g][2];k=z(c[w],d&&d[w]||0)}};for(var j=0,k=z(c[w],d&&d[w]||0);j<k;j++){c[j]=g(c[j],e);h(c,j);d&&(d[j]=g(d[j],f));d&&h(d,j);i(c,d,e,f,j);i(d,c,f,e,j);var l=c[j],o=d&&d[j],p=l[w],q=d&&o[w];e.x=l[p-2];e.y=l[p-1];e.bx=S(l[p-4])||e.x;e.by=S(l[p-3])||e.y;f.bx=d&&(S(o[q-4])||f.x);f.by=d&&(S(o[q-3])||f.y);f.x=d&&o[q-2];f.y=d&&o[q-1]}return d?[c,d]:c},null,bo),bx=bm(function(b){var c=[];for(var d=0,e=b[w];d<e;d++){var f={},g=b[d].match(/^([^:]*):?([\d\.]*)/);f.color=a.getRGB(g[1]);if(f.color.error)return null;f.color=f.color.hex;g[2]&&(f.offset=g[2]+"%");c[L](f)}for(d=1,e=c[w]-1;d<e;d++){if(!c[d].offset){var h=S(c[d-1].offset||0),i=0;for(var j=d+1;j<e;j++){if(c[j].offset){i=c[j].offset;break}}if(!i){i=100;j=e}i=S(i);var k=(i-h)/(j-d+1);for(;d<j;d++){h+=k;c[d].offset=h+"%"}}}return c}),by=function(b,c,d,e){var f;if(a.is(b,F)||a.is(b,"object")){f=a.is(b,F)?g.getElementById(b):b;if(f.tagName)return c==null?{container:f,width:f.style.pixelWidth||f.offsetWidth,height:f.style.pixelHeight||f.offsetHeight}:{container:f,width:c,height:d}}else return{container:1,x:b,y:c,width:d,height:e}},bz=function(a,b){var c=this;for(var d in b){if(b[f](d)&&!(d in a))switch(typeof b[d]){case"function":(function(b){a[d]=a===c?b:function(){return b[m](c,arguments)}})(b[d]);break;case"object":a[d]=a[d]||{};bz.call(this,a[d],b[d]);break;default:a[d]=b[d];break}}},bA=function(a,b){a==b.top&&(b.top=a.prev);a==b.bottom&&(b.bottom=a.next);a.next&&(a.next.prev=a.prev);a.prev&&(a.prev.next=a.next)},bB=function(a,b){if(b.top===a)return;bA(a,b);a.next=null;a.prev=b.top;b.top.next=a;b.top=a},bC=function(a,b){if(b.bottom===a)return;bA(a,b);a.next=b.bottom;a.prev=null;b.bottom.prev=a;b.bottom=a},bD=function(a,b,c){bA(a,c);b==c.top&&(c.top=a);b.next&&(b.next.prev=a);a.next=b.next;a.prev=b;b.next=a},bE=function(a,b,c){bA(a,c);b==c.bottom&&(c.bottom=a);b.prev&&(b.prev.next=a);a.prev=b.prev;b.prev=a;a.next=b},bF=function(a){return function(){throw new Error("Raphaël: you are calling to method “"+a+"� of removed object")}};a.pathToRelative=bp;if(a.svg){k.svgns="http://www.w3.org/2000/svg";k.xlink="http://www.w3.org/1999/xlink";Q=function(a){return+a+(~(~a)===a)*0.5};var bG=function(a,b){if(b)for(var c in b)b[f](c)&&a[R](c,r(b[c]));else{a=g.createElementNS(k.svgns,a);a.style.webkitTapHighlightColor="rgba(0,0,0,0)";return a}};a[H]=function(){return"Your browser supports SVG.\nYou are running Raphaël "+this.version};var bH=function(a,b){var c=bG("path");b.canvas&&b.canvas[l](c);var d=new bN(c,b);d.type="path";bK(d,{fill:"none",stroke:"#000",path:a});return d},bI=function(a,b,c){var d="linear",e=0.5,f=0.5,h=a.style;b=r(b)[Y](bd,function(a,b,c){d="radial";if(b&&c){e=S(b);f=S(c);var g=(f>0.5)*2-1;C(e-0.5,2)+C(f-0.5,2)>0.25&&(f=y.sqrt(0.25-C(e-0.5,2))*g+0.5)&&f!=0.5&&(f=f.toFixed(5)-0.00001*g)}return p});b=b[s](/\s*\-\s*/);if(d=="linear"){var i=b.shift();i=-S(i);if(isNaN(i))return null;var j=[0,0,y.cos(i*D/180),y.sin(i*D/180)],k=1/(z(B(j[2]),B(j[3]))||1);j[2]*=k;j[3]*=k;if(j[2]<0){j[0]=-j[2];j[2]=0}if(j[3]<0){j[1]=-j[3];j[3]=0}}var m=bx(b);if(!m)return null;var n=a.getAttribute(I);n=n.match(/^url\(#(.*)\)$/);n&&c.defs.removeChild(g.getElementById(n[1]));var o=bG(d+"Gradient");o.id=bh();bG(o,d=="radial"?{fx:e,fy:f}:{x1:j[0],y1:j[1],x2:j[2],y2:j[3]});c.defs[l](o);for(var q=0,t=m[w];q<t;q++){var u=bG("stop");bG(u,{offset:m[q].offset?m[q].offset:q?"100%":"0%","stop-color":m[q].color||"#fff"});o[l](u)}bG(a,{fill:"url(#"+o.id+")",opacity:1,"fill-opacity":1});h.fill=p;h.opacity=1;h.fillOpacity=1;return 1},bJ=function(b){var c=b.getBBox();bG(b.pattern,{patternTransform:a.format("translate({0},{1})",c.x,c.y)})},bK=function(c,d){var e={"":[0],none:[0],"-":[3,1],".":[1,1],"-.":[3,1,1,1],"-..":[3,1,1,1,1,1],". ":[1,3],"- ":[4,3],"--":[8,3],"- .":[4,3,1,3],"--.":[8,3,1,3],"--..":[8,3,1,3,1,3]},h=c.node,i=c.attrs,j=c.rotate(),k=function(a,b){b=e[x.call(b)];if(b){var c=a.attrs["stroke-width"]||"1",f=({round:c,square:c,butt:0})[a.attrs["stroke-linecap"]||d["stroke-linecap"]]||0,g=[],i=b[w];while(i--)g[i]=b[i]*c+(i%2?1:-1)*f;bG(h,{"stroke-dasharray":g[v](",")})}};d[f]("rotation")&&(j=d.rotation);var m=r(j)[s](b);if(m.length-1){m[1]=+m[1];m[2]=+m[2]}else m=null;S(j)&&c.rotate(0,true);for(var n in d){if(d[f](n)){if(!W[f](n))continue;var o=d[n];i[n]=o;switch(n){case"blur":c.blur(o);break;case"rotation":c.rotate(o,true);break;case"href":case"title":case"target":var t=h.parentNode;if(x.call(t.tagName)!="a"){var u=bG("a");t.insertBefore(u,h);u[l](h);t=u}n=="target"&&o=="blank"?t.setAttributeNS(c.paper.xlink,"show","new"):t.setAttributeNS(c.paper.xlink,n,o);break;case"cursor":h.style.cursor=o;break;case"clip-rect":var y=r(o)[s](b);if(y[w]==4){c.clip&&c.clip.parentNode.parentNode.removeChild(c.clip.parentNode);var z=bG("clipPath"),A=bG("rect");z.id=bh();bG(A,{x:y[0],y:y[1],width:y[2],height:y[3]});z[l](A);c.paper.defs[l](z);bG(h,{"clip-path":"url(#"+z.id+")"});c.clip=A}if(!o){var B=g.getElementById(h.getAttribute("clip-path")[Y](/(^url\(#|\)$)/g,p));B&&B.parentNode.removeChild(B);bG(h,{"clip-path":p});delete c.clip}break;case"path":c.type=="path"&&bG(h,{d:o?i.path=bq(o):"M0,0"});break;case"width":h[R](n,o);if(i.fx){n="x";o=i.x}else break;case"x":i.fx&&(o=-i.x-(i.width||0));case"rx":if(n=="rx"&&c.type=="rect")break;case"cx":m&&(n=="x"||n=="cx")&&(m[1]+=o-i[n]);h[R](n,o);c.pattern&&bJ(c);break;case"height":h[R](n,o);if(i.fy){n="y";o=i.y}else break;case"y":i.fy&&(o=-i.y-(i.height||0));case"ry":if(n=="ry"&&c.type=="rect")break;case"cy":m&&(n=="y"||n=="cy")&&(m[2]+=o-i[n]);h[R](n,o);c.pattern&&bJ(c);break;case"r":c.type=="rect"?bG(h,{rx:o,ry:o}):h[R](n,o);break;case"src":c.type=="image"&&h.setAttributeNS(c.paper.xlink,"href",o);break;case"stroke-width":h.style.strokeWidth=o;h[R](n,o);i["stroke-dasharray"]&&k(c,i["stroke-dasharray"]);break;case"stroke-dasharray":k(c,o);break;case"translation":var C=r(o)[s](b);C[0]=+C[0]||0;C[1]=+C[1]||0;if(m){m[1]+=C[0];m[2]+=C[1]}cz.call(c,C[0],C[1]);break;case"scale":C=r(o)[s](b);c.scale(+C[0]||1,+C[1]||+C[0]||1,isNaN(S(C[2]))?null:+C[2],isNaN(S(C[3]))?null:+C[3]);break;case I:var D=r(o).match(M);if(D){z=bG("pattern");var E=bG("image");z.id=bh();bG(z,{x:0,y:0,patternUnits:"userSpaceOnUse",height:1,width:1});bG(E,{x:0,y:0});E.setAttributeNS(c.paper.xlink,"href",D[1]);z[l](E);var F=g.createElement("img");F.style.cssText="position:absolute;left:-9999em;top-9999em";F.onload=function(){bG(z,{width:this.offsetWidth,height:this.offsetHeight});bG(E,{width:this.offsetWidth,height:this.offsetHeight});g.body.removeChild(this);c.paper.safari()};g.body[l](F);F.src=D[1];c.paper.defs[l](z);h.style.fill="url(#"+z.id+")";bG(h,{fill:"url(#"+z.id+")"});c.pattern=z;c.pattern&&bJ(c);break}var G=a.getRGB(o);if(G.error)if((({circle:1,ellipse:1})[f](c.type)||r(o).charAt()!="r")&&bI(h,o,c.paper)){i.gradient=o;i.fill="none";break}else{delete d.gradient;delete i.gradient;!a.is(i.opacity,"undefined")&&a.is(d.opacity,"undefined")&&bG(h,{opacity:i.opacity});!a.is(i["fill-opacity"],"undefined")&&a.is(d["fill-opacity"],"undefined")&&bG(h,{"fill-opacity":i["fill-opacity"]})}G[f]("opacity")&&bG(h,{"fill-opacity":G.opacity>1?G.opacity/100:G.opacity});case"stroke":G=a.getRGB(o);h[R](n,G.hex);n=="stroke"&&G[f]("opacity")&&bG(h,{"stroke-opacity":G.opacity>1?G.opacity/100:G.opacity});break;case"gradient":(({circle:1,ellipse:1})[f](c.type)||r(o).charAt()!="r")&&bI(h,o,c.paper);break;case"opacity":i.gradient&&!i[f]("stroke-opacity")&&bG(h,{"stroke-opacity":o>1?o/100:o});case"fill-opacity":if(i.gradient){var H=g.getElementById(h.getAttribute(I)[Y](/^url\(#|\)$/g,p));if(H){var J=H.getElementsByTagName("stop");J[J[w]-1][R]("stop-opacity",o)}break}default:n=="font-size"&&(o=T(o,10)+"px");var K=n[Y](/(\-.)/g,function(a){return V.call(a.substring(1))});h.style[K]=o;h[R](n,o);break}}}bM(c,d);m?c.rotate(m.join(q)):S(j)&&c.rotate(j,true)},bL=1.2,bM=function(b,c){if(b.type!="text"||!(c[f]("text")||c[f]("font")||c[f]("font-size")||c[f]("x")||c[f]("y")))return;var d=b.attrs,e=b.node,h=e.firstChild?T(g.defaultView.getComputedStyle(e.firstChild,p).getPropertyValue("font-size"),10):10;if(c[f]("text")){d.text=c.text;while(e.firstChild)e.removeChild(e.firstChild);var i=r(c.text)[s]("\n");for(var j=0,k=i[w];j<k;j++)if(i[j]){var m=bG("tspan");j&&bG(m,{dy:h*bL,x:d.x});m[l](g.createTextNode(i[j]));e[l](m)}}else{i=e.getElementsByTagName("tspan");for(j=0,k=i[w];j<k;j++)j&&bG(i[j],{dy:h*bL,x:d.x})}bG(e,{y:d.y});var n=b.getBBox(),o=d.y-(n.y+n.height/2);o&&a.is(o,"finite")&&bG(e,{y:d.y+o})},bN=function(b,c){var d=0,e=0;this[0]=b;this.id=a._oid++;this.node=b;b.raphael=this;this.paper=c;this.attrs=this.attrs||{};this.transformations=[];this._={tx:0,ty:0,rt:{deg:0,cx:0,cy:0},sx:1,sy:1};!c.bottom&&(c.bottom=this);this.prev=c.top;c.top&&(c.top.next=this);c.top=this;this.next=null},bO=bN[e];bN[e].rotate=function(c,d,e){if(this.removed)return this;if(c==null){if(this._.rt.cx)return[this._.rt.deg,this._.rt.cx,this._.rt.cy][v](q);return this._.rt.deg}var f=this.getBBox();c=r(c)[s](b);if(c[w]-1){d=S(c[1]);e=S(c[2])}c=S(c[0]);d!=null&&d!==false?this._.rt.deg=c:this._.rt.deg+=c;e==null&&(d=null);this._.rt.cx=d;this._.rt.cy=e;d=d==null?f.x+f.width/2:d;e=e==null?f.y+f.height/2:e;if(this._.rt.deg){this.transformations[0]=a.format("rotate({0} {1} {2})",this._.rt.deg,d,e);this.clip&&bG(this.clip,{transform:a.format("rotate({0} {1} {2})",-this._.rt.deg,d,e)})}else{this.transformations[0]=p;this.clip&&bG(this.clip,{transform:p})}bG(this.node,{transform:this.transformations[v](q)});return this};bN[e].hide=function(){!this.removed&&(this.node.style.display="none");return this};bN[e].show=function(){!this.removed&&(this.node.style.display="");return this};bN[e].remove=function(){if(this.removed)return;bA(this,this.paper);this.node.parentNode.removeChild(this.node);for(var a in this)delete this[a];this.removed=true};bN[e].getBBox=function(){if(this.removed)return this;if(this.type=="path")return bn(this.attrs.path);if(this.node.style.display=="none"){this.show();var a=true}var b={};try{b=this.node.getBBox()}catch(a){}finally{b=b||{}}if(this.type=="text"){b={x:b.x,y:Infinity,width:0,height:0};for(var c=0,d=this.node.getNumberOfChars();c<d;c++){var e=this.node.getExtentOfChar(c);e.y<b.y&&(b.y=e.y);e.y+e.height-b.y>b.height&&(b.height=e.y+e.height-b.y);e.x+e.width-b.x>b.width&&(b.width=e.x+e.width-b.x)}}a&&this.hide();return b};bN[e].attr=function(b,c){if(this.removed)return this;if(b==null){var d={};for(var e in this.attrs)this.attrs[f](e)&&(d[e]=this.attrs[e]);this._.rt.deg&&(d.rotation=this.rotate());(this._.sx!=1||this._.sy!=1)&&(d.scale=this.scale());d.gradient&&d.fill=="none"&&(d.fill=d.gradient)&&delete d.gradient;return d}if(c==null&&a.is(b,F)){if(b=="translation")return cz.call(this);if(b=="rotation")return this.rotate();if(b=="scale")return this.scale();if(b==I&&this.attrs.fill=="none"&&this.attrs.gradient)return this.attrs.gradient;return this.attrs[b]}if(c==null&&a.is(b,G)){var g={};for(var h=0,i=b.length;h<i;h++)g[b[h]]=this.attr(b[h]);return g}if(c!=null){var j={};j[b]=c}else b!=null&&a.is(b,"object")&&(j=b);for(var k in this.paper.customAttributes)if(this.paper.customAttributes[f](k)&&j[f](k)&&a.is(this.paper.customAttributes[k],"function")){var l=this.paper.customAttributes[k].apply(this,[][n](j[k]));this.attrs[k]=j[k];for(var m in l)l[f](m)&&(j[m]=l[m])}bK(this,j);return this};bN[e].toFront=function(){if(this.removed)return this;this.node.parentNode[l](this.node);var a=this.paper;a.top!=this&&bB(this,a);return this};bN[e].toBack=function(){if(this.removed)return this;if(this.node.parentNode.firstChild!=this.node){this.node.parentNode.insertBefore(this.node,this.node.parentNode.firstChild);bC(this,this.paper);var a=this.paper}return this};bN[e].insertAfter=function(a){if(this.removed)return this;var b=a.node||a[a.length-1].node;b.nextSibling?b.parentNode.insertBefore(this.node,b.nextSibling):b.parentNode[l](this.node);bD(this,a,this.paper);return this};bN[e].insertBefore=function(a){if(this.removed)return this;var b=a.node||a[0].node;b.parentNode.insertBefore(this.node,b);bE(this,a,this.paper);return this};bN[e].blur=function(a){var b=this;if(+a!==0){var c=bG("filter"),d=bG("feGaussianBlur");b.attrs.blur=a;c.id=bh();bG(d,{stdDeviation:+a||1.5});c.appendChild(d);b.paper.defs.appendChild(c);b._blur=c;bG(b.node,{filter:"url(#"+c.id+")"})}else{if(b._blur){b._blur.parentNode.removeChild(b._blur);delete b._blur;delete b.attrs.blur}b.node.removeAttribute("filter")}};var bP=function(a,b,c,d){var e=bG("circle");a.canvas&&a.canvas[l](e);var f=new bN(e,a);f.attrs={cx:b,cy:c,r:d,fill:"none",stroke:"#000"};f.type="circle";bG(e,f.attrs);return f},bQ=function(a,b,c,d,e,f){var g=bG("rect");a.canvas&&a.canvas[l](g);var h=new bN(g,a);h.attrs={x:b,y:c,width:d,height:e,r:f||0,rx:f||0,ry:f||0,fill:"none",stroke:"#000"};h.type="rect";bG(g,h.attrs);return h},bR=function(a,b,c,d,e){var f=bG("ellipse");a.canvas&&a.canvas[l](f);var g=new bN(f,a);g.attrs={cx:b,cy:c,rx:d,ry:e,fill:"none",stroke:"#000"};g.type="ellipse";bG(f,g.attrs);return g},bS=function(a,b,c,d,e,f){var g=bG("image");bG(g,{x:c,y:d,width:e,height:f,preserveAspectRatio:"none"});g.setAttributeNS(a.xlink,"href",b);a.canvas&&a.canvas[l](g);var h=new bN(g,a);h.attrs={x:c,y:d,width:e,height:f,src:b};h.type="image";return h},bT=function(a,b,c,d){var e=bG("text");bG(e,{x:b,y:c,"text-anchor":"middle"});a.canvas&&a.canvas[l](e);var f=new bN(e,a);f.attrs={x:b,y:c,"text-anchor":"middle",text:d,font:W.font,stroke:"none",fill:"#000"};f.type="text";bK(f,f.attrs);return f},bU=function(a,b){this.width=a||this.width;this.height=b||this.height;this.canvas[R]("width",this.width);this.canvas[R]("height",this.height);return this},bV=function(){var b=by[m](0,arguments),c=b&&b.container,d=b.x,e=b.y,f=b.width,h=b.height;if(!c)throw new Error("SVG container not found.");var i=bG("svg");d=d||0;e=e||0;f=f||512;h=h||342;bG(i,{xmlns:"http://www.w3.org/2000/svg",version:1.1,width:f,height:h});if(c==1){i.style.cssText="position:absolute;left:"+d+"px;top:"+e+"px";g.body[l](i)}else c.firstChild?c.insertBefore(i,c.firstChild):c[l](i);c=new j;c.width=f;c.height=h;c.canvas=i;bz.call(c,c,a.fn);c.clear();return c};k.clear=function(){var a=this.canvas;while(a.firstChild)a.removeChild(a.firstChild);this.bottom=this.top=null;(this.desc=bG("desc"))[l](g.createTextNode("Created with Raphaël"));a[l](this.desc);a[l](this.defs=bG("defs"))};k.remove=function(){this.canvas.parentNode&&this.canvas.parentNode.removeChild(this.canvas);for(var a in this)this[a]=bF(a)}}if(a.vml){var bW={M:"m",L:"l",C:"c",Z:"x",m:"t",l:"r",c:"v",z:"x"},bX=/([clmz]),?([^clmz]*)/gi,bY=/ progid:\S+Blur\([^\)]+\)/g,bZ=/-?[^,\s-]+/g,b$=1000+q+1000,b_=10,ca={path:1,rect:1},cb=function(a){var b=/[ahqstv]/ig,c=bq;r(a).match(b)&&(c=bw);b=/[clmz]/g;if(c==bq&&!r(a).match(b)){var d=r(a)[Y](bX,function(a,b,c){var d=[],e=x.call(b)=="m",f=bW[b];c[Y](bZ,function(a){if(e&&d[w]==2){f+=d+bW[b=="m"?"l":"L"];d=[]}d[L](Q(a*b_))});return f+d});return d}var e=c(a),f,g;d=[];for(var h=0,i=e[w];h<i;h++){f=e[h];g=x.call(e[h][0]);g=="z"&&(g="x");for(var j=1,k=f[w];j<k;j++)g+=Q(f[j]*b_)+(j!=k-1?",":p);d[L](g)}return d[v](q)};a[H]=function(){return"Your browser doesn’t support SVG. Falling down to VML.\nYou are running Raphaël "+this.version};bH=function(a,b){var c=cd("group");c.style.cssText="position:absolute;left:0;top:0;width:"+b.width+"px;height:"+b.height+"px";c.coordsize=b.coordsize;c.coordorigin=b.coordorigin;var d=cd("shape"),e=d.style;e.width=b.width+"px";e.height=b.height+"px";d.coordsize=b$;d.coordorigin=b.coordorigin;c[l](d);var f=new bN(d,c,b),g={fill:"none",stroke:"#000"};a&&(g.path=a);f.type="path";f.path=[];f.Path=p;bK(f,g);b.canvas[l](c);return f};bK=function(c,d){c.attrs=c.attrs||{};var e=c.node,h=c.attrs,i=e.style,j,k=(d.x!=h.x||d.y!=h.y||d.width!=h.width||d.height!=h.height||d.r!=h.r)&&c.type=="rect",m=c;for(var n in d)d[f](n)&&(h[n]=d[n]);if(k){h.path=cc(h.x,h.y,h.width,h.height,h.r);c.X=h.x;c.Y=h.y;c.W=h.width;c.H=h.height}d.href&&(e.href=d.href);d.title&&(e.title=d.title);d.target&&(e.target=d.target);d.cursor&&(i.cursor=d.cursor);"blur"in d&&c.blur(d.blur);if(d.path&&c.type=="path"||k)e.path=cb(h.path);d.rotation!=null&&c.rotate(d.rotation,true);if(d.translation){j=r(d.translation)[s](b);cz.call(c,j[0],j[1]);if(c._.rt.cx!=null){c._.rt.cx+=+j[0];c._.rt.cy+=+j[1];c.setBox(c.attrs,j[0],j[1])}}if(d.scale){j=r(d.scale)[s](b);c.scale(+j[0]||1,+j[1]||+j[0]||1,+j[2]||null,+j[3]||null)}if("clip-rect"in d){var o=r(d["clip-rect"])[s](b);if(o[w]==4){o[2]=+o[2]+ +o[0];o[3]=+o[3]+ +o[1];var q=e.clipRect||g.createElement("div"),t=q.style,u=e.parentNode;t.clip=a.format("rect({1}px {2}px {3}px {0}px)",o);if(!e.clipRect){t.position="absolute";t.top=0;t.left=0;t.width=c.paper.width+"px";t.height=c.paper.height+"px";u.parentNode.insertBefore(q,u);q[l](u);e.clipRect=q}}d["clip-rect"]||e.clipRect&&(e.clipRect.style.clip=p)}c.type=="image"&&d.src&&(e.src=d.src);if(c.type=="image"&&d.opacity){e.filterOpacity=U+".Alpha(opacity="+d.opacity*100+")";i.filter=(e.filterMatrix||p)+(e.filterOpacity||p)}d.font&&(i.font=d.font);d["font-family"]&&(i.fontFamily="\""+d["font-family"][s](",")[0][Y](/^['"]+|['"]+$/g,p)+"\"");d["font-size"]&&(i.fontSize=d["font-size"]);d["font-weight"]&&(i.fontWeight=d["font-weight"]);d["font-style"]&&(i.fontStyle=d["font-style"]);if(d.opacity!=null||d["stroke-width"]!=null||d.fill!=null||d.stroke!=null||d["stroke-width"]!=null||d["stroke-opacity"]!=null||d["fill-opacity"]!=null||d["stroke-dasharray"]!=null||d["stroke-miterlimit"]!=null||d["stroke-linejoin"]!=null||d["stroke-linecap"]!=null){e=c.shape||e;var v=e.getElementsByTagName(I)&&e.getElementsByTagName(I)[0],x=false;!v&&(x=v=cd(I));if("fill-opacity"in d||"opacity"in d){var y=((+h["fill-opacity"]+1||2)-1)*((+h.opacity+1||2)-1)*((+a.getRGB(d.fill).o+1||2)-1);y=A(z(y,0),1);v.opacity=y}d.fill&&(v.on=true);if(v.on==null||d.fill=="none")v.on=false;if(v.on&&d.fill){var B=d.fill.match(M);if(B){v.src=B[1];v.type="tile"}else{v.color=a.getRGB(d.fill).hex;v.src=p;v.type="solid";if(a.getRGB(d.fill).error&&(m.type in{circle:1,ellipse:1}||r(d.fill).charAt()!="r")&&bI(m,d.fill)){h.fill="none";h.gradient=d.fill}}}x&&e[l](v);var C=e.getElementsByTagName("stroke")&&e.getElementsByTagName("stroke")[0],D=false;!C&&(D=C=cd("stroke"));if(d.stroke&&d.stroke!="none"||d["stroke-width"]||d["stroke-opacity"]!=null||d["stroke-dasharray"]||d["stroke-miterlimit"]||d["stroke-linejoin"]||d["stroke-linecap"])C.on=true;(d.stroke=="none"||C.on==null||d.stroke==0||d["stroke-width"]==0)&&(C.on=false);var E=a.getRGB(d.stroke);C.on&&d.stroke&&(C.color=E.hex);y=((+h["stroke-opacity"]+1||2)-1)*((+h.opacity+1||2)-1)*((+E.o+1||2)-1);var F=(S(d["stroke-width"])||1)*0.75;y=A(z(y,0),1);d["stroke-width"]==null&&(F=h["stroke-width"]);d["stroke-width"]&&(C.weight=F);F&&F<1&&(y*=F)&&(C.weight=1);C.opacity=y;d["stroke-linejoin"]&&(C.joinstyle=d["stroke-linejoin"]||"miter");C.miterlimit=d["stroke-miterlimit"]||8;d["stroke-linecap"]&&(C.endcap=d["stroke-linecap"]=="butt"?"flat":d["stroke-linecap"]=="square"?"square":"round");if(d["stroke-dasharray"]){var G={"-":"shortdash",".":"shortdot","-.":"shortdashdot","-..":"shortdashdotdot",". ":"dot","- ":"dash","--":"longdash","- .":"dashdot","--.":"longdashdot","--..":"longdashdotdot"};C.dashstyle=G[f](d["stroke-dasharray"])?G[d["stroke-dasharray"]]:p}D&&e[l](C)}if(m.type=="text"){i=m.paper.span.style;h.font&&(i.font=h.font);h["font-family"]&&(i.fontFamily=h["font-family"]);h["font-size"]&&(i.fontSize=h["font-size"]);h["font-weight"]&&(i.fontWeight=h["font-weight"]);h["font-style"]&&(i.fontStyle=h["font-style"]);m.node.string&&(m.paper.span.innerHTML=r(m.node.string)[Y](/</g,"&#60;")[Y](/&/g,"&#38;")[Y](/\n/g,"<br>"));m.W=h.w=m.paper.span.offsetWidth;m.H=h.h=m.paper.span.offsetHeight;m.X=h.x;m.Y=h.y+Q(m.H/2);switch(h["text-anchor"]){case"start":m.node.style["v-text-align"]="left";m.bbx=Q(m.W/2);break;case"end":m.node.style["v-text-align"]="right";m.bbx=-Q(m.W/2);break;default:m.node.style["v-text-align"]="center";break}}};bI=function(a,b){a.attrs=a.attrs||{};var c=a.attrs,d,e="linear",f=".5 .5";a.attrs.gradient=b;b=r(b)[Y](bd,function(a,b,c){e="radial";if(b&&c){b=S(b);c=S(c);C(b-0.5,2)+C(c-0.5,2)>0.25&&(c=y.sqrt(0.25-C(b-0.5,2))*((c>0.5)*2-1)+0.5);f=b+q+c}return p});b=b[s](/\s*\-\s*/);if(e=="linear"){var g=b.shift();g=-S(g);if(isNaN(g))return null}var h=bx(b);if(!h)return null;a=a.shape||a.node;d=a.getElementsByTagName(I)[0]||cd(I);!d.parentNode&&a.appendChild(d);if(h[w]){d.on=true;d.method="none";d.color=h[0].color;d.color2=h[h[w]-1].color;var i=[];for(var j=0,k=h[w];j<k;j++)h[j].offset&&i[L](h[j].offset+q+h[j].color);d.colors&&(d.colors.value=i[w]?i[v]():"0% "+d.color);if(e=="radial"){d.type="gradientradial";d.focus="100%";d.focussize=f;d.focusposition=f}else{d.type="gradient";d.angle=(270-g)%360}}return 1};bN=function(b,c,d){var e=0,f=0,g=0,h=1;this[0]=b;this.id=a._oid++;this.node=b;b.raphael=this;this.X=0;this.Y=0;this.attrs={};this.Group=c;this.paper=d;this._={tx:0,ty:0,rt:{deg:0},sx:1,sy:1};!d.bottom&&(d.bottom=this);this.prev=d.top;d.top&&(d.top.next=this);d.top=this;this.next=null};bO=bN[e];bO.rotate=function(a,c,d){if(this.removed)return this;if(a==null){if(this._.rt.cx)return[this._.rt.deg,this._.rt.cx,this._.rt.cy][v](q);return this._.rt.deg}a=r(a)[s](b);if(a[w]-1){c=S(a[1]);d=S(a[2])}a=S(a[0]);c!=null?this._.rt.deg=a:this._.rt.deg+=a;d==null&&(c=null);this._.rt.cx=c;this._.rt.cy=d;this.setBox(this.attrs,c,d);this.Group.style.rotation=this._.rt.deg;return this};bO.setBox=function(a,b,c){if(this.removed)return this;var d=this.Group.style,e=this.shape&&this.shape.style||this.node.style;a=a||{};for(var g in a)a[f](g)&&(this.attrs[g]=a[g]);b=b||this._.rt.cx;c=c||this._.rt.cy;var h=this.attrs,i,j,k,l;switch(this.type){case"circle":i=h.cx-h.r;j=h.cy-h.r;k=l=h.r*2;break;case"ellipse":i=h.cx-h.rx;j=h.cy-h.ry;k=h.rx*2;l=h.ry*2;break;case"image":i=+h.x;j=+h.y;k=h.width||0;l=h.height||0;break;case"text":this.textpath.v=["m",Q(h.x),", ",Q(h.y-2),"l",Q(h.x)+1,", ",Q(h.y-2)][v](p);i=h.x-Q(this.W/2);j=h.y-this.H/2;k=this.W;l=this.H;break;case"rect":case"path":if(this.attrs.path){var m=bn(this.attrs.path);i=m.x;j=m.y;k=m.width;l=m.height}else{i=0;j=0;k=this.paper.width;l=this.paper.height}break;default:i=0;j=0;k=this.paper.width;l=this.paper.height;break}b=b==null?i+k/2:b;c=c==null?j+l/2:c;var n=b-this.paper.width/2,o=c-this.paper.height/2,q;d.left!=(q=n+"px")&&(d.left=q);d.top!=(q=o+"px")&&(d.top=q);this.X=ca[f](this.type)?-n:i;this.Y=ca[f](this.type)?-o:j;this.W=k;this.H=l;if(ca[f](this.type)){e.left!=(q=-n*b_+"px")&&(e.left=q);e.top!=(q=-o*b_+"px")&&(e.top=q)}else if(this.type=="text"){e.left!=(q=-n+"px")&&(e.left=q);e.top!=(q=-o+"px")&&(e.top=q)}else{d.width!=(q=this.paper.width+"px")&&(d.width=q);d.height!=(q=this.paper.height+"px")&&(d.height=q);e.left!=(q=i-n+"px")&&(e.left=q);e.top!=(q=j-o+"px")&&(e.top=q);e.width!=(q=k+"px")&&(e.width=q);e.height!=(q=l+"px")&&(e.height=q)}};bO.hide=function(){!this.removed&&(this.Group.style.display="none");return this};bO.show=function(){!this.removed&&(this.Group.style.display="block");return this};bO.getBBox=function(){if(this.removed)return this;if(ca[f](this.type))return bn(this.attrs.path);return{x:this.X+(this.bbx||0),y:this.Y,width:this.W,height:this.H}};bO.remove=function(){if(this.removed)return;bA(this,this.paper);this.node.parentNode.removeChild(this.node);this.Group.parentNode.removeChild(this.Group);this.shape&&this.shape.parentNode.removeChild(this.shape);for(var a in this)delete this[a];this.removed=true};bO.attr=function(b,c){if(this.removed)return this;if(b==null){var d={};for(var e in this.attrs)this.attrs[f](e)&&(d[e]=this.attrs[e]);this._.rt.deg&&(d.rotation=this.rotate());(this._.sx!=1||this._.sy!=1)&&(d.scale=this.scale());d.gradient&&d.fill=="none"&&(d.fill=d.gradient)&&delete d.gradient;return d}if(c==null&&a.is(b,"string")){if(b=="translation")return cz.call(this);if(b=="rotation")return this.rotate();if(b=="scale")return this.scale();if(b==I&&this.attrs.fill=="none"&&this.attrs.gradient)return this.attrs.gradient;return this.attrs[b]}if(this.attrs&&c==null&&a.is(b,G)){var g,h={};for(e=0,g=b[w];e<g;e++)h[b[e]]=this.attr(b[e]);return h}var i;if(c!=null){i={};i[b]=c}c==null&&a.is(b,"object")&&(i=b);if(i){for(var j in this.paper.customAttributes)if(this.paper.customAttributes[f](j)&&i[f](j)&&a.is(this.paper.customAttributes[j],"function")){var k=this.paper.customAttributes[j].apply(this,[][n](i[j]));this.attrs[j]=i[j];for(var l in k)k[f](l)&&(i[l]=k[l])}i.text&&this.type=="text"&&(this.node.string=i.text);bK(this,i);i.gradient&&(({circle:1,ellipse:1})[f](this.type)||r(i.gradient).charAt()!="r")&&bI(this,i.gradient);(!ca[f](this.type)||this._.rt.deg)&&this.setBox(this.attrs)}return this};bO.toFront=function(){!this.removed&&this.Group.parentNode[l](this.Group);this.paper.top!=this&&bB(this,this.paper);return this};bO.toBack=function(){if(this.removed)return this;if(this.Group.parentNode.firstChild!=this.Group){this.Group.parentNode.insertBefore(this.Group,this.Group.parentNode.firstChild);bC(this,this.paper)}return this};bO.insertAfter=function(a){if(this.removed)return this;a.constructor==cC&&(a=a[a.length-1]);a.Group.nextSibling?a.Group.parentNode.insertBefore(this.Group,a.Group.nextSibling):a.Group.parentNode[l](this.Group);bD(this,a,this.paper);return this};bO.insertBefore=function(a){if(this.removed)return this;a.constructor==cC&&(a=a[0]);a.Group.parentNode.insertBefore(this.Group,a.Group);bE(this,a,this.paper);return this};bO.blur=function(b){var c=this.node.runtimeStyle,d=c.filter;d=d.replace(bY,p);if(+b!==0){this.attrs.blur=b;c.filter=d+q+U+".Blur(pixelradius="+(+b||1.5)+")";c.margin=a.format("-{0}px 0 0 -{0}px",Q(+b||1.5))}else{c.filter=d;c.margin=0;delete this.attrs.blur}};bP=function(a,b,c,d){var e=cd("group"),f=cd("oval"),g=f.style;e.style.cssText="position:absolute;left:0;top:0;width:"+a.width+"px;height:"+a.height+"px";e.coordsize=b$;e.coordorigin=a.coordorigin;e[l](f);var h=new bN(f,e,a);h.type="circle";bK(h,{stroke:"#000",fill:"none"});h.attrs.cx=b;h.attrs.cy=c;h.attrs.r=d;h.setBox({x:b-d,y:c-d,width:d*2,height:d*2});a.canvas[l](e);return h};function cc(b,c,d,e,f){return f?a.format("M{0},{1}l{2},0a{3},{3},0,0,1,{3},{3}l0,{5}a{3},{3},0,0,1,{4},{3}l{6},0a{3},{3},0,0,1,{4},{4}l0,{7}a{3},{3},0,0,1,{3},{4}z",b+f,c,d-f*2,f,-f,e-f*2,f*2-d,f*2-e):a.format("M{0},{1}l{2},0,0,{3},{4},0z",b,c,d,e,-d)}bQ=function(a,b,c,d,e,f){var g=cc(b,c,d,e,f),h=a.path(g),i=h.attrs;h.X=i.x=b;h.Y=i.y=c;h.W=i.width=d;h.H=i.height=e;i.r=f;i.path=g;h.type="rect";return h};bR=function(a,b,c,d,e){var f=cd("group"),g=cd("oval"),h=g.style;f.style.cssText="position:absolute;left:0;top:0;width:"+a.width+"px;height:"+a.height+"px";f.coordsize=b$;f.coordorigin=a.coordorigin;f[l](g);var i=new bN(g,f,a);i.type="ellipse";bK(i,{stroke:"#000"});i.attrs.cx=b;i.attrs.cy=c;i.attrs.rx=d;i.attrs.ry=e;i.setBox({x:b-d,y:c-e,width:d*2,height:e*2});a.canvas[l](f);return i};bS=function(a,b,c,d,e,f){var g=cd("group"),h=cd("image");g.style.cssText="position:absolute;left:0;top:0;width:"+a.width+"px;height:"+a.height+"px";g.coordsize=b$;g.coordorigin=a.coordorigin;h.src=b;g[l](h);var i=new bN(h,g,a);i.type="image";i.attrs.src=b;i.attrs.x=c;i.attrs.y=d;i.attrs.w=e;i.attrs.h=f;i.setBox({x:c,y:d,width:e,height:f});a.canvas[l](g);return i};bT=function(b,c,d,e){var f=cd("group"),g=cd("shape"),h=g.style,i=cd("path"),j=i.style,k=cd("textpath");f.style.cssText="position:absolute;left:0;top:0;width:"+b.width+"px;height:"+b.height+"px";f.coordsize=b$;f.coordorigin=b.coordorigin;i.v=a.format("m{0},{1}l{2},{1}",Q(c*10),Q(d*10),Q(c*10)+1);i.textpathok=true;h.width=b.width;h.height=b.height;k.string=r(e);k.on=true;g[l](k);g[l](i);f[l](g);var m=new bN(k,f,b);m.shape=g;m.textpath=i;m.type="text";m.attrs.text=e;m.attrs.x=c;m.attrs.y=d;m.attrs.w=1;m.attrs.h=1;bK(m,{font:W.font,stroke:"none",fill:"#000"});m.setBox();b.canvas[l](f);return m};bU=function(a,b){var c=this.canvas.style;a==+a&&(a+="px");b==+b&&(b+="px");c.width=a;c.height=b;c.clip="rect(0 "+a+" "+b+" 0)";return this};var cd;g.createStyleSheet().addRule(".rvml","behavior:url(#default#VML)");try{!g.namespaces.rvml&&g.namespaces.add("rvml","urn:schemas-microsoft-com:vml");cd=function(a){return g.createElement("<rvml:"+a+" class=\"rvml\">")}}catch(a){cd=function(a){return g.createElement("<"+a+" xmlns=\"urn:schemas-microsoft.com:vml\" class=\"rvml\">")}}bV=function(){var b=by[m](0,arguments),c=b.container,d=b.height,e,f=b.width,h=b.x,i=b.y;if(!c)throw new Error("VML container not found.");var k=new j,n=k.canvas=g.createElement("div"),o=n.style;h=h||0;i=i||0;f=f||512;d=d||342;f==+f&&(f+="px");d==+d&&(d+="px");k.width=1000;k.height=1000;k.coordsize=b_*1000+q+b_*1000;k.coordorigin="0 0";k.span=g.createElement("span");k.span.style.cssText="position:absolute;left:-9999em;top:-9999em;padding:0;margin:0;line-height:1;display:inline;";n[l](k.span);o.cssText=a.format("top:0;left:0;width:{0};height:{1};display:inline-block;position:relative;clip:rect(0 {0} {1} 0);overflow:hidden",f,d);if(c==1){g.body[l](n);o.left=h+"px";o.top=i+"px";o.position="absolute"}else c.firstChild?c.insertBefore(n,c.firstChild):c[l](n);bz.call(k,k,a.fn);return k};k.clear=function(){this.canvas.innerHTML=p;this.span=g.createElement("span");this.span.style.cssText="position:absolute;left:-9999em;top:-9999em;padding:0;margin:0;line-height:1;display:inline;";this.canvas[l](this.span);this.bottom=this.top=null};k.remove=function(){this.canvas.parentNode.removeChild(this.canvas);for(var a in this)this[a]=bF(a);return true}}var ce=navigator.userAgent.match(/Version\\x2f(.*?)\s/);navigator.vendor=="Apple Computer, Inc."&&(ce&&ce[1]<4||navigator.platform.slice(0,2)=="iP")?k.safari=function(){var a=this.rect(-99,-99,this.width+99,this.height+99).attr({stroke:"none"});h.setTimeout(function(){a.remove()})}:k.safari=function(){};var cf=function(){this.returnValue=false},cg=function(){return this.originalEvent.preventDefault()},ch=function(){this.cancelBubble=true},ci=function(){return this.originalEvent.stopPropagation()},cj=(function(){{if(g.addEventListener)return function(a,b,c,d){var e=o&&u[b]?u[b]:b,g=function(e){if(o&&u[f](b))for(var g=0,h=e.targetTouches&&e.targetTouches.length;g<h;g++){if(e.targetTouches[g].target==a){var i=e;e=e.targetTouches[g];e.originalEvent=i;e.preventDefault=cg;e.stopPropagation=ci;break}}return c.call(d,e)};a.addEventListener(e,g,false);return function(){a.removeEventListener(e,g,false);return true}};if(g.attachEvent)return function(a,b,c,d){var e=function(a){a=a||h.event;a.preventDefault=a.preventDefault||cf;a.stopPropagation=a.stopPropagation||ch;return c.call(d,a)};a.attachEvent("on"+b,e);var f=function(){a.detachEvent("on"+b,e);return true};return f}}})(),ck=[],cl=function(a){var b=a.clientX,c=a.clientY,d=g.documentElement.scrollTop||g.body.scrollTop,e=g.documentElement.scrollLeft||g.body.scrollLeft,f,h=ck.length;while(h--){f=ck[h];if(o){var i=a.touches.length,j;while(i--){j=a.touches[i];if(j.identifier==f.el._drag.id){b=j.clientX;c=j.clientY;(a.originalEvent?a.originalEvent:a).preventDefault();break}}}else a.preventDefault();b+=e;c+=d;f.move&&f.move.call(f.move_scope||f.el,b-f.el._drag.x,c-f.el._drag.y,b,c,a)}},cm=function(b){a.unmousemove(cl).unmouseup(cm);var c=ck.length,d;while(c--){d=ck[c];d.el._drag={};d.end&&d.end.call(d.end_scope||d.start_scope||d.move_scope||d.el,b)}ck=[]};for(var cn=t[w];cn--;)(function(b){a[b]=bN[e][b]=function(c,d){if(a.is(c,"function")){this.events=this.events||[];this.events.push({name:b,f:c,unbind:cj(this.shape||this.node||g,b,c,d||this)})}return this};a["un"+b]=bN[e]["un"+b]=function(a){var c=this.events,d=c[w];while(d--)if(c[d].name==b&&c[d].f==a){c[d].unbind();c.splice(d,1);!c.length&&delete this.events;return this}return this}})(t[cn]);bO.hover=function(a,b,c,d){return this.mouseover(a,c).mouseout(b,d||c)};bO.unhover=function(a,b){return this.unmouseover(a).unmouseout(b)};bO.drag=function(b,c,d,e,f,h){this._drag={};this.mousedown(function(i){(i.originalEvent||i).preventDefault();var j=g.documentElement.scrollTop||g.body.scrollTop,k=g.documentElement.scrollLeft||g.body.scrollLeft;this._drag.x=i.clientX+k;this._drag.y=i.clientY+j;this._drag.id=i.identifier;c&&c.call(f||e||this,i.clientX+k,i.clientY+j,i);!ck.length&&a.mousemove(cl).mouseup(cm);ck.push({el:this,move:b,end:d,move_scope:e,start_scope:f,end_scope:h})});return this};bO.undrag=function(b,c,d){var e=ck.length;while(e--)ck[e].el==this&&(ck[e].move==b&&ck[e].end==d)&&ck.splice(e++,1);!ck.length&&a.unmousemove(cl).unmouseup(cm)};k.circle=function(a,b,c){return bP(this,a||0,b||0,c||0)};k.rect=function(a,b,c,d,e){return bQ(this,a||0,b||0,c||0,d||0,e||0)};k.ellipse=function(a,b,c,d){return bR(this,a||0,b||0,c||0,d||0)};k.path=function(b){b&&!a.is(b,F)&&!a.is(b[0],G)&&(b+=p);return bH(a.format[m](a,arguments),this)};k.image=function(a,b,c,d,e){return bS(this,a||"about:blank",b||0,c||0,d||0,e||0)};k.text=function(a,b,c){return bT(this,a||0,b||0,r(c))};k.set=function(a){arguments[w]>1&&(a=Array[e].splice.call(arguments,0,arguments[w]));return new cC(a)};k.setSize=bU;k.top=k.bottom=null;k.raphael=a;function co(){return this.x+q+this.y}bO.resetScale=function(){if(this.removed)return this;this._.sx=1;this._.sy=1;this.attrs.scale="1 1"};bO.scale=function(a,b,c,d){if(this.removed)return this;if(a==null&&b==null)return{x:this._.sx,y:this._.sy,toString:co};b=b||a;!(+b)&&(b=a);var e,f,g,h,i=this.attrs;if(a!=0){var j=this.getBBox(),k=j.x+j.width/2,l=j.y+j.height/2,m=B(a/this._.sx),o=B(b/this._.sy);c=+c||c==0?c:k;d=+d||d==0?d:l;var r=this._.sx>0,s=this._.sy>0,t=~(~(a/B(a))),u=~(~(b/B(b))),x=m*t,y=o*u,z=this.node.style,A=c+B(k-c)*x*(k>c==r?1:-1),C=d+B(l-d)*y*(l>d==s?1:-1),D=a*t>b*u?o:m;switch(this.type){case"rect":case"image":var E=i.width*m,F=i.height*o;this.attr({height:F,r:i.r*D,width:E,x:A-E/2,y:C-F/2});break;case"circle":case"ellipse":this.attr({rx:i.rx*m,ry:i.ry*o,r:i.r*D,cx:A,cy:C});break;case"text":this.attr({x:A,y:C});break;case"path":var G=bp(i.path),H=true,I=r?x:m,J=s?y:o;for(var K=0,L=G[w];K<L;K++){var M=G[K],N=V.call(M[0]);{if(N=="M"&&H)continue;H=false}if(N=="A"){M[G[K][w]-2]*=I;M[G[K][w]-1]*=J;M[1]*=m;M[2]*=o;M[5]=+(t+u?!(!(+M[5])):!(+M[5]))}else if(N=="H")for(var O=1,P=M[w];O<P;O++)M[O]*=I;else if(N=="V")for(O=1,P=M[w];O<P;O++)M[O]*=J;else for(O=1,P=M[w];O<P;O++)M[O]*=O%2?I:J}var Q=bn(G);e=A-Q.x-Q.width/2;f=C-Q.y-Q.height/2;G[0][1]+=e;G[0][2]+=f;this.attr({path:G});break}if(this.type in{text:1,image:1}&&(t!=1||u!=1))if(this.transformations){this.transformations[2]="scale("[n](t,",",u,")");this.node[R]("transform",this.transformations[v](q));e=t==-1?-i.x-(E||0):i.x;f=u==-1?-i.y-(F||0):i.y;this.attr({x:e,y:f});i.fx=t-1;i.fy=u-1}else{this.node.filterMatrix=U+".Matrix(M11="[n](t,", M12=0, M21=0, M22=",u,", Dx=0, Dy=0, sizingmethod='auto expand', filtertype='bilinear')");z.filter=(this.node.filterMatrix||p)+(this.node.filterOpacity||p)}else if(this.transformations){this.transformations[2]=p;this.node[R]("transform",this.transformations[v](q));i.fx=0;i.fy=0}else{this.node.filterMatrix=p;z.filter=(this.node.filterMatrix||p)+(this.node.filterOpacity||p)}i.scale=[a,b,c,d][v](q);this._.sx=a;this._.sy=b}return this};bO.clone=function(){if(this.removed)return null;var a=this.attr();delete a.scale;delete a.translation;return this.paper[this.type]().attr(a)};var cp={},cq=function(b,c,d,e,f,g,h,i,j){var k=0,l=100,m=[b,c,d,e,f,g,h,i].join(),n=cp[m],o,p;!n&&(cp[m]=n={data:[]});n.timer&&clearTimeout(n.timer);n.timer=setTimeout(function(){delete cp[m]},2000);if(j!=null){var q=cq(b,c,d,e,f,g,h,i);l=~(~q)*10}for(var r=0;r<l+1;r++){if(n.data[j]>r)p=n.data[r*l];else{p=a.findDotsAtSegment(b,c,d,e,f,g,h,i,r/l);n.data[r]=p}r&&(k+=C(C(o.x-p.x,2)+C(o.y-p.y,2),0.5));if(j!=null&&k>=j)return p;o=p}if(j==null)return k},cr=function(b,c){return function(d,e,f){d=bw(d);var g,h,i,j,k="",l={},m,n=0;for(var o=0,p=d.length;o<p;o++){i=d[o];if(i[0]=="M"){g=+i[1];h=+i[2]}else{j=cq(g,h,i[1],i[2],i[3],i[4],i[5],i[6]);if(n+j>e){if(c&&!l.start){m=cq(g,h,i[1],i[2],i[3],i[4],i[5],i[6],e-n);k+=["C",m.start.x,m.start.y,m.m.x,m.m.y,m.x,m.y];if(f)return k;l.start=k;k=["M",m.x,m.y+"C",m.n.x,m.n.y,m.end.x,m.end.y,i[5],i[6]][v]();n+=j;g=+i[5];h=+i[6];continue}if(!b&&!c){m=cq(g,h,i[1],i[2],i[3],i[4],i[5],i[6],e-n);return{x:m.x,y:m.y,alpha:m.alpha}}}n+=j;g=+i[5];h=+i[6]}k+=i}l.end=k;m=b?n:c?l:a.findDotsAtSegment(g,h,i[1],i[2],i[3],i[4],i[5],i[6],1);m.alpha&&(m={x:m.x,y:m.y,alpha:m.alpha});return m}},cs=cr(1),ct=cr(),cu=cr(0,1);bO.getTotalLength=function(){if(this.type!="path")return;if(this.node.getTotalLength)return this.node.getTotalLength();return cs(this.attrs.path)};bO.getPointAtLength=function(a){if(this.type!="path")return;return ct(this.attrs.path,a)};bO.getSubpath=function(a,b){if(this.type!="path")return;if(B(this.getTotalLength()-b)<"1e-6")return cu(this.attrs.path,a).end;var c=cu(this.attrs.path,b,1);return a?cu(c,a).end:c};a.easing_formulas={linear:function(a){return a},"<":function(a){return C(a,3)},">":function(a){return C(a-1,3)+1},"<>":function(a){a=a*2;if(a<1)return C(a,3)/2;a-=2;return(C(a,3)+2)/2},backIn:function(a){var b=1.70158;return a*a*((b+1)*a-b)},backOut:function(a){a=a-1;var b=1.70158;return a*a*((b+1)*a+b)+1},elastic:function(a){if(a==0||a==1)return a;var b=0.3,c=b/4;return C(2,-10*a)*y.sin((a-c)*(2*D)/b)+1},bounce:function(a){var b=7.5625,c=2.75,d;if(a<1/c)d=b*a*a;else if(a<2/c){a-=1.5/c;d=b*a*a+0.75}else if(a<2.5/c){a-=2.25/c;d=b*a*a+0.9375}else{a-=2.625/c;d=b*a*a+0.984375}return d}};var cv=[],cw=function(){var b=+(new Date);for(var c=0;c<cv[w];c++){var d=cv[c];if(d.stop||d.el.removed)continue;var e=b-d.start,g=d.ms,h=d.easing,i=d.from,j=d.diff,k=d.to,l=d.t,m=d.el,n={},o;if(e<g){var r=h(e/g);for(var s in i)if(i[f](s)){switch(X[s]){case"along":o=r*g*j[s];k.back&&(o=k.len-o);var t=ct(k[s],o);m.translate(j.sx-j.x||0,j.sy-j.y||0);j.x=t.x;j.y=t.y;m.translate(t.x-j.sx,t.y-j.sy);k.rot&&m.rotate(j.r+t.alpha,t.x,t.y);break;case E:o=+i[s]+r*g*j[s];break;case"colour":o="rgb("+[cy(Q(i[s].r+r*g*j[s].r)),cy(Q(i[s].g+r*g*j[s].g)),cy(Q(i[s].b+r*g*j[s].b))][v](",")+")";break;case"path":o=[];for(var u=0,x=i[s][w];u<x;u++){o[u]=[i[s][u][0]];for(var y=1,z=i[s][u][w];y<z;y++)o[u][y]=+i[s][u][y]+r*g*j[s][u][y];o[u]=o[u][v](q)}o=o[v](q);break;case"csv":switch(s){case"translation":var A=r*g*j[s][0]-l.x,B=r*g*j[s][1]-l.y;l.x+=A;l.y+=B;o=A+q+B;break;case"rotation":o=+i[s][0]+r*g*j[s][0];i[s][1]&&(o+=","+i[s][1]+","+i[s][2]);break;case"scale":o=[+i[s][0]+r*g*j[s][0],+i[s][1]+r*g*j[s][1],2 in k[s]?k[s][2]:p,3 in k[s]?k[s][3]:p][v](q);break;case"clip-rect":o=[];u=4;while(u--)o[u]=+i[s][u]+r*g*j[s][u];break}break;default:var C=[].concat(i[s]);o=[];u=m.paper.customAttributes[s].length;while(u--)o[u]=+C[u]+r*g*j[s][u];break}n[s]=o}m.attr(n);m._run&&m._run.call(m)}else{if(k.along){t=ct(k.along,k.len*!k.back);m.translate(j.sx-(j.x||0)+t.x-j.sx,j.sy-(j.y||0)+t.y-j.sy);k.rot&&m.rotate(j.r+t.alpha,t.x,t.y)}(l.x||l.y)&&m.translate(-l.x,-l.y);k.scale&&(k.scale+=p);m.attr(k);cv.splice(c--,1)}}a.svg&&m&&m.paper&&m.paper.safari();cv[w]&&setTimeout(cw)},cx=function(b,c,d,e,f){var g=d-e;c.timeouts.push(setTimeout(function(){a.is(f,"function")&&f.call(c);c.animate(b,g,b.easing)},e))},cy=function(a){return z(A(a,255),0)},cz=function(a,b){if(a==null)return{x:this._.tx,y:this._.ty,toString:co};this._.tx+=+a;this._.ty+=+b;switch(this.type){case"circle":case"ellipse":this.attr({cx:+a+this.attrs.cx,cy:+b+this.attrs.cy});break;case"rect":case"image":case"text":this.attr({x:+a+this.attrs.x,y:+b+this.attrs.y});break;case"path":var c=bp(this.attrs.path);c[0][1]+=+a;c[0][2]+=+b;this.attr({path:c});break}return this};bO.animateWith=function(a,b,c,d,e){for(var f=0,g=cv.length;f<g;f++)cv[f].el.id==a.id&&(b.start=cv[f].start);return this.animate(b,c,d,e)};bO.animateAlong=cA();bO.animateAlongBack=cA(1);function cA(b){return function(c,d,e,f){var g={back:b};a.is(e,"function")?f=e:g.rot=e;c&&c.constructor==bN&&(c=c.attrs.path);c&&(g.along=c);return this.animate(g,d,f)}}function cB(a,b,c,d,e,f){var g=3*b,h=3*(d-b)-g,i=1-g-h,j=3*c,k=3*(e-c)-j,l=1-j-k;function m(a){return((i*a+h)*a+g)*a}function n(a,b){var c=o(a,b);return((l*c+k)*c+j)*c}function o(a,b){var c,d,e,f,j,k;for(e=a,k=0;k<8;k++){f=m(e)-a;if(B(f)<b)return e;j=(3*i*e+2*h)*e+g;if(B(j)<0.000001)break;e=e-f/j}c=0;d=1;e=a;if(e<c)return c;if(e>d)return d;while(c<d){f=m(e);if(B(f-a)<b)return e;a>f?c=e:d=e;e=(d-c)/2+c}return e}return n(a,1/(200*f))}bO.onAnimation=function(a){this._run=a||0;return this};bO.animate=function(c,d,e,g){var h=this;h.timeouts=h.timeouts||[];if(a.is(e,"function")||!e)g=e||null;if(h.removed){g&&g.call(h);return h}var i={},j={},k=false,l={};for(var m in c)if(c[f](m)){if(X[f](m)||h.paper.customAttributes[f](m)){k=true;i[m]=h.attr(m);i[m]==null&&(i[m]=W[m]);j[m]=c[m];switch(X[m]){case"along":var n=cs(c[m]),o=ct(c[m],n*!(!c.back)),p=h.getBBox();l[m]=n/d;l.tx=p.x;l.ty=p.y;l.sx=o.x;l.sy=o.y;j.rot=c.rot;j.back=c.back;j.len=n;c.rot&&(l.r=S(h.rotate())||0);break;case E:l[m]=(j[m]-i[m])/d;break;case"colour":i[m]=a.getRGB(i[m]);var q=a.getRGB(j[m]);l[m]={r:(q.r-i[m].r)/d,g:(q.g-i[m].g)/d,b:(q.b-i[m].b)/d};break;case"path":var t=bw(i[m],j[m]);i[m]=t[0];var u=t[1];l[m]=[];for(var v=0,x=i[m][w];v<x;v++){l[m][v]=[0];for(var y=1,z=i[m][v][w];y<z;y++)l[m][v][y]=(u[v][y]-i[m][v][y])/d}break;case"csv":var A=r(c[m])[s](b),B=r(i[m])[s](b);switch(m){case"translation":i[m]=[0,0];l[m]=[A[0]/d,A[1]/d];break;case"rotation":i[m]=B[1]==A[1]&&B[2]==A[2]?B:[0,A[1],A[2]];l[m]=[(A[0]-i[m][0])/d,0,0];break;case"scale":c[m]=A;i[m]=r(i[m])[s](b);l[m]=[(A[0]-i[m][0])/d,(A[1]-i[m][1])/d,0,0];break;case"clip-rect":i[m]=r(i[m])[s](b);l[m]=[];v=4;while(v--)l[m][v]=(A[v]-i[m][v])/d;break}j[m]=A;break;default:A=[].concat(c[m]);B=[].concat(i[m]);l[m]=[];v=h.paper.customAttributes[m][w];while(v--)l[m][v]=((A[v]||0)-(B[v]||0))/d;break}}}if(k){var G=a.easing_formulas[e];if(!G){G=r(e).match(P);if(G&&G[w]==5){var H=G;G=function(a){return cB(a,+H[1],+H[2],+H[3],+H[4],d)}}else G=function(a){return a}}cv.push({start:c.start||+(new Date),ms:d,easing:G,from:i,diff:l,to:j,el:h,t:{x:0,y:0}});a.is(g,"function")&&(h._ac=setTimeout(function(){g.call(h)},d));cv[w]==1&&setTimeout(cw)}else{var C=[],D;for(var F in c)if(c[f](F)&&Z.test(F)){m={value:c[F]};F=="from"&&(F=0);F=="to"&&(F=100);m.key=T(F,10);C.push(m)}C.sort(be);C[0].key&&C.unshift({key:0,value:h.attrs});for(v=0,x=C[w];v<x;v++)cx(C[v].value,h,d/100*C[v].key,d/100*(C[v-1]&&C[v-1].key||0),C[v-1]&&C[v-1].value.callback);D=C[C[w]-1].value.callback;D&&h.timeouts.push(setTimeout(function(){D.call(h)},d))}return this};bO.stop=function(){for(var a=0;a<cv.length;a++)cv[a].el.id==this.id&&cv.splice(a--,1);for(a=0,ii=this.timeouts&&this.timeouts.length;a<ii;a++)clearTimeout(this.timeouts[a]);this.timeouts=[];clearTimeout(this._ac);delete this._ac;return this};bO.translate=function(a,b){return this.attr({translation:a+" "+b})};bO[H]=function(){return"Raphaël’s object"};a.ae=cv;var cC=function(a){this.items=[];this[w]=0;this.type="set";if(a)for(var b=0,c=a[w];b<c;b++){if(a[b]&&(a[b].constructor==bN||a[b].constructor==cC)){this[this.items[w]]=this.items[this.items[w]]=a[b];this[w]++}}};cC[e][L]=function(){var a,b;for(var c=0,d=arguments[w];c<d;c++){a=arguments[c];if(a&&(a.constructor==bN||a.constructor==cC)){b=this.items[w];this[b]=this.items[b]=a;this[w]++}}return this};cC[e].pop=function(){delete this[this[w]--];return this.items.pop()};for(var cD in bO)bO[f](cD)&&(cC[e][cD]=(function(a){return function(){for(var b=0,c=this.items[w];b<c;b++)this.items[b][a][m](this.items[b],arguments);return this}})(cD));cC[e].attr=function(b,c){if(b&&a.is(b,G)&&a.is(b[0],"object"))for(var d=0,e=b[w];d<e;d++)this.items[d].attr(b[d]);else for(var f=0,g=this.items[w];f<g;f++)this.items[f].attr(b,c);return this};cC[e].animate=function(b,c,d,e){(a.is(d,"function")||!d)&&(e=d||null);var f=this.items[w],g=f,h,i=this,j;e&&(j=function(){!(--f)&&e.call(i)});d=a.is(d,F)?d:j;h=this.items[--g].animate(b,c,d,j);while(g--)this.items[g]&&!this.items[g].removed&&this.items[g].animateWith(h,b,c,d,j);return this};cC[e].insertAfter=function(a){var b=this.items[w];while(b--)this.items[b].insertAfter(a);return this};cC[e].getBBox=function(){var a=[],b=[],c=[],d=[];for(var e=this.items[w];e--;){var f=this.items[e].getBBox();a[L](f.x);b[L](f.y);c[L](f.x+f.width);d[L](f.y+f.height)}a=A[m](0,a);b=A[m](0,b);return{x:a,y:b,width:z[m](0,c)-a,height:z[m](0,d)-b}};cC[e].clone=function(a){a=new cC;for(var b=0,c=this.items[w];b<c;b++)a[L](this.items[b].clone());return a};a.registerFont=function(a){if(!a.face)return a;this.fonts=this.fonts||{};var b={w:a.w,face:{},glyphs:{}},c=a.face["font-family"];for(var d in a.face)a.face[f](d)&&(b.face[d]=a.face[d]);this.fonts[c]?this.fonts[c][L](b):this.fonts[c]=[b];if(!a.svg){b.face["units-per-em"]=T(a.face["units-per-em"],10);for(var e in a.glyphs)if(a.glyphs[f](e)){var g=a.glyphs[e];b.glyphs[e]={w:g.w,k:{},d:g.d&&"M"+g.d[Y](/[mlcxtrv]/g,function(a){return({l:"L",c:"C",x:"z",t:"m",r:"l",v:"c"})[a]||"M"})+"z"};if(g.k)for(var h in g.k)g[f](h)&&(b.glyphs[e].k[h]=g.k[h])}}return a};k.getFont=function(b,c,d,e){e=e||"normal";d=d||"normal";c=+c||({normal:400,bold:700,lighter:300,bolder:800})[c]||400;if(!a.fonts)return;var g=a.fonts[b];if(!g){var h=new RegExp("(^|\\s)"+b[Y](/[^\w\d\s+!~.:_-]/g,p)+"(\\s|$)","i");for(var i in a.fonts)if(a.fonts[f](i)){if(h.test(i)){g=a.fonts[i];break}}}var j;if(g)for(var k=0,l=g[w];k<l;k++){j=g[k];if(j.face["font-weight"]==c&&(j.face["font-style"]==d||!j.face["font-style"])&&j.face["font-stretch"]==e)break}return j};k.print=function(c,d,e,f,g,h,i){h=h||"middle";i=z(A(i||0,1),-1);var j=this.set(),k=r(e)[s](p),l=0,m=p,n;a.is(f,e)&&(f=this.getFont(f));if(f){n=(g||16)/f.face["units-per-em"];var o=f.face.bbox.split(b),q=+o[0],t=+o[1]+(h=="baseline"?o[3]-o[1]+ +f.face.descent:(o[3]-o[1])/2);for(var u=0,v=k[w];u<v;u++){var x=u&&f.glyphs[k[u-1]]||{},y=f.glyphs[k[u]];l+=u?(x.w||f.w)+(x.k&&x.k[k[u]]||0)+f.w*i:0;y&&y.d&&j[L](this.path(y.d).attr({fill:"#000",stroke:"none",translation:[l,0]}))}j.scale(n,n,q,t).translate(c-q,d-t)}return j};a.format=function(b,c){var e=a.is(c,G)?[0][n](c):arguments;b&&a.is(b,F)&&e[w]-1&&(b=b[Y](d,function(a,b){return e[++b]==null?p:e[b]}));return b||p};a.ninja=function(){i.was?h.Raphael=i.is:delete Raphael;return a};a.el=bO;a.st=cC[e];i.was?h.Raphael=a:Raphael=a})()
diff --git a/webapp/src/main/webapp/js/searchDownload.js b/webapp/src/main/webapp/js/searchDownload.js
index 24a66a749..bb53c8c00 100644
--- a/webapp/src/main/webapp/js/searchDownload.js
+++ b/webapp/src/main/webapp/js/searchDownload.js
@@ -48,13 +48,13 @@ $(document).ready(function(){
 	      }
 	    });
 	    $( "#amount" ).val( $( "#slider-vertical" ).slider( "value" ) );
-	
+
 
     // Prevent close link for URI qTip from requesting bogus '#' href
     $('a.close').click(function() {
         $('#downloadIcon').qtip("hide");
         return false;
     });
-    
 
-});
\ No newline at end of file
+
+});
diff --git a/webapp/src/main/webapp/js/selectivizr.js b/webapp/src/main/webapp/js/selectivizr.js
index 3e06de7f6..87ecf5d05 100755
--- a/webapp/src/main/webapp/js/selectivizr.js
+++ b/webapp/src/main/webapp/js/selectivizr.js
@@ -2,4 +2,4 @@
 selectivizr v1.0.0 - (c) Keith Clark, freely distributable under the terms of the MIT license.
 selectivizr.com
 */
-(function(x){function K(a){return a.replace(L,o).replace(M,function(b,e,c){b=c.split(",");c=0;for(var g=b.length;c<g;c++){var j=N(b[c].replace(O,o).replace(P,o))+t,f=[];b[c]=j.replace(Q,function(d,k,l,i,h){if(k){if(f.length>0){d=f;var u;h=j.substring(0,h).replace(R,n);if(h==n||h.charAt(h.length-1)==t)h+="*";try{u=v(h)}catch(da){}if(u){h=0;for(l=u.length;h<l;h++){i=u[h];for(var y=i.className,z=0,S=d.length;z<S;z++){var q=d[z];if(!RegExp("(^|\\s)"+q.className+"(\\s|$)").test(i.className))if(q.b&&(q.b===true||q.b(i)===true))y=A(y,q.className,true)}i.className=y}}f=[]}return k}else{if(k=l?T(l):!B||B.test(i)?{className:C(i),b:true}:null){f.push(k);return"."+k.className}return d}})}return e+b.join(",")})}function T(a){var b=true,e=C(a.slice(1)),c=a.substring(0,5)==":not(",g,j;if(c)a=a.slice(5,-1);var f=a.indexOf("(");if(f>-1)a=a.substring(0,f);if(a.charAt(0)==":")switch(a.slice(1)){case "root":b=function(d){return c?d!=D:d==D};break;case "target":if(p==8){b=function(d){function k(){var l=location.hash,i=l.slice(1);return c?l==""||d.id!=i:l!=""&&d.id==i}x.attachEvent("onhashchange",function(){r(d,e,k())});return k()};break}return false;case "checked":b=function(d){U.test(d.type)&&d.attachEvent("onpropertychange",function(){event.propertyName=="checked"&&r(d,e,d.checked!==c)});return d.checked!==c};break;case "disabled":c=!c;case "enabled":b=function(d){if(V.test(d.tagName)){d.attachEvent("onpropertychange",function(){event.propertyName=="$disabled"&&r(d,e,d.a===c)});w.push(d);d.a=d.disabled;return d.disabled===c}return a==":enabled"?c:!c};break;case "focus":g="focus";j="blur";case "hover":if(!g){g="mouseenter";j="mouseleave"}b=function(d){d.attachEvent("on"+(c?j:g),function(){r(d,e,true)});d.attachEvent("on"+(c?g:j),function(){r(d,e,false)});return c};break;default:if(!W.test(a))return false;break}return{className:e,b:b}}function C(a){return E+"-"+(p==6&&X?Y++:a.replace(Z,function(b){return b.charCodeAt(0)}))}function N(a){return a.replace(F,o).replace($,t)}function r(a,b,e){var c=a.className;b=A(c,b,e);if(b!=c){a.className=b;a.parentNode.className+=n}}function A(a,b,e){var c=RegExp("(^|\\s)"+b+"(\\s|$)"),g=c.test(a);return e?g?a:a+t+b:g?a.replace(c,o).replace(F,o):a}function G(a,b){if(/^https?:\/\//i.test(a))return b.substring(0,b.indexOf("/",8))==a.substring(0,a.indexOf("/",8))?a:null;if(a.charAt(0)=="/")return b.substring(0,b.indexOf("/",8))+a;var e=b.split("?")[0];if(a.charAt(0)!="?"&&e.charAt(e.length-1)!="/")e=e.substring(0,e.lastIndexOf("/")+1);return e+a}function H(a){if(a){s.open("GET",a,false);s.send();return(s.status==200?s.responseText:n).replace(aa,n).replace(ba,function(b,e,c){return H(G(c,a))})}return n}function ca(){var a,b;a=m.getElementsByTagName("BASE");for(var e=a.length>0?a[0].href:m.location.href,c=0;c<m.styleSheets.length;c++){b=m.styleSheets[c];if(b.href!=n)if(a=G(b.href,e))b.cssText=K(H(a))}w.length>0&&setInterval(function(){for(var g=0,j=w.length;g<j;g++){var f=w[g];if(f.disabled!==f.a)if(f.disabled){f.disabled=false;f.a=true;f.disabled=true}else f.a=f.disabled}},250)}if(!/*@cc_on!@*/true){var m=document,D=m.documentElement,s=function(){if(x.XMLHttpRequest)return new XMLHttpRequest;try{return new ActiveXObject("Microsoft.XMLHTTP")}catch(a){return null}}(),p=/MSIE ([\d])/.exec(navigator.userAgent)[1];if(!(m.compatMode!="CSS1Compat"||p<6||p>8||!s)){var I={NW:"*.Dom.select",DOMAssistant:"*.$",Prototype:"$$",YAHOO:"*.util.Selector.query",MooTools:"$$",Sizzle:"*",jQuery:"*",dojo:"*.query"},v,w=[],Y=0,X=true,E="slvzr",J=E+"DOMReady",aa=/(\/\*[^*]*\*+([^\/][^*]*\*+)*\/)\s*/g,ba=/@import\s*url\(\s*(["'])?(.*?)\1\s*\)[\w\W]*?;/g,W=/^:(empty|(first|last|only|nth(-last)?)-(child|of-type))$/,L=/:(:first-(?:line|letter))/g,M=/(^|})\s*([^\{]*?[\[:][^{]+)/g,Q=/([ +~>])|(:[a-z-]+(?:\(.*?\)+)?)|(\[.*?\])/g,R=/(:not\()?:(hover|enabled|disabled|focus|checked|target|active|visited|first-line|first-letter)\)?/g,Z=/[^\w-]/g,V=/^(INPUT|SELECT|TEXTAREA|BUTTON)$/,U=/^(checkbox|radio)$/,B=p==8?/[\$\^]=(['"])\1/:p==7?/[\$\^*]=(['"])\1/:null,O=/([(\[+~])\s+/g,P=/\s+([)\]+~])/g,$=/\s+/g,F=/^\s*((?:[\S\s]*\S)?)\s*$/,n="",t=" ",o="$1";m.write("<script id="+J+" defer src='//:'><\/script>");m.getElementById(J).onreadystatechange=function(){if(this.readyState=="complete"){a:{var a;for(var b in I)if(x[b]&&(a=eval(I[b].replace("*",b)))){v=a;break a}v=false}if(v){ca();this.parentNode.removeChild(this)}}}}}})(this);
\ No newline at end of file
+(function(x){function K(a){return a.replace(L,o).replace(M,function(b,e,c){b=c.split(",");c=0;for(var g=b.length;c<g;c++){var j=N(b[c].replace(O,o).replace(P,o))+t,f=[];b[c]=j.replace(Q,function(d,k,l,i,h){if(k){if(f.length>0){d=f;var u;h=j.substring(0,h).replace(R,n);if(h==n||h.charAt(h.length-1)==t)h+="*";try{u=v(h)}catch(da){}if(u){h=0;for(l=u.length;h<l;h++){i=u[h];for(var y=i.className,z=0,S=d.length;z<S;z++){var q=d[z];if(!RegExp("(^|\\s)"+q.className+"(\\s|$)").test(i.className))if(q.b&&(q.b===true||q.b(i)===true))y=A(y,q.className,true)}i.className=y}}f=[]}return k}else{if(k=l?T(l):!B||B.test(i)?{className:C(i),b:true}:null){f.push(k);return"."+k.className}return d}})}return e+b.join(",")})}function T(a){var b=true,e=C(a.slice(1)),c=a.substring(0,5)==":not(",g,j;if(c)a=a.slice(5,-1);var f=a.indexOf("(");if(f>-1)a=a.substring(0,f);if(a.charAt(0)==":")switch(a.slice(1)){case "root":b=function(d){return c?d!=D:d==D};break;case "target":if(p==8){b=function(d){function k(){var l=location.hash,i=l.slice(1);return c?l==""||d.id!=i:l!=""&&d.id==i}x.attachEvent("onhashchange",function(){r(d,e,k())});return k()};break}return false;case "checked":b=function(d){U.test(d.type)&&d.attachEvent("onpropertychange",function(){event.propertyName=="checked"&&r(d,e,d.checked!==c)});return d.checked!==c};break;case "disabled":c=!c;case "enabled":b=function(d){if(V.test(d.tagName)){d.attachEvent("onpropertychange",function(){event.propertyName=="$disabled"&&r(d,e,d.a===c)});w.push(d);d.a=d.disabled;return d.disabled===c}return a==":enabled"?c:!c};break;case "focus":g="focus";j="blur";case "hover":if(!g){g="mouseenter";j="mouseleave"}b=function(d){d.attachEvent("on"+(c?j:g),function(){r(d,e,true)});d.attachEvent("on"+(c?g:j),function(){r(d,e,false)});return c};break;default:if(!W.test(a))return false;break}return{className:e,b:b}}function C(a){return E+"-"+(p==6&&X?Y++:a.replace(Z,function(b){return b.charCodeAt(0)}))}function N(a){return a.replace(F,o).replace($,t)}function r(a,b,e){var c=a.className;b=A(c,b,e);if(b!=c){a.className=b;a.parentNode.className+=n}}function A(a,b,e){var c=RegExp("(^|\\s)"+b+"(\\s|$)"),g=c.test(a);return e?g?a:a+t+b:g?a.replace(c,o).replace(F,o):a}function G(a,b){if(/^https?:\/\//i.test(a))return b.substring(0,b.indexOf("/",8))==a.substring(0,a.indexOf("/",8))?a:null;if(a.charAt(0)=="/")return b.substring(0,b.indexOf("/",8))+a;var e=b.split("?")[0];if(a.charAt(0)!="?"&&e.charAt(e.length-1)!="/")e=e.substring(0,e.lastIndexOf("/")+1);return e+a}function H(a){if(a){s.open("GET",a,false);s.send();return(s.status==200?s.responseText:n).replace(aa,n).replace(ba,function(b,e,c){return H(G(c,a))})}return n}function ca(){var a,b;a=m.getElementsByTagName("BASE");for(var e=a.length>0?a[0].href:m.location.href,c=0;c<m.styleSheets.length;c++){b=m.styleSheets[c];if(b.href!=n)if(a=G(b.href,e))b.cssText=K(H(a))}w.length>0&&setInterval(function(){for(var g=0,j=w.length;g<j;g++){var f=w[g];if(f.disabled!==f.a)if(f.disabled){f.disabled=false;f.a=true;f.disabled=true}else f.a=f.disabled}},250)}if(!/*@cc_on!@*/true){var m=document,D=m.documentElement,s=function(){if(x.XMLHttpRequest)return new XMLHttpRequest;try{return new ActiveXObject("Microsoft.XMLHTTP")}catch(a){return null}}(),p=/MSIE ([\d])/.exec(navigator.userAgent)[1];if(!(m.compatMode!="CSS1Compat"||p<6||p>8||!s)){var I={NW:"*.Dom.select",DOMAssistant:"*.$",Prototype:"$$",YAHOO:"*.util.Selector.query",MooTools:"$$",Sizzle:"*",jQuery:"*",dojo:"*.query"},v,w=[],Y=0,X=true,E="slvzr",J=E+"DOMReady",aa=/(\/\*[^*]*\*+([^\/][^*]*\*+)*\/)\s*/g,ba=/@import\s*url\(\s*(["'])?(.*?)\1\s*\)[\w\W]*?;/g,W=/^:(empty|(first|last|only|nth(-last)?)-(child|of-type))$/,L=/:(:first-(?:line|letter))/g,M=/(^|})\s*([^\{]*?[\[:][^{]+)/g,Q=/([ +~>])|(:[a-z-]+(?:\(.*?\)+)?)|(\[.*?\])/g,R=/(:not\()?:(hover|enabled|disabled|focus|checked|target|active|visited|first-line|first-letter)\)?/g,Z=/[^\w-]/g,V=/^(INPUT|SELECT|TEXTAREA|BUTTON)$/,U=/^(checkbox|radio)$/,B=p==8?/[\$\^]=(['"])\1/:p==7?/[\$\^*]=(['"])\1/:null,O=/([(\[+~])\s+/g,P=/\s+([)\]+~])/g,$=/\s+/g,F=/^\s*((?:[\S\s]*\S)?)\s*$/,n="",t=" ",o="$1";m.write("<script id="+J+" defer src='//:'><\/script>");m.getElementById(J).onreadystatechange=function(){if(this.readyState=="complete"){a:{var a;for(var b in I)if(x[b]&&(a=eval(I[b].replace("*",b)))){v=a;break a}v=false}if(v){ca();this.parentNode.removeChild(this)}}}}}})(this);
diff --git a/webapp/src/main/webapp/js/siteAdmin/classHierarchyUtils.js b/webapp/src/main/webapp/js/siteAdmin/classHierarchyUtils.js
index c56cd36ee..00496b99f 100644
--- a/webapp/src/main/webapp/js/siteAdmin/classHierarchyUtils.js
+++ b/webapp/src/main/webapp/js/siteAdmin/classHierarchyUtils.js
@@ -1,5 +1,5 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
-  
+
     var classHierarchyUtils = {
     onLoad: function(urlBase,displayOption) {
         $.extend(this, i18nStrings);
@@ -24,8 +24,8 @@
         this.bindEventListeners();
     },
 
-    initObjects: function() { 
-        this.expandAll = $('span#expandAll').find('a');   
+    initObjects: function() {
+        this.expandAll = $('span#expandAll').find('a');
         this.classCounter = 1;
         this.expandCounter = 1;
         this.classHtml = "";
@@ -44,7 +44,7 @@
             else if ( classHierarchyUtils.select.val() == "group") {
                 classHierarchyUtils.form.attr("action", "listGroups");
             }
-            
+
             classHierarchyUtils.form.submit();
         });
         this.addClass.click(function() {
@@ -58,8 +58,8 @@
 
         if ( this.displayOption == "group" ) {
             this.expandAll.click(function() {
-            
-                if ( classHierarchyUtils.expandAll.text() == i18nStrings.hideSubclasses ) { 
+
+                if ( classHierarchyUtils.expandAll.text() == i18nStrings.hideSubclasses ) {
                     $('td.subclassCell').parent('tr').hide();
                     $('table.innerDefinition').hide();
                     classHierarchyUtils.expandAll.text(i18nStrings.showSubclasses);
@@ -70,10 +70,10 @@
                     classHierarchyUtils.expandAll.text(i18nStrings.hideSubclasses);
                 }
             });
-        }        
-        
+        }
+
     },
-     
+
     buildClassHierarchyHtml: function() {
 
         $.each(json, function() {
@@ -83,15 +83,15 @@
             var descendants = "";
             var headerSpan = "";
             var closingTable = "</table>";
-            
+
             if ( this.children.length ) {
                 descendants = classHierarchyUtils.getTheChildren(this);
                 closingTable = "";
-                headerSpan = "<span class='headerSpanPlus' id='headerSpan" + classHierarchyUtils.classCounter 
+                headerSpan = "<span class='headerSpanPlus' id='headerSpan" + classHierarchyUtils.classCounter
                               + "' view='less'>&nbsp;</span>";
             }
 
-            classHierarchyUtils.classHtml += "<div>" + this.name + headerSpan + "</div>" + "<table class='classHierarchy' id='classHierarchy" 
+            classHierarchyUtils.classHtml += "<div>" + this.name + headerSpan + "</div>" + "<table class='classHierarchy' id='classHierarchy"
                                       + classHierarchyUtils.classCounter + "'>" ;
 
             if ( this.data.shortDef.length > 0 ) {
@@ -104,11 +104,11 @@
 
             classHierarchyUtils.classHtml += "<tr><td class='classDetail'>" + i18nStrings.ontologyString + ":</td><td class='subclassCell'>" + this.data.ontology + "</td></tr>";
 
- 
+
             if ( descendants.length > 1 ) {
                 descendants = descendants.substring(0, descendants.length - 10);
             }
-            
+
             classHierarchyUtils.classHtml += descendants;
 
             classHierarchyUtils.classHtml += closingTable;
@@ -121,7 +121,7 @@
             classHierarchyUtils.classHtml = "";
             classHierarchyUtils.classCounter += 1;
         });
-        
+
     },
 
     getTheChildren: function(node) {
@@ -136,22 +136,22 @@
             else {
                 childDetails += "<tr><td></td>" ;
             }
-            
+
             if ( this.children.length == 1 ) {
-                subclassString += "<span style='font-size:0.8em'> (1 subclass)</span>"; 
+                subclassString += "<span style='font-size:0.8em'> (1 subclass)</span>";
             }
             else if ( this.children.length > 1 ) {
                 subclassString += "<span style='font-size:0.8em'> (" + this.children.length + " subclasses)</span>";
             }
-            childDetails += "<td class='subclassCell'><span class='subclassExpandPlus' id='subclassExpand" 
-                            + classHierarchyUtils.expandCounter + "'>&nbsp;</span>" 
-                            + this.name + subclassString + "</td></tr><tr><td></td><td><table id='subclassTable" 
+            childDetails += "<td class='subclassCell'><span class='subclassExpandPlus' id='subclassExpand"
+                            + classHierarchyUtils.expandCounter + "'>&nbsp;</span>"
+                            + this.name + subclassString + "</td></tr><tr><td></td><td><table id='subclassTable"
                             + classHierarchyUtils.expandCounter + "' class='subclassTable'>";
             subclassString = " ";
             classHierarchyUtils.clickableSpans.push('subclassExpand' + classHierarchyUtils.expandCounter);
-            
+
             classHierarchyUtils.expandCounter += 1;
-            
+
             if ( this.data.shortDef.length > 0 ) {
                 childDetails += "<tr><td colspan='2'>" + this.data.shortDef + "</td></tr>";
             }
@@ -170,7 +170,7 @@
         childDetails += "</table></td></tr>";
         return childDetails;
     },
-    
+
     makeHeaderSpansClickable: function(ctr) {
 
         var $clickableHeader = $('section#classContainer' + ctr).find('span.headerSpanPlus');
@@ -190,7 +190,7 @@
             }
         });
     },//    $('myOjbect').css('background-image', 'url(' + imageUrl + ')');
-    
+
     makeSubclassSpansClickable: function() {
         $.each(classHierarchyUtils.clickableSpans, function() {
             var currentSpan = this;
@@ -211,7 +211,7 @@
             });
         });
     },
-    
+
     wireExpandLink: function() {
         this.expandAll.click(function() {
             if ( classHierarchyUtils.expandAll.text() == i18nStrings.expandAll ) {
@@ -230,15 +230,15 @@
             }
         });
     },
-     
+
     buildAllClassesHtml: function() {
 
         $.each(json, function() {
             $newClassSection = jQuery("<section></section>", {
                 id: "classContainer" + classHierarchyUtils.classCounter
             });
-            
-            classHierarchyUtils.classHtml += "<div>" + this.name + "</div>" + "<table class='classHierarchy' id='classHierarchy" 
+
+            classHierarchyUtils.classHtml += "<div>" + this.name + "</div>" + "<table class='classHierarchy' id='classHierarchy"
                                       + classHierarchyUtils.classCounter + "'>" ;
 
             if ( this.data.shortDef.length > 0 ) {
@@ -267,7 +267,7 @@
                 id: "classContainer" + classHierarchyUtils.classCounter
             });
             var descendants = "";
-            
+
             if ( this.children.length ) {
                 var ctr = 0;
                 $.each(this.children, function() {
@@ -281,18 +281,18 @@
 
                     descendants += "<td class='subclassCell'>" + this.name + "</td></tr>";
                     descendants += "<tr><td></td><td><table class='innerDefinition'><tr><td>" + this.data.shortDef + "</td></tr></table></td></tr>";
-                    
+
                 });
                 descendants += "</table></td></tr>";
             }
 
-            classHierarchyUtils.classHtml += "<div>" + this.name + "</div>" + "<table class='classHierarchy' id='classHierarchy" 
+            classHierarchyUtils.classHtml += "<div>" + this.name + "</div>" + "<table class='classHierarchy' id='classHierarchy"
                                       + classHierarchyUtils.classCounter + "'>" ;
 
             if ( this.data.displayRank.length > 0 ) {
                 classHierarchyUtils.classHtml += "<tr><td class='classDetail'>" + i18nStrings.displayRank + ":</td><td>" + this.data.displayRank + "</td></tr>"
             }
- 
+
             classHierarchyUtils.classHtml += descendants;
 
             classHierarchyUtils.classHtml += "</table>";
diff --git a/webapp/src/main/webapp/js/siteAdmin/fauxPropertiesListingUtils.js b/webapp/src/main/webapp/js/siteAdmin/fauxPropertiesListingUtils.js
index 222456b63..415d52c0d 100644
--- a/webapp/src/main/webapp/js/siteAdmin/fauxPropertiesListingUtils.js
+++ b/webapp/src/main/webapp/js/siteAdmin/fauxPropertiesListingUtils.js
@@ -1,12 +1,12 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
-  
+
     var fauxPropertiesListingUtils = {
     onLoad: function() {
 		this.initObjects();
         this.bindEventListeners();
     },
 
-    initObjects: function() { 
+    initObjects: function() {
 		this.select = $('select#displayOption');
         this.theForm = $('form#fauxListing');
     },
diff --git a/webapp/src/main/webapp/js/siteAdmin/objectPropertyHierarchyUtils.js b/webapp/src/main/webapp/js/siteAdmin/objectPropertyHierarchyUtils.js
index a29c00ab1..be99504f5 100644
--- a/webapp/src/main/webapp/js/siteAdmin/objectPropertyHierarchyUtils.js
+++ b/webapp/src/main/webapp/js/siteAdmin/objectPropertyHierarchyUtils.js
@@ -1,5 +1,5 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
-  
+
     var objectPropHierarchyUtils = {
     onLoad: function(urlBase,displayOption,type) {
         $.extend(this, i18nStrings);
@@ -23,7 +23,7 @@
             this.buildPropertyHierarchyHtml();
             this.wireExpandLink();
         }
-        
+
         if ( displayOption == "hierarchy" || displayOption == "group") {
             this.expandAll.show();
         }
@@ -33,8 +33,8 @@
         this.bindEventListeners();
     },
 
-    initObjects: function() { 
-        this.expandAll = $('span#expandAll').find('a');   
+    initObjects: function() {
+        this.expandAll = $('span#expandAll').find('a');
         this.classCounter = 1;
         this.expandCounter = 1;
         this.classHtml = "";
@@ -69,7 +69,7 @@
                 }
                 objectPropHierarchyUtils.form.submit();
             });
-         
+
             this.addProperty.click(function() {
                 objectPropHierarchyUtils.form.attr("action", "editForm?controller=Property");
                 objectPropHierarchyUtils.form.submit();
@@ -88,7 +88,7 @@
                 }
                 objectPropHierarchyUtils.form.submit();
             });
-         
+
             this.addProperty.click(function() {
                 objectPropHierarchyUtils.form.attr("action", "editForm?controller=Dataprop");
                 objectPropHierarchyUtils.form.submit();
@@ -96,8 +96,8 @@
         }
         if ( this.propType == "group" ) {
             this.expandAll.click(function() {
-            
-                if ( objectPropHierarchyUtils.expandAll.text() == i18nStrings.hideProperties ) { 
+
+                if ( objectPropHierarchyUtils.expandAll.text() == i18nStrings.hideProperties ) {
                     $('td.subclassCell').parent('tr').hide();
                     objectPropHierarchyUtils.expandAll.text(i18nStrings.showProperties);
                 }
@@ -109,7 +109,7 @@
         }
     },
 
-    checkJsonTree: function() { 
+    checkJsonTree: function() {
         if ( json.length == 1 ) {
             $.each(json, function() {
                 // check to see whether we have a 'no properties' message or an actual json tree
@@ -135,33 +135,33 @@
             var descendants = "";
             var headerSpan = "";
             var closingTable = "</table>";
-            
+
             if ( this.children.length ) {
                 descendants = objectPropHierarchyUtils.getTheChildren(this);
                 closingTable = "";
-                headerSpan = "<span class='headerSpanPlus' id='headerSpan" + objectPropHierarchyUtils.classCounter 
+                headerSpan = "<span class='headerSpanPlus' id='headerSpan" + objectPropHierarchyUtils.classCounter
                               + "' view='less'>&nbsp;</span>";
             }
 
-            objectPropHierarchyUtils.classHtml += "<div>" + this.name + headerSpan + "</div>" + "<table class='classHierarchy' id='classHierarchy" 
+            objectPropHierarchyUtils.classHtml += "<div>" + this.name + headerSpan + "</div>" + "<table class='classHierarchy' id='classHierarchy"
                                       + objectPropHierarchyUtils.classCounter + "'>" ;
 
-            objectPropHierarchyUtils.classHtml += "<tr><td class='classDetail'>" + i18nStrings.localNameString + ":</td><td>" 
+            objectPropHierarchyUtils.classHtml += "<tr><td class='classDetail'>" + i18nStrings.localNameString + ":</td><td>"
                                                + (this.data.internalName.length > 0 ? this.data.internalName : "none" ) + "</td></tr>";
 
-            objectPropHierarchyUtils.classHtml += "<tr><td class='classDetail'>" + i18nStrings.groupString + ":</td><td>" 
+            objectPropHierarchyUtils.classHtml += "<tr><td class='classDetail'>" + i18nStrings.groupString + ":</td><td>"
                                                + (this.data.group.length > 0 ? this.data.group : "unspecified" ) + "</td></tr>";
 
-            objectPropHierarchyUtils.classHtml += "<tr><td class='classDetail'>" + i18nStrings.domainClass + ":</td><td>" 
+            objectPropHierarchyUtils.classHtml += "<tr><td class='classDetail'>" + i18nStrings.domainClass + ":</td><td>"
                                                + (this.data.domainVClass.length > 0 ? this.data.domainVClass : "none" ) + " ";
 
-            objectPropHierarchyUtils.classHtml += "<span class='rangeClass'>" + objectPropHierarchyUtils.range + ":</span>" 
+            objectPropHierarchyUtils.classHtml += "<span class='rangeClass'>" + objectPropHierarchyUtils.range + ":</span>"
                                                + (this.data.rangeVClass.length > 0 ? this.data.rangeVClass : "none" ) + "</td></tr>";
 
             if ( descendants.length > 1 ) {
                descendants = descendants.substring(0, descendants.length - 10);
             }
- 
+
             objectPropHierarchyUtils.classHtml += descendants;
 
             objectPropHierarchyUtils.classHtml += closingTable;
@@ -190,33 +190,33 @@
             }
 
             if ( this.children.length == 1 ) {
-                subclassString += "<span style='font-size:0.8em'> (1 " + i18nStrings.subProperty + ")</span>"; 
+                subclassString += "<span style='font-size:0.8em'> (1 " + i18nStrings.subProperty + ")</span>";
             }
             else if ( this.children.length > 1 ) {
                 subclassString += "<span style='font-size:0.8em'> (" + this.children.length + " " + i18nStrings.subProperties + ")</span>";
             }
 
-            childDetails += "<td class='subclassCell' colspan='2'><span class='subclassExpandPlus' id='subclassExpand" 
-                            + objectPropHierarchyUtils.expandCounter + "'>&nbsp;</span>" 
-                            + this.name + subclassString + "</td></tr><tr><td></td><td colspan='2'><table id='subclassTable" 
+            childDetails += "<td class='subclassCell' colspan='2'><span class='subclassExpandPlus' id='subclassExpand"
+                            + objectPropHierarchyUtils.expandCounter + "'>&nbsp;</span>"
+                            + this.name + subclassString + "</td></tr><tr><td></td><td colspan='2'><table id='subclassTable"
                             + objectPropHierarchyUtils.expandCounter + "' class='subclassTable'>";
 
             subclassString = " ";
 
             objectPropHierarchyUtils.clickableSpans.push('subclassExpand' + objectPropHierarchyUtils.expandCounter);
-            
+
             objectPropHierarchyUtils.expandCounter += 1;
-            
-            childDetails += "<tr><td class='classDetail'>" + i18nStrings.localNameString + ":</td><td>" 
+
+            childDetails += "<tr><td class='classDetail'>" + i18nStrings.localNameString + ":</td><td>"
                                                + (this.data.internalName.length > 0 ? this.data.internalName : "none" ) + "</td></tr>";
 
-            childDetails += "<tr><td class='classDetail'>" + i18nStrings.groupString + ":</td><td>" 
+            childDetails += "<tr><td class='classDetail'>" + i18nStrings.groupString + ":</td><td>"
                                                + (this.data.group.length > 0 ? this.data.group : "unspecified" ) + "</td></tr>";
 
-            childDetails += "<tr><td class='classDetail'>" + i18nStrings.domainClass + ":</td><td>" 
+            childDetails += "<tr><td class='classDetail'>" + i18nStrings.domainClass + ":</td><td>"
                                                + (this.data.domainVClass.length > 0 ? this.data.domainVClass : "none" ) + " ";
 
-            childDetails += "<span class='rangeClass'>" + objectPropHierarchyUtils.range + ":</span>" 
+            childDetails += "<span class='rangeClass'>" + objectPropHierarchyUtils.range + ":</span>"
                                                + (this.data.rangeVClass.length > 0 ? this.data.rangeVClass : "none" ) + "</td></tr>";
 
             if ( this.children ) {
@@ -227,7 +227,7 @@
         childDetails += "</table></td></tr>";
         return childDetails;
     },
-    
+
     makeHeaderSpansClickable: function(ctr) {
 
         var $clickableHeader = $('section#classContainer' + ctr).find('span.headerSpanPlus');
@@ -247,7 +247,7 @@
             }
         });
     },//    $('myOjbect').css('background-image', 'url(' + imageUrl + ')');
-    
+
     makeSubpropertySpansClickable: function() {
         $.each(objectPropHierarchyUtils.clickableSpans, function() {
             var currentSpan = this;
@@ -268,7 +268,7 @@
             });
         });
     },
-    
+
     wireExpandLink: function() {
         this.expandAll.click(function() {
             if ( objectPropHierarchyUtils.expandAll.text() == i18nStrings.expandAll ) {
@@ -287,27 +287,27 @@
             }
         });
     },
-     
+
     buildAllPropsHtml: function() {
 
         $.each(json, function() {
             $newClassSection = jQuery("<section></section>", {
                 id: "classContainer" + objectPropHierarchyUtils.classCounter
             });
-            
-            objectPropHierarchyUtils.classHtml += "<div>" + this.name + "</div>" + "<table class='classHierarchy' id='classHierarchy" 
+
+            objectPropHierarchyUtils.classHtml += "<div>" + this.name + "</div>" + "<table class='classHierarchy' id='classHierarchy"
                                       + objectPropHierarchyUtils.classCounter + "'>" ;
 
-            objectPropHierarchyUtils.classHtml += "<tr><td class='classDetail'>" + i18nStrings.localNameString + ":</td><td>" 
+            objectPropHierarchyUtils.classHtml += "<tr><td class='classDetail'>" + i18nStrings.localNameString + ":</td><td>"
                                          + (this.data.internalName.length > 0 ? this.data.internalName : "none" ) + "</td></tr>";
 
-            objectPropHierarchyUtils.classHtml += "<tr><td class='classDetail'>" + i18nStrings.groupString + ":</td><td>" 
+            objectPropHierarchyUtils.classHtml += "<tr><td class='classDetail'>" + i18nStrings.groupString + ":</td><td>"
                                          + (this.data.group.length > 0 ? this.data.group : "unspecified" ) + "</td></tr>";
 
-            objectPropHierarchyUtils.classHtml += "<tr><td class='classDetail'>" + i18nStrings.domainClass + ":</td><td>" 
+            objectPropHierarchyUtils.classHtml += "<tr><td class='classDetail'>" + i18nStrings.domainClass + ":</td><td>"
                                          + (this.data.domainVClass.length > 0 ? this.data.domainVClass : "none" ) + " ";
 
-            objectPropHierarchyUtils.classHtml += "<span class='rangeClass'>" + objectPropHierarchyUtils.range + ":</span>" 
+            objectPropHierarchyUtils.classHtml += "<span class='rangeClass'>" + objectPropHierarchyUtils.range + ":</span>"
                                          + (this.data.rangeVClass.length > 0 ? this.data.rangeVClass : "none" ) + "</td></tr>";
 
             objectPropHierarchyUtils.classHtml += "</table>";
@@ -325,7 +325,7 @@
             $newClassSection = jQuery("<section></section>", {
                 id: "classContainer" + objectPropHierarchyUtils.classCounter
             });
-            
+
             objectPropHierarchyUtils.classHtml = "<h4>" + this.name + "</h4>";
             $newClassSection.html(objectPropHierarchyUtils.classHtml);
             $newClassSection.appendTo($('section#container'));
@@ -359,13 +359,13 @@
                 descendants += "</table></td></tr>";
             }
 
-            objectPropHierarchyUtils.classHtml += "<div>" + this.name + "</div>" + "<table class='classHierarchy' id='classHierarchy" 
+            objectPropHierarchyUtils.classHtml += "<div>" + this.name + "</div>" + "<table class='classHierarchy' id='classHierarchy"
                                                + objectPropHierarchyUtils.classCounter + "'>" ;
 
             if ( this.data.displayRank.length > 0 ) {
                 objectPropHierarchyUtils.classHtml += "<tr><td class='classDetail'>" + i18nStrings.displayRank + ":</td><td>" + this.data.displayRank + "</td></tr>"
             }
-            
+
             objectPropHierarchyUtils.classHtml += descendants;
 
             objectPropHierarchyUtils.classHtml += "</table>";
@@ -376,5 +376,5 @@
             objectPropHierarchyUtils.classCounter += 1;
         });
     }
-    
+
 }
diff --git a/webapp/src/main/webapp/js/siteAdmin/siteAdminUtils.js b/webapp/src/main/webapp/js/siteAdmin/siteAdminUtils.js
index 8a9b47650..c87f1b41c 100644
--- a/webapp/src/main/webapp/js/siteAdmin/siteAdminUtils.js
+++ b/webapp/src/main/webapp/js/siteAdmin/siteAdminUtils.js
@@ -1,29 +1,29 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
-  
-/*Display bubble message letting the user knows that it is necessary to create class groups and associate classes with class groups when there is no individual classes to select in Data Input section and 
+
+/*Display bubble message letting the user knows that it is necessary to create class groups and associate classes with class groups when there is no individual classes to select in Data Input section and
 hide it when there are classes*/
-    
+
 $(document).ready(function(){
-    
+
      var classesInSelectList = $('#addIndividualClass option').length;
-     
+
      if (classesInSelectList == 0) {
          $('#addIndividualClass input[type="submit"]').css('opacity','.4').click(function(event){
              event.preventDefault();
              $('#addClassBubble').effect( "shake", {times:2, direction:"up", distance:5}, 50 );
           });
-          
+
          $('#VClassURI').css('width','150px');
-         
+
          $('#addClassBubble').show();
-         
+
      }else{
          $('#addIndividualClass input[type="submit"]').removeClass('opacity');
-         
+
          $('#VClassURI').removeClass('width');
-         
+
          $('.long-options').css('width','300px');
-         
+
          $('#addClassBubble').hide();
      }
-});
\ No newline at end of file
+});
diff --git a/webapp/src/main/webapp/js/sparql/prototype.js b/webapp/src/main/webapp/js/sparql/prototype.js
index e9ccd3c88..d79e5b88d 100644
--- a/webapp/src/main/webapp/js/sparql/prototype.js
+++ b/webapp/src/main/webapp/js/sparql/prototype.js
@@ -1782,4 +1782,4 @@ if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) {
 
     return [valueL, valueT];
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/js/sparql/sparql.js b/webapp/src/main/webapp/js/sparql/sparql.js
index 51ffef9ba..0c3cef70b 100644
--- a/webapp/src/main/webapp/js/sparql/sparql.js
+++ b/webapp/src/main/webapp/js/sparql/sparql.js
@@ -9,9 +9,9 @@
 //					swrlb	:	"http://www.w3.org/2003/11/swrlb#",
 //					vitro	:	"http://vitro.mannlib.cornell.edu/ns/vitro/0.7#"
 				};
-			
+
 			var level = 0;
-			
+
 			function init(){
 				var url = "getAllClasses";
 				var preurl = "getAllPrefix";
@@ -29,11 +29,11 @@
 							for(i=0; i<options.length; i++){
 								base[base.length] = new Option(options[i].childNodes[0].firstChild.data, options[i].childNodes[1].firstChild.data);
 							}
-							
+
 							var subdiv = document.getElementById("subject(0)");
 							subdiv.appendChild(document.createElement("br"));
-							
-							
+
+
 							var addprop = document.createElement("input");
 							addprop.type = "button";
 							addprop.value = "Add Property";
@@ -46,7 +46,7 @@
 						}
 					}
 				);
-				
+
 				var myPrefixAjax = new Ajax.Request( preurl, {method: "get", parameters: "", onComplete: function(originalRequest){
 							var response = originalRequest.responseXML;
 							var options = response.getElementsByTagName("option");
@@ -60,10 +60,10 @@
 					}
 				);
 			}
-			
-			
+
+
 			function getProperty(addprop){
-				
+
 				var url = "getClazzAllProperties";
 				var base = document.getElementById("subject(" + addprop.level + ",0)");
 				var subject = base.value;
@@ -87,23 +87,23 @@
 								}
 								property.level = base.level;
 								property.count = base.count;
-								
+
 								property.onchange = function() {
 									return getObject(this);
 								}
-								
+
 								var prediv = document.getElementById("predicate(" + base.level + ")");
-								
+
 								if (prediv.innerHTML.trim() != "") {
 									var lastNode = prediv.lastChild.previousSibling;
 									if (lastNode.selectedIndex == 0){
 										alert("You have a undefined property, please make sure it has been initialized.");
 										return;
 									}
-										
+
 								}
 								prediv.appendChild(property);
-								
+
 								base.count += 1
 								prediv.appendChild(document.createElement("br"));
 							}
@@ -111,17 +111,17 @@
 					);
 				}
 			}
-			
-			
+
+
 			function getObject(property){
 				var url = "getObjectClasses";
-				
+
 				var base = document.getElementById("subject(" + property.level + ",0)")
 				var subject = base.value;
-				
+
 				//Disable the selection
 				property.disabled = true;
-				
+
 				//DEL PROPERTY
 				var delprop = document.createElement("input");
 				delprop.type = "button";
@@ -133,8 +133,8 @@
 				}
 				var prediv = document.getElementById("predicate(" + base.level + ")");
 				prediv.insertBefore(delprop, property.nextSibling);
-				
-				
+
+
 				var predicate = property.value;
 				var type = predicate.charAt(predicate.length-1);
 				predicate = predicate.substring(0, predicate.length-1);
@@ -151,7 +151,7 @@
 				}
 				else{
 				var params = "predicate=" + predicate.replace('#', '%23');
-				
+
 				var myAjax = new Ajax.Request( url, {method: "get", parameters: params, onComplete: function(originalRequest){
 								var response = originalRequest.responseXML;
 								var objdiv = document.getElementById("object(" + base.level + ")");
@@ -171,14 +171,14 @@
 										obj.onchange = function(){
 											return addClass(this);
 										}
-										
+
 									}
 									else{
 										obj = document.createElement("input");
 										obj.type = "text";
 									}
 									obj.id = "object(" + base.level + "," + (base.count - 1) + ")";
-									
+
 									obj.level = base.level;
 									obj.count = base.count - 1;
 									objdiv.appendChild(obj);
@@ -186,7 +186,7 @@
 								}
 								else{
 									var objpar = obj.parentNode;
-									
+
 									if (options.length > 0){
 										var newobj = document.createElement("select");
 										newobj[newobj.length] = new Option("Classes", "");
@@ -196,14 +196,14 @@
 										newobj.onchange = function(){
 											return addClass(this);
 										}
-										
+
 									}
 									else{
 										newobj = document.createElement("input");
 										newobj.type = "text";
 									}
 									newobj.id = "object(" + base.level + "," + base.count + ")";
-									
+
 									newobj.level = base.level;
 									newobj.count = base.count;
 									objpar.replaceChild(newobj, obj);
@@ -214,25 +214,25 @@
 				}
 
 			}
-			
+
 			function addClass(obj){
 				addClazz();
-				
+
 				//disable the selection
 				obj.disabled = true;
-				
+
 				var subject = document.createElement("select");
-				
+
 				subject[subject.length] = new Option(obj.options[obj.selectedIndex].text, obj.value);
 				subject.disabled = true;
 				subject.level = level;
 				level ++;
 				subject.count = 0;
 				subject.id = "subject(" + subject.level + "," + subject.count + ")";
-				
+
 				var subdiv = document.getElementById("subject(" + subject.level +")");
 				subdiv.appendChild(subject);
-				
+
 				var delclazz = document.createElement("input");
 				delclazz.type = "button";
 				delclazz.value = "Delete";
@@ -251,12 +251,12 @@
 					return getProperty(this);
 				}
 				subdiv.appendChild(addprop);
-				
+
 			}
-			
+
 			function addClazz(){
 				var builder = document.getElementById("builder");
-				
+
 				var clazz = document.createElement("tr");
 				clazz.id = "clazz(" + level + ")";
 				var subject = document.createElement("td");
@@ -265,34 +265,34 @@
 				predicate.id = "predicate(" + level + ")";
 				var object = document.createElement("td");
 				object.id = "object(" + level + ")";
-				
+
 				clazz.appendChild(subject);
 				clazz.appendChild(predicate);
 				clazz.appendChild(object);
-				
+
 				builder.appendChild(clazz);
 			}
-			
+
 			function delClazz(level){
 				var clazz = document.getElementById("clazz(" + level +")");
 				var builder = document.getElementById("builder");
 				builder.removeChild(clazz);
 			}
-			
+
 			function delProperty(delprop){
 				var sub = document.getElementById("predicate(" + delprop.level + "," + delprop.count + ")");
 				var obj = document.getElementById("object(" + delprop.level + "," + delprop.count + ")");
 				var subdiv = document.getElementById("predicate(" + delprop.level +")");
-				var objdiv = document.getElementById("object(" + delprop.level +")");	
+				var objdiv = document.getElementById("object(" + delprop.level +")");
 				subdiv.removeChild(sub.nextSibling.nextSibling);
 				subdiv.removeChild(sub.nextSibling);
 				subdiv.removeChild(sub);
-				
+
 				objdiv.removeChild(obj.nextSibling);
 				objdiv.removeChild(obj);
-				
+
 			}
-			
+
 			function genQuery(){
 				var items = new Array();
 				var criterias = new Array();
@@ -300,8 +300,8 @@
 				var number = 0;
 				var _sub;
 				var _obj;
-				
-				
+
+
 				// namespaces shown in the SPARQL query box
 				var namespace = getNamespace();
 				//var gid = 0;
@@ -312,9 +312,9 @@
 					}
 					var subNodes = subjects.getElementsByTagName("select");
 					var sub = subNodes[0].value;
-					
+
 					sub = getNameWithPrefix(sub);
-					
+
 					if (!clazz[sub.substring(sub.indexOf(":") + 1)]){
 						clazz[sub.substring(sub.indexOf(":") + 1)] = 1;
 						_sub = sub.substring(sub.indexOf(":") + 1) + 1;
@@ -326,12 +326,12 @@
 					//gid++;
 					//criterias[criterias.length] = "GRAPH ?g" + gid + " { " + subname + " rdf:type " + sub + " . }";
 					criterias[criterias.length] = subname + " rdf:type " + sub + " .";
-					
-					
+
+
 					var predicates = document.getElementById("predicate(" + i + ")");
 					var preNodes = predicates.getElementsByTagName("select");
 					var num = preNodes.length;
-					
+
 					for (j=0; j<num; j++){
 						//gid++;
 						var pre = preNodes[j];
@@ -345,7 +345,7 @@
 						pre = getNameWithPrefix(pre);
 						if (obj.tagName == "INPUT"){
 							var objname = subname + "_" + pre.substring(pre.indexOf(":") + 1);
-							
+
 							//criterias[criterias.length] = "GRAPH ?g" + gid + " { " + subname + " " + pre + " " + objname + " . }";
 							criterias[criterias.length] = subname + " " + pre + " " + objname + " .";
 							items[items.length] = objname;
@@ -354,7 +354,7 @@
 							}
 						}
 						else{
-							
+
 							obj = obj.value;
 							obj = getNameWithPrefix(obj);
 							if (!clazz[obj.substring(obj.indexOf(":") + 1)]){
@@ -371,7 +371,7 @@
 							criterias[criterias.length] = subname + " " + pre + " " + objname + " .";
 						}
 					}
-					
+
 				}
 				if (items.length == 0) {
 					var item = "*"
@@ -380,14 +380,14 @@
 					var item = "distinct " + items.join(" ");
 				}
 				var criteria = criterias.join("\n");
-				
+
 				var query = namespace+ "SELECT " + item + "\nWHERE{\n" + criteria + "\n}\n";
 				var quediv = document.getElementById("sparqlquery");
 				var quetextarea = document.getElementById("query");
 				quediv.style.visibility = "visible";
 				quetextarea.value = query;
 			}
-			
+
 			function getNamespace(){
 				var namespace = "";
 				for (key in namespaces){
@@ -404,4 +404,4 @@
 					}
 				}
 				return name;
-			}
\ No newline at end of file
+			}
diff --git a/webapp/src/main/webapp/js/tiny_mce/jquery.tinymce.js b/webapp/src/main/webapp/js/tiny_mce/jquery.tinymce.js
index b4d0c3977..f732b1521 100644
--- a/webapp/src/main/webapp/js/tiny_mce/jquery.tinymce.js
+++ b/webapp/src/main/webapp/js/tiny_mce/jquery.tinymce.js
@@ -1 +1 @@
-(function(c){var b,e,a=[],d=window;c.fn.tinymce=function(j){var p=this,g,k,h,m,i,l="",n="";if(!p.length){return p}if(!j){return tinyMCE.get(p[0].id)}p.css("visibility","hidden");function o(){var r=[],q=0;if(f){f();f=null}p.each(function(t,u){var s,w=u.id,v=j.oninit;if(!w){u.id=w=tinymce.DOM.uniqueId()}s=new tinymce.Editor(w,j);r.push(s);s.onInit.add(function(){var x,y=v;p.css("visibility","");if(v){if(++q==r.length){if(tinymce.is(y,"string")){x=(y.indexOf(".")===-1)?null:tinymce.resolve(y.replace(/\.\w+$/,""));y=tinymce.resolve(y)}y.apply(x||tinymce,r)}}})});c.each(r,function(t,s){s.render()})}if(!d.tinymce&&!e&&(g=j.script_url)){e=1;h=g.substring(0,g.lastIndexOf("/"));if(/_(src|dev)\.js/g.test(g)){n="_src"}m=g.lastIndexOf("?");if(m!=-1){l=g.substring(m+1)}d.tinyMCEPreInit=d.tinyMCEPreInit||{base:h,suffix:n,query:l};if(g.indexOf("gzip")!=-1){i=j.language||"en";g=g+(/\?/.test(g)?"&":"?")+"js=true&core=true&suffix="+escape(n)+"&themes="+escape(j.theme)+"&plugins="+escape(j.plugins)+"&languages="+i;if(!d.tinyMCE_GZ){tinyMCE_GZ={start:function(){tinymce.suffix=n;function q(r){tinymce.ScriptLoader.markDone(tinyMCE.baseURI.toAbsolute(r))}q("langs/"+i+".js");q("themes/"+j.theme+"/editor_template"+n+".js");q("themes/"+j.theme+"/langs/"+i+".js");c.each(j.plugins.split(","),function(s,r){if(r){q("plugins/"+r+"/editor_plugin"+n+".js");q("plugins/"+r+"/langs/"+i+".js")}})},end:function(){}}}}c.ajax({type:"GET",url:g,dataType:"script",cache:true,success:function(){tinymce.dom.Event.domLoaded=1;e=2;if(j.script_loaded){j.script_loaded()}o();c.each(a,function(q,r){r()})}})}else{if(e===1){a.push(o)}else{o()}}return p};c.extend(c.expr[":"],{tinymce:function(g){return !!(g.id&&"tinyMCE" in window&&tinyMCE.get(g.id))}});function f(){function i(l){if(l==="remove"){this.each(function(n,o){var m=h(o);if(m){m.remove()}})}this.find("span.mceEditor,div.mceEditor").each(function(n,o){var m=tinyMCE.get(o.id.replace(/_parent$/,""));if(m){m.remove()}})}function k(n){var m=this,l;if(n!==b){i.call(m);m.each(function(p,q){var o;if(o=tinyMCE.get(q.id)){o.setContent(n)}})}else{if(m.length>0){if(l=tinyMCE.get(m[0].id)){return l.getContent()}}}}function h(m){var l=null;(m)&&(m.id)&&(d.tinymce)&&(l=tinyMCE.get(m.id));return l}function g(l){return !!((l)&&(l.length)&&(d.tinymce)&&(l.is(":tinymce")))}var j={};c.each(["text","html","val"],function(n,l){var o=j[l]=c.fn[l],m=(l==="text");c.fn[l]=function(s){var p=this;if(!g(p)){return o.apply(p,arguments)}if(s!==b){k.call(p.filter(":tinymce"),s);o.apply(p.not(":tinymce"),arguments);return p}else{var r="";var q=arguments;(m?p:p.eq(0)).each(function(u,v){var t=h(v);r+=t?(m?t.getContent().replace(/<(?:"[^"]*"|'[^']*'|[^'">])*>/g,""):t.getContent({save:true})):o.apply(c(v),q)});return r}}});c.each(["append","prepend"],function(n,m){var o=j[m]=c.fn[m],l=(m==="prepend");c.fn[m]=function(q){var p=this;if(!g(p)){return o.apply(p,arguments)}if(q!==b){p.filter(":tinymce").each(function(s,t){var r=h(t);r&&r.setContent(l?q+r.getContent():r.getContent()+q)});o.apply(p.not(":tinymce"),arguments);return p}}});c.each(["remove","replaceWith","replaceAll","empty"],function(m,l){var n=j[l]=c.fn[l];c.fn[l]=function(){i.call(this,l);return n.apply(this,arguments)}});j.attr=c.fn.attr;c.fn.attr=function(o,q){var m=this,n=arguments;if((!o)||(o!=="value")||(!g(m))){if(q!==b){return j.attr.apply(m,n)}else{return j.attr.apply(m,n)}}if(q!==b){k.call(m.filter(":tinymce"),q);j.attr.apply(m.not(":tinymce"),n);return m}else{var p=m[0],l=h(p);return l?l.getContent({save:true}):j.attr.apply(c(p),n)}}}})(jQuery);
\ No newline at end of file
+(function(c){var b,e,a=[],d=window;c.fn.tinymce=function(j){var p=this,g,k,h,m,i,l="",n="";if(!p.length){return p}if(!j){return tinyMCE.get(p[0].id)}p.css("visibility","hidden");function o(){var r=[],q=0;if(f){f();f=null}p.each(function(t,u){var s,w=u.id,v=j.oninit;if(!w){u.id=w=tinymce.DOM.uniqueId()}s=new tinymce.Editor(w,j);r.push(s);s.onInit.add(function(){var x,y=v;p.css("visibility","");if(v){if(++q==r.length){if(tinymce.is(y,"string")){x=(y.indexOf(".")===-1)?null:tinymce.resolve(y.replace(/\.\w+$/,""));y=tinymce.resolve(y)}y.apply(x||tinymce,r)}}})});c.each(r,function(t,s){s.render()})}if(!d.tinymce&&!e&&(g=j.script_url)){e=1;h=g.substring(0,g.lastIndexOf("/"));if(/_(src|dev)\.js/g.test(g)){n="_src"}m=g.lastIndexOf("?");if(m!=-1){l=g.substring(m+1)}d.tinyMCEPreInit=d.tinyMCEPreInit||{base:h,suffix:n,query:l};if(g.indexOf("gzip")!=-1){i=j.language||"en";g=g+(/\?/.test(g)?"&":"?")+"js=true&core=true&suffix="+escape(n)+"&themes="+escape(j.theme)+"&plugins="+escape(j.plugins)+"&languages="+i;if(!d.tinyMCE_GZ){tinyMCE_GZ={start:function(){tinymce.suffix=n;function q(r){tinymce.ScriptLoader.markDone(tinyMCE.baseURI.toAbsolute(r))}q("langs/"+i+".js");q("themes/"+j.theme+"/editor_template"+n+".js");q("themes/"+j.theme+"/langs/"+i+".js");c.each(j.plugins.split(","),function(s,r){if(r){q("plugins/"+r+"/editor_plugin"+n+".js");q("plugins/"+r+"/langs/"+i+".js")}})},end:function(){}}}}c.ajax({type:"GET",url:g,dataType:"script",cache:true,success:function(){tinymce.dom.Event.domLoaded=1;e=2;if(j.script_loaded){j.script_loaded()}o();c.each(a,function(q,r){r()})}})}else{if(e===1){a.push(o)}else{o()}}return p};c.extend(c.expr[":"],{tinymce:function(g){return !!(g.id&&"tinyMCE" in window&&tinyMCE.get(g.id))}});function f(){function i(l){if(l==="remove"){this.each(function(n,o){var m=h(o);if(m){m.remove()}})}this.find("span.mceEditor,div.mceEditor").each(function(n,o){var m=tinyMCE.get(o.id.replace(/_parent$/,""));if(m){m.remove()}})}function k(n){var m=this,l;if(n!==b){i.call(m);m.each(function(p,q){var o;if(o=tinyMCE.get(q.id)){o.setContent(n)}})}else{if(m.length>0){if(l=tinyMCE.get(m[0].id)){return l.getContent()}}}}function h(m){var l=null;(m)&&(m.id)&&(d.tinymce)&&(l=tinyMCE.get(m.id));return l}function g(l){return !!((l)&&(l.length)&&(d.tinymce)&&(l.is(":tinymce")))}var j={};c.each(["text","html","val"],function(n,l){var o=j[l]=c.fn[l],m=(l==="text");c.fn[l]=function(s){var p=this;if(!g(p)){return o.apply(p,arguments)}if(s!==b){k.call(p.filter(":tinymce"),s);o.apply(p.not(":tinymce"),arguments);return p}else{var r="";var q=arguments;(m?p:p.eq(0)).each(function(u,v){var t=h(v);r+=t?(m?t.getContent().replace(/<(?:"[^"]*"|'[^']*'|[^'">])*>/g,""):t.getContent({save:true})):o.apply(c(v),q)});return r}}});c.each(["append","prepend"],function(n,m){var o=j[m]=c.fn[m],l=(m==="prepend");c.fn[m]=function(q){var p=this;if(!g(p)){return o.apply(p,arguments)}if(q!==b){p.filter(":tinymce").each(function(s,t){var r=h(t);r&&r.setContent(l?q+r.getContent():r.getContent()+q)});o.apply(p.not(":tinymce"),arguments);return p}}});c.each(["remove","replaceWith","replaceAll","empty"],function(m,l){var n=j[l]=c.fn[l];c.fn[l]=function(){i.call(this,l);return n.apply(this,arguments)}});j.attr=c.fn.attr;c.fn.attr=function(o,q){var m=this,n=arguments;if((!o)||(o!=="value")||(!g(m))){if(q!==b){return j.attr.apply(m,n)}else{return j.attr.apply(m,n)}}if(q!==b){k.call(m.filter(":tinymce"),q);j.attr.apply(m.not(":tinymce"),n);return m}else{var p=m[0],l=h(p);return l?l.getContent({save:true}):j.attr.apply(c(p),n)}}}})(jQuery);
diff --git a/webapp/src/main/webapp/js/tiny_mce/langs/en.js b/webapp/src/main/webapp/js/tiny_mce/langs/en.js
index 19324f74c..bfa032fa1 100644
--- a/webapp/src/main/webapp/js/tiny_mce/langs/en.js
+++ b/webapp/src/main/webapp/js/tiny_mce/langs/en.js
@@ -1 +1 @@
-tinyMCE.addI18n({en:{common:{"more_colors":"More Colors...","invalid_data":"Error: Invalid values entered, these are marked in red.","popup_blocked":"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.","clipboard_no_support":"Currently not supported by your browser, use keyboard shortcuts instead.","clipboard_msg":"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?","not_set":"-- Not Set --","class_name":"Class",browse:"Browse",close:"Close",cancel:"Cancel",update:"Update",insert:"Insert",apply:"Apply","edit_confirm":"Do you want to use the WYSIWYG mode for this textarea?","invalid_data_number":"{#field} must be a number","invalid_data_min":"{#field} must be a number greater than {#min}","invalid_data_size":"{#field} must be a number or percentage",value:"(value)"},contextmenu:{full:"Full",right:"Right",center:"Center",left:"Left",align:"Alignment"},insertdatetime:{"day_short":"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun","day_long":"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday","months_short":"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec","months_long":"January,February,March,April,May,June,July,August,September,October,November,December","inserttime_desc":"Insert Time","insertdate_desc":"Insert Date","time_fmt":"%H:%M:%S","date_fmt":"%Y-%m-%d"},print:{"print_desc":"Print"},preview:{"preview_desc":"Preview"},directionality:{"rtl_desc":"Direction Right to Left","ltr_desc":"Direction Left to Right"},layer:{content:"New layer...","absolute_desc":"Toggle Absolute Positioning","backward_desc":"Move Backward","forward_desc":"Move Forward","insertlayer_desc":"Insert New Layer"},save:{"save_desc":"Save","cancel_desc":"Cancel All Changes"},nonbreaking:{"nonbreaking_desc":"Insert Non-Breaking Space Character"},iespell:{download:"ieSpell not detected. Do you want to install it now?","iespell_desc":"Check Spelling"},advhr:{"delta_height":"","delta_width":"","advhr_desc":"Insert Horizontal Line"},emotions:{"delta_height":"","delta_width":"","emotions_desc":"Emotions"},searchreplace:{"replace_desc":"Find/Replace","delta_width":"","delta_height":"","search_desc":"Find"},advimage:{"delta_width":"","image_desc":"Insert/Edit Image","delta_height":""},advlink:{"delta_height":"","delta_width":"","link_desc":"Insert/Edit Link"},xhtmlxtras:{"attribs_delta_height":"","attribs_delta_width":"","ins_delta_height":"","ins_delta_width":"","del_delta_height":"","del_delta_width":"","acronym_delta_height":"","acronym_delta_width":"","abbr_delta_height":"","abbr_delta_width":"","cite_delta_height":"","cite_delta_width":"","attribs_desc":"Insert/Edit Attributes","ins_desc":"Insertion","del_desc":"Deletion","acronym_desc":"Acronym","abbr_desc":"Abbreviation","cite_desc":"Citation"},style:{"delta_height":"","delta_width":"",desc:"Edit CSS Style"},paste:{"plaintext_mode_stick":"Paste is now in plain text mode. Click again to toggle back to regular paste mode.","plaintext_mode":"Paste is now in plain text mode. Click again to toggle back to regular paste mode. After you paste something you will be returned to regular paste mode.","selectall_desc":"Select All","paste_word_desc":"Paste from Word","paste_text_desc":"Paste as Plain Text"},"paste_dlg":{"word_title":"Use Ctrl+V on your keyboard to paste the text into the window.","text_linebreaks":"Keep Linebreaks","text_title":"Use Ctrl+V on your keyboard to paste the text into the window."},table:{"merge_cells_delta_height":"","merge_cells_delta_width":"","table_delta_height":"","table_delta_width":"","cellprops_delta_height":"","cellprops_delta_width":"","rowprops_delta_height":"","rowprops_delta_width":"",cell:"Cell",col:"Column",row:"Row",del:"Delete Table","copy_row_desc":"Copy Table Row","cut_row_desc":"Cut Table Row","paste_row_after_desc":"Paste Table Row After","paste_row_before_desc":"Paste Table Row Before","props_desc":"Table Properties","cell_desc":"Table Cell Properties","row_desc":"Table Row Properties","merge_cells_desc":"Merge Table Cells","split_cells_desc":"Split Merged Table Cells","delete_col_desc":"Delete Column","col_after_desc":"Insert Column After","col_before_desc":"Insert Column Before","delete_row_desc":"Delete Row","row_after_desc":"Insert Row After","row_before_desc":"Insert Row Before",desc:"Insert/Edit Table"},autosave:{"warning_message":"If you restore the saved content, you will lose all the content that is currently in the editor.\n\nAre you sure you want to restore the saved content?","restore_content":"Restore auto-saved content.","unload_msg":"The changes you made will be lost if you navigate away from this page."},fullscreen:{desc:"Toggle Full Screen Mode"},media:{"delta_height":"","delta_width":"",edit:"Edit Embedded Media",desc:"Insert/Edit Embedded Media"},fullpage:{desc:"Document Properties","delta_width":"","delta_height":""},template:{desc:"Insert Predefined Template Content"},visualchars:{desc:"Show/Hide Visual Control Characters"},spellchecker:{desc:"Toggle Spell Checker",menu:"Spell Checker Settings","ignore_word":"Ignore Word","ignore_words":"Ignore All",langs:"Languages",wait:"Please wait...",sug:"Suggestions","no_sug":"No Suggestions","no_mpell":"No misspellings found.","learn_word":"Learn word"},pagebreak:{desc:"Insert Page Break for Printing"},advlist:{types:"Types",def:"Default","lower_alpha":"Lower Alpha","lower_greek":"Lower Greek","lower_roman":"Lower Roman","upper_alpha":"Upper Alpha","upper_roman":"Upper Roman",circle:"Circle",disc:"Disc",square:"Square"},colors:{"333300":"Dark olive","993300":"Burnt orange","000000":"Black","003300":"Dark green","003366":"Dark azure","000080":"Navy Blue","333399":"Indigo","333333":"Very dark gray","800000":"Maroon",FF6600:"Orange","808000":"Olive","008000":"Green","008080":"Teal","0000FF":"Blue","666699":"Grayish blue","808080":"Gray",FF0000:"Red",FF9900:"Amber","99CC00":"Yellow green","339966":"Sea green","33CCCC":"Turquoise","3366FF":"Royal blue","800080":"Purple","999999":"Medium gray",FF00FF:"Magenta",FFCC00:"Gold",FFFF00:"Yellow","00FF00":"Lime","00FFFF":"Aqua","00CCFF":"Sky blue","993366":"Brown",C0C0C0:"Silver",FF99CC:"Pink",FFCC99:"Peach",FFFF99:"Light yellow",CCFFCC:"Pale green",CCFFFF:"Pale cyan","99CCFF":"Light sky blue",CC99FF:"Plum",FFFFFF:"White"},aria:{"rich_text_area":"Rich Text Area"},wordcount:{words:"Words:"},visualblocks:{desc:'Show/hide block elements'}}});
\ No newline at end of file
+tinyMCE.addI18n({en:{common:{"more_colors":"More Colors...","invalid_data":"Error: Invalid values entered, these are marked in red.","popup_blocked":"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.","clipboard_no_support":"Currently not supported by your browser, use keyboard shortcuts instead.","clipboard_msg":"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?","not_set":"-- Not Set --","class_name":"Class",browse:"Browse",close:"Close",cancel:"Cancel",update:"Update",insert:"Insert",apply:"Apply","edit_confirm":"Do you want to use the WYSIWYG mode for this textarea?","invalid_data_number":"{#field} must be a number","invalid_data_min":"{#field} must be a number greater than {#min}","invalid_data_size":"{#field} must be a number or percentage",value:"(value)"},contextmenu:{full:"Full",right:"Right",center:"Center",left:"Left",align:"Alignment"},insertdatetime:{"day_short":"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun","day_long":"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday","months_short":"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec","months_long":"January,February,March,April,May,June,July,August,September,October,November,December","inserttime_desc":"Insert Time","insertdate_desc":"Insert Date","time_fmt":"%H:%M:%S","date_fmt":"%Y-%m-%d"},print:{"print_desc":"Print"},preview:{"preview_desc":"Preview"},directionality:{"rtl_desc":"Direction Right to Left","ltr_desc":"Direction Left to Right"},layer:{content:"New layer...","absolute_desc":"Toggle Absolute Positioning","backward_desc":"Move Backward","forward_desc":"Move Forward","insertlayer_desc":"Insert New Layer"},save:{"save_desc":"Save","cancel_desc":"Cancel All Changes"},nonbreaking:{"nonbreaking_desc":"Insert Non-Breaking Space Character"},iespell:{download:"ieSpell not detected. Do you want to install it now?","iespell_desc":"Check Spelling"},advhr:{"delta_height":"","delta_width":"","advhr_desc":"Insert Horizontal Line"},emotions:{"delta_height":"","delta_width":"","emotions_desc":"Emotions"},searchreplace:{"replace_desc":"Find/Replace","delta_width":"","delta_height":"","search_desc":"Find"},advimage:{"delta_width":"","image_desc":"Insert/Edit Image","delta_height":""},advlink:{"delta_height":"","delta_width":"","link_desc":"Insert/Edit Link"},xhtmlxtras:{"attribs_delta_height":"","attribs_delta_width":"","ins_delta_height":"","ins_delta_width":"","del_delta_height":"","del_delta_width":"","acronym_delta_height":"","acronym_delta_width":"","abbr_delta_height":"","abbr_delta_width":"","cite_delta_height":"","cite_delta_width":"","attribs_desc":"Insert/Edit Attributes","ins_desc":"Insertion","del_desc":"Deletion","acronym_desc":"Acronym","abbr_desc":"Abbreviation","cite_desc":"Citation"},style:{"delta_height":"","delta_width":"",desc:"Edit CSS Style"},paste:{"plaintext_mode_stick":"Paste is now in plain text mode. Click again to toggle back to regular paste mode.","plaintext_mode":"Paste is now in plain text mode. Click again to toggle back to regular paste mode. After you paste something you will be returned to regular paste mode.","selectall_desc":"Select All","paste_word_desc":"Paste from Word","paste_text_desc":"Paste as Plain Text"},"paste_dlg":{"word_title":"Use Ctrl+V on your keyboard to paste the text into the window.","text_linebreaks":"Keep Linebreaks","text_title":"Use Ctrl+V on your keyboard to paste the text into the window."},table:{"merge_cells_delta_height":"","merge_cells_delta_width":"","table_delta_height":"","table_delta_width":"","cellprops_delta_height":"","cellprops_delta_width":"","rowprops_delta_height":"","rowprops_delta_width":"",cell:"Cell",col:"Column",row:"Row",del:"Delete Table","copy_row_desc":"Copy Table Row","cut_row_desc":"Cut Table Row","paste_row_after_desc":"Paste Table Row After","paste_row_before_desc":"Paste Table Row Before","props_desc":"Table Properties","cell_desc":"Table Cell Properties","row_desc":"Table Row Properties","merge_cells_desc":"Merge Table Cells","split_cells_desc":"Split Merged Table Cells","delete_col_desc":"Delete Column","col_after_desc":"Insert Column After","col_before_desc":"Insert Column Before","delete_row_desc":"Delete Row","row_after_desc":"Insert Row After","row_before_desc":"Insert Row Before",desc:"Insert/Edit Table"},autosave:{"warning_message":"If you restore the saved content, you will lose all the content that is currently in the editor.\n\nAre you sure you want to restore the saved content?","restore_content":"Restore auto-saved content.","unload_msg":"The changes you made will be lost if you navigate away from this page."},fullscreen:{desc:"Toggle Full Screen Mode"},media:{"delta_height":"","delta_width":"",edit:"Edit Embedded Media",desc:"Insert/Edit Embedded Media"},fullpage:{desc:"Document Properties","delta_width":"","delta_height":""},template:{desc:"Insert Predefined Template Content"},visualchars:{desc:"Show/Hide Visual Control Characters"},spellchecker:{desc:"Toggle Spell Checker",menu:"Spell Checker Settings","ignore_word":"Ignore Word","ignore_words":"Ignore All",langs:"Languages",wait:"Please wait...",sug:"Suggestions","no_sug":"No Suggestions","no_mpell":"No misspellings found.","learn_word":"Learn word"},pagebreak:{desc:"Insert Page Break for Printing"},advlist:{types:"Types",def:"Default","lower_alpha":"Lower Alpha","lower_greek":"Lower Greek","lower_roman":"Lower Roman","upper_alpha":"Upper Alpha","upper_roman":"Upper Roman",circle:"Circle",disc:"Disc",square:"Square"},colors:{"333300":"Dark olive","993300":"Burnt orange","000000":"Black","003300":"Dark green","003366":"Dark azure","000080":"Navy Blue","333399":"Indigo","333333":"Very dark gray","800000":"Maroon",FF6600:"Orange","808000":"Olive","008000":"Green","008080":"Teal","0000FF":"Blue","666699":"Grayish blue","808080":"Gray",FF0000:"Red",FF9900:"Amber","99CC00":"Yellow green","339966":"Sea green","33CCCC":"Turquoise","3366FF":"Royal blue","800080":"Purple","999999":"Medium gray",FF00FF:"Magenta",FFCC00:"Gold",FFFF00:"Yellow","00FF00":"Lime","00FFFF":"Aqua","00CCFF":"Sky blue","993366":"Brown",C0C0C0:"Silver",FF99CC:"Pink",FFCC99:"Peach",FFFF99:"Light yellow",CCFFCC:"Pale green",CCFFFF:"Pale cyan","99CCFF":"Light sky blue",CC99FF:"Plum",FFFFFF:"White"},aria:{"rich_text_area":"Rich Text Area"},wordcount:{words:"Words:"},visualblocks:{desc:'Show/hide block elements'}}});
diff --git a/webapp/src/main/webapp/js/tiny_mce/license.txt b/webapp/src/main/webapp/js/tiny_mce/license.txt
index 14ebc6f4b..548b2e09d 100644
--- a/webapp/src/main/webapp/js/tiny_mce/license.txt
+++ b/webapp/src/main/webapp/js/tiny_mce/license.txt
@@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/advhr/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/advhr/editor_plugin.js
index 4d3b062de..176b2d232 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/advhr/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/advhr/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.AdvancedHRPlugin",{init:function(a,b){a.addCommand("mceAdvancedHr",function(){a.windowManager.open({file:b+"/rule.htm",width:250+parseInt(a.getLang("advhr.delta_width",0)),height:160+parseInt(a.getLang("advhr.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("advhr",{title:"advhr.advhr_desc",cmd:"mceAdvancedHr"});a.onNodeChange.add(function(d,c,e){c.setActive("advhr",e.nodeName=="HR")});a.onClick.add(function(c,d){d=d.target;if(d.nodeName==="HR"){c.selection.select(d)}})},getInfo:function(){return{longname:"Advanced HR",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advhr",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advhr",tinymce.plugins.AdvancedHRPlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.AdvancedHRPlugin",{init:function(a,b){a.addCommand("mceAdvancedHr",function(){a.windowManager.open({file:b+"/rule.htm",width:250+parseInt(a.getLang("advhr.delta_width",0)),height:160+parseInt(a.getLang("advhr.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("advhr",{title:"advhr.advhr_desc",cmd:"mceAdvancedHr"});a.onNodeChange.add(function(d,c,e){c.setActive("advhr",e.nodeName=="HR")});a.onClick.add(function(c,d){d=d.target;if(d.nodeName==="HR"){c.selection.select(d)}})},getInfo:function(){return{longname:"Advanced HR",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advhr",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advhr",tinymce.plugins.AdvancedHRPlugin)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/advhr/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/advhr/editor_plugin_src.js
index 5a4b7250b..2db664e0c 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/advhr/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/advhr/editor_plugin_src.js
@@ -54,4 +54,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('advhr', tinymce.plugins.AdvancedHRPlugin);
-})();
\ No newline at end of file
+})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/advhr/langs/en_dlg.js b/webapp/src/main/webapp/js/tiny_mce/plugins/advhr/langs/en_dlg.js
index 0c3bf15e6..a77d01261 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/advhr/langs/en_dlg.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/advhr/langs/en_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.advhr_dlg',{size:"Height",noshade:"No Shadow",width:"Width",normal:"Normal",widthunits:"Units"});
\ No newline at end of file
+tinyMCE.addI18n('en.advhr_dlg',{size:"Height",noshade:"No Shadow",width:"Width",normal:"Normal",widthunits:"Units"});
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/advimage/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/advimage/editor_plugin.js
index d613a6139..cd75426e8 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/advimage/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/advimage/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.AdvancedImagePlugin",{init:function(a,b){a.addCommand("mceAdvImage",function(){if(a.dom.getAttrib(a.selection.getNode(),"class","").indexOf("mceItem")!=-1){return}a.windowManager.open({file:b+"/image.htm",width:480+parseInt(a.getLang("advimage.delta_width",0)),height:385+parseInt(a.getLang("advimage.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("image",{title:"advimage.image_desc",cmd:"mceAdvImage"})},getInfo:function(){return{longname:"Advanced image",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advimage",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advimage",tinymce.plugins.AdvancedImagePlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.AdvancedImagePlugin",{init:function(a,b){a.addCommand("mceAdvImage",function(){if(a.dom.getAttrib(a.selection.getNode(),"class","").indexOf("mceItem")!=-1){return}a.windowManager.open({file:b+"/image.htm",width:480+parseInt(a.getLang("advimage.delta_width",0)),height:385+parseInt(a.getLang("advimage.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("image",{title:"advimage.image_desc",cmd:"mceAdvImage"})},getInfo:function(){return{longname:"Advanced image",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advimage",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advimage",tinymce.plugins.AdvancedImagePlugin)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/advimage/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/advimage/editor_plugin_src.js
index 76df89a3a..0712ecf78 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/advimage/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/advimage/editor_plugin_src.js
@@ -47,4 +47,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('advimage', tinymce.plugins.AdvancedImagePlugin);
-})();
\ No newline at end of file
+})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/advimage/image.htm b/webapp/src/main/webapp/js/tiny_mce/plugins/advimage/image.htm
index 835d3882c..8eb59d17c 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/advimage/image.htm
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/advimage/image.htm
@@ -12,7 +12,7 @@
 </head>
 <body id="advimage" style="display: none" role="application" aria-labelledby="app_title">
 	<span id="app_title" style="display:none">{#advimage_dlg.dialog_title}</span>
-	<form onsubmit="ImageDialog.insert();return false;" action="#"> 
+	<form onsubmit="ImageDialog.insert();return false;" action="#">
 		<div class="tabs">
 			<ul>
 				<li id="general_tab" class="current" aria-controls="general_panel"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advimage_dlg.tab_general}</a></span></li>
@@ -30,8 +30,8 @@
 							<tr>
 								<td class="column1"><label id="srclabel" for="src">{#advimage_dlg.src}</label></td>
 								<td colspan="2"><table role="presentation" border="0" cellspacing="0" cellpadding="0">
-									<tr> 
-										<td><input name="src" type="text" id="src" value="" class="mceFocus" onchange="ImageDialog.showPreviewImage(this.value);" aria-required="true" /></td> 
+									<tr>
+										<td><input name="src" type="text" id="src" value="" class="mceFocus" onchange="ImageDialog.showPreviewImage(this.value);" aria-required="true" /></td>
 										<td id="srcbrowsercontainer">&nbsp;</td>
 									</tr>
 								</table></td>
@@ -40,13 +40,13 @@
 								<td><label for="src_list">{#advimage_dlg.image_list}</label></td>
 								<td><select id="src_list" name="src_list" onchange="document.getElementById('src').value=this.options[this.selectedIndex].value;document.getElementById('alt').value=this.options[this.selectedIndex].text;document.getElementById('title').value=this.options[this.selectedIndex].text;ImageDialog.showPreviewImage(this.options[this.selectedIndex].value);"><option value=""></option></select></td>
 							</tr>
-							<tr> 
-								<td class="column1"><label id="altlabel" for="alt">{#advimage_dlg.alt}</label></td> 
-								<td colspan="2"><input id="alt" name="alt" type="text" value="" /></td> 
-							</tr> 
-							<tr> 
-								<td class="column1"><label id="titlelabel" for="title">{#advimage_dlg.title}</label></td> 
-								<td colspan="2"><input id="title" name="title" type="text" value="" /></td> 
+							<tr>
+								<td class="column1"><label id="altlabel" for="alt">{#advimage_dlg.alt}</label></td>
+								<td colspan="2"><input id="alt" name="alt" type="text" value="" /></td>
+							</tr>
+							<tr>
+								<td class="column1"><label id="titlelabel" for="title">{#advimage_dlg.title}</label></td>
+								<td colspan="2"><input id="title" name="title" type="text" value="" /></td>
 							</tr>
 						</table>
 				</fieldset>
@@ -62,10 +62,10 @@
 					<legend>{#advimage_dlg.tab_appearance}</legend>
 
 					<table role="presentation" border="0" cellpadding="4" cellspacing="0">
-						<tr> 
-							<td class="column1"><label id="alignlabel" for="align">{#advimage_dlg.align}</label></td> 
-							<td><select id="align" name="align" onchange="ImageDialog.updateStyle('align');ImageDialog.changeAppearance();"> 
-									<option value="">{#not_set}</option> 
+						<tr>
+							<td class="column1"><label id="alignlabel" for="align">{#advimage_dlg.align}</label></td>
+							<td><select id="align" name="align" onchange="ImageDialog.updateStyle('align');ImageDialog.changeAppearance();">
+									<option value="">{#not_set}</option>
 									<option value="baseline">{#advimage_dlg.align_baseline}</option>
 									<option value="top">{#advimage_dlg.align_top}</option>
 									<option value="middle">{#advimage_dlg.align_middle}</option>
@@ -74,7 +74,7 @@
 									<option value="text-bottom">{#advimage_dlg.align_textbottom}</option>
 									<option value="left">{#advimage_dlg.align_left}</option>
 									<option value="right">{#advimage_dlg.align_right}</option>
-								</select> 
+								</select>
 							</td>
 							<td rowspan="6" valign="top">
 								<div class="alignPreview">
@@ -91,7 +91,7 @@
 							<td class="column1"><label id="widthlabel" for="width">{#advimage_dlg.dimensions}</label></td>
 							<td class="nowrap">
 								<span style="display:none" id="width_voiceLabel">{#advimage_dlg.width}</span>
-								<input name="width" type="text" id="width" value="" size="5" maxlength="5" class="size" onchange="ImageDialog.changeHeight();" aria-labelledby="width_voiceLabel" /> x 
+								<input name="width" type="text" id="width" value="" size="5" maxlength="5" class="size" onchange="ImageDialog.changeHeight();" aria-labelledby="width_voiceLabel" /> x
 								<span style="display:none" id="height_voiceLabel">{#advimage_dlg.height}</span>
 								<input name="height" type="text" id="height" value="" size="5" maxlength="5" class="size" onchange="ImageDialog.changeWidth();" aria-labelledby="height_voiceLabel" /> px
 							</td>
@@ -108,19 +108,19 @@
 						</tr>
 
 						<tr>
-							<td class="column1"><label id="vspacelabel" for="vspace">{#advimage_dlg.vspace}</label></td> 
+							<td class="column1"><label id="vspacelabel" for="vspace">{#advimage_dlg.vspace}</label></td>
 							<td><input name="vspace" type="text" id="vspace" value="" size="3" maxlength="3" class="number" onchange="ImageDialog.updateStyle('vspace');ImageDialog.changeAppearance();" onblur="ImageDialog.updateStyle('vspace');ImageDialog.changeAppearance();" />
 							</td>
 						</tr>
 
-						<tr> 
-							<td class="column1"><label id="hspacelabel" for="hspace">{#advimage_dlg.hspace}</label></td> 
-							<td><input name="hspace" type="text" id="hspace" value="" size="3" maxlength="3" class="number" onchange="ImageDialog.updateStyle('hspace');ImageDialog.changeAppearance();" onblur="ImageDialog.updateStyle('hspace');ImageDialog.changeAppearance();" /></td> 
+						<tr>
+							<td class="column1"><label id="hspacelabel" for="hspace">{#advimage_dlg.hspace}</label></td>
+							<td><input name="hspace" type="text" id="hspace" value="" size="3" maxlength="3" class="number" onchange="ImageDialog.updateStyle('hspace');ImageDialog.changeAppearance();" onblur="ImageDialog.updateStyle('hspace');ImageDialog.changeAppearance();" /></td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label id="borderlabel" for="border">{#advimage_dlg.border}</label></td> 
-							<td><input id="border" name="border" type="text" value="" size="3" maxlength="3" class="number" onchange="ImageDialog.updateStyle('border');ImageDialog.changeAppearance();" onblur="ImageDialog.updateStyle('border');ImageDialog.changeAppearance();" /></td> 
+							<td class="column1"><label id="borderlabel" for="border">{#advimage_dlg.border}</label></td>
+							<td><input id="border" name="border" type="text" value="" size="3" maxlength="3" class="number" onchange="ImageDialog.updateStyle('border');ImageDialog.changeAppearance();" onblur="ImageDialog.updateStyle('border');ImageDialog.changeAppearance();" /></td>
 						</tr>
 
 						<tr>
@@ -129,13 +129,13 @@
 						</tr>
 
 						<tr>
-							<td class="column1"><label id="stylelabel" for="style">{#advimage_dlg.style}</label></td> 
-							<td colspan="2"><input id="style" name="style" type="text" value="" onchange="ImageDialog.changeAppearance();" /></td> 
+							<td class="column1"><label id="stylelabel" for="style">{#advimage_dlg.style}</label></td>
+							<td colspan="2"><input id="style" name="style" type="text" value="" onchange="ImageDialog.changeAppearance();" /></td>
 						</tr>
 
 						<!-- <tr>
-							<td class="column1"><label id="classeslabel" for="classes">{#advimage_dlg.classes}</label></td> 
-							<td colspan="2"><input id="classes" name="classes" type="text" value="" onchange="selectByValue(this.form,'classlist',this.value,true);" /></td> 
+							<td class="column1"><label id="classeslabel" for="classes">{#advimage_dlg.classes}</label></td>
+							<td colspan="2"><input id="classes" name="classes" type="text" value="" onchange="selectByValue(this.form,'classlist',this.value,true);" /></td>
 						</tr> -->
 					</table>
 				</fieldset>
@@ -150,10 +150,10 @@
 
 					<table role="presentation" border="0" cellpadding="4" cellspacing="0" width="100%">
 							<tr>
-								<td class="column1"><label id="onmouseoversrclabel" for="onmouseoversrc">{#advimage_dlg.mouseover}</label></td> 
-								<td><table role="presentation" border="0" cellspacing="0" cellpadding="0"> 
-									<tr> 
-										<td><input id="onmouseoversrc" name="onmouseoversrc" type="text" value="" /></td> 
+								<td class="column1"><label id="onmouseoversrclabel" for="onmouseoversrc">{#advimage_dlg.mouseover}</label></td>
+								<td><table role="presentation" border="0" cellspacing="0" cellpadding="0">
+									<tr>
+										<td><input id="onmouseoversrc" name="onmouseoversrc" type="text" value="" /></td>
 										<td id="onmouseoversrccontainer">&nbsp;</td>
 									</tr>
 								</table></td>
@@ -162,14 +162,14 @@
 								<td><label for="over_list">{#advimage_dlg.image_list}</label></td>
 								<td><select id="over_list" name="over_list" onchange="document.getElementById('onmouseoversrc').value=this.options[this.selectedIndex].value;"><option value=""></option></select></td>
 							</tr>
-							<tr> 
-								<td class="column1"><label id="onmouseoutsrclabel" for="onmouseoutsrc">{#advimage_dlg.mouseout}</label></td> 
-								<td class="column2"><table role="presentation" border="0" cellspacing="0" cellpadding="0"> 
-									<tr> 
-										<td><input id="onmouseoutsrc" name="onmouseoutsrc" type="text" value="" /></td> 
+							<tr>
+								<td class="column1"><label id="onmouseoutsrclabel" for="onmouseoutsrc">{#advimage_dlg.mouseout}</label></td>
+								<td class="column2"><table role="presentation" border="0" cellspacing="0" cellpadding="0">
+									<tr>
+										<td><input id="onmouseoutsrc" name="onmouseoutsrc" type="text" value="" /></td>
 										<td id="onmouseoutsrccontainer">&nbsp;</td>
-									</tr> 
-								</table></td> 
+									</tr>
+								</table></td>
 							</tr>
 							<tr>
 								<td><label for="out_list">{#advimage_dlg.image_list}</label></td>
@@ -183,33 +183,33 @@
 
 					<table role="presentation" border="0" cellpadding="4" cellspacing="0">
 						<tr>
-							<td class="column1"><label id="idlabel" for="id">{#advimage_dlg.id}</label></td> 
-							<td><input id="id" name="id" type="text" value="" /></td> 
+							<td class="column1"><label id="idlabel" for="id">{#advimage_dlg.id}</label></td>
+							<td><input id="id" name="id" type="text" value="" /></td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label id="dirlabel" for="dir">{#advimage_dlg.langdir}</label></td> 
+							<td class="column1"><label id="dirlabel" for="dir">{#advimage_dlg.langdir}</label></td>
 							<td>
-								<select id="dir" name="dir" onchange="ImageDialog.changeAppearance();"> 
-										<option value="">{#not_set}</option> 
-										<option value="ltr">{#advimage_dlg.ltr}</option> 
-										<option value="rtl">{#advimage_dlg.rtl}</option> 
+								<select id="dir" name="dir" onchange="ImageDialog.changeAppearance();">
+										<option value="">{#not_set}</option>
+										<option value="ltr">{#advimage_dlg.ltr}</option>
+										<option value="rtl">{#advimage_dlg.rtl}</option>
 								</select>
-							</td> 
+							</td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label id="langlabel" for="lang">{#advimage_dlg.langcode}</label></td> 
+							<td class="column1"><label id="langlabel" for="lang">{#advimage_dlg.langcode}</label></td>
 							<td>
 								<input id="lang" name="lang" type="text" value="" />
-							</td> 
+							</td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label id="usemaplabel" for="usemap">{#advimage_dlg.map}</label></td> 
+							<td class="column1"><label id="usemaplabel" for="usemap">{#advimage_dlg.map}</label></td>
 							<td>
 								<input id="usemap" name="usemap" type="text" value="" />
-							</td> 
+							</td>
 						</tr>
 
 						<tr>
@@ -219,7 +219,7 @@
 										<td><input id="longdesc" name="longdesc" type="text" value="" /></td>
 										<td id="longdesccontainer">&nbsp;</td>
 									</tr>
-							</table></td> 
+							</table></td>
 						</tr>
 					</table>
 				</fieldset>
@@ -231,5 +231,5 @@
 			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
 		</div>
 	</form>
-</body> 
-</html> 
+</body>
+</html>
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/advimage/langs/en_dlg.js b/webapp/src/main/webapp/js/tiny_mce/plugins/advimage/langs/en_dlg.js
index 5f122e2cd..56394c0b0 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/advimage/langs/en_dlg.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/advimage/langs/en_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.advimage_dlg',{"image_list":"Image List","align_right":"Right","align_left":"Left","align_textbottom":"Text Bottom","align_texttop":"Text Top","align_bottom":"Bottom","align_middle":"Middle","align_top":"Top","align_baseline":"Baseline",align:"Alignment",hspace:"Horizontal Space",vspace:"Vertical Space",dimensions:"Dimensions",border:"Border",list:"Image List",alt:"Image Description",src:"Image URL","dialog_title":"Insert/Edit Image","missing_alt":"Are you sure you want to continue without including an Image Description? Without it the image may not be accessible to some users with disabilities, or to those using a text browser, or browsing the Web with images turned off.","example_img":"Appearance Preview Image",misc:"Miscellaneous",mouseout:"For Mouse Out",mouseover:"For Mouse Over","alt_image":"Alternative Image","swap_image":"Swap Image",map:"Image Map",id:"ID",rtl:"Right to Left",ltr:"Left to Right",classes:"Classes",style:"Style","long_desc":"Long Description Link",langcode:"Language Code",langdir:"Language Direction","constrain_proportions":"Constrain Proportions",preview:"Preview",title:"Title",general:"General","tab_advanced":"Advanced","tab_appearance":"Appearance","tab_general":"General",width:"Width",height:"Height"});
\ No newline at end of file
+tinyMCE.addI18n('en.advimage_dlg',{"image_list":"Image List","align_right":"Right","align_left":"Left","align_textbottom":"Text Bottom","align_texttop":"Text Top","align_bottom":"Bottom","align_middle":"Middle","align_top":"Top","align_baseline":"Baseline",align:"Alignment",hspace:"Horizontal Space",vspace:"Vertical Space",dimensions:"Dimensions",border:"Border",list:"Image List",alt:"Image Description",src:"Image URL","dialog_title":"Insert/Edit Image","missing_alt":"Are you sure you want to continue without including an Image Description? Without it the image may not be accessible to some users with disabilities, or to those using a text browser, or browsing the Web with images turned off.","example_img":"Appearance Preview Image",misc:"Miscellaneous",mouseout:"For Mouse Out",mouseover:"For Mouse Over","alt_image":"Alternative Image","swap_image":"Swap Image",map:"Image Map",id:"ID",rtl:"Right to Left",ltr:"Left to Right",classes:"Classes",style:"Style","long_desc":"Long Description Link",langcode:"Language Code",langdir:"Language Direction","constrain_proportions":"Constrain Proportions",preview:"Preview",title:"Title",general:"General","tab_advanced":"Advanced","tab_appearance":"Appearance","tab_general":"General",width:"Width",height:"Height"});
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/advlink/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/advlink/editor_plugin.js
index 983fe5a9c..dd26ac96a 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/advlink/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/advlink/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.AdvancedLinkPlugin",{init:function(a,b){this.editor=a;a.addCommand("mceAdvLink",function(){var c=a.selection;if(c.isCollapsed()&&!a.dom.getParent(c.getNode(),"A")){return}a.windowManager.open({file:b+"/link.htm",width:480+parseInt(a.getLang("advlink.delta_width",0)),height:400+parseInt(a.getLang("advlink.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("link",{title:"advlink.link_desc",cmd:"mceAdvLink"});a.addShortcut("ctrl+k","advlink.advlink_desc","mceAdvLink");a.onNodeChange.add(function(d,c,f,e){c.setDisabled("link",e&&f.nodeName!="A");c.setActive("link",f.nodeName=="A"&&!f.name)})},getInfo:function(){return{longname:"Advanced link",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advlink",tinymce.plugins.AdvancedLinkPlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.AdvancedLinkPlugin",{init:function(a,b){this.editor=a;a.addCommand("mceAdvLink",function(){var c=a.selection;if(c.isCollapsed()&&!a.dom.getParent(c.getNode(),"A")){return}a.windowManager.open({file:b+"/link.htm",width:480+parseInt(a.getLang("advlink.delta_width",0)),height:400+parseInt(a.getLang("advlink.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("link",{title:"advlink.link_desc",cmd:"mceAdvLink"});a.addShortcut("ctrl+k","advlink.advlink_desc","mceAdvLink");a.onNodeChange.add(function(d,c,f,e){c.setDisabled("link",e&&f.nodeName!="A");c.setActive("link",f.nodeName=="A"&&!f.name)})},getInfo:function(){return{longname:"Advanced link",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advlink",tinymce.plugins.AdvancedLinkPlugin)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/advlink/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/advlink/editor_plugin_src.js
index 32ea8f3db..225e38509 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/advlink/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/advlink/editor_plugin_src.js
@@ -58,4 +58,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('advlink', tinymce.plugins.AdvancedLinkPlugin);
-})();
\ No newline at end of file
+})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/advlink/langs/en_dlg.js b/webapp/src/main/webapp/js/tiny_mce/plugins/advlink/langs/en_dlg.js
index 3169a5658..ba72f161f 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/advlink/langs/en_dlg.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/advlink/langs/en_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.advlink_dlg',{"target_name":"Target Name",classes:"Classes",style:"Style",id:"ID","popup_position":"Position (X/Y)",langdir:"Language Direction","popup_size":"Size","popup_dependent":"Dependent (Mozilla/Firefox Only)","popup_resizable":"Make Window Resizable","popup_location":"Show Location Bar","popup_menubar":"Show Menu Bar","popup_toolbar":"Show Toolbars","popup_statusbar":"Show Status Bar","popup_scrollbars":"Show Scrollbars","popup_return":"Insert \'return false\'","popup_name":"Window Name","popup_url":"Popup URL",popup:"JavaScript Popup","target_blank":"Open in New Window","target_top":"Open in Top Frame (Replaces All Frames)","target_parent":"Open in Parent Window/Frame","target_same":"Open in This Window/Frame","anchor_names":"Anchors","popup_opts":"Options","advanced_props":"Advanced Properties","event_props":"Events","popup_props":"Popup Properties","general_props":"General Properties","advanced_tab":"Advanced","events_tab":"Events","popup_tab":"Popup","general_tab":"General",list:"Link List","is_external":"The URL you entered seems to be an external link. Do you want to add the required http:// prefix?","is_email":"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",titlefield:"Title",target:"Target",url:"Link URL",title:"Insert/Edit Link","link_list":"Link List",rtl:"Right to Left",ltr:"Left to Right",accesskey:"AccessKey",tabindex:"TabIndex",rev:"Relationship Target to Page",rel:"Relationship Page to Target",mime:"Target MIME Type",encoding:"Target Character Encoding",langcode:"Language Code","target_langcode":"Target Language",width:"Width",height:"Height"});
\ No newline at end of file
+tinyMCE.addI18n('en.advlink_dlg',{"target_name":"Target Name",classes:"Classes",style:"Style",id:"ID","popup_position":"Position (X/Y)",langdir:"Language Direction","popup_size":"Size","popup_dependent":"Dependent (Mozilla/Firefox Only)","popup_resizable":"Make Window Resizable","popup_location":"Show Location Bar","popup_menubar":"Show Menu Bar","popup_toolbar":"Show Toolbars","popup_statusbar":"Show Status Bar","popup_scrollbars":"Show Scrollbars","popup_return":"Insert \'return false\'","popup_name":"Window Name","popup_url":"Popup URL",popup:"JavaScript Popup","target_blank":"Open in New Window","target_top":"Open in Top Frame (Replaces All Frames)","target_parent":"Open in Parent Window/Frame","target_same":"Open in This Window/Frame","anchor_names":"Anchors","popup_opts":"Options","advanced_props":"Advanced Properties","event_props":"Events","popup_props":"Popup Properties","general_props":"General Properties","advanced_tab":"Advanced","events_tab":"Events","popup_tab":"Popup","general_tab":"General",list:"Link List","is_external":"The URL you entered seems to be an external link. Do you want to add the required http:// prefix?","is_email":"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",titlefield:"Title",target:"Target",url:"Link URL",title:"Insert/Edit Link","link_list":"Link List",rtl:"Right to Left",ltr:"Left to Right",accesskey:"AccessKey",tabindex:"TabIndex",rev:"Relationship Target to Page",rel:"Relationship Page to Target",mime:"Target MIME Type",encoding:"Target Character Encoding",langcode:"Language Code","target_langcode":"Target Language",width:"Width",height:"Height"});
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/advlink/link.htm b/webapp/src/main/webapp/js/tiny_mce/plugins/advlink/link.htm
index 52623ab57..937e8946b 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/advlink/link.htm
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/advlink/link.htm
@@ -100,7 +100,7 @@
 							<td class="nowrap" id="labelleft"><label id="popup_position_label">{#advlink_dlg.popup_position}</label>&nbsp;</td>
 							<td class="nowrap">
 								<span style="display:none" id="x_voiceLabel">X</span>
-								<input type="text" id="popupleft" name="popupleft" value="" onchange="buildOnClick();" aria-labelledby="x_voiceLabel" /> /                                
+								<input type="text" id="popupleft" name="popupleft" value="" onchange="buildOnClick();" aria-labelledby="x_voiceLabel" /> /
 								<span style="display:none" id="y_voiceLabel">Y</span>
 								<input type="text" id="popuptop" name="popuptop" value="" onchange="buildOnClick();" aria-labelledby="y_voiceLabel" /> <span id="center_hint">(c /c = center)</span>
 							</td>
@@ -146,8 +146,8 @@
 
 					<table border="0" cellpadding="0" cellspacing="4" role="presentation" >
 						<tr>
-							<td class="column1"><label id="idlabel" for="id">{#advlink_dlg.id}</label></td> 
-							<td><input id="id" name="id" type="text" value="" /></td> 
+							<td class="column1"><label id="idlabel" for="id">{#advlink_dlg.id}</label></td>
+							<td><input id="id" name="id" type="text" value="" /></td>
 						</tr>
 
 						<tr>
@@ -166,14 +166,14 @@
 						</tr>
 
 						<tr>
-							<td class="column1"><label id="dirlabel" for="dir">{#advlink_dlg.langdir}</label></td> 
+							<td class="column1"><label id="dirlabel" for="dir">{#advlink_dlg.langdir}</label></td>
 							<td>
-								<select id="dir" name="dir"> 
-										<option value="">{#not_set}</option> 
-										<option value="ltr">{#advlink_dlg.ltr}</option> 
-										<option value="rtl">{#advlink_dlg.rtl}</option> 
+								<select id="dir" name="dir">
+										<option value="">{#not_set}</option>
+										<option value="ltr">{#advlink_dlg.ltr}</option>
+										<option value="rtl">{#advlink_dlg.rtl}</option>
 								</select>
-							</td> 
+							</td>
 						</tr>
 
 						<tr>
@@ -182,10 +182,10 @@
 						</tr>
 
 						<tr>
-							<td class="column1"><label id="langlabel" for="lang">{#advlink_dlg.langcode}</label></td> 
+							<td class="column1"><label id="langlabel" for="lang">{#advlink_dlg.langcode}</label></td>
 							<td>
 								<input id="lang" name="lang" type="text" value="" />
-							</td> 
+							</td>
 						</tr>
 
 						<tr>
@@ -200,50 +200,50 @@
 
 						<tr>
 							<td><label id="rellabel" for="rel">{#advlink_dlg.rel}</label></td>
-							<td><select id="rel" name="rel"> 
-									<option value="">{#not_set}</option> 
-									<option value="lightbox">Lightbox</option> 
-									<option value="alternate">Alternate</option> 
-									<option value="designates">Designates</option> 
-									<option value="stylesheet">Stylesheet</option> 
-									<option value="start">Start</option> 
-									<option value="next">Next</option> 
-									<option value="prev">Prev</option> 
-									<option value="contents">Contents</option> 
-									<option value="index">Index</option> 
-									<option value="glossary">Glossary</option> 
-									<option value="copyright">Copyright</option> 
-									<option value="chapter">Chapter</option> 
-									<option value="subsection">Subsection</option> 
-									<option value="appendix">Appendix</option> 
-									<option value="help">Help</option> 
+							<td><select id="rel" name="rel">
+									<option value="">{#not_set}</option>
+									<option value="lightbox">Lightbox</option>
+									<option value="alternate">Alternate</option>
+									<option value="designates">Designates</option>
+									<option value="stylesheet">Stylesheet</option>
+									<option value="start">Start</option>
+									<option value="next">Next</option>
+									<option value="prev">Prev</option>
+									<option value="contents">Contents</option>
+									<option value="index">Index</option>
+									<option value="glossary">Glossary</option>
+									<option value="copyright">Copyright</option>
+									<option value="chapter">Chapter</option>
+									<option value="subsection">Subsection</option>
+									<option value="appendix">Appendix</option>
+									<option value="help">Help</option>
 									<option value="bookmark">Bookmark</option>
 									<option value="nofollow">No Follow</option>
 									<option value="tag">Tag</option>
-								</select> 
+								</select>
 							</td>
 						</tr>
 
 						<tr>
 							<td><label id="revlabel" for="rev">{#advlink_dlg.rev}</label></td>
-							<td><select id="rev" name="rev"> 
-									<option value="">{#not_set}</option> 
-									<option value="alternate">Alternate</option> 
-									<option value="designates">Designates</option> 
-									<option value="stylesheet">Stylesheet</option> 
-									<option value="start">Start</option> 
-									<option value="next">Next</option> 
-									<option value="prev">Prev</option> 
-									<option value="contents">Contents</option> 
-									<option value="index">Index</option> 
-									<option value="glossary">Glossary</option> 
-									<option value="copyright">Copyright</option> 
-									<option value="chapter">Chapter</option> 
-									<option value="subsection">Subsection</option> 
-									<option value="appendix">Appendix</option> 
-									<option value="help">Help</option> 
-									<option value="bookmark">Bookmark</option> 
-								</select> 
+							<td><select id="rev" name="rev">
+									<option value="">{#not_set}</option>
+									<option value="alternate">Alternate</option>
+									<option value="designates">Designates</option>
+									<option value="stylesheet">Stylesheet</option>
+									<option value="start">Start</option>
+									<option value="next">Next</option>
+									<option value="prev">Prev</option>
+									<option value="contents">Contents</option>
+									<option value="index">Index</option>
+									<option value="glossary">Glossary</option>
+									<option value="copyright">Copyright</option>
+									<option value="chapter">Chapter</option>
+									<option value="subsection">Subsection</option>
+									<option value="appendix">Appendix</option>
+									<option value="help">Help</option>
+									<option value="bookmark">Bookmark</option>
+								</select>
 							</td>
 						</tr>
 
@@ -266,63 +266,63 @@
 
 					<table border="0" cellpadding="0" cellspacing="4" role="presentation" >
 						<tr>
-							<td class="column1"><label for="onfocus">onfocus</label></td> 
-							<td><input id="onfocus" name="onfocus" type="text" value="" /></td> 
+							<td class="column1"><label for="onfocus">onfocus</label></td>
+							<td><input id="onfocus" name="onfocus" type="text" value="" /></td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="onblur">onblur</label></td> 
-							<td><input id="onblur" name="onblur" type="text" value="" /></td> 
+							<td class="column1"><label for="onblur">onblur</label></td>
+							<td><input id="onblur" name="onblur" type="text" value="" /></td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="onclick">onclick</label></td> 
-							<td><input id="onclick" name="onclick" type="text" value="" /></td> 
+							<td class="column1"><label for="onclick">onclick</label></td>
+							<td><input id="onclick" name="onclick" type="text" value="" /></td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="ondblclick">ondblclick</label></td> 
-							<td><input id="ondblclick" name="ondblclick" type="text" value="" /></td> 
+							<td class="column1"><label for="ondblclick">ondblclick</label></td>
+							<td><input id="ondblclick" name="ondblclick" type="text" value="" /></td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="onmousedown">onmousedown</label></td> 
-							<td><input id="onmousedown" name="onmousedown" type="text" value="" /></td> 
+							<td class="column1"><label for="onmousedown">onmousedown</label></td>
+							<td><input id="onmousedown" name="onmousedown" type="text" value="" /></td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="onmouseup">onmouseup</label></td> 
-							<td><input id="onmouseup" name="onmouseup" type="text" value="" /></td> 
+							<td class="column1"><label for="onmouseup">onmouseup</label></td>
+							<td><input id="onmouseup" name="onmouseup" type="text" value="" /></td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="onmouseover">onmouseover</label></td> 
-							<td><input id="onmouseover" name="onmouseover" type="text" value="" /></td> 
+							<td class="column1"><label for="onmouseover">onmouseover</label></td>
+							<td><input id="onmouseover" name="onmouseover" type="text" value="" /></td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="onmousemove">onmousemove</label></td> 
-							<td><input id="onmousemove" name="onmousemove" type="text" value="" /></td> 
+							<td class="column1"><label for="onmousemove">onmousemove</label></td>
+							<td><input id="onmousemove" name="onmousemove" type="text" value="" /></td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="onmouseout">onmouseout</label></td> 
-							<td><input id="onmouseout" name="onmouseout" type="text" value="" /></td> 
+							<td class="column1"><label for="onmouseout">onmouseout</label></td>
+							<td><input id="onmouseout" name="onmouseout" type="text" value="" /></td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="onkeypress">onkeypress</label></td> 
-							<td><input id="onkeypress" name="onkeypress" type="text" value="" /></td> 
+							<td class="column1"><label for="onkeypress">onkeypress</label></td>
+							<td><input id="onkeypress" name="onkeypress" type="text" value="" /></td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="onkeydown">onkeydown</label></td> 
-							<td><input id="onkeydown" name="onkeydown" type="text" value="" /></td> 
+							<td class="column1"><label for="onkeydown">onkeydown</label></td>
+							<td><input id="onkeydown" name="onkeydown" type="text" value="" /></td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="onkeyup">onkeyup</label></td> 
-							<td><input id="onkeyup" name="onkeyup" type="text" value="" /></td> 
+							<td class="column1"><label for="onkeyup">onkeyup</label></td>
+							<td><input id="onkeyup" name="onkeyup" type="text" value="" /></td>
 						</tr>
 					</table>
 				</fieldset>
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/advlist/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/advlist/editor_plugin.js
index 57ecce6e0..11e2bfa65 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/advlist/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/advlist/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.AdvListPlugin",{init:function(b,c){var d=this;d.editor=b;function e(g){var f=[];a(g.split(/,/),function(h){f.push({title:"advlist."+(h=="default"?"def":h.replace(/-/g,"_")),styles:{listStyleType:h=="default"?"":h}})});return f}d.numlist=b.getParam("advlist_number_styles")||e("default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman");d.bullist=b.getParam("advlist_bullet_styles")||e("default,circle,disc,square");if(tinymce.isIE&&/MSIE [2-7]/.test(navigator.userAgent)){d.isIE7=true}},createControl:function(d,b){var f=this,e,i,g=f.editor;if(d=="numlist"||d=="bullist"){if(f[d][0].title=="advlist.def"){i=f[d][0]}function c(j,l){var k=true;a(l.styles,function(n,m){if(g.dom.getStyle(j,m)!=n){k=false;return false}});return k}function h(){var k,l=g.dom,j=g.selection;k=l.getParent(j.getNode(),"ol,ul");if(!k||k.nodeName==(d=="bullist"?"OL":"UL")||c(k,i)){g.execCommand(d=="bullist"?"InsertUnorderedList":"InsertOrderedList")}if(i){k=l.getParent(j.getNode(),"ol,ul");if(k){l.setStyles(k,i.styles);k.removeAttribute("data-mce-style")}}g.focus()}e=b.createSplitButton(d,{title:"advanced."+d+"_desc","class":"mce_"+d,onclick:function(){h()}});e.onRenderMenu.add(function(j,k){k.onHideMenu.add(function(){if(f.bookmark){g.selection.moveToBookmark(f.bookmark);f.bookmark=0}});k.onShowMenu.add(function(){var n=g.dom,m=n.getParent(g.selection.getNode(),"ol,ul"),l;if(m||i){l=f[d];a(k.items,function(o){var p=true;o.setSelected(0);if(m&&!o.isDisabled()){a(l,function(q){if(q.id==o.id){if(!c(m,q)){p=false;return false}}});if(p){o.setSelected(1)}}});if(!m){k.items[i.id].setSelected(1)}}g.focus();if(tinymce.isIE){f.bookmark=g.selection.getBookmark(1)}});k.add({id:g.dom.uniqueId(),title:"advlist.types","class":"mceMenuItemTitle",titleItem:true}).setDisabled(1);a(f[d],function(l){if(f.isIE7&&l.styles.listStyleType=="lower-greek"){return}l.id=g.dom.uniqueId();k.add({id:l.id,title:l.title,onclick:function(){i=l;h()}})})});return e}},getInfo:function(){return{longname:"Advanced lists",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlist",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advlist",tinymce.plugins.AdvListPlugin)})();
\ No newline at end of file
+(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.AdvListPlugin",{init:function(b,c){var d=this;d.editor=b;function e(g){var f=[];a(g.split(/,/),function(h){f.push({title:"advlist."+(h=="default"?"def":h.replace(/-/g,"_")),styles:{listStyleType:h=="default"?"":h}})});return f}d.numlist=b.getParam("advlist_number_styles")||e("default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman");d.bullist=b.getParam("advlist_bullet_styles")||e("default,circle,disc,square");if(tinymce.isIE&&/MSIE [2-7]/.test(navigator.userAgent)){d.isIE7=true}},createControl:function(d,b){var f=this,e,i,g=f.editor;if(d=="numlist"||d=="bullist"){if(f[d][0].title=="advlist.def"){i=f[d][0]}function c(j,l){var k=true;a(l.styles,function(n,m){if(g.dom.getStyle(j,m)!=n){k=false;return false}});return k}function h(){var k,l=g.dom,j=g.selection;k=l.getParent(j.getNode(),"ol,ul");if(!k||k.nodeName==(d=="bullist"?"OL":"UL")||c(k,i)){g.execCommand(d=="bullist"?"InsertUnorderedList":"InsertOrderedList")}if(i){k=l.getParent(j.getNode(),"ol,ul");if(k){l.setStyles(k,i.styles);k.removeAttribute("data-mce-style")}}g.focus()}e=b.createSplitButton(d,{title:"advanced."+d+"_desc","class":"mce_"+d,onclick:function(){h()}});e.onRenderMenu.add(function(j,k){k.onHideMenu.add(function(){if(f.bookmark){g.selection.moveToBookmark(f.bookmark);f.bookmark=0}});k.onShowMenu.add(function(){var n=g.dom,m=n.getParent(g.selection.getNode(),"ol,ul"),l;if(m||i){l=f[d];a(k.items,function(o){var p=true;o.setSelected(0);if(m&&!o.isDisabled()){a(l,function(q){if(q.id==o.id){if(!c(m,q)){p=false;return false}}});if(p){o.setSelected(1)}}});if(!m){k.items[i.id].setSelected(1)}}g.focus();if(tinymce.isIE){f.bookmark=g.selection.getBookmark(1)}});k.add({id:g.dom.uniqueId(),title:"advlist.types","class":"mceMenuItemTitle",titleItem:true}).setDisabled(1);a(f[d],function(l){if(f.isIE7&&l.styles.listStyleType=="lower-greek"){return}l.id=g.dom.uniqueId();k.add({id:l.id,title:l.title,onclick:function(){i=l;h()}})})});return e}},getInfo:function(){return{longname:"Advanced lists",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlist",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advlist",tinymce.plugins.AdvListPlugin)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/advlist/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/advlist/editor_plugin_src.js
index 4ee4d34c8..2488def31 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/advlist/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/advlist/editor_plugin_src.js
@@ -131,7 +131,7 @@
 							if (!list)
 								menu.items[format.id].setSelected(1);
 						}
-	
+
 						editor.focus();
 
 						// IE looses it's selection so store it away and restore it later
@@ -173,4 +173,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('advlist', tinymce.plugins.AdvListPlugin);
-})();
\ No newline at end of file
+})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/autolink/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/autolink/editor_plugin.js
index 71d86bbec..0aa085118 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/autolink/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/autolink/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.AutolinkPlugin",{init:function(a,b){var c=this;a.onKeyDown.addToTop(function(d,f){if(f.keyCode==13){return c.handleEnter(d)}});if(tinyMCE.isIE){return}a.onKeyPress.add(function(d,f){if(f.which==41){return c.handleEclipse(d)}});a.onKeyUp.add(function(d,f){if(f.keyCode==32){return c.handleSpacebar(d)}})},handleEclipse:function(a){this.parseCurrentLine(a,-1,"(",true)},handleSpacebar:function(a){this.parseCurrentLine(a,0,"",true)},handleEnter:function(a){this.parseCurrentLine(a,-1,"",false)},parseCurrentLine:function(i,d,b,g){var a,f,c,n,k,m,h,e,j;a=i.selection.getRng(true).cloneRange();if(a.startOffset<5){e=a.endContainer.previousSibling;if(e==null){if(a.endContainer.firstChild==null||a.endContainer.firstChild.nextSibling==null){return}e=a.endContainer.firstChild.nextSibling}j=e.length;a.setStart(e,j);a.setEnd(e,j);if(a.endOffset<5){return}f=a.endOffset;n=e}else{n=a.endContainer;if(n.nodeType!=3&&n.firstChild){while(n.nodeType!=3&&n.firstChild){n=n.firstChild}if(n.nodeType==3){a.setStart(n,0);a.setEnd(n,n.nodeValue.length)}}if(a.endOffset==1){f=2}else{f=a.endOffset-1-d}}c=f;do{a.setStart(n,f>=2?f-2:0);a.setEnd(n,f>=1?f-1:0);f-=1}while(a.toString()!=" "&&a.toString()!=""&&a.toString().charCodeAt(0)!=160&&(f-2)>=0&&a.toString()!=b);if(a.toString()==b||a.toString().charCodeAt(0)==160){a.setStart(n,f);a.setEnd(n,c);f+=1}else{if(a.startOffset==0){a.setStart(n,0);a.setEnd(n,c)}else{a.setStart(n,f);a.setEnd(n,c)}}var m=a.toString();if(m.charAt(m.length-1)=="."){a.setEnd(n,c-1)}m=a.toString();h=m.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|(?:mailto:)?[A-Z0-9._%+-]+@)(.+)$/i);if(h){if(h[1]=="www."){h[1]="http://www."}else{if(/@$/.test(h[1])&&!/^mailto:/.test(h[1])){h[1]="mailto:"+h[1]}}k=i.selection.getBookmark();i.selection.setRng(a);tinyMCE.execCommand("createlink",false,h[1]+h[2]);i.selection.moveToBookmark(k);i.nodeChanged();if(tinyMCE.isWebKit){i.selection.collapse(false);var l=Math.min(n.length,c+1);a.setStart(n,l);a.setEnd(n,l);i.selection.setRng(a)}}},getInfo:function(){return{longname:"Autolink",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autolink",tinymce.plugins.AutolinkPlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.AutolinkPlugin",{init:function(a,b){var c=this;a.onKeyDown.addToTop(function(d,f){if(f.keyCode==13){return c.handleEnter(d)}});if(tinyMCE.isIE){return}a.onKeyPress.add(function(d,f){if(f.which==41){return c.handleEclipse(d)}});a.onKeyUp.add(function(d,f){if(f.keyCode==32){return c.handleSpacebar(d)}})},handleEclipse:function(a){this.parseCurrentLine(a,-1,"(",true)},handleSpacebar:function(a){this.parseCurrentLine(a,0,"",true)},handleEnter:function(a){this.parseCurrentLine(a,-1,"",false)},parseCurrentLine:function(i,d,b,g){var a,f,c,n,k,m,h,e,j;a=i.selection.getRng(true).cloneRange();if(a.startOffset<5){e=a.endContainer.previousSibling;if(e==null){if(a.endContainer.firstChild==null||a.endContainer.firstChild.nextSibling==null){return}e=a.endContainer.firstChild.nextSibling}j=e.length;a.setStart(e,j);a.setEnd(e,j);if(a.endOffset<5){return}f=a.endOffset;n=e}else{n=a.endContainer;if(n.nodeType!=3&&n.firstChild){while(n.nodeType!=3&&n.firstChild){n=n.firstChild}if(n.nodeType==3){a.setStart(n,0);a.setEnd(n,n.nodeValue.length)}}if(a.endOffset==1){f=2}else{f=a.endOffset-1-d}}c=f;do{a.setStart(n,f>=2?f-2:0);a.setEnd(n,f>=1?f-1:0);f-=1}while(a.toString()!=" "&&a.toString()!=""&&a.toString().charCodeAt(0)!=160&&(f-2)>=0&&a.toString()!=b);if(a.toString()==b||a.toString().charCodeAt(0)==160){a.setStart(n,f);a.setEnd(n,c);f+=1}else{if(a.startOffset==0){a.setStart(n,0);a.setEnd(n,c)}else{a.setStart(n,f);a.setEnd(n,c)}}var m=a.toString();if(m.charAt(m.length-1)=="."){a.setEnd(n,c-1)}m=a.toString();h=m.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|(?:mailto:)?[A-Z0-9._%+-]+@)(.+)$/i);if(h){if(h[1]=="www."){h[1]="http://www."}else{if(/@$/.test(h[1])&&!/^mailto:/.test(h[1])){h[1]="mailto:"+h[1]}}k=i.selection.getBookmark();i.selection.setRng(a);tinyMCE.execCommand("createlink",false,h[1]+h[2]);i.selection.moveToBookmark(k);i.nodeChanged();if(tinyMCE.isWebKit){i.selection.collapse(false);var l=Math.min(n.length,c+1);a.setStart(n,l);a.setEnd(n,l);i.selection.setRng(a)}}},getInfo:function(){return{longname:"Autolink",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autolink",tinymce.plugins.AutolinkPlugin)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/autolink/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/autolink/editor_plugin_src.js
index 5b61f7a20..50e6eecca 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/autolink/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/autolink/editor_plugin_src.js
@@ -63,7 +63,7 @@
 			// hence, at minimum, five characters from the beginning of the line.
 			r = ed.selection.getRng(true).cloneRange();
 			if (r.startOffset < 5) {
-				// During testing, the caret is placed inbetween two text nodes. 
+				// During testing, the caret is placed inbetween two text nodes.
 				// The previous text node contains the URL.
 				prev = r.endContainer.previousSibling;
 				if (prev == null) {
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/autoresize/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/autoresize/editor_plugin.js
index 46d9dc3dd..ff8ff6d68 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/autoresize/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/autoresize/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.AutoResizePlugin",{init:function(a,c){var d=this,e=0;if(a.getParam("fullscreen_is_enabled")){return}function b(){var j,i=a.getDoc(),f=i.body,l=i.documentElement,h=tinymce.DOM,k=d.autoresize_min_height,g;g=tinymce.isIE?f.scrollHeight:(tinymce.isWebKit&&f.clientHeight==0?0:f.offsetHeight);if(g>d.autoresize_min_height){k=g}if(d.autoresize_max_height&&g>d.autoresize_max_height){k=d.autoresize_max_height;f.style.overflowY="auto";l.style.overflowY="auto"}else{f.style.overflowY="hidden";l.style.overflowY="hidden";f.scrollTop=0}if(k!==e){j=k-e;h.setStyle(h.get(a.id+"_ifr"),"height",k+"px");e=k;if(tinymce.isWebKit&&j<0){b()}}}d.editor=a;d.autoresize_min_height=parseInt(a.getParam("autoresize_min_height",a.getElement().offsetHeight));d.autoresize_max_height=parseInt(a.getParam("autoresize_max_height",0));a.onInit.add(function(f){f.dom.setStyle(f.getBody(),"paddingBottom",f.getParam("autoresize_bottom_margin",50)+"px")});a.onChange.add(b);a.onSetContent.add(b);a.onPaste.add(b);a.onKeyUp.add(b);a.onPostRender.add(b);if(a.getParam("autoresize_on_init",true)){a.onLoad.add(b);a.onLoadContent.add(b)}a.addCommand("mceAutoResize",b)},getInfo:function(){return{longname:"Auto Resize",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autoresize",tinymce.plugins.AutoResizePlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.AutoResizePlugin",{init:function(a,c){var d=this,e=0;if(a.getParam("fullscreen_is_enabled")){return}function b(){var j,i=a.getDoc(),f=i.body,l=i.documentElement,h=tinymce.DOM,k=d.autoresize_min_height,g;g=tinymce.isIE?f.scrollHeight:(tinymce.isWebKit&&f.clientHeight==0?0:f.offsetHeight);if(g>d.autoresize_min_height){k=g}if(d.autoresize_max_height&&g>d.autoresize_max_height){k=d.autoresize_max_height;f.style.overflowY="auto";l.style.overflowY="auto"}else{f.style.overflowY="hidden";l.style.overflowY="hidden";f.scrollTop=0}if(k!==e){j=k-e;h.setStyle(h.get(a.id+"_ifr"),"height",k+"px");e=k;if(tinymce.isWebKit&&j<0){b()}}}d.editor=a;d.autoresize_min_height=parseInt(a.getParam("autoresize_min_height",a.getElement().offsetHeight));d.autoresize_max_height=parseInt(a.getParam("autoresize_max_height",0));a.onInit.add(function(f){f.dom.setStyle(f.getBody(),"paddingBottom",f.getParam("autoresize_bottom_margin",50)+"px")});a.onChange.add(b);a.onSetContent.add(b);a.onPaste.add(b);a.onKeyUp.add(b);a.onPostRender.add(b);if(a.getParam("autoresize_on_init",true)){a.onLoad.add(b);a.onLoadContent.add(b)}a.addCommand("mceAutoResize",b)},getInfo:function(){return{longname:"Auto Resize",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autoresize",tinymce.plugins.AutoResizePlugin)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/autosave/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/autosave/editor_plugin.js
index 6da98ff33..fd647920f 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/autosave/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/autosave/editor_plugin.js
@@ -1 +1 @@
-(function(e){var c="autosave",g="restoredraft",b=true,f,d,a=e.util.Dispatcher;e.create("tinymce.plugins.AutoSave",{init:function(i,j){var h=this,l=i.settings;h.editor=i;function k(n){var m={s:1000,m:60000};n=/^(\d+)([ms]?)$/.exec(""+n);return(n[2]?m[n[2]]:1)*parseInt(n)}e.each({ask_before_unload:b,interval:"30s",retention:"20m",minlength:50},function(n,m){m=c+"_"+m;if(l[m]===f){l[m]=n}});l.autosave_interval=k(l.autosave_interval);l.autosave_retention=k(l.autosave_retention);i.addButton(g,{title:c+".restore_content",onclick:function(){if(i.getContent({draft:true}).replace(/\s|&nbsp;|<\/?p[^>]*>|<br[^>]*>/gi,"").length>0){i.windowManager.confirm(c+".warning_message",function(m){if(m){h.restoreDraft()}})}else{h.restoreDraft()}}});i.onNodeChange.add(function(){var m=i.controlManager;if(m.get(g)){m.setDisabled(g,!h.hasDraft())}});i.onInit.add(function(){if(i.controlManager.get(g)){h.setupStorage(i);setInterval(function(){if(!i.removed){h.storeDraft();i.nodeChanged()}},l.autosave_interval)}});h.onStoreDraft=new a(h);h.onRestoreDraft=new a(h);h.onRemoveDraft=new a(h);if(!d){window.onbeforeunload=e.plugins.AutoSave._beforeUnloadHandler;d=b}},getInfo:function(){return{longname:"Auto save",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave",version:e.majorVersion+"."+e.minorVersion}},getExpDate:function(){return new Date(new Date().getTime()+this.editor.settings.autosave_retention).toUTCString()},setupStorage:function(i){var h=this,k=c+"_test",j="OK";h.key=c+i.id;e.each([function(){if(localStorage){localStorage.setItem(k,j);if(localStorage.getItem(k)===j){localStorage.removeItem(k);return localStorage}}},function(){if(sessionStorage){sessionStorage.setItem(k,j);if(sessionStorage.getItem(k)===j){sessionStorage.removeItem(k);return sessionStorage}}},function(){if(e.isIE){i.getElement().style.behavior="url('#default#userData')";return{autoExpires:b,setItem:function(l,n){var m=i.getElement();m.setAttribute(l,n);m.expires=h.getExpDate();try{m.save("TinyMCE")}catch(o){}},getItem:function(l){var m=i.getElement();try{m.load("TinyMCE");return m.getAttribute(l)}catch(n){return null}},removeItem:function(l){i.getElement().removeAttribute(l)}}}},],function(l){try{h.storage=l();if(h.storage){return false}}catch(m){}})},storeDraft:function(){var i=this,l=i.storage,j=i.editor,h,k;if(l){if(!l.getItem(i.key)&&!j.isDirty()){return}k=j.getContent({draft:true});if(k.length>j.settings.autosave_minlength){h=i.getExpDate();if(!i.storage.autoExpires){i.storage.setItem(i.key+"_expires",h)}i.storage.setItem(i.key,k);i.onStoreDraft.dispatch(i,{expires:h,content:k})}}},restoreDraft:function(){var h=this,j=h.storage,i;if(j){i=j.getItem(h.key);if(i){h.editor.setContent(i);h.onRestoreDraft.dispatch(h,{content:i})}}},hasDraft:function(){var h=this,k=h.storage,i,j;if(k){j=!!k.getItem(h.key);if(j){if(!h.storage.autoExpires){i=new Date(k.getItem(h.key+"_expires"));if(new Date().getTime()<i.getTime()){return b}h.removeDraft()}else{return b}}}return false},removeDraft:function(){var h=this,k=h.storage,i=h.key,j;if(k){j=k.getItem(i);k.removeItem(i);k.removeItem(i+"_expires");if(j){h.onRemoveDraft.dispatch(h,{content:j})}}},"static":{_beforeUnloadHandler:function(h){var i;e.each(tinyMCE.editors,function(j){if(j.plugins.autosave){j.plugins.autosave.storeDraft()}if(j.getParam("fullscreen_is_enabled")){return}if(!i&&j.isDirty()&&j.getParam("autosave_ask_before_unload")){i=j.getLang("autosave.unload_msg")}});return i}}});e.PluginManager.add("autosave",e.plugins.AutoSave)})(tinymce);
\ No newline at end of file
+(function(e){var c="autosave",g="restoredraft",b=true,f,d,a=e.util.Dispatcher;e.create("tinymce.plugins.AutoSave",{init:function(i,j){var h=this,l=i.settings;h.editor=i;function k(n){var m={s:1000,m:60000};n=/^(\d+)([ms]?)$/.exec(""+n);return(n[2]?m[n[2]]:1)*parseInt(n)}e.each({ask_before_unload:b,interval:"30s",retention:"20m",minlength:50},function(n,m){m=c+"_"+m;if(l[m]===f){l[m]=n}});l.autosave_interval=k(l.autosave_interval);l.autosave_retention=k(l.autosave_retention);i.addButton(g,{title:c+".restore_content",onclick:function(){if(i.getContent({draft:true}).replace(/\s|&nbsp;|<\/?p[^>]*>|<br[^>]*>/gi,"").length>0){i.windowManager.confirm(c+".warning_message",function(m){if(m){h.restoreDraft()}})}else{h.restoreDraft()}}});i.onNodeChange.add(function(){var m=i.controlManager;if(m.get(g)){m.setDisabled(g,!h.hasDraft())}});i.onInit.add(function(){if(i.controlManager.get(g)){h.setupStorage(i);setInterval(function(){if(!i.removed){h.storeDraft();i.nodeChanged()}},l.autosave_interval)}});h.onStoreDraft=new a(h);h.onRestoreDraft=new a(h);h.onRemoveDraft=new a(h);if(!d){window.onbeforeunload=e.plugins.AutoSave._beforeUnloadHandler;d=b}},getInfo:function(){return{longname:"Auto save",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave",version:e.majorVersion+"."+e.minorVersion}},getExpDate:function(){return new Date(new Date().getTime()+this.editor.settings.autosave_retention).toUTCString()},setupStorage:function(i){var h=this,k=c+"_test",j="OK";h.key=c+i.id;e.each([function(){if(localStorage){localStorage.setItem(k,j);if(localStorage.getItem(k)===j){localStorage.removeItem(k);return localStorage}}},function(){if(sessionStorage){sessionStorage.setItem(k,j);if(sessionStorage.getItem(k)===j){sessionStorage.removeItem(k);return sessionStorage}}},function(){if(e.isIE){i.getElement().style.behavior="url('#default#userData')";return{autoExpires:b,setItem:function(l,n){var m=i.getElement();m.setAttribute(l,n);m.expires=h.getExpDate();try{m.save("TinyMCE")}catch(o){}},getItem:function(l){var m=i.getElement();try{m.load("TinyMCE");return m.getAttribute(l)}catch(n){return null}},removeItem:function(l){i.getElement().removeAttribute(l)}}}},],function(l){try{h.storage=l();if(h.storage){return false}}catch(m){}})},storeDraft:function(){var i=this,l=i.storage,j=i.editor,h,k;if(l){if(!l.getItem(i.key)&&!j.isDirty()){return}k=j.getContent({draft:true});if(k.length>j.settings.autosave_minlength){h=i.getExpDate();if(!i.storage.autoExpires){i.storage.setItem(i.key+"_expires",h)}i.storage.setItem(i.key,k);i.onStoreDraft.dispatch(i,{expires:h,content:k})}}},restoreDraft:function(){var h=this,j=h.storage,i;if(j){i=j.getItem(h.key);if(i){h.editor.setContent(i);h.onRestoreDraft.dispatch(h,{content:i})}}},hasDraft:function(){var h=this,k=h.storage,i,j;if(k){j=!!k.getItem(h.key);if(j){if(!h.storage.autoExpires){i=new Date(k.getItem(h.key+"_expires"));if(new Date().getTime()<i.getTime()){return b}h.removeDraft()}else{return b}}}return false},removeDraft:function(){var h=this,k=h.storage,i=h.key,j;if(k){j=k.getItem(i);k.removeItem(i);k.removeItem(i+"_expires");if(j){h.onRemoveDraft.dispatch(h,{content:j})}}},"static":{_beforeUnloadHandler:function(h){var i;e.each(tinyMCE.editors,function(j){if(j.plugins.autosave){j.plugins.autosave.storeDraft()}if(j.getParam("fullscreen_is_enabled")){return}if(!i&&j.isDirty()&&j.getParam("autosave_ask_before_unload")){i=j.getLang("autosave.unload_msg")}});return i}}});e.PluginManager.add("autosave",e.plugins.AutoSave)})(tinymce);
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/autosave/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/autosave/editor_plugin_src.js
index b5c845bce..20891c44b 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/autosave/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/autosave/editor_plugin_src.js
@@ -12,11 +12,11 @@
  * and that project can be found here: http://code.google.com/p/tinyautosave/
  *
  * TECHNOLOGY DISCUSSION:
- * 
+ *
  * The plugin attempts to use the most advanced features available in the current browser to save
  * as much content as possible.  There are a total of four different methods used to autosave the
  * content.  In order of preference, they are:
- * 
+ *
  * 1. localStorage - A new feature of HTML 5, localStorage can store megabytes of data per domain
  * on the client computer. Data stored in the localStorage area has no expiration date, so we must
  * manage expiring the data ourselves.  localStorage is fully supported by IE8, and it is supposed
@@ -24,14 +24,14 @@
  * HTML 5 gets wider support, the AutoSave plugin will use it automatically. In Windows Vista/7,
  * localStorage is stored in the following folder:
  * C:\Users\[username]\AppData\Local\Microsoft\Internet Explorer\DOMStore\[tempFolder]
- * 
+ *
  * 2. sessionStorage - A new feature of HTML 5, sessionStorage works similarly to localStorage,
  * except it is designed to expire after a certain amount of time.  Because the specification
  * around expiration date/time is very loosely-described, it is preferrable to use locaStorage and
  * manage the expiration ourselves.  sessionStorage has similar storage characteristics to
  * localStorage, although it seems to have better support by Firefox 3 at the moment.  (That will
  * certainly change as Firefox continues getting better at HTML 5 adoption.)
- * 
+ *
  * 3. UserData - A very under-exploited feature of Microsoft Internet Explorer, UserData is a
  * way to store up to 128K of data per "document", or up to 1MB of data per domain, on the client
  * computer.  The feature is available for IE 5+, which makes it available for every version of IE
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/bbcode/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/bbcode/editor_plugin.js
index 8f8821fd6..f6d43ca24 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/bbcode/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/bbcode/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(a,b){var d=this,c=a.getParam("bbcode_dialect","punbb").toLowerCase();a.onBeforeSetContent.add(function(e,f){f.content=d["_"+c+"_bbcode2html"](f.content)});a.onPostProcess.add(function(e,f){if(f.set){f.content=d["_"+c+"_bbcode2html"](f.content)}if(f.get){f.content=d["_"+c+"_html2bbcode"](f.content)}})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_punbb_html2bbcode:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");b(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");b(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");b(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");b(/<font>(.*?)<\/font>/gi,"$1");b(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");b(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");b(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");b(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");b(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");b(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");b(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");b(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");b(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");b(/<\/(strong|b)>/gi,"[/b]");b(/<(strong|b)>/gi,"[b]");b(/<\/(em|i)>/gi,"[/i]");b(/<(em|i)>/gi,"[i]");b(/<\/u>/gi,"[/u]");b(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");b(/<u>/gi,"[u]");b(/<blockquote[^>]*>/gi,"[quote]");b(/<\/blockquote>/gi,"[/quote]");b(/<br \/>/gi,"\n");b(/<br\/>/gi,"\n");b(/<br>/gi,"\n");b(/<p>/gi,"");b(/<\/p>/gi,"\n");b(/&nbsp;|\u00a0/gi," ");b(/&quot;/gi,'"');b(/&lt;/gi,"<");b(/&gt;/gi,">");b(/&amp;/gi,"&");return a},_punbb_bbcode2html:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/\n/gi,"<br />");b(/\[b\]/gi,"<strong>");b(/\[\/b\]/gi,"</strong>");b(/\[i\]/gi,"<em>");b(/\[\/i\]/gi,"</em>");b(/\[u\]/gi,"<u>");b(/\[\/u\]/gi,"</u>");b(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'<a href="$1">$2</a>');b(/\[url\](.*?)\[\/url\]/gi,'<a href="$1">$1</a>');b(/\[img\](.*?)\[\/img\]/gi,'<img src="$1" />');b(/\[color=(.*?)\](.*?)\[\/color\]/gi,'<font color="$1">$2</font>');b(/\[code\](.*?)\[\/code\]/gi,'<span class="codeStyle">$1</span>&nbsp;');b(/\[quote.*?\](.*?)\[\/quote\]/gi,'<span class="quoteStyle">$1</span>&nbsp;');return a}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(a,b){var d=this,c=a.getParam("bbcode_dialect","punbb").toLowerCase();a.onBeforeSetContent.add(function(e,f){f.content=d["_"+c+"_bbcode2html"](f.content)});a.onPostProcess.add(function(e,f){if(f.set){f.content=d["_"+c+"_bbcode2html"](f.content)}if(f.get){f.content=d["_"+c+"_html2bbcode"](f.content)}})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_punbb_html2bbcode:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");b(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");b(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");b(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");b(/<font>(.*?)<\/font>/gi,"$1");b(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");b(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");b(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");b(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");b(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");b(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");b(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");b(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");b(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");b(/<\/(strong|b)>/gi,"[/b]");b(/<(strong|b)>/gi,"[b]");b(/<\/(em|i)>/gi,"[/i]");b(/<(em|i)>/gi,"[i]");b(/<\/u>/gi,"[/u]");b(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");b(/<u>/gi,"[u]");b(/<blockquote[^>]*>/gi,"[quote]");b(/<\/blockquote>/gi,"[/quote]");b(/<br \/>/gi,"\n");b(/<br\/>/gi,"\n");b(/<br>/gi,"\n");b(/<p>/gi,"");b(/<\/p>/gi,"\n");b(/&nbsp;|\u00a0/gi," ");b(/&quot;/gi,'"');b(/&lt;/gi,"<");b(/&gt;/gi,">");b(/&amp;/gi,"&");return a},_punbb_bbcode2html:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/\n/gi,"<br />");b(/\[b\]/gi,"<strong>");b(/\[\/b\]/gi,"</strong>");b(/\[i\]/gi,"<em>");b(/\[\/i\]/gi,"</em>");b(/\[u\]/gi,"<u>");b(/\[\/u\]/gi,"</u>");b(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'<a href="$1">$2</a>');b(/\[url\](.*?)\[\/url\]/gi,'<a href="$1">$1</a>');b(/\[img\](.*?)\[\/img\]/gi,'<img src="$1" />');b(/\[color=(.*?)\](.*?)\[\/color\]/gi,'<font color="$1">$2</font>');b(/\[code\](.*?)\[\/code\]/gi,'<span class="codeStyle">$1</span>&nbsp;');b(/\[quote.*?\](.*?)\[\/quote\]/gi,'<span class="quoteStyle">$1</span>&nbsp;');return a}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/bbcode/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/bbcode/editor_plugin_src.js
index 12cdacaa5..ea90ae9b3 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/bbcode/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/bbcode/editor_plugin_src.js
@@ -85,7 +85,7 @@
 			rep(/&gt;/gi,">");
 			rep(/&amp;/gi,"&");
 
-			return s; 
+			return s;
 		},
 
 		// BBCode -> HTML from PunBB dialect
@@ -111,10 +111,10 @@
 			rep(/\[code\](.*?)\[\/code\]/gi,"<span class=\"codeStyle\">$1</span>&nbsp;");
 			rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<span class=\"quoteStyle\">$1</span>&nbsp;");
 
-			return s; 
+			return s;
 		}
 	});
 
 	// Register plugin
 	tinymce.PluginManager.add('bbcode', tinymce.plugins.BBCodePlugin);
-})();
\ No newline at end of file
+})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/contextmenu/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/contextmenu/editor_plugin.js
index 2ed042c3a..0810d023d 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/contextmenu/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/contextmenu/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.dom.Event,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.ContextMenu",{init:function(f){var i=this,g,d,j,e;i.editor=f;d=f.settings.contextmenu_never_use_native;i.onContextMenu=new tinymce.util.Dispatcher(this);e=function(k){h(f,k)};g=f.onContextMenu.add(function(k,l){if((j!==0?j:l.ctrlKey)&&!d){return}a.cancel(l);if(l.target.nodeName=="IMG"){k.selection.select(l.target)}i._getMenu(k).showMenu(l.clientX||l.pageX,l.clientY||l.pageY);a.add(k.getDoc(),"click",e);k.nodeChanged()});f.onRemove.add(function(){if(i._menu){i._menu.removeAll()}});function h(k,l){j=0;if(l&&l.button==2){j=l.ctrlKey;return}if(i._menu){i._menu.removeAll();i._menu.destroy();a.remove(k.getDoc(),"click",e);i._menu=null}}f.onMouseDown.add(h);f.onKeyDown.add(h);f.onKeyDown.add(function(k,l){if(l.shiftKey&&!l.ctrlKey&&!l.altKey&&l.keyCode===121){a.cancel(l);g(k,l)}})},getInfo:function(){return{longname:"Contextmenu",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_getMenu:function(e){var g=this,d=g._menu,j=e.selection,f=j.isCollapsed(),h=j.getNode()||e.getBody(),i,k;if(d){d.removeAll();d.destroy()}k=b.getPos(e.getContentAreaContainer());d=e.controlManager.createDropMenu("contextmenu",{offset_x:k.x+e.getParam("contextmenu_offset_x",0),offset_y:k.y+e.getParam("contextmenu_offset_y",0),constrain:1,keyboard_focus:true});g._menu=d;d.add({title:"advanced.cut_desc",icon:"cut",cmd:"Cut"}).setDisabled(f);d.add({title:"advanced.copy_desc",icon:"copy",cmd:"Copy"}).setDisabled(f);d.add({title:"advanced.paste_desc",icon:"paste",cmd:"Paste"});if((h.nodeName=="A"&&!e.dom.getAttrib(h,"name"))||!f){d.addSeparator();d.add({title:"advanced.link_desc",icon:"link",cmd:e.plugins.advlink?"mceAdvLink":"mceLink",ui:true});d.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"})}d.addSeparator();d.add({title:"advanced.image_desc",icon:"image",cmd:e.plugins.advimage?"mceAdvImage":"mceImage",ui:true});d.addSeparator();i=d.addMenu({title:"contextmenu.align"});i.add({title:"contextmenu.left",icon:"justifyleft",cmd:"JustifyLeft"});i.add({title:"contextmenu.center",icon:"justifycenter",cmd:"JustifyCenter"});i.add({title:"contextmenu.right",icon:"justifyright",cmd:"JustifyRight"});i.add({title:"contextmenu.full",icon:"justifyfull",cmd:"JustifyFull"});g.onContextMenu.dispatch(g,d,h,f);return d}});tinymce.PluginManager.add("contextmenu",tinymce.plugins.ContextMenu)})();
\ No newline at end of file
+(function(){var a=tinymce.dom.Event,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.ContextMenu",{init:function(f){var i=this,g,d,j,e;i.editor=f;d=f.settings.contextmenu_never_use_native;i.onContextMenu=new tinymce.util.Dispatcher(this);e=function(k){h(f,k)};g=f.onContextMenu.add(function(k,l){if((j!==0?j:l.ctrlKey)&&!d){return}a.cancel(l);if(l.target.nodeName=="IMG"){k.selection.select(l.target)}i._getMenu(k).showMenu(l.clientX||l.pageX,l.clientY||l.pageY);a.add(k.getDoc(),"click",e);k.nodeChanged()});f.onRemove.add(function(){if(i._menu){i._menu.removeAll()}});function h(k,l){j=0;if(l&&l.button==2){j=l.ctrlKey;return}if(i._menu){i._menu.removeAll();i._menu.destroy();a.remove(k.getDoc(),"click",e);i._menu=null}}f.onMouseDown.add(h);f.onKeyDown.add(h);f.onKeyDown.add(function(k,l){if(l.shiftKey&&!l.ctrlKey&&!l.altKey&&l.keyCode===121){a.cancel(l);g(k,l)}})},getInfo:function(){return{longname:"Contextmenu",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_getMenu:function(e){var g=this,d=g._menu,j=e.selection,f=j.isCollapsed(),h=j.getNode()||e.getBody(),i,k;if(d){d.removeAll();d.destroy()}k=b.getPos(e.getContentAreaContainer());d=e.controlManager.createDropMenu("contextmenu",{offset_x:k.x+e.getParam("contextmenu_offset_x",0),offset_y:k.y+e.getParam("contextmenu_offset_y",0),constrain:1,keyboard_focus:true});g._menu=d;d.add({title:"advanced.cut_desc",icon:"cut",cmd:"Cut"}).setDisabled(f);d.add({title:"advanced.copy_desc",icon:"copy",cmd:"Copy"}).setDisabled(f);d.add({title:"advanced.paste_desc",icon:"paste",cmd:"Paste"});if((h.nodeName=="A"&&!e.dom.getAttrib(h,"name"))||!f){d.addSeparator();d.add({title:"advanced.link_desc",icon:"link",cmd:e.plugins.advlink?"mceAdvLink":"mceLink",ui:true});d.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"})}d.addSeparator();d.add({title:"advanced.image_desc",icon:"image",cmd:e.plugins.advimage?"mceAdvImage":"mceImage",ui:true});d.addSeparator();i=d.addMenu({title:"contextmenu.align"});i.add({title:"contextmenu.left",icon:"justifyleft",cmd:"JustifyLeft"});i.add({title:"contextmenu.center",icon:"justifycenter",cmd:"JustifyCenter"});i.add({title:"contextmenu.right",icon:"justifyright",cmd:"JustifyRight"});i.add({title:"contextmenu.full",icon:"justifyfull",cmd:"JustifyFull"});g.onContextMenu.dispatch(g,d,h,f);return d}});tinymce.PluginManager.add("contextmenu",tinymce.plugins.ContextMenu)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/contextmenu/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/contextmenu/editor_plugin_src.js
index 237cbf5b0..cef571409 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/contextmenu/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/contextmenu/editor_plugin_src.js
@@ -62,7 +62,7 @@
 
 				ed.nodeChanged();
 			});
-			
+
 			ed.onRemove.add(function() {
 				if (t._menu)
 					t._menu.removeAll();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/directionality/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/directionality/editor_plugin.js
index 90847e78e..cbae8e46e 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/directionality/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/directionality/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.Directionality",{init:function(b,c){var d=this;d.editor=b;function a(e){var h=b.dom,g,f=b.selection.getSelectedBlocks();if(f.length){g=h.getAttrib(f[0],"dir");tinymce.each(f,function(i){if(!h.getParent(i.parentNode,"*[dir='"+e+"']",h.getRoot())){if(g!=e){h.setAttrib(i,"dir",e)}else{h.setAttrib(i,"dir",null)}}});b.nodeChanged()}}b.addCommand("mceDirectionLTR",function(){a("ltr")});b.addCommand("mceDirectionRTL",function(){a("rtl")});b.addButton("ltr",{title:"directionality.ltr_desc",cmd:"mceDirectionLTR"});b.addButton("rtl",{title:"directionality.rtl_desc",cmd:"mceDirectionRTL"});b.onNodeChange.add(d._nodeChange,d)},getInfo:function(){return{longname:"Directionality",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,e){var d=b.dom,c;e=d.getParent(e,d.isBlock);if(!e){a.setDisabled("ltr",1);a.setDisabled("rtl",1);return}c=d.getAttrib(e,"dir");a.setActive("ltr",c=="ltr");a.setDisabled("ltr",0);a.setActive("rtl",c=="rtl");a.setDisabled("rtl",0)}});tinymce.PluginManager.add("directionality",tinymce.plugins.Directionality)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.Directionality",{init:function(b,c){var d=this;d.editor=b;function a(e){var h=b.dom,g,f=b.selection.getSelectedBlocks();if(f.length){g=h.getAttrib(f[0],"dir");tinymce.each(f,function(i){if(!h.getParent(i.parentNode,"*[dir='"+e+"']",h.getRoot())){if(g!=e){h.setAttrib(i,"dir",e)}else{h.setAttrib(i,"dir",null)}}});b.nodeChanged()}}b.addCommand("mceDirectionLTR",function(){a("ltr")});b.addCommand("mceDirectionRTL",function(){a("rtl")});b.addButton("ltr",{title:"directionality.ltr_desc",cmd:"mceDirectionLTR"});b.addButton("rtl",{title:"directionality.rtl_desc",cmd:"mceDirectionRTL"});b.onNodeChange.add(d._nodeChange,d)},getInfo:function(){return{longname:"Directionality",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,e){var d=b.dom,c;e=d.getParent(e,d.isBlock);if(!e){a.setDisabled("ltr",1);a.setDisabled("rtl",1);return}c=d.getAttrib(e,"dir");a.setActive("ltr",c=="ltr");a.setDisabled("ltr",0);a.setActive("rtl",c=="rtl");a.setDisabled("rtl",0)}});tinymce.PluginManager.add("directionality",tinymce.plugins.Directionality)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/directionality/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/directionality/editor_plugin_src.js
index c90732bbd..dce811b73 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/directionality/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/directionality/editor_plugin_src.js
@@ -82,4 +82,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('directionality', tinymce.plugins.Directionality);
-})();
\ No newline at end of file
+})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/emotions/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/emotions/editor_plugin.js
index dbdd8ffb5..bc4590f3d 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/emotions/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/emotions/editor_plugin.js
@@ -1 +1 @@
-(function(a){a.create("tinymce.plugins.EmotionsPlugin",{init:function(b,c){b.addCommand("mceEmotion",function(){b.windowManager.open({file:c+"/emotions.htm",width:250+parseInt(b.getLang("emotions.delta_width",0)),height:160+parseInt(b.getLang("emotions.delta_height",0)),inline:1},{plugin_url:c})});b.addButton("emotions",{title:"emotions.emotions_desc",cmd:"mceEmotion"})},getInfo:function(){return{longname:"Emotions",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/emotions",version:a.majorVersion+"."+a.minorVersion}}});a.PluginManager.add("emotions",a.plugins.EmotionsPlugin)})(tinymce);
\ No newline at end of file
+(function(a){a.create("tinymce.plugins.EmotionsPlugin",{init:function(b,c){b.addCommand("mceEmotion",function(){b.windowManager.open({file:c+"/emotions.htm",width:250+parseInt(b.getLang("emotions.delta_width",0)),height:160+parseInt(b.getLang("emotions.delta_height",0)),inline:1},{plugin_url:c})});b.addButton("emotions",{title:"emotions.emotions_desc",cmd:"mceEmotion"})},getInfo:function(){return{longname:"Emotions",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/emotions",version:a.majorVersion+"."+a.minorVersion}}});a.PluginManager.add("emotions",a.plugins.EmotionsPlugin)})(tinymce);
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/emotions/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/emotions/editor_plugin_src.js
index aeee199d2..f3a898376 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/emotions/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/emotions/editor_plugin_src.js
@@ -40,4 +40,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('emotions', tinymce.plugins.EmotionsPlugin);
-})(tinymce);
\ No newline at end of file
+})(tinymce);
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/emotions/js/emotions.js b/webapp/src/main/webapp/js/tiny_mce/plugins/emotions/js/emotions.js
index f73516c83..74d2a2066 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/emotions/js/emotions.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/emotions/js/emotions.js
@@ -3,9 +3,9 @@ tinyMCEPopup.requireLangPack();
 var EmotionsDialog = {
 	addKeyboardNavigation: function(){
 		var tableElm, cells, settings;
-			
+
 		cells = tinyMCEPopup.dom.select("a.emoticon_link", "emoticon_table");
-			
+
 		settings ={
 			root: "emoticon_table",
 			items: cells
@@ -13,14 +13,14 @@ var EmotionsDialog = {
 		cells[0].tabindex=0;
 		tinyMCEPopup.dom.addClass(cells[0], "mceFocus");
 		if (tinymce.isGecko) {
-			cells[0].focus();		
+			cells[0].focus();
 		} else {
 			setTimeout(function(){
 				cells[0].focus();
 			}, 100);
 		}
 		tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', settings, tinyMCEPopup.dom);
-	}, 
+	},
 	init : function(ed) {
 		tinyMCEPopup.resizeToInnerSize();
 		this.addKeyboardNavigation();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/example/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/example/editor_plugin.js
index ec1f81ea4..835b94284 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/example/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/example/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.PluginManager.requireLangPack("example");tinymce.create("tinymce.plugins.ExamplePlugin",{init:function(a,b){a.addCommand("mceExample",function(){a.windowManager.open({file:b+"/dialog.htm",width:320+parseInt(a.getLang("example.delta_width",0)),height:120+parseInt(a.getLang("example.delta_height",0)),inline:1},{plugin_url:b,some_custom_arg:"custom arg"})});a.addButton("example",{title:"example.desc",cmd:"mceExample",image:b+"/img/example.gif"});a.onNodeChange.add(function(d,c,e){c.setActive("example",e.nodeName=="IMG")})},createControl:function(b,a){return null},getInfo:function(){return{longname:"Example plugin",author:"Some author",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example",version:"1.0"}}});tinymce.PluginManager.add("example",tinymce.plugins.ExamplePlugin)})();
\ No newline at end of file
+(function(){tinymce.PluginManager.requireLangPack("example");tinymce.create("tinymce.plugins.ExamplePlugin",{init:function(a,b){a.addCommand("mceExample",function(){a.windowManager.open({file:b+"/dialog.htm",width:320+parseInt(a.getLang("example.delta_width",0)),height:120+parseInt(a.getLang("example.delta_height",0)),inline:1},{plugin_url:b,some_custom_arg:"custom arg"})});a.addButton("example",{title:"example.desc",cmd:"mceExample",image:b+"/img/example.gif"});a.onNodeChange.add(function(d,c,e){c.setActive("example",e.nodeName=="IMG")})},createControl:function(b,a){return null},getInfo:function(){return{longname:"Example plugin",author:"Some author",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example",version:"1.0"}}});tinymce.PluginManager.add("example",tinymce.plugins.ExamplePlugin)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/example/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/example/editor_plugin_src.js
index bd805e637..4c12fa429 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/example/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/example/editor_plugin_src.js
@@ -81,4 +81,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('example', tinymce.plugins.ExamplePlugin);
-})();
\ No newline at end of file
+})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/example_dependency/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/example_dependency/editor_plugin.js
index 0a4551d38..639812c93 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/example_dependency/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/example_dependency/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.ExampleDependencyPlugin",{init:function(a,b){},getInfo:function(){return{longname:"Example Dependency plugin",author:"Some author",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example_dependency",version:"1.0"}}});tinymce.PluginManager.add("example_dependency",tinymce.plugins.ExampleDependencyPlugin,["example"])})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.ExampleDependencyPlugin",{init:function(a,b){},getInfo:function(){return{longname:"Example Dependency plugin",author:"Some author",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example_dependency",version:"1.0"}}});tinymce.PluginManager.add("example_dependency",tinymce.plugins.ExampleDependencyPlugin,["example"])})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/css/fullpage.css b/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/css/fullpage.css
index 28b721f9b..c88b67975 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/css/fullpage.css
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/css/fullpage.css
@@ -16,7 +16,7 @@
 }
 
 #bgimage {
-	width: 220px;	
+	width: 220px;
 }
 
 #fontface {
@@ -140,4 +140,4 @@ textarea {
 	height: 55px;
 }
 
-.panel_wrapper div.current {height:420px;}
\ No newline at end of file
+.panel_wrapper div.current {height:420px;}
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/editor_plugin.js
index dcf76024d..8e4c11b43 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/editor_plugin.js
@@ -1 +1 @@
-(function(){var b=tinymce.each,a=tinymce.html.Node;tinymce.create("tinymce.plugins.FullPagePlugin",{init:function(c,d){var e=this;e.editor=c;c.addCommand("mceFullPageProperties",function(){c.windowManager.open({file:d+"/fullpage.htm",width:430+parseInt(c.getLang("fullpage.delta_width",0)),height:495+parseInt(c.getLang("fullpage.delta_height",0)),inline:1},{plugin_url:d,data:e._htmlToData()})});c.addButton("fullpage",{title:"fullpage.desc",cmd:"mceFullPageProperties"});c.onBeforeSetContent.add(e._setContent,e);c.onGetContent.add(e._getContent,e)},getInfo:function(){return{longname:"Fullpage",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullpage",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_htmlToData:function(){var f=this._parseHeader(),h={},c,i,g,e=this.editor;function d(l,j){var k=l.attr(j);return k||""}h.fontface=e.getParam("fullpage_default_fontface","");h.fontsize=e.getParam("fullpage_default_fontsize","");i=f.firstChild;if(i.type==7){h.xml_pi=true;g=/encoding="([^"]+)"/.exec(i.value);if(g){h.docencoding=g[1]}}i=f.getAll("#doctype")[0];if(i){h.doctype="<!DOCTYPE"+i.value+">"}i=f.getAll("title")[0];if(i&&i.firstChild){h.metatitle=i.firstChild.value}b(f.getAll("meta"),function(m){var k=m.attr("name"),j=m.attr("http-equiv"),l;if(k){h["meta"+k.toLowerCase()]=m.attr("content")}else{if(j=="Content-Type"){l=/charset\s*=\s*(.*)\s*/gi.exec(m.attr("content"));if(l){h.docencoding=l[1]}}}});i=f.getAll("html")[0];if(i){h.langcode=d(i,"lang")||d(i,"xml:lang")}i=f.getAll("link")[0];if(i&&i.attr("rel")=="stylesheet"){h.stylesheet=i.attr("href")}i=f.getAll("body")[0];if(i){h.langdir=d(i,"dir");h.style=d(i,"style");h.visited_color=d(i,"vlink");h.link_color=d(i,"link");h.active_color=d(i,"alink")}return h},_dataToHtml:function(g){var f,d,h,j,k,e=this.editor.dom;function c(n,l,m){n.attr(l,m?m:undefined)}function i(l){if(d.firstChild){d.insert(l,d.firstChild)}else{d.append(l)}}f=this._parseHeader();d=f.getAll("head")[0];if(!d){j=f.getAll("html")[0];d=new a("head",1);if(j.firstChild){j.insert(d,j.firstChild,true)}else{j.append(d)}}j=f.firstChild;if(g.xml_pi){k='version="1.0"';if(g.docencoding){k+=' encoding="'+g.docencoding+'"'}if(j.type!=7){j=new a("xml",7);f.insert(j,f.firstChild,true)}j.value=k}else{if(j&&j.type==7){j.remove()}}j=f.getAll("#doctype")[0];if(g.doctype){if(!j){j=new a("#doctype",10);if(g.xml_pi){f.insert(j,f.firstChild)}else{i(j)}}j.value=g.doctype.substring(9,g.doctype.length-1)}else{if(j){j.remove()}}j=f.getAll("title")[0];if(g.metatitle){if(!j){j=new a("title",1);j.append(new a("#text",3)).value=g.metatitle;i(j)}}if(g.docencoding){j=null;b(f.getAll("meta"),function(l){if(l.attr("http-equiv")=="Content-Type"){j=l}});if(!j){j=new a("meta",1);j.attr("http-equiv","Content-Type");j.shortEnded=true;i(j)}j.attr("content","text/html; charset="+g.docencoding)}b("keywords,description,author,copyright,robots".split(","),function(m){var l=f.getAll("meta"),n,p,o=g["meta"+m];for(n=0;n<l.length;n++){p=l[n];if(p.attr("name")==m){if(o){p.attr("content",o)}else{p.remove()}return}}if(o){j=new a("meta",1);j.attr("name",m);j.attr("content",o);j.shortEnded=true;i(j)}});j=f.getAll("link")[0];if(j&&j.attr("rel")=="stylesheet"){if(g.stylesheet){j.attr("href",g.stylesheet)}else{j.remove()}}else{if(g.stylesheet){j=new a("link",1);j.attr({rel:"stylesheet",text:"text/css",href:g.stylesheet});j.shortEnded=true;i(j)}}j=f.getAll("body")[0];if(j){c(j,"dir",g.langdir);c(j,"style",g.style);c(j,"vlink",g.visited_color);c(j,"link",g.link_color);c(j,"alink",g.active_color);e.setAttribs(this.editor.getBody(),{style:g.style,dir:g.dir,vLink:g.visited_color,link:g.link_color,aLink:g.active_color})}j=f.getAll("html")[0];if(j){c(j,"lang",g.langcode);c(j,"xml:lang",g.langcode)}h=new tinymce.html.Serializer({validate:false,indent:true,apply_source_formatting:true,indent_before:"head,html,body,meta,title,script,link,style",indent_after:"head,html,body,meta,title,script,link,style"}).serialize(f);this.head=h.substring(0,h.indexOf("</body>"))},_parseHeader:function(){return new tinymce.html.DomParser({validate:false,root_name:"#document"}).parse(this.head)},_setContent:function(g,d){var m=this,i,c,h=d.content,f,l="",e=m.editor.dom,j;function k(n){return n.replace(/<\/?[A-Z]+/g,function(o){return o.toLowerCase()})}if(d.format=="raw"&&m.head){return}if(d.source_view&&g.getParam("fullpage_hide_in_source_view")){return}h=h.replace(/<(\/?)BODY/gi,"<$1body");i=h.indexOf("<body");if(i!=-1){i=h.indexOf(">",i);m.head=k(h.substring(0,i+1));c=h.indexOf("</body",i);if(c==-1){c=h.length}d.content=h.substring(i+1,c);m.foot=k(h.substring(c))}else{m.head=this._getDefaultHeader();m.foot="\n</body>\n</html>"}f=m._parseHeader();b(f.getAll("style"),function(n){if(n.firstChild){l+=n.firstChild.value}});j=f.getAll("body")[0];if(j){e.setAttribs(m.editor.getBody(),{style:j.attr("style")||"",dir:j.attr("dir")||"",vLink:j.attr("vlink")||"",link:j.attr("link")||"",aLink:j.attr("alink")||""})}e.remove("fullpage_styles");if(l){e.add(m.editor.getDoc().getElementsByTagName("head")[0],"style",{id:"fullpage_styles"},l);j=e.get("fullpage_styles");if(j.styleSheet){j.styleSheet.cssText=l}}},_getDefaultHeader:function(){var f="",c=this.editor,e,d="";if(c.getParam("fullpage_default_xml_pi")){f+='<?xml version="1.0" encoding="'+c.getParam("fullpage_default_encoding","ISO-8859-1")+'" ?>\n'}f+=c.getParam("fullpage_default_doctype",'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');f+="\n<html>\n<head>\n";if(e=c.getParam("fullpage_default_title")){f+="<title>"+e+"</title>\n"}if(e=c.getParam("fullpage_default_encoding")){f+='<meta http-equiv="Content-Type" content="text/html; charset='+e+'" />\n'}if(e=c.getParam("fullpage_default_font_family")){d+="font-family: "+e+";"}if(e=c.getParam("fullpage_default_font_size")){d+="font-size: "+e+";"}if(e=c.getParam("fullpage_default_text_color")){d+="color: "+e+";"}f+="</head>\n<body"+(d?' style="'+d+'"':"")+">\n";return f},_getContent:function(d,e){var c=this;if(!e.source_view||!d.getParam("fullpage_hide_in_source_view")){e.content=tinymce.trim(c.head)+"\n"+tinymce.trim(e.content)+"\n"+tinymce.trim(c.foot)}}});tinymce.PluginManager.add("fullpage",tinymce.plugins.FullPagePlugin)})();
\ No newline at end of file
+(function(){var b=tinymce.each,a=tinymce.html.Node;tinymce.create("tinymce.plugins.FullPagePlugin",{init:function(c,d){var e=this;e.editor=c;c.addCommand("mceFullPageProperties",function(){c.windowManager.open({file:d+"/fullpage.htm",width:430+parseInt(c.getLang("fullpage.delta_width",0)),height:495+parseInt(c.getLang("fullpage.delta_height",0)),inline:1},{plugin_url:d,data:e._htmlToData()})});c.addButton("fullpage",{title:"fullpage.desc",cmd:"mceFullPageProperties"});c.onBeforeSetContent.add(e._setContent,e);c.onGetContent.add(e._getContent,e)},getInfo:function(){return{longname:"Fullpage",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullpage",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_htmlToData:function(){var f=this._parseHeader(),h={},c,i,g,e=this.editor;function d(l,j){var k=l.attr(j);return k||""}h.fontface=e.getParam("fullpage_default_fontface","");h.fontsize=e.getParam("fullpage_default_fontsize","");i=f.firstChild;if(i.type==7){h.xml_pi=true;g=/encoding="([^"]+)"/.exec(i.value);if(g){h.docencoding=g[1]}}i=f.getAll("#doctype")[0];if(i){h.doctype="<!DOCTYPE"+i.value+">"}i=f.getAll("title")[0];if(i&&i.firstChild){h.metatitle=i.firstChild.value}b(f.getAll("meta"),function(m){var k=m.attr("name"),j=m.attr("http-equiv"),l;if(k){h["meta"+k.toLowerCase()]=m.attr("content")}else{if(j=="Content-Type"){l=/charset\s*=\s*(.*)\s*/gi.exec(m.attr("content"));if(l){h.docencoding=l[1]}}}});i=f.getAll("html")[0];if(i){h.langcode=d(i,"lang")||d(i,"xml:lang")}i=f.getAll("link")[0];if(i&&i.attr("rel")=="stylesheet"){h.stylesheet=i.attr("href")}i=f.getAll("body")[0];if(i){h.langdir=d(i,"dir");h.style=d(i,"style");h.visited_color=d(i,"vlink");h.link_color=d(i,"link");h.active_color=d(i,"alink")}return h},_dataToHtml:function(g){var f,d,h,j,k,e=this.editor.dom;function c(n,l,m){n.attr(l,m?m:undefined)}function i(l){if(d.firstChild){d.insert(l,d.firstChild)}else{d.append(l)}}f=this._parseHeader();d=f.getAll("head")[0];if(!d){j=f.getAll("html")[0];d=new a("head",1);if(j.firstChild){j.insert(d,j.firstChild,true)}else{j.append(d)}}j=f.firstChild;if(g.xml_pi){k='version="1.0"';if(g.docencoding){k+=' encoding="'+g.docencoding+'"'}if(j.type!=7){j=new a("xml",7);f.insert(j,f.firstChild,true)}j.value=k}else{if(j&&j.type==7){j.remove()}}j=f.getAll("#doctype")[0];if(g.doctype){if(!j){j=new a("#doctype",10);if(g.xml_pi){f.insert(j,f.firstChild)}else{i(j)}}j.value=g.doctype.substring(9,g.doctype.length-1)}else{if(j){j.remove()}}j=f.getAll("title")[0];if(g.metatitle){if(!j){j=new a("title",1);j.append(new a("#text",3)).value=g.metatitle;i(j)}}if(g.docencoding){j=null;b(f.getAll("meta"),function(l){if(l.attr("http-equiv")=="Content-Type"){j=l}});if(!j){j=new a("meta",1);j.attr("http-equiv","Content-Type");j.shortEnded=true;i(j)}j.attr("content","text/html; charset="+g.docencoding)}b("keywords,description,author,copyright,robots".split(","),function(m){var l=f.getAll("meta"),n,p,o=g["meta"+m];for(n=0;n<l.length;n++){p=l[n];if(p.attr("name")==m){if(o){p.attr("content",o)}else{p.remove()}return}}if(o){j=new a("meta",1);j.attr("name",m);j.attr("content",o);j.shortEnded=true;i(j)}});j=f.getAll("link")[0];if(j&&j.attr("rel")=="stylesheet"){if(g.stylesheet){j.attr("href",g.stylesheet)}else{j.remove()}}else{if(g.stylesheet){j=new a("link",1);j.attr({rel:"stylesheet",text:"text/css",href:g.stylesheet});j.shortEnded=true;i(j)}}j=f.getAll("body")[0];if(j){c(j,"dir",g.langdir);c(j,"style",g.style);c(j,"vlink",g.visited_color);c(j,"link",g.link_color);c(j,"alink",g.active_color);e.setAttribs(this.editor.getBody(),{style:g.style,dir:g.dir,vLink:g.visited_color,link:g.link_color,aLink:g.active_color})}j=f.getAll("html")[0];if(j){c(j,"lang",g.langcode);c(j,"xml:lang",g.langcode)}h=new tinymce.html.Serializer({validate:false,indent:true,apply_source_formatting:true,indent_before:"head,html,body,meta,title,script,link,style",indent_after:"head,html,body,meta,title,script,link,style"}).serialize(f);this.head=h.substring(0,h.indexOf("</body>"))},_parseHeader:function(){return new tinymce.html.DomParser({validate:false,root_name:"#document"}).parse(this.head)},_setContent:function(g,d){var m=this,i,c,h=d.content,f,l="",e=m.editor.dom,j;function k(n){return n.replace(/<\/?[A-Z]+/g,function(o){return o.toLowerCase()})}if(d.format=="raw"&&m.head){return}if(d.source_view&&g.getParam("fullpage_hide_in_source_view")){return}h=h.replace(/<(\/?)BODY/gi,"<$1body");i=h.indexOf("<body");if(i!=-1){i=h.indexOf(">",i);m.head=k(h.substring(0,i+1));c=h.indexOf("</body",i);if(c==-1){c=h.length}d.content=h.substring(i+1,c);m.foot=k(h.substring(c))}else{m.head=this._getDefaultHeader();m.foot="\n</body>\n</html>"}f=m._parseHeader();b(f.getAll("style"),function(n){if(n.firstChild){l+=n.firstChild.value}});j=f.getAll("body")[0];if(j){e.setAttribs(m.editor.getBody(),{style:j.attr("style")||"",dir:j.attr("dir")||"",vLink:j.attr("vlink")||"",link:j.attr("link")||"",aLink:j.attr("alink")||""})}e.remove("fullpage_styles");if(l){e.add(m.editor.getDoc().getElementsByTagName("head")[0],"style",{id:"fullpage_styles"},l);j=e.get("fullpage_styles");if(j.styleSheet){j.styleSheet.cssText=l}}},_getDefaultHeader:function(){var f="",c=this.editor,e,d="";if(c.getParam("fullpage_default_xml_pi")){f+='<?xml version="1.0" encoding="'+c.getParam("fullpage_default_encoding","ISO-8859-1")+'" ?>\n'}f+=c.getParam("fullpage_default_doctype",'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');f+="\n<html>\n<head>\n";if(e=c.getParam("fullpage_default_title")){f+="<title>"+e+"</title>\n"}if(e=c.getParam("fullpage_default_encoding")){f+='<meta http-equiv="Content-Type" content="text/html; charset='+e+'" />\n'}if(e=c.getParam("fullpage_default_font_family")){d+="font-family: "+e+";"}if(e=c.getParam("fullpage_default_font_size")){d+="font-size: "+e+";"}if(e=c.getParam("fullpage_default_text_color")){d+="color: "+e+";"}f+="</head>\n<body"+(d?' style="'+d+'"':"")+">\n";return f},_getContent:function(d,e){var c=this;if(!e.source_view||!d.getParam("fullpage_hide_in_source_view")){e.content=tinymce.trim(c.head)+"\n"+tinymce.trim(e.content)+"\n"+tinymce.trim(c.foot)}}});tinymce.PluginManager.add("fullpage",tinymce.plugins.FullPagePlugin)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/editor_plugin_src.js
index 8b49c4464..cc625e56b 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/editor_plugin_src.js
@@ -74,7 +74,7 @@
 			// Parse doctype
 			elm = headerFragment.getAll('#doctype')[0];
 			if (elm)
-				data.doctype = '<!DOCTYPE' + elm.value + ">"; 
+				data.doctype = '<!DOCTYPE' + elm.value + ">";
 
 			// Parse title element
 			elm = headerFragment.getAll('title')[0];
@@ -100,7 +100,7 @@
 			elm = headerFragment.getAll('html')[0];
 			if (elm)
 				data.langcode = getAttr(elm, 'lang') || getAttr(elm, 'xml:lang');
-	
+
 			// Parse stylesheet
 			elm = headerFragment.getAll('link')[0];
 			if (elm && elm.attr('rel') == 'stylesheet')
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/fullpage.htm b/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/fullpage.htm
index 200f2b8e6..0601d9add 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/fullpage.htm
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/fullpage.htm
@@ -47,7 +47,7 @@
 							<td class="nowrap"><label for="metarobots">{#fullpage_dlg.meta_robots}</label>&nbsp;</td>
 							<td>
 								<select id="metarobots" name="metarobots">
-											<option value="">{#not_set}</option> 
+											<option value="">{#not_set}</option>
 											<option value="index,follow">{#fullpage_dlg.meta_index_follow}</option>
 											<option value="index,nofollow">{#fullpage_dlg.meta_index_nofollow}</option>
 											<option value="noindex,follow">{#fullpage_dlg.meta_noindex_follow}</option>
@@ -63,12 +63,12 @@
 
 					<table border="0" cellpadding="4" cellspacing="0">
 						<tr>
-							<td class="column1"><label for="docencoding">{#fullpage_dlg.encoding}</label></td> 
+							<td class="column1"><label for="docencoding">{#fullpage_dlg.encoding}</label></td>
 							<td>
-								<select id="docencoding" name="docencoding"> 
+								<select id="docencoding" name="docencoding">
 										<option value="">{#not_set}</option>
 								</select>
-							</td> 
+							</td>
 						</tr>
 						<tr>
 							<td class="nowrap"><label for="doctype">{#fullpage_dlg.doctypes}</label>&nbsp;</td>
@@ -83,14 +83,14 @@
 							<td><input type="text" id="langcode" name="langcode" value="" /></td>
 						</tr>
 						<tr>
-							<td class="column1"><label for="langdir">{#fullpage_dlg.langdir}</label></td> 
+							<td class="column1"><label for="langdir">{#fullpage_dlg.langdir}</label></td>
 							<td>
-								<select id="langdir" name="langdir"> 
-										<option value="">{#not_set}</option> 
-										<option value="ltr">{#fullpage_dlg.ltr}</option> 
-										<option value="rtl">{#fullpage_dlg.rtl}</option> 
+								<select id="langdir" name="langdir">
+										<option value="">{#not_set}</option>
+										<option value="ltr">{#fullpage_dlg.ltr}</option>
+										<option value="rtl">{#fullpage_dlg.rtl}</option>
 								</select>
-							</td> 
+							</td>
 						</tr>
 						<tr>
 							<td class="nowrap"><label for="xml_pi">{#fullpage_dlg.xml_pi}</label>&nbsp;</td>
@@ -106,16 +106,16 @@
 
 					<table border="0" cellpadding="4" cellspacing="0">
 						<tr>
-							<td class="column1"><label for="fontface">{#fullpage_dlg.fontface}</label></td> 
+							<td class="column1"><label for="fontface">{#fullpage_dlg.fontface}</label></td>
 							<td>
 								<select id="fontface" name="fontface" onchange="FullPageDialog.changedStyleProp();">
 										<option value="">{#not_set}</option>
 								</select>
-							</td> 
+							</td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="fontsize">{#fullpage_dlg.fontsize}</label></td> 
+							<td class="column1"><label for="fontsize">{#fullpage_dlg.fontsize}</label></td>
 							<td>
 								<select id="fontsize" name="fontsize" onchange="FullPageDialog.changedStyleProp();">
 										<option value="">{#not_set}</option>
@@ -124,7 +124,7 @@
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="textcolor">{#fullpage_dlg.textcolor}</label></td> 
+							<td class="column1"><label for="textcolor">{#fullpage_dlg.textcolor}</label></td>
 							<td>
 								<table border="0" cellpadding="0" cellspacing="0">
 									<tr>
@@ -142,7 +142,7 @@
 
 					<table border="0" cellpadding="4" cellspacing="0">
 						<tr>
-							<td class="column1"><label for="bgimage">{#fullpage_dlg.bgimage}</label></td> 
+							<td class="column1"><label for="bgimage">{#fullpage_dlg.bgimage}</label></td>
 							<td>
 								<table border="0" cellpadding="0" cellspacing="0">
 									<tr>
@@ -153,7 +153,7 @@
 							</td>
 						</tr>
 						<tr>
-							<td class="column1"><label for="bgcolor">{#fullpage_dlg.bgcolor}</label></td> 
+							<td class="column1"><label for="bgcolor">{#fullpage_dlg.bgcolor}</label></td>
 							<td>
 								<table border="0" cellpadding="0" cellspacing="0">
 									<tr>
@@ -161,7 +161,7 @@
 										<td id="bgcolor_pickcontainer">&nbsp;</td>
 									</tr>
 								</table>
-							</td> 
+							</td>
 						</tr>
 					</table>
 				</fieldset>
@@ -171,15 +171,15 @@
 
 					<table border="0" cellpadding="4" cellspacing="0">
 						<tr>
-							<td class="column1"><label for="leftmargin">{#fullpage_dlg.left_margin}</label></td> 
+							<td class="column1"><label for="leftmargin">{#fullpage_dlg.left_margin}</label></td>
 							<td><input id="leftmargin" name="leftmargin" type="text" value="" onchange="FullPageDialog.changedStyleProp();" /></td>
-							<td class="column1"><label for="rightmargin">{#fullpage_dlg.right_margin}</label></td> 
+							<td class="column1"><label for="rightmargin">{#fullpage_dlg.right_margin}</label></td>
 							<td><input id="rightmargin" name="rightmargin" type="text" value="" onchange="FullPageDialog.changedStyleProp();" /></td>
 						</tr>
 						<tr>
-							<td class="column1"><label for="topmargin">{#fullpage_dlg.top_margin}</label></td> 
+							<td class="column1"><label for="topmargin">{#fullpage_dlg.top_margin}</label></td>
 							<td><input id="topmargin" name="topmargin" type="text" value="" onchange="FullPageDialog.changedStyleProp();" /></td>
-							<td class="column1"><label for="bottommargin">{#fullpage_dlg.bottom_margin}</label></td> 
+							<td class="column1"><label for="bottommargin">{#fullpage_dlg.bottom_margin}</label></td>
 							<td><input id="bottommargin" name="bottommargin" type="text" value="" onchange="FullPageDialog.changedStyleProp();" /></td>
 						</tr>
 					</table>
@@ -190,7 +190,7 @@
 
 					<table border="0" cellpadding="4" cellspacing="0">
 						<tr>
-							<td class="column1"><label for="link_color">{#fullpage_dlg.link_color}</label></td> 
+							<td class="column1"><label for="link_color">{#fullpage_dlg.link_color}</label></td>
 							<td>
 								<table border="0" cellpadding="0" cellspacing="0">
 									<tr>
@@ -200,7 +200,7 @@
 								</table>
 							</td>
 
-							<td class="column1"><label for="visited_color">{#fullpage_dlg.visited_color}</label></td> 
+							<td class="column1"><label for="visited_color">{#fullpage_dlg.visited_color}</label></td>
 							<td>
 								<table border="0" cellpadding="0" cellspacing="0">
 									<tr>
@@ -212,7 +212,7 @@
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="active_color">{#fullpage_dlg.active_color}</label></td> 
+							<td class="column1"><label for="active_color">{#fullpage_dlg.active_color}</label></td>
 							<td>
 								<table border="0" cellpadding="0" cellspacing="0">
 									<tr>
@@ -233,7 +233,7 @@
 
 					<table border="0" cellpadding="4" cellspacing="0">
 						<tr>
-							<td class="column1"><label for="stylesheet">{#fullpage_dlg.stylesheet}</label></td> 
+							<td class="column1"><label for="stylesheet">{#fullpage_dlg.stylesheet}</label></td>
 							<td><table border="0" cellpadding="0" cellspacing="0">
 									<tr>
 										<td><input id="stylesheet" name="stylesheet" type="text" value="" /></td>
@@ -242,7 +242,7 @@
 								</table></td>
 						</tr>
 						<tr>
-							<td class="column1"><label for="style">{#fullpage_dlg.style}</label></td> 
+							<td class="column1"><label for="style">{#fullpage_dlg.style}</label></td>
 							<td><input id="style" name="style" type="text" value="" onchange="FullPageDialog.changedStyle();" /></td>
 						</tr>
 					</table>
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/js/fullpage.js b/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/js/fullpage.js
index 66eec2d7b..0201a1b1b 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/js/fullpage.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/js/fullpage.js
@@ -11,7 +11,7 @@
 (function() {
 	tinyMCEPopup.requireLangPack();
 
-	var defaultDocTypes = 
+	var defaultDocTypes =
 		'XHTML 1.0 Transitional=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">,' +
 		'XHTML 1.0 Frameset=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">,' +
 		'XHTML 1.0 Strict=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">,' +
@@ -20,7 +20,7 @@
 		'HTML 4.01 Strict=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">,' +
 		'HTML 4.01 Frameset=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">';
 
-	var defaultEncodings = 
+	var defaultEncodings =
 		'Western european (iso-8859-1)=iso-8859-1,' +
 		'Central European (iso-8859-2)=iso-8859-2,' +
 		'Unicode (UTF-8)=utf-8,' +
@@ -109,7 +109,7 @@
 
 		changedStyleProp : function() {
 			var val, dom = tinyMCEPopup.editor.dom, styles = dom.parseStyle(getVal('style'));
-	
+
 			styles['font-face'] = getVal('fontface');
 			styles['font-size'] = getVal('fontsize');
 			styles['color'] = getVal('textcolor');
@@ -146,7 +146,7 @@
 			setVal('style', dom.serializeStyle(dom.parseStyle(dom.serializeStyle(styles))));
 			this.changedStyle();
 		},
-		
+
 		update : function() {
 			var data = {};
 
@@ -158,7 +158,7 @@
 			tinyMCEPopup.close();
 		}
 	};
-	
+
 	function init() {
 		var form = document.forms[0], i, item, list, editor = tinyMCEPopup.editor;
 
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/langs/en_dlg.js b/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/langs/en_dlg.js
index 516edc74f..990c79b5b 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/langs/en_dlg.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/fullpage/langs/en_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.fullpage_dlg',{title:"Document Properties","meta_tab":"General","appearance_tab":"Appearance","advanced_tab":"Advanced","meta_props":"Meta Information",langprops:"Language and Encoding","meta_title":"Title","meta_keywords":"Keywords","meta_description":"Description","meta_robots":"Robots",doctypes:"Doctype",langcode:"Language Code",langdir:"Language Direction",ltr:"Left to Right",rtl:"Right to Left","xml_pi":"XML Declaration",encoding:"Character Encoding","appearance_bgprops":"Background Properties","appearance_marginprops":"Body Margins","appearance_linkprops":"Link Colors","appearance_textprops":"Text Properties",bgcolor:"Background Color",bgimage:"Background Image","left_margin":"Left Margin","right_margin":"Right Margin","top_margin":"Top Margin","bottom_margin":"Bottom Margin","text_color":"Text Color","font_size":"Font Size","font_face":"Font Face","link_color":"Link Color","hover_color":"Hover Color","visited_color":"Visited Color","active_color":"Active Color",textcolor:"Color",fontsize:"Font Size",fontface:"Font Family","meta_index_follow":"Index and Follow the Links","meta_index_nofollow":"Index and Don\'t Follow the Links","meta_noindex_follow":"Do Not Index but Follow the Links","meta_noindex_nofollow":"Do Not Index and Don\'t Follow the Links","appearance_style":"Stylesheet and Style Properties",stylesheet:"Stylesheet",style:"Style",author:"Author",copyright:"Copyright",add:"Add New Element",remove:"Remove Selected Element",moveup:"Move Selected Element Up",movedown:"Move Selected Element Down","head_elements":"Head Elements",info:"Information","add_title":"Title Element","add_meta":"Meta Element","add_script":"Script Element","add_style":"Style Element","add_link":"Link Element","add_base":"Base Element","add_comment":"Comment Node","title_element":"Title Element","script_element":"Script Element","style_element":"Style Element","base_element":"Base Element","link_element":"Link Element","meta_element":"Meta Element","comment_element":"Comment",src:"Source",language:"Language",href:"HREF",target:"Target",type:"Type",charset:"Charset",defer:"Defer",media:"Media",properties:"Properties",name:"Name",value:"Value",content:"Content",rel:"Rel",rev:"Rev",hreflang:"HREF Lang","general_props":"General","advanced_props":"Advanced"});
\ No newline at end of file
+tinyMCE.addI18n('en.fullpage_dlg',{title:"Document Properties","meta_tab":"General","appearance_tab":"Appearance","advanced_tab":"Advanced","meta_props":"Meta Information",langprops:"Language and Encoding","meta_title":"Title","meta_keywords":"Keywords","meta_description":"Description","meta_robots":"Robots",doctypes:"Doctype",langcode:"Language Code",langdir:"Language Direction",ltr:"Left to Right",rtl:"Right to Left","xml_pi":"XML Declaration",encoding:"Character Encoding","appearance_bgprops":"Background Properties","appearance_marginprops":"Body Margins","appearance_linkprops":"Link Colors","appearance_textprops":"Text Properties",bgcolor:"Background Color",bgimage:"Background Image","left_margin":"Left Margin","right_margin":"Right Margin","top_margin":"Top Margin","bottom_margin":"Bottom Margin","text_color":"Text Color","font_size":"Font Size","font_face":"Font Face","link_color":"Link Color","hover_color":"Hover Color","visited_color":"Visited Color","active_color":"Active Color",textcolor:"Color",fontsize:"Font Size",fontface:"Font Family","meta_index_follow":"Index and Follow the Links","meta_index_nofollow":"Index and Don\'t Follow the Links","meta_noindex_follow":"Do Not Index but Follow the Links","meta_noindex_nofollow":"Do Not Index and Don\'t Follow the Links","appearance_style":"Stylesheet and Style Properties",stylesheet:"Stylesheet",style:"Style",author:"Author",copyright:"Copyright",add:"Add New Element",remove:"Remove Selected Element",moveup:"Move Selected Element Up",movedown:"Move Selected Element Down","head_elements":"Head Elements",info:"Information","add_title":"Title Element","add_meta":"Meta Element","add_script":"Script Element","add_style":"Style Element","add_link":"Link Element","add_base":"Base Element","add_comment":"Comment Node","title_element":"Title Element","script_element":"Script Element","style_element":"Style Element","base_element":"Base Element","link_element":"Link Element","meta_element":"Meta Element","comment_element":"Comment",src:"Source",language:"Language",href:"HREF",target:"Target",type:"Type",charset:"Charset",defer:"Defer",media:"Media",properties:"Properties",name:"Name",value:"Value",content:"Content",rel:"Rel",rev:"Rev",hreflang:"HREF Lang","general_props":"General","advanced_props":"Advanced"});
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/fullscreen/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/fullscreen/editor_plugin.js
index 1aa8cc443..bc1a30827 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/fullscreen/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/fullscreen/editor_plugin.js
@@ -1 +1 @@
-(function(){var b=tinymce.DOM;var a=function(d,f,e){var c=function(g){var i=d.controlManager.get(g);var h=f.controlManager.get(g);if(i&&h){h.displayColor(i.value)}};c("forecolor");c("backcolor");f.setContent(d.getContent({format:"raw"}),{format:"raw"});f.selection.moveToBookmark(e);if(d.plugins.spellchecker&&f.plugins.spellchecker){f.plugins.spellchecker.setLanguage(d.plugins.spellchecker.selectedLang)}};tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(i,c){var l=this,m={},k=b.doc.documentElement,d,o,h,g,f,e,j;i.addCommand("mceFullScreen",function(){var q,r;if(i.getParam("fullscreen_is_enabled")){if(i.getParam("fullscreen_new_window")){closeFullscreen()}else{b.win.setTimeout(function(){var t=i;var s=tinyMCE.get(t.getParam("fullscreen_editor_id"));s.plugins.fullscreen.saveState(t);tinyMCE.remove(t)},10)}return}if(i.getParam("fullscreen_new_window")){l.fullscreenSettings={bookmark:i.selection.getBookmark()};q=b.win.open(c+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{q.resizeTo(screen.availWidth,screen.availHeight)}catch(p){}}else{o=b.getStyle(b.doc.body,"overflow",1)||"auto";h=b.getStyle(k,"overflow",1);d=b.getViewPort();g=d.x;f=d.y;if(tinymce.isOpera&&o=="visible"){o="auto"}if(tinymce.isIE&&o=="scroll"){o="auto"}if(tinymce.isIE&&(h=="visible"||h=="scroll")){h="auto"}if(o=="0px"){o=""}b.setStyle(b.doc.body,"overflow","hidden");k.style.overflow="hidden";d=b.getViewPort();b.win.scrollTo(0,0);if(tinymce.isIE){d.h-=1}if(tinymce.isIE6||document.compatMode=="BackCompat"){e="absolute;top:"+d.y}else{e="fixed;top:0"}n=b.add(b.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+e+";left:0;width:"+d.w+"px;height:"+d.h+"px;z-index:200000;"});b.add(n,"div",{id:"mce_fullscreen"});tinymce.each(i.settings,function(s,t){m[t]=s});m.id="mce_fullscreen";m.width=n.clientWidth;m.height=n.clientHeight-15;m.fullscreen_is_enabled=true;m.fullscreen_editor_id=i.id;m.theme_advanced_resizing=false;m.save_onsavecallback=function(){i.setContent(tinyMCE.get(m.id).getContent());i.execCommand("mceSave")};tinymce.each(i.getParam("fullscreen_settings"),function(t,s){m[s]=t});l.fullscreenSettings={bookmark:i.selection.getBookmark(),fullscreen_overflow:o,fullscreen_html_overflow:h,fullscreen_scrollx:g,fullscreen_scrolly:f};if(m.theme_advanced_toolbar_location==="external"){m.theme_advanced_toolbar_location="top"}tinyMCE.oldSettings=tinyMCE.settings;l.fullscreenEditor=new tinymce.Editor("mce_fullscreen",m);l.fullscreenEditor.onInit.add(function(){l.loadState(l.fullscreenEditor)});l.fullscreenEditor.render();l.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");l.fullscreenElement.update();l.resizeFunc=tinymce.dom.Event.add(b.win,"resize",function(){var v=tinymce.DOM.getViewPort(),t=l.fullscreenEditor,s,u;s=t.dom.getSize(t.getContainer().getElementsByTagName("table")[0]);u=t.dom.getSize(t.getContainer().getElementsByTagName("iframe")[0]);t.theme.resizeTo(v.w-s.w+u.w,v.h-s.h+u.h)})}});i.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});i.onNodeChange.add(function(q,p){p.setActive("fullscreen",q.getParam("fullscreen_is_enabled"))});l.loadState=function(p){if(!(p&&l.fullscreenSettings)){throw"No fullscreen editor to load to"}a(i,p,l.fullscreenSettings.bookmark);p.focus()};l.saveState=function(q){if(!(q&&l.fullscreenSettings)){throw"No fullscreen editor to restore from"}var p=l.fullscreenSettings;a(q,i,q.selection.getBookmark());if(!i.getParam("fullscreen_new_window")){tinymce.dom.Event.remove(b.win,"resize",l.resizeFunc);delete l.resizeFunc;b.remove("mce_fullscreen_container");b.doc.documentElement.style.overflow=p.fullscreen_html_overflow;b.setStyle(b.doc.body,"overflow",p.fullscreen_overflow);b.win.scrollTo(p.fullscreen_scrollx,p.fullscreen_scrolly)}tinyMCE.settings=tinyMCE.oldSettings;delete tinyMCE.oldSettings;delete l.fullscreenEditor;delete l.fullscreenElement;delete l.fullscreenSettings;b.win.setTimeout(function(){i.selection.moveToBookmark(j);i.focus()},10)}},getInfo:function(){return{longname:"Fullscreen",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("fullscreen",tinymce.plugins.FullScreenPlugin)})();
\ No newline at end of file
+(function(){var b=tinymce.DOM;var a=function(d,f,e){var c=function(g){var i=d.controlManager.get(g);var h=f.controlManager.get(g);if(i&&h){h.displayColor(i.value)}};c("forecolor");c("backcolor");f.setContent(d.getContent({format:"raw"}),{format:"raw"});f.selection.moveToBookmark(e);if(d.plugins.spellchecker&&f.plugins.spellchecker){f.plugins.spellchecker.setLanguage(d.plugins.spellchecker.selectedLang)}};tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(i,c){var l=this,m={},k=b.doc.documentElement,d,o,h,g,f,e,j;i.addCommand("mceFullScreen",function(){var q,r;if(i.getParam("fullscreen_is_enabled")){if(i.getParam("fullscreen_new_window")){closeFullscreen()}else{b.win.setTimeout(function(){var t=i;var s=tinyMCE.get(t.getParam("fullscreen_editor_id"));s.plugins.fullscreen.saveState(t);tinyMCE.remove(t)},10)}return}if(i.getParam("fullscreen_new_window")){l.fullscreenSettings={bookmark:i.selection.getBookmark()};q=b.win.open(c+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{q.resizeTo(screen.availWidth,screen.availHeight)}catch(p){}}else{o=b.getStyle(b.doc.body,"overflow",1)||"auto";h=b.getStyle(k,"overflow",1);d=b.getViewPort();g=d.x;f=d.y;if(tinymce.isOpera&&o=="visible"){o="auto"}if(tinymce.isIE&&o=="scroll"){o="auto"}if(tinymce.isIE&&(h=="visible"||h=="scroll")){h="auto"}if(o=="0px"){o=""}b.setStyle(b.doc.body,"overflow","hidden");k.style.overflow="hidden";d=b.getViewPort();b.win.scrollTo(0,0);if(tinymce.isIE){d.h-=1}if(tinymce.isIE6||document.compatMode=="BackCompat"){e="absolute;top:"+d.y}else{e="fixed;top:0"}n=b.add(b.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+e+";left:0;width:"+d.w+"px;height:"+d.h+"px;z-index:200000;"});b.add(n,"div",{id:"mce_fullscreen"});tinymce.each(i.settings,function(s,t){m[t]=s});m.id="mce_fullscreen";m.width=n.clientWidth;m.height=n.clientHeight-15;m.fullscreen_is_enabled=true;m.fullscreen_editor_id=i.id;m.theme_advanced_resizing=false;m.save_onsavecallback=function(){i.setContent(tinyMCE.get(m.id).getContent());i.execCommand("mceSave")};tinymce.each(i.getParam("fullscreen_settings"),function(t,s){m[s]=t});l.fullscreenSettings={bookmark:i.selection.getBookmark(),fullscreen_overflow:o,fullscreen_html_overflow:h,fullscreen_scrollx:g,fullscreen_scrolly:f};if(m.theme_advanced_toolbar_location==="external"){m.theme_advanced_toolbar_location="top"}tinyMCE.oldSettings=tinyMCE.settings;l.fullscreenEditor=new tinymce.Editor("mce_fullscreen",m);l.fullscreenEditor.onInit.add(function(){l.loadState(l.fullscreenEditor)});l.fullscreenEditor.render();l.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");l.fullscreenElement.update();l.resizeFunc=tinymce.dom.Event.add(b.win,"resize",function(){var v=tinymce.DOM.getViewPort(),t=l.fullscreenEditor,s,u;s=t.dom.getSize(t.getContainer().getElementsByTagName("table")[0]);u=t.dom.getSize(t.getContainer().getElementsByTagName("iframe")[0]);t.theme.resizeTo(v.w-s.w+u.w,v.h-s.h+u.h)})}});i.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});i.onNodeChange.add(function(q,p){p.setActive("fullscreen",q.getParam("fullscreen_is_enabled"))});l.loadState=function(p){if(!(p&&l.fullscreenSettings)){throw"No fullscreen editor to load to"}a(i,p,l.fullscreenSettings.bookmark);p.focus()};l.saveState=function(q){if(!(q&&l.fullscreenSettings)){throw"No fullscreen editor to restore from"}var p=l.fullscreenSettings;a(q,i,q.selection.getBookmark());if(!i.getParam("fullscreen_new_window")){tinymce.dom.Event.remove(b.win,"resize",l.resizeFunc);delete l.resizeFunc;b.remove("mce_fullscreen_container");b.doc.documentElement.style.overflow=p.fullscreen_html_overflow;b.setStyle(b.doc.body,"overflow",p.fullscreen_overflow);b.win.scrollTo(p.fullscreen_scrollx,p.fullscreen_scrolly)}tinyMCE.settings=tinyMCE.oldSettings;delete tinyMCE.oldSettings;delete l.fullscreenEditor;delete l.fullscreenElement;delete l.fullscreenSettings;b.win.setTimeout(function(){i.selection.moveToBookmark(j);i.focus()},10)}},getInfo:function(){return{longname:"Fullscreen",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("fullscreen",tinymce.plugins.FullScreenPlugin)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/iespell/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/iespell/editor_plugin.js
index e9cba106c..90ed7f8b3 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/iespell/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/iespell/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.IESpell",{init:function(a,b){var c=this,d;if(!tinymce.isIE){return}c.editor=a;a.addCommand("mceIESpell",function(){try{d=new ActiveXObject("ieSpell.ieSpellExtension");d.CheckDocumentNode(a.getDoc().documentElement)}catch(f){if(f.number==-2146827859){a.windowManager.confirm(a.getLang("iespell.download"),function(e){if(e){window.open("http://www.iespell.com/download.php","ieSpellDownload","")}})}else{a.windowManager.alert("Error Loading ieSpell: Exception "+f.number)}}});a.addButton("iespell",{title:"iespell.iespell_desc",cmd:"mceIESpell"})},getInfo:function(){return{longname:"IESpell (IE Only)",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/iespell",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("iespell",tinymce.plugins.IESpell)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.IESpell",{init:function(a,b){var c=this,d;if(!tinymce.isIE){return}c.editor=a;a.addCommand("mceIESpell",function(){try{d=new ActiveXObject("ieSpell.ieSpellExtension");d.CheckDocumentNode(a.getDoc().documentElement)}catch(f){if(f.number==-2146827859){a.windowManager.confirm(a.getLang("iespell.download"),function(e){if(e){window.open("http://www.iespell.com/download.php","ieSpellDownload","")}})}else{a.windowManager.alert("Error Loading ieSpell: Exception "+f.number)}}});a.addButton("iespell",{title:"iespell.iespell_desc",cmd:"mceIESpell"})},getInfo:function(){return{longname:"IESpell (IE Only)",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/iespell",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("iespell",tinymce.plugins.IESpell)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/iespell/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/iespell/editor_plugin_src.js
index 61edf1e23..6e4cb61bb 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/iespell/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/iespell/editor_plugin_src.js
@@ -51,4 +51,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('iespell', tinymce.plugins.IESpell);
-})();
\ No newline at end of file
+})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/inlinepopups/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/inlinepopups/editor_plugin.js
index 2d71a2e17..bbd50678f 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/inlinepopups/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/inlinepopups/editor_plugin.js
@@ -1 +1 @@
-(function(){var d=tinymce.DOM,b=tinymce.dom.Element,a=tinymce.dom.Event,e=tinymce.each,c=tinymce.is;tinymce.create("tinymce.plugins.InlinePopups",{init:function(f,g){f.onBeforeRenderUI.add(function(){f.windowManager=new tinymce.InlineWindowManager(f);d.loadCSS(g+"/skins/"+(f.settings.inlinepopups_skin||"clearlooks2")+"/window.css")})},getInfo:function(){return{longname:"InlinePopups",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.create("tinymce.InlineWindowManager:tinymce.WindowManager",{InlineWindowManager:function(f){var g=this;g.parent(f);g.zIndex=300000;g.count=0;g.windows={}},open:function(s,j){var z=this,i,k="",r=z.editor,g=0,v=0,h,m,o,q,l,x,y,n;s=s||{};j=j||{};if(!s.inline){return z.parent(s,j)}n=z._frontWindow();if(n&&d.get(n.id+"_ifr")){n.focussedElement=d.get(n.id+"_ifr").contentWindow.document.activeElement}if(!s.type){z.bookmark=r.selection.getBookmark(1)}i=d.uniqueId("mce_inlinepopups_");h=d.getViewPort();s.width=parseInt(s.width||320);s.height=parseInt(s.height||240)+(tinymce.isIE?8:0);s.min_width=parseInt(s.min_width||150);s.min_height=parseInt(s.min_height||100);s.max_width=parseInt(s.max_width||2000);s.max_height=parseInt(s.max_height||2000);s.left=s.left||Math.round(Math.max(h.x,h.x+(h.w/2)-(s.width/2)));s.top=s.top||Math.round(Math.max(h.y,h.y+(h.h/2)-(s.height/2)));s.movable=s.resizable=true;j.mce_width=s.width;j.mce_height=s.height;j.mce_inline=true;j.mce_window_id=i;j.mce_auto_focus=s.auto_focus;z.features=s;z.params=j;z.onOpen.dispatch(z,s,j);if(s.type){k+=" mceModal";if(s.type){k+=" mce"+s.type.substring(0,1).toUpperCase()+s.type.substring(1)}s.resizable=false}if(s.statusbar){k+=" mceStatusbar"}if(s.resizable){k+=" mceResizable"}if(s.minimizable){k+=" mceMinimizable"}if(s.maximizable){k+=" mceMaximizable"}if(s.movable){k+=" mceMovable"}z._addAll(d.doc.body,["div",{id:i,role:"dialog","aria-labelledby":s.type?i+"_content":i+"_title","class":(r.settings.inlinepopups_skin||"clearlooks2")+(tinymce.isIE&&window.getSelection?" ie9":""),style:"width:100px;height:100px"},["div",{id:i+"_wrapper","class":"mceWrapper"+k},["div",{id:i+"_top","class":"mceTop"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_title"},s.title||""]],["div",{id:i+"_middle","class":"mceMiddle"},["div",{id:i+"_left","class":"mceLeft",tabindex:"0"}],["span",{id:i+"_content"}],["div",{id:i+"_right","class":"mceRight",tabindex:"0"}]],["div",{id:i+"_bottom","class":"mceBottom"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_status"},"Content"]],["a",{"class":"mceMove",tabindex:"-1",href:"javascript:;"}],["a",{"class":"mceMin",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMax",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMed",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceClose",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{id:i+"_resize_n","class":"mceResize mceResizeN",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_s","class":"mceResize mceResizeS",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_w","class":"mceResize mceResizeW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_e","class":"mceResize mceResizeE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_nw","class":"mceResize mceResizeNW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_ne","class":"mceResize mceResizeNE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_sw","class":"mceResize mceResizeSW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_se","class":"mceResize mceResizeSE",tabindex:"-1",href:"javascript:;"}]]]);d.setStyles(i,{top:-10000,left:-10000});if(tinymce.isGecko){d.setStyle(i,"overflow","auto")}if(!s.type){g+=d.get(i+"_left").clientWidth;g+=d.get(i+"_right").clientWidth;v+=d.get(i+"_top").clientHeight;v+=d.get(i+"_bottom").clientHeight}d.setStyles(i,{top:s.top,left:s.left,width:s.width+g,height:s.height+v});y=s.url||s.file;if(y){if(tinymce.relaxedDomain){y+=(y.indexOf("?")==-1?"?":"&")+"mce_rdomain="+tinymce.relaxedDomain}y=tinymce._addVer(y)}if(!s.type){d.add(i+"_content","iframe",{id:i+"_ifr",src:'javascript:""',frameBorder:0,style:"border:0;width:10px;height:10px"});d.setStyles(i+"_ifr",{width:s.width,height:s.height});d.setAttrib(i+"_ifr","src",y)}else{d.add(i+"_wrapper","a",{id:i+"_ok","class":"mceButton mceOk",href:"javascript:;",onmousedown:"return false;"},"Ok");if(s.type=="confirm"){d.add(i+"_wrapper","a",{"class":"mceButton mceCancel",href:"javascript:;",onmousedown:"return false;"},"Cancel")}d.add(i+"_middle","div",{"class":"mceIcon"});d.setHTML(i+"_content",s.content.replace("\n","<br />"));a.add(i,"keyup",function(f){var p=27;if(f.keyCode===p){s.button_func(false);return a.cancel(f)}});a.add(i,"keydown",function(f){var t,p=9;if(f.keyCode===p){t=d.select("a.mceCancel",i+"_wrapper")[0];if(t&&t!==f.target){t.focus()}else{d.get(i+"_ok").focus()}return a.cancel(f)}})}o=a.add(i,"mousedown",function(t){var u=t.target,f,p;f=z.windows[i];z.focus(i);if(u.nodeName=="A"||u.nodeName=="a"){if(u.className=="mceClose"){z.close(null,i);return a.cancel(t)}else{if(u.className=="mceMax"){f.oldPos=f.element.getXY();f.oldSize=f.element.getSize();p=d.getViewPort();p.w-=2;p.h-=2;f.element.moveTo(p.x,p.y);f.element.resizeTo(p.w,p.h);d.setStyles(i+"_ifr",{width:p.w-f.deltaWidth,height:p.h-f.deltaHeight});d.addClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMed"){f.element.moveTo(f.oldPos.x,f.oldPos.y);f.element.resizeTo(f.oldSize.w,f.oldSize.h);f.iframeElement.resizeTo(f.oldSize.w-f.deltaWidth,f.oldSize.h-f.deltaHeight);d.removeClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMove"){return z._startDrag(i,t,u.className)}else{if(d.hasClass(u,"mceResize")){return z._startDrag(i,t,u.className.substring(13))}}}}}}});q=a.add(i,"click",function(f){var p=f.target;z.focus(i);if(p.nodeName=="A"||p.nodeName=="a"){switch(p.className){case"mceClose":z.close(null,i);return a.cancel(f);case"mceButton mceOk":case"mceButton mceCancel":s.button_func(p.className=="mceButton mceOk");return a.cancel(f)}}});a.add([i+"_left",i+"_right"],"focus",function(p){var t=d.get(i+"_ifr");if(t){var f=t.contentWindow.document.body;var u=d.select(":input:enabled,*[tabindex=0]",f);if(p.target.id===(i+"_left")){u[u.length-1].focus()}else{u[0].focus()}}else{d.get(i+"_ok").focus()}});x=z.windows[i]={id:i,mousedown_func:o,click_func:q,element:new b(i,{blocker:1,container:r.getContainer()}),iframeElement:new b(i+"_ifr"),features:s,deltaWidth:g,deltaHeight:v};x.iframeElement.on("focus",function(){z.focus(i)});if(z.count==0&&z.editor.getParam("dialog_type","modal")=="modal"){d.add(d.doc.body,"div",{id:"mceModalBlocker","class":(z.editor.settings.inlinepopups_skin||"clearlooks2")+"_modalBlocker",style:{zIndex:z.zIndex-1}});d.show("mceModalBlocker");d.setAttrib(d.doc.body,"aria-hidden","true")}else{d.setStyle("mceModalBlocker","z-index",z.zIndex-1)}if(tinymce.isIE6||/Firefox\/2\./.test(navigator.userAgent)||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceModalBlocker",{position:"absolute",left:h.x,top:h.y,width:h.w-2,height:h.h-2})}d.setAttrib(i,"aria-hidden","false");z.focus(i);z._fixIELayout(i,1);if(d.get(i+"_ok")){d.get(i+"_ok").focus()}z.count++;return x},focus:function(h){var g=this,f;if(f=g.windows[h]){f.zIndex=this.zIndex++;f.element.setStyle("zIndex",f.zIndex);f.element.update();h=h+"_wrapper";d.removeClass(g.lastId,"mceFocus");d.addClass(h,"mceFocus");g.lastId=h;if(f.focussedElement){f.focussedElement.focus()}else{if(d.get(h+"_ok")){d.get(f.id+"_ok").focus()}else{if(d.get(f.id+"_ifr")){d.get(f.id+"_ifr").focus()}}}}},_addAll:function(k,h){var g,l,f=this,j=tinymce.DOM;if(c(h,"string")){k.appendChild(j.doc.createTextNode(h))}else{if(h.length){k=k.appendChild(j.create(h[0],h[1]));for(g=2;g<h.length;g++){f._addAll(k,h[g])}}}},_startDrag:function(v,G,E){var o=this,u,z,C=d.doc,f,l=o.windows[v],h=l.element,y=h.getXY(),x,q,F,g,A,s,r,j,i,m,k,n,B;g={x:0,y:0};A=d.getViewPort();A.w-=2;A.h-=2;j=G.screenX;i=G.screenY;m=k=n=B=0;u=a.add(C,"mouseup",function(p){a.remove(C,"mouseup",u);a.remove(C,"mousemove",z);if(f){f.remove()}h.moveBy(m,k);h.resizeBy(n,B);q=h.getSize();d.setStyles(v+"_ifr",{width:q.w-l.deltaWidth,height:q.h-l.deltaHeight});o._fixIELayout(v,1);return a.cancel(p)});if(E!="Move"){D()}function D(){if(f){return}o._fixIELayout(v,0);d.add(C.body,"div",{id:"mceEventBlocker","class":"mceEventBlocker "+(o.editor.settings.inlinepopups_skin||"clearlooks2"),style:{zIndex:o.zIndex+1}});if(tinymce.isIE6||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceEventBlocker",{position:"absolute",left:A.x,top:A.y,width:A.w-2,height:A.h-2})}f=new b("mceEventBlocker");f.update();x=h.getXY();q=h.getSize();s=g.x+x.x-A.x;r=g.y+x.y-A.y;d.add(f.get(),"div",{id:"mcePlaceHolder","class":"mcePlaceHolder",style:{left:s,top:r,width:q.w,height:q.h}});F=new b("mcePlaceHolder")}z=a.add(C,"mousemove",function(w){var p,H,t;D();p=w.screenX-j;H=w.screenY-i;switch(E){case"ResizeW":m=p;n=0-p;break;case"ResizeE":n=p;break;case"ResizeN":case"ResizeNW":case"ResizeNE":if(E=="ResizeNW"){m=p;n=0-p}else{if(E=="ResizeNE"){n=p}}k=H;B=0-H;break;case"ResizeS":case"ResizeSW":case"ResizeSE":if(E=="ResizeSW"){m=p;n=0-p}else{if(E=="ResizeSE"){n=p}}B=H;break;case"mceMove":m=p;k=H;break}if(n<(t=l.features.min_width-q.w)){if(m!==0){m+=n-t}n=t}if(B<(t=l.features.min_height-q.h)){if(k!==0){k+=B-t}B=t}n=Math.min(n,l.features.max_width-q.w);B=Math.min(B,l.features.max_height-q.h);m=Math.max(m,A.x-(s+A.x));k=Math.max(k,A.y-(r+A.y));m=Math.min(m,(A.w+A.x)-(s+q.w+A.x));k=Math.min(k,(A.h+A.y)-(r+q.h+A.y));if(m+k!==0){if(s+m<0){m=0}if(r+k<0){k=0}F.moveTo(s+m,r+k)}if(n+B!==0){F.resizeTo(q.w+n,q.h+B)}return a.cancel(w)});return a.cancel(G)},resizeBy:function(g,h,i){var f=this.windows[i];if(f){f.element.resizeBy(g,h);f.iframeElement.resizeBy(g,h)}},close:function(i,k){var g=this,f,j=d.doc,h,k;k=g._findId(k||i);if(!g.windows[k]){g.parent(i);return}g.count--;if(g.count==0){d.remove("mceModalBlocker");d.setAttrib(d.doc.body,"aria-hidden","false");g.editor.focus()}if(f=g.windows[k]){g.onClose.dispatch(g);a.remove(j,"mousedown",f.mousedownFunc);a.remove(j,"click",f.clickFunc);a.clear(k);a.clear(k+"_ifr");d.setAttrib(k+"_ifr","src",'javascript:""');f.element.remove();delete g.windows[k];h=g._frontWindow();if(h){g.focus(h.id)}}},_frontWindow:function(){var g,f=0;e(this.windows,function(h){if(h.zIndex>f){g=h;f=h.zIndex}});return g},setTitle:function(f,g){var h;f=this._findId(f);if(h=d.get(f+"_title")){h.innerHTML=d.encode(g)}},alert:function(g,f,j){var i=this,h;h=i.open({title:i,type:"alert",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},confirm:function(g,f,j){var i=this,h;h=i.open({title:i,type:"confirm",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},_findId:function(f){var g=this;if(typeof(f)=="string"){return f}e(g.windows,function(h){var i=d.get(h.id+"_ifr");if(i&&f==i.contentWindow){f=h.id;return false}});return f},_fixIELayout:function(i,h){var f,g;if(!tinymce.isIE6){return}e(["n","s","w","e","nw","ne","sw","se"],function(j){var k=d.get(i+"_resize_"+j);d.setStyles(k,{width:h?k.clientWidth:"",height:h?k.clientHeight:"",cursor:d.getStyle(k,"cursor",1)});d.setStyle(i+"_bottom","bottom","-1px");k=0});if(f=this.windows[i]){f.element.hide();f.element.show();e(d.select("div,a",i),function(k,j){if(k.currentStyle.backgroundImage!="none"){g=new Image();g.src=k.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/,"$1")}});d.get(i).style.filter=""}}});tinymce.PluginManager.add("inlinepopups",tinymce.plugins.InlinePopups)})();
\ No newline at end of file
+(function(){var d=tinymce.DOM,b=tinymce.dom.Element,a=tinymce.dom.Event,e=tinymce.each,c=tinymce.is;tinymce.create("tinymce.plugins.InlinePopups",{init:function(f,g){f.onBeforeRenderUI.add(function(){f.windowManager=new tinymce.InlineWindowManager(f);d.loadCSS(g+"/skins/"+(f.settings.inlinepopups_skin||"clearlooks2")+"/window.css")})},getInfo:function(){return{longname:"InlinePopups",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.create("tinymce.InlineWindowManager:tinymce.WindowManager",{InlineWindowManager:function(f){var g=this;g.parent(f);g.zIndex=300000;g.count=0;g.windows={}},open:function(s,j){var z=this,i,k="",r=z.editor,g=0,v=0,h,m,o,q,l,x,y,n;s=s||{};j=j||{};if(!s.inline){return z.parent(s,j)}n=z._frontWindow();if(n&&d.get(n.id+"_ifr")){n.focussedElement=d.get(n.id+"_ifr").contentWindow.document.activeElement}if(!s.type){z.bookmark=r.selection.getBookmark(1)}i=d.uniqueId("mce_inlinepopups_");h=d.getViewPort();s.width=parseInt(s.width||320);s.height=parseInt(s.height||240)+(tinymce.isIE?8:0);s.min_width=parseInt(s.min_width||150);s.min_height=parseInt(s.min_height||100);s.max_width=parseInt(s.max_width||2000);s.max_height=parseInt(s.max_height||2000);s.left=s.left||Math.round(Math.max(h.x,h.x+(h.w/2)-(s.width/2)));s.top=s.top||Math.round(Math.max(h.y,h.y+(h.h/2)-(s.height/2)));s.movable=s.resizable=true;j.mce_width=s.width;j.mce_height=s.height;j.mce_inline=true;j.mce_window_id=i;j.mce_auto_focus=s.auto_focus;z.features=s;z.params=j;z.onOpen.dispatch(z,s,j);if(s.type){k+=" mceModal";if(s.type){k+=" mce"+s.type.substring(0,1).toUpperCase()+s.type.substring(1)}s.resizable=false}if(s.statusbar){k+=" mceStatusbar"}if(s.resizable){k+=" mceResizable"}if(s.minimizable){k+=" mceMinimizable"}if(s.maximizable){k+=" mceMaximizable"}if(s.movable){k+=" mceMovable"}z._addAll(d.doc.body,["div",{id:i,role:"dialog","aria-labelledby":s.type?i+"_content":i+"_title","class":(r.settings.inlinepopups_skin||"clearlooks2")+(tinymce.isIE&&window.getSelection?" ie9":""),style:"width:100px;height:100px"},["div",{id:i+"_wrapper","class":"mceWrapper"+k},["div",{id:i+"_top","class":"mceTop"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_title"},s.title||""]],["div",{id:i+"_middle","class":"mceMiddle"},["div",{id:i+"_left","class":"mceLeft",tabindex:"0"}],["span",{id:i+"_content"}],["div",{id:i+"_right","class":"mceRight",tabindex:"0"}]],["div",{id:i+"_bottom","class":"mceBottom"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_status"},"Content"]],["a",{"class":"mceMove",tabindex:"-1",href:"javascript:;"}],["a",{"class":"mceMin",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMax",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMed",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceClose",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{id:i+"_resize_n","class":"mceResize mceResizeN",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_s","class":"mceResize mceResizeS",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_w","class":"mceResize mceResizeW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_e","class":"mceResize mceResizeE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_nw","class":"mceResize mceResizeNW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_ne","class":"mceResize mceResizeNE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_sw","class":"mceResize mceResizeSW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_se","class":"mceResize mceResizeSE",tabindex:"-1",href:"javascript:;"}]]]);d.setStyles(i,{top:-10000,left:-10000});if(tinymce.isGecko){d.setStyle(i,"overflow","auto")}if(!s.type){g+=d.get(i+"_left").clientWidth;g+=d.get(i+"_right").clientWidth;v+=d.get(i+"_top").clientHeight;v+=d.get(i+"_bottom").clientHeight}d.setStyles(i,{top:s.top,left:s.left,width:s.width+g,height:s.height+v});y=s.url||s.file;if(y){if(tinymce.relaxedDomain){y+=(y.indexOf("?")==-1?"?":"&")+"mce_rdomain="+tinymce.relaxedDomain}y=tinymce._addVer(y)}if(!s.type){d.add(i+"_content","iframe",{id:i+"_ifr",src:'javascript:""',frameBorder:0,style:"border:0;width:10px;height:10px"});d.setStyles(i+"_ifr",{width:s.width,height:s.height});d.setAttrib(i+"_ifr","src",y)}else{d.add(i+"_wrapper","a",{id:i+"_ok","class":"mceButton mceOk",href:"javascript:;",onmousedown:"return false;"},"Ok");if(s.type=="confirm"){d.add(i+"_wrapper","a",{"class":"mceButton mceCancel",href:"javascript:;",onmousedown:"return false;"},"Cancel")}d.add(i+"_middle","div",{"class":"mceIcon"});d.setHTML(i+"_content",s.content.replace("\n","<br />"));a.add(i,"keyup",function(f){var p=27;if(f.keyCode===p){s.button_func(false);return a.cancel(f)}});a.add(i,"keydown",function(f){var t,p=9;if(f.keyCode===p){t=d.select("a.mceCancel",i+"_wrapper")[0];if(t&&t!==f.target){t.focus()}else{d.get(i+"_ok").focus()}return a.cancel(f)}})}o=a.add(i,"mousedown",function(t){var u=t.target,f,p;f=z.windows[i];z.focus(i);if(u.nodeName=="A"||u.nodeName=="a"){if(u.className=="mceClose"){z.close(null,i);return a.cancel(t)}else{if(u.className=="mceMax"){f.oldPos=f.element.getXY();f.oldSize=f.element.getSize();p=d.getViewPort();p.w-=2;p.h-=2;f.element.moveTo(p.x,p.y);f.element.resizeTo(p.w,p.h);d.setStyles(i+"_ifr",{width:p.w-f.deltaWidth,height:p.h-f.deltaHeight});d.addClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMed"){f.element.moveTo(f.oldPos.x,f.oldPos.y);f.element.resizeTo(f.oldSize.w,f.oldSize.h);f.iframeElement.resizeTo(f.oldSize.w-f.deltaWidth,f.oldSize.h-f.deltaHeight);d.removeClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMove"){return z._startDrag(i,t,u.className)}else{if(d.hasClass(u,"mceResize")){return z._startDrag(i,t,u.className.substring(13))}}}}}}});q=a.add(i,"click",function(f){var p=f.target;z.focus(i);if(p.nodeName=="A"||p.nodeName=="a"){switch(p.className){case"mceClose":z.close(null,i);return a.cancel(f);case"mceButton mceOk":case"mceButton mceCancel":s.button_func(p.className=="mceButton mceOk");return a.cancel(f)}}});a.add([i+"_left",i+"_right"],"focus",function(p){var t=d.get(i+"_ifr");if(t){var f=t.contentWindow.document.body;var u=d.select(":input:enabled,*[tabindex=0]",f);if(p.target.id===(i+"_left")){u[u.length-1].focus()}else{u[0].focus()}}else{d.get(i+"_ok").focus()}});x=z.windows[i]={id:i,mousedown_func:o,click_func:q,element:new b(i,{blocker:1,container:r.getContainer()}),iframeElement:new b(i+"_ifr"),features:s,deltaWidth:g,deltaHeight:v};x.iframeElement.on("focus",function(){z.focus(i)});if(z.count==0&&z.editor.getParam("dialog_type","modal")=="modal"){d.add(d.doc.body,"div",{id:"mceModalBlocker","class":(z.editor.settings.inlinepopups_skin||"clearlooks2")+"_modalBlocker",style:{zIndex:z.zIndex-1}});d.show("mceModalBlocker");d.setAttrib(d.doc.body,"aria-hidden","true")}else{d.setStyle("mceModalBlocker","z-index",z.zIndex-1)}if(tinymce.isIE6||/Firefox\/2\./.test(navigator.userAgent)||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceModalBlocker",{position:"absolute",left:h.x,top:h.y,width:h.w-2,height:h.h-2})}d.setAttrib(i,"aria-hidden","false");z.focus(i);z._fixIELayout(i,1);if(d.get(i+"_ok")){d.get(i+"_ok").focus()}z.count++;return x},focus:function(h){var g=this,f;if(f=g.windows[h]){f.zIndex=this.zIndex++;f.element.setStyle("zIndex",f.zIndex);f.element.update();h=h+"_wrapper";d.removeClass(g.lastId,"mceFocus");d.addClass(h,"mceFocus");g.lastId=h;if(f.focussedElement){f.focussedElement.focus()}else{if(d.get(h+"_ok")){d.get(f.id+"_ok").focus()}else{if(d.get(f.id+"_ifr")){d.get(f.id+"_ifr").focus()}}}}},_addAll:function(k,h){var g,l,f=this,j=tinymce.DOM;if(c(h,"string")){k.appendChild(j.doc.createTextNode(h))}else{if(h.length){k=k.appendChild(j.create(h[0],h[1]));for(g=2;g<h.length;g++){f._addAll(k,h[g])}}}},_startDrag:function(v,G,E){var o=this,u,z,C=d.doc,f,l=o.windows[v],h=l.element,y=h.getXY(),x,q,F,g,A,s,r,j,i,m,k,n,B;g={x:0,y:0};A=d.getViewPort();A.w-=2;A.h-=2;j=G.screenX;i=G.screenY;m=k=n=B=0;u=a.add(C,"mouseup",function(p){a.remove(C,"mouseup",u);a.remove(C,"mousemove",z);if(f){f.remove()}h.moveBy(m,k);h.resizeBy(n,B);q=h.getSize();d.setStyles(v+"_ifr",{width:q.w-l.deltaWidth,height:q.h-l.deltaHeight});o._fixIELayout(v,1);return a.cancel(p)});if(E!="Move"){D()}function D(){if(f){return}o._fixIELayout(v,0);d.add(C.body,"div",{id:"mceEventBlocker","class":"mceEventBlocker "+(o.editor.settings.inlinepopups_skin||"clearlooks2"),style:{zIndex:o.zIndex+1}});if(tinymce.isIE6||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceEventBlocker",{position:"absolute",left:A.x,top:A.y,width:A.w-2,height:A.h-2})}f=new b("mceEventBlocker");f.update();x=h.getXY();q=h.getSize();s=g.x+x.x-A.x;r=g.y+x.y-A.y;d.add(f.get(),"div",{id:"mcePlaceHolder","class":"mcePlaceHolder",style:{left:s,top:r,width:q.w,height:q.h}});F=new b("mcePlaceHolder")}z=a.add(C,"mousemove",function(w){var p,H,t;D();p=w.screenX-j;H=w.screenY-i;switch(E){case"ResizeW":m=p;n=0-p;break;case"ResizeE":n=p;break;case"ResizeN":case"ResizeNW":case"ResizeNE":if(E=="ResizeNW"){m=p;n=0-p}else{if(E=="ResizeNE"){n=p}}k=H;B=0-H;break;case"ResizeS":case"ResizeSW":case"ResizeSE":if(E=="ResizeSW"){m=p;n=0-p}else{if(E=="ResizeSE"){n=p}}B=H;break;case"mceMove":m=p;k=H;break}if(n<(t=l.features.min_width-q.w)){if(m!==0){m+=n-t}n=t}if(B<(t=l.features.min_height-q.h)){if(k!==0){k+=B-t}B=t}n=Math.min(n,l.features.max_width-q.w);B=Math.min(B,l.features.max_height-q.h);m=Math.max(m,A.x-(s+A.x));k=Math.max(k,A.y-(r+A.y));m=Math.min(m,(A.w+A.x)-(s+q.w+A.x));k=Math.min(k,(A.h+A.y)-(r+q.h+A.y));if(m+k!==0){if(s+m<0){m=0}if(r+k<0){k=0}F.moveTo(s+m,r+k)}if(n+B!==0){F.resizeTo(q.w+n,q.h+B)}return a.cancel(w)});return a.cancel(G)},resizeBy:function(g,h,i){var f=this.windows[i];if(f){f.element.resizeBy(g,h);f.iframeElement.resizeBy(g,h)}},close:function(i,k){var g=this,f,j=d.doc,h,k;k=g._findId(k||i);if(!g.windows[k]){g.parent(i);return}g.count--;if(g.count==0){d.remove("mceModalBlocker");d.setAttrib(d.doc.body,"aria-hidden","false");g.editor.focus()}if(f=g.windows[k]){g.onClose.dispatch(g);a.remove(j,"mousedown",f.mousedownFunc);a.remove(j,"click",f.clickFunc);a.clear(k);a.clear(k+"_ifr");d.setAttrib(k+"_ifr","src",'javascript:""');f.element.remove();delete g.windows[k];h=g._frontWindow();if(h){g.focus(h.id)}}},_frontWindow:function(){var g,f=0;e(this.windows,function(h){if(h.zIndex>f){g=h;f=h.zIndex}});return g},setTitle:function(f,g){var h;f=this._findId(f);if(h=d.get(f+"_title")){h.innerHTML=d.encode(g)}},alert:function(g,f,j){var i=this,h;h=i.open({title:i,type:"alert",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},confirm:function(g,f,j){var i=this,h;h=i.open({title:i,type:"confirm",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},_findId:function(f){var g=this;if(typeof(f)=="string"){return f}e(g.windows,function(h){var i=d.get(h.id+"_ifr");if(i&&f==i.contentWindow){f=h.id;return false}});return f},_fixIELayout:function(i,h){var f,g;if(!tinymce.isIE6){return}e(["n","s","w","e","nw","ne","sw","se"],function(j){var k=d.get(i+"_resize_"+j);d.setStyles(k,{width:h?k.clientWidth:"",height:h?k.clientHeight:"",cursor:d.getStyle(k,"cursor",1)});d.setStyle(i+"_bottom","bottom","-1px");k=0});if(f=this.windows[i]){f.element.hide();f.element.show();e(d.select("div,a",i),function(k,j){if(k.currentStyle.backgroundImage!="none"){g=new Image();g.src=k.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/,"$1")}});d.get(i).style.filter=""}}});tinymce.PluginManager.add("inlinepopups",tinymce.plugins.InlinePopups)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/insertdatetime/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/insertdatetime/editor_plugin.js
index 938ce6b17..c5c123591 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/insertdatetime/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/insertdatetime/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.InsertDateTime",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceInsertDate",function(){var d=c._getDateTime(new Date(),a.getParam("plugin_insertdate_dateFormat",a.getLang("insertdatetime.date_fmt")));a.execCommand("mceInsertContent",false,d)});a.addCommand("mceInsertTime",function(){var d=c._getDateTime(new Date(),a.getParam("plugin_insertdate_timeFormat",a.getLang("insertdatetime.time_fmt")));a.execCommand("mceInsertContent",false,d)});a.addButton("insertdate",{title:"insertdatetime.insertdate_desc",cmd:"mceInsertDate"});a.addButton("inserttime",{title:"insertdatetime.inserttime_desc",cmd:"mceInsertTime"})},getInfo:function(){return{longname:"Insert date/time",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/insertdatetime",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_getDateTime:function(e,a){var c=this.editor;function b(g,d){g=""+g;if(g.length<d){for(var f=0;f<(d-g.length);f++){g="0"+g}}return g}a=a.replace("%D","%m/%d/%y");a=a.replace("%r","%I:%M:%S %p");a=a.replace("%Y",""+e.getFullYear());a=a.replace("%y",""+e.getYear());a=a.replace("%m",b(e.getMonth()+1,2));a=a.replace("%d",b(e.getDate(),2));a=a.replace("%H",""+b(e.getHours(),2));a=a.replace("%M",""+b(e.getMinutes(),2));a=a.replace("%S",""+b(e.getSeconds(),2));a=a.replace("%I",""+((e.getHours()+11)%12+1));a=a.replace("%p",""+(e.getHours()<12?"AM":"PM"));a=a.replace("%B",""+c.getLang("insertdatetime.months_long").split(",")[e.getMonth()]);a=a.replace("%b",""+c.getLang("insertdatetime.months_short").split(",")[e.getMonth()]);a=a.replace("%A",""+c.getLang("insertdatetime.day_long").split(",")[e.getDay()]);a=a.replace("%a",""+c.getLang("insertdatetime.day_short").split(",")[e.getDay()]);a=a.replace("%%","%");return a}});tinymce.PluginManager.add("insertdatetime",tinymce.plugins.InsertDateTime)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.InsertDateTime",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceInsertDate",function(){var d=c._getDateTime(new Date(),a.getParam("plugin_insertdate_dateFormat",a.getLang("insertdatetime.date_fmt")));a.execCommand("mceInsertContent",false,d)});a.addCommand("mceInsertTime",function(){var d=c._getDateTime(new Date(),a.getParam("plugin_insertdate_timeFormat",a.getLang("insertdatetime.time_fmt")));a.execCommand("mceInsertContent",false,d)});a.addButton("insertdate",{title:"insertdatetime.insertdate_desc",cmd:"mceInsertDate"});a.addButton("inserttime",{title:"insertdatetime.inserttime_desc",cmd:"mceInsertTime"})},getInfo:function(){return{longname:"Insert date/time",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/insertdatetime",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_getDateTime:function(e,a){var c=this.editor;function b(g,d){g=""+g;if(g.length<d){for(var f=0;f<(d-g.length);f++){g="0"+g}}return g}a=a.replace("%D","%m/%d/%y");a=a.replace("%r","%I:%M:%S %p");a=a.replace("%Y",""+e.getFullYear());a=a.replace("%y",""+e.getYear());a=a.replace("%m",b(e.getMonth()+1,2));a=a.replace("%d",b(e.getDate(),2));a=a.replace("%H",""+b(e.getHours(),2));a=a.replace("%M",""+b(e.getMinutes(),2));a=a.replace("%S",""+b(e.getSeconds(),2));a=a.replace("%I",""+((e.getHours()+11)%12+1));a=a.replace("%p",""+(e.getHours()<12?"AM":"PM"));a=a.replace("%B",""+c.getLang("insertdatetime.months_long").split(",")[e.getMonth()]);a=a.replace("%b",""+c.getLang("insertdatetime.months_short").split(",")[e.getMonth()]);a=a.replace("%A",""+c.getLang("insertdatetime.day_long").split(",")[e.getDay()]);a=a.replace("%a",""+c.getLang("insertdatetime.day_short").split(",")[e.getDay()]);a=a.replace("%%","%");return a}});tinymce.PluginManager.add("insertdatetime",tinymce.plugins.InsertDateTime)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/insertdatetime/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
index c5d9a416c..69462da01 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
@@ -80,4 +80,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('insertdatetime', tinymce.plugins.InsertDateTime);
-})();
\ No newline at end of file
+})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/layer/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/layer/editor_plugin.js
index ca3857a74..5055ee85b 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/layer/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/layer/editor_plugin.js
@@ -1 +1 @@
-(function(){function a(b){do{if(b.className&&b.className.indexOf("mceItemLayer")!=-1){return b}}while(b=b.parentNode)}tinymce.create("tinymce.plugins.Layer",{init:function(b,c){var d=this;d.editor=b;b.addCommand("mceInsertLayer",d._insertLayer,d);b.addCommand("mceMoveForward",function(){d._move(1)});b.addCommand("mceMoveBackward",function(){d._move(-1)});b.addCommand("mceMakeAbsolute",function(){d._toggleAbsolute()});b.addButton("moveforward",{title:"layer.forward_desc",cmd:"mceMoveForward"});b.addButton("movebackward",{title:"layer.backward_desc",cmd:"mceMoveBackward"});b.addButton("absolute",{title:"layer.absolute_desc",cmd:"mceMakeAbsolute"});b.addButton("insertlayer",{title:"layer.insertlayer_desc",cmd:"mceInsertLayer"});b.onInit.add(function(){var e=b.dom;if(tinymce.isIE){b.getDoc().execCommand("2D-Position",false,true)}});b.onMouseUp.add(function(f,h){var g=a(h.target);if(g){f.dom.setAttrib(g,"data-mce-style","")}});b.onMouseDown.add(function(f,j){var h=j.target,i=f.getDoc(),g;if(tinymce.isGecko){if(a(h)){if(i.designMode!=="on"){i.designMode="on";h=i.body;g=h.parentNode;g.removeChild(h);g.appendChild(h)}}else{if(i.designMode=="on"){i.designMode="off"}}}});b.onNodeChange.add(d._nodeChange,d);b.onVisualAid.add(d._visualAid,d)},getInfo:function(){return{longname:"Layer",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(c,b,f){var d,e;d=this._getParentLayer(f);e=c.dom.getParent(f,"DIV,P,IMG");if(!e){b.setDisabled("absolute",1);b.setDisabled("moveforward",1);b.setDisabled("movebackward",1)}else{b.setDisabled("absolute",0);b.setDisabled("moveforward",!d);b.setDisabled("movebackward",!d);b.setActive("absolute",d&&d.style.position.toLowerCase()=="absolute")}},_visualAid:function(b,d,c){var f=b.dom;tinymce.each(f.select("div,p",d),function(g){if(/^(absolute|relative|fixed)$/i.test(g.style.position)){if(c){f.addClass(g,"mceItemVisualAid")}else{f.removeClass(g,"mceItemVisualAid")}f.addClass(g,"mceItemLayer")}})},_move:function(j){var c=this.editor,g,h=[],f=this._getParentLayer(c.selection.getNode()),e=-1,k=-1,b;b=[];tinymce.walk(c.getBody(),function(d){if(d.nodeType==1&&/^(absolute|relative|static)$/i.test(d.style.position)){b.push(d)}},"childNodes");for(g=0;g<b.length;g++){h[g]=b[g].style.zIndex?parseInt(b[g].style.zIndex):0;if(e<0&&b[g]==f){e=g}}if(j<0){for(g=0;g<h.length;g++){if(h[g]<h[e]){k=g;break}}if(k>-1){b[e].style.zIndex=h[k];b[k].style.zIndex=h[e]}else{if(h[e]>0){b[e].style.zIndex=h[e]-1}}}else{for(g=0;g<h.length;g++){if(h[g]>h[e]){k=g;break}}if(k>-1){b[e].style.zIndex=h[k];b[k].style.zIndex=h[e]}else{b[e].style.zIndex=h[e]+1}}c.execCommand("mceRepaint")},_getParentLayer:function(b){return this.editor.dom.getParent(b,function(c){return c.nodeType==1&&/^(absolute|relative|static)$/i.test(c.style.position)})},_insertLayer:function(){var c=this.editor,e=c.dom,d=e.getPos(e.getParent(c.selection.getNode(),"*")),b=c.getBody();c.dom.add(b,"div",{style:{position:"absolute",left:d.x,top:(d.y>20?d.y:20),width:100,height:100},"class":"mceItemVisualAid mceItemLayer"},c.selection.getContent()||c.getLang("layer.content"));if(tinymce.isIE){e.setHTML(b,b.innerHTML)}},_toggleAbsolute:function(){var b=this.editor,c=this._getParentLayer(b.selection.getNode());if(!c){c=b.dom.getParent(b.selection.getNode(),"DIV,P,IMG")}if(c){if(c.style.position.toLowerCase()=="absolute"){b.dom.setStyles(c,{position:"",left:"",top:"",width:"",height:""});b.dom.removeClass(c,"mceItemVisualAid");b.dom.removeClass(c,"mceItemLayer")}else{if(c.style.left==""){c.style.left=20+"px"}if(c.style.top==""){c.style.top=20+"px"}if(c.style.width==""){c.style.width=c.width?(c.width+"px"):"100px"}if(c.style.height==""){c.style.height=c.height?(c.height+"px"):"100px"}c.style.position="absolute";b.dom.setAttrib(c,"data-mce-style","");b.addVisual(b.getBody())}b.execCommand("mceRepaint");b.nodeChanged()}}});tinymce.PluginManager.add("layer",tinymce.plugins.Layer)})();
\ No newline at end of file
+(function(){function a(b){do{if(b.className&&b.className.indexOf("mceItemLayer")!=-1){return b}}while(b=b.parentNode)}tinymce.create("tinymce.plugins.Layer",{init:function(b,c){var d=this;d.editor=b;b.addCommand("mceInsertLayer",d._insertLayer,d);b.addCommand("mceMoveForward",function(){d._move(1)});b.addCommand("mceMoveBackward",function(){d._move(-1)});b.addCommand("mceMakeAbsolute",function(){d._toggleAbsolute()});b.addButton("moveforward",{title:"layer.forward_desc",cmd:"mceMoveForward"});b.addButton("movebackward",{title:"layer.backward_desc",cmd:"mceMoveBackward"});b.addButton("absolute",{title:"layer.absolute_desc",cmd:"mceMakeAbsolute"});b.addButton("insertlayer",{title:"layer.insertlayer_desc",cmd:"mceInsertLayer"});b.onInit.add(function(){var e=b.dom;if(tinymce.isIE){b.getDoc().execCommand("2D-Position",false,true)}});b.onMouseUp.add(function(f,h){var g=a(h.target);if(g){f.dom.setAttrib(g,"data-mce-style","")}});b.onMouseDown.add(function(f,j){var h=j.target,i=f.getDoc(),g;if(tinymce.isGecko){if(a(h)){if(i.designMode!=="on"){i.designMode="on";h=i.body;g=h.parentNode;g.removeChild(h);g.appendChild(h)}}else{if(i.designMode=="on"){i.designMode="off"}}}});b.onNodeChange.add(d._nodeChange,d);b.onVisualAid.add(d._visualAid,d)},getInfo:function(){return{longname:"Layer",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(c,b,f){var d,e;d=this._getParentLayer(f);e=c.dom.getParent(f,"DIV,P,IMG");if(!e){b.setDisabled("absolute",1);b.setDisabled("moveforward",1);b.setDisabled("movebackward",1)}else{b.setDisabled("absolute",0);b.setDisabled("moveforward",!d);b.setDisabled("movebackward",!d);b.setActive("absolute",d&&d.style.position.toLowerCase()=="absolute")}},_visualAid:function(b,d,c){var f=b.dom;tinymce.each(f.select("div,p",d),function(g){if(/^(absolute|relative|fixed)$/i.test(g.style.position)){if(c){f.addClass(g,"mceItemVisualAid")}else{f.removeClass(g,"mceItemVisualAid")}f.addClass(g,"mceItemLayer")}})},_move:function(j){var c=this.editor,g,h=[],f=this._getParentLayer(c.selection.getNode()),e=-1,k=-1,b;b=[];tinymce.walk(c.getBody(),function(d){if(d.nodeType==1&&/^(absolute|relative|static)$/i.test(d.style.position)){b.push(d)}},"childNodes");for(g=0;g<b.length;g++){h[g]=b[g].style.zIndex?parseInt(b[g].style.zIndex):0;if(e<0&&b[g]==f){e=g}}if(j<0){for(g=0;g<h.length;g++){if(h[g]<h[e]){k=g;break}}if(k>-1){b[e].style.zIndex=h[k];b[k].style.zIndex=h[e]}else{if(h[e]>0){b[e].style.zIndex=h[e]-1}}}else{for(g=0;g<h.length;g++){if(h[g]>h[e]){k=g;break}}if(k>-1){b[e].style.zIndex=h[k];b[k].style.zIndex=h[e]}else{b[e].style.zIndex=h[e]+1}}c.execCommand("mceRepaint")},_getParentLayer:function(b){return this.editor.dom.getParent(b,function(c){return c.nodeType==1&&/^(absolute|relative|static)$/i.test(c.style.position)})},_insertLayer:function(){var c=this.editor,e=c.dom,d=e.getPos(e.getParent(c.selection.getNode(),"*")),b=c.getBody();c.dom.add(b,"div",{style:{position:"absolute",left:d.x,top:(d.y>20?d.y:20),width:100,height:100},"class":"mceItemVisualAid mceItemLayer"},c.selection.getContent()||c.getLang("layer.content"));if(tinymce.isIE){e.setHTML(b,b.innerHTML)}},_toggleAbsolute:function(){var b=this.editor,c=this._getParentLayer(b.selection.getNode());if(!c){c=b.dom.getParent(b.selection.getNode(),"DIV,P,IMG")}if(c){if(c.style.position.toLowerCase()=="absolute"){b.dom.setStyles(c,{position:"",left:"",top:"",width:"",height:""});b.dom.removeClass(c,"mceItemVisualAid");b.dom.removeClass(c,"mceItemLayer")}else{if(c.style.left==""){c.style.left=20+"px"}if(c.style.top==""){c.style.top=20+"px"}if(c.style.width==""){c.style.width=c.width?(c.width+"px"):"100px"}if(c.style.height==""){c.style.height=c.height?(c.height+"px"):"100px"}c.style.position="absolute";b.dom.setAttrib(c,"data-mce-style","");b.addVisual(b.getBody())}b.execCommand("mceRepaint");b.nodeChanged()}}});tinymce.PluginManager.add("layer",tinymce.plugins.Layer)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/layer/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/layer/editor_plugin_src.js
index d31978bf6..8cbb85805 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/layer/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/layer/editor_plugin_src.js
@@ -54,7 +54,7 @@
 			// Remove serialized styles when selecting a layer since it might be changed by a drag operation
 			ed.onMouseUp.add(function(ed, e) {
 				var layer = findParentLayer(e.target);
-	
+
 				if (layer) {
 					ed.dom.setAttrib(layer, 'data-mce-style', '');
 				}
@@ -139,7 +139,7 @@
 			nl = [];
 			tinymce.walk(ed.getBody(), function(n) {
 				if (n.nodeType == 1 && /^(absolute|relative|static)$/i.test(n.style.position))
-					nl.push(n); 
+					nl.push(n);
 			}, 'childNodes');
 
 			// Find z-indexes
@@ -259,4 +259,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('layer', tinymce.plugins.Layer);
-})();
\ No newline at end of file
+})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/legacyoutput/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/legacyoutput/editor_plugin.js
index 2ed5f41ae..08df0a97b 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/legacyoutput/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/legacyoutput/editor_plugin.js
@@ -1 +1 @@
-(function(a){a.onAddEditor.addToTop(function(c,b){b.settings.inline_styles=false});a.create("tinymce.plugins.LegacyOutput",{init:function(b){b.onInit.add(function(){var c="p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img",e=a.explode(b.settings.font_size_style_values),d=b.schema;b.formatter.register({alignleft:{selector:c,attributes:{align:"left"}},aligncenter:{selector:c,attributes:{align:"center"}},alignright:{selector:c,attributes:{align:"right"}},alignfull:{selector:c,attributes:{align:"justify"}},bold:[{inline:"b",remove:"all"},{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}}],italic:[{inline:"i",remove:"all"},{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}}],underline:[{inline:"u",remove:"all"},{inline:"span",styles:{textDecoration:"underline"},exact:true}],strikethrough:[{inline:"strike",remove:"all"},{inline:"span",styles:{textDecoration:"line-through"},exact:true}],fontname:{inline:"font",attributes:{face:"%value"}},fontsize:{inline:"font",attributes:{size:function(f){return a.inArray(e,f.value)+1}}},forecolor:{inline:"font",attributes:{color:"%value"}},hilitecolor:{inline:"font",styles:{backgroundColor:"%value"}}});a.each("b,i,u,strike".split(","),function(f){d.addValidElements(f+"[*]")});if(!d.getElementRule("font")){d.addValidElements("font[face|size|color|style]")}a.each(c.split(","),function(f){var h=d.getElementRule(f),g;if(h){if(!h.attributes.align){h.attributes.align={};h.attributesOrder.push("align")}}});b.onNodeChange.add(function(g,k){var j,f,h,i;f=g.dom.getParent(g.selection.getNode(),"font");if(f){h=f.face;i=f.size}if(j=k.get("fontselect")){j.select(function(l){return l==h})}if(j=k.get("fontsizeselect")){j.select(function(m){var l=a.inArray(e,m.fontSize);return l+1==i})}})})},getInfo:function(){return{longname:"LegacyOutput",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/legacyoutput",version:a.majorVersion+"."+a.minorVersion}}});a.PluginManager.add("legacyoutput",a.plugins.LegacyOutput)})(tinymce);
\ No newline at end of file
+(function(a){a.onAddEditor.addToTop(function(c,b){b.settings.inline_styles=false});a.create("tinymce.plugins.LegacyOutput",{init:function(b){b.onInit.add(function(){var c="p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img",e=a.explode(b.settings.font_size_style_values),d=b.schema;b.formatter.register({alignleft:{selector:c,attributes:{align:"left"}},aligncenter:{selector:c,attributes:{align:"center"}},alignright:{selector:c,attributes:{align:"right"}},alignfull:{selector:c,attributes:{align:"justify"}},bold:[{inline:"b",remove:"all"},{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}}],italic:[{inline:"i",remove:"all"},{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}}],underline:[{inline:"u",remove:"all"},{inline:"span",styles:{textDecoration:"underline"},exact:true}],strikethrough:[{inline:"strike",remove:"all"},{inline:"span",styles:{textDecoration:"line-through"},exact:true}],fontname:{inline:"font",attributes:{face:"%value"}},fontsize:{inline:"font",attributes:{size:function(f){return a.inArray(e,f.value)+1}}},forecolor:{inline:"font",attributes:{color:"%value"}},hilitecolor:{inline:"font",styles:{backgroundColor:"%value"}}});a.each("b,i,u,strike".split(","),function(f){d.addValidElements(f+"[*]")});if(!d.getElementRule("font")){d.addValidElements("font[face|size|color|style]")}a.each(c.split(","),function(f){var h=d.getElementRule(f),g;if(h){if(!h.attributes.align){h.attributes.align={};h.attributesOrder.push("align")}}});b.onNodeChange.add(function(g,k){var j,f,h,i;f=g.dom.getParent(g.selection.getNode(),"font");if(f){h=f.face;i=f.size}if(j=k.get("fontselect")){j.select(function(l){return l==h})}if(j=k.get("fontsizeselect")){j.select(function(m){var l=a.inArray(e,m.fontSize);return l+1==i})}})})},getInfo:function(){return{longname:"LegacyOutput",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/legacyoutput",version:a.majorVersion+"."+a.minorVersion}}});a.PluginManager.add("legacyoutput",a.plugins.LegacyOutput)})(tinymce);
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/lists/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/lists/editor_plugin.js
index ec21b256e..03d9711a1 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/lists/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/lists/editor_plugin.js
@@ -1 +1 @@
-(function(){var e=tinymce.each,r=tinymce.dom.Event,g;function p(t,s){while(t&&(t.nodeType===8||(t.nodeType===3&&/^[ \t\n\r]*$/.test(t.nodeValue)))){t=s(t)}return t}function b(s){return p(s,function(t){return t.previousSibling})}function i(s){return p(s,function(t){return t.nextSibling})}function d(s,u,t){return s.dom.getParent(u,function(v){return tinymce.inArray(t,v)!==-1})}function n(s){return s&&(s.tagName==="OL"||s.tagName==="UL")}function c(u,v){var t,w,s;t=b(u.lastChild);while(n(t)){w=t;t=b(w.previousSibling)}if(w){s=v.create("li",{style:"list-style-type: none;"});v.split(u,w);v.insertAfter(s,w);s.appendChild(w);s.appendChild(w);u=s.previousSibling}return u}function m(t,s,u){t=a(t,s,u);return o(t,s,u)}function a(u,s,v){var t=b(u.previousSibling);if(t){return h(t,u,s?t:false,v)}else{return u}}function o(u,t,v){var s=i(u.nextSibling);if(s){return h(u,s,t?s:false,v)}else{return u}}function h(u,s,t,v){if(l(u,s,!!t,v)){return f(u,s,t)}else{if(u&&u.tagName==="LI"&&n(s)){u.appendChild(s)}}return s}function l(u,t,s,v){if(!u||!t){return false}else{if(u.tagName==="LI"&&t.tagName==="LI"){return t.style.listStyleType==="none"||j(t)}else{if(n(u)){return(u.tagName===t.tagName&&(s||u.style.listStyleType===t.style.listStyleType))||q(t)}else{return v&&u.tagName==="P"&&t.tagName==="P"}}}}function q(t){var s=i(t.firstChild),u=b(t.lastChild);return s&&u&&n(t)&&s===u&&(n(s)||s.style.listStyleType==="none"||j(s))}function j(u){var t=i(u.firstChild),s=b(u.lastChild);return t&&s&&t===s&&n(t)}function f(w,v,s){var u=b(w.lastChild),t=i(v.firstChild);if(w.tagName==="P"){w.appendChild(w.ownerDocument.createElement("br"))}while(v.firstChild){w.appendChild(v.firstChild)}if(s){w.style.listStyleType=s.style.listStyleType}v.parentNode.removeChild(v);h(u,t,false);return w}function k(t,u){var s;if(!u.is(t,"li,ol,ul")){s=u.getParent(t,"li");if(s){t=s}}return t}tinymce.create("tinymce.plugins.Lists",{init:function(y){var v="TABBING";var s="EMPTY";var J="ESCAPE";var z="PARAGRAPH";var N="UNKNOWN";var x=N;function E(U){return U.keyCode===tinymce.VK.TAB&&!(U.altKey||U.ctrlKey)&&(y.queryCommandState("InsertUnorderedList")||y.queryCommandState("InsertOrderedList"))}function w(){var U=B();var W=U.parentNode.parentNode;var V=U.parentNode.lastChild===U;return V&&!t(W)&&P(U)}function t(U){if(n(U)){return U.parentNode&&U.parentNode.tagName==="LI"}else{return U.tagName==="LI"}}function F(){return y.selection.isCollapsed()&&P(B())}function B(){var U=y.selection.getStart();return((U.tagName=="BR"||U.tagName=="")&&U.parentNode.tagName=="LI")?U.parentNode:U}function P(U){var V=U.childNodes.length;if(U.tagName==="LI"){return V==0?true:V==1&&(U.firstChild.tagName==""||U.firstChild.tagName=="BR"||H(U))}return false}function H(U){var V=tinymce.grep(U.parentNode.childNodes,function(Y){return Y.tagName=="LI"});var W=U==V[V.length-1];var X=U.firstChild;return tinymce.isIE9&&W&&(X.nodeValue==String.fromCharCode(160)||X.nodeValue==String.fromCharCode(32))}function T(U){return U.keyCode===tinymce.VK.ENTER}function A(U){return T(U)&&!U.shiftKey}function M(U){if(E(U)){return v}else{if(A(U)&&w()){return N}else{if(A(U)&&F()){return s}else{return N}}}}function D(U,V){if(x==v||x==s||tinymce.isGecko&&x==J){r.cancel(V)}}function C(){var U=y.selection.getRng(true);var V=U.startContainer;if(V.nodeType==3){var W=V.nodeValue;if(tinymce.isIE9&&W.length>1&&W.charCodeAt(W.length-1)==32){return(U.endOffset==W.length-1)}else{return(U.endOffset==W.length)}}else{if(V.nodeType==1){return U.endOffset==V.childNodes.length}}return false}function I(){var W=y.selection.getNode();var V="h1,h2,h3,h4,h5,h6,p,div";var U=y.dom.is(W,V)&&W.parentNode.tagName==="LI"&&W.parentNode.lastChild===W;return y.selection.isCollapsed()&&U&&C()}function K(W,Y){if(A(Y)&&I()){var X=W.selection.getNode();var V=W.dom.create("li");var U=W.dom.getParent(X,"li");W.dom.insertAfter(V,U);if(tinymce.isIE6||tinymce.isIE7||tinyMCE.isIE8){W.selection.setCursorLocation(V,1)}else{W.selection.setCursorLocation(V,0)}Y.preventDefault()}}function u(X,Z){var ac;if(!tinymce.isGecko){return}var V=X.selection.getStart();if(Z.keyCode!=tinymce.VK.BACKSPACE||V.tagName!=="IMG"){return}function W(ag){var ah=ag.firstChild;var af=null;do{if(!ah){break}if(ah.tagName==="LI"){af=ah}}while(ah=ah.nextSibling);return af}function ae(ag,af){while(ag.childNodes.length>0){af.appendChild(ag.childNodes[0])}}ac=V.parentNode.previousSibling;if(!ac){return}var aa;if(ac.tagName==="UL"||ac.tagName==="OL"){aa=ac}else{if(ac.previousSibling&&(ac.previousSibling.tagName==="UL"||ac.previousSibling.tagName==="OL")){aa=ac.previousSibling}else{return}}var ad=W(aa);var U=X.dom.createRng();U.setStart(ad,1);U.setEnd(ad,1);X.selection.setRng(U);X.selection.collapse(true);var Y=X.selection.getBookmark();var ab=V.parentNode.cloneNode(true);if(ab.tagName==="P"||ab.tagName==="DIV"){ae(ab,ad)}else{ad.appendChild(ab)}V.parentNode.parentNode.removeChild(V.parentNode);X.selection.moveToBookmark(Y)}function G(U){var V=y.dom.getParent(U,"ol,ul");if(V!=null){var W=V.lastChild;y.selection.setCursorLocation(W,0)}}this.ed=y;y.addCommand("Indent",this.indent,this);y.addCommand("Outdent",this.outdent,this);y.addCommand("InsertUnorderedList",function(){this.applyList("UL","OL")},this);y.addCommand("InsertOrderedList",function(){this.applyList("OL","UL")},this);y.onInit.add(function(){y.editorCommands.addCommands({outdent:function(){var V=y.selection,W=y.dom;function U(X){X=W.getParent(X,W.isBlock);return X&&(parseInt(y.dom.getStyle(X,"margin-left")||0,10)+parseInt(y.dom.getStyle(X,"padding-left")||0,10))>0}return U(V.getStart())||U(V.getEnd())||y.queryCommandState("InsertOrderedList")||y.queryCommandState("InsertUnorderedList")}},"state")});y.onKeyUp.add(function(V,W){if(x==v){V.execCommand(W.shiftKey?"Outdent":"Indent",true,null);x=N;return r.cancel(W)}else{if(x==s){var U=B();var Y=V.settings.list_outdent_on_enter===true||W.shiftKey;V.execCommand(Y?"Outdent":"Indent",true,null);if(tinymce.isIE){G(U)}return r.cancel(W)}else{if(x==J){if(tinymce.isIE6||tinymce.isIE7||tinymce.isIE8){var X=V.getDoc().createTextNode("\uFEFF");V.selection.getNode().appendChild(X)}else{if(tinymce.isIE9||tinymce.isGecko){V.execCommand("Outdent");return r.cancel(W)}}}}}});function L(V,U){var W=y.getDoc().createTextNode("\uFEFF");V.insertBefore(W,U);y.selection.setCursorLocation(W,0);y.execCommand("mceRepaint")}function R(V,X){if(T(X)){var U=B();if(U){var W=U.parentNode;var Y=W&&W.parentNode;if(Y&&Y.nodeName=="LI"&&Y.firstChild==W&&U==W.firstChild){L(Y,W)}}}}function S(V,X){if(T(X)){var U=B();if(V.dom.select("ul li",U).length===1){var W=U.firstChild;L(U,W)}}}function Q(W,aa){function X(ab){var ad=[];var ae=new tinymce.dom.TreeWalker(ab.firstChild,ab);for(var ac=ae.current();ac;ac=ae.next()){if(W.dom.is(ac,"ol,ul,li")){ad.push(ac)}}return ad}if(aa.keyCode==tinymce.VK.BACKSPACE){var U=B();if(U){var Z=W.dom.getParent(U,"ol,ul"),V=W.selection.getRng();if(Z&&Z.firstChild===U&&V.startOffset==0){var Y=X(U);Y.unshift(U);W.execCommand("Outdent",false,Y);W.undoManager.add();return r.cancel(aa)}}}}function O(V,X){var U=B();if(X.keyCode===tinymce.VK.BACKSPACE&&V.dom.is(U,"li")&&U.parentNode.firstChild!==U){if(V.dom.select("ul,ol",U).length===1){var Z=U.previousSibling;V.dom.remove(V.dom.select("br",U));V.dom.remove(U,true);var W=tinymce.grep(Z.childNodes,function(aa){return aa.nodeType===3});if(W.length===1){var Y=W[0];V.selection.setCursorLocation(Y,Y.length)}V.undoManager.add();return r.cancel(X)}}}y.onKeyDown.add(function(U,V){x=M(V)});y.onKeyDown.add(D);y.onKeyDown.add(u);y.onKeyDown.add(K);if(tinymce.isGecko){y.onKeyUp.add(R)}if(tinymce.isIE8){y.onKeyUp.add(S)}if(tinymce.isGecko||tinymce.isWebKit){y.onKeyDown.add(Q)}if(tinymce.isWebKit){y.onKeyDown.add(O)}},applyList:function(y,v){var C=this,z=C.ed,I=z.dom,s=[],H=false,u=false,w=false,B,G=z.selection.getSelectedBlocks();function E(t){if(t&&t.tagName==="BR"){I.remove(t)}}function F(M){var N=I.create(y),t;function L(O){if(O.style.marginLeft||O.style.paddingLeft){C.adjustPaddingFunction(false)(O)}}if(M.tagName==="LI"){}else{if(M.tagName==="P"||M.tagName==="DIV"||M.tagName==="BODY"){K(M,function(P,O){J(P,O,M.tagName==="BODY"?null:P.parentNode);t=P.parentNode;L(t);E(O)});if(t){if(t.tagName==="LI"&&(M.tagName==="P"||G.length>1)){I.split(t.parentNode.parentNode,t.parentNode)}m(t.parentNode,true)}return}else{t=I.create("li");I.insertAfter(t,M);t.appendChild(M);L(M);M=t}}I.insertAfter(N,M);N.appendChild(M);m(N,true);s.push(M)}function J(P,L,N){var t,O=P,M;while(!I.isBlock(P.parentNode)&&P.parentNode!==I.getRoot()){P=I.split(P.parentNode,P.previousSibling);P=P.nextSibling;O=P}if(N){t=N.cloneNode(true);P.parentNode.insertBefore(t,P);while(t.firstChild){I.remove(t.firstChild)}t=I.rename(t,"li")}else{t=I.create("li");P.parentNode.insertBefore(t,P)}while(O&&O!=L){M=O.nextSibling;t.appendChild(O);O=M}if(t.childNodes.length===0){t.innerHTML='<br _mce_bogus="1" />'}F(t)}function K(Q,T){var N,R,O=3,L=1,t="br,ul,ol,p,div,h1,h2,h3,h4,h5,h6,table,blockquote,address,pre,form,center,dl";function P(X,U){var V=I.createRng(),W;g.keep=true;z.selection.moveToBookmark(g);g.keep=false;W=z.selection.getRng(true);if(!U){U=X.parentNode.lastChild}V.setStartBefore(X);V.setEndAfter(U);return !(V.compareBoundaryPoints(O,W)>0||V.compareBoundaryPoints(L,W)<=0)}function S(U){if(U.nextSibling){return U.nextSibling}if(!I.isBlock(U.parentNode)&&U.parentNode!==I.getRoot()){return S(U.parentNode)}}N=Q.firstChild;var M=false;e(I.select(t,Q),function(U){if(U.hasAttribute&&U.hasAttribute("_mce_bogus")){return true}if(P(N,U)){I.addClass(U,"_mce_tagged_br");N=S(U)}});M=(N&&P(N,undefined));N=Q.firstChild;e(I.select(t,Q),function(V){var U=S(V);if(V.hasAttribute&&V.hasAttribute("_mce_bogus")){return true}if(I.hasClass(V,"_mce_tagged_br")){T(N,V,R);R=null}else{R=V}N=U});if(M){T(N,undefined,R)}}function D(t){K(t,function(M,L,N){J(M,L);E(L);E(N)})}function A(t){if(tinymce.inArray(s,t)!==-1){return}if(t.parentNode.tagName===v){I.split(t.parentNode,t);F(t);o(t.parentNode,false)}s.push(t)}function x(M){var O,N,L,t;if(tinymce.inArray(s,M)!==-1){return}M=c(M,I);while(I.is(M.parentNode,"ol,ul,li")){I.split(M.parentNode,M)}s.push(M);M=I.rename(M,"p");L=m(M,false,z.settings.force_br_newlines);if(L===M){O=M.firstChild;while(O){if(I.isBlock(O)){O=I.split(O.parentNode,O);t=true;N=O.nextSibling&&O.nextSibling.firstChild}else{N=O.nextSibling;if(t&&O.tagName==="BR"){I.remove(O)}t=false}O=N}}}e(G,function(t){t=k(t,I);if(t.tagName===v||(t.tagName==="LI"&&t.parentNode.tagName===v)){u=true}else{if(t.tagName===y||(t.tagName==="LI"&&t.parentNode.tagName===y)){H=true}else{w=true}}});if(w&&!H||u||G.length===0){B={LI:A,H1:F,H2:F,H3:F,H4:F,H5:F,H6:F,P:F,BODY:F,DIV:G.length>1?F:D,defaultAction:D,elements:this.selectedBlocks()}}else{B={defaultAction:x,elements:this.selectedBlocks(),processEvenIfEmpty:true}}this.process(B)},indent:function(){var u=this.ed,w=u.dom,x=[];function s(z){var y=w.create("li",{style:"list-style-type: none;"});w.insertAfter(y,z);return y}function t(B){var y=s(B),D=w.getParent(B,"ol,ul"),C=D.tagName,E=w.getStyle(D,"list-style-type"),A={},z;if(E!==""){A.style="list-style-type: "+E+";"}z=w.create(C,A);y.appendChild(z);return z}function v(z){if(!d(u,z,x)){z=c(z,w);var y=t(z);y.appendChild(z);m(y.parentNode,false);m(y,false);x.push(z)}}this.process({LI:v,defaultAction:this.adjustPaddingFunction(true),elements:this.selectedBlocks()})},outdent:function(y,x){var w=this,u=w.ed,z=u.dom,s=[];function A(t){var C,B,D;if(!d(u,t,s)){if(z.getStyle(t,"margin-left")!==""||z.getStyle(t,"padding-left")!==""){return w.adjustPaddingFunction(false)(t)}D=z.getStyle(t,"text-align",true);if(D==="center"||D==="right"){z.setStyle(t,"text-align","left");return}t=c(t,z);C=t.parentNode;B=t.parentNode.parentNode;if(B.tagName==="P"){z.split(B,t.parentNode)}else{z.split(C,t);if(B.tagName==="LI"){z.split(B,t)}else{if(!z.is(B,"ol,ul")){z.rename(t,"p")}}}s.push(t)}}var v=x&&tinymce.is(x,"array")?x:this.selectedBlocks();this.process({LI:A,defaultAction:this.adjustPaddingFunction(false),elements:v});e(s,m)},process:function(y){var F=this,w=F.ed.selection,z=F.ed.dom,E,u;function B(t){var s=tinymce.grep(t.childNodes,function(H){return !(H.nodeName==="BR"||H.nodeName==="SPAN"&&z.getAttrib(H,"data-mce-type")=="bookmark"||H.nodeType==3&&(H.nodeValue==String.fromCharCode(160)||H.nodeValue==""))});return s.length===0}function x(s){z.removeClass(s,"_mce_act_on");if(!s||s.nodeType!==1||!y.processEvenIfEmpty&&E.length>1&&B(s)){return}s=k(s,z);var t=y[s.tagName];if(!t){t=y.defaultAction}t(s)}function v(s){F.splitSafeEach(s.childNodes,x,true)}function C(s,t){return t>=0&&s.hasChildNodes()&&t<s.childNodes.length&&s.childNodes[t].tagName==="BR"}function D(){var t=w.getNode();var s=z.getParent(t,"td");return s!==null}E=y.elements;u=w.getRng(true);if(!u.collapsed){if(C(u.endContainer,u.endOffset-1)){u.setEnd(u.endContainer,u.endOffset-1);w.setRng(u)}if(C(u.startContainer,u.startOffset)){u.setStart(u.startContainer,u.startOffset+1);w.setRng(u)}}if(tinymce.isIE8){var G=F.ed.selection.getNode();if(G.tagName==="LI"&&!(G.parentNode.lastChild===G)){var A=F.ed.getDoc().createTextNode("\uFEFF");G.appendChild(A)}}g=w.getBookmark();y.OL=y.UL=v;F.splitSafeEach(E,x);w.moveToBookmark(g);g=null;if(!D()){F.ed.execCommand("mceRepaint")}},splitSafeEach:function(u,t,s){if(s||(tinymce.isGecko&&(/Firefox\/[12]\.[0-9]/.test(navigator.userAgent)||/Firefox\/3\.[0-4]/.test(navigator.userAgent)))){this.classBasedEach(u,t)}else{e(u,t)}},classBasedEach:function(v,u){var w=this.ed.dom,s,t;e(v,function(x){w.addClass(x,"_mce_act_on")});s=w.select("._mce_act_on");while(s.length>0){t=s.shift();w.removeClass(t,"_mce_act_on");u(t);s=w.select("._mce_act_on")}},adjustPaddingFunction:function(u){var s,v,t=this.ed;s=t.settings.indentation;v=/[a-z%]+/i.exec(s);s=parseInt(s,10);return function(w){var y,x;y=parseInt(t.dom.getStyle(w,"margin-left")||0,10)+parseInt(t.dom.getStyle(w,"padding-left")||0,10);if(u){x=y+s}else{x=y-s}t.dom.setStyle(w,"padding-left","");t.dom.setStyle(w,"margin-left",x>0?x+v:"")}},selectedBlocks:function(){var s=this.ed,t=s.selection.getSelectedBlocks();return t.length==0?[s.dom.getRoot()]:t},getInfo:function(){return{longname:"Lists",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/lists",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("lists",tinymce.plugins.Lists)}());
\ No newline at end of file
+(function(){var e=tinymce.each,r=tinymce.dom.Event,g;function p(t,s){while(t&&(t.nodeType===8||(t.nodeType===3&&/^[ \t\n\r]*$/.test(t.nodeValue)))){t=s(t)}return t}function b(s){return p(s,function(t){return t.previousSibling})}function i(s){return p(s,function(t){return t.nextSibling})}function d(s,u,t){return s.dom.getParent(u,function(v){return tinymce.inArray(t,v)!==-1})}function n(s){return s&&(s.tagName==="OL"||s.tagName==="UL")}function c(u,v){var t,w,s;t=b(u.lastChild);while(n(t)){w=t;t=b(w.previousSibling)}if(w){s=v.create("li",{style:"list-style-type: none;"});v.split(u,w);v.insertAfter(s,w);s.appendChild(w);s.appendChild(w);u=s.previousSibling}return u}function m(t,s,u){t=a(t,s,u);return o(t,s,u)}function a(u,s,v){var t=b(u.previousSibling);if(t){return h(t,u,s?t:false,v)}else{return u}}function o(u,t,v){var s=i(u.nextSibling);if(s){return h(u,s,t?s:false,v)}else{return u}}function h(u,s,t,v){if(l(u,s,!!t,v)){return f(u,s,t)}else{if(u&&u.tagName==="LI"&&n(s)){u.appendChild(s)}}return s}function l(u,t,s,v){if(!u||!t){return false}else{if(u.tagName==="LI"&&t.tagName==="LI"){return t.style.listStyleType==="none"||j(t)}else{if(n(u)){return(u.tagName===t.tagName&&(s||u.style.listStyleType===t.style.listStyleType))||q(t)}else{return v&&u.tagName==="P"&&t.tagName==="P"}}}}function q(t){var s=i(t.firstChild),u=b(t.lastChild);return s&&u&&n(t)&&s===u&&(n(s)||s.style.listStyleType==="none"||j(s))}function j(u){var t=i(u.firstChild),s=b(u.lastChild);return t&&s&&t===s&&n(t)}function f(w,v,s){var u=b(w.lastChild),t=i(v.firstChild);if(w.tagName==="P"){w.appendChild(w.ownerDocument.createElement("br"))}while(v.firstChild){w.appendChild(v.firstChild)}if(s){w.style.listStyleType=s.style.listStyleType}v.parentNode.removeChild(v);h(u,t,false);return w}function k(t,u){var s;if(!u.is(t,"li,ol,ul")){s=u.getParent(t,"li");if(s){t=s}}return t}tinymce.create("tinymce.plugins.Lists",{init:function(y){var v="TABBING";var s="EMPTY";var J="ESCAPE";var z="PARAGRAPH";var N="UNKNOWN";var x=N;function E(U){return U.keyCode===tinymce.VK.TAB&&!(U.altKey||U.ctrlKey)&&(y.queryCommandState("InsertUnorderedList")||y.queryCommandState("InsertOrderedList"))}function w(){var U=B();var W=U.parentNode.parentNode;var V=U.parentNode.lastChild===U;return V&&!t(W)&&P(U)}function t(U){if(n(U)){return U.parentNode&&U.parentNode.tagName==="LI"}else{return U.tagName==="LI"}}function F(){return y.selection.isCollapsed()&&P(B())}function B(){var U=y.selection.getStart();return((U.tagName=="BR"||U.tagName=="")&&U.parentNode.tagName=="LI")?U.parentNode:U}function P(U){var V=U.childNodes.length;if(U.tagName==="LI"){return V==0?true:V==1&&(U.firstChild.tagName==""||U.firstChild.tagName=="BR"||H(U))}return false}function H(U){var V=tinymce.grep(U.parentNode.childNodes,function(Y){return Y.tagName=="LI"});var W=U==V[V.length-1];var X=U.firstChild;return tinymce.isIE9&&W&&(X.nodeValue==String.fromCharCode(160)||X.nodeValue==String.fromCharCode(32))}function T(U){return U.keyCode===tinymce.VK.ENTER}function A(U){return T(U)&&!U.shiftKey}function M(U){if(E(U)){return v}else{if(A(U)&&w()){return N}else{if(A(U)&&F()){return s}else{return N}}}}function D(U,V){if(x==v||x==s||tinymce.isGecko&&x==J){r.cancel(V)}}function C(){var U=y.selection.getRng(true);var V=U.startContainer;if(V.nodeType==3){var W=V.nodeValue;if(tinymce.isIE9&&W.length>1&&W.charCodeAt(W.length-1)==32){return(U.endOffset==W.length-1)}else{return(U.endOffset==W.length)}}else{if(V.nodeType==1){return U.endOffset==V.childNodes.length}}return false}function I(){var W=y.selection.getNode();var V="h1,h2,h3,h4,h5,h6,p,div";var U=y.dom.is(W,V)&&W.parentNode.tagName==="LI"&&W.parentNode.lastChild===W;return y.selection.isCollapsed()&&U&&C()}function K(W,Y){if(A(Y)&&I()){var X=W.selection.getNode();var V=W.dom.create("li");var U=W.dom.getParent(X,"li");W.dom.insertAfter(V,U);if(tinymce.isIE6||tinymce.isIE7||tinyMCE.isIE8){W.selection.setCursorLocation(V,1)}else{W.selection.setCursorLocation(V,0)}Y.preventDefault()}}function u(X,Z){var ac;if(!tinymce.isGecko){return}var V=X.selection.getStart();if(Z.keyCode!=tinymce.VK.BACKSPACE||V.tagName!=="IMG"){return}function W(ag){var ah=ag.firstChild;var af=null;do{if(!ah){break}if(ah.tagName==="LI"){af=ah}}while(ah=ah.nextSibling);return af}function ae(ag,af){while(ag.childNodes.length>0){af.appendChild(ag.childNodes[0])}}ac=V.parentNode.previousSibling;if(!ac){return}var aa;if(ac.tagName==="UL"||ac.tagName==="OL"){aa=ac}else{if(ac.previousSibling&&(ac.previousSibling.tagName==="UL"||ac.previousSibling.tagName==="OL")){aa=ac.previousSibling}else{return}}var ad=W(aa);var U=X.dom.createRng();U.setStart(ad,1);U.setEnd(ad,1);X.selection.setRng(U);X.selection.collapse(true);var Y=X.selection.getBookmark();var ab=V.parentNode.cloneNode(true);if(ab.tagName==="P"||ab.tagName==="DIV"){ae(ab,ad)}else{ad.appendChild(ab)}V.parentNode.parentNode.removeChild(V.parentNode);X.selection.moveToBookmark(Y)}function G(U){var V=y.dom.getParent(U,"ol,ul");if(V!=null){var W=V.lastChild;y.selection.setCursorLocation(W,0)}}this.ed=y;y.addCommand("Indent",this.indent,this);y.addCommand("Outdent",this.outdent,this);y.addCommand("InsertUnorderedList",function(){this.applyList("UL","OL")},this);y.addCommand("InsertOrderedList",function(){this.applyList("OL","UL")},this);y.onInit.add(function(){y.editorCommands.addCommands({outdent:function(){var V=y.selection,W=y.dom;function U(X){X=W.getParent(X,W.isBlock);return X&&(parseInt(y.dom.getStyle(X,"margin-left")||0,10)+parseInt(y.dom.getStyle(X,"padding-left")||0,10))>0}return U(V.getStart())||U(V.getEnd())||y.queryCommandState("InsertOrderedList")||y.queryCommandState("InsertUnorderedList")}},"state")});y.onKeyUp.add(function(V,W){if(x==v){V.execCommand(W.shiftKey?"Outdent":"Indent",true,null);x=N;return r.cancel(W)}else{if(x==s){var U=B();var Y=V.settings.list_outdent_on_enter===true||W.shiftKey;V.execCommand(Y?"Outdent":"Indent",true,null);if(tinymce.isIE){G(U)}return r.cancel(W)}else{if(x==J){if(tinymce.isIE6||tinymce.isIE7||tinymce.isIE8){var X=V.getDoc().createTextNode("\uFEFF");V.selection.getNode().appendChild(X)}else{if(tinymce.isIE9||tinymce.isGecko){V.execCommand("Outdent");return r.cancel(W)}}}}}});function L(V,U){var W=y.getDoc().createTextNode("\uFEFF");V.insertBefore(W,U);y.selection.setCursorLocation(W,0);y.execCommand("mceRepaint")}function R(V,X){if(T(X)){var U=B();if(U){var W=U.parentNode;var Y=W&&W.parentNode;if(Y&&Y.nodeName=="LI"&&Y.firstChild==W&&U==W.firstChild){L(Y,W)}}}}function S(V,X){if(T(X)){var U=B();if(V.dom.select("ul li",U).length===1){var W=U.firstChild;L(U,W)}}}function Q(W,aa){function X(ab){var ad=[];var ae=new tinymce.dom.TreeWalker(ab.firstChild,ab);for(var ac=ae.current();ac;ac=ae.next()){if(W.dom.is(ac,"ol,ul,li")){ad.push(ac)}}return ad}if(aa.keyCode==tinymce.VK.BACKSPACE){var U=B();if(U){var Z=W.dom.getParent(U,"ol,ul"),V=W.selection.getRng();if(Z&&Z.firstChild===U&&V.startOffset==0){var Y=X(U);Y.unshift(U);W.execCommand("Outdent",false,Y);W.undoManager.add();return r.cancel(aa)}}}}function O(V,X){var U=B();if(X.keyCode===tinymce.VK.BACKSPACE&&V.dom.is(U,"li")&&U.parentNode.firstChild!==U){if(V.dom.select("ul,ol",U).length===1){var Z=U.previousSibling;V.dom.remove(V.dom.select("br",U));V.dom.remove(U,true);var W=tinymce.grep(Z.childNodes,function(aa){return aa.nodeType===3});if(W.length===1){var Y=W[0];V.selection.setCursorLocation(Y,Y.length)}V.undoManager.add();return r.cancel(X)}}}y.onKeyDown.add(function(U,V){x=M(V)});y.onKeyDown.add(D);y.onKeyDown.add(u);y.onKeyDown.add(K);if(tinymce.isGecko){y.onKeyUp.add(R)}if(tinymce.isIE8){y.onKeyUp.add(S)}if(tinymce.isGecko||tinymce.isWebKit){y.onKeyDown.add(Q)}if(tinymce.isWebKit){y.onKeyDown.add(O)}},applyList:function(y,v){var C=this,z=C.ed,I=z.dom,s=[],H=false,u=false,w=false,B,G=z.selection.getSelectedBlocks();function E(t){if(t&&t.tagName==="BR"){I.remove(t)}}function F(M){var N=I.create(y),t;function L(O){if(O.style.marginLeft||O.style.paddingLeft){C.adjustPaddingFunction(false)(O)}}if(M.tagName==="LI"){}else{if(M.tagName==="P"||M.tagName==="DIV"||M.tagName==="BODY"){K(M,function(P,O){J(P,O,M.tagName==="BODY"?null:P.parentNode);t=P.parentNode;L(t);E(O)});if(t){if(t.tagName==="LI"&&(M.tagName==="P"||G.length>1)){I.split(t.parentNode.parentNode,t.parentNode)}m(t.parentNode,true)}return}else{t=I.create("li");I.insertAfter(t,M);t.appendChild(M);L(M);M=t}}I.insertAfter(N,M);N.appendChild(M);m(N,true);s.push(M)}function J(P,L,N){var t,O=P,M;while(!I.isBlock(P.parentNode)&&P.parentNode!==I.getRoot()){P=I.split(P.parentNode,P.previousSibling);P=P.nextSibling;O=P}if(N){t=N.cloneNode(true);P.parentNode.insertBefore(t,P);while(t.firstChild){I.remove(t.firstChild)}t=I.rename(t,"li")}else{t=I.create("li");P.parentNode.insertBefore(t,P)}while(O&&O!=L){M=O.nextSibling;t.appendChild(O);O=M}if(t.childNodes.length===0){t.innerHTML='<br _mce_bogus="1" />'}F(t)}function K(Q,T){var N,R,O=3,L=1,t="br,ul,ol,p,div,h1,h2,h3,h4,h5,h6,table,blockquote,address,pre,form,center,dl";function P(X,U){var V=I.createRng(),W;g.keep=true;z.selection.moveToBookmark(g);g.keep=false;W=z.selection.getRng(true);if(!U){U=X.parentNode.lastChild}V.setStartBefore(X);V.setEndAfter(U);return !(V.compareBoundaryPoints(O,W)>0||V.compareBoundaryPoints(L,W)<=0)}function S(U){if(U.nextSibling){return U.nextSibling}if(!I.isBlock(U.parentNode)&&U.parentNode!==I.getRoot()){return S(U.parentNode)}}N=Q.firstChild;var M=false;e(I.select(t,Q),function(U){if(U.hasAttribute&&U.hasAttribute("_mce_bogus")){return true}if(P(N,U)){I.addClass(U,"_mce_tagged_br");N=S(U)}});M=(N&&P(N,undefined));N=Q.firstChild;e(I.select(t,Q),function(V){var U=S(V);if(V.hasAttribute&&V.hasAttribute("_mce_bogus")){return true}if(I.hasClass(V,"_mce_tagged_br")){T(N,V,R);R=null}else{R=V}N=U});if(M){T(N,undefined,R)}}function D(t){K(t,function(M,L,N){J(M,L);E(L);E(N)})}function A(t){if(tinymce.inArray(s,t)!==-1){return}if(t.parentNode.tagName===v){I.split(t.parentNode,t);F(t);o(t.parentNode,false)}s.push(t)}function x(M){var O,N,L,t;if(tinymce.inArray(s,M)!==-1){return}M=c(M,I);while(I.is(M.parentNode,"ol,ul,li")){I.split(M.parentNode,M)}s.push(M);M=I.rename(M,"p");L=m(M,false,z.settings.force_br_newlines);if(L===M){O=M.firstChild;while(O){if(I.isBlock(O)){O=I.split(O.parentNode,O);t=true;N=O.nextSibling&&O.nextSibling.firstChild}else{N=O.nextSibling;if(t&&O.tagName==="BR"){I.remove(O)}t=false}O=N}}}e(G,function(t){t=k(t,I);if(t.tagName===v||(t.tagName==="LI"&&t.parentNode.tagName===v)){u=true}else{if(t.tagName===y||(t.tagName==="LI"&&t.parentNode.tagName===y)){H=true}else{w=true}}});if(w&&!H||u||G.length===0){B={LI:A,H1:F,H2:F,H3:F,H4:F,H5:F,H6:F,P:F,BODY:F,DIV:G.length>1?F:D,defaultAction:D,elements:this.selectedBlocks()}}else{B={defaultAction:x,elements:this.selectedBlocks(),processEvenIfEmpty:true}}this.process(B)},indent:function(){var u=this.ed,w=u.dom,x=[];function s(z){var y=w.create("li",{style:"list-style-type: none;"});w.insertAfter(y,z);return y}function t(B){var y=s(B),D=w.getParent(B,"ol,ul"),C=D.tagName,E=w.getStyle(D,"list-style-type"),A={},z;if(E!==""){A.style="list-style-type: "+E+";"}z=w.create(C,A);y.appendChild(z);return z}function v(z){if(!d(u,z,x)){z=c(z,w);var y=t(z);y.appendChild(z);m(y.parentNode,false);m(y,false);x.push(z)}}this.process({LI:v,defaultAction:this.adjustPaddingFunction(true),elements:this.selectedBlocks()})},outdent:function(y,x){var w=this,u=w.ed,z=u.dom,s=[];function A(t){var C,B,D;if(!d(u,t,s)){if(z.getStyle(t,"margin-left")!==""||z.getStyle(t,"padding-left")!==""){return w.adjustPaddingFunction(false)(t)}D=z.getStyle(t,"text-align",true);if(D==="center"||D==="right"){z.setStyle(t,"text-align","left");return}t=c(t,z);C=t.parentNode;B=t.parentNode.parentNode;if(B.tagName==="P"){z.split(B,t.parentNode)}else{z.split(C,t);if(B.tagName==="LI"){z.split(B,t)}else{if(!z.is(B,"ol,ul")){z.rename(t,"p")}}}s.push(t)}}var v=x&&tinymce.is(x,"array")?x:this.selectedBlocks();this.process({LI:A,defaultAction:this.adjustPaddingFunction(false),elements:v});e(s,m)},process:function(y){var F=this,w=F.ed.selection,z=F.ed.dom,E,u;function B(t){var s=tinymce.grep(t.childNodes,function(H){return !(H.nodeName==="BR"||H.nodeName==="SPAN"&&z.getAttrib(H,"data-mce-type")=="bookmark"||H.nodeType==3&&(H.nodeValue==String.fromCharCode(160)||H.nodeValue==""))});return s.length===0}function x(s){z.removeClass(s,"_mce_act_on");if(!s||s.nodeType!==1||!y.processEvenIfEmpty&&E.length>1&&B(s)){return}s=k(s,z);var t=y[s.tagName];if(!t){t=y.defaultAction}t(s)}function v(s){F.splitSafeEach(s.childNodes,x,true)}function C(s,t){return t>=0&&s.hasChildNodes()&&t<s.childNodes.length&&s.childNodes[t].tagName==="BR"}function D(){var t=w.getNode();var s=z.getParent(t,"td");return s!==null}E=y.elements;u=w.getRng(true);if(!u.collapsed){if(C(u.endContainer,u.endOffset-1)){u.setEnd(u.endContainer,u.endOffset-1);w.setRng(u)}if(C(u.startContainer,u.startOffset)){u.setStart(u.startContainer,u.startOffset+1);w.setRng(u)}}if(tinymce.isIE8){var G=F.ed.selection.getNode();if(G.tagName==="LI"&&!(G.parentNode.lastChild===G)){var A=F.ed.getDoc().createTextNode("\uFEFF");G.appendChild(A)}}g=w.getBookmark();y.OL=y.UL=v;F.splitSafeEach(E,x);w.moveToBookmark(g);g=null;if(!D()){F.ed.execCommand("mceRepaint")}},splitSafeEach:function(u,t,s){if(s||(tinymce.isGecko&&(/Firefox\/[12]\.[0-9]/.test(navigator.userAgent)||/Firefox\/3\.[0-4]/.test(navigator.userAgent)))){this.classBasedEach(u,t)}else{e(u,t)}},classBasedEach:function(v,u){var w=this.ed.dom,s,t;e(v,function(x){w.addClass(x,"_mce_act_on")});s=w.select("._mce_act_on");while(s.length>0){t=s.shift();w.removeClass(t,"_mce_act_on");u(t);s=w.select("._mce_act_on")}},adjustPaddingFunction:function(u){var s,v,t=this.ed;s=t.settings.indentation;v=/[a-z%]+/i.exec(s);s=parseInt(s,10);return function(w){var y,x;y=parseInt(t.dom.getStyle(w,"margin-left")||0,10)+parseInt(t.dom.getStyle(w,"padding-left")||0,10);if(u){x=y+s}else{x=y-s}t.dom.setStyle(w,"padding-left","");t.dom.setStyle(w,"margin-left",x>0?x+v:"")}},selectedBlocks:function(){var s=this.ed,t=s.selection.getSelectedBlocks();return t.length==0?[s.dom.getRoot()]:t},getInfo:function(){return{longname:"Lists",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/lists",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("lists",tinymce.plugins.Lists)}());
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/media/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/media/editor_plugin.js
index 9ac42e0d2..e6dabe45b 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/media/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/media/editor_plugin.js
@@ -1 +1 @@
-(function(){var b=tinymce.explode("id,name,width,height,style,align,class,hspace,vspace,bgcolor,type"),a=tinymce.makeMap(b.join(",")),f=tinymce.html.Node,d,i,h=tinymce.util.JSON,g;d=[["Flash","d27cdb6e-ae6d-11cf-96b8-444553540000","application/x-shockwave-flash","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["ShockWave","166b1bca-3f9c-11cf-8075-444553540000","application/x-director","http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0"],["WindowsMedia","6bf52a52-394a-11d3-b153-00c04f79faa6,22d6f312-b0f6-11d0-94ab-0080c74c7e95,05589fa1-c356-11ce-bf01-00aa0055595a","application/x-mplayer2","http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701"],["QuickTime","02bf25d5-8c17-4b23-bc80-d3488abddc6b","video/quicktime","http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"],["RealMedia","cfcdaa03-8be4-11cf-b84b-0020afbbccfa","audio/x-pn-realaudio-plugin","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["Java","8ad9c840-044e-11d1-b3e9-00805f499d93","application/x-java-applet","http://java.sun.com/products/plugin/autodl/jinstall-1_5_0-windows-i586.cab#Version=1,5,0,0"],["Silverlight","dfeaf541-f3e1-4c24-acac-99c30715084a","application/x-silverlight-2"],["Iframe"],["Video"],["EmbeddedAudio"],["Audio"]];function e(j){return typeof(j)=="string"?j.replace(/[^0-9%]/g,""):j}function c(m){var l,j,k;if(m&&!m.splice){j=[];for(k=0;true;k++){if(m[k]){j[k]=m[k]}else{break}}return j}return m}tinymce.create("tinymce.plugins.MediaPlugin",{init:function(n,j){var r=this,l={},m,p,q,k;function o(s){return s&&s.nodeName==="IMG"&&n.dom.hasClass(s,"mceItemMedia")}r.editor=n;r.url=j;i="";for(m=0;m<d.length;m++){k=d[m][0];q={name:k,clsids:tinymce.explode(d[m][1]||""),mimes:tinymce.explode(d[m][2]||""),codebase:d[m][3]};for(p=0;p<q.clsids.length;p++){l["clsid:"+q.clsids[p]]=q}for(p=0;p<q.mimes.length;p++){l[q.mimes[p]]=q}l["mceItem"+k]=q;l[k.toLowerCase()]=q;i+=(i?"|":"")+k}tinymce.each(n.getParam("media_types","video=mp4,m4v,ogv,webm;silverlight=xap;flash=swf,flv;shockwave=dcr;quicktime=mov,qt,mpg,mpeg;shockwave=dcr;windowsmedia=avi,wmv,wm,asf,asx,wmx,wvx;realmedia=rm,ra,ram;java=jar;audio=mp3,ogg").split(";"),function(v){var s,u,t;v=v.split(/=/);u=tinymce.explode(v[1].toLowerCase());for(s=0;s<u.length;s++){t=l[v[0].toLowerCase()];if(t){l[u[s]]=t}}});i=new RegExp("write("+i+")\\(([^)]+)\\)");r.lookup=l;n.onPreInit.add(function(){n.schema.addValidElements("object[id|style|width|height|classid|codebase|*],param[name|value],embed[id|style|width|height|type|src|*],video[*],audio[*],source[*]");n.parser.addNodeFilter("object,embed,video,audio,script,iframe",function(s){var t=s.length;while(t--){r.objectToImg(s[t])}});n.serializer.addNodeFilter("img",function(s,u,t){var v=s.length,w;while(v--){w=s[v];if((w.attr("class")||"").indexOf("mceItemMedia")!==-1){r.imgToObject(w,t)}}})});n.onInit.add(function(){if(n.theme&&n.theme.onResolveName){n.theme.onResolveName.add(function(s,t){if(t.name==="img"&&n.dom.hasClass(t.node,"mceItemMedia")){t.name="media"}})}if(n&&n.plugins.contextmenu){n.plugins.contextmenu.onContextMenu.add(function(t,u,s){if(s.nodeName==="IMG"&&s.className.indexOf("mceItemMedia")!==-1){u.add({title:"media.edit",icon:"media",cmd:"mceMedia"})}})}});n.addCommand("mceMedia",function(){var t,s;s=n.selection.getNode();if(o(s)){t=n.dom.getAttrib(s,"data-mce-json");if(t){t=h.parse(t);tinymce.each(b,function(u){var v=n.dom.getAttrib(s,u);if(v){t[u]=v}});t.type=r.getType(s.className).name.toLowerCase()}}if(!t){t={type:"flash",video:{sources:[]},params:{}}}n.windowManager.open({file:j+"/media.htm",width:430+parseInt(n.getLang("media.delta_width",0)),height:500+parseInt(n.getLang("media.delta_height",0)),inline:1},{plugin_url:j,data:t})});n.addButton("media",{title:"media.desc",cmd:"mceMedia"});n.onNodeChange.add(function(t,s,u){s.setActive("media",o(u))})},convertUrl:function(l,o){var k=this,n=k.editor,m=n.settings,p=m.url_converter,j=m.url_converter_scope||k;if(!l){return l}if(o){return n.documentBaseURI.toAbsolute(l)}return p.call(j,l,"src","object")},getInfo:function(){return{longname:"Media",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media",version:tinymce.majorVersion+"."+tinymce.minorVersion}},dataToImg:function(m,k){var r=this,o=r.editor,p=o.documentBaseURI,j,q,n,l;m.params.src=r.convertUrl(m.params.src,k);q=m.video.attrs;if(q){q.src=r.convertUrl(q.src,k)}if(q){q.poster=r.convertUrl(q.poster,k)}j=c(m.video.sources);if(j){for(l=0;l<j.length;l++){j[l].src=r.convertUrl(j[l].src,k)}}n=r.editor.dom.create("img",{id:m.id,style:m.style,align:m.align,hspace:m.hspace,vspace:m.vspace,src:r.editor.theme.url+"/img/trans.gif","class":"mceItemMedia mceItem"+r.getType(m.type).name,"data-mce-json":h.serialize(m,"'")});n.width=m.width=e(m.width||(m.type=="audio"?"300":"320"));n.height=m.height=e(m.height||(m.type=="audio"?"32":"240"));return n},dataToHtml:function(j,k){return this.editor.serializer.serialize(this.dataToImg(j,k),{forced_root_block:"",force_absolute:k})},htmlToData:function(l){var k,j,m;m={type:"flash",video:{sources:[]},params:{}};k=this.editor.parser.parse(l);j=k.getAll("img")[0];if(j){m=h.parse(j.attr("data-mce-json"));m.type=this.getType(j.attr("class")).name.toLowerCase();tinymce.each(b,function(n){var o=j.attr(n);if(o){m[n]=o}})}return m},getType:function(m){var k,j,l;j=tinymce.explode(m," ");for(k=0;k<j.length;k++){l=this.lookup[j[k]];if(l){return l}}},imgToObject:function(z,o){var u=this,p=u.editor,C,H,j,t,I,y,G,w,k,E,s,q,A,D,m,x,l,B,F;function r(n,J){var N,M,O,L,K;K=p.getParam("flash_video_player_url",u.convertUrl(u.url+"/moxieplayer.swf"));if(K){N=p.documentBaseURI;G.params.src=K;if(p.getParam("flash_video_player_absvideourl",true)){n=N.toAbsolute(n||"",true);J=N.toAbsolute(J||"",true)}O="";M=p.getParam("flash_video_player_flashvars",{url:"$url",poster:"$poster"});tinymce.each(M,function(Q,P){Q=Q.replace(/\$url/,n||"");Q=Q.replace(/\$poster/,J||"");if(Q.length>0){O+=(O?"&":"")+P+"="+escape(Q)}});if(O.length){G.params.flashvars=O}L=p.getParam("flash_video_player_params",{allowfullscreen:true,allowscriptaccess:true});tinymce.each(L,function(Q,P){G.params[P]=""+Q})}}G=z.attr("data-mce-json");if(!G){return}G=h.parse(G);q=this.getType(z.attr("class"));B=z.attr("data-mce-style");if(!B){B=z.attr("style");if(B){B=p.dom.serializeStyle(p.dom.parseStyle(B,"img"))}}G.width=z.attr("width")||G.width;G.height=z.attr("height")||G.height;if(q.name==="Iframe"){x=new f("iframe",1);tinymce.each(b,function(n){var J=z.attr(n);if(n=="class"&&J){J=J.replace(/mceItem.+ ?/g,"")}if(J&&J.length>0){x.attr(n,J)}});for(I in G.params){x.attr(I,G.params[I])}x.attr({style:B,src:G.params.src});z.replace(x);return}if(this.editor.settings.media_use_script){x=new f("script",1).attr("type","text/javascript");y=new f("#text",3);y.value="write"+q.name+"("+h.serialize(tinymce.extend(G.params,{width:z.attr("width"),height:z.attr("height")}))+");";x.append(y);z.replace(x);return}if(q.name==="Video"&&G.video.sources[0]){C=new f("video",1).attr(tinymce.extend({id:z.attr("id"),width:e(z.attr("width")),height:e(z.attr("height")),style:B},G.video.attrs));if(G.video.attrs){l=G.video.attrs.poster}k=G.video.sources=c(G.video.sources);for(A=0;A<k.length;A++){if(/\.mp4$/.test(k[A].src)){m=k[A].src}}if(!k[0].type){C.attr("src",k[0].src);k.splice(0,1)}for(A=0;A<k.length;A++){w=new f("source",1).attr(k[A]);w.shortEnded=true;C.append(w)}if(m){r(m,l);q=u.getType("flash")}else{G.params.src=""}}if(q.name==="Audio"&&G.video.sources[0]){F=new f("audio",1).attr(tinymce.extend({id:z.attr("id"),width:e(z.attr("width")),height:e(z.attr("height")),style:B},G.video.attrs));if(G.video.attrs){l=G.video.attrs.poster}k=G.video.sources=c(G.video.sources);if(!k[0].type){F.attr("src",k[0].src);k.splice(0,1)}for(A=0;A<k.length;A++){w=new f("source",1).attr(k[A]);w.shortEnded=true;F.append(w)}G.params.src=""}if(q.name==="EmbeddedAudio"){j=new f("embed",1);j.shortEnded=true;j.attr({id:z.attr("id"),width:e(z.attr("width")),height:e(z.attr("height")),style:B,type:z.attr("type")});for(I in G.params){j.attr(I,G.params[I])}tinymce.each(b,function(n){if(G[n]&&n!="type"){j.attr(n,G[n])}});G.params.src=""}if(G.params.src){if(/\.flv$/i.test(G.params.src)){r(G.params.src,"")}if(o&&o.force_absolute){G.params.src=p.documentBaseURI.toAbsolute(G.params.src)}H=new f("object",1).attr({id:z.attr("id"),width:e(z.attr("width")),height:e(z.attr("height")),style:B});tinymce.each(b,function(n){var J=G[n];if(n=="class"&&J){J=J.replace(/mceItem.+ ?/g,"")}if(J&&n!="type"){H.attr(n,J)}});for(I in G.params){s=new f("param",1);s.shortEnded=true;y=G.params[I];if(I==="src"&&q.name==="WindowsMedia"){I="url"}s.attr({name:I,value:y});H.append(s)}if(this.editor.getParam("media_strict",true)){H.attr({data:G.params.src,type:q.mimes[0]})}else{H.attr({classid:"clsid:"+q.clsids[0],codebase:q.codebase});j=new f("embed",1);j.shortEnded=true;j.attr({id:z.attr("id"),width:e(z.attr("width")),height:e(z.attr("height")),style:B,type:q.mimes[0]});for(I in G.params){j.attr(I,G.params[I])}tinymce.each(b,function(n){if(G[n]&&n!="type"){j.attr(n,G[n])}});H.append(j)}if(G.object_html){y=new f("#text",3);y.raw=true;y.value=G.object_html;H.append(y)}if(C){C.append(H)}}if(C){if(G.video_html){y=new f("#text",3);y.raw=true;y.value=G.video_html;C.append(y)}}if(F){if(G.video_html){y=new f("#text",3);y.raw=true;y.value=G.video_html;F.append(y)}}var v=C||F||H||j;if(v){z.replace(v)}else{z.remove()}},objectToImg:function(C){var L,k,F,s,M,N,y,A,x,G,E,t,q,I,B,l,K,o,H=this.lookup,m,z,v=this.editor.settings.url_converter,n=this.editor.settings.url_converter_scope,w,r,D,j;function u(O){return new tinymce.html.Serializer({inner:true,validate:false}).serialize(O)}function J(P,O){return H[(P.attr(O)||"").toLowerCase()]}function p(P){var O=P.replace(/^.*\.([^.]+)$/,"$1");return H[O.toLowerCase()||""]}if(!C.parent){return}if(C.name==="script"){if(C.firstChild){m=i.exec(C.firstChild.value)}if(!m){return}o=m[1];K={video:{},params:h.parse(m[2])};A=K.params.width;x=K.params.height}K=K||{video:{},params:{}};M=new f("img",1);M.attr({src:this.editor.theme.url+"/img/trans.gif"});N=C.name;if(N==="video"||N=="audio"){F=C;L=C.getAll("object")[0];k=C.getAll("embed")[0];A=F.attr("width");x=F.attr("height");y=F.attr("id");K.video={attrs:{},sources:[]};z=K.video.attrs;for(N in F.attributes.map){z[N]=F.attributes.map[N]}B=C.attr("src");if(B){K.video.sources.push({src:v.call(n,B,"src",C.name)})}l=F.getAll("source");for(E=0;E<l.length;E++){B=l[E].remove();K.video.sources.push({src:v.call(n,B.attr("src"),"src","source"),type:B.attr("type"),media:B.attr("media")})}if(z.poster){z.poster=v.call(n,z.poster,"poster",C.name)}}if(C.name==="object"){L=C;k=C.getAll("embed")[0]}if(C.name==="embed"){k=C}if(C.name==="iframe"){s=C;o="Iframe"}if(L){A=A||L.attr("width");x=x||L.attr("height");G=G||L.attr("style");y=y||L.attr("id");w=w||L.attr("hspace");r=r||L.attr("vspace");D=D||L.attr("align");j=j||L.attr("bgcolor");K.name=L.attr("name");I=L.getAll("param");for(E=0;E<I.length;E++){q=I[E];N=q.remove().attr("name");if(!a[N]){K.params[N]=q.attr("value")}}K.params.src=K.params.src||L.attr("data")}if(k){A=A||k.attr("width");x=x||k.attr("height");G=G||k.attr("style");y=y||k.attr("id");w=w||k.attr("hspace");r=r||k.attr("vspace");D=D||k.attr("align");j=j||k.attr("bgcolor");for(N in k.attributes.map){if(!a[N]&&!K.params[N]){K.params[N]=k.attributes.map[N]}}}if(s){A=e(s.attr("width"));x=e(s.attr("height"));G=G||s.attr("style");y=s.attr("id");w=s.attr("hspace");r=s.attr("vspace");D=s.attr("align");j=s.attr("bgcolor");tinymce.each(b,function(O){M.attr(O,s.attr(O))});for(N in s.attributes.map){if(!a[N]&&!K.params[N]){K.params[N]=s.attributes.map[N]}}}if(K.params.movie){K.params.src=K.params.src||K.params.movie;delete K.params.movie}if(K.params.src){K.params.src=v.call(n,K.params.src,"src","object")}if(F){if(C.name==="video"){o=H.video.name}else{if(C.name==="audio"){o=H.audio.name}}}if(L&&!o){o=(J(L,"clsid")||J(L,"classid")||J(L,"type")||{}).name}if(k&&!o){o=(J(k,"type")||p(K.params.src)||{}).name}if(k&&o=="EmbeddedAudio"){K.params.type=k.attr("type")}C.replace(M);if(k){k.remove()}if(L){t=u(L.remove());if(t){K.object_html=t}}if(F){t=u(F.remove());if(t){K.video_html=t}}K.hspace=w;K.vspace=r;K.align=D;K.bgcolor=j;M.attr({id:y,"class":"mceItemMedia mceItem"+(o||"Flash"),style:G,width:A||(C.name=="audio"?"300":"320"),height:x||(C.name=="audio"?"32":"240"),hspace:w,vspace:r,align:D,bgcolor:j,"data-mce-json":h.serialize(K,"'")})}});tinymce.PluginManager.add("media",tinymce.plugins.MediaPlugin)})();
\ No newline at end of file
+(function(){var b=tinymce.explode("id,name,width,height,style,align,class,hspace,vspace,bgcolor,type"),a=tinymce.makeMap(b.join(",")),f=tinymce.html.Node,d,i,h=tinymce.util.JSON,g;d=[["Flash","d27cdb6e-ae6d-11cf-96b8-444553540000","application/x-shockwave-flash","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["ShockWave","166b1bca-3f9c-11cf-8075-444553540000","application/x-director","http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0"],["WindowsMedia","6bf52a52-394a-11d3-b153-00c04f79faa6,22d6f312-b0f6-11d0-94ab-0080c74c7e95,05589fa1-c356-11ce-bf01-00aa0055595a","application/x-mplayer2","http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701"],["QuickTime","02bf25d5-8c17-4b23-bc80-d3488abddc6b","video/quicktime","http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"],["RealMedia","cfcdaa03-8be4-11cf-b84b-0020afbbccfa","audio/x-pn-realaudio-plugin","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["Java","8ad9c840-044e-11d1-b3e9-00805f499d93","application/x-java-applet","http://java.sun.com/products/plugin/autodl/jinstall-1_5_0-windows-i586.cab#Version=1,5,0,0"],["Silverlight","dfeaf541-f3e1-4c24-acac-99c30715084a","application/x-silverlight-2"],["Iframe"],["Video"],["EmbeddedAudio"],["Audio"]];function e(j){return typeof(j)=="string"?j.replace(/[^0-9%]/g,""):j}function c(m){var l,j,k;if(m&&!m.splice){j=[];for(k=0;true;k++){if(m[k]){j[k]=m[k]}else{break}}return j}return m}tinymce.create("tinymce.plugins.MediaPlugin",{init:function(n,j){var r=this,l={},m,p,q,k;function o(s){return s&&s.nodeName==="IMG"&&n.dom.hasClass(s,"mceItemMedia")}r.editor=n;r.url=j;i="";for(m=0;m<d.length;m++){k=d[m][0];q={name:k,clsids:tinymce.explode(d[m][1]||""),mimes:tinymce.explode(d[m][2]||""),codebase:d[m][3]};for(p=0;p<q.clsids.length;p++){l["clsid:"+q.clsids[p]]=q}for(p=0;p<q.mimes.length;p++){l[q.mimes[p]]=q}l["mceItem"+k]=q;l[k.toLowerCase()]=q;i+=(i?"|":"")+k}tinymce.each(n.getParam("media_types","video=mp4,m4v,ogv,webm;silverlight=xap;flash=swf,flv;shockwave=dcr;quicktime=mov,qt,mpg,mpeg;shockwave=dcr;windowsmedia=avi,wmv,wm,asf,asx,wmx,wvx;realmedia=rm,ra,ram;java=jar;audio=mp3,ogg").split(";"),function(v){var s,u,t;v=v.split(/=/);u=tinymce.explode(v[1].toLowerCase());for(s=0;s<u.length;s++){t=l[v[0].toLowerCase()];if(t){l[u[s]]=t}}});i=new RegExp("write("+i+")\\(([^)]+)\\)");r.lookup=l;n.onPreInit.add(function(){n.schema.addValidElements("object[id|style|width|height|classid|codebase|*],param[name|value],embed[id|style|width|height|type|src|*],video[*],audio[*],source[*]");n.parser.addNodeFilter("object,embed,video,audio,script,iframe",function(s){var t=s.length;while(t--){r.objectToImg(s[t])}});n.serializer.addNodeFilter("img",function(s,u,t){var v=s.length,w;while(v--){w=s[v];if((w.attr("class")||"").indexOf("mceItemMedia")!==-1){r.imgToObject(w,t)}}})});n.onInit.add(function(){if(n.theme&&n.theme.onResolveName){n.theme.onResolveName.add(function(s,t){if(t.name==="img"&&n.dom.hasClass(t.node,"mceItemMedia")){t.name="media"}})}if(n&&n.plugins.contextmenu){n.plugins.contextmenu.onContextMenu.add(function(t,u,s){if(s.nodeName==="IMG"&&s.className.indexOf("mceItemMedia")!==-1){u.add({title:"media.edit",icon:"media",cmd:"mceMedia"})}})}});n.addCommand("mceMedia",function(){var t,s;s=n.selection.getNode();if(o(s)){t=n.dom.getAttrib(s,"data-mce-json");if(t){t=h.parse(t);tinymce.each(b,function(u){var v=n.dom.getAttrib(s,u);if(v){t[u]=v}});t.type=r.getType(s.className).name.toLowerCase()}}if(!t){t={type:"flash",video:{sources:[]},params:{}}}n.windowManager.open({file:j+"/media.htm",width:430+parseInt(n.getLang("media.delta_width",0)),height:500+parseInt(n.getLang("media.delta_height",0)),inline:1},{plugin_url:j,data:t})});n.addButton("media",{title:"media.desc",cmd:"mceMedia"});n.onNodeChange.add(function(t,s,u){s.setActive("media",o(u))})},convertUrl:function(l,o){var k=this,n=k.editor,m=n.settings,p=m.url_converter,j=m.url_converter_scope||k;if(!l){return l}if(o){return n.documentBaseURI.toAbsolute(l)}return p.call(j,l,"src","object")},getInfo:function(){return{longname:"Media",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media",version:tinymce.majorVersion+"."+tinymce.minorVersion}},dataToImg:function(m,k){var r=this,o=r.editor,p=o.documentBaseURI,j,q,n,l;m.params.src=r.convertUrl(m.params.src,k);q=m.video.attrs;if(q){q.src=r.convertUrl(q.src,k)}if(q){q.poster=r.convertUrl(q.poster,k)}j=c(m.video.sources);if(j){for(l=0;l<j.length;l++){j[l].src=r.convertUrl(j[l].src,k)}}n=r.editor.dom.create("img",{id:m.id,style:m.style,align:m.align,hspace:m.hspace,vspace:m.vspace,src:r.editor.theme.url+"/img/trans.gif","class":"mceItemMedia mceItem"+r.getType(m.type).name,"data-mce-json":h.serialize(m,"'")});n.width=m.width=e(m.width||(m.type=="audio"?"300":"320"));n.height=m.height=e(m.height||(m.type=="audio"?"32":"240"));return n},dataToHtml:function(j,k){return this.editor.serializer.serialize(this.dataToImg(j,k),{forced_root_block:"",force_absolute:k})},htmlToData:function(l){var k,j,m;m={type:"flash",video:{sources:[]},params:{}};k=this.editor.parser.parse(l);j=k.getAll("img")[0];if(j){m=h.parse(j.attr("data-mce-json"));m.type=this.getType(j.attr("class")).name.toLowerCase();tinymce.each(b,function(n){var o=j.attr(n);if(o){m[n]=o}})}return m},getType:function(m){var k,j,l;j=tinymce.explode(m," ");for(k=0;k<j.length;k++){l=this.lookup[j[k]];if(l){return l}}},imgToObject:function(z,o){var u=this,p=u.editor,C,H,j,t,I,y,G,w,k,E,s,q,A,D,m,x,l,B,F;function r(n,J){var N,M,O,L,K;K=p.getParam("flash_video_player_url",u.convertUrl(u.url+"/moxieplayer.swf"));if(K){N=p.documentBaseURI;G.params.src=K;if(p.getParam("flash_video_player_absvideourl",true)){n=N.toAbsolute(n||"",true);J=N.toAbsolute(J||"",true)}O="";M=p.getParam("flash_video_player_flashvars",{url:"$url",poster:"$poster"});tinymce.each(M,function(Q,P){Q=Q.replace(/\$url/,n||"");Q=Q.replace(/\$poster/,J||"");if(Q.length>0){O+=(O?"&":"")+P+"="+escape(Q)}});if(O.length){G.params.flashvars=O}L=p.getParam("flash_video_player_params",{allowfullscreen:true,allowscriptaccess:true});tinymce.each(L,function(Q,P){G.params[P]=""+Q})}}G=z.attr("data-mce-json");if(!G){return}G=h.parse(G);q=this.getType(z.attr("class"));B=z.attr("data-mce-style");if(!B){B=z.attr("style");if(B){B=p.dom.serializeStyle(p.dom.parseStyle(B,"img"))}}G.width=z.attr("width")||G.width;G.height=z.attr("height")||G.height;if(q.name==="Iframe"){x=new f("iframe",1);tinymce.each(b,function(n){var J=z.attr(n);if(n=="class"&&J){J=J.replace(/mceItem.+ ?/g,"")}if(J&&J.length>0){x.attr(n,J)}});for(I in G.params){x.attr(I,G.params[I])}x.attr({style:B,src:G.params.src});z.replace(x);return}if(this.editor.settings.media_use_script){x=new f("script",1).attr("type","text/javascript");y=new f("#text",3);y.value="write"+q.name+"("+h.serialize(tinymce.extend(G.params,{width:z.attr("width"),height:z.attr("height")}))+");";x.append(y);z.replace(x);return}if(q.name==="Video"&&G.video.sources[0]){C=new f("video",1).attr(tinymce.extend({id:z.attr("id"),width:e(z.attr("width")),height:e(z.attr("height")),style:B},G.video.attrs));if(G.video.attrs){l=G.video.attrs.poster}k=G.video.sources=c(G.video.sources);for(A=0;A<k.length;A++){if(/\.mp4$/.test(k[A].src)){m=k[A].src}}if(!k[0].type){C.attr("src",k[0].src);k.splice(0,1)}for(A=0;A<k.length;A++){w=new f("source",1).attr(k[A]);w.shortEnded=true;C.append(w)}if(m){r(m,l);q=u.getType("flash")}else{G.params.src=""}}if(q.name==="Audio"&&G.video.sources[0]){F=new f("audio",1).attr(tinymce.extend({id:z.attr("id"),width:e(z.attr("width")),height:e(z.attr("height")),style:B},G.video.attrs));if(G.video.attrs){l=G.video.attrs.poster}k=G.video.sources=c(G.video.sources);if(!k[0].type){F.attr("src",k[0].src);k.splice(0,1)}for(A=0;A<k.length;A++){w=new f("source",1).attr(k[A]);w.shortEnded=true;F.append(w)}G.params.src=""}if(q.name==="EmbeddedAudio"){j=new f("embed",1);j.shortEnded=true;j.attr({id:z.attr("id"),width:e(z.attr("width")),height:e(z.attr("height")),style:B,type:z.attr("type")});for(I in G.params){j.attr(I,G.params[I])}tinymce.each(b,function(n){if(G[n]&&n!="type"){j.attr(n,G[n])}});G.params.src=""}if(G.params.src){if(/\.flv$/i.test(G.params.src)){r(G.params.src,"")}if(o&&o.force_absolute){G.params.src=p.documentBaseURI.toAbsolute(G.params.src)}H=new f("object",1).attr({id:z.attr("id"),width:e(z.attr("width")),height:e(z.attr("height")),style:B});tinymce.each(b,function(n){var J=G[n];if(n=="class"&&J){J=J.replace(/mceItem.+ ?/g,"")}if(J&&n!="type"){H.attr(n,J)}});for(I in G.params){s=new f("param",1);s.shortEnded=true;y=G.params[I];if(I==="src"&&q.name==="WindowsMedia"){I="url"}s.attr({name:I,value:y});H.append(s)}if(this.editor.getParam("media_strict",true)){H.attr({data:G.params.src,type:q.mimes[0]})}else{H.attr({classid:"clsid:"+q.clsids[0],codebase:q.codebase});j=new f("embed",1);j.shortEnded=true;j.attr({id:z.attr("id"),width:e(z.attr("width")),height:e(z.attr("height")),style:B,type:q.mimes[0]});for(I in G.params){j.attr(I,G.params[I])}tinymce.each(b,function(n){if(G[n]&&n!="type"){j.attr(n,G[n])}});H.append(j)}if(G.object_html){y=new f("#text",3);y.raw=true;y.value=G.object_html;H.append(y)}if(C){C.append(H)}}if(C){if(G.video_html){y=new f("#text",3);y.raw=true;y.value=G.video_html;C.append(y)}}if(F){if(G.video_html){y=new f("#text",3);y.raw=true;y.value=G.video_html;F.append(y)}}var v=C||F||H||j;if(v){z.replace(v)}else{z.remove()}},objectToImg:function(C){var L,k,F,s,M,N,y,A,x,G,E,t,q,I,B,l,K,o,H=this.lookup,m,z,v=this.editor.settings.url_converter,n=this.editor.settings.url_converter_scope,w,r,D,j;function u(O){return new tinymce.html.Serializer({inner:true,validate:false}).serialize(O)}function J(P,O){return H[(P.attr(O)||"").toLowerCase()]}function p(P){var O=P.replace(/^.*\.([^.]+)$/,"$1");return H[O.toLowerCase()||""]}if(!C.parent){return}if(C.name==="script"){if(C.firstChild){m=i.exec(C.firstChild.value)}if(!m){return}o=m[1];K={video:{},params:h.parse(m[2])};A=K.params.width;x=K.params.height}K=K||{video:{},params:{}};M=new f("img",1);M.attr({src:this.editor.theme.url+"/img/trans.gif"});N=C.name;if(N==="video"||N=="audio"){F=C;L=C.getAll("object")[0];k=C.getAll("embed")[0];A=F.attr("width");x=F.attr("height");y=F.attr("id");K.video={attrs:{},sources:[]};z=K.video.attrs;for(N in F.attributes.map){z[N]=F.attributes.map[N]}B=C.attr("src");if(B){K.video.sources.push({src:v.call(n,B,"src",C.name)})}l=F.getAll("source");for(E=0;E<l.length;E++){B=l[E].remove();K.video.sources.push({src:v.call(n,B.attr("src"),"src","source"),type:B.attr("type"),media:B.attr("media")})}if(z.poster){z.poster=v.call(n,z.poster,"poster",C.name)}}if(C.name==="object"){L=C;k=C.getAll("embed")[0]}if(C.name==="embed"){k=C}if(C.name==="iframe"){s=C;o="Iframe"}if(L){A=A||L.attr("width");x=x||L.attr("height");G=G||L.attr("style");y=y||L.attr("id");w=w||L.attr("hspace");r=r||L.attr("vspace");D=D||L.attr("align");j=j||L.attr("bgcolor");K.name=L.attr("name");I=L.getAll("param");for(E=0;E<I.length;E++){q=I[E];N=q.remove().attr("name");if(!a[N]){K.params[N]=q.attr("value")}}K.params.src=K.params.src||L.attr("data")}if(k){A=A||k.attr("width");x=x||k.attr("height");G=G||k.attr("style");y=y||k.attr("id");w=w||k.attr("hspace");r=r||k.attr("vspace");D=D||k.attr("align");j=j||k.attr("bgcolor");for(N in k.attributes.map){if(!a[N]&&!K.params[N]){K.params[N]=k.attributes.map[N]}}}if(s){A=e(s.attr("width"));x=e(s.attr("height"));G=G||s.attr("style");y=s.attr("id");w=s.attr("hspace");r=s.attr("vspace");D=s.attr("align");j=s.attr("bgcolor");tinymce.each(b,function(O){M.attr(O,s.attr(O))});for(N in s.attributes.map){if(!a[N]&&!K.params[N]){K.params[N]=s.attributes.map[N]}}}if(K.params.movie){K.params.src=K.params.src||K.params.movie;delete K.params.movie}if(K.params.src){K.params.src=v.call(n,K.params.src,"src","object")}if(F){if(C.name==="video"){o=H.video.name}else{if(C.name==="audio"){o=H.audio.name}}}if(L&&!o){o=(J(L,"clsid")||J(L,"classid")||J(L,"type")||{}).name}if(k&&!o){o=(J(k,"type")||p(K.params.src)||{}).name}if(k&&o=="EmbeddedAudio"){K.params.type=k.attr("type")}C.replace(M);if(k){k.remove()}if(L){t=u(L.remove());if(t){K.object_html=t}}if(F){t=u(F.remove());if(t){K.video_html=t}}K.hspace=w;K.vspace=r;K.align=D;K.bgcolor=j;M.attr({id:y,"class":"mceItemMedia mceItem"+(o||"Flash"),style:G,width:A||(C.name=="audio"?"300":"320"),height:x||(C.name=="audio"?"32":"240"),hspace:w,vspace:r,align:D,bgcolor:j,"data-mce-json":h.serialize(K,"'")})}});tinymce.PluginManager.add("media",tinymce.plugins.MediaPlugin)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/media/js/media.js b/webapp/src/main/webapp/js/tiny_mce/plugins/media/js/media.js
index b21abb5f3..f13fb0253 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/media/js/media.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/media/js/media.js
@@ -273,11 +273,11 @@
                 } else if (data.type == 'audio') {
                     if (data.video.sources[0])
                         setVal('src', data.video.sources[0].src);
-                    
+
                     src = data.video.sources[1];
                     if (src)
                         setVal('audio_altsource1', src.src);
-                    
+
                     src = data.video.sources[2];
                     if (src)
                         setVal('audio_altsource2', src.src);
@@ -336,7 +336,7 @@
 					setVal('src', src);
 					setVal('media_type', data.type);
 				}
-				
+
 				// Vimeo
 				if (src.match(/vimeo\.com\/([0-9]+)/)) {
 					data.width = 425;
@@ -347,7 +347,7 @@
 					setVal('src', src);
 					setVal('media_type', data.type);
 				}
-            
+
 				// stream.cz
 				if (src.match(/stream\.cz\/((?!object).)*\/([0-9]+)/)) {
 					data.width = 425;
@@ -358,7 +358,7 @@
 					setVal('src', src);
 					setVal('media_type', data.type);
 				}
-				
+
 				// Google maps
 				if (src.match(/maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/)) {
 					data.width = 425;
@@ -386,13 +386,13 @@
                 } else if (data.type == 'audio') {
                     if (!data.video.sources)
                         data.video.sources = [];
-                    
+
                     data.video.sources[0] = {src : src};
-                    
+
                     src = getVal("audio_altsource1");
                     if (src)
                         data.video.sources[1] = {src : src};
-                    
+
                     src = getVal("audio_altsource2");
                     if (src)
                         data.video.sources[2] = {src : src};
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/media/langs/en_dlg.js b/webapp/src/main/webapp/js/tiny_mce/plugins/media/langs/en_dlg.js
index ecef3a801..cc0413775 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/media/langs/en_dlg.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/media/langs/en_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.media_dlg',{list:"List",file:"File/URL",advanced:"Advanced",general:"General",title:"Insert/Edit Embedded Media","align_top_left":"Top Left","align_center":"Center","align_left":"Left","align_bottom":"Bottom","align_right":"Right","align_top":"Top","qt_stream_warn":"Streamed RTSP resources should be added to the QT Source field under the Advanced tab.\nYou should also add a non-streamed version to the Source field.",qtsrc:"QT Source",progress:"Progress",sound:"Sound",swstretchvalign:"Stretch V-Align",swstretchhalign:"Stretch H-Align",swstretchstyle:"Stretch Style",scriptcallbacks:"Script Callbacks","align_top_right":"Top Right",uimode:"UI Mode",rate:"Rate",playcount:"Play Count",defaultframe:"Default Frame",currentposition:"Current Position",currentmarker:"Current Marker",captioningid:"Captioning ID",baseurl:"Base URL",balance:"Balance",windowlessvideo:"Windowless Video",stretchtofit:"Stretch to Fit",mute:"Mute",invokeurls:"Invoke URLs",fullscreen:"Full Screen",enabled:"Enabled",autostart:"Auto Start",volume:"Volume",target:"Target",qtsrcchokespeed:"Choke Speed",href:"HREF",endtime:"End Time",starttime:"Start Time",enablejavascript:"Enable JavaScript",correction:"No Correction",targetcache:"Target Cache",playeveryframe:"Play Every Frame",kioskmode:"Kiosk Mode",controller:"Controller",menu:"Show Menu",loop:"Loop",play:"Auto Play",hspace:"H-Space",vspace:"V-Space","class_name":"Class",name:"Name",id:"ID",type:"Type",size:"Dimensions",preview:"Preview","constrain_proportions":"Constrain Proportions",controls:"Controls",numloop:"Num Loops",console:"Console",cache:"Cache",autohref:"Auto HREF",liveconnect:"SWLiveConnect",flashvars:"Flash Vars",base:"Base",bgcolor:"Background",wmode:"WMode",salign:"SAlign",align:"Align",scale:"Scale",quality:"Quality",shuffle:"Shuffle",prefetch:"Prefetch",nojava:"No Java",maintainaspect:"Maintain Aspect",imagestatus:"Image Status",center:"Center",autogotourl:"Auto Goto URL","shockwave_options":"Shockwave Options","rmp_options":"Real Media Player Options","wmp_options":"Windows Media Player Options","qt_options":"QuickTime Options","flash_options":"Flash Options",hidden:"Hidden","align_bottom_left":"Bottom Left","align_bottom_right":"Bottom Right","html5_video_options":"HTML5 Video Options",altsource1:"Alternative source 1",altsource2:"Alternative source 2",preload:"Preload",poster:"Poster",source:"Source","html5_audio_options":"Audio Options","preload_none":"Don\'t Preload","preload_metadata":"Preload video metadata","preload_auto":"Let user\'s browser decide", "embedded_audio_options":"Embedded Audio Options", video:"HTML5 Video", audio:"HTML5 Audio", flash:"Flash", quicktime:"QuickTime", shockwave:"Shockwave", windowsmedia:"Windows Media", realmedia:"Real Media", iframe:"Iframe", embeddedaudio:"Embedded Audio" }); 
+tinyMCE.addI18n('en.media_dlg',{list:"List",file:"File/URL",advanced:"Advanced",general:"General",title:"Insert/Edit Embedded Media","align_top_left":"Top Left","align_center":"Center","align_left":"Left","align_bottom":"Bottom","align_right":"Right","align_top":"Top","qt_stream_warn":"Streamed RTSP resources should be added to the QT Source field under the Advanced tab.\nYou should also add a non-streamed version to the Source field.",qtsrc:"QT Source",progress:"Progress",sound:"Sound",swstretchvalign:"Stretch V-Align",swstretchhalign:"Stretch H-Align",swstretchstyle:"Stretch Style",scriptcallbacks:"Script Callbacks","align_top_right":"Top Right",uimode:"UI Mode",rate:"Rate",playcount:"Play Count",defaultframe:"Default Frame",currentposition:"Current Position",currentmarker:"Current Marker",captioningid:"Captioning ID",baseurl:"Base URL",balance:"Balance",windowlessvideo:"Windowless Video",stretchtofit:"Stretch to Fit",mute:"Mute",invokeurls:"Invoke URLs",fullscreen:"Full Screen",enabled:"Enabled",autostart:"Auto Start",volume:"Volume",target:"Target",qtsrcchokespeed:"Choke Speed",href:"HREF",endtime:"End Time",starttime:"Start Time",enablejavascript:"Enable JavaScript",correction:"No Correction",targetcache:"Target Cache",playeveryframe:"Play Every Frame",kioskmode:"Kiosk Mode",controller:"Controller",menu:"Show Menu",loop:"Loop",play:"Auto Play",hspace:"H-Space",vspace:"V-Space","class_name":"Class",name:"Name",id:"ID",type:"Type",size:"Dimensions",preview:"Preview","constrain_proportions":"Constrain Proportions",controls:"Controls",numloop:"Num Loops",console:"Console",cache:"Cache",autohref:"Auto HREF",liveconnect:"SWLiveConnect",flashvars:"Flash Vars",base:"Base",bgcolor:"Background",wmode:"WMode",salign:"SAlign",align:"Align",scale:"Scale",quality:"Quality",shuffle:"Shuffle",prefetch:"Prefetch",nojava:"No Java",maintainaspect:"Maintain Aspect",imagestatus:"Image Status",center:"Center",autogotourl:"Auto Goto URL","shockwave_options":"Shockwave Options","rmp_options":"Real Media Player Options","wmp_options":"Windows Media Player Options","qt_options":"QuickTime Options","flash_options":"Flash Options",hidden:"Hidden","align_bottom_left":"Bottom Left","align_bottom_right":"Bottom Right","html5_video_options":"HTML5 Video Options",altsource1:"Alternative source 1",altsource2:"Alternative source 2",preload:"Preload",poster:"Poster",source:"Source","html5_audio_options":"Audio Options","preload_none":"Don\'t Preload","preload_metadata":"Preload video metadata","preload_auto":"Let user\'s browser decide", "embedded_audio_options":"Embedded Audio Options", video:"HTML5 Video", audio:"HTML5 Audio", flash:"Flash", quicktime:"QuickTime", shockwave:"Shockwave", windowsmedia:"Windows Media", realmedia:"Real Media", iframe:"Iframe", embeddedaudio:"Embedded Audio" });
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/media/media.htm b/webapp/src/main/webapp/js/tiny_mce/plugins/media/media.htm
index 50efe9182..b60894a97 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/media/media.htm
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/media/media.htm
@@ -84,7 +84,7 @@
 							<td><label for="align">{#media_dlg.align}</label></td>
 							<td>
 								<select id="align" name="align" onchange="Media.formToData();">
-									<option value="">{#not_set}</option> 
+									<option value="">{#not_set}</option>
 									<option value="top">{#media_dlg.align_top}</option>
 									<option value="right">{#media_dlg.align_right}</option>
 									<option value="bottom">{#media_dlg.align_bottom}</option>
@@ -156,7 +156,7 @@
 							<td><label for="video_preload">{#media_dlg.preload}</label></td>
 							<td>
 								<select id="video_preload" name="video_preload" onchange="Media.formToData();">
-									<option value="none">{#media_dlg.preload_none}</option> 
+									<option value="none">{#media_dlg.preload_none}</option>
 									<option value="metadata">{#media_dlg.preload_metadata}</option>
 									<option value="auto">{#media_dlg.preload_auto}</option>
 								</select>
@@ -320,7 +320,7 @@
 							<td><label for="flash_quality">{#media_dlg.quality}</label></td>
 							<td>
 								<select id="flash_quality" name="flash_quality" onchange="Media.formToData();">
-									<option value="">{#not_set}</option> 
+									<option value="">{#not_set}</option>
 									<option value="high">high</option>
 									<option value="low">low</option>
 									<option value="autolow">autolow</option>
@@ -332,7 +332,7 @@
 							<td><label for="flash_scale">{#media_dlg.scale}</label></td>
 							<td>
 								<select id="flash_scale" name="flash_scale" onchange="Media.formToData();">
-									<option value="">{#not_set}</option> 
+									<option value="">{#not_set}</option>
 									<option value="showall">showall</option>
 									<option value="noborder">noborder</option>
 									<option value="exactfit">exactfit</option>
@@ -345,7 +345,7 @@
 							<td><label for="flash_wmode">{#media_dlg.wmode}</label></td>
 							<td>
 								<select id="flash_wmode" name="flash_wmode" onchange="Media.formToData();">
-									<option value="">{#not_set}</option> 
+									<option value="">{#not_set}</option>
 									<option value="window">window</option>
 									<option value="opaque">opaque</option>
 									<option value="transparent">transparent</option>
@@ -355,7 +355,7 @@
 							<td><label for="flash_salign">{#media_dlg.salign}</label></td>
 							<td>
 								<select id="flash_salign" name="flash_salign" onchange="Media.formToData();">
-									<option value="">{#not_set}</option> 
+									<option value="">{#not_set}</option>
 									<option value="l">{#media_dlg.align_left}</option>
 									<option value="t">{#media_dlg.align_top}</option>
 									<option value="r">{#media_dlg.align_right}</option>
@@ -529,7 +529,7 @@
 						<tr>
 							<td><label for="quicktime_scale">{#media_dlg.scale}</label></td>
 							<td><select id="quicktime_scale" name="quicktime_scale" class="mceEditableSelect" onchange="Media.formToData();">
-									<option value="">{#not_set}</option> 
+									<option value="">{#not_set}</option>
 									<option value="tofit">tofit</option>
 									<option value="aspect">aspect</option>
 								</select>
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/nonbreaking/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/nonbreaking/editor_plugin.js
index 687f54866..be4a3344d 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/nonbreaking/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/nonbreaking/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.Nonbreaking",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceNonBreaking",function(){a.execCommand("mceInsertContent",false,(a.plugins.visualchars&&a.plugins.visualchars.state)?'<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">&nbsp;</span>':"&nbsp;")});a.addButton("nonbreaking",{title:"nonbreaking.nonbreaking_desc",cmd:"mceNonBreaking"});if(a.getParam("nonbreaking_force_tab")){a.onKeyDown.add(function(d,f){if(f.keyCode==9){f.preventDefault();d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking")}})}},getInfo:function(){return{longname:"Nonbreaking space",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/nonbreaking",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("nonbreaking",tinymce.plugins.Nonbreaking)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.Nonbreaking",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceNonBreaking",function(){a.execCommand("mceInsertContent",false,(a.plugins.visualchars&&a.plugins.visualchars.state)?'<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">&nbsp;</span>':"&nbsp;")});a.addButton("nonbreaking",{title:"nonbreaking.nonbreaking_desc",cmd:"mceNonBreaking"});if(a.getParam("nonbreaking_force_tab")){a.onKeyDown.add(function(d,f){if(f.keyCode==9){f.preventDefault();d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking")}})}},getInfo:function(){return{longname:"Nonbreaking space",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/nonbreaking",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("nonbreaking",tinymce.plugins.Nonbreaking)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/nonbreaking/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
index 0a048b379..ab13dd3f6 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
@@ -27,7 +27,7 @@
 				ed.onKeyDown.add(function(ed, e) {
 					if (e.keyCode == 9) {
 						e.preventDefault();
-	
+
 						ed.execCommand('mceNonBreaking');
 						ed.execCommand('mceNonBreaking');
 						ed.execCommand('mceNonBreaking');
@@ -51,4 +51,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('nonbreaking', tinymce.plugins.Nonbreaking);
-})();
\ No newline at end of file
+})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/noneditable/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/noneditable/editor_plugin.js
index da411ebc0..dec5a1af1 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/noneditable/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/noneditable/editor_plugin.js
@@ -1 +1 @@
-(function(){var c=tinymce.dom.TreeWalker;var a="contenteditable",d="data-mce-"+a;var e=tinymce.VK;function b(n){var j=n.dom,p=n.selection,r,o="mce_noneditablecaret",r="\uFEFF";function m(t){var s;if(t.nodeType===1){s=t.getAttribute(d);if(s&&s!=="inherit"){return s}s=t.contentEditable;if(s!=="inherit"){return s}}return null}function g(s){var t;while(s){t=m(s);if(t){return t==="false"?s:null}s=s.parentNode}}function l(s){while(s){if(s.id===o){return s}s=s.parentNode}}function k(s){var t;if(s){t=new c(s,s);for(s=t.current();s;s=t.next()){if(s.nodeType===3){return s}}}}function f(v,u){var s,t;if(m(v)==="false"){if(j.isBlock(v)){p.select(v);return}}t=j.createRng();if(m(v)==="true"){if(!v.firstChild){v.appendChild(n.getDoc().createTextNode("\u00a0"))}v=v.firstChild;u=true}s=j.create("span",{id:o,"data-mce-bogus":true},r);if(u){v.parentNode.insertBefore(s,v)}else{j.insertAfter(s,v)}t.setStart(s.firstChild,1);t.collapse(true);p.setRng(t);return s}function i(s){var v,t,u;if(s){rng=p.getRng(true);rng.setStartBefore(s);rng.setEndBefore(s);v=k(s);if(v&&v.nodeValue.charAt(0)==r){v=v.deleteData(0,1)}j.remove(s,true);p.setRng(rng)}else{t=l(p.getStart());while((s=j.get(o))&&s!==u){if(t!==s){v=k(s);if(v&&v.nodeValue.charAt(0)==r){v=v.deleteData(0,1)}j.remove(s,true)}u=s}}}function q(){var s,w,u,t,v;function x(B,D){var A,F,E,C,z;A=t.startContainer;F=t.startOffset;if(A.nodeType==3){z=A.nodeValue.length;if((F>0&&F<z)||(D?F==z:F==0)){return}}else{if(F<A.childNodes.length){var G=!D&&F>0?F-1:F;A=A.childNodes[G];if(A.hasChildNodes()){A=A.firstChild}}else{return !D?B:null}}E=new c(A,B);while(C=E[D?"prev":"next"]()){if(C.nodeType===3&&C.nodeValue.length>0){return}else{if(m(C)==="true"){return C}}}return B}i();u=p.isCollapsed();s=g(p.getStart());w=g(p.getEnd());if(s||w){t=p.getRng(true);if(u){s=s||w;var y=p.getStart();if(v=x(s,true)){f(v,true)}else{if(v=x(s,false)){f(v,false)}else{p.select(s)}}}else{t=p.getRng(true);if(s){t.setStartBefore(s)}if(w){t.setEndAfter(w)}p.setRng(t)}}}function h(z,B){var F=B.keyCode,x,C,D,v;function u(H,G){while(H=H[G?"previousSibling":"nextSibling"]){if(H.nodeType!==3||H.nodeValue.length>0){return H}}}function y(G,H){p.select(G);p.collapse(H)}function t(K){var J,I,M,H;function G(O){var N=I;while(N){if(N===O){return}N=N.parentNode}j.remove(O);q()}function L(){var O,P,N=z.schema.getNonEmptyElements();P=new tinymce.dom.TreeWalker(I,z.getBody());while(O=(K?P.prev():P.next())){if(N[O.nodeName.toLowerCase()]){break}if(O.nodeType===3&&tinymce.trim(O.nodeValue).length>0){break}if(m(O)==="false"){G(O);return true}}if(g(O)){return true}return false}if(p.isCollapsed()){J=p.getRng(true);I=J.startContainer;M=J.startOffset;I=l(I)||I;if(H=g(I)){G(H);return false}if(I.nodeType==3&&(K?M>0:M<I.nodeValue.length)){return true}if(I.nodeType==1){I=I.childNodes[M]||I}if(L()){return false}}return true}D=p.getStart();v=p.getEnd();x=g(D)||g(v);if(x&&(F<112||F>124)&&F!=e.DELETE&&F!=e.BACKSPACE){if((tinymce.isMac?B.metaKey:B.ctrlKey)&&(F==67||F==88||F==86)){return}B.preventDefault();if(F==e.LEFT||F==e.RIGHT){var w=F==e.LEFT;if(z.dom.isBlock(x)){var A=w?x.previousSibling:x.nextSibling;var s=new c(A,A);var E=w?s.prev():s.next();y(E,!w)}else{y(x,w)}}}else{if(F==e.LEFT||F==e.RIGHT||F==e.BACKSPACE||F==e.DELETE){C=l(D);if(C){if(F==e.LEFT||F==e.BACKSPACE){x=u(C,true);if(x&&m(x)==="false"){B.preventDefault();if(F==e.LEFT){y(x,true)}else{j.remove(x);return}}else{i(C)}}if(F==e.RIGHT||F==e.DELETE){x=u(C);if(x&&m(x)==="false"){B.preventDefault();if(F==e.RIGHT){y(x,false)}else{j.remove(x);return}}else{i(C)}}}if((F==e.BACKSPACE||F==e.DELETE)&&!t(F==e.BACKSPACE)){B.preventDefault();return false}}}}n.onMouseDown.addToTop(function(s,u){var t=s.selection.getNode();if(m(t)==="false"&&t==u.target){q()}});n.onMouseUp.addToTop(q);n.onKeyDown.addToTop(h);n.onKeyUp.addToTop(q)}tinymce.create("tinymce.plugins.NonEditablePlugin",{init:function(i,k){var h,g,j;function f(m,n){var o=j.length,p=n.content,l=tinymce.trim(g);if(n.format=="raw"){return}while(o--){p=p.replace(j[o],function(s){var r=arguments,q=r[r.length-2];if(q>0&&p.charAt(q-1)=='"'){return s}return'<span class="'+l+'" data-mce-content="'+m.dom.encode(r[0])+'">'+m.dom.encode(typeof(r[1])==="string"?r[1]:r[0])+"</span>"})}n.content=p}h=" "+tinymce.trim(i.getParam("noneditable_editable_class","mceEditable"))+" ";g=" "+tinymce.trim(i.getParam("noneditable_noneditable_class","mceNonEditable"))+" ";j=i.getParam("noneditable_regexp");if(j&&!j.length){j=[j]}i.onPreInit.add(function(){b(i);if(j){i.selection.onBeforeSetContent.add(f);i.onBeforeSetContent.add(f)}i.parser.addAttributeFilter("class",function(l){var m=l.length,n,o;while(m--){o=l[m];n=" "+o.attr("class")+" ";if(n.indexOf(h)!==-1){o.attr(d,"true")}else{if(n.indexOf(g)!==-1){o.attr(d,"false")}}}});i.serializer.addAttributeFilter(d,function(l,m){var n=l.length,o;while(n--){o=l[n];if(j&&o.attr("data-mce-content")){o.name="#text";o.type=3;o.raw=true;o.value=o.attr("data-mce-content")}else{o.attr(a,null);o.attr(d,null)}}});i.parser.addAttributeFilter(a,function(l,m){var n=l.length,o;while(n--){o=l[n];o.attr(d,o.attr(a));o.attr(a,null)}})})},getInfo:function(){return{longname:"Non editable elements",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/noneditable",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("noneditable",tinymce.plugins.NonEditablePlugin)})();
\ No newline at end of file
+(function(){var c=tinymce.dom.TreeWalker;var a="contenteditable",d="data-mce-"+a;var e=tinymce.VK;function b(n){var j=n.dom,p=n.selection,r,o="mce_noneditablecaret",r="\uFEFF";function m(t){var s;if(t.nodeType===1){s=t.getAttribute(d);if(s&&s!=="inherit"){return s}s=t.contentEditable;if(s!=="inherit"){return s}}return null}function g(s){var t;while(s){t=m(s);if(t){return t==="false"?s:null}s=s.parentNode}}function l(s){while(s){if(s.id===o){return s}s=s.parentNode}}function k(s){var t;if(s){t=new c(s,s);for(s=t.current();s;s=t.next()){if(s.nodeType===3){return s}}}}function f(v,u){var s,t;if(m(v)==="false"){if(j.isBlock(v)){p.select(v);return}}t=j.createRng();if(m(v)==="true"){if(!v.firstChild){v.appendChild(n.getDoc().createTextNode("\u00a0"))}v=v.firstChild;u=true}s=j.create("span",{id:o,"data-mce-bogus":true},r);if(u){v.parentNode.insertBefore(s,v)}else{j.insertAfter(s,v)}t.setStart(s.firstChild,1);t.collapse(true);p.setRng(t);return s}function i(s){var v,t,u;if(s){rng=p.getRng(true);rng.setStartBefore(s);rng.setEndBefore(s);v=k(s);if(v&&v.nodeValue.charAt(0)==r){v=v.deleteData(0,1)}j.remove(s,true);p.setRng(rng)}else{t=l(p.getStart());while((s=j.get(o))&&s!==u){if(t!==s){v=k(s);if(v&&v.nodeValue.charAt(0)==r){v=v.deleteData(0,1)}j.remove(s,true)}u=s}}}function q(){var s,w,u,t,v;function x(B,D){var A,F,E,C,z;A=t.startContainer;F=t.startOffset;if(A.nodeType==3){z=A.nodeValue.length;if((F>0&&F<z)||(D?F==z:F==0)){return}}else{if(F<A.childNodes.length){var G=!D&&F>0?F-1:F;A=A.childNodes[G];if(A.hasChildNodes()){A=A.firstChild}}else{return !D?B:null}}E=new c(A,B);while(C=E[D?"prev":"next"]()){if(C.nodeType===3&&C.nodeValue.length>0){return}else{if(m(C)==="true"){return C}}}return B}i();u=p.isCollapsed();s=g(p.getStart());w=g(p.getEnd());if(s||w){t=p.getRng(true);if(u){s=s||w;var y=p.getStart();if(v=x(s,true)){f(v,true)}else{if(v=x(s,false)){f(v,false)}else{p.select(s)}}}else{t=p.getRng(true);if(s){t.setStartBefore(s)}if(w){t.setEndAfter(w)}p.setRng(t)}}}function h(z,B){var F=B.keyCode,x,C,D,v;function u(H,G){while(H=H[G?"previousSibling":"nextSibling"]){if(H.nodeType!==3||H.nodeValue.length>0){return H}}}function y(G,H){p.select(G);p.collapse(H)}function t(K){var J,I,M,H;function G(O){var N=I;while(N){if(N===O){return}N=N.parentNode}j.remove(O);q()}function L(){var O,P,N=z.schema.getNonEmptyElements();P=new tinymce.dom.TreeWalker(I,z.getBody());while(O=(K?P.prev():P.next())){if(N[O.nodeName.toLowerCase()]){break}if(O.nodeType===3&&tinymce.trim(O.nodeValue).length>0){break}if(m(O)==="false"){G(O);return true}}if(g(O)){return true}return false}if(p.isCollapsed()){J=p.getRng(true);I=J.startContainer;M=J.startOffset;I=l(I)||I;if(H=g(I)){G(H);return false}if(I.nodeType==3&&(K?M>0:M<I.nodeValue.length)){return true}if(I.nodeType==1){I=I.childNodes[M]||I}if(L()){return false}}return true}D=p.getStart();v=p.getEnd();x=g(D)||g(v);if(x&&(F<112||F>124)&&F!=e.DELETE&&F!=e.BACKSPACE){if((tinymce.isMac?B.metaKey:B.ctrlKey)&&(F==67||F==88||F==86)){return}B.preventDefault();if(F==e.LEFT||F==e.RIGHT){var w=F==e.LEFT;if(z.dom.isBlock(x)){var A=w?x.previousSibling:x.nextSibling;var s=new c(A,A);var E=w?s.prev():s.next();y(E,!w)}else{y(x,w)}}}else{if(F==e.LEFT||F==e.RIGHT||F==e.BACKSPACE||F==e.DELETE){C=l(D);if(C){if(F==e.LEFT||F==e.BACKSPACE){x=u(C,true);if(x&&m(x)==="false"){B.preventDefault();if(F==e.LEFT){y(x,true)}else{j.remove(x);return}}else{i(C)}}if(F==e.RIGHT||F==e.DELETE){x=u(C);if(x&&m(x)==="false"){B.preventDefault();if(F==e.RIGHT){y(x,false)}else{j.remove(x);return}}else{i(C)}}}if((F==e.BACKSPACE||F==e.DELETE)&&!t(F==e.BACKSPACE)){B.preventDefault();return false}}}}n.onMouseDown.addToTop(function(s,u){var t=s.selection.getNode();if(m(t)==="false"&&t==u.target){q()}});n.onMouseUp.addToTop(q);n.onKeyDown.addToTop(h);n.onKeyUp.addToTop(q)}tinymce.create("tinymce.plugins.NonEditablePlugin",{init:function(i,k){var h,g,j;function f(m,n){var o=j.length,p=n.content,l=tinymce.trim(g);if(n.format=="raw"){return}while(o--){p=p.replace(j[o],function(s){var r=arguments,q=r[r.length-2];if(q>0&&p.charAt(q-1)=='"'){return s}return'<span class="'+l+'" data-mce-content="'+m.dom.encode(r[0])+'">'+m.dom.encode(typeof(r[1])==="string"?r[1]:r[0])+"</span>"})}n.content=p}h=" "+tinymce.trim(i.getParam("noneditable_editable_class","mceEditable"))+" ";g=" "+tinymce.trim(i.getParam("noneditable_noneditable_class","mceNonEditable"))+" ";j=i.getParam("noneditable_regexp");if(j&&!j.length){j=[j]}i.onPreInit.add(function(){b(i);if(j){i.selection.onBeforeSetContent.add(f);i.onBeforeSetContent.add(f)}i.parser.addAttributeFilter("class",function(l){var m=l.length,n,o;while(m--){o=l[m];n=" "+o.attr("class")+" ";if(n.indexOf(h)!==-1){o.attr(d,"true")}else{if(n.indexOf(g)!==-1){o.attr(d,"false")}}}});i.serializer.addAttributeFilter(d,function(l,m){var n=l.length,o;while(n--){o=l[n];if(j&&o.attr("data-mce-content")){o.name="#text";o.type=3;o.raw=true;o.value=o.attr("data-mce-content")}else{o.attr(a,null);o.attr(d,null)}}});i.parser.addAttributeFilter(a,function(l,m){var n=l.length,o;while(n--){o=l[n];o.attr(d,o.attr(a));o.attr(a,null)}})})},getInfo:function(){return{longname:"Non editable elements",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/noneditable",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("noneditable",tinymce.plugins.NonEditablePlugin)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/noneditable/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/noneditable/editor_plugin_src.js
index 35c0cea74..af9d9dbf3 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/noneditable/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/noneditable/editor_plugin_src.js
@@ -455,7 +455,7 @@
 
 				args.content = content;
 			};
-			
+
 			editClass = " " + tinymce.trim(ed.getParam("noneditable_editable_class", "mceEditable")) + " ";
 			nonEditClass = " " + tinymce.trim(ed.getParam("noneditable_noneditable_class", "mceNonEditable")) + " ";
 
@@ -534,4 +534,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('noneditable', tinymce.plugins.NonEditablePlugin);
-})();
\ No newline at end of file
+})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/pagebreak/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/pagebreak/editor_plugin.js
index 35085e8ad..316f9d454 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/pagebreak/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/pagebreak/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.PageBreakPlugin",{init:function(b,d){var f='<img src="'+b.theme.url+'/img/trans.gif" class="mcePageBreak mceItemNoResize" />',a="mcePageBreak",c=b.getParam("pagebreak_separator","<!-- pagebreak -->"),e;e=new RegExp(c.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,function(g){return"\\"+g}),"g");b.addCommand("mcePageBreak",function(){b.execCommand("mceInsertContent",0,f)});b.addButton("pagebreak",{title:"pagebreak.desc",cmd:a});b.onInit.add(function(){if(b.theme.onResolveName){b.theme.onResolveName.add(function(g,h){if(h.node.nodeName=="IMG"&&b.dom.hasClass(h.node,a)){h.name="pagebreak"}})}});b.onClick.add(function(g,h){h=h.target;if(h.nodeName==="IMG"&&g.dom.hasClass(h,a)){g.selection.select(h)}});b.onNodeChange.add(function(h,g,i){g.setActive("pagebreak",i.nodeName==="IMG"&&h.dom.hasClass(i,a))});b.onBeforeSetContent.add(function(g,h){h.content=h.content.replace(e,f)});b.onPostProcess.add(function(g,h){if(h.get){h.content=h.content.replace(/<img[^>]+>/g,function(i){if(i.indexOf('class="mcePageBreak')!==-1){i=c}return i})}})},getInfo:function(){return{longname:"PageBreak",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/pagebreak",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("pagebreak",tinymce.plugins.PageBreakPlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.PageBreakPlugin",{init:function(b,d){var f='<img src="'+b.theme.url+'/img/trans.gif" class="mcePageBreak mceItemNoResize" />',a="mcePageBreak",c=b.getParam("pagebreak_separator","<!-- pagebreak -->"),e;e=new RegExp(c.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,function(g){return"\\"+g}),"g");b.addCommand("mcePageBreak",function(){b.execCommand("mceInsertContent",0,f)});b.addButton("pagebreak",{title:"pagebreak.desc",cmd:a});b.onInit.add(function(){if(b.theme.onResolveName){b.theme.onResolveName.add(function(g,h){if(h.node.nodeName=="IMG"&&b.dom.hasClass(h.node,a)){h.name="pagebreak"}})}});b.onClick.add(function(g,h){h=h.target;if(h.nodeName==="IMG"&&g.dom.hasClass(h,a)){g.selection.select(h)}});b.onNodeChange.add(function(h,g,i){g.setActive("pagebreak",i.nodeName==="IMG"&&h.dom.hasClass(i,a))});b.onBeforeSetContent.add(function(g,h){h.content=h.content.replace(e,f)});b.onPostProcess.add(function(g,h){if(h.get){h.content=h.content.replace(/<img[^>]+>/g,function(i){if(i.indexOf('class="mcePageBreak')!==-1){i=c}return i})}})},getInfo:function(){return{longname:"PageBreak",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/pagebreak",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("pagebreak",tinymce.plugins.PageBreakPlugin)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/pagebreak/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/pagebreak/editor_plugin_src.js
index fc3b3b4a1..f0f1e62e2 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/pagebreak/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/pagebreak/editor_plugin_src.js
@@ -71,4 +71,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('pagebreak', tinymce.plugins.PageBreakPlugin);
-})();
\ No newline at end of file
+})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/paste/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/paste/editor_plugin.js
index 5d0626188..b275c5f26 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/paste/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/paste/editor_plugin.js
@@ -1 +1 @@
-(function(){var c=tinymce.each,a={paste_auto_cleanup_on_paste:true,paste_enable_default_filters:true,paste_block_drop:false,paste_retain_style_properties:"none",paste_strip_class_attributes:"mso",paste_remove_spans:false,paste_remove_styles:false,paste_remove_styles_if_webkit:true,paste_convert_middot_lists:true,paste_convert_headers_to_strong:false,paste_dialog_width:"450",paste_dialog_height:"400",paste_max_consecutive_linebreaks:2,paste_text_use_dialog:false,paste_text_sticky:false,paste_text_sticky_default:false,paste_text_notifyalways:false,paste_text_linebreaktype:"combined",paste_text_replacements:[[/\u2026/g,"..."],[/[\x93\x94\u201c\u201d]/g,'"'],[/[\x60\x91\x92\u2018\u2019]/g,"'"]]};function b(d,e){return d.getParam(e,a[e])}tinymce.create("tinymce.plugins.PastePlugin",{init:function(d,e){var f=this;f.editor=d;f.url=e;f.onPreProcess=new tinymce.util.Dispatcher(f);f.onPostProcess=new tinymce.util.Dispatcher(f);f.onPreProcess.add(f._preProcess);f.onPostProcess.add(f._postProcess);f.onPreProcess.add(function(i,j){d.execCallback("paste_preprocess",i,j)});f.onPostProcess.add(function(i,j){d.execCallback("paste_postprocess",i,j)});d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){return false}});d.pasteAsPlainText=b(d,"paste_text_sticky_default");function h(l,j){var k=d.dom,i;f.onPreProcess.dispatch(f,l);l.node=k.create("div",0,l.content);if(tinymce.isGecko){i=d.selection.getRng(true);if(i.startContainer==i.endContainer&&i.startContainer.nodeType==3){if(l.node.childNodes.length===1&&/^(p|h[1-6]|pre)$/i.test(l.node.firstChild.nodeName)&&l.content.indexOf("__MCE_ITEM__")===-1){k.remove(l.node.firstChild,true)}}}f.onPostProcess.dispatch(f,l);l.content=d.serializer.serialize(l.node,{getInner:1,forced_root_block:""});if((!j)&&(d.pasteAsPlainText)){f._insertPlainText(l.content);if(!b(d,"paste_text_sticky")){d.pasteAsPlainText=false;d.controlManager.setActive("pastetext",false)}}else{f._insert(l.content)}}d.addCommand("mceInsertClipboardContent",function(i,j){h(j,true)});if(!b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(j,i){var k=tinymce.util.Cookie;d.pasteAsPlainText=!d.pasteAsPlainText;d.controlManager.setActive("pastetext",d.pasteAsPlainText);if((d.pasteAsPlainText)&&(!k.get("tinymcePasteText"))){if(b(d,"paste_text_sticky")){d.windowManager.alert(d.translate("paste.plaintext_mode_sticky"))}else{d.windowManager.alert(d.translate("paste.plaintext_mode"))}if(!b(d,"paste_text_notifyalways")){k.set("tinymcePasteText","1",new Date(new Date().getFullYear()+1,12,31))}}})}d.addButton("pastetext",{title:"paste.paste_text_desc",cmd:"mcePasteText"});d.addButton("selectall",{title:"paste.selectall_desc",cmd:"selectall"});function g(s){var l,p,j,t,k=d.selection,o=d.dom,q=d.getBody(),i,r;if(s.clipboardData||o.doc.dataTransfer){r=(s.clipboardData||o.doc.dataTransfer).getData("Text");if(d.pasteAsPlainText){s.preventDefault();h({content:o.encode(r).replace(/\r?\n/g,"<br />")});return}}if(o.get("_mcePaste")){return}l=o.add(q,"div",{id:"_mcePaste","class":"mcePaste","data-mce-bogus":"1"},"\uFEFF\uFEFF");if(q!=d.getDoc().body){i=o.getPos(d.selection.getStart(),q).y}else{i=q.scrollTop+o.getViewPort(d.getWin()).y}o.setStyles(l,{position:"absolute",left:tinymce.isGecko?-40:0,top:i-25,width:1,height:1,overflow:"hidden"});if(tinymce.isIE){t=k.getRng();j=o.doc.body.createTextRange();j.moveToElementText(l);j.execCommand("Paste");o.remove(l);if(l.innerHTML==="\uFEFF\uFEFF"){d.execCommand("mcePasteWord");s.preventDefault();return}k.setRng(t);k.setContent("");setTimeout(function(){h({content:l.innerHTML})},0);return tinymce.dom.Event.cancel(s)}else{function m(n){n.preventDefault()}o.bind(d.getDoc(),"mousedown",m);o.bind(d.getDoc(),"keydown",m);p=d.selection.getRng();l=l.firstChild;j=d.getDoc().createRange();j.setStart(l,0);j.setEnd(l,2);k.setRng(j);window.setTimeout(function(){var u="",n;if(!o.select("div.mcePaste > div.mcePaste").length){n=o.select("div.mcePaste");c(n,function(w){var v=w.firstChild;if(v&&v.nodeName=="DIV"&&v.style.marginTop&&v.style.backgroundColor){o.remove(v,1)}c(o.select("span.Apple-style-span",w),function(x){o.remove(x,1)});c(o.select("br[data-mce-bogus]",w),function(x){o.remove(x)});if(w.parentNode.className!="mcePaste"){u+=w.innerHTML}})}else{u="<p>"+o.encode(r).replace(/\r?\n\r?\n/g,"</p><p>").replace(/\r?\n/g,"<br />")+"</p>"}c(o.select("div.mcePaste"),function(v){o.remove(v)});if(p){k.setRng(p)}h({content:u});o.unbind(d.getDoc(),"mousedown",m);o.unbind(d.getDoc(),"keydown",m)},0)}}if(b(d,"paste_auto_cleanup_on_paste")){if(tinymce.isOpera||/Firefox\/2/.test(navigator.userAgent)){d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){g(j)}})}else{d.onPaste.addToTop(function(i,j){return g(j)})}}d.onInit.add(function(){d.controlManager.setActive("pastetext",d.pasteAsPlainText);if(b(d,"paste_block_drop")){d.dom.bind(d.getBody(),["dragend","dragover","draggesture","dragdrop","drop","drag"],function(i){i.preventDefault();i.stopPropagation();return false})}});f._legacySupport()},getInfo:function(){return{longname:"Paste text/word",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_preProcess:function(g,e){var k=this.editor,j=e.content,p=tinymce.grep,n=tinymce.explode,f=tinymce.trim,l,i;function d(h){c(h,function(o){if(o.constructor==RegExp){j=j.replace(o,"")}else{j=j.replace(o[0],o[1])}})}if(k.settings.paste_enable_default_filters==false){return}if(tinymce.isIE&&document.documentMode>=9&&/<(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)/.test(e.content)){d([[/(?:<br>&nbsp;[\s\r\n]+|<br>)*(<\/?(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)[^>]*>)(?:<br>&nbsp;[\s\r\n]+|<br>)*/g,"$1"]]);d([[/<br><br>/g,"<BR><BR>"],[/<br>/g," "],[/<BR><BR>/g,"<br>"]])}if(/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(j)||e.wordContent){e.wordContent=true;d([/^\s*(&nbsp;)+/gi,/(&nbsp;|<br[^>]*>)+\s*$/gi]);if(b(k,"paste_convert_headers_to_strong")){j=j.replace(/<p [^>]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi,"<p><strong>$1</strong></p>")}if(b(k,"paste_convert_middot_lists")){d([[/<!--\[if !supportLists\]-->/gi,"$&__MCE_ITEM__"],[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi,"$1__MCE_ITEM__"],[/(<p[^>]+(?:MsoListParagraph)[^>]+>)/gi,"$1__MCE_ITEM__"]])}d([/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/gi,"\u00a0"]]);do{l=j.length;j=j.replace(/(<?!(ol|ul)[^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1");j=j.replace(/(<(ol|ul)[^>]*\s)(?:id|name|language|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1")}while(l!=j.length);if(b(k,"paste_retain_style_properties").replace(/^none$/i,"").length==0){j=j.replace(/<\/?span[^>]*>/gi,"")}else{d([[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(o,h){return(h.length>0)?h.replace(/./," ").slice(Math.floor(h.length/2)).split("").join("\u00a0"):""}],[/(<[a-z][^>]*)\sstyle="([^"]*)"/gi,function(t,h,r){var u=[],o=0,q=n(f(r).replace(/&quot;/gi,"'"),";");c(q,function(s){var w,y,z=n(s,":");function x(A){return A+((A!=="0")&&(/\d$/.test(A)))?"px":""}if(z.length==2){w=z[0].toLowerCase();y=z[1].toLowerCase();switch(w){case"mso-padding-alt":case"mso-padding-top-alt":case"mso-padding-right-alt":case"mso-padding-bottom-alt":case"mso-padding-left-alt":case"mso-margin-alt":case"mso-margin-top-alt":case"mso-margin-right-alt":case"mso-margin-bottom-alt":case"mso-margin-left-alt":case"mso-table-layout-alt":case"mso-height":case"mso-width":case"mso-vertical-align-alt":u[o++]=w.replace(/^mso-|-alt$/g,"")+":"+x(y);return;case"horiz-align":u[o++]="text-align:"+y;return;case"vert-align":u[o++]="vertical-align:"+y;return;case"font-color":case"mso-foreground":u[o++]="color:"+y;return;case"mso-background":case"mso-highlight":u[o++]="background:"+y;return;case"mso-default-height":u[o++]="min-height:"+x(y);return;case"mso-default-width":u[o++]="min-width:"+x(y);return;case"mso-padding-between-alt":u[o++]="border-collapse:separate;border-spacing:"+x(y);return;case"text-line-through":if((y=="single")||(y=="double")){u[o++]="text-decoration:line-through"}return;case"mso-zero-height":if(y=="yes"){u[o++]="display:none"}return}if(/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(w)){return}u[o++]=w+":"+z[1]}});if(o>0){return h+' style="'+u.join(";")+'"'}else{return h}}]])}}if(b(k,"paste_convert_headers_to_strong")){d([[/<h[1-6][^>]*>/gi,"<p><strong>"],[/<\/h[1-6][^>]*>/gi,"</strong></p>"]])}d([[/Version:[\d.]+\nStartHTML:\d+\nEndHTML:\d+\nStartFragment:\d+\nEndFragment:\d+/gi,""]]);i=b(k,"paste_strip_class_attributes");if(i!=="none"){function m(q,o){if(i==="all"){return""}var h=p(n(o.replace(/^(["'])(.*)\1$/,"$2")," "),function(r){return(/^(?!mso)/i.test(r))});return h.length?' class="'+h.join(" ")+'"':""}j=j.replace(/ class="([^"]+)"/gi,m);j=j.replace(/ class=([\-\w]+)/gi,m)}if(b(k,"paste_remove_spans")){j=j.replace(/<\/?span[^>]*>/gi,"")}e.content=j},_postProcess:function(g,i){var f=this,e=f.editor,h=e.dom,d;if(e.settings.paste_enable_default_filters==false){return}if(i.wordContent){c(h.select("a",i.node),function(j){if(!j.href||j.href.indexOf("#_Toc")!=-1){h.remove(j,1)}});if(b(e,"paste_convert_middot_lists")){f._convertLists(g,i)}d=b(e,"paste_retain_style_properties");if((tinymce.is(d,"string"))&&(d!=="all")&&(d!=="*")){d=tinymce.explode(d.replace(/^none$/i,""));c(h.select("*",i.node),function(m){var n={},k=0,l,o,j;if(d){for(l=0;l<d.length;l++){o=d[l];j=h.getStyle(m,o);if(j){n[o]=j;k++}}}h.setAttrib(m,"style","");if(d&&k>0){h.setStyles(m,n)}else{if(m.nodeName=="SPAN"&&!m.className){h.remove(m,true)}}})}}if(b(e,"paste_remove_styles")||(b(e,"paste_remove_styles_if_webkit")&&tinymce.isWebKit)){c(h.select("*[style]",i.node),function(j){j.removeAttribute("style");j.removeAttribute("data-mce-style")})}else{if(tinymce.isWebKit){c(h.select("*",i.node),function(j){j.removeAttribute("data-mce-style")})}}},_convertLists:function(g,e){var i=g.editor.dom,h,l,d=-1,f,m=[],k,j;c(i.select("p",e.node),function(t){var q,u="",s,r,n,o;for(q=t.firstChild;q&&q.nodeType==3;q=q.nextSibling){u+=q.nodeValue}u=t.innerHTML.replace(/<\/?\w+[^>]*>/gi,"").replace(/&nbsp;/g,"\u00a0");if(/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*\u00a0*/.test(u)){s="ul"}if(/^__MCE_ITEM__\s*\w+\.\s*\u00a0+/.test(u)){s="ol"}if(s){f=parseFloat(t.style.marginLeft||0);if(f>d){m.push(f)}if(!h||s!=k){h=i.create(s);i.insertAfter(h,t)}else{if(f>d){h=l.appendChild(i.create(s))}else{if(f<d){n=tinymce.inArray(m,f);o=i.getParents(h.parentNode,s);h=o[o.length-1-n]||h}}}c(i.select("span",t),function(v){var p=v.innerHTML.replace(/<\/?\w+[^>]*>/gi,"");if(s=="ul"&&/^__MCE_ITEM__[\u2022\u00b7\u00a7\u00d8o\u25CF]/.test(p)){i.remove(v)}else{if(/^__MCE_ITEM__[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(p)){i.remove(v)}}});r=t.innerHTML;if(s=="ul"){r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*(&nbsp;|\u00a0)+\s*/,"")}else{r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^\s*[\w|'<'|'>']+\.(&nbsp;|\u00a0)+\s*/,"")}l=h.appendChild(i.create("li",0,r));i.remove(t);d=f;k=s}else{h=d=0}});j=e.node.innerHTML;if(j.indexOf("__MCE_ITEM__")!=-1){e.node.innerHTML=j.replace(/__MCE_ITEM__/g,"")}},_insert:function(f,d){var e=this.editor,g=e.selection.getRng();if(!e.selection.isCollapsed()&&g.startContainer!=g.endContainer){e.getDoc().execCommand("Delete",false,null)}e.execCommand("mceInsertContent",false,f,{skip_undo:d})},_insertPlainText:function(j){var h=this.editor,f=b(h,"paste_text_linebreaktype"),k=b(h,"paste_text_replacements"),g=tinymce.is;function e(m){c(m,function(n){if(n.constructor==RegExp){j=j.replace(n,"")}else{j=j.replace(n[0],n[1])}})}if((typeof(j)==="string")&&(j.length>0)){if(/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(j)){e([/[\n\r]+/g])}else{e([/\r+/g])}e([[/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi,"\n\n"],[/<br[^>]*>|<\/tr>/gi,"\n"],[/<\/t[dh]>\s*<t[dh][^>]*>/gi,"\t"],/<[a-z!\/?][^>]*>/gi,[/&nbsp;/gi," "],[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi,"$1"]]);var d=Number(b(h,"paste_max_consecutive_linebreaks"));if(d>-1){var l=new RegExp("\n{"+(d+1)+",}","g");var i="";while(i.length<d){i+="\n"}e([[l,i]])}j=h.dom.decode(tinymce.html.Entities.encodeRaw(j));if(g(k,"array")){e(k)}else{if(g(k,"string")){e(new RegExp(k,"gi"))}}if(f=="none"){e([[/\n+/g," "]])}else{if(f=="br"){e([[/\n/g,"<br />"]])}else{if(f=="p"){e([[/\n+/g,"</p><p>"],[/^(.*<\/p>)(<p>)$/,"<p>$1"]])}else{e([[/\n\n/g,"</p><p>"],[/^(.*<\/p>)(<p>)$/,"<p>$1"],[/\n/g,"<br />"]])}}}h.execCommand("mceInsertContent",false,j)}},_legacySupport:function(){var e=this,d=e.editor;d.addCommand("mcePasteWord",function(){d.windowManager.open({file:e.url+"/pasteword.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})});if(b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(){d.windowManager.open({file:e.url+"/pastetext.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})})}d.addButton("pasteword",{title:"paste.paste_word_desc",cmd:"mcePasteWord"})}});tinymce.PluginManager.add("paste",tinymce.plugins.PastePlugin)})();
\ No newline at end of file
+(function(){var c=tinymce.each,a={paste_auto_cleanup_on_paste:true,paste_enable_default_filters:true,paste_block_drop:false,paste_retain_style_properties:"none",paste_strip_class_attributes:"mso",paste_remove_spans:false,paste_remove_styles:false,paste_remove_styles_if_webkit:true,paste_convert_middot_lists:true,paste_convert_headers_to_strong:false,paste_dialog_width:"450",paste_dialog_height:"400",paste_max_consecutive_linebreaks:2,paste_text_use_dialog:false,paste_text_sticky:false,paste_text_sticky_default:false,paste_text_notifyalways:false,paste_text_linebreaktype:"combined",paste_text_replacements:[[/\u2026/g,"..."],[/[\x93\x94\u201c\u201d]/g,'"'],[/[\x60\x91\x92\u2018\u2019]/g,"'"]]};function b(d,e){return d.getParam(e,a[e])}tinymce.create("tinymce.plugins.PastePlugin",{init:function(d,e){var f=this;f.editor=d;f.url=e;f.onPreProcess=new tinymce.util.Dispatcher(f);f.onPostProcess=new tinymce.util.Dispatcher(f);f.onPreProcess.add(f._preProcess);f.onPostProcess.add(f._postProcess);f.onPreProcess.add(function(i,j){d.execCallback("paste_preprocess",i,j)});f.onPostProcess.add(function(i,j){d.execCallback("paste_postprocess",i,j)});d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){return false}});d.pasteAsPlainText=b(d,"paste_text_sticky_default");function h(l,j){var k=d.dom,i;f.onPreProcess.dispatch(f,l);l.node=k.create("div",0,l.content);if(tinymce.isGecko){i=d.selection.getRng(true);if(i.startContainer==i.endContainer&&i.startContainer.nodeType==3){if(l.node.childNodes.length===1&&/^(p|h[1-6]|pre)$/i.test(l.node.firstChild.nodeName)&&l.content.indexOf("__MCE_ITEM__")===-1){k.remove(l.node.firstChild,true)}}}f.onPostProcess.dispatch(f,l);l.content=d.serializer.serialize(l.node,{getInner:1,forced_root_block:""});if((!j)&&(d.pasteAsPlainText)){f._insertPlainText(l.content);if(!b(d,"paste_text_sticky")){d.pasteAsPlainText=false;d.controlManager.setActive("pastetext",false)}}else{f._insert(l.content)}}d.addCommand("mceInsertClipboardContent",function(i,j){h(j,true)});if(!b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(j,i){var k=tinymce.util.Cookie;d.pasteAsPlainText=!d.pasteAsPlainText;d.controlManager.setActive("pastetext",d.pasteAsPlainText);if((d.pasteAsPlainText)&&(!k.get("tinymcePasteText"))){if(b(d,"paste_text_sticky")){d.windowManager.alert(d.translate("paste.plaintext_mode_sticky"))}else{d.windowManager.alert(d.translate("paste.plaintext_mode"))}if(!b(d,"paste_text_notifyalways")){k.set("tinymcePasteText","1",new Date(new Date().getFullYear()+1,12,31))}}})}d.addButton("pastetext",{title:"paste.paste_text_desc",cmd:"mcePasteText"});d.addButton("selectall",{title:"paste.selectall_desc",cmd:"selectall"});function g(s){var l,p,j,t,k=d.selection,o=d.dom,q=d.getBody(),i,r;if(s.clipboardData||o.doc.dataTransfer){r=(s.clipboardData||o.doc.dataTransfer).getData("Text");if(d.pasteAsPlainText){s.preventDefault();h({content:o.encode(r).replace(/\r?\n/g,"<br />")});return}}if(o.get("_mcePaste")){return}l=o.add(q,"div",{id:"_mcePaste","class":"mcePaste","data-mce-bogus":"1"},"\uFEFF\uFEFF");if(q!=d.getDoc().body){i=o.getPos(d.selection.getStart(),q).y}else{i=q.scrollTop+o.getViewPort(d.getWin()).y}o.setStyles(l,{position:"absolute",left:tinymce.isGecko?-40:0,top:i-25,width:1,height:1,overflow:"hidden"});if(tinymce.isIE){t=k.getRng();j=o.doc.body.createTextRange();j.moveToElementText(l);j.execCommand("Paste");o.remove(l);if(l.innerHTML==="\uFEFF\uFEFF"){d.execCommand("mcePasteWord");s.preventDefault();return}k.setRng(t);k.setContent("");setTimeout(function(){h({content:l.innerHTML})},0);return tinymce.dom.Event.cancel(s)}else{function m(n){n.preventDefault()}o.bind(d.getDoc(),"mousedown",m);o.bind(d.getDoc(),"keydown",m);p=d.selection.getRng();l=l.firstChild;j=d.getDoc().createRange();j.setStart(l,0);j.setEnd(l,2);k.setRng(j);window.setTimeout(function(){var u="",n;if(!o.select("div.mcePaste > div.mcePaste").length){n=o.select("div.mcePaste");c(n,function(w){var v=w.firstChild;if(v&&v.nodeName=="DIV"&&v.style.marginTop&&v.style.backgroundColor){o.remove(v,1)}c(o.select("span.Apple-style-span",w),function(x){o.remove(x,1)});c(o.select("br[data-mce-bogus]",w),function(x){o.remove(x)});if(w.parentNode.className!="mcePaste"){u+=w.innerHTML}})}else{u="<p>"+o.encode(r).replace(/\r?\n\r?\n/g,"</p><p>").replace(/\r?\n/g,"<br />")+"</p>"}c(o.select("div.mcePaste"),function(v){o.remove(v)});if(p){k.setRng(p)}h({content:u});o.unbind(d.getDoc(),"mousedown",m);o.unbind(d.getDoc(),"keydown",m)},0)}}if(b(d,"paste_auto_cleanup_on_paste")){if(tinymce.isOpera||/Firefox\/2/.test(navigator.userAgent)){d.onKeyDown.addToTop(function(i,j){if(((tinymce.isMac?j.metaKey:j.ctrlKey)&&j.keyCode==86)||(j.shiftKey&&j.keyCode==45)){g(j)}})}else{d.onPaste.addToTop(function(i,j){return g(j)})}}d.onInit.add(function(){d.controlManager.setActive("pastetext",d.pasteAsPlainText);if(b(d,"paste_block_drop")){d.dom.bind(d.getBody(),["dragend","dragover","draggesture","dragdrop","drop","drag"],function(i){i.preventDefault();i.stopPropagation();return false})}});f._legacySupport()},getInfo:function(){return{longname:"Paste text/word",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_preProcess:function(g,e){var k=this.editor,j=e.content,p=tinymce.grep,n=tinymce.explode,f=tinymce.trim,l,i;function d(h){c(h,function(o){if(o.constructor==RegExp){j=j.replace(o,"")}else{j=j.replace(o[0],o[1])}})}if(k.settings.paste_enable_default_filters==false){return}if(tinymce.isIE&&document.documentMode>=9&&/<(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)/.test(e.content)){d([[/(?:<br>&nbsp;[\s\r\n]+|<br>)*(<\/?(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)[^>]*>)(?:<br>&nbsp;[\s\r\n]+|<br>)*/g,"$1"]]);d([[/<br><br>/g,"<BR><BR>"],[/<br>/g," "],[/<BR><BR>/g,"<br>"]])}if(/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(j)||e.wordContent){e.wordContent=true;d([/^\s*(&nbsp;)+/gi,/(&nbsp;|<br[^>]*>)+\s*$/gi]);if(b(k,"paste_convert_headers_to_strong")){j=j.replace(/<p [^>]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi,"<p><strong>$1</strong></p>")}if(b(k,"paste_convert_middot_lists")){d([[/<!--\[if !supportLists\]-->/gi,"$&__MCE_ITEM__"],[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi,"$1__MCE_ITEM__"],[/(<p[^>]+(?:MsoListParagraph)[^>]+>)/gi,"$1__MCE_ITEM__"]])}d([/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/gi,"\u00a0"]]);do{l=j.length;j=j.replace(/(<?!(ol|ul)[^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1");j=j.replace(/(<(ol|ul)[^>]*\s)(?:id|name|language|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1")}while(l!=j.length);if(b(k,"paste_retain_style_properties").replace(/^none$/i,"").length==0){j=j.replace(/<\/?span[^>]*>/gi,"")}else{d([[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(o,h){return(h.length>0)?h.replace(/./," ").slice(Math.floor(h.length/2)).split("").join("\u00a0"):""}],[/(<[a-z][^>]*)\sstyle="([^"]*)"/gi,function(t,h,r){var u=[],o=0,q=n(f(r).replace(/&quot;/gi,"'"),";");c(q,function(s){var w,y,z=n(s,":");function x(A){return A+((A!=="0")&&(/\d$/.test(A)))?"px":""}if(z.length==2){w=z[0].toLowerCase();y=z[1].toLowerCase();switch(w){case"mso-padding-alt":case"mso-padding-top-alt":case"mso-padding-right-alt":case"mso-padding-bottom-alt":case"mso-padding-left-alt":case"mso-margin-alt":case"mso-margin-top-alt":case"mso-margin-right-alt":case"mso-margin-bottom-alt":case"mso-margin-left-alt":case"mso-table-layout-alt":case"mso-height":case"mso-width":case"mso-vertical-align-alt":u[o++]=w.replace(/^mso-|-alt$/g,"")+":"+x(y);return;case"horiz-align":u[o++]="text-align:"+y;return;case"vert-align":u[o++]="vertical-align:"+y;return;case"font-color":case"mso-foreground":u[o++]="color:"+y;return;case"mso-background":case"mso-highlight":u[o++]="background:"+y;return;case"mso-default-height":u[o++]="min-height:"+x(y);return;case"mso-default-width":u[o++]="min-width:"+x(y);return;case"mso-padding-between-alt":u[o++]="border-collapse:separate;border-spacing:"+x(y);return;case"text-line-through":if((y=="single")||(y=="double")){u[o++]="text-decoration:line-through"}return;case"mso-zero-height":if(y=="yes"){u[o++]="display:none"}return}if(/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(w)){return}u[o++]=w+":"+z[1]}});if(o>0){return h+' style="'+u.join(";")+'"'}else{return h}}]])}}if(b(k,"paste_convert_headers_to_strong")){d([[/<h[1-6][^>]*>/gi,"<p><strong>"],[/<\/h[1-6][^>]*>/gi,"</strong></p>"]])}d([[/Version:[\d.]+\nStartHTML:\d+\nEndHTML:\d+\nStartFragment:\d+\nEndFragment:\d+/gi,""]]);i=b(k,"paste_strip_class_attributes");if(i!=="none"){function m(q,o){if(i==="all"){return""}var h=p(n(o.replace(/^(["'])(.*)\1$/,"$2")," "),function(r){return(/^(?!mso)/i.test(r))});return h.length?' class="'+h.join(" ")+'"':""}j=j.replace(/ class="([^"]+)"/gi,m);j=j.replace(/ class=([\-\w]+)/gi,m)}if(b(k,"paste_remove_spans")){j=j.replace(/<\/?span[^>]*>/gi,"")}e.content=j},_postProcess:function(g,i){var f=this,e=f.editor,h=e.dom,d;if(e.settings.paste_enable_default_filters==false){return}if(i.wordContent){c(h.select("a",i.node),function(j){if(!j.href||j.href.indexOf("#_Toc")!=-1){h.remove(j,1)}});if(b(e,"paste_convert_middot_lists")){f._convertLists(g,i)}d=b(e,"paste_retain_style_properties");if((tinymce.is(d,"string"))&&(d!=="all")&&(d!=="*")){d=tinymce.explode(d.replace(/^none$/i,""));c(h.select("*",i.node),function(m){var n={},k=0,l,o,j;if(d){for(l=0;l<d.length;l++){o=d[l];j=h.getStyle(m,o);if(j){n[o]=j;k++}}}h.setAttrib(m,"style","");if(d&&k>0){h.setStyles(m,n)}else{if(m.nodeName=="SPAN"&&!m.className){h.remove(m,true)}}})}}if(b(e,"paste_remove_styles")||(b(e,"paste_remove_styles_if_webkit")&&tinymce.isWebKit)){c(h.select("*[style]",i.node),function(j){j.removeAttribute("style");j.removeAttribute("data-mce-style")})}else{if(tinymce.isWebKit){c(h.select("*",i.node),function(j){j.removeAttribute("data-mce-style")})}}},_convertLists:function(g,e){var i=g.editor.dom,h,l,d=-1,f,m=[],k,j;c(i.select("p",e.node),function(t){var q,u="",s,r,n,o;for(q=t.firstChild;q&&q.nodeType==3;q=q.nextSibling){u+=q.nodeValue}u=t.innerHTML.replace(/<\/?\w+[^>]*>/gi,"").replace(/&nbsp;/g,"\u00a0");if(/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*\u00a0*/.test(u)){s="ul"}if(/^__MCE_ITEM__\s*\w+\.\s*\u00a0+/.test(u)){s="ol"}if(s){f=parseFloat(t.style.marginLeft||0);if(f>d){m.push(f)}if(!h||s!=k){h=i.create(s);i.insertAfter(h,t)}else{if(f>d){h=l.appendChild(i.create(s))}else{if(f<d){n=tinymce.inArray(m,f);o=i.getParents(h.parentNode,s);h=o[o.length-1-n]||h}}}c(i.select("span",t),function(v){var p=v.innerHTML.replace(/<\/?\w+[^>]*>/gi,"");if(s=="ul"&&/^__MCE_ITEM__[\u2022\u00b7\u00a7\u00d8o\u25CF]/.test(p)){i.remove(v)}else{if(/^__MCE_ITEM__[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(p)){i.remove(v)}}});r=t.innerHTML;if(s=="ul"){r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*(&nbsp;|\u00a0)+\s*/,"")}else{r=t.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^\s*[\w|'<'|'>']+\.(&nbsp;|\u00a0)+\s*/,"")}l=h.appendChild(i.create("li",0,r));i.remove(t);d=f;k=s}else{h=d=0}});j=e.node.innerHTML;if(j.indexOf("__MCE_ITEM__")!=-1){e.node.innerHTML=j.replace(/__MCE_ITEM__/g,"")}},_insert:function(f,d){var e=this.editor,g=e.selection.getRng();if(!e.selection.isCollapsed()&&g.startContainer!=g.endContainer){e.getDoc().execCommand("Delete",false,null)}e.execCommand("mceInsertContent",false,f,{skip_undo:d})},_insertPlainText:function(j){var h=this.editor,f=b(h,"paste_text_linebreaktype"),k=b(h,"paste_text_replacements"),g=tinymce.is;function e(m){c(m,function(n){if(n.constructor==RegExp){j=j.replace(n,"")}else{j=j.replace(n[0],n[1])}})}if((typeof(j)==="string")&&(j.length>0)){if(/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(j)){e([/[\n\r]+/g])}else{e([/\r+/g])}e([[/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi,"\n\n"],[/<br[^>]*>|<\/tr>/gi,"\n"],[/<\/t[dh]>\s*<t[dh][^>]*>/gi,"\t"],/<[a-z!\/?][^>]*>/gi,[/&nbsp;/gi," "],[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi,"$1"]]);var d=Number(b(h,"paste_max_consecutive_linebreaks"));if(d>-1){var l=new RegExp("\n{"+(d+1)+",}","g");var i="";while(i.length<d){i+="\n"}e([[l,i]])}j=h.dom.decode(tinymce.html.Entities.encodeRaw(j));if(g(k,"array")){e(k)}else{if(g(k,"string")){e(new RegExp(k,"gi"))}}if(f=="none"){e([[/\n+/g," "]])}else{if(f=="br"){e([[/\n/g,"<br />"]])}else{if(f=="p"){e([[/\n+/g,"</p><p>"],[/^(.*<\/p>)(<p>)$/,"<p>$1"]])}else{e([[/\n\n/g,"</p><p>"],[/^(.*<\/p>)(<p>)$/,"<p>$1"],[/\n/g,"<br />"]])}}}h.execCommand("mceInsertContent",false,j)}},_legacySupport:function(){var e=this,d=e.editor;d.addCommand("mcePasteWord",function(){d.windowManager.open({file:e.url+"/pasteword.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})});if(b(d,"paste_text_use_dialog")){d.addCommand("mcePasteText",function(){d.windowManager.open({file:e.url+"/pastetext.htm",width:parseInt(b(d,"paste_dialog_width")),height:parseInt(b(d,"paste_dialog_height")),inline:1})})}d.addButton("pasteword",{title:"paste.paste_word_desc",cmd:"mcePasteWord"})}});tinymce.PluginManager.add("paste",tinymce.plugins.PastePlugin)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/paste/langs/en_dlg.js b/webapp/src/main/webapp/js/tiny_mce/plugins/paste/langs/en_dlg.js
index bc74daf85..7b90e687b 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/paste/langs/en_dlg.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/paste/langs/en_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.paste_dlg',{"word_title":"Use Ctrl+V on your keyboard to paste the text into the window.","text_linebreaks":"Keep Linebreaks","text_title":"Use Ctrl+V on your keyboard to paste the text into the window."});
\ No newline at end of file
+tinyMCE.addI18n('en.paste_dlg',{"word_title":"Use Ctrl+V on your keyboard to paste the text into the window.","text_linebreaks":"Keep Linebreaks","text_title":"Use Ctrl+V on your keyboard to paste the text into the window."});
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/paste/pastetext.htm b/webapp/src/main/webapp/js/tiny_mce/plugins/paste/pastetext.htm
index 8ccfbb970..50055d787 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/paste/pastetext.htm
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/paste/pastetext.htm
@@ -23,5 +23,5 @@
 			<input type="button" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" id="cancel" />
 		</div>
 	</form>
-</body> 
-</html>
\ No newline at end of file
+</body>
+</html>
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/preview/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/preview/editor_plugin.js
index 507909c5f..85e07830a 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/preview/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/preview/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.Preview",{init:function(a,b){var d=this,c=tinymce.explode(a.settings.content_css);d.editor=a;tinymce.each(c,function(f,e){c[e]=a.documentBaseURI.toAbsolute(f)});a.addCommand("mcePreview",function(){a.windowManager.open({file:a.getParam("plugin_preview_pageurl",b+"/preview.html"),width:parseInt(a.getParam("plugin_preview_width","550")),height:parseInt(a.getParam("plugin_preview_height","600")),resizable:"yes",scrollbars:"yes",popup_css:c?c.join(","):a.baseURI.toAbsolute("themes/"+a.settings.theme+"/skins/"+a.settings.skin+"/content.css"),inline:a.getParam("plugin_preview_inline",1)},{base:a.documentBaseURI.getURI()})});a.addButton("preview",{title:"preview.preview_desc",cmd:"mcePreview"})},getInfo:function(){return{longname:"Preview",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/preview",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("preview",tinymce.plugins.Preview)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.Preview",{init:function(a,b){var d=this,c=tinymce.explode(a.settings.content_css);d.editor=a;tinymce.each(c,function(f,e){c[e]=a.documentBaseURI.toAbsolute(f)});a.addCommand("mcePreview",function(){a.windowManager.open({file:a.getParam("plugin_preview_pageurl",b+"/preview.html"),width:parseInt(a.getParam("plugin_preview_width","550")),height:parseInt(a.getParam("plugin_preview_height","600")),resizable:"yes",scrollbars:"yes",popup_css:c?c.join(","):a.baseURI.toAbsolute("themes/"+a.settings.theme+"/skins/"+a.settings.skin+"/content.css"),inline:a.getParam("plugin_preview_inline",1)},{base:a.documentBaseURI.getURI()})});a.addButton("preview",{title:"preview.preview_desc",cmd:"mcePreview"})},getInfo:function(){return{longname:"Preview",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/preview",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("preview",tinymce.plugins.Preview)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/preview/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/preview/editor_plugin_src.js
index 80f00f0d9..e3ec7668a 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/preview/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/preview/editor_plugin_src.js
@@ -15,7 +15,7 @@
 
 			t.editor = ed;
 
-			// Force absolute CSS urls	
+			// Force absolute CSS urls
 			tinymce.each(css, function(u, k) {
 				css[k] = ed.documentBaseURI.toAbsolute(u);
 			});
@@ -50,4 +50,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('preview', tinymce.plugins.Preview);
-})();
\ No newline at end of file
+})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/print/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/print/editor_plugin.js
index b5b3a55ed..84f603675 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/print/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/print/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.Print",{init:function(a,b){a.addCommand("mcePrint",function(){a.getWin().print()});a.addButton("print",{title:"print.print_desc",cmd:"mcePrint"})},getInfo:function(){return{longname:"Print",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/print",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("print",tinymce.plugins.Print)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.Print",{init:function(a,b){a.addCommand("mcePrint",function(){a.getWin().print()});a.addButton("print",{title:"print.print_desc",cmd:"mcePrint"})},getInfo:function(){return{longname:"Print",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/print",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("print",tinymce.plugins.Print)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/save/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/save/editor_plugin.js
index 8e9399667..16744346e 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/save/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/save/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.Save",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceSave",c._save,c);a.addCommand("mceCancel",c._cancel,c);a.addButton("save",{title:"save.save_desc",cmd:"mceSave"});a.addButton("cancel",{title:"save.cancel_desc",cmd:"mceCancel"});a.onNodeChange.add(c._nodeChange,c);a.addShortcut("ctrl+s",a.getLang("save.save_desc"),"mceSave")},getInfo:function(){return{longname:"Save",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/save",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,c){var b=this.editor;if(b.getParam("save_enablewhendirty")){a.setDisabled("save",!b.isDirty());a.setDisabled("cancel",!b.isDirty())}},_save:function(){var c=this.editor,a,e,d,b;a=tinymce.DOM.get(c.id).form||tinymce.DOM.getParent(c.id,"form");if(c.getParam("save_enablewhendirty")&&!c.isDirty()){return}tinyMCE.triggerSave();if(e=c.getParam("save_onsavecallback")){if(c.execCallback("save_onsavecallback",c)){c.startContent=tinymce.trim(c.getContent({format:"raw"}));c.nodeChanged()}return}if(a){c.isNotDirty=true;if(a.onsubmit==null||a.onsubmit()!=false){a.submit()}c.nodeChanged()}else{c.windowManager.alert("Error: No form element found.")}},_cancel:function(){var a=this.editor,c,b=tinymce.trim(a.startContent);if(c=a.getParam("save_oncancelcallback")){a.execCallback("save_oncancelcallback",a);return}a.setContent(b);a.undoManager.clear();a.nodeChanged()}});tinymce.PluginManager.add("save",tinymce.plugins.Save)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.Save",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceSave",c._save,c);a.addCommand("mceCancel",c._cancel,c);a.addButton("save",{title:"save.save_desc",cmd:"mceSave"});a.addButton("cancel",{title:"save.cancel_desc",cmd:"mceCancel"});a.onNodeChange.add(c._nodeChange,c);a.addShortcut("ctrl+s",a.getLang("save.save_desc"),"mceSave")},getInfo:function(){return{longname:"Save",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/save",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,c){var b=this.editor;if(b.getParam("save_enablewhendirty")){a.setDisabled("save",!b.isDirty());a.setDisabled("cancel",!b.isDirty())}},_save:function(){var c=this.editor,a,e,d,b;a=tinymce.DOM.get(c.id).form||tinymce.DOM.getParent(c.id,"form");if(c.getParam("save_enablewhendirty")&&!c.isDirty()){return}tinyMCE.triggerSave();if(e=c.getParam("save_onsavecallback")){if(c.execCallback("save_onsavecallback",c)){c.startContent=tinymce.trim(c.getContent({format:"raw"}));c.nodeChanged()}return}if(a){c.isNotDirty=true;if(a.onsubmit==null||a.onsubmit()!=false){a.submit()}c.nodeChanged()}else{c.windowManager.alert("Error: No form element found.")}},_cancel:function(){var a=this.editor,c,b=tinymce.trim(a.startContent);if(c=a.getParam("save_oncancelcallback")){a.execCallback("save_oncancelcallback",a);return}a.setContent(b);a.undoManager.clear();a.nodeChanged()}});tinymce.PluginManager.add("save",tinymce.plugins.Save)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/save/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/save/editor_plugin_src.js
index 5ab6491c8..95705c982 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/save/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/save/editor_plugin_src.js
@@ -98,4 +98,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('save', tinymce.plugins.Save);
-})();
\ No newline at end of file
+})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/searchreplace/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/searchreplace/editor_plugin.js
index 165bc12df..396d5c23e 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/searchreplace/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/searchreplace/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.SearchReplacePlugin",{init:function(a,c){function b(d){window.focus();a.windowManager.open({file:c+"/searchreplace.htm",width:420+parseInt(a.getLang("searchreplace.delta_width",0)),height:170+parseInt(a.getLang("searchreplace.delta_height",0)),inline:1,auto_focus:0},{mode:d,search_string:a.selection.getContent({format:"text"}),plugin_url:c})}a.addCommand("mceSearch",function(){b("search")});a.addCommand("mceReplace",function(){b("replace")});a.addButton("search",{title:"searchreplace.search_desc",cmd:"mceSearch"});a.addButton("replace",{title:"searchreplace.replace_desc",cmd:"mceReplace"});a.addShortcut("ctrl+f","searchreplace.search_desc","mceSearch")},getInfo:function(){return{longname:"Search/Replace",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("searchreplace",tinymce.plugins.SearchReplacePlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.SearchReplacePlugin",{init:function(a,c){function b(d){window.focus();a.windowManager.open({file:c+"/searchreplace.htm",width:420+parseInt(a.getLang("searchreplace.delta_width",0)),height:170+parseInt(a.getLang("searchreplace.delta_height",0)),inline:1,auto_focus:0},{mode:d,search_string:a.selection.getContent({format:"text"}),plugin_url:c})}a.addCommand("mceSearch",function(){b("search")});a.addCommand("mceReplace",function(){b("replace")});a.addButton("search",{title:"searchreplace.search_desc",cmd:"mceSearch"});a.addButton("replace",{title:"searchreplace.replace_desc",cmd:"mceReplace"});a.addShortcut("ctrl+f","searchreplace.search_desc","mceSearch")},getInfo:function(){return{longname:"Search/Replace",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("searchreplace",tinymce.plugins.SearchReplacePlugin)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/searchreplace/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/searchreplace/editor_plugin_src.js
index b0c013fdf..ef6b965c8 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/searchreplace/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/searchreplace/editor_plugin_src.js
@@ -58,4 +58,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('searchreplace', tinymce.plugins.SearchReplacePlugin);
-})();
\ No newline at end of file
+})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/searchreplace/js/searchreplace.js b/webapp/src/main/webapp/js/tiny_mce/plugins/searchreplace/js/searchreplace.js
index 85c542ee5..a552ce26f 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/searchreplace/js/searchreplace.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/searchreplace/js/searchreplace.js
@@ -10,7 +10,7 @@ var SearchReplaceDialog = {
 
 		// Focus input field
 		f[m + '_panel_searchstring'].focus();
-		
+
 		mcTabs.onChange.add(function(tab_id, panel_id) {
 			t.switchMode(tab_id.substring(0, tab_id.indexOf('_')));
 		});
@@ -61,7 +61,7 @@ var SearchReplaceDialog = {
 
 		function fix() {
 			// Correct Firefox graphics glitches
-			// TODO: Verify if this is actually needed any more, maybe it was for very old FF versions? 
+			// TODO: Verify if this is actually needed any more, maybe it was for very old FF versions?
 			r = se.getRng().cloneRange();
 			ed.getDoc().execCommand('SelectAll', false, null);
 			se.setRng(r);
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/searchreplace/langs/en_dlg.js b/webapp/src/main/webapp/js/tiny_mce/plugins/searchreplace/langs/en_dlg.js
index 8a6590097..cfcc4cd59 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/searchreplace/langs/en_dlg.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/searchreplace/langs/en_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.searchreplace_dlg',{findwhat:"Find What",replacewith:"Replace with",direction:"Direction",up:"Up",down:"Down",mcase:"Match Case",findnext:"Find Next",allreplaced:"All occurrences of the search string were replaced.","searchnext_desc":"Find Again",notfound:"The search has been completed. The search string could not be found.","search_title":"Find","replace_title":"Find/Replace",replaceall:"Replace All",replace:"Replace"});
\ No newline at end of file
+tinyMCE.addI18n('en.searchreplace_dlg',{findwhat:"Find What",replacewith:"Replace with",direction:"Direction",up:"Up",down:"Down",mcase:"Match Case",findnext:"Find Next",allreplaced:"All occurrences of the search string were replaced.","searchnext_desc":"Find Again",notfound:"The search has been completed. The search string could not be found.","search_title":"Find","replace_title":"Find/Replace",replaceall:"Replace All",replace:"Replace"});
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/spellchecker/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/spellchecker/editor_plugin.js
index 6b57241a9..527e40808 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/spellchecker/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/spellchecker/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.util.JSONRequest,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.SpellcheckerPlugin",{getInfo:function(){return{longname:"Spellchecker",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker",version:tinymce.majorVersion+"."+tinymce.minorVersion}},init:function(e,f){var g=this,d;g.url=f;g.editor=e;g.rpcUrl=e.getParam("spellchecker_rpc_url","{backend}");if(g.rpcUrl=="{backend}"){if(tinymce.isIE){return}g.hasSupport=true;e.onContextMenu.addToTop(function(h,i){if(g.active){return false}})}e.addCommand("mceSpellCheck",function(){if(g.rpcUrl=="{backend}"){g.editor.getBody().spellcheck=g.active=!g.active;return}if(!g.active){e.setProgressState(1);g._sendRPC("checkWords",[g.selectedLang,g._getWords()],function(h){if(h.length>0){g.active=1;g._markWords(h);e.setProgressState(0);e.nodeChanged()}else{e.setProgressState(0);if(e.getParam("spellchecker_report_no_misspellings",true)){e.windowManager.alert("spellchecker.no_mpell")}}})}else{g._done()}});if(e.settings.content_css!==false){e.contentCSS.push(f+"/css/content.css")}e.onClick.add(g._showMenu,g);e.onContextMenu.add(g._showMenu,g);e.onBeforeGetContent.add(function(){if(g.active){g._removeWords()}});e.onNodeChange.add(function(i,h){h.setActive("spellchecker",g.active)});e.onSetContent.add(function(){g._done()});e.onBeforeGetContent.add(function(){g._done()});e.onBeforeExecCommand.add(function(h,i){if(i=="mceFullScreen"){g._done()}});g.languages={};c(e.getParam("spellchecker_languages","+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv","hash"),function(i,h){if(h.indexOf("+")===0){h=h.substring(1);g.selectedLang=i}g.languages[h]=i})},createControl:function(h,d){var f=this,g,e=f.editor;if(h=="spellchecker"){if(f.rpcUrl=="{backend}"){if(f.hasSupport){g=d.createButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f})}return g}g=d.createSplitButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f});g.onRenderMenu.add(function(j,i){i.add({title:"spellchecker.langs","class":"mceMenuItemTitle"}).setDisabled(1);f.menuItems={};c(f.languages,function(n,m){var p={icon:1},l;p.onclick=function(){if(n==f.selectedLang){return}f._updateMenu(l);f.selectedLang=n};p.title=m;l=i.add(p);l.setSelected(n==f.selectedLang);f.menuItems[n]=l;if(n==f.selectedLang){f.selectedItem=l}})});return g}},setLanguage:function(e){var d=this;if(e==d.selectedLang){return}if(tinymce.grep(d.languages,function(f){return f===e}).length===0){throw"Unknown language: "+e}d.selectedLang=e;if(d.menuItems){d._updateMenu(d.menuItems[e])}if(d.active){d._done()}},_updateMenu:function(d){d.setSelected(1);this.selectedItem.setSelected(0);this.selectedItem=d},_walk:function(i,g){var h=this.editor.getDoc(),e;if(h.createTreeWalker){e=h.createTreeWalker(i,NodeFilter.SHOW_TEXT,null,false);while((i=e.nextNode())!=null){g.call(this,i)}}else{tinymce.walk(i,g,"childNodes")}},_getSeparators:function(){var e="",d,f=this.editor.getParam("spellchecker_word_separator_chars",'\\s!"#$%&()*+,-./:;<=>?@[]^_{|}§©«®±¶·¸»¼½¾¿×÷¤\u201d\u201c');for(d=0;d<f.length;d++){e+="\\"+f.charAt(d)}return e},_getWords:function(){var e=this.editor,g=[],d="",f={},h=[];this._walk(e.getBody(),function(i){if(i.nodeType==3){d+=i.nodeValue+" "}});if(e.getParam("spellchecker_word_pattern")){h=d.match("("+e.getParam("spellchecker_word_pattern")+")","gi")}else{d=d.replace(new RegExp("([0-9]|["+this._getSeparators()+"])","g")," ");d=tinymce.trim(d.replace(/(\s+)/g," "));h=d.split(" ")}c(h,function(i){if(!f[i]){g.push(i);f[i]=1}});return g},_removeWords:function(d){var e=this.editor,h=e.dom,g=e.selection,f=g.getRng(true);c(h.select("span").reverse(),function(i){if(i&&(h.hasClass(i,"mceItemHiddenSpellWord")||h.hasClass(i,"mceItemHidden"))){if(!d||h.decode(i.innerHTML)==d){h.remove(i,1)}}});g.setRng(f)},_markWords:function(l){var h=this.editor,g=h.dom,j=h.getDoc(),i=h.selection,d=i.getRng(true),e=[],k=l.join("|"),m=this._getSeparators(),f=new RegExp("(^|["+m+"])("+k+")(?=["+m+"]|$)","g");this._walk(h.getBody(),function(o){if(o.nodeType==3){e.push(o)}});c(e,function(t){var r,q,o,s,p=t.nodeValue;f.lastIndex=0;if(f.test(p)){p=g.encode(p);q=g.create("span",{"class":"mceItemHidden"});if(tinymce.isIE){p=p.replace(f,"$1<mcespell>$2</mcespell>");while((s=p.indexOf("<mcespell>"))!=-1){o=p.substring(0,s);if(o.length){r=j.createTextNode(g.decode(o));q.appendChild(r)}p=p.substring(s+10);s=p.indexOf("</mcespell>");o=p.substring(0,s);p=p.substring(s+11);q.appendChild(g.create("span",{"class":"mceItemHiddenSpellWord"},o))}if(p.length){r=j.createTextNode(g.decode(p));q.appendChild(r)}}else{q.innerHTML=p.replace(f,'$1<span class="mceItemHiddenSpellWord">$2</span>')}g.replace(q,t)}});i.setRng(d)},_showMenu:function(h,j){var i=this,h=i.editor,d=i._menu,l,k=h.dom,g=k.getViewPort(h.getWin()),f=j.target;j=0;if(!d){d=h.controlManager.createDropMenu("spellcheckermenu",{"class":"mceNoIcons"});i._menu=d}if(k.hasClass(f,"mceItemHiddenSpellWord")){d.removeAll();d.add({title:"spellchecker.wait","class":"mceMenuItemTitle"}).setDisabled(1);i._sendRPC("getSuggestions",[i.selectedLang,k.decode(f.innerHTML)],function(m){var e;d.removeAll();if(m.length>0){d.add({title:"spellchecker.sug","class":"mceMenuItemTitle"}).setDisabled(1);c(m,function(n){d.add({title:n,onclick:function(){k.replace(h.getDoc().createTextNode(n),f);i._checkDone()}})});d.addSeparator()}else{d.add({title:"spellchecker.no_sug","class":"mceMenuItemTitle"}).setDisabled(1)}if(h.getParam("show_ignore_words",true)){e=i.editor.getParam("spellchecker_enable_ignore_rpc","");d.add({title:"spellchecker.ignore_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}}});d.add({title:"spellchecker.ignore_words",onclick:function(){var n=f.innerHTML;i._removeWords(k.decode(n));i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWords",[i.selectedLang,n],function(o){h.setProgressState(0)})}}})}if(i.editor.getParam("spellchecker_enable_learn_rpc")){d.add({title:"spellchecker.learn_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();h.setProgressState(1);i._sendRPC("learnWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}})}d.update()});l=b.getPos(h.getContentAreaContainer());d.settings.offset_x=l.x;d.settings.offset_y=l.y;h.selection.select(f);l=k.getPos(f);d.showMenu(l.x,l.y+f.offsetHeight-g.y);return tinymce.dom.Event.cancel(j)}else{d.hideMenu()}},_checkDone:function(){var e=this,d=e.editor,g=d.dom,f;c(g.select("span"),function(h){if(h&&g.hasClass(h,"mceItemHiddenSpellWord")){f=true;return false}});if(!f){e._done()}},_done:function(){var d=this,e=d.active;if(d.active){d.active=0;d._removeWords();if(d._menu){d._menu.hideMenu()}if(e){d.editor.nodeChanged()}}},_sendRPC:function(e,g,d){var f=this;a.sendRPC({url:f.rpcUrl,method:e,params:g,success:d,error:function(i,h){f.editor.setProgressState(0);f.editor.windowManager.alert(i.errstr||("Error response: "+h.responseText))}})}});tinymce.PluginManager.add("spellchecker",tinymce.plugins.SpellcheckerPlugin)})();
\ No newline at end of file
+(function(){var a=tinymce.util.JSONRequest,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.SpellcheckerPlugin",{getInfo:function(){return{longname:"Spellchecker",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker",version:tinymce.majorVersion+"."+tinymce.minorVersion}},init:function(e,f){var g=this,d;g.url=f;g.editor=e;g.rpcUrl=e.getParam("spellchecker_rpc_url","{backend}");if(g.rpcUrl=="{backend}"){if(tinymce.isIE){return}g.hasSupport=true;e.onContextMenu.addToTop(function(h,i){if(g.active){return false}})}e.addCommand("mceSpellCheck",function(){if(g.rpcUrl=="{backend}"){g.editor.getBody().spellcheck=g.active=!g.active;return}if(!g.active){e.setProgressState(1);g._sendRPC("checkWords",[g.selectedLang,g._getWords()],function(h){if(h.length>0){g.active=1;g._markWords(h);e.setProgressState(0);e.nodeChanged()}else{e.setProgressState(0);if(e.getParam("spellchecker_report_no_misspellings",true)){e.windowManager.alert("spellchecker.no_mpell")}}})}else{g._done()}});if(e.settings.content_css!==false){e.contentCSS.push(f+"/css/content.css")}e.onClick.add(g._showMenu,g);e.onContextMenu.add(g._showMenu,g);e.onBeforeGetContent.add(function(){if(g.active){g._removeWords()}});e.onNodeChange.add(function(i,h){h.setActive("spellchecker",g.active)});e.onSetContent.add(function(){g._done()});e.onBeforeGetContent.add(function(){g._done()});e.onBeforeExecCommand.add(function(h,i){if(i=="mceFullScreen"){g._done()}});g.languages={};c(e.getParam("spellchecker_languages","+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv","hash"),function(i,h){if(h.indexOf("+")===0){h=h.substring(1);g.selectedLang=i}g.languages[h]=i})},createControl:function(h,d){var f=this,g,e=f.editor;if(h=="spellchecker"){if(f.rpcUrl=="{backend}"){if(f.hasSupport){g=d.createButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f})}return g}g=d.createSplitButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f});g.onRenderMenu.add(function(j,i){i.add({title:"spellchecker.langs","class":"mceMenuItemTitle"}).setDisabled(1);f.menuItems={};c(f.languages,function(n,m){var p={icon:1},l;p.onclick=function(){if(n==f.selectedLang){return}f._updateMenu(l);f.selectedLang=n};p.title=m;l=i.add(p);l.setSelected(n==f.selectedLang);f.menuItems[n]=l;if(n==f.selectedLang){f.selectedItem=l}})});return g}},setLanguage:function(e){var d=this;if(e==d.selectedLang){return}if(tinymce.grep(d.languages,function(f){return f===e}).length===0){throw"Unknown language: "+e}d.selectedLang=e;if(d.menuItems){d._updateMenu(d.menuItems[e])}if(d.active){d._done()}},_updateMenu:function(d){d.setSelected(1);this.selectedItem.setSelected(0);this.selectedItem=d},_walk:function(i,g){var h=this.editor.getDoc(),e;if(h.createTreeWalker){e=h.createTreeWalker(i,NodeFilter.SHOW_TEXT,null,false);while((i=e.nextNode())!=null){g.call(this,i)}}else{tinymce.walk(i,g,"childNodes")}},_getSeparators:function(){var e="",d,f=this.editor.getParam("spellchecker_word_separator_chars",'\\s!"#$%&()*+,-./:;<=>?@[]^_{|}§©«®±¶·¸»¼½¾¿×÷¤\u201d\u201c');for(d=0;d<f.length;d++){e+="\\"+f.charAt(d)}return e},_getWords:function(){var e=this.editor,g=[],d="",f={},h=[];this._walk(e.getBody(),function(i){if(i.nodeType==3){d+=i.nodeValue+" "}});if(e.getParam("spellchecker_word_pattern")){h=d.match("("+e.getParam("spellchecker_word_pattern")+")","gi")}else{d=d.replace(new RegExp("([0-9]|["+this._getSeparators()+"])","g")," ");d=tinymce.trim(d.replace(/(\s+)/g," "));h=d.split(" ")}c(h,function(i){if(!f[i]){g.push(i);f[i]=1}});return g},_removeWords:function(d){var e=this.editor,h=e.dom,g=e.selection,f=g.getRng(true);c(h.select("span").reverse(),function(i){if(i&&(h.hasClass(i,"mceItemHiddenSpellWord")||h.hasClass(i,"mceItemHidden"))){if(!d||h.decode(i.innerHTML)==d){h.remove(i,1)}}});g.setRng(f)},_markWords:function(l){var h=this.editor,g=h.dom,j=h.getDoc(),i=h.selection,d=i.getRng(true),e=[],k=l.join("|"),m=this._getSeparators(),f=new RegExp("(^|["+m+"])("+k+")(?=["+m+"]|$)","g");this._walk(h.getBody(),function(o){if(o.nodeType==3){e.push(o)}});c(e,function(t){var r,q,o,s,p=t.nodeValue;f.lastIndex=0;if(f.test(p)){p=g.encode(p);q=g.create("span",{"class":"mceItemHidden"});if(tinymce.isIE){p=p.replace(f,"$1<mcespell>$2</mcespell>");while((s=p.indexOf("<mcespell>"))!=-1){o=p.substring(0,s);if(o.length){r=j.createTextNode(g.decode(o));q.appendChild(r)}p=p.substring(s+10);s=p.indexOf("</mcespell>");o=p.substring(0,s);p=p.substring(s+11);q.appendChild(g.create("span",{"class":"mceItemHiddenSpellWord"},o))}if(p.length){r=j.createTextNode(g.decode(p));q.appendChild(r)}}else{q.innerHTML=p.replace(f,'$1<span class="mceItemHiddenSpellWord">$2</span>')}g.replace(q,t)}});i.setRng(d)},_showMenu:function(h,j){var i=this,h=i.editor,d=i._menu,l,k=h.dom,g=k.getViewPort(h.getWin()),f=j.target;j=0;if(!d){d=h.controlManager.createDropMenu("spellcheckermenu",{"class":"mceNoIcons"});i._menu=d}if(k.hasClass(f,"mceItemHiddenSpellWord")){d.removeAll();d.add({title:"spellchecker.wait","class":"mceMenuItemTitle"}).setDisabled(1);i._sendRPC("getSuggestions",[i.selectedLang,k.decode(f.innerHTML)],function(m){var e;d.removeAll();if(m.length>0){d.add({title:"spellchecker.sug","class":"mceMenuItemTitle"}).setDisabled(1);c(m,function(n){d.add({title:n,onclick:function(){k.replace(h.getDoc().createTextNode(n),f);i._checkDone()}})});d.addSeparator()}else{d.add({title:"spellchecker.no_sug","class":"mceMenuItemTitle"}).setDisabled(1)}if(h.getParam("show_ignore_words",true)){e=i.editor.getParam("spellchecker_enable_ignore_rpc","");d.add({title:"spellchecker.ignore_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}}});d.add({title:"spellchecker.ignore_words",onclick:function(){var n=f.innerHTML;i._removeWords(k.decode(n));i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWords",[i.selectedLang,n],function(o){h.setProgressState(0)})}}})}if(i.editor.getParam("spellchecker_enable_learn_rpc")){d.add({title:"spellchecker.learn_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();h.setProgressState(1);i._sendRPC("learnWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}})}d.update()});l=b.getPos(h.getContentAreaContainer());d.settings.offset_x=l.x;d.settings.offset_y=l.y;h.selection.select(f);l=k.getPos(f);d.showMenu(l.x,l.y+f.offsetHeight-g.y);return tinymce.dom.Event.cancel(j)}else{d.hideMenu()}},_checkDone:function(){var e=this,d=e.editor,g=d.dom,f;c(g.select("span"),function(h){if(h&&g.hasClass(h,"mceItemHiddenSpellWord")){f=true;return false}});if(!f){e._done()}},_done:function(){var d=this,e=d.active;if(d.active){d.active=0;d._removeWords();if(d._menu){d._menu.hideMenu()}if(e){d.editor.nodeChanged()}}},_sendRPC:function(e,g,d){var f=this;a.sendRPC({url:f.rpcUrl,method:e,params:g,success:d,error:function(i,h){f.editor.setProgressState(0);f.editor.windowManager.alert(i.errstr||("Error response: "+h.responseText))}})}});tinymce.PluginManager.add("spellchecker",tinymce.plugins.SpellcheckerPlugin)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/style/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/style/editor_plugin.js
index dda9f928b..22b761f8f 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/style/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/style/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.StylePlugin",{init:function(a,b){a.addCommand("mceStyleProps",function(){var c=false;var f=a.selection.getSelectedBlocks();var d=[];if(f.length===1){d.push(a.selection.getNode().style.cssText)}else{tinymce.each(f,function(g){d.push(a.dom.getAttrib(g,"style"))});c=true}a.windowManager.open({file:b+"/props.htm",width:480+parseInt(a.getLang("style.delta_width",0)),height:340+parseInt(a.getLang("style.delta_height",0)),inline:1},{applyStyleToBlocks:c,plugin_url:b,styles:d})});a.addCommand("mceSetElementStyle",function(d,c){if(e=a.selection.getNode()){a.dom.setAttrib(e,"style",c);a.execCommand("mceRepaint")}});a.onNodeChange.add(function(d,c,f){c.setDisabled("styleprops",f.nodeName==="BODY")});a.addButton("styleprops",{title:"style.desc",cmd:"mceStyleProps"})},getInfo:function(){return{longname:"Style",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("style",tinymce.plugins.StylePlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.StylePlugin",{init:function(a,b){a.addCommand("mceStyleProps",function(){var c=false;var f=a.selection.getSelectedBlocks();var d=[];if(f.length===1){d.push(a.selection.getNode().style.cssText)}else{tinymce.each(f,function(g){d.push(a.dom.getAttrib(g,"style"))});c=true}a.windowManager.open({file:b+"/props.htm",width:480+parseInt(a.getLang("style.delta_width",0)),height:340+parseInt(a.getLang("style.delta_height",0)),inline:1},{applyStyleToBlocks:c,plugin_url:b,styles:d})});a.addCommand("mceSetElementStyle",function(d,c){if(e=a.selection.getNode()){a.dom.setAttrib(e,"style",c);a.execCommand("mceRepaint")}});a.onNodeChange.add(function(d,c,f){c.setDisabled("styleprops",f.nodeName==="BODY")});a.addButton("styleprops",{title:"style.desc",cmd:"mceStyleProps"})},getInfo:function(){return{longname:"Style",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("style",tinymce.plugins.StylePlugin)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/style/js/props.js b/webapp/src/main/webapp/js/tiny_mce/plugins/style/js/props.js
index 853222bee..79dd00efb 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/style/js/props.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/style/js/props.js
@@ -1,12 +1,12 @@
 tinyMCEPopup.requireLangPack();
 
-var defaultFonts = "" + 
-	"Arial, Helvetica, sans-serif=Arial, Helvetica, sans-serif;" + 
-	"Times New Roman, Times, serif=Times New Roman, Times, serif;" + 
-	"Courier New, Courier, mono=Courier New, Courier, mono;" + 
-	"Times New Roman, Times, serif=Times New Roman, Times, serif;" + 
-	"Georgia, Times New Roman, Times, serif=Georgia, Times New Roman, Times, serif;" + 
-	"Verdana, Arial, Helvetica, sans-serif=Verdana, Arial, Helvetica, sans-serif;" + 
+var defaultFonts = "" +
+	"Arial, Helvetica, sans-serif=Arial, Helvetica, sans-serif;" +
+	"Times New Roman, Times, serif=Times New Roman, Times, serif;" +
+	"Courier New, Courier, mono=Courier New, Courier, mono;" +
+	"Times New Roman, Times, serif=Times New Roman, Times, serif;" +
+	"Georgia, Times New Roman, Times, serif=Georgia, Times New Roman, Times, serif;" +
+	"Verdana, Arial, Helvetica, sans-serif=Verdana, Arial, Helvetica, sans-serif;" +
 	"Geneva, Arial, Helvetica, sans-serif=Geneva, Arial, Helvetica, sans-serif";
 
 var defaultSizes = "9;10;12;14;16;18;24;xx-small;x-small;small;medium;large;x-large;xx-large;smaller;larger";
@@ -507,7 +507,7 @@ function generateCSS() {
 		ce.style.paddingBottom = f.box_padding_bottom.value + (isNum(f.box_padding_bottom.value) ? f.box_padding_bottom_measurement.value : "");
 		ce.style.paddingLeft = f.box_padding_left.value + (isNum(f.box_padding_left.value) ? f.box_padding_left_measurement.value : "");
 	} else
-		ce.style.padding = f.box_padding_top.value + (isNum(f.box_padding_top.value) ? f.box_padding_top_measurement.value : "");		
+		ce.style.padding = f.box_padding_top.value + (isNum(f.box_padding_top.value) ? f.box_padding_top_measurement.value : "");
 
 	if (!f.box_margin_same.checked) {
 		ce.style.marginTop = f.box_margin_top.value + (isNum(f.box_margin_top.value) ? f.box_margin_top_measurement.value : "");
@@ -515,7 +515,7 @@ function generateCSS() {
 		ce.style.marginBottom = f.box_margin_bottom.value + (isNum(f.box_margin_bottom.value) ? f.box_margin_bottom_measurement.value : "");
 		ce.style.marginLeft = f.box_margin_left.value + (isNum(f.box_margin_left.value) ? f.box_margin_left_measurement.value : "");
 	} else
-		ce.style.margin = f.box_margin_top.value + (isNum(f.box_margin_top.value) ? f.box_margin_top_measurement.value : "");		
+		ce.style.margin = f.box_margin_top.value + (isNum(f.box_margin_top.value) ? f.box_margin_top_measurement.value : "");
 
 	// Build border styles
 
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/style/props.htm b/webapp/src/main/webapp/js/tiny_mce/plugins/style/props.htm
index 7dc087a30..4004c43be 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/style/props.htm
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/style/props.htm
@@ -147,8 +147,8 @@
 			<tr>
 				<td><label for="background_image">{#style_dlg.background_image}</label></td>
 				<td><table role="presentation" border="0" cellspacing="0" cellpadding="0">
-					<tr> 
-						<td><input id="background_image" name="background_image" type="text" /></td> 
+					<tr>
+						<td><input id="background_image" name="background_image" type="text" /></td>
 						<td id="background_image_browser">&nbsp;</td>
 					</tr>
 					</table>
@@ -468,7 +468,7 @@
 
 <div id="border_panel" class="panel">
 	<fieldset>
-		<legend>{#style_dlg.border}</legend>	
+		<legend>{#style_dlg.border}</legend>
 		<table role="presentation" border="0" cellspacing="0" cellpadding="0" width="100%">
 		<tr>
 			<td class="tdelim">&nbsp;</td>
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/tabfocus/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/tabfocus/editor_plugin.js
index 2c5129161..52bcb1c02 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/tabfocus/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/tabfocus/editor_plugin.js
@@ -1 +1 @@
-(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(t){n=c.select(":input:enabled,*[tabindex]:not(iframe)");function s(v){return v.nodeName==="BODY"||(v.type!="hidden"&&!(v.style.display=="none")&&!(v.style.visibility=="hidden")&&s(v.parentNode))}function i(v){return v.attributes.tabIndex.specified||v.nodeName=="INPUT"||v.nodeName=="TEXTAREA"}function u(){return tinymce.isIE6||tinymce.isIE7}function r(v){return((!u()||i(v)))&&v.getAttribute("tabindex")!="-1"&&s(v)}d(n,function(w,v){if(w.id==l.id){j=v;return false}});if(t>0){for(m=j+1;m<n.length;m++){if(r(n[m])){return n[m]}}}else{for(m=j-1;m>=0;m--){if(r(n[m])){return n[m]}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(n.id&&(l=tinymce.get(n.id||n.name))){l.focus()}else{window.setTimeout(function(){if(!tinymce.isWebKit){window.focus()}n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})();
\ No newline at end of file
+(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(t){n=c.select(":input:enabled,*[tabindex]:not(iframe)");function s(v){return v.nodeName==="BODY"||(v.type!="hidden"&&!(v.style.display=="none")&&!(v.style.visibility=="hidden")&&s(v.parentNode))}function i(v){return v.attributes.tabIndex.specified||v.nodeName=="INPUT"||v.nodeName=="TEXTAREA"}function u(){return tinymce.isIE6||tinymce.isIE7}function r(v){return((!u()||i(v)))&&v.getAttribute("tabindex")!="-1"&&s(v)}d(n,function(w,v){if(w.id==l.id){j=v;return false}});if(t>0){for(m=j+1;m<n.length;m++){if(r(n[m])){return n[m]}}}else{for(m=j-1;m>=0;m--){if(r(n[m])){return n[m]}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(n.id&&(l=tinymce.get(n.id||n.name))){l.focus()}else{window.setTimeout(function(){if(!tinymce.isWebKit){window.focus()}n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/table/cell.htm b/webapp/src/main/webapp/js/tiny_mce/plugins/table/cell.htm
index 2922f7a2d..428b1d665 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/table/cell.htm
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/table/cell.htm
@@ -35,7 +35,7 @@
 									<option value="right">{#table_dlg.align_right}</option>
 								</select>
 							</td>
-		
+
 							<td><label for="celltype">{#table_dlg.cell_type}</label></td>
 							<td>
 								<select id="celltype" name="celltype">
@@ -95,8 +95,8 @@
 
 					<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 						<tr>
-							<td class="column1"><label for="id">{#table_dlg.id}</label></td> 
-							<td><input id="id" name="id" type="text" value="" style="width: 200px" /></td> 
+							<td class="column1"><label for="id">{#table_dlg.id}</label></td>
+							<td><input id="id" name="id" type="text" value="" style="width: 200px" /></td>
 						</tr>
 
 						<tr>
@@ -105,25 +105,25 @@
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="dir">{#table_dlg.langdir}</label></td> 
+							<td class="column1"><label for="dir">{#table_dlg.langdir}</label></td>
 							<td>
-								<select id="dir" name="dir" style="width: 200px"> 
-										<option value="">{#not_set}</option> 
-										<option value="ltr">{#table_dlg.ltr}</option> 
-										<option value="rtl">{#table_dlg.rtl}</option> 
+								<select id="dir" name="dir" style="width: 200px">
+										<option value="">{#not_set}</option>
+										<option value="ltr">{#table_dlg.ltr}</option>
+										<option value="rtl">{#table_dlg.rtl}</option>
 								</select>
-							</td> 
+							</td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="lang">{#table_dlg.langcode}</label></td> 
+							<td class="column1"><label for="lang">{#table_dlg.langcode}</label></td>
 							<td>
 								<input id="lang" name="lang" type="text" value="" style="width: 200px" />
-							</td> 
+							</td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 
+							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td>
 							<td>
 								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
@@ -131,11 +131,11 @@
 										<td id="backgroundimagebrowsercontainer">&nbsp;</td>
 									</tr>
 								</table>
-							</td> 
+							</td>
 						</tr>
 
 						<tr role="group" aria-labelledby="bordercolor_label">
-							<td class="column1"><label id="bordercolor_label" for="bordercolor">{#table_dlg.bordercolor}</label></td> 
+							<td class="column1"><label id="bordercolor_label" for="bordercolor">{#table_dlg.bordercolor}</label></td>
 							<td>
 								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
@@ -143,11 +143,11 @@
 										<td id="bordercolor_pickcontainer">&nbsp;</td>
 									</tr>
 								</table>
-							</td> 
+							</td>
 						</tr>
 
 						<tr role="group" aria-labelledby="bgcolor_label">
-							<td class="column1"><label id="bgcolor_label" for="bgcolor">{#table_dlg.bgcolor}</label></td> 
+							<td class="column1"><label id="bgcolor_label" for="bgcolor">{#table_dlg.bgcolor}</label></td>
 							<td>
 								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
@@ -155,7 +155,7 @@
 										<td id="bgcolor_pickcontainer">&nbsp;</td>
 									</tr>
 								</table>
-							</td> 
+							</td>
 						</tr>
 					</table>
 				</fieldset>
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/table/css/cell.css b/webapp/src/main/webapp/js/tiny_mce/plugins/table/css/cell.css
index a47cc1a1e..4e321066e 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/table/css/cell.css
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/table/css/cell.css
@@ -14,4 +14,4 @@
 
 #class {
 	width: 150px;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/table/css/row.css b/webapp/src/main/webapp/js/tiny_mce/plugins/table/css/row.css
index 0e397db3e..986105e14 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/table/css/row.css
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/table/css/row.css
@@ -17,7 +17,7 @@
 }
 
 #height {
-	width: 50px;	
+	width: 50px;
 }
 
 .col2 {
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/table/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/table/editor_plugin.js
index 4a92e1b36..99d2886de 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/table/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/table/editor_plugin.js
@@ -1 +1 @@
-(function(d){var e=d.each;function c(g,h){var j=h.ownerDocument,f=j.createRange(),k;f.setStartBefore(h);f.setEnd(g.endContainer,g.endOffset);k=j.createElement("body");k.appendChild(f.cloneContents());return k.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi,"-").replace(/<[^>]+>/g,"").length==0}function a(g,f){return parseInt(g.getAttribute(f)||1)}function b(H,G,K){var g,L,D,o;t();o=G.getParent(K.getStart(),"th,td");if(o){L=F(o);D=I();o=z(L.x,L.y)}function A(N,M){N=N.cloneNode(M);N.removeAttribute("id");return N}function t(){var M=0;g=[];e(["thead","tbody","tfoot"],function(N){var O=G.select("> "+N+" tr",H);e(O,function(P,Q){Q+=M;e(G.select("> td, > th",P),function(W,R){var S,T,U,V;if(g[Q]){while(g[Q][R]){R++}}U=a(W,"rowspan");V=a(W,"colspan");for(T=Q;T<Q+U;T++){if(!g[T]){g[T]=[]}for(S=R;S<R+V;S++){g[T][S]={part:N,real:T==Q&&S==R,elm:W,rowspan:U,colspan:V}}}})});M+=O.length})}function z(M,O){var N;N=g[O];if(N){return N[M]}}function s(O,M,N){if(O){N=parseInt(N);if(N===1){O.removeAttribute(M,1)}else{O.setAttribute(M,N,1)}}}function j(M){return M&&(G.hasClass(M.elm,"mceSelected")||M==o)}function k(){var M=[];e(H.rows,function(N){e(N.cells,function(O){if(G.hasClass(O,"mceSelected")||O==o.elm){M.push(N);return false}})});return M}function r(){var M=G.createRng();M.setStartAfter(H);M.setEndAfter(H);K.setRng(M);G.remove(H)}function f(M){var N;d.walk(M,function(P){var O;if(P.nodeType==3){e(G.getParents(P.parentNode,null,M).reverse(),function(Q){Q=A(Q,false);if(!N){N=O=Q}else{if(O){O.appendChild(Q)}}O=Q});if(O){O.innerHTML=d.isIE&&!d.isIE11?"&nbsp;":'<br data-mce-bogus="1" />'}return false}},"childNodes");M=A(M,false);s(M,"rowSpan",1);s(M,"colSpan",1);if(N){M.appendChild(N)}else{if(!d.isIE||d.isIE11){M.innerHTML='<br data-mce-bogus="1" />'}}return M}function q(){var M=G.createRng();e(G.select("tr",H),function(N){if(N.cells.length==0){G.remove(N)}});if(G.select("tr",H).length==0){M.setStartAfter(H);M.setEndAfter(H);K.setRng(M);G.remove(H);return}e(G.select("thead,tbody,tfoot",H),function(N){if(N.rows.length==0){G.remove(N)}});t();row=g[Math.min(g.length-1,L.y)];if(row){K.select(row[Math.min(row.length-1,L.x)].elm,true);K.collapse(true)}}function u(S,Q,U,R){var P,N,M,O,T;P=g[Q][S].elm.parentNode;for(M=1;M<=U;M++){P=G.getNext(P,"tr");if(P){for(N=S;N>=0;N--){T=g[Q+M][N].elm;if(T.parentNode==P){for(O=1;O<=R;O++){G.insertAfter(f(T),T)}break}}if(N==-1){for(O=1;O<=R;O++){P.insertBefore(f(P.cells[0]),P.cells[0])}}}}}function C(){e(g,function(M,N){e(M,function(P,O){var S,R,T,Q;if(j(P)){P=P.elm;S=a(P,"colspan");R=a(P,"rowspan");if(S>1||R>1){s(P,"rowSpan",1);s(P,"colSpan",1);for(Q=0;Q<S-1;Q++){G.insertAfter(f(P),P)}u(O,N,R-1,S)}}})})}function p(V,S,Y){var P,O,X,W,U,R,T,M,V,N,Q;if(V){pos=F(V);P=pos.x;O=pos.y;X=P+(S-1);W=O+(Y-1)}else{L=D=null;e(g,function(Z,aa){e(Z,function(ac,ab){if(j(ac)){if(!L){L={x:ab,y:aa}}D={x:ab,y:aa}}})});P=L.x;O=L.y;X=D.x;W=D.y}T=z(P,O);M=z(X,W);if(T&&M&&T.part==M.part){C();t();T=z(P,O).elm;s(T,"colSpan",(X-P)+1);s(T,"rowSpan",(W-O)+1);for(R=O;R<=W;R++){for(U=P;U<=X;U++){if(!g[R]||!g[R][U]){continue}V=g[R][U].elm;if(V!=T){N=d.grep(V.childNodes);e(N,function(Z){T.appendChild(Z)});if(N.length){N=d.grep(T.childNodes);Q=0;e(N,function(Z){if(Z.nodeName=="BR"&&G.getAttrib(Z,"data-mce-bogus")&&Q++<N.length-1){T.removeChild(Z)}})}G.remove(V)}}}q()}}function l(Q){var M,S,P,R,T,U,N,V,O;e(g,function(W,X){e(W,function(Z,Y){if(j(Z)){Z=Z.elm;T=Z.parentNode;U=A(T,false);M=X;if(Q){return false}}});if(Q){return !M}});for(R=0;R<g[0].length;R++){if(!g[M][R]){continue}S=g[M][R].elm;if(S!=P){if(!Q){O=a(S,"rowspan");if(O>1){s(S,"rowSpan",O+1);continue}}else{if(M>0&&g[M-1][R]){V=g[M-1][R].elm;O=a(V,"rowSpan");if(O>1){s(V,"rowSpan",O+1);continue}}}N=f(S);s(N,"colSpan",S.colSpan);U.appendChild(N);P=S}}if(U.hasChildNodes()){if(!Q){G.insertAfter(U,T)}else{T.parentNode.insertBefore(U,T)}}}function h(N){var O,M;e(g,function(P,Q){e(P,function(S,R){if(j(S)){O=R;if(N){return false}}});if(N){return !O}});e(g,function(S,T){var P,Q,R;if(!S[O]){return}P=S[O].elm;if(P!=M){R=a(P,"colspan");Q=a(P,"rowspan");if(R==1){if(!N){G.insertAfter(f(P),P);u(O,T,Q-1,R)}else{P.parentNode.insertBefore(f(P),P);u(O,T,Q-1,R)}}else{s(P,"colSpan",P.colSpan+1)}M=P}})}function n(){var M=[];e(g,function(N,O){e(N,function(Q,P){if(j(Q)&&d.inArray(M,P)===-1){e(g,function(T){var R=T[P].elm,S;S=a(R,"colSpan");if(S>1){s(R,"colSpan",S-1)}else{G.remove(R)}});M.push(P)}})});q()}function m(){var N;function M(Q){var P,R,O;P=G.getNext(Q,"tr");e(Q.cells,function(S){var T=a(S,"rowSpan");if(T>1){s(S,"rowSpan",T-1);R=F(S);u(R.x,R.y,1,1)}});R=F(Q.cells[0]);e(g[R.y],function(S){var T;S=S.elm;if(S!=O){T=a(S,"rowSpan");if(T<=1){G.remove(S)}else{s(S,"rowSpan",T-1)}O=S}})}N=k();e(N.reverse(),function(O){M(O)});q()}function E(){var M=k();G.remove(M);q();return M}function J(){var M=k();e(M,function(O,N){M[N]=A(O,true)});return M}function B(O,N){if(!O){return}var P=k(),M=P[N?0:P.length-1],Q=M.cells.length;e(g,function(S){var R;Q=0;e(S,function(U,T){if(U.real){Q+=U.colspan}if(U.elm.parentNode==M){R=1}});if(R){return false}});if(!N){O.reverse()}e(O,function(T){var S=T.cells.length,R;for(i=0;i<S;i++){R=T.cells[i];s(R,"colSpan",1);s(R,"rowSpan",1)}for(i=S;i<Q;i++){T.appendChild(f(T.cells[S-1]))}for(i=Q;i<S;i++){G.remove(T.cells[i])}if(N){M.parentNode.insertBefore(T,M)}else{G.insertAfter(T,M)}});G.removeClass(G.select("td.mceSelected,th.mceSelected"),"mceSelected")}function F(M){var N;e(g,function(O,P){e(O,function(R,Q){if(R.elm==M){N={x:Q,y:P};return false}});return !N});return N}function w(M){L=F(M)}function I(){var O,N,M;N=M=0;e(g,function(P,Q){e(P,function(S,R){var U,T;if(j(S)){S=g[Q][R];if(R>N){N=R}if(Q>M){M=Q}if(S.real){U=S.colspan-1;T=S.rowspan-1;if(U){if(R+U>N){N=R+U}}if(T){if(Q+T>M){M=Q+T}}}}})});return{x:N,y:M}}function v(S){var P,O,U,T,N,M,Q,R;D=F(S);if(L&&D){P=Math.min(L.x,D.x);O=Math.min(L.y,D.y);U=Math.max(L.x,D.x);T=Math.max(L.y,D.y);N=U;M=T;for(y=O;y<=M;y++){S=g[y][P];if(!S.real){if(P-(S.colspan-1)<P){P-=S.colspan-1}}}for(x=P;x<=N;x++){S=g[O][x];if(!S.real){if(O-(S.rowspan-1)<O){O-=S.rowspan-1}}}for(y=O;y<=T;y++){for(x=P;x<=U;x++){S=g[y][x];if(S.real){Q=S.colspan-1;R=S.rowspan-1;if(Q){if(x+Q>N){N=x+Q}}if(R){if(y+R>M){M=y+R}}}}}G.removeClass(G.select("td.mceSelected,th.mceSelected"),"mceSelected");for(y=O;y<=M;y++){for(x=P;x<=N;x++){if(g[y][x]){G.addClass(g[y][x].elm,"mceSelected")}}}}}d.extend(this,{deleteTable:r,split:C,merge:p,insertRow:l,insertCol:h,deleteCols:n,deleteRows:m,cutRows:E,copyRows:J,pasteRows:B,getPos:F,setStartCell:w,setEndCell:v})}d.create("tinymce.plugins.TablePlugin",{init:function(g,h){var f,m,j=true;function l(p){var o=g.selection,n=g.dom.getParent(p||o.getNode(),"table");if(n){return new b(n,g.dom,o)}}function k(){g.getBody().style.webkitUserSelect="";if(j){g.dom.removeClass(g.dom.select("td.mceSelected,th.mceSelected"),"mceSelected");j=false}}e([["table","table.desc","mceInsertTable",true],["delete_table","table.del","mceTableDelete"],["delete_col","table.delete_col_desc","mceTableDeleteCol"],["delete_row","table.delete_row_desc","mceTableDeleteRow"],["col_after","table.col_after_desc","mceTableInsertColAfter"],["col_before","table.col_before_desc","mceTableInsertColBefore"],["row_after","table.row_after_desc","mceTableInsertRowAfter"],["row_before","table.row_before_desc","mceTableInsertRowBefore"],["row_props","table.row_desc","mceTableRowProps",true],["cell_props","table.cell_desc","mceTableCellProps",true],["split_cells","table.split_cells_desc","mceTableSplitCells",true],["merge_cells","table.merge_cells_desc","mceTableMergeCells",true]],function(n){g.addButton(n[0],{title:n[1],cmd:n[2],ui:n[3]})});if(!d.isIE){g.onClick.add(function(n,o){o=o.target;if(o.nodeName==="TABLE"){n.selection.select(o);n.nodeChanged()}})}g.onPreProcess.add(function(o,p){var n,q,r,t=o.dom,s;n=t.select("table",p.node);q=n.length;while(q--){r=n[q];t.setAttrib(r,"data-mce-style","");if((s=t.getAttrib(r,"width"))){t.setStyle(r,"width",s);t.setAttrib(r,"width","")}if((s=t.getAttrib(r,"height"))){t.setStyle(r,"height",s);t.setAttrib(r,"height","")}}});g.onNodeChange.add(function(q,o,s){var r;s=q.selection.getStart();r=q.dom.getParent(s,"td,th,caption");o.setActive("table",s.nodeName==="TABLE"||!!r);if(r&&r.nodeName==="CAPTION"){r=0}o.setDisabled("delete_table",!r);o.setDisabled("delete_col",!r);o.setDisabled("delete_table",!r);o.setDisabled("delete_row",!r);o.setDisabled("col_after",!r);o.setDisabled("col_before",!r);o.setDisabled("row_after",!r);o.setDisabled("row_before",!r);o.setDisabled("row_props",!r);o.setDisabled("cell_props",!r);o.setDisabled("split_cells",!r);o.setDisabled("merge_cells",!r)});g.onInit.add(function(r){var p,t,q=r.dom,u;f=r.windowManager;r.onMouseDown.add(function(w,z){if(z.button!=2){k();t=q.getParent(z.target,"td,th");p=q.getParent(t,"table")}});q.bind(r.getDoc(),"mouseover",function(C){var A,z,B=C.target;if(t&&(u||B!=t)&&(B.nodeName=="TD"||B.nodeName=="TH")){z=q.getParent(B,"table");if(z==p){if(!u){u=l(z);u.setStartCell(t);r.getBody().style.webkitUserSelect="none"}u.setEndCell(B);j=true}A=r.selection.getSel();try{if(A.removeAllRanges){A.removeAllRanges()}else{A.empty()}}catch(w){}C.preventDefault()}});r.onMouseUp.add(function(F,G){var z,B=F.selection,H,I=B.getSel(),w,C,A,E;if(t){if(u){F.getBody().style.webkitUserSelect=""}function D(J,L){var K=new d.dom.TreeWalker(J,J);do{if(J.nodeType==3&&d.trim(J.nodeValue).length!=0){if(L){z.setStart(J,0)}else{z.setEnd(J,J.nodeValue.length)}return}if(J.nodeName=="BR"){if(L){z.setStartBefore(J)}else{z.setEndBefore(J)}return}}while(J=(L?K.next():K.prev()))}H=q.select("td.mceSelected,th.mceSelected");if(H.length>0){z=q.createRng();C=H[0];E=H[H.length-1];z.setStartBefore(C);z.setEndAfter(C);D(C,1);w=new d.dom.TreeWalker(C,q.getParent(H[0],"table"));do{if(C.nodeName=="TD"||C.nodeName=="TH"){if(!q.hasClass(C,"mceSelected")){break}A=C}}while(C=w.next());D(A);B.setRng(z)}F.nodeChanged();t=u=p=null}});r.onKeyUp.add(function(w,z){k()});r.onKeyDown.add(function(w,z){n(w)});r.onMouseDown.add(function(w,z){if(z.button!=2){n(w)}});function o(D,z,A,F){var B=3,G=D.dom.getParent(z.startContainer,"TABLE"),C,w,E;if(G){C=G.parentNode}w=z.startContainer.nodeType==B&&z.startOffset==0&&z.endOffset==0&&F&&(A.nodeName=="TR"||A==C);E=(A.nodeName=="TD"||A.nodeName=="TH")&&!F;return w||E}function n(A){if(!d.isWebKit){return}var z=A.selection.getRng();var C=A.selection.getNode();var B=A.dom.getParent(z.startContainer,"TD,TH");if(!o(A,z,C,B)){return}if(!B){B=C}var w=B.lastChild;while(w.lastChild){w=w.lastChild}z.setEnd(w,w.nodeValue.length);A.selection.setRng(z)}r.plugins.table.fixTableCellSelection=n;if(r&&r.plugins.contextmenu){r.plugins.contextmenu.onContextMenu.add(function(A,w,C){var D,B=r.selection,z=B.getNode()||r.getBody();if(r.dom.getParent(C,"td")||r.dom.getParent(C,"th")||r.dom.select("td.mceSelected,th.mceSelected").length){w.removeAll();if(z.nodeName=="A"&&!r.dom.getAttrib(z,"name")){w.add({title:"advanced.link_desc",icon:"link",cmd:r.plugins.advlink?"mceAdvLink":"mceLink",ui:true});w.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"});w.addSeparator()}if(z.nodeName=="IMG"&&z.className.indexOf("mceItem")==-1){w.add({title:"advanced.image_desc",icon:"image",cmd:r.plugins.advimage?"mceAdvImage":"mceImage",ui:true});w.addSeparator()}w.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",value:{action:"insert"}});w.add({title:"table.props_desc",icon:"table_props",cmd:"mceInsertTable"});w.add({title:"table.del",icon:"delete_table",cmd:"mceTableDelete"});w.addSeparator();D=w.addMenu({title:"table.cell"});D.add({title:"table.cell_desc",icon:"cell_props",cmd:"mceTableCellProps"});D.add({title:"table.split_cells_desc",icon:"split_cells",cmd:"mceTableSplitCells"});D.add({title:"table.merge_cells_desc",icon:"merge_cells",cmd:"mceTableMergeCells"});D=w.addMenu({title:"table.row"});D.add({title:"table.row_desc",icon:"row_props",cmd:"mceTableRowProps"});D.add({title:"table.row_before_desc",icon:"row_before",cmd:"mceTableInsertRowBefore"});D.add({title:"table.row_after_desc",icon:"row_after",cmd:"mceTableInsertRowAfter"});D.add({title:"table.delete_row_desc",icon:"delete_row",cmd:"mceTableDeleteRow"});D.addSeparator();D.add({title:"table.cut_row_desc",icon:"cut",cmd:"mceTableCutRow"});D.add({title:"table.copy_row_desc",icon:"copy",cmd:"mceTableCopyRow"});D.add({title:"table.paste_row_before_desc",icon:"paste",cmd:"mceTablePasteRowBefore"}).setDisabled(!m);D.add({title:"table.paste_row_after_desc",icon:"paste",cmd:"mceTablePasteRowAfter"}).setDisabled(!m);D=w.addMenu({title:"table.col"});D.add({title:"table.col_before_desc",icon:"col_before",cmd:"mceTableInsertColBefore"});D.add({title:"table.col_after_desc",icon:"col_after",cmd:"mceTableInsertColAfter"});D.add({title:"table.delete_col_desc",icon:"delete_col",cmd:"mceTableDeleteCol"})}else{w.add({title:"table.desc",icon:"table",cmd:"mceInsertTable"})}})}if(d.isWebKit){function v(C,N){var L=d.VK;var Q=N.keyCode;function O(Y,U,S){var T=Y?"previousSibling":"nextSibling";var Z=C.dom.getParent(U,"tr");var X=Z[T];if(X){z(C,U,X,Y);d.dom.Event.cancel(S);return true}else{var aa=C.dom.getParent(Z,"table");var W=Z.parentNode;var R=W.nodeName.toLowerCase();if(R==="tbody"||R===(Y?"tfoot":"thead")){var V=w(Y,aa,W,"tbody");if(V!==null){return K(Y,V,U,S)}}return M(Y,Z,T,aa,S)}}function w(V,T,U,X){var S=C.dom.select(">"+X,T);var R=S.indexOf(U);if(V&&R===0||!V&&R===S.length-1){return B(V,T)}else{if(R===-1){var W=U.tagName.toLowerCase()==="thead"?0:S.length-1;return S[W]}else{return S[R+(V?-1:1)]}}}function B(U,T){var S=U?"thead":"tfoot";var R=C.dom.select(">"+S,T);return R.length!==0?R[0]:null}function K(V,T,S,U){var R=J(T,V);R&&z(C,S,R,V);d.dom.Event.cancel(U);return true}function M(Y,U,R,X,W){var S=X[R];if(S){F(S);return true}else{var V=C.dom.getParent(X,"td,th");if(V){return O(Y,V,W)}else{var T=J(U,!Y);F(T);return d.dom.Event.cancel(W)}}}function J(S,R){var T=S&&S[R?"lastChild":"firstChild"];return T&&T.nodeName==="BR"?C.dom.getParent(T,"td,th"):T}function F(R){C.selection.setCursorLocation(R,0)}function A(){return Q==L.UP||Q==L.DOWN}function D(R){var T=R.selection.getNode();var S=R.dom.getParent(T,"tr");return S!==null}function P(S){var R=0;var T=S;while(T.previousSibling){T=T.previousSibling;R=R+a(T,"colspan")}return R}function E(T,R){var U=0;var S=0;e(T.children,function(V,W){U=U+a(V,"colspan");S=W;if(U>R){return false}});return S}function z(T,W,Y,V){var X=P(T.dom.getParent(W,"td,th"));var S=E(Y,X);var R=Y.childNodes[S];var U=J(R,V);F(U||R)}function H(R){var T=C.selection.getNode();var U=C.dom.getParent(T,"td,th");var S=C.dom.getParent(R,"td,th");return U&&U!==S&&I(U,S)}function I(S,R){return C.dom.getParent(S,"TABLE")===C.dom.getParent(R,"TABLE")}if(A()&&D(C)){var G=C.selection.getNode();setTimeout(function(){if(H(G)){O(!N.shiftKey&&Q===L.UP,G,N)}},0)}}r.onKeyDown.add(v)}function s(){var w;for(w=r.getBody().lastChild;w&&w.nodeType==3&&!w.nodeValue.length;w=w.previousSibling){}if(w&&w.nodeName=="TABLE"){if(r.settings.forced_root_block){r.dom.add(r.getBody(),r.settings.forced_root_block,null,d.isIE&&!d.isIE11?"&nbsp;":'<br data-mce-bogus="1" />')}else{r.dom.add(r.getBody(),"br",{"data-mce-bogus":"1"})}}}if(d.isGecko){r.onKeyDown.add(function(z,B){var w,A,C=z.dom;if(B.keyCode==37||B.keyCode==38){w=z.selection.getRng();A=C.getParent(w.startContainer,"table");if(A&&z.getBody().firstChild==A){if(c(w,A)){w=C.createRng();w.setStartBefore(A);w.setEndBefore(A);z.selection.setRng(w);B.preventDefault()}}}})}r.onKeyUp.add(s);r.onSetContent.add(s);r.onVisualAid.add(s);r.onPreProcess.add(function(w,A){var z=A.node.lastChild;if(z&&(z.nodeName=="BR"||(z.childNodes.length==1&&(z.firstChild.nodeName=="BR"||z.firstChild.nodeValue=="\u00a0")))&&z.previousSibling&&z.previousSibling.nodeName=="TABLE"){w.dom.remove(z)}});s();r.startContent=r.getContent({format:"raw"})});e({mceTableSplitCells:function(n){n.split()},mceTableMergeCells:function(o){var p,q,n;n=g.dom.getParent(g.selection.getNode(),"th,td");if(n){p=n.rowSpan;q=n.colSpan}if(!g.dom.select("td.mceSelected,th.mceSelected").length){f.open({url:h+"/merge_cells.htm",width:240+parseInt(g.getLang("table.merge_cells_delta_width",0)),height:110+parseInt(g.getLang("table.merge_cells_delta_height",0)),inline:1},{rows:p,cols:q,onaction:function(r){o.merge(n,r.cols,r.rows)},plugin_url:h})}else{o.merge()}},mceTableInsertRowBefore:function(n){n.insertRow(true)},mceTableInsertRowAfter:function(n){n.insertRow()},mceTableInsertColBefore:function(n){n.insertCol(true)},mceTableInsertColAfter:function(n){n.insertCol()},mceTableDeleteCol:function(n){n.deleteCols()},mceTableDeleteRow:function(n){n.deleteRows()},mceTableCutRow:function(n){m=n.cutRows()},mceTableCopyRow:function(n){m=n.copyRows()},mceTablePasteRowBefore:function(n){n.pasteRows(m,true)},mceTablePasteRowAfter:function(n){n.pasteRows(m)},mceTableDelete:function(n){n.deleteTable()}},function(o,n){g.addCommand(n,function(){var p=l();if(p){o(p);g.execCommand("mceRepaint");k()}})});e({mceInsertTable:function(n){f.open({url:h+"/table.htm",width:400+parseInt(g.getLang("table.table_delta_width",0)),height:320+parseInt(g.getLang("table.table_delta_height",0)),inline:1},{plugin_url:h,action:n?n.action:0})},mceTableRowProps:function(){f.open({url:h+"/row.htm",width:400+parseInt(g.getLang("table.rowprops_delta_width",0)),height:295+parseInt(g.getLang("table.rowprops_delta_height",0)),inline:1},{plugin_url:h})},mceTableCellProps:function(){f.open({url:h+"/cell.htm",width:400+parseInt(g.getLang("table.cellprops_delta_width",0)),height:295+parseInt(g.getLang("table.cellprops_delta_height",0)),inline:1},{plugin_url:h})}},function(o,n){g.addCommand(n,function(p,q){o(q)})})}});d.PluginManager.add("table",d.plugins.TablePlugin)})(tinymce);
\ No newline at end of file
+(function(d){var e=d.each;function c(g,h){var j=h.ownerDocument,f=j.createRange(),k;f.setStartBefore(h);f.setEnd(g.endContainer,g.endOffset);k=j.createElement("body");k.appendChild(f.cloneContents());return k.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi,"-").replace(/<[^>]+>/g,"").length==0}function a(g,f){return parseInt(g.getAttribute(f)||1)}function b(H,G,K){var g,L,D,o;t();o=G.getParent(K.getStart(),"th,td");if(o){L=F(o);D=I();o=z(L.x,L.y)}function A(N,M){N=N.cloneNode(M);N.removeAttribute("id");return N}function t(){var M=0;g=[];e(["thead","tbody","tfoot"],function(N){var O=G.select("> "+N+" tr",H);e(O,function(P,Q){Q+=M;e(G.select("> td, > th",P),function(W,R){var S,T,U,V;if(g[Q]){while(g[Q][R]){R++}}U=a(W,"rowspan");V=a(W,"colspan");for(T=Q;T<Q+U;T++){if(!g[T]){g[T]=[]}for(S=R;S<R+V;S++){g[T][S]={part:N,real:T==Q&&S==R,elm:W,rowspan:U,colspan:V}}}})});M+=O.length})}function z(M,O){var N;N=g[O];if(N){return N[M]}}function s(O,M,N){if(O){N=parseInt(N);if(N===1){O.removeAttribute(M,1)}else{O.setAttribute(M,N,1)}}}function j(M){return M&&(G.hasClass(M.elm,"mceSelected")||M==o)}function k(){var M=[];e(H.rows,function(N){e(N.cells,function(O){if(G.hasClass(O,"mceSelected")||O==o.elm){M.push(N);return false}})});return M}function r(){var M=G.createRng();M.setStartAfter(H);M.setEndAfter(H);K.setRng(M);G.remove(H)}function f(M){var N;d.walk(M,function(P){var O;if(P.nodeType==3){e(G.getParents(P.parentNode,null,M).reverse(),function(Q){Q=A(Q,false);if(!N){N=O=Q}else{if(O){O.appendChild(Q)}}O=Q});if(O){O.innerHTML=d.isIE&&!d.isIE11?"&nbsp;":'<br data-mce-bogus="1" />'}return false}},"childNodes");M=A(M,false);s(M,"rowSpan",1);s(M,"colSpan",1);if(N){M.appendChild(N)}else{if(!d.isIE||d.isIE11){M.innerHTML='<br data-mce-bogus="1" />'}}return M}function q(){var M=G.createRng();e(G.select("tr",H),function(N){if(N.cells.length==0){G.remove(N)}});if(G.select("tr",H).length==0){M.setStartAfter(H);M.setEndAfter(H);K.setRng(M);G.remove(H);return}e(G.select("thead,tbody,tfoot",H),function(N){if(N.rows.length==0){G.remove(N)}});t();row=g[Math.min(g.length-1,L.y)];if(row){K.select(row[Math.min(row.length-1,L.x)].elm,true);K.collapse(true)}}function u(S,Q,U,R){var P,N,M,O,T;P=g[Q][S].elm.parentNode;for(M=1;M<=U;M++){P=G.getNext(P,"tr");if(P){for(N=S;N>=0;N--){T=g[Q+M][N].elm;if(T.parentNode==P){for(O=1;O<=R;O++){G.insertAfter(f(T),T)}break}}if(N==-1){for(O=1;O<=R;O++){P.insertBefore(f(P.cells[0]),P.cells[0])}}}}}function C(){e(g,function(M,N){e(M,function(P,O){var S,R,T,Q;if(j(P)){P=P.elm;S=a(P,"colspan");R=a(P,"rowspan");if(S>1||R>1){s(P,"rowSpan",1);s(P,"colSpan",1);for(Q=0;Q<S-1;Q++){G.insertAfter(f(P),P)}u(O,N,R-1,S)}}})})}function p(V,S,Y){var P,O,X,W,U,R,T,M,V,N,Q;if(V){pos=F(V);P=pos.x;O=pos.y;X=P+(S-1);W=O+(Y-1)}else{L=D=null;e(g,function(Z,aa){e(Z,function(ac,ab){if(j(ac)){if(!L){L={x:ab,y:aa}}D={x:ab,y:aa}}})});P=L.x;O=L.y;X=D.x;W=D.y}T=z(P,O);M=z(X,W);if(T&&M&&T.part==M.part){C();t();T=z(P,O).elm;s(T,"colSpan",(X-P)+1);s(T,"rowSpan",(W-O)+1);for(R=O;R<=W;R++){for(U=P;U<=X;U++){if(!g[R]||!g[R][U]){continue}V=g[R][U].elm;if(V!=T){N=d.grep(V.childNodes);e(N,function(Z){T.appendChild(Z)});if(N.length){N=d.grep(T.childNodes);Q=0;e(N,function(Z){if(Z.nodeName=="BR"&&G.getAttrib(Z,"data-mce-bogus")&&Q++<N.length-1){T.removeChild(Z)}})}G.remove(V)}}}q()}}function l(Q){var M,S,P,R,T,U,N,V,O;e(g,function(W,X){e(W,function(Z,Y){if(j(Z)){Z=Z.elm;T=Z.parentNode;U=A(T,false);M=X;if(Q){return false}}});if(Q){return !M}});for(R=0;R<g[0].length;R++){if(!g[M][R]){continue}S=g[M][R].elm;if(S!=P){if(!Q){O=a(S,"rowspan");if(O>1){s(S,"rowSpan",O+1);continue}}else{if(M>0&&g[M-1][R]){V=g[M-1][R].elm;O=a(V,"rowSpan");if(O>1){s(V,"rowSpan",O+1);continue}}}N=f(S);s(N,"colSpan",S.colSpan);U.appendChild(N);P=S}}if(U.hasChildNodes()){if(!Q){G.insertAfter(U,T)}else{T.parentNode.insertBefore(U,T)}}}function h(N){var O,M;e(g,function(P,Q){e(P,function(S,R){if(j(S)){O=R;if(N){return false}}});if(N){return !O}});e(g,function(S,T){var P,Q,R;if(!S[O]){return}P=S[O].elm;if(P!=M){R=a(P,"colspan");Q=a(P,"rowspan");if(R==1){if(!N){G.insertAfter(f(P),P);u(O,T,Q-1,R)}else{P.parentNode.insertBefore(f(P),P);u(O,T,Q-1,R)}}else{s(P,"colSpan",P.colSpan+1)}M=P}})}function n(){var M=[];e(g,function(N,O){e(N,function(Q,P){if(j(Q)&&d.inArray(M,P)===-1){e(g,function(T){var R=T[P].elm,S;S=a(R,"colSpan");if(S>1){s(R,"colSpan",S-1)}else{G.remove(R)}});M.push(P)}})});q()}function m(){var N;function M(Q){var P,R,O;P=G.getNext(Q,"tr");e(Q.cells,function(S){var T=a(S,"rowSpan");if(T>1){s(S,"rowSpan",T-1);R=F(S);u(R.x,R.y,1,1)}});R=F(Q.cells[0]);e(g[R.y],function(S){var T;S=S.elm;if(S!=O){T=a(S,"rowSpan");if(T<=1){G.remove(S)}else{s(S,"rowSpan",T-1)}O=S}})}N=k();e(N.reverse(),function(O){M(O)});q()}function E(){var M=k();G.remove(M);q();return M}function J(){var M=k();e(M,function(O,N){M[N]=A(O,true)});return M}function B(O,N){if(!O){return}var P=k(),M=P[N?0:P.length-1],Q=M.cells.length;e(g,function(S){var R;Q=0;e(S,function(U,T){if(U.real){Q+=U.colspan}if(U.elm.parentNode==M){R=1}});if(R){return false}});if(!N){O.reverse()}e(O,function(T){var S=T.cells.length,R;for(i=0;i<S;i++){R=T.cells[i];s(R,"colSpan",1);s(R,"rowSpan",1)}for(i=S;i<Q;i++){T.appendChild(f(T.cells[S-1]))}for(i=Q;i<S;i++){G.remove(T.cells[i])}if(N){M.parentNode.insertBefore(T,M)}else{G.insertAfter(T,M)}});G.removeClass(G.select("td.mceSelected,th.mceSelected"),"mceSelected")}function F(M){var N;e(g,function(O,P){e(O,function(R,Q){if(R.elm==M){N={x:Q,y:P};return false}});return !N});return N}function w(M){L=F(M)}function I(){var O,N,M;N=M=0;e(g,function(P,Q){e(P,function(S,R){var U,T;if(j(S)){S=g[Q][R];if(R>N){N=R}if(Q>M){M=Q}if(S.real){U=S.colspan-1;T=S.rowspan-1;if(U){if(R+U>N){N=R+U}}if(T){if(Q+T>M){M=Q+T}}}}})});return{x:N,y:M}}function v(S){var P,O,U,T,N,M,Q,R;D=F(S);if(L&&D){P=Math.min(L.x,D.x);O=Math.min(L.y,D.y);U=Math.max(L.x,D.x);T=Math.max(L.y,D.y);N=U;M=T;for(y=O;y<=M;y++){S=g[y][P];if(!S.real){if(P-(S.colspan-1)<P){P-=S.colspan-1}}}for(x=P;x<=N;x++){S=g[O][x];if(!S.real){if(O-(S.rowspan-1)<O){O-=S.rowspan-1}}}for(y=O;y<=T;y++){for(x=P;x<=U;x++){S=g[y][x];if(S.real){Q=S.colspan-1;R=S.rowspan-1;if(Q){if(x+Q>N){N=x+Q}}if(R){if(y+R>M){M=y+R}}}}}G.removeClass(G.select("td.mceSelected,th.mceSelected"),"mceSelected");for(y=O;y<=M;y++){for(x=P;x<=N;x++){if(g[y][x]){G.addClass(g[y][x].elm,"mceSelected")}}}}}d.extend(this,{deleteTable:r,split:C,merge:p,insertRow:l,insertCol:h,deleteCols:n,deleteRows:m,cutRows:E,copyRows:J,pasteRows:B,getPos:F,setStartCell:w,setEndCell:v})}d.create("tinymce.plugins.TablePlugin",{init:function(g,h){var f,m,j=true;function l(p){var o=g.selection,n=g.dom.getParent(p||o.getNode(),"table");if(n){return new b(n,g.dom,o)}}function k(){g.getBody().style.webkitUserSelect="";if(j){g.dom.removeClass(g.dom.select("td.mceSelected,th.mceSelected"),"mceSelected");j=false}}e([["table","table.desc","mceInsertTable",true],["delete_table","table.del","mceTableDelete"],["delete_col","table.delete_col_desc","mceTableDeleteCol"],["delete_row","table.delete_row_desc","mceTableDeleteRow"],["col_after","table.col_after_desc","mceTableInsertColAfter"],["col_before","table.col_before_desc","mceTableInsertColBefore"],["row_after","table.row_after_desc","mceTableInsertRowAfter"],["row_before","table.row_before_desc","mceTableInsertRowBefore"],["row_props","table.row_desc","mceTableRowProps",true],["cell_props","table.cell_desc","mceTableCellProps",true],["split_cells","table.split_cells_desc","mceTableSplitCells",true],["merge_cells","table.merge_cells_desc","mceTableMergeCells",true]],function(n){g.addButton(n[0],{title:n[1],cmd:n[2],ui:n[3]})});if(!d.isIE){g.onClick.add(function(n,o){o=o.target;if(o.nodeName==="TABLE"){n.selection.select(o);n.nodeChanged()}})}g.onPreProcess.add(function(o,p){var n,q,r,t=o.dom,s;n=t.select("table",p.node);q=n.length;while(q--){r=n[q];t.setAttrib(r,"data-mce-style","");if((s=t.getAttrib(r,"width"))){t.setStyle(r,"width",s);t.setAttrib(r,"width","")}if((s=t.getAttrib(r,"height"))){t.setStyle(r,"height",s);t.setAttrib(r,"height","")}}});g.onNodeChange.add(function(q,o,s){var r;s=q.selection.getStart();r=q.dom.getParent(s,"td,th,caption");o.setActive("table",s.nodeName==="TABLE"||!!r);if(r&&r.nodeName==="CAPTION"){r=0}o.setDisabled("delete_table",!r);o.setDisabled("delete_col",!r);o.setDisabled("delete_table",!r);o.setDisabled("delete_row",!r);o.setDisabled("col_after",!r);o.setDisabled("col_before",!r);o.setDisabled("row_after",!r);o.setDisabled("row_before",!r);o.setDisabled("row_props",!r);o.setDisabled("cell_props",!r);o.setDisabled("split_cells",!r);o.setDisabled("merge_cells",!r)});g.onInit.add(function(r){var p,t,q=r.dom,u;f=r.windowManager;r.onMouseDown.add(function(w,z){if(z.button!=2){k();t=q.getParent(z.target,"td,th");p=q.getParent(t,"table")}});q.bind(r.getDoc(),"mouseover",function(C){var A,z,B=C.target;if(t&&(u||B!=t)&&(B.nodeName=="TD"||B.nodeName=="TH")){z=q.getParent(B,"table");if(z==p){if(!u){u=l(z);u.setStartCell(t);r.getBody().style.webkitUserSelect="none"}u.setEndCell(B);j=true}A=r.selection.getSel();try{if(A.removeAllRanges){A.removeAllRanges()}else{A.empty()}}catch(w){}C.preventDefault()}});r.onMouseUp.add(function(F,G){var z,B=F.selection,H,I=B.getSel(),w,C,A,E;if(t){if(u){F.getBody().style.webkitUserSelect=""}function D(J,L){var K=new d.dom.TreeWalker(J,J);do{if(J.nodeType==3&&d.trim(J.nodeValue).length!=0){if(L){z.setStart(J,0)}else{z.setEnd(J,J.nodeValue.length)}return}if(J.nodeName=="BR"){if(L){z.setStartBefore(J)}else{z.setEndBefore(J)}return}}while(J=(L?K.next():K.prev()))}H=q.select("td.mceSelected,th.mceSelected");if(H.length>0){z=q.createRng();C=H[0];E=H[H.length-1];z.setStartBefore(C);z.setEndAfter(C);D(C,1);w=new d.dom.TreeWalker(C,q.getParent(H[0],"table"));do{if(C.nodeName=="TD"||C.nodeName=="TH"){if(!q.hasClass(C,"mceSelected")){break}A=C}}while(C=w.next());D(A);B.setRng(z)}F.nodeChanged();t=u=p=null}});r.onKeyUp.add(function(w,z){k()});r.onKeyDown.add(function(w,z){n(w)});r.onMouseDown.add(function(w,z){if(z.button!=2){n(w)}});function o(D,z,A,F){var B=3,G=D.dom.getParent(z.startContainer,"TABLE"),C,w,E;if(G){C=G.parentNode}w=z.startContainer.nodeType==B&&z.startOffset==0&&z.endOffset==0&&F&&(A.nodeName=="TR"||A==C);E=(A.nodeName=="TD"||A.nodeName=="TH")&&!F;return w||E}function n(A){if(!d.isWebKit){return}var z=A.selection.getRng();var C=A.selection.getNode();var B=A.dom.getParent(z.startContainer,"TD,TH");if(!o(A,z,C,B)){return}if(!B){B=C}var w=B.lastChild;while(w.lastChild){w=w.lastChild}z.setEnd(w,w.nodeValue.length);A.selection.setRng(z)}r.plugins.table.fixTableCellSelection=n;if(r&&r.plugins.contextmenu){r.plugins.contextmenu.onContextMenu.add(function(A,w,C){var D,B=r.selection,z=B.getNode()||r.getBody();if(r.dom.getParent(C,"td")||r.dom.getParent(C,"th")||r.dom.select("td.mceSelected,th.mceSelected").length){w.removeAll();if(z.nodeName=="A"&&!r.dom.getAttrib(z,"name")){w.add({title:"advanced.link_desc",icon:"link",cmd:r.plugins.advlink?"mceAdvLink":"mceLink",ui:true});w.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"});w.addSeparator()}if(z.nodeName=="IMG"&&z.className.indexOf("mceItem")==-1){w.add({title:"advanced.image_desc",icon:"image",cmd:r.plugins.advimage?"mceAdvImage":"mceImage",ui:true});w.addSeparator()}w.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",value:{action:"insert"}});w.add({title:"table.props_desc",icon:"table_props",cmd:"mceInsertTable"});w.add({title:"table.del",icon:"delete_table",cmd:"mceTableDelete"});w.addSeparator();D=w.addMenu({title:"table.cell"});D.add({title:"table.cell_desc",icon:"cell_props",cmd:"mceTableCellProps"});D.add({title:"table.split_cells_desc",icon:"split_cells",cmd:"mceTableSplitCells"});D.add({title:"table.merge_cells_desc",icon:"merge_cells",cmd:"mceTableMergeCells"});D=w.addMenu({title:"table.row"});D.add({title:"table.row_desc",icon:"row_props",cmd:"mceTableRowProps"});D.add({title:"table.row_before_desc",icon:"row_before",cmd:"mceTableInsertRowBefore"});D.add({title:"table.row_after_desc",icon:"row_after",cmd:"mceTableInsertRowAfter"});D.add({title:"table.delete_row_desc",icon:"delete_row",cmd:"mceTableDeleteRow"});D.addSeparator();D.add({title:"table.cut_row_desc",icon:"cut",cmd:"mceTableCutRow"});D.add({title:"table.copy_row_desc",icon:"copy",cmd:"mceTableCopyRow"});D.add({title:"table.paste_row_before_desc",icon:"paste",cmd:"mceTablePasteRowBefore"}).setDisabled(!m);D.add({title:"table.paste_row_after_desc",icon:"paste",cmd:"mceTablePasteRowAfter"}).setDisabled(!m);D=w.addMenu({title:"table.col"});D.add({title:"table.col_before_desc",icon:"col_before",cmd:"mceTableInsertColBefore"});D.add({title:"table.col_after_desc",icon:"col_after",cmd:"mceTableInsertColAfter"});D.add({title:"table.delete_col_desc",icon:"delete_col",cmd:"mceTableDeleteCol"})}else{w.add({title:"table.desc",icon:"table",cmd:"mceInsertTable"})}})}if(d.isWebKit){function v(C,N){var L=d.VK;var Q=N.keyCode;function O(Y,U,S){var T=Y?"previousSibling":"nextSibling";var Z=C.dom.getParent(U,"tr");var X=Z[T];if(X){z(C,U,X,Y);d.dom.Event.cancel(S);return true}else{var aa=C.dom.getParent(Z,"table");var W=Z.parentNode;var R=W.nodeName.toLowerCase();if(R==="tbody"||R===(Y?"tfoot":"thead")){var V=w(Y,aa,W,"tbody");if(V!==null){return K(Y,V,U,S)}}return M(Y,Z,T,aa,S)}}function w(V,T,U,X){var S=C.dom.select(">"+X,T);var R=S.indexOf(U);if(V&&R===0||!V&&R===S.length-1){return B(V,T)}else{if(R===-1){var W=U.tagName.toLowerCase()==="thead"?0:S.length-1;return S[W]}else{return S[R+(V?-1:1)]}}}function B(U,T){var S=U?"thead":"tfoot";var R=C.dom.select(">"+S,T);return R.length!==0?R[0]:null}function K(V,T,S,U){var R=J(T,V);R&&z(C,S,R,V);d.dom.Event.cancel(U);return true}function M(Y,U,R,X,W){var S=X[R];if(S){F(S);return true}else{var V=C.dom.getParent(X,"td,th");if(V){return O(Y,V,W)}else{var T=J(U,!Y);F(T);return d.dom.Event.cancel(W)}}}function J(S,R){var T=S&&S[R?"lastChild":"firstChild"];return T&&T.nodeName==="BR"?C.dom.getParent(T,"td,th"):T}function F(R){C.selection.setCursorLocation(R,0)}function A(){return Q==L.UP||Q==L.DOWN}function D(R){var T=R.selection.getNode();var S=R.dom.getParent(T,"tr");return S!==null}function P(S){var R=0;var T=S;while(T.previousSibling){T=T.previousSibling;R=R+a(T,"colspan")}return R}function E(T,R){var U=0;var S=0;e(T.children,function(V,W){U=U+a(V,"colspan");S=W;if(U>R){return false}});return S}function z(T,W,Y,V){var X=P(T.dom.getParent(W,"td,th"));var S=E(Y,X);var R=Y.childNodes[S];var U=J(R,V);F(U||R)}function H(R){var T=C.selection.getNode();var U=C.dom.getParent(T,"td,th");var S=C.dom.getParent(R,"td,th");return U&&U!==S&&I(U,S)}function I(S,R){return C.dom.getParent(S,"TABLE")===C.dom.getParent(R,"TABLE")}if(A()&&D(C)){var G=C.selection.getNode();setTimeout(function(){if(H(G)){O(!N.shiftKey&&Q===L.UP,G,N)}},0)}}r.onKeyDown.add(v)}function s(){var w;for(w=r.getBody().lastChild;w&&w.nodeType==3&&!w.nodeValue.length;w=w.previousSibling){}if(w&&w.nodeName=="TABLE"){if(r.settings.forced_root_block){r.dom.add(r.getBody(),r.settings.forced_root_block,null,d.isIE&&!d.isIE11?"&nbsp;":'<br data-mce-bogus="1" />')}else{r.dom.add(r.getBody(),"br",{"data-mce-bogus":"1"})}}}if(d.isGecko){r.onKeyDown.add(function(z,B){var w,A,C=z.dom;if(B.keyCode==37||B.keyCode==38){w=z.selection.getRng();A=C.getParent(w.startContainer,"table");if(A&&z.getBody().firstChild==A){if(c(w,A)){w=C.createRng();w.setStartBefore(A);w.setEndBefore(A);z.selection.setRng(w);B.preventDefault()}}}})}r.onKeyUp.add(s);r.onSetContent.add(s);r.onVisualAid.add(s);r.onPreProcess.add(function(w,A){var z=A.node.lastChild;if(z&&(z.nodeName=="BR"||(z.childNodes.length==1&&(z.firstChild.nodeName=="BR"||z.firstChild.nodeValue=="\u00a0")))&&z.previousSibling&&z.previousSibling.nodeName=="TABLE"){w.dom.remove(z)}});s();r.startContent=r.getContent({format:"raw"})});e({mceTableSplitCells:function(n){n.split()},mceTableMergeCells:function(o){var p,q,n;n=g.dom.getParent(g.selection.getNode(),"th,td");if(n){p=n.rowSpan;q=n.colSpan}if(!g.dom.select("td.mceSelected,th.mceSelected").length){f.open({url:h+"/merge_cells.htm",width:240+parseInt(g.getLang("table.merge_cells_delta_width",0)),height:110+parseInt(g.getLang("table.merge_cells_delta_height",0)),inline:1},{rows:p,cols:q,onaction:function(r){o.merge(n,r.cols,r.rows)},plugin_url:h})}else{o.merge()}},mceTableInsertRowBefore:function(n){n.insertRow(true)},mceTableInsertRowAfter:function(n){n.insertRow()},mceTableInsertColBefore:function(n){n.insertCol(true)},mceTableInsertColAfter:function(n){n.insertCol()},mceTableDeleteCol:function(n){n.deleteCols()},mceTableDeleteRow:function(n){n.deleteRows()},mceTableCutRow:function(n){m=n.cutRows()},mceTableCopyRow:function(n){m=n.copyRows()},mceTablePasteRowBefore:function(n){n.pasteRows(m,true)},mceTablePasteRowAfter:function(n){n.pasteRows(m)},mceTableDelete:function(n){n.deleteTable()}},function(o,n){g.addCommand(n,function(){var p=l();if(p){o(p);g.execCommand("mceRepaint");k()}})});e({mceInsertTable:function(n){f.open({url:h+"/table.htm",width:400+parseInt(g.getLang("table.table_delta_width",0)),height:320+parseInt(g.getLang("table.table_delta_height",0)),inline:1},{plugin_url:h,action:n?n.action:0})},mceTableRowProps:function(){f.open({url:h+"/row.htm",width:400+parseInt(g.getLang("table.rowprops_delta_width",0)),height:295+parseInt(g.getLang("table.rowprops_delta_height",0)),inline:1},{plugin_url:h})},mceTableCellProps:function(){f.open({url:h+"/cell.htm",width:400+parseInt(g.getLang("table.cellprops_delta_width",0)),height:295+parseInt(g.getLang("table.cellprops_delta_height",0)),inline:1},{plugin_url:h})}},function(o,n){g.addCommand(n,function(p,q){o(q)})})}});d.PluginManager.add("table",d.plugins.TablePlugin)})(tinymce);
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/table/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/table/editor_plugin_src.js
index 045648376..30f1c23fe 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/table/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/table/editor_plugin_src.js
@@ -348,7 +348,7 @@
 										startCell.removeChild(node);
 								});
 							}
-							
+
 							// Remove cell
 							dom.remove(cell);
 						}
@@ -998,23 +998,23 @@
 				});
 				function tableCellSelected(ed, rng, n, currentCell) {
 					// The decision of when a table cell is selected is somewhat involved.  The fact that this code is
-					// required is actually a pointer to the root cause of this bug. A cell is selected when the start 
+					// required is actually a pointer to the root cause of this bug. A cell is selected when the start
 					// and end offsets are 0, the start container is a text, and the selection node is either a TR (most cases)
 					// or the parent of the table (in the case of the selection containing the last cell of a table).
-					var TEXT_NODE = 3, table = ed.dom.getParent(rng.startContainer, 'TABLE'), 
+					var TEXT_NODE = 3, table = ed.dom.getParent(rng.startContainer, 'TABLE'),
 					tableParent, allOfCellSelected, tableCellSelection;
-					if (table) 
+					if (table)
 					tableParent = table.parentNode;
-					allOfCellSelected =rng.startContainer.nodeType == TEXT_NODE && 
-						rng.startOffset == 0 && 
-						rng.endOffset == 0 && 
-						currentCell && 
+					allOfCellSelected =rng.startContainer.nodeType == TEXT_NODE &&
+						rng.startOffset == 0 &&
+						rng.endOffset == 0 &&
+						currentCell &&
 						(n.nodeName=="TR" || n==tableParent);
-					tableCellSelection = (n.nodeName=="TD"||n.nodeName=="TH")&& !currentCell;	   
+					tableCellSelection = (n.nodeName=="TD"||n.nodeName=="TH")&& !currentCell;
 					return  allOfCellSelected || tableCellSelection;
 					// return false;
 				}
-				
+
 				// this nasty hack is here to work around some WebKit selection bugs.
 				function fixTableCellSelection(ed) {
 					if (!tinymce.isWebKit)
@@ -1023,18 +1023,18 @@
 					var rng = ed.selection.getRng();
 					var n = ed.selection.getNode();
 					var currentCell = ed.dom.getParent(rng.startContainer, 'TD,TH');
-				
+
 					if (!tableCellSelected(ed, rng, n, currentCell))
 						return;
 						if (!currentCell) {
 							currentCell=n;
 						}
-					
+
 					// Get the very last node inside the table cell
 					var end = currentCell.lastChild;
 					while (end.lastChild)
 						end = end.lastChild;
-					
+
 					// Select the entire table cell. Nothing outside of the table cell should be selected.
 					rng.setEnd(end, end.nodeValue.length);
 					ed.selection.setRng(rng);
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/table/js/table.js b/webapp/src/main/webapp/js/tiny_mce/plugins/table/js/table.js
index c580556bd..158d03455 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/table/js/table.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/table/js/table.js
@@ -254,7 +254,7 @@ function insertTable() {
 		}
 
 		try {
-			// IE9 might fail to do this selection 
+			// IE9 might fail to do this selection
 			inst.selection.setCursorLocation(tdorth[0], 0);
 		} catch (ex) {
 			// Ignore
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/table/langs/en_dlg.js b/webapp/src/main/webapp/js/tiny_mce/plugins/table/langs/en_dlg.js
index 463e09ee1..4daffe358 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/table/langs/en_dlg.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/table/langs/en_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.table_dlg',{"rules_border":"border","rules_box":"box","rules_vsides":"vsides","rules_rhs":"rhs","rules_lhs":"lhs","rules_hsides":"hsides","rules_below":"below","rules_above":"above","rules_void":"void",rules:"Rules","frame_all":"all","frame_cols":"cols","frame_rows":"rows","frame_groups":"groups","frame_none":"none",frame:"Frame",caption:"Table Caption","missing_scope":"Are you sure you want to continue without specifying a scope for this table header cell. Without it, it may be difficult for some users with disabilities to understand the content or data displayed of the table.","cell_limit":"You\'ve exceeded the maximum number of cells of {$cells}.","row_limit":"You\'ve exceeded the maximum number of rows of {$rows}.","col_limit":"You\'ve exceeded the maximum number of columns of {$cols}.",colgroup:"Col Group",rowgroup:"Row Group",scope:"Scope",tfoot:"Footer",tbody:"Body",thead:"Header","row_all":"Update All Rows in Table","row_even":"Update Even Rows in Table","row_odd":"Update Odd Rows in Table","row_row":"Update Current Row","cell_all":"Update All Cells in Table","cell_row":"Update All Cells in Row","cell_cell":"Update Current Cell",th:"Header",td:"Data",summary:"Summary",bgimage:"Background Image",rtl:"Right to Left",ltr:"Left to Right",mime:"Target MIME Type",langcode:"Language Code",langdir:"Language Direction",style:"Style",id:"ID","merge_cells_title":"Merge Table Cells",bgcolor:"Background Color",bordercolor:"Border Color","align_bottom":"Bottom","align_top":"Top",valign:"Vertical Alignment","cell_type":"Cell Type","cell_title":"Table Cell Properties","row_title":"Table Row Properties","align_middle":"Center","align_right":"Right","align_left":"Left","align_default":"Default",align:"Alignment",border:"Border",cellpadding:"Cell Padding",cellspacing:"Cell Spacing",rows:"Rows",cols:"Columns",height:"Height",width:"Width",title:"Insert/Edit Table",rowtype:"Row Type","advanced_props":"Advanced Properties","general_props":"General Properties","advanced_tab":"Advanced","general_tab":"General","cell_col":"Update all cells in column"});
\ No newline at end of file
+tinyMCE.addI18n('en.table_dlg',{"rules_border":"border","rules_box":"box","rules_vsides":"vsides","rules_rhs":"rhs","rules_lhs":"lhs","rules_hsides":"hsides","rules_below":"below","rules_above":"above","rules_void":"void",rules:"Rules","frame_all":"all","frame_cols":"cols","frame_rows":"rows","frame_groups":"groups","frame_none":"none",frame:"Frame",caption:"Table Caption","missing_scope":"Are you sure you want to continue without specifying a scope for this table header cell. Without it, it may be difficult for some users with disabilities to understand the content or data displayed of the table.","cell_limit":"You\'ve exceeded the maximum number of cells of {$cells}.","row_limit":"You\'ve exceeded the maximum number of rows of {$rows}.","col_limit":"You\'ve exceeded the maximum number of columns of {$cols}.",colgroup:"Col Group",rowgroup:"Row Group",scope:"Scope",tfoot:"Footer",tbody:"Body",thead:"Header","row_all":"Update All Rows in Table","row_even":"Update Even Rows in Table","row_odd":"Update Odd Rows in Table","row_row":"Update Current Row","cell_all":"Update All Cells in Table","cell_row":"Update All Cells in Row","cell_cell":"Update Current Cell",th:"Header",td:"Data",summary:"Summary",bgimage:"Background Image",rtl:"Right to Left",ltr:"Left to Right",mime:"Target MIME Type",langcode:"Language Code",langdir:"Language Direction",style:"Style",id:"ID","merge_cells_title":"Merge Table Cells",bgcolor:"Background Color",bordercolor:"Border Color","align_bottom":"Bottom","align_top":"Top",valign:"Vertical Alignment","cell_type":"Cell Type","cell_title":"Table Cell Properties","row_title":"Table Row Properties","align_middle":"Center","align_right":"Right","align_left":"Left","align_default":"Default",align:"Alignment",border:"Border",cellpadding:"Cell Padding",cellspacing:"Cell Spacing",rows:"Rows",cols:"Columns",height:"Height",width:"Width",title:"Insert/Edit Table",rowtype:"Row Type","advanced_props":"Advanced Properties","general_props":"General Properties","advanced_tab":"Advanced","general_tab":"General","cell_col":"Update all cells in column"});
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/table/table.htm b/webapp/src/main/webapp/js/tiny_mce/plugins/table/table.htm
index 52e6bf28f..c4610bba5 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/table/table.htm
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/table/table.htm
@@ -62,8 +62,8 @@
 							 </select></td>
 						</tr>
 						<tr>
-							<td class="column1" ><label for="caption">{#table_dlg.caption}</label></td> 
-							<td><input id="caption" name="caption" type="checkbox" class="checkbox" value="true" /></td> 
+							<td class="column1" ><label for="caption">{#table_dlg.caption}</label></td>
+							<td><input id="caption" name="caption" type="checkbox" class="checkbox" value="true" /></td>
 						</tr>
 					</table>
 				</fieldset>
@@ -75,13 +75,13 @@
 
 					<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 						<tr>
-							<td class="column1"><label for="id">{#table_dlg.id}</label></td> 
-							<td><input id="id" name="id" type="text" value="" class="advfield" /></td> 
+							<td class="column1"><label for="id">{#table_dlg.id}</label></td>
+							<td><input id="id" name="id" type="text" value="" class="advfield" /></td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="summary">{#table_dlg.summary}</label></td> 
-							<td><input id="summary" name="summary" type="text" value="" class="advfield" /></td> 
+							<td class="column1"><label for="summary">{#table_dlg.summary}</label></td>
+							<td><input id="summary" name="summary" type="text" value="" class="advfield" /></td>
 						</tr>
 
 						<tr>
@@ -90,14 +90,14 @@
 						</tr>
 
 						<tr>
-							<td class="column1"><label id="langlabel" for="lang">{#table_dlg.langcode}</label></td> 
+							<td class="column1"><label id="langlabel" for="lang">{#table_dlg.langcode}</label></td>
 							<td>
 								<input id="lang" name="lang" type="text" value="" class="advfield" />
-							</td> 
+							</td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 
+							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td>
 							<td>
 								<table role="presentation" aria-labelledby="backgroundimage_label" border="0" cellpadding="0" cellspacing="0">
 									<tr>
@@ -105,54 +105,54 @@
 										<td id="backgroundimagebrowsercontainer">&nbsp;</td>
 									</tr>
 								</table>
-							</td> 
+							</td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="tframe">{#table_dlg.frame}</label></td> 
+							<td class="column1"><label for="tframe">{#table_dlg.frame}</label></td>
 							<td>
-								<select id="tframe" name="tframe" class="advfield"> 
+								<select id="tframe" name="tframe" class="advfield">
 										<option value="">{#not_set}</option>
 										<option value="void">{#table_dlg.rules_void}</option>
-										<option value="above">{#table_dlg.rules_above}</option> 
-										<option value="below">{#table_dlg.rules_below}</option> 
-										<option value="hsides">{#table_dlg.rules_hsides}</option> 
-										<option value="lhs">{#table_dlg.rules_lhs}</option> 
-										<option value="rhs">{#table_dlg.rules_rhs}</option> 
-										<option value="vsides">{#table_dlg.rules_vsides}</option> 
-										<option value="box">{#table_dlg.rules_box}</option> 
-										<option value="border">{#table_dlg.rules_border}</option> 
+										<option value="above">{#table_dlg.rules_above}</option>
+										<option value="below">{#table_dlg.rules_below}</option>
+										<option value="hsides">{#table_dlg.rules_hsides}</option>
+										<option value="lhs">{#table_dlg.rules_lhs}</option>
+										<option value="rhs">{#table_dlg.rules_rhs}</option>
+										<option value="vsides">{#table_dlg.rules_vsides}</option>
+										<option value="box">{#table_dlg.rules_box}</option>
+										<option value="border">{#table_dlg.rules_border}</option>
 								</select>
-							</td> 
+							</td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="rules">{#table_dlg.rules}</label></td> 
+							<td class="column1"><label for="rules">{#table_dlg.rules}</label></td>
 							<td>
-								<select id="rules" name="rules" class="advfield"> 
-										<option value="">{#not_set}</option> 
+								<select id="rules" name="rules" class="advfield">
+										<option value="">{#not_set}</option>
 										<option value="none">{#table_dlg.frame_none}</option>
 										<option value="groups">{#table_dlg.frame_groups}</option>
 										<option value="rows">{#table_dlg.frame_rows}</option>
 										<option value="cols">{#table_dlg.frame_cols}</option>
 										<option value="all">{#table_dlg.frame_all}</option>
 									</select>
-							</td> 
+							</td>
 						</tr>
 
 						<tr>
-							<td class="column1"><label for="dir">{#table_dlg.langdir}</label></td> 
+							<td class="column1"><label for="dir">{#table_dlg.langdir}</label></td>
 							<td>
-								<select id="dir" name="dir" class="advfield"> 
-										<option value="">{#not_set}</option> 
-										<option value="ltr">{#table_dlg.ltr}</option> 
-										<option value="rtl">{#table_dlg.rtl}</option> 
+								<select id="dir" name="dir" class="advfield">
+										<option value="">{#not_set}</option>
+										<option value="ltr">{#table_dlg.ltr}</option>
+										<option value="rtl">{#table_dlg.rtl}</option>
 								</select>
-							</td> 
+							</td>
 						</tr>
 
 						<tr role="group" aria-labelledby="bordercolor_label">
-							<td class="column1"><label id="bordercolor_label" for="bordercolor">{#table_dlg.bordercolor}</label></td> 
+							<td class="column1"><label id="bordercolor_label" for="bordercolor">{#table_dlg.bordercolor}</label></td>
 							<td>
 								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
@@ -160,11 +160,11 @@
 										<td id="bordercolor_pickcontainer">&nbsp;</td>
 									</tr>
 								</table>
-							</td> 
+							</td>
 						</tr>
 
 						<tr role="group" aria-labelledby="bgcolor_label">
-							<td class="column1"><label id="bgcolor_label" for="bgcolor">{#table_dlg.bgcolor}</label></td> 
+							<td class="column1"><label id="bgcolor_label" for="bgcolor">{#table_dlg.bgcolor}</label></td>
 							<td>
 								<table role="presentation" border="0" cellpadding="0" cellspacing="0">
 									<tr>
@@ -172,7 +172,7 @@
 										<td id="bgcolor_pickcontainer">&nbsp;</td>
 									</tr>
 								</table>
-							</td> 
+							</td>
 						</tr>
 					</table>
 				</fieldset>
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/template/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/template/editor_plugin.js
index ebe3c27d7..4125ff9a4 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/template/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/template/editor_plugin.js
@@ -1 +1 @@
-(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.TemplatePlugin",{init:function(b,c){var d=this;d.editor=b;b.addCommand("mceTemplate",function(e){b.windowManager.open({file:c+"/template.htm",width:b.getParam("template_popup_width",750),height:b.getParam("template_popup_height",600),inline:1},{plugin_url:c})});b.addCommand("mceInsertTemplate",d._insertTemplate,d);b.addButton("template",{title:"template.desc",cmd:"mceTemplate"});b.onPreProcess.add(function(e,g){var f=e.dom;a(f.select("div",g.node),function(h){if(f.hasClass(h,"mceTmpl")){a(f.select("*",h),function(i){if(f.hasClass(i,e.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))){i.innerHTML=d._getDateTime(new Date(),e.getParam("template_mdate_format",e.getLang("template.mdate_format")))}});d._replaceVals(h)}})})},getInfo:function(){return{longname:"Template plugin",author:"Moxiecode Systems AB",authorurl:"http://www.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/template",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_insertTemplate:function(i,j){var k=this,g=k.editor,f,c,d=g.dom,b=g.selection.getContent();f=j.content;a(k.editor.getParam("template_replace_values"),function(l,h){if(typeof(l)!="function"){f=f.replace(new RegExp("\\{\\$"+h+"\\}","g"),l)}});c=d.create("div",null,f);n=d.select(".mceTmpl",c);if(n&&n.length>0){c=d.create("div",null);c.appendChild(n[0].cloneNode(true))}function e(l,h){return new RegExp("\\b"+h+"\\b","g").test(l.className)}a(d.select("*",c),function(h){if(e(h,g.getParam("template_cdate_classes","cdate").replace(/\s+/g,"|"))){h.innerHTML=k._getDateTime(new Date(),g.getParam("template_cdate_format",g.getLang("template.cdate_format")))}if(e(h,g.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))){h.innerHTML=k._getDateTime(new Date(),g.getParam("template_mdate_format",g.getLang("template.mdate_format")))}if(e(h,g.getParam("template_selected_content_classes","selcontent").replace(/\s+/g,"|"))){h.innerHTML=b}});k._replaceVals(c);g.execCommand("mceInsertContent",false,c.innerHTML);g.addVisual()},_replaceVals:function(c){var d=this.editor.dom,b=this.editor.getParam("template_replace_values");a(d.select("*",c),function(f){a(b,function(g,e){if(d.hasClass(f,e)){if(typeof(b[e])=="function"){b[e](f)}}})})},_getDateTime:function(e,b){if(!b){return""}function c(g,d){var f;g=""+g;if(g.length<d){for(f=0;f<(d-g.length);f++){g="0"+g}}return g}b=b.replace("%D","%m/%d/%y");b=b.replace("%r","%I:%M:%S %p");b=b.replace("%Y",""+e.getFullYear());b=b.replace("%y",""+e.getYear());b=b.replace("%m",c(e.getMonth()+1,2));b=b.replace("%d",c(e.getDate(),2));b=b.replace("%H",""+c(e.getHours(),2));b=b.replace("%M",""+c(e.getMinutes(),2));b=b.replace("%S",""+c(e.getSeconds(),2));b=b.replace("%I",""+((e.getHours()+11)%12+1));b=b.replace("%p",""+(e.getHours()<12?"AM":"PM"));b=b.replace("%B",""+this.editor.getLang("template_months_long").split(",")[e.getMonth()]);b=b.replace("%b",""+this.editor.getLang("template_months_short").split(",")[e.getMonth()]);b=b.replace("%A",""+this.editor.getLang("template_day_long").split(",")[e.getDay()]);b=b.replace("%a",""+this.editor.getLang("template_day_short").split(",")[e.getDay()]);b=b.replace("%%","%");return b}});tinymce.PluginManager.add("template",tinymce.plugins.TemplatePlugin)})();
\ No newline at end of file
+(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.TemplatePlugin",{init:function(b,c){var d=this;d.editor=b;b.addCommand("mceTemplate",function(e){b.windowManager.open({file:c+"/template.htm",width:b.getParam("template_popup_width",750),height:b.getParam("template_popup_height",600),inline:1},{plugin_url:c})});b.addCommand("mceInsertTemplate",d._insertTemplate,d);b.addButton("template",{title:"template.desc",cmd:"mceTemplate"});b.onPreProcess.add(function(e,g){var f=e.dom;a(f.select("div",g.node),function(h){if(f.hasClass(h,"mceTmpl")){a(f.select("*",h),function(i){if(f.hasClass(i,e.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))){i.innerHTML=d._getDateTime(new Date(),e.getParam("template_mdate_format",e.getLang("template.mdate_format")))}});d._replaceVals(h)}})})},getInfo:function(){return{longname:"Template plugin",author:"Moxiecode Systems AB",authorurl:"http://www.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/template",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_insertTemplate:function(i,j){var k=this,g=k.editor,f,c,d=g.dom,b=g.selection.getContent();f=j.content;a(k.editor.getParam("template_replace_values"),function(l,h){if(typeof(l)!="function"){f=f.replace(new RegExp("\\{\\$"+h+"\\}","g"),l)}});c=d.create("div",null,f);n=d.select(".mceTmpl",c);if(n&&n.length>0){c=d.create("div",null);c.appendChild(n[0].cloneNode(true))}function e(l,h){return new RegExp("\\b"+h+"\\b","g").test(l.className)}a(d.select("*",c),function(h){if(e(h,g.getParam("template_cdate_classes","cdate").replace(/\s+/g,"|"))){h.innerHTML=k._getDateTime(new Date(),g.getParam("template_cdate_format",g.getLang("template.cdate_format")))}if(e(h,g.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))){h.innerHTML=k._getDateTime(new Date(),g.getParam("template_mdate_format",g.getLang("template.mdate_format")))}if(e(h,g.getParam("template_selected_content_classes","selcontent").replace(/\s+/g,"|"))){h.innerHTML=b}});k._replaceVals(c);g.execCommand("mceInsertContent",false,c.innerHTML);g.addVisual()},_replaceVals:function(c){var d=this.editor.dom,b=this.editor.getParam("template_replace_values");a(d.select("*",c),function(f){a(b,function(g,e){if(d.hasClass(f,e)){if(typeof(b[e])=="function"){b[e](f)}}})})},_getDateTime:function(e,b){if(!b){return""}function c(g,d){var f;g=""+g;if(g.length<d){for(f=0;f<(d-g.length);f++){g="0"+g}}return g}b=b.replace("%D","%m/%d/%y");b=b.replace("%r","%I:%M:%S %p");b=b.replace("%Y",""+e.getFullYear());b=b.replace("%y",""+e.getYear());b=b.replace("%m",c(e.getMonth()+1,2));b=b.replace("%d",c(e.getDate(),2));b=b.replace("%H",""+c(e.getHours(),2));b=b.replace("%M",""+c(e.getMinutes(),2));b=b.replace("%S",""+c(e.getSeconds(),2));b=b.replace("%I",""+((e.getHours()+11)%12+1));b=b.replace("%p",""+(e.getHours()<12?"AM":"PM"));b=b.replace("%B",""+this.editor.getLang("template_months_long").split(",")[e.getMonth()]);b=b.replace("%b",""+this.editor.getLang("template_months_short").split(",")[e.getMonth()]);b=b.replace("%A",""+this.editor.getLang("template_day_long").split(",")[e.getDay()]);b=b.replace("%a",""+this.editor.getLang("template_day_short").split(",")[e.getDay()]);b=b.replace("%%","%");return b}});tinymce.PluginManager.add("template",tinymce.plugins.TemplatePlugin)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/template/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/template/editor_plugin_src.js
index 28baed21e..61fc887fa 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/template/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/template/editor_plugin_src.js
@@ -156,4 +156,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('template', tinymce.plugins.TemplatePlugin);
-})();
\ No newline at end of file
+})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/template/langs/en_dlg.js b/webapp/src/main/webapp/js/tiny_mce/plugins/template/langs/en_dlg.js
index 83e599d68..300b44c90 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/template/langs/en_dlg.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/template/langs/en_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.template_dlg',{title:"Templates",label:"Template","desc_label":"Description",desc:"Insert Predefined Template Content",select:"Select a Template",preview:"Preview",warning:"Warning: Updating a template with a different one may cause data loss.","mdate_format":"%Y-%m-%d %H:%M:%S","cdate_format":"%Y-%m-%d %H:%M:%S","months_long":"January,February,March,April,May,June,July,August,September,October,November,December","months_short":"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec","day_long":"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday","day_short":"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun"});
\ No newline at end of file
+tinyMCE.addI18n('en.template_dlg',{title:"Templates",label:"Template","desc_label":"Description",desc:"Insert Predefined Template Content",select:"Select a Template",preview:"Preview",warning:"Warning: Updating a template with a different one may cause data loss.","mdate_format":"%Y-%m-%d %H:%M:%S","cdate_format":"%Y-%m-%d %H:%M:%S","months_long":"January,February,March,April,May,June,July,August,September,October,November,December","months_short":"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec","day_long":"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday","day_short":"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun"});
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/template/template.htm b/webapp/src/main/webapp/js/tiny_mce/plugins/template/template.htm
index 59b7cdc09..20e35be7f 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/template/template.htm
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/template/template.htm
@@ -5,7 +5,7 @@
 	<script type="text/javascript" src="js/template.js"></script>
 	<link href="css/template.css" rel="stylesheet" type="text/css" />
 </head>
-<body onresize="TemplateDialog.resize();"> 
+<body onresize="TemplateDialog.resize();">
 	<form onsubmit="TemplateDialog.insert();return false;">
 		<div id="frmbody">
 			<div class="title">{#template_dlg.desc}</div>
@@ -21,11 +21,11 @@
 				<iframe id="templatesrc" name="templatesrc" src="blank.htm" width="690" height="400" frameborder="0"></iframe>
 			</fieldset>
 		</div>
-		
+
 		<div class="mceActionPanel">
 			<input type="submit" id="insert" name="insert" value="{#insert}" />
 			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
 		</div>
 	</form>
-</body> 
-</html> 
+</body>
+</html>
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/visualblocks/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/visualblocks/editor_plugin.js
index c65eaf2b4..f2583cd21 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/visualblocks/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/visualblocks/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.VisualBlocks",{init:function(a,b){var c;if(!window.NodeList){return}a.addCommand("mceVisualBlocks",function(){var e=a.dom,d;if(!c){c=e.uniqueId();d=e.create("link",{id:c,rel:"stylesheet",href:b+"/css/visualblocks.css"});a.getDoc().getElementsByTagName("head")[0].appendChild(d)}else{d=e.get(c);d.disabled=!d.disabled}a.controlManager.setActive("visualblocks",!d.disabled)});a.addButton("visualblocks",{title:"visualblocks.desc",cmd:"mceVisualBlocks"});a.onInit.add(function(){if(a.settings.visualblocks_default_state){a.execCommand("mceVisualBlocks",false,null,{skip_focus:true})}})},getInfo:function(){return{longname:"Visual blocks",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualblocks",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("visualblocks",tinymce.plugins.VisualBlocks)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.VisualBlocks",{init:function(a,b){var c;if(!window.NodeList){return}a.addCommand("mceVisualBlocks",function(){var e=a.dom,d;if(!c){c=e.uniqueId();d=e.create("link",{id:c,rel:"stylesheet",href:b+"/css/visualblocks.css"});a.getDoc().getElementsByTagName("head")[0].appendChild(d)}else{d=e.get(c);d.disabled=!d.disabled}a.controlManager.setActive("visualblocks",!d.disabled)});a.addButton("visualblocks",{title:"visualblocks.desc",cmd:"mceVisualBlocks"});a.onInit.add(function(){if(a.settings.visualblocks_default_state){a.execCommand("mceVisualBlocks",false,null,{skip_focus:true})}})},getInfo:function(){return{longname:"Visual blocks",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualblocks",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("visualblocks",tinymce.plugins.VisualBlocks)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/visualblocks/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/visualblocks/editor_plugin_src.js
index 51f8a613d..504f55629 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/visualblocks/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/visualblocks/editor_plugin_src.js
@@ -60,4 +60,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('visualblocks', tinymce.plugins.VisualBlocks);
-})();
\ No newline at end of file
+})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/visualchars/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/visualchars/editor_plugin.js
index 1a148e8b4..467829f54 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/visualchars/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/visualchars/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.VisualChars",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceVisualChars",c._toggleVisualChars,c);a.addButton("visualchars",{title:"visualchars.desc",cmd:"mceVisualChars"});a.onBeforeGetContent.add(function(d,e){if(c.state&&e.format!="raw"&&!e.draft){c.state=true;c._toggleVisualChars(false)}})},getInfo:function(){return{longname:"Visual characters",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualchars",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_toggleVisualChars:function(m){var p=this,k=p.editor,a,g,j,n=k.getDoc(),o=k.getBody(),l,q=k.selection,e,c,f;p.state=!p.state;k.controlManager.setActive("visualchars",p.state);if(m){f=q.getBookmark()}if(p.state){a=[];tinymce.walk(o,function(b){if(b.nodeType==3&&b.nodeValue&&b.nodeValue.indexOf("\u00a0")!=-1){a.push(b)}},"childNodes");for(g=0;g<a.length;g++){l=a[g].nodeValue;l=l.replace(/(\u00a0)/g,'<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">$1</span>');c=k.dom.create("div",null,l);while(node=c.lastChild){k.dom.insertAfter(node,a[g])}k.dom.remove(a[g])}}else{a=k.dom.select("span.mceItemNbsp",o);for(g=a.length-1;g>=0;g--){k.dom.remove(a[g],1)}}q.moveToBookmark(f)}});tinymce.PluginManager.add("visualchars",tinymce.plugins.VisualChars)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.VisualChars",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceVisualChars",c._toggleVisualChars,c);a.addButton("visualchars",{title:"visualchars.desc",cmd:"mceVisualChars"});a.onBeforeGetContent.add(function(d,e){if(c.state&&e.format!="raw"&&!e.draft){c.state=true;c._toggleVisualChars(false)}})},getInfo:function(){return{longname:"Visual characters",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualchars",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_toggleVisualChars:function(m){var p=this,k=p.editor,a,g,j,n=k.getDoc(),o=k.getBody(),l,q=k.selection,e,c,f;p.state=!p.state;k.controlManager.setActive("visualchars",p.state);if(m){f=q.getBookmark()}if(p.state){a=[];tinymce.walk(o,function(b){if(b.nodeType==3&&b.nodeValue&&b.nodeValue.indexOf("\u00a0")!=-1){a.push(b)}},"childNodes");for(g=0;g<a.length;g++){l=a[g].nodeValue;l=l.replace(/(\u00a0)/g,'<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">$1</span>');c=k.dom.create("div",null,l);while(node=c.lastChild){k.dom.insertAfter(node,a[g])}k.dom.remove(a[g])}}else{a=k.dom.select("span.mceItemNbsp",o);for(g=a.length-1;g>=0;g--){k.dom.remove(a[g],1)}}q.moveToBookmark(f)}});tinymce.PluginManager.add("visualchars",tinymce.plugins.VisualChars)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/visualchars/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/visualchars/editor_plugin_src.js
index 0e3572e6e..804fa5914 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/visualchars/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/visualchars/editor_plugin_src.js
@@ -80,4 +80,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('visualchars', tinymce.plugins.VisualChars);
-})();
\ No newline at end of file
+})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/wordcount/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/wordcount/editor_plugin.js
index 070fe5902..d79efa749 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/wordcount/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/wordcount/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.WordCount",{block:0,id:null,countre:null,cleanre:null,init:function(c,d){var e=this,f=0,g=tinymce.VK;e.countre=c.getParam("wordcount_countregex",/[\w\u2019\u00co-\u00ff^\uc397^u00f7\'-]+/g);e.cleanre=c.getParam("wordcount_cleanregex",/[0-9.(),;:!?%#$?\'\"_+=\\\/-]*/g);e.update_rate=c.getParam("wordcount_update_rate",2000);e.update_on_delete=c.getParam("wordcount_update_on_delete",false);e.id=c.id+"-word-count";c.onPostRender.add(function(i,h){var j,k;k=i.getParam("wordcount_target_id");if(!k){j=tinymce.DOM.get(i.id+"_path_row");if(j){tinymce.DOM.add(j.parentNode,"div",{style:"float: right"},i.getLang("wordcount.words","Words: ")+'<span id="'+e.id+'">0</span>')}}else{tinymce.DOM.add(k,"span",{},'<span id="'+e.id+'">0</span>')}});c.onInit.add(function(h){h.selection.onSetContent.add(function(){e._count(h)});e._count(h)});c.onSetContent.add(function(h){e._count(h)});function b(h){return h!==f&&(h===g.ENTER||f===g.SPACEBAR||a(f))}function a(h){return h===g.DELETE||h===g.BACKSPACE}c.onKeyUp.add(function(h,i){if(b(i.keyCode)||e.update_on_delete&&a(i.keyCode)){e._count(h)}f=i.keyCode})},_getCount:function(c){var a=0;var b=c.getContent({format:"raw"});if(b){b=b.replace(/\.\.\./g," ");b=b.replace(/<.[^<>]*?>/g," ").replace(/&nbsp;|&#160;/gi," ");b=b.replace(/(\w+)(&.+?;)+(\w+)/,"$1$3").replace(/&.+?;/g," ");b=b.replace(this.cleanre,"");var d=b.match(this.countre);if(d){a=d.length}}return a},_count:function(a){var b=this;if(b.block){return}b.block=1;setTimeout(function(){if(!a.destroyed){var c=b._getCount(a);tinymce.DOM.setHTML(b.id,c.toString());setTimeout(function(){b.block=0},b.update_rate)}},1)},getInfo:function(){return{longname:"Word Count plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("wordcount",tinymce.plugins.WordCount)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.WordCount",{block:0,id:null,countre:null,cleanre:null,init:function(c,d){var e=this,f=0,g=tinymce.VK;e.countre=c.getParam("wordcount_countregex",/[\w\u2019\u00co-\u00ff^\uc397^u00f7\'-]+/g);e.cleanre=c.getParam("wordcount_cleanregex",/[0-9.(),;:!?%#$?\'\"_+=\\\/-]*/g);e.update_rate=c.getParam("wordcount_update_rate",2000);e.update_on_delete=c.getParam("wordcount_update_on_delete",false);e.id=c.id+"-word-count";c.onPostRender.add(function(i,h){var j,k;k=i.getParam("wordcount_target_id");if(!k){j=tinymce.DOM.get(i.id+"_path_row");if(j){tinymce.DOM.add(j.parentNode,"div",{style:"float: right"},i.getLang("wordcount.words","Words: ")+'<span id="'+e.id+'">0</span>')}}else{tinymce.DOM.add(k,"span",{},'<span id="'+e.id+'">0</span>')}});c.onInit.add(function(h){h.selection.onSetContent.add(function(){e._count(h)});e._count(h)});c.onSetContent.add(function(h){e._count(h)});function b(h){return h!==f&&(h===g.ENTER||f===g.SPACEBAR||a(f))}function a(h){return h===g.DELETE||h===g.BACKSPACE}c.onKeyUp.add(function(h,i){if(b(i.keyCode)||e.update_on_delete&&a(i.keyCode)){e._count(h)}f=i.keyCode})},_getCount:function(c){var a=0;var b=c.getContent({format:"raw"});if(b){b=b.replace(/\.\.\./g," ");b=b.replace(/<.[^<>]*?>/g," ").replace(/&nbsp;|&#160;/gi," ");b=b.replace(/(\w+)(&.+?;)+(\w+)/,"$1$3").replace(/&.+?;/g," ");b=b.replace(this.cleanre,"");var d=b.match(this.countre);if(d){a=d.length}}return a},_count:function(a){var b=this;if(b.block){return}b.block=1;setTimeout(function(){if(!a.destroyed){var c=b._getCount(a);tinymce.DOM.setHTML(b.id,c.toString());setTimeout(function(){b.block=0},b.update_rate)}},1)},getInfo:function(){return{longname:"Word Count plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("wordcount",tinymce.plugins.WordCount)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/abbr.htm b/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/abbr.htm
index d41021802..d720ce16b 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/abbr.htm
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/abbr.htm
@@ -26,40 +26,40 @@
 				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
 				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
-						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 
-						<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td> 
+						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td>
+						<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td>
 					</tr>
 					<tr>
-						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 
-						<td><input id="id" name="id" type="text" value="" class="field" /></td> 
+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td>
+						<td><input id="id" name="id" type="text" value="" class="field" /></td>
 					</tr>
 					<tr>
-						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td> 
+						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td>
 						<td>
 							<select id="class" name="class" class="field mceEditableSelect">
-								<option value="">{#not_set}</option> 
+								<option value="">{#not_set}</option>
 							</select>
 						</td>
 					</tr>
 					<tr>
-						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 
-						<td><input id="style" name="style" type="text" value="" class="field" /></td> 
+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td>
+						<td><input id="style" name="style" type="text" value="" class="field" /></td>
 					</tr>
 					<tr>
-						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 
+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td>
 						<td>
-							<select id="dir" name="dir" class="field"> 
-								<option value="">{#not_set}</option> 
-								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option> 
-								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option> 
+							<select id="dir" name="dir" class="field">
+								<option value="">{#not_set}</option>
+								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option>
+								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option>
 							</select>
-						</td> 
+						</td>
 					</tr>
 					<tr>
-						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 
+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td>
 						<td>
 							<input id="lang" name="lang" type="text" value="" class="field" />
-						</td> 
+						</td>
 					</tr>
 				</table>
 			</fieldset>
@@ -70,63 +70,63 @@
 
 				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
-						<td class="label"><label for="onfocus">onfocus</label>:</td> 
-						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onfocus">onfocus</label>:</td>
+						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onblur">onblur</label>:</td> 
-						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onblur">onblur</label>:</td>
+						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onclick">onclick</label>:</td> 
-						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onclick">onclick</label>:</td>
+						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 
-						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="ondblclick">ondblclick</label>:</td>
+						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 
-						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmousedown">onmousedown</label>:</td>
+						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 
-						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmouseup">onmouseup</label>:</td>
+						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 
-						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmouseover">onmouseover</label>:</td>
+						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 
-						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmousemove">onmousemove</label>:</td>
+						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 
-						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmouseout">onmouseout</label>:</td>
+						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 
-						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onkeypress">onkeypress</label>:</td>
+						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 
-						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onkeydown">onkeydown</label>:</td>
+						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
-						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onkeyup">onkeyup</label>:</td>
+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td>
 					</tr>
 				</table>
 			</fieldset>
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/acronym.htm b/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/acronym.htm
index 12b189b43..d434d52f6 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/acronym.htm
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/acronym.htm
@@ -26,40 +26,40 @@
 				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
 				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
-						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 
-						<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td> 
+						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td>
+						<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td>
 					</tr>
 					<tr>
-						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 
-						<td><input id="id" name="id" type="text" value="" class="field" /></td> 
+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td>
+						<td><input id="id" name="id" type="text" value="" class="field" /></td>
 					</tr>
 					<tr>
-						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td> 
+						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td>
 						<td>
 							<select id="class" name="class" class="field mceEditableSelect">
-								<option value="">{#not_set}</option> 
+								<option value="">{#not_set}</option>
 							</select>
 						</td>
 					</tr>
 					<tr>
-						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 
-						<td><input id="style" name="style" type="text" value="" class="field" /></td> 
+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td>
+						<td><input id="style" name="style" type="text" value="" class="field" /></td>
 					</tr>
 					<tr>
-						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 
+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td>
 						<td>
-							<select id="dir" name="dir" class="field"> 
-								<option value="">{#not_set}</option> 
-								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option> 
-								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option> 
+							<select id="dir" name="dir" class="field">
+								<option value="">{#not_set}</option>
+								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option>
+								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option>
 							</select>
-						</td> 
+						</td>
 					</tr>
 					<tr>
-						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 
+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td>
 						<td>
 							<input id="lang" name="lang" type="text" value="" class="field" />
-						</td> 
+						</td>
 					</tr>
 				</table>
 			</fieldset>
@@ -70,63 +70,63 @@
 
 				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
-						<td class="label"><label for="onfocus">onfocus</label>:</td> 
-						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onfocus">onfocus</label>:</td>
+						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onblur">onblur</label>:</td> 
-						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onblur">onblur</label>:</td>
+						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onclick">onclick</label>:</td> 
-						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onclick">onclick</label>:</td>
+						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 
-						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="ondblclick">ondblclick</label>:</td>
+						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 
-						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmousedown">onmousedown</label>:</td>
+						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 
-						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmouseup">onmouseup</label>:</td>
+						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 
-						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmouseover">onmouseover</label>:</td>
+						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 
-						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmousemove">onmousemove</label>:</td>
+						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 
-						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmouseout">onmouseout</label>:</td>
+						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 
-						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onkeypress">onkeypress</label>:</td>
+						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 
-						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onkeydown">onkeydown</label>:</td>
+						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
-						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onkeyup">onkeyup</label>:</td>
+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td>
 					</tr>
 				</table>
 			</fieldset>
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/attributes.htm b/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/attributes.htm
index d84f378bf..b0c374ffb 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/attributes.htm
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/attributes.htm
@@ -25,12 +25,12 @@
 				<legend>{#xhtmlxtras_dlg.attribute_attrib_tab}</legend>
 				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
-						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 
-						<td><input id="title" name="title" type="text" value="" class="mceFocus" /></td> 
+						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td>
+						<td><input id="title" name="title" type="text" value="" class="mceFocus" /></td>
 					</tr>
 					<tr>
-						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 
-						<td><input id="id" name="id" type="text" value="" /></td> 
+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td>
+						<td><input id="id" name="id" type="text" value="" /></td>
 					</tr>
 					<tr>
 						<td><label id="classlabel" for="classlist">{#class_name}</label></td>
@@ -41,24 +41,24 @@
 						</td>
 					</tr>
 					<tr>
-						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 
-						<td><input id="style" name="style" type="text" value="" /></td> 
+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td>
+						<td><input id="style" name="style" type="text" value="" /></td>
 					</tr>
 					<tr>
-						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 
+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td>
 						<td>
-							<select id="dir" name="dir"> 
-								<option value="">{#not_set}</option> 
-								<option value="ltr">{#xhtmlxtras_dlg.option_ltr}</option> 
-								<option value="rtl">{#xhtmlxtras_dlg.option_rtl}</option> 
+							<select id="dir" name="dir">
+								<option value="">{#not_set}</option>
+								<option value="ltr">{#xhtmlxtras_dlg.option_ltr}</option>
+								<option value="rtl">{#xhtmlxtras_dlg.option_rtl}</option>
 							</select>
-						</td> 
+						</td>
 					</tr>
 					<tr>
-						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 
+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td>
 						<td>
 							<input id="lang" name="lang" type="text" value="" />
-						</td> 
+						</td>
 					</tr>
 					<tr>
 							<td><label id="tabindexlabel" for="tabindex">{#xhtmlxtras_dlg.attribute_label_tabindex}</label></td>
@@ -78,63 +78,63 @@
 
 				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
-						<td class="label"><label for="onfocus">onfocus</label>:</td> 
-						<td><input id="onfocus" name="onfocus" type="text" value="" /></td> 
+						<td class="label"><label for="onfocus">onfocus</label>:</td>
+						<td><input id="onfocus" name="onfocus" type="text" value="" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onblur">onblur</label>:</td> 
-						<td><input id="onblur" name="onblur" type="text" value="" /></td> 
+						<td class="label"><label for="onblur">onblur</label>:</td>
+						<td><input id="onblur" name="onblur" type="text" value="" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onclick">onclick</label>:</td> 
-						<td><input id="onclick" name="onclick" type="text" value="" /></td> 
+						<td class="label"><label for="onclick">onclick</label>:</td>
+						<td><input id="onclick" name="onclick" type="text" value="" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 
-						<td><input id="ondblclick" name="ondblclick" type="text" value="" /></td> 
+						<td class="label"><label for="ondblclick">ondblclick</label>:</td>
+						<td><input id="ondblclick" name="ondblclick" type="text" value="" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 
-						<td><input id="onmousedown" name="onmousedown" type="text" value="" /></td> 
+						<td class="label"><label for="onmousedown">onmousedown</label>:</td>
+						<td><input id="onmousedown" name="onmousedown" type="text" value="" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 
-						<td><input id="onmouseup" name="onmouseup" type="text" value="" /></td> 
+						<td class="label"><label for="onmouseup">onmouseup</label>:</td>
+						<td><input id="onmouseup" name="onmouseup" type="text" value="" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 
-						<td><input id="onmouseover" name="onmouseover" type="text" value="" /></td> 
+						<td class="label"><label for="onmouseover">onmouseover</label>:</td>
+						<td><input id="onmouseover" name="onmouseover" type="text" value="" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 
-						<td><input id="onmousemove" name="onmousemove" type="text" value="" /></td> 
+						<td class="label"><label for="onmousemove">onmousemove</label>:</td>
+						<td><input id="onmousemove" name="onmousemove" type="text" value="" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 
-						<td><input id="onmouseout" name="onmouseout" type="text" value="" /></td> 
+						<td class="label"><label for="onmouseout">onmouseout</label>:</td>
+						<td><input id="onmouseout" name="onmouseout" type="text" value="" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 
-						<td><input id="onkeypress" name="onkeypress" type="text" value="" /></td> 
+						<td class="label"><label for="onkeypress">onkeypress</label>:</td>
+						<td><input id="onkeypress" name="onkeypress" type="text" value="" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 
-						<td><input id="onkeydown" name="onkeydown" type="text" value="" /></td> 
+						<td class="label"><label for="onkeydown">onkeydown</label>:</td>
+						<td><input id="onkeydown" name="onkeydown" type="text" value="" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
-						<td><input id="onkeyup" name="onkeyup" type="text" value="" /></td> 
+						<td class="label"><label for="onkeyup">onkeyup</label>:</td>
+						<td><input id="onkeyup" name="onkeyup" type="text" value="" /></td>
 					</tr>
 				</table>
 			</fieldset>
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/cite.htm b/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/cite.htm
index ab61b330c..4ccb4338b 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/cite.htm
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/cite.htm
@@ -26,40 +26,40 @@
 				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
 				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
-						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 
-						<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td> 
+						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td>
+						<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td>
 					</tr>
 					<tr>
-						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 
-						<td><input id="id" name="id" type="text" value="" class="field" /></td> 
+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td>
+						<td><input id="id" name="id" type="text" value="" class="field" /></td>
 					</tr>
 					<tr>
-						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td> 
+						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td>
 						<td>
 							<select id="class" name="class" class="field mceEditableSelect">
-								<option value="">{#not_set}</option> 
+								<option value="">{#not_set}</option>
 							</select>
 						</td>
 					</tr>
 					<tr>
-						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 
-						<td><input id="style" name="style" type="text" value="" class="field" /></td> 
+						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td>
+						<td><input id="style" name="style" type="text" value="" class="field" /></td>
 					</tr>
 					<tr>
-						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 
+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td>
 						<td>
-							<select id="dir" name="dir" class="field"> 
-								<option value="">{#not_set}</option> 
-								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option> 
-								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option> 
+							<select id="dir" name="dir" class="field">
+								<option value="">{#not_set}</option>
+								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option>
+								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option>
 							</select>
-						</td> 
+						</td>
 					</tr>
 					<tr>
-						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 
+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td>
 						<td>
 							<input id="lang" name="lang" type="text" value="" class="field" />
-						</td> 
+						</td>
 					</tr>
 				</table>
 			</fieldset>
@@ -70,63 +70,63 @@
 
 				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
-						<td class="label"><label for="onfocus">onfocus</label>:</td> 
-						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onfocus">onfocus</label>:</td>
+						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onblur">onblur</label>:</td> 
-						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onblur">onblur</label>:</td>
+						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onclick">onclick</label>:</td> 
-						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onclick">onclick</label>:</td>
+						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 
-						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="ondblclick">ondblclick</label>:</td>
+						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 
-						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmousedown">onmousedown</label>:</td>
+						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 
-						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmouseup">onmouseup</label>:</td>
+						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 
-						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmouseover">onmouseover</label>:</td>
+						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 
-						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmousemove">onmousemove</label>:</td>
+						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 
-						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmouseout">onmouseout</label>:</td>
+						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 
-						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onkeypress">onkeypress</label>:</td>
+						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 
-						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onkeydown">onkeydown</label>:</td>
+						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
-						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onkeyup">onkeyup</label>:</td>
+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td>
 					</tr>
 				</table>
 			</fieldset>
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/del.htm b/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/del.htm
index e3f34c7df..5e3c1f2ee 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/del.htm
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/del.htm
@@ -29,8 +29,8 @@
 						<td class="label"><label id="datetimelabel" for="datetime">{#xhtmlxtras_dlg.attribute_label_datetime}</label>:</td>
 						<td>
 							<table role="presentation" border="0" cellspacing="0" cellpadding="0">
-								<tr> 
-									<td><input id="datetime" name="datetime" type="text" value="" maxlength="19" class="field mceFocus" /></td> 
+								<tr>
+									<td><input id="datetime" name="datetime" type="text" value="" maxlength="19" class="field mceFocus" /></td>
 									<td><a href="javascript:insertDateTime('datetime');" onmousedown="return false;" class="browse" role="button" aria-labelledby="datetimelabel"><span class="datetime" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>
 								</tr>
 							</table>
@@ -38,7 +38,7 @@
 					</tr>
 					<tr>
 						<td class="label"><label id="citelabel" for="cite">{#xhtmlxtras_dlg.attribute_label_cite}</label>:</td>
-						<td><input id="cite" name="cite" type="text" value="" class="field" /></td> 
+						<td><input id="cite" name="cite" type="text" value="" class="field" /></td>
 					</tr>
 				</table>
 			</fieldset>
@@ -46,40 +46,40 @@
 				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
 				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
-						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 
-						<td><input id="title" name="title" type="text" value="" class="field" /></td> 
+						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td>
+						<td><input id="title" name="title" type="text" value="" class="field" /></td>
 					</tr>
 					<tr>
-						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 
-						<td><input id="id" name="id" type="text" value="" class="field" /></td> 
+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td>
+						<td><input id="id" name="id" type="text" value="" class="field" /></td>
 					</tr>
 					<tr>
-						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td> 
+						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td>
 						<td>
 							<select id="class" name="class" class="field mceEditableSelect">
-								<option value="">{#not_set}</option> 
+								<option value="">{#not_set}</option>
 							</select>
 						</td>
 					</tr>
 					<tr>
-						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 
-						<td><input id="style" name="style" type="text" value="" class="field" /></td> 
+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td>
+						<td><input id="style" name="style" type="text" value="" class="field" /></td>
 					</tr>
 					<tr>
-						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 
+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td>
 						<td>
-							<select id="dir" name="dir" class="field"> 
-								<option value="">{#not_set}</option> 
-								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option> 
-								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option> 
+							<select id="dir" name="dir" class="field">
+								<option value="">{#not_set}</option>
+								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option>
+								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option>
 							</select>
-						</td> 
+						</td>
 					</tr>
 					<tr>
-						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 
+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td>
 						<td>
 							<input id="lang" name="lang" type="text" value="" class="field" />
-						</td> 
+						</td>
 					</tr>
 				</table>
 			</fieldset>
@@ -90,63 +90,63 @@
 
 				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
-						<td class="label"><label for="onfocus">onfocus</label>:</td> 
-						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onfocus">onfocus</label>:</td>
+						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onblur">onblur</label>:</td> 
-						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onblur">onblur</label>:</td>
+						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onclick">onclick</label>:</td> 
-						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onclick">onclick</label>:</td>
+						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 
-						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="ondblclick">ondblclick</label>:</td>
+						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 
-						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmousedown">onmousedown</label>:</td>
+						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 
-						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmouseup">onmouseup</label>:</td>
+						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 
-						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmouseover">onmouseover</label>:</td>
+						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 
-						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmousemove">onmousemove</label>:</td>
+						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 
-						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmouseout">onmouseout</label>:</td>
+						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 
-						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onkeypress">onkeypress</label>:</td>
+						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 
-						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onkeydown">onkeydown</label>:</td>
+						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
-						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onkeyup">onkeyup</label>:</td>
+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td>
 					</tr>
 				</table>
 			</fieldset>
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/editor_plugin.js b/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
index 9b98a5154..0b709b0d4 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.XHTMLXtrasPlugin",{init:function(a,b){a.addCommand("mceCite",function(){a.windowManager.open({file:b+"/cite.htm",width:350+parseInt(a.getLang("xhtmlxtras.cite_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.cite_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAcronym",function(){a.windowManager.open({file:b+"/acronym.htm",width:350+parseInt(a.getLang("xhtmlxtras.acronym_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.acronym_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAbbr",function(){a.windowManager.open({file:b+"/abbr.htm",width:350+parseInt(a.getLang("xhtmlxtras.abbr_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.abbr_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceDel",function(){a.windowManager.open({file:b+"/del.htm",width:340+parseInt(a.getLang("xhtmlxtras.del_delta_width",0)),height:310+parseInt(a.getLang("xhtmlxtras.del_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceIns",function(){a.windowManager.open({file:b+"/ins.htm",width:340+parseInt(a.getLang("xhtmlxtras.ins_delta_width",0)),height:310+parseInt(a.getLang("xhtmlxtras.ins_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAttributes",function(){a.windowManager.open({file:b+"/attributes.htm",width:380+parseInt(a.getLang("xhtmlxtras.attr_delta_width",0)),height:370+parseInt(a.getLang("xhtmlxtras.attr_delta_height",0)),inline:1},{plugin_url:b})});a.addButton("cite",{title:"xhtmlxtras.cite_desc",cmd:"mceCite"});a.addButton("acronym",{title:"xhtmlxtras.acronym_desc",cmd:"mceAcronym"});a.addButton("abbr",{title:"xhtmlxtras.abbr_desc",cmd:"mceAbbr"});a.addButton("del",{title:"xhtmlxtras.del_desc",cmd:"mceDel"});a.addButton("ins",{title:"xhtmlxtras.ins_desc",cmd:"mceIns"});a.addButton("attribs",{title:"xhtmlxtras.attribs_desc",cmd:"mceAttributes"});a.onNodeChange.add(function(d,c,f,e){f=d.dom.getParent(f,"CITE,ACRONYM,ABBR,DEL,INS");c.setDisabled("cite",e);c.setDisabled("acronym",e);c.setDisabled("abbr",e);c.setDisabled("del",e);c.setDisabled("ins",e);c.setDisabled("attribs",f&&f.nodeName=="BODY");c.setActive("cite",0);c.setActive("acronym",0);c.setActive("abbr",0);c.setActive("del",0);c.setActive("ins",0);if(f){do{c.setDisabled(f.nodeName.toLowerCase(),0);c.setActive(f.nodeName.toLowerCase(),1)}while(f=f.parentNode)}});a.onPreInit.add(function(){a.dom.create("abbr")})},getInfo:function(){return{longname:"XHTML Xtras Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("xhtmlxtras",tinymce.plugins.XHTMLXtrasPlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.XHTMLXtrasPlugin",{init:function(a,b){a.addCommand("mceCite",function(){a.windowManager.open({file:b+"/cite.htm",width:350+parseInt(a.getLang("xhtmlxtras.cite_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.cite_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAcronym",function(){a.windowManager.open({file:b+"/acronym.htm",width:350+parseInt(a.getLang("xhtmlxtras.acronym_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.acronym_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAbbr",function(){a.windowManager.open({file:b+"/abbr.htm",width:350+parseInt(a.getLang("xhtmlxtras.abbr_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.abbr_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceDel",function(){a.windowManager.open({file:b+"/del.htm",width:340+parseInt(a.getLang("xhtmlxtras.del_delta_width",0)),height:310+parseInt(a.getLang("xhtmlxtras.del_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceIns",function(){a.windowManager.open({file:b+"/ins.htm",width:340+parseInt(a.getLang("xhtmlxtras.ins_delta_width",0)),height:310+parseInt(a.getLang("xhtmlxtras.ins_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAttributes",function(){a.windowManager.open({file:b+"/attributes.htm",width:380+parseInt(a.getLang("xhtmlxtras.attr_delta_width",0)),height:370+parseInt(a.getLang("xhtmlxtras.attr_delta_height",0)),inline:1},{plugin_url:b})});a.addButton("cite",{title:"xhtmlxtras.cite_desc",cmd:"mceCite"});a.addButton("acronym",{title:"xhtmlxtras.acronym_desc",cmd:"mceAcronym"});a.addButton("abbr",{title:"xhtmlxtras.abbr_desc",cmd:"mceAbbr"});a.addButton("del",{title:"xhtmlxtras.del_desc",cmd:"mceDel"});a.addButton("ins",{title:"xhtmlxtras.ins_desc",cmd:"mceIns"});a.addButton("attribs",{title:"xhtmlxtras.attribs_desc",cmd:"mceAttributes"});a.onNodeChange.add(function(d,c,f,e){f=d.dom.getParent(f,"CITE,ACRONYM,ABBR,DEL,INS");c.setDisabled("cite",e);c.setDisabled("acronym",e);c.setDisabled("abbr",e);c.setDisabled("del",e);c.setDisabled("ins",e);c.setDisabled("attribs",f&&f.nodeName=="BODY");c.setActive("cite",0);c.setActive("acronym",0);c.setActive("abbr",0);c.setActive("del",0);c.setActive("ins",0);if(f){do{c.setDisabled(f.nodeName.toLowerCase(),0);c.setActive(f.nodeName.toLowerCase(),1)}while(f=f.parentNode)}});a.onPreInit.add(function(){a.dom.create("abbr")})},getInfo:function(){return{longname:"XHTML Xtras Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("xhtmlxtras",tinymce.plugins.XHTMLXtrasPlugin)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js b/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
index a9c12ef3a..24f72b997 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
@@ -129,4 +129,4 @@
 
 	// Register plugin
 	tinymce.PluginManager.add('xhtmlxtras', tinymce.plugins.XHTMLXtrasPlugin);
-})();
\ No newline at end of file
+})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/ins.htm b/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/ins.htm
index 226e60532..1e91565bf 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/ins.htm
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/ins.htm
@@ -26,19 +26,19 @@
 				<legend>{#xhtmlxtras_dlg.fieldset_general_tab}</legend>
 				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
-						<td class="label"><label id="datetimelabel" for="datetime">{#xhtmlxtras_dlg.attribute_label_datetime}</label>:</td> 
+						<td class="label"><label id="datetimelabel" for="datetime">{#xhtmlxtras_dlg.attribute_label_datetime}</label>:</td>
 						<td>
 							<table role="presentation" border="0" cellspacing="0" cellpadding="0">
-								<tr> 
-									<td><input id="datetime" name="datetime" type="text" value="" maxlength="19" class="field mceFocus" /></td> 
+								<tr>
+									<td><input id="datetime" name="datetime" type="text" value="" maxlength="19" class="field mceFocus" /></td>
 									<td ><a href="javascript:insertDateTime('datetime');" onmousedown="return false;" class="browse" role="button" aria-labelledby="datetimelabel"><span class="datetime" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>
 								</tr>
 							</table>
 						</td>
 					</tr>
 					<tr >
-						<td class="label"><label id="citelabel" for="cite">{#xhtmlxtras_dlg.attribute_label_cite}</label>:</td> 
-						<td><input id="cite" name="cite" type="text" value="" class="field" /></td> 
+						<td class="label"><label id="citelabel" for="cite">{#xhtmlxtras_dlg.attribute_label_cite}</label>:</td>
+						<td><input id="cite" name="cite" type="text" value="" class="field" /></td>
 					</tr>
 				</table>
 			</fieldset>
@@ -46,40 +46,40 @@
 				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
 				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
-						<td  class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 
-						<td><input id="title" name="title" type="text" value="" class="field" /></td> 
+						<td  class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td>
+						<td><input id="title" name="title" type="text" value="" class="field" /></td>
 					</tr>
 					<tr>
-						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 
-						<td><input id="id" name="id" type="text" value="" class="field" /></td> 
+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td>
+						<td><input id="id" name="id" type="text" value="" class="field" /></td>
 					</tr>
 					<tr>
-						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td> 
+						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td>
 						<td>
 							<select id="class" name="class" class="field mceEditableSelect">
-								<option value="">{#not_set}</option> 
+								<option value="">{#not_set}</option>
 							</select>
 						</td>
 					</tr>
 					<tr>
-						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 
-						<td><input id="style" name="style" type="text" value="" class="field" /></td> 
+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td>
+						<td><input id="style" name="style" type="text" value="" class="field" /></td>
 					</tr>
 					<tr>
-						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 
+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td>
 						<td>
-							<select id="dir" name="dir" class="field"> 
-								<option value="">{#not_set}</option> 
-								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option> 
-								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option> 
+							<select id="dir" name="dir" class="field">
+								<option value="">{#not_set}</option>
+								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option>
+								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option>
 							</select>
-						</td> 
+						</td>
 					</tr>
 					<tr>
-						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 
+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td>
 						<td>
 							<input id="lang" name="lang" type="text" value="" class="field" />
-						</td> 
+						</td>
 					</tr>
 				</table>
 			</fieldset>
@@ -90,63 +90,63 @@
 
 				<table role="presentation" border="0" cellpadding="0" cellspacing="4">
 					<tr>
-						<td class="label"><label for="onfocus">onfocus</label>:</td> 
-						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onfocus">onfocus</label>:</td>
+						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onblur">onblur</label>:</td> 
-						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onblur">onblur</label>:</td>
+						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onclick">onclick</label>:</td> 
-						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onclick">onclick</label>:</td>
+						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 
-						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="ondblclick">ondblclick</label>:</td>
+						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 
-						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmousedown">onmousedown</label>:</td>
+						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 
-						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmouseup">onmouseup</label>:</td>
+						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 
-						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmouseover">onmouseover</label>:</td>
+						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 
-						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmousemove">onmousemove</label>:</td>
+						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 
-						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onmouseout">onmouseout</label>:</td>
+						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 
-						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onkeypress">onkeypress</label>:</td>
+						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 
-						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onkeydown">onkeydown</label>:</td>
+						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td>
 					</tr>
 
 					<tr>
-						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
-						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 
+						<td class="label"><label for="onkeyup">onkeyup</label>:</td>
+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td>
 					</tr>
 				</table>
 			</fieldset>
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/js/element_common.js b/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/js/element_common.js
index 6df1b7759..b9337f597 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/js/element_common.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/js/element_common.js
@@ -148,7 +148,7 @@ SXE.initElementDialog = function(element_name) {
 		SXE.updateElement = elm;
 	}
 
-	document.forms[0].insert.value = tinyMCEPopup.getLang(SXE.currentAction, 'Insert', true); 
+	document.forms[0].insert.value = tinyMCEPopup.getLang(SXE.currentAction, 'Insert', true);
 }
 
 SXE.insertElement = function(element_name) {
diff --git a/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js b/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
index c4569f85e..d6968aa36 100644
--- a/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
+++ b/webapp/src/main/webapp/js/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.xhtmlxtras_dlg',{"attribs_title":"Insert/Edit Attributes","option_rtl":"Right to Left","option_ltr":"Left to Right","insert_date":"Insert Current Date/Time",remove:"Remove","title_cite_element":"Citation Element","title_abbr_element":"Abbreviation Element","title_acronym_element":"Acronym Element","title_del_element":"Deletion Element","title_ins_element":"Insertion Element","fieldset_events_tab":"Element Events","fieldset_attrib_tab":"Element Attributes","fieldset_general_tab":"General Settings","events_tab":"Events","attrib_tab":"Attributes","general_tab":"General","attribute_attrib_tab":"Attributes","attribute_events_tab":"Events","attribute_label_accesskey":"AccessKey","attribute_label_tabindex":"TabIndex","attribute_label_langcode":"Language","attribute_option_rtl":"Right to Left","attribute_option_ltr":"Left to Right","attribute_label_langdir":"Text Direction","attribute_label_datetime":"Date/Time","attribute_label_cite":"Cite","attribute_label_style":"Style","attribute_label_class":"Class","attribute_label_id":"ID","attribute_label_title":"Title"});
\ No newline at end of file
+tinyMCE.addI18n('en.xhtmlxtras_dlg',{"attribs_title":"Insert/Edit Attributes","option_rtl":"Right to Left","option_ltr":"Left to Right","insert_date":"Insert Current Date/Time",remove:"Remove","title_cite_element":"Citation Element","title_abbr_element":"Abbreviation Element","title_acronym_element":"Acronym Element","title_del_element":"Deletion Element","title_ins_element":"Insertion Element","fieldset_events_tab":"Element Events","fieldset_attrib_tab":"Element Attributes","fieldset_general_tab":"General Settings","events_tab":"Events","attrib_tab":"Attributes","general_tab":"General","attribute_attrib_tab":"Attributes","attribute_events_tab":"Events","attribute_label_accesskey":"AccessKey","attribute_label_tabindex":"TabIndex","attribute_label_langcode":"Language","attribute_option_rtl":"Right to Left","attribute_option_ltr":"Left to Right","attribute_label_langdir":"Text Direction","attribute_label_datetime":"Date/Time","attribute_label_cite":"Cite","attribute_label_style":"Style","attribute_label_class":"Class","attribute_label_id":"ID","attribute_label_title":"Title"});
diff --git a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/about.htm b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/about.htm
index fe3660371..9b85d0b06 100644
--- a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/about.htm
+++ b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/about.htm
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<title>{#advanced_dlg.about_title}</title>
diff --git a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/charmap.htm b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/charmap.htm
index 12acfe18a..0dee28d20 100644
--- a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/charmap.htm
+++ b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/charmap.htm
@@ -49,7 +49,7 @@
 	<tr>
 		<td colspan="2" id="charmap_usage">{#advanced_dlg.charmap_usage}</td>
 	</tr>
-	
+
 </table>
 </body>
 </html>
diff --git a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/editor_template.js b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/editor_template.js
index 4b8d56375..16a344a38 100644
--- a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/editor_template.js
+++ b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/editor_template.js
@@ -1 +1 @@
-(function(h){var i=h.DOM,g=h.dom.Event,c=h.extend,f=h.each,a=h.util.Cookie,e,d=h.explode;function b(p,m){var k,l,o=p.dom,j="",n,r;previewStyles=p.settings.preview_styles;if(previewStyles===false){return""}if(!previewStyles){previewStyles="font-family font-size font-weight text-decoration text-transform color background-color"}function q(s){return s.replace(/%(\w+)/g,"")}k=m.block||m.inline||"span";l=o.create(k);f(m.styles,function(t,s){t=q(t);if(t){o.setStyle(l,s,t)}});f(m.attributes,function(t,s){t=q(t);if(t){o.setAttrib(l,s,t)}});f(m.classes,function(s){s=q(s);if(!o.hasClass(l,s)){o.addClass(l,s)}});o.setStyles(l,{position:"absolute",left:-65535});p.getBody().appendChild(l);n=o.getStyle(p.getBody(),"fontSize",true);n=/px$/.test(n)?parseInt(n,10):0;f(previewStyles.split(" "),function(s){var t=o.getStyle(l,s,true);if(s=="background-color"&&/transparent|rgba\s*\([^)]+,\s*0\)/.test(t)){t=o.getStyle(p.getBody(),s,true);if(o.toHex(t).toLowerCase()=="#ffffff"){return}}if(s=="font-size"){if(/em|%$/.test(t)){if(n===0){return}t=parseFloat(t,10)/(/%$/.test(t)?100:1);t=(t*n)+"px"}}j+=s+":"+t+";"});o.remove(l);return j}h.ThemeManager.requireLangPack("advanced");h.create("tinymce.themes.AdvancedTheme",{sizes:[8,10,12,14,18,24,36],controls:{bold:["bold_desc","Bold"],italic:["italic_desc","Italic"],underline:["underline_desc","Underline"],strikethrough:["striketrough_desc","Strikethrough"],justifyleft:["justifyleft_desc","JustifyLeft"],justifycenter:["justifycenter_desc","JustifyCenter"],justifyright:["justifyright_desc","JustifyRight"],justifyfull:["justifyfull_desc","JustifyFull"],bullist:["bullist_desc","InsertUnorderedList"],numlist:["numlist_desc","InsertOrderedList"],outdent:["outdent_desc","Outdent"],indent:["indent_desc","Indent"],cut:["cut_desc","Cut"],copy:["copy_desc","Copy"],paste:["paste_desc","Paste"],undo:["undo_desc","Undo"],redo:["redo_desc","Redo"],link:["link_desc","mceLink"],unlink:["unlink_desc","unlink"],image:["image_desc","mceImage"],cleanup:["cleanup_desc","mceCleanup"],help:["help_desc","mceHelp"],code:["code_desc","mceCodeEditor"],hr:["hr_desc","InsertHorizontalRule"],removeformat:["removeformat_desc","RemoveFormat"],sub:["sub_desc","subscript"],sup:["sup_desc","superscript"],forecolor:["forecolor_desc","ForeColor"],forecolorpicker:["forecolor_desc","mceForeColor"],backcolor:["backcolor_desc","HiliteColor"],backcolorpicker:["backcolor_desc","mceBackColor"],charmap:["charmap_desc","mceCharMap"],visualaid:["visualaid_desc","mceToggleVisualAid"],anchor:["anchor_desc","mceInsertAnchor"],newdocument:["newdocument_desc","mceNewDocument"],blockquote:["blockquote_desc","mceBlockQuote"]},stateControls:["bold","italic","underline","strikethrough","bullist","numlist","justifyleft","justifycenter","justifyright","justifyfull","sub","sup","blockquote"],init:function(k,l){var m=this,n,j,p;m.editor=k;m.url=l;m.onResolveName=new h.util.Dispatcher(this);n=k.settings;k.forcedHighContrastMode=k.settings.detect_highcontrast&&m._isHighContrast();k.settings.skin=k.forcedHighContrastMode?"highcontrast":k.settings.skin;if(!n.theme_advanced_buttons1){n=c({theme_advanced_buttons1:"bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",theme_advanced_buttons2:"bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",theme_advanced_buttons3:"hr,removeformat,visualaid,|,sub,sup,|,charmap"},n)}m.settings=n=c({theme_advanced_path:true,theme_advanced_toolbar_location:"top",theme_advanced_blockformats:"p,address,pre,h1,h2,h3,h4,h5,h6",theme_advanced_toolbar_align:"left",theme_advanced_statusbar_location:"bottom",theme_advanced_fonts:"Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",theme_advanced_more_colors:1,theme_advanced_row_height:23,theme_advanced_resize_horizontal:1,theme_advanced_resizing_use_cookie:1,theme_advanced_font_sizes:"1,2,3,4,5,6,7",theme_advanced_font_selector:"span",theme_advanced_show_current_color:0,readonly:k.settings.readonly},n);if(!n.font_size_style_values){n.font_size_style_values="8pt,10pt,12pt,14pt,18pt,24pt,36pt"}if(h.is(n.theme_advanced_font_sizes,"string")){n.font_size_style_values=h.explode(n.font_size_style_values);n.font_size_classes=h.explode(n.font_size_classes||"");p={};k.settings.theme_advanced_font_sizes=n.theme_advanced_font_sizes;f(k.getParam("theme_advanced_font_sizes","","hash"),function(r,q){var o;if(q==r&&r>=1&&r<=7){q=r+" ("+m.sizes[r-1]+"pt)";o=n.font_size_classes[r-1];r=n.font_size_style_values[r-1]||(m.sizes[r-1]+"pt")}if(/^\s*\./.test(r)){o=r.replace(/\./g,"")}p[q]=o?{"class":o}:{fontSize:r}});n.theme_advanced_font_sizes=p}if((j=n.theme_advanced_path_location)&&j!="none"){n.theme_advanced_statusbar_location=n.theme_advanced_path_location}if(n.theme_advanced_statusbar_location=="none"){n.theme_advanced_statusbar_location=0}if(k.settings.content_css!==false){k.contentCSS.push(k.baseURI.toAbsolute(l+"/skins/"+k.settings.skin+"/content.css"))}k.onInit.add(function(){if(!k.settings.readonly){k.onNodeChange.add(m._nodeChanged,m);k.onKeyUp.add(m._updateUndoStatus,m);k.onMouseUp.add(m._updateUndoStatus,m);k.dom.bind(k.dom.getRoot(),"dragend",function(){m._updateUndoStatus(k)})}});k.onSetProgressState.add(function(r,o,s){var t,u=r.id,q;if(o){m.progressTimer=setTimeout(function(){t=r.getContainer();t=t.insertBefore(i.create("DIV",{style:"position:relative"}),t.firstChild);q=i.get(r.id+"_tbl");i.add(t,"div",{id:u+"_blocker","class":"mceBlocker",style:{width:q.clientWidth+2,height:q.clientHeight+2}});i.add(t,"div",{id:u+"_progress","class":"mceProgress",style:{left:q.clientWidth/2,top:q.clientHeight/2}})},s||0)}else{i.remove(u+"_blocker");i.remove(u+"_progress");clearTimeout(m.progressTimer)}});i.loadCSS(n.editor_css?k.documentBaseURI.toAbsolute(n.editor_css):l+"/skins/"+k.settings.skin+"/ui.css");if(n.skin_variant){i.loadCSS(l+"/skins/"+k.settings.skin+"/ui_"+n.skin_variant+".css")}},_isHighContrast:function(){var j,k=i.add(i.getRoot(),"div",{style:"background-color: rgb(171,239,86);"});j=(i.getStyle(k,"background-color",true)+"").toLowerCase().replace(/ /g,"");i.remove(k);return j!="rgb(171,239,86)"&&j!="#abef56"},createControl:function(m,j){var k,l;if(l=j.createControl(m)){return l}switch(m){case"styleselect":return this._createStyleSelect();case"formatselect":return this._createBlockFormats();case"fontselect":return this._createFontSelect();case"fontsizeselect":return this._createFontSizeSelect();case"forecolor":return this._createForeColorMenu();case"backcolor":return this._createBackColorMenu()}if((k=this.controls[m])){return j.createButton(m,{title:"advanced."+k[0],cmd:k[1],ui:k[2],value:k[3]})}},execCommand:function(l,k,m){var j=this["_"+l];if(j){j.call(this,k,m);return true}return false},_importClasses:function(l){var j=this.editor,k=j.controlManager.get("styleselect");if(k.getLength()==0){f(j.dom.getClasses(),function(q,m){var p="style_"+m,n;n={inline:"span",attributes:{"class":q["class"]},selector:"*"};j.formatter.register(p,n);k.add(q["class"],p,{style:function(){return b(j,n)}})})}},_createStyleSelect:function(o){var l=this,j=l.editor,k=j.controlManager,m;m=k.createListBox("styleselect",{title:"advanced.style_select",onselect:function(q){var r,n=[],p;f(m.items,function(s){n.push(s.value)});j.focus();j.undoManager.add();r=j.formatter.matchAll(n);h.each(r,function(s){if(!q||s==q){if(s){j.formatter.remove(s)}p=true}});if(!p){j.formatter.apply(q)}j.undoManager.add();j.nodeChanged();return false}});j.onPreInit.add(function(){var p=0,n=j.getParam("style_formats");if(n){f(n,function(q){var r,s=0;f(q,function(){s++});if(s>1){r=q.name=q.name||"style_"+(p++);j.formatter.register(r,q);m.add(q.title,r,{style:function(){return b(j,q)}})}else{m.add(q.title)}})}else{f(j.getParam("theme_advanced_styles","","hash"),function(t,s){var r,q;if(t){r="style_"+(p++);q={inline:"span",classes:t,selector:"*"};j.formatter.register(r,q);m.add(l.editor.translate(s),r,{style:function(){return b(j,q)}})}})}});if(m.getLength()==0){m.onPostRender.add(function(p,q){if(!m.NativeListBox){g.add(q.id+"_text","focus",l._importClasses,l);g.add(q.id+"_text","mousedown",l._importClasses,l);g.add(q.id+"_open","focus",l._importClasses,l);g.add(q.id+"_open","mousedown",l._importClasses,l)}else{g.add(q.id,"focus",l._importClasses,l)}})}return m},_createFontSelect:function(){var l,k=this,j=k.editor;l=j.controlManager.createListBox("fontselect",{title:"advanced.fontdefault",onselect:function(m){var n=l.items[l.selectedIndex];if(!m&&n){j.execCommand("FontName",false,n.value);return}j.execCommand("FontName",false,m);l.select(function(o){return m==o});if(n&&n.value==m){l.select(null)}return false}});if(l){f(j.getParam("theme_advanced_fonts",k.settings.theme_advanced_fonts,"hash"),function(n,m){l.add(j.translate(m),n,{style:n.indexOf("dings")==-1?"font-family:"+n:""})})}return l},_createFontSizeSelect:function(){var m=this,k=m.editor,n,l=0,j=[];n=k.controlManager.createListBox("fontsizeselect",{title:"advanced.font_size",onselect:function(o){var p=n.items[n.selectedIndex];if(!o&&p){p=p.value;if(p["class"]){k.formatter.toggle("fontsize_class",{value:p["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,p.fontSize)}return}if(o["class"]){k.focus();k.undoManager.add();k.formatter.toggle("fontsize_class",{value:o["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,o.fontSize)}n.select(function(q){return o==q});if(p&&(p.value.fontSize==o.fontSize||p.value["class"]&&p.value["class"]==o["class"])){n.select(null)}return false}});if(n){f(m.settings.theme_advanced_font_sizes,function(p,o){var q=p.fontSize;if(q>=1&&q<=7){q=m.sizes[parseInt(q)-1]+"pt"}n.add(o,p,{style:"font-size:"+q,"class":"mceFontSize"+(l++)+(" "+(p["class"]||""))})})}return n},_createBlockFormats:function(){var l,j={p:"advanced.paragraph",address:"advanced.address",pre:"advanced.pre",h1:"advanced.h1",h2:"advanced.h2",h3:"advanced.h3",h4:"advanced.h4",h5:"advanced.h5",h6:"advanced.h6",div:"advanced.div",blockquote:"advanced.blockquote",code:"advanced.code",dt:"advanced.dt",dd:"advanced.dd",samp:"advanced.samp"},k=this;l=k.editor.controlManager.createListBox("formatselect",{title:"advanced.block",onselect:function(m){k.editor.execCommand("FormatBlock",false,m);return false}});if(l){f(k.editor.getParam("theme_advanced_blockformats",k.settings.theme_advanced_blockformats,"hash"),function(n,m){l.add(k.editor.translate(m!=n?m:j[n]),n,{"class":"mce_formatPreview mce_"+n,style:function(){return b(k.editor,{block:n})}})})}return l},_createForeColorMenu:function(){var n,k=this,l=k.settings,m={},j;if(l.theme_advanced_more_colors){m.more_colors_func=function(){k._mceColorPicker(0,{color:n.value,func:function(o){n.setColor(o)}})}}if(j=l.theme_advanced_text_colors){m.colors=j}if(l.theme_advanced_default_foreground_color){m.default_color=l.theme_advanced_default_foreground_color}m.title="advanced.forecolor_desc";m.cmd="ForeColor";m.scope=this;n=k.editor.controlManager.createColorSplitButton("forecolor",m);return n},_createBackColorMenu:function(){var n,k=this,l=k.settings,m={},j;if(l.theme_advanced_more_colors){m.more_colors_func=function(){k._mceColorPicker(0,{color:n.value,func:function(o){n.setColor(o)}})}}if(j=l.theme_advanced_background_colors){m.colors=j}if(l.theme_advanced_default_background_color){m.default_color=l.theme_advanced_default_background_color}m.title="advanced.backcolor_desc";m.cmd="HiliteColor";m.scope=this;n=k.editor.controlManager.createColorSplitButton("backcolor",m);return n},renderUI:function(l){var q,m,r,w=this,u=w.editor,x=w.settings,v,k,j;if(u.settings){u.settings.aria_label=x.aria_label+u.getLang("advanced.help_shortcut")}q=k=i.create("span",{role:"application","aria-labelledby":u.id+"_voice",id:u.id+"_parent","class":"mceEditor "+u.settings.skin+"Skin"+(x.skin_variant?" "+u.settings.skin+"Skin"+w._ufirst(x.skin_variant):"")+(u.settings.directionality=="rtl"?" mceRtl":"")});i.add(q,"span",{"class":"mceVoiceLabel",style:"display:none;",id:u.id+"_voice"},x.aria_label);if(!i.boxModel){q=i.add(q,"div",{"class":"mceOldBoxModel"})}q=v=i.add(q,"table",{role:"presentation",id:u.id+"_tbl","class":"mceLayout",cellSpacing:0,cellPadding:0});q=r=i.add(q,"tbody");switch((x.theme_advanced_layout_manager||"").toLowerCase()){case"rowlayout":m=w._rowLayout(x,r,l);break;case"customlayout":m=u.execCallback("theme_advanced_custom_layout",x,r,l,k);break;default:m=w._simpleLayout(x,r,l,k)}q=l.targetNode;j=v.rows;i.addClass(j[0],"mceFirst");i.addClass(j[j.length-1],"mceLast");f(i.select("tr",r),function(o){i.addClass(o.firstChild,"mceFirst");i.addClass(o.childNodes[o.childNodes.length-1],"mceLast")});if(i.get(x.theme_advanced_toolbar_container)){i.get(x.theme_advanced_toolbar_container).appendChild(k)}else{i.insertAfter(k,q)}g.add(u.id+"_path_row","click",function(n){n=n.target;if(n.nodeName=="A"){w._sel(n.className.replace(/^.*mcePath_([0-9]+).*$/,"$1"));return false}});if(!u.getParam("accessibility_focus")){g.add(i.add(k,"a",{href:"#"},"<!-- IE -->"),"focus",function(){tinyMCE.get(u.id).focus()})}if(x.theme_advanced_toolbar_location=="external"){l.deltaHeight=0}w.deltaHeight=l.deltaHeight;l.targetNode=null;u.onKeyDown.add(function(p,n){var s=121,o=122;if(n.altKey){if(n.keyCode===s){if(h.isWebKit){window.focus()}w.toolbarGroup.focus();return g.cancel(n)}else{if(n.keyCode===o){i.get(p.id+"_path_row").focus();return g.cancel(n)}}}});u.addShortcut("alt+0","","mceShortcuts",w);return{iframeContainer:m,editorContainer:u.id+"_parent",sizeContainer:v,deltaHeight:l.deltaHeight}},getInfo:function(){return{longname:"Advanced theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:h.majorVersion+"."+h.minorVersion}},resizeBy:function(j,k){var l=i.get(this.editor.id+"_ifr");this.resizeTo(l.clientWidth+j,l.clientHeight+k)},resizeTo:function(j,n,l){var k=this.editor,m=this.settings,o=i.get(k.id+"_tbl"),p=i.get(k.id+"_ifr");j=Math.max(m.theme_advanced_resizing_min_width||100,j);n=Math.max(m.theme_advanced_resizing_min_height||100,n);j=Math.min(m.theme_advanced_resizing_max_width||65535,j);n=Math.min(m.theme_advanced_resizing_max_height||65535,n);i.setStyle(o,"height","");i.setStyle(p,"height",n);if(m.theme_advanced_resize_horizontal){i.setStyle(o,"width","");i.setStyle(p,"width",j);if(j<o.clientWidth){j=o.clientWidth;i.setStyle(p,"width",o.clientWidth)}}if(l&&m.theme_advanced_resizing_use_cookie){a.setHash("TinyMCE_"+k.id+"_size",{cw:j,ch:n})}},destroy:function(){var j=this.editor.id;g.clear(j+"_resize");g.clear(j+"_path_row");g.clear(j+"_external_close")},_simpleLayout:function(z,u,l,j){var y=this,v=y.editor,w=z.theme_advanced_toolbar_location,q=z.theme_advanced_statusbar_location,m,k,r,x;if(z.readonly){m=i.add(u,"tr");m=k=i.add(m,"td",{"class":"mceIframeContainer"});return k}if(w=="top"){y._addToolbars(u,l)}if(w=="external"){m=x=i.create("div",{style:"position:relative"});m=i.add(m,"div",{id:v.id+"_external","class":"mceExternalToolbar"});i.add(m,"a",{id:v.id+"_external_close",href:"javascript:;","class":"mceExternalClose"});m=i.add(m,"table",{id:v.id+"_tblext",cellSpacing:0,cellPadding:0});r=i.add(m,"tbody");if(j.firstChild.className=="mceOldBoxModel"){j.firstChild.appendChild(x)}else{j.insertBefore(x,j.firstChild)}y._addToolbars(r,l);v.onMouseUp.add(function(){var o=i.get(v.id+"_external");i.show(o);i.hide(e);var n=g.add(v.id+"_external_close","click",function(){i.hide(v.id+"_external");g.remove(v.id+"_external_close","click",n);return false});i.show(o);i.setStyle(o,"top",0-i.getRect(v.id+"_tblext").h-1);i.hide(o);i.show(o);o.style.filter="";e=v.id+"_external";o=null})}if(q=="top"){y._addStatusBar(u,l)}if(!z.theme_advanced_toolbar_container){m=i.add(u,"tr");m=k=i.add(m,"td",{"class":"mceIframeContainer"})}if(w=="bottom"){y._addToolbars(u,l)}if(q=="bottom"){y._addStatusBar(u,l)}return k},_rowLayout:function(x,p,l){var w=this,q=w.editor,v,y,j=q.controlManager,m,k,u,r;v=x.theme_advanced_containers_default_class||"";y=x.theme_advanced_containers_default_align||"center";f(d(x.theme_advanced_containers||""),function(s,o){var n=x["theme_advanced_container_"+s]||"";switch(s.toLowerCase()){case"mceeditor":m=i.add(p,"tr");m=k=i.add(m,"td",{"class":"mceIframeContainer"});break;case"mceelementpath":w._addStatusBar(p,l);break;default:r=(x["theme_advanced_container_"+s+"_align"]||y).toLowerCase();r="mce"+w._ufirst(r);m=i.add(i.add(p,"tr"),"td",{"class":"mceToolbar "+(x["theme_advanced_container_"+s+"_class"]||v)+" "+r||y});u=j.createToolbar("toolbar"+o);w._addControls(n,u);i.setHTML(m,u.renderHTML());l.deltaHeight-=x.theme_advanced_row_height}});return k},_addControls:function(k,j){var l=this,m=l.settings,n,o=l.editor.controlManager;if(m.theme_advanced_disable&&!l._disabled){n={};f(d(m.theme_advanced_disable),function(p){n[p]=1});l._disabled=n}else{n=l._disabled}f(d(k),function(q){var p;if(n&&n[q]){return}if(q=="tablecontrols"){f(["table","|","row_props","cell_props","|","row_before","row_after","delete_row","|","col_before","col_after","delete_col","|","split_cells","merge_cells"],function(r){r=l.createControl(r,o);if(r){j.add(r)}});return}p=l.createControl(q,o);if(p){j.add(p)}})},_addToolbars:function(y,k){var B=this,q,p,u=B.editor,C=B.settings,A,j=u.controlManager,w,l,r=[],z,x,m=false;x=j.createToolbarGroup("toolbargroup",{name:u.getLang("advanced.toolbar"),tab_focus_toolbar:u.getParam("theme_advanced_tab_focus_toolbar")});B.toolbarGroup=x;z=C.theme_advanced_toolbar_align.toLowerCase();z="mce"+B._ufirst(z);l=i.add(i.add(y,"tr",{role:"presentation"}),"td",{"class":"mceToolbar "+z,role:"toolbar"});for(q=1;(A=C["theme_advanced_buttons"+q]);q++){m=true;p=j.createToolbar("toolbar"+q,{"class":"mceToolbarRow"+q});if(C["theme_advanced_buttons"+q+"_add"]){A+=","+C["theme_advanced_buttons"+q+"_add"]}if(C["theme_advanced_buttons"+q+"_add_before"]){A=C["theme_advanced_buttons"+q+"_add_before"]+","+A}B._addControls(A,p);x.add(p);k.deltaHeight-=C.theme_advanced_row_height}if(!m){k.deltaHeight-=C.theme_advanced_row_height}r.push(x.renderHTML());r.push(i.createHTML("a",{href:"#",accesskey:"z",title:u.getLang("advanced.toolbar_focus"),onfocus:"tinyMCE.getInstanceById('"+u.id+"').focus();"},"<!-- IE -->"));i.setHTML(l,r.join(""))},_addStatusBar:function(p,k){var l,w=this,q=w.editor,x=w.settings,j,u,v,m;l=i.add(p,"tr");l=m=i.add(l,"td",{"class":"mceStatusbar"});l=i.add(l,"div",{id:q.id+"_path_row",role:"group","aria-labelledby":q.id+"_path_voice"});if(x.theme_advanced_path){i.add(l,"span",{id:q.id+"_path_voice"},q.translate("advanced.path"));i.add(l,"span",{},": ")}else{i.add(l,"span",{},"&#160;")}if(x.theme_advanced_resizing){i.add(m,"a",{id:q.id+"_resize",href:"javascript:;",onclick:"return false;","class":"mceResize",tabIndex:"-1"});if(x.theme_advanced_resizing_use_cookie){q.onPostRender.add(function(){var n=a.getHash("TinyMCE_"+q.id+"_size"),r=i.get(q.id+"_tbl");if(!n){return}w.resizeTo(n.cw,n.ch)})}q.onPostRender.add(function(){g.add(q.id+"_resize","click",function(n){n.preventDefault()});g.add(q.id+"_resize","mousedown",function(E){var t,r,s,o,D,A,B,G,n,F,y;function z(H){H.preventDefault();n=B+(H.screenX-D);F=G+(H.screenY-A);w.resizeTo(n,F)}function C(H){g.remove(i.doc,"mousemove",t);g.remove(q.getDoc(),"mousemove",r);g.remove(i.doc,"mouseup",s);g.remove(q.getDoc(),"mouseup",o);n=B+(H.screenX-D);F=G+(H.screenY-A);w.resizeTo(n,F,true);q.nodeChanged()}E.preventDefault();D=E.screenX;A=E.screenY;y=i.get(w.editor.id+"_ifr");B=n=y.clientWidth;G=F=y.clientHeight;t=g.add(i.doc,"mousemove",z);r=g.add(q.getDoc(),"mousemove",z);s=g.add(i.doc,"mouseup",C);o=g.add(q.getDoc(),"mouseup",C)})})}k.deltaHeight-=21;l=p=null},_updateUndoStatus:function(k){var j=k.controlManager,l=k.undoManager;j.setDisabled("undo",!l.hasUndo()&&!l.typing);j.setDisabled("redo",!l.hasRedo())},_nodeChanged:function(o,u,E,r,F){var z=this,D,G=0,y,H,A=z.settings,x,l,w,C,m,k,j;h.each(z.stateControls,function(n){u.setActive(n,o.queryCommandState(z.controls[n][1]))});function q(p){var s,n=F.parents,t=p;if(typeof(p)=="string"){t=function(v){return v.nodeName==p}}for(s=0;s<n.length;s++){if(t(n[s])){return n[s]}}}u.setActive("visualaid",o.hasVisual);z._updateUndoStatus(o);u.setDisabled("outdent",!o.queryCommandState("Outdent"));D=q("A");if(H=u.get("link")){H.setDisabled((!D&&r)||(D&&!D.href));H.setActive(!!D&&(!D.name&&!D.id))}if(H=u.get("unlink")){H.setDisabled(!D&&r);H.setActive(!!D&&!D.name&&!D.id)}if(H=u.get("anchor")){H.setActive(!r&&!!D&&(D.name||(D.id&&!D.href)))}D=q("IMG");if(H=u.get("image")){H.setActive(!r&&!!D&&E.className.indexOf("mceItem")==-1)}if(H=u.get("styleselect")){z._importClasses();k=[];f(H.items,function(n){k.push(n.value)});j=o.formatter.matchAll(k);H.select(j[0]);h.each(j,function(p,n){if(n>0){H.mark(p)}})}if(H=u.get("formatselect")){D=q(o.dom.isBlock);if(D){H.select(D.nodeName.toLowerCase())}}q(function(p){if(p.nodeName==="SPAN"){if(!x&&p.className){x=p.className}}if(o.dom.is(p,A.theme_advanced_font_selector)){if(!l&&p.style.fontSize){l=p.style.fontSize}if(!w&&p.style.fontFamily){w=p.style.fontFamily.replace(/[\"\']+/g,"").replace(/^([^,]+).*/,"$1").toLowerCase()}if(!C&&p.style.color){C=p.style.color}if(!m&&p.style.backgroundColor){m=p.style.backgroundColor}}return false});if(H=u.get("fontselect")){H.select(function(n){return n.replace(/^([^,]+).*/,"$1").toLowerCase()==w})}if(H=u.get("fontsizeselect")){if(A.theme_advanced_runtime_fontsize&&!l&&!x){l=o.dom.getStyle(E,"fontSize",true)}H.select(function(n){if(n.fontSize&&n.fontSize===l){return true}if(n["class"]&&n["class"]===x){return true}})}if(A.theme_advanced_show_current_color){function B(p,n){if(H=u.get(p)){if(!n){n=H.settings.default_color}if(n!==H.value){H.displayColor(n)}}}B("forecolor",C);B("backcolor",m)}if(A.theme_advanced_show_current_color){function B(p,n){if(H=u.get(p)){if(!n){n=H.settings.default_color}if(n!==H.value){H.displayColor(n)}}}B("forecolor",C);B("backcolor",m)}if(A.theme_advanced_path&&A.theme_advanced_statusbar_location){D=i.get(o.id+"_path")||i.add(o.id+"_path_row","span",{id:o.id+"_path"});if(z.statusKeyboardNavigation){z.statusKeyboardNavigation.destroy();z.statusKeyboardNavigation=null}i.setHTML(D,"");q(function(I){var p=I.nodeName.toLowerCase(),s,v,t="";if(I.nodeType!=1||p==="br"||I.getAttribute("data-mce-bogus")||i.hasClass(I,"mceItemHidden")||i.hasClass(I,"mceItemRemoved")){return}if(h.isIE&&I.scopeName!=="HTML"&&I.scopeName){p=I.scopeName+":"+p}p=p.replace(/mce\:/g,"");switch(p){case"b":p="strong";break;case"i":p="em";break;case"img":if(y=i.getAttrib(I,"src")){t+="src: "+y+" "}break;case"a":if(y=i.getAttrib(I,"name")){t+="name: "+y+" ";p+="#"+y}if(y=i.getAttrib(I,"href")){t+="href: "+y+" "}break;case"font":if(y=i.getAttrib(I,"face")){t+="font: "+y+" "}if(y=i.getAttrib(I,"size")){t+="size: "+y+" "}if(y=i.getAttrib(I,"color")){t+="color: "+y+" "}break;case"span":if(y=i.getAttrib(I,"style")){t+="style: "+y+" "}break}if(y=i.getAttrib(I,"id")){t+="id: "+y+" "}if(y=I.className){y=y.replace(/\b\s*(webkit|mce|Apple-)\w+\s*\b/g,"");if(y){t+="class: "+y+" ";if(o.dom.isBlock(I)||p=="img"||p=="span"){p+="."+y}}}p=p.replace(/(html:)/g,"");p={name:p,node:I,title:t};z.onResolveName.dispatch(z,p);t=p.title;p=p.name;v=i.create("a",{href:"javascript:;",role:"button",onmousedown:"return false;",title:t,"class":"mcePath_"+(G++)},p);if(D.hasChildNodes()){D.insertBefore(i.create("span",{"aria-hidden":"true"},"\u00a0\u00bb "),D.firstChild);D.insertBefore(v,D.firstChild)}else{D.appendChild(v)}},o.getBody());if(i.select("a",D).length>0){z.statusKeyboardNavigation=new h.ui.KeyboardNavigation({root:o.id+"_path_row",items:i.select("a",D),excludeFromTabOrder:true,onCancel:function(){o.focus()}},i)}}},_sel:function(j){this.editor.execCommand("mceSelectNodeDepth",false,j)},_mceInsertAnchor:function(l,k){var j=this.editor;j.windowManager.open({url:this.url+"/anchor.htm",width:320+parseInt(j.getLang("advanced.anchor_delta_width",0)),height:90+parseInt(j.getLang("advanced.anchor_delta_height",0)),inline:true},{theme_url:this.url})},_mceCharMap:function(){var j=this.editor;j.windowManager.open({url:this.url+"/charmap.htm",width:550+parseInt(j.getLang("advanced.charmap_delta_width",0)),height:265+parseInt(j.getLang("advanced.charmap_delta_height",0)),inline:true},{theme_url:this.url})},_mceHelp:function(){var j=this.editor;j.windowManager.open({url:this.url+"/about.htm",width:480,height:380,inline:true},{theme_url:this.url})},_mceShortcuts:function(){var j=this.editor;j.windowManager.open({url:this.url+"/shortcuts.htm",width:480,height:380,inline:true},{theme_url:this.url})},_mceColorPicker:function(l,k){var j=this.editor;k=k||{};j.windowManager.open({url:this.url+"/color_picker.htm",width:375+parseInt(j.getLang("advanced.colorpicker_delta_width",0)),height:250+parseInt(j.getLang("advanced.colorpicker_delta_height",0)),close_previous:false,inline:true},{input_color:k.color,func:k.func,theme_url:this.url})},_mceCodeEditor:function(k,l){var j=this.editor;j.windowManager.open({url:this.url+"/source_editor.htm",width:parseInt(j.getParam("theme_advanced_source_editor_width",720)),height:parseInt(j.getParam("theme_advanced_source_editor_height",580)),inline:true,resizable:true,maximizable:true},{theme_url:this.url})},_mceImage:function(k,l){var j=this.editor;if(j.dom.getAttrib(j.selection.getNode(),"class","").indexOf("mceItem")!=-1){return}j.windowManager.open({url:this.url+"/image.htm",width:355+parseInt(j.getLang("advanced.image_delta_width",0)),height:275+parseInt(j.getLang("advanced.image_delta_height",0)),inline:true},{theme_url:this.url})},_mceLink:function(k,l){var j=this.editor;j.windowManager.open({url:this.url+"/link.htm",width:310+parseInt(j.getLang("advanced.link_delta_width",0)),height:200+parseInt(j.getLang("advanced.link_delta_height",0)),inline:true},{theme_url:this.url})},_mceNewDocument:function(){var j=this.editor;j.windowManager.confirm("advanced.newdocument",function(k){if(k){j.execCommand("mceSetContent",false,"")}})},_mceForeColor:function(){var j=this;this._mceColorPicker(0,{color:j.fgColor,func:function(k){j.fgColor=k;j.editor.execCommand("ForeColor",false,k)}})},_mceBackColor:function(){var j=this;this._mceColorPicker(0,{color:j.bgColor,func:function(k){j.bgColor=k;j.editor.execCommand("HiliteColor",false,k)}})},_ufirst:function(j){return j.substring(0,1).toUpperCase()+j.substring(1)}});h.ThemeManager.add("advanced",h.themes.AdvancedTheme)}(tinymce));
\ No newline at end of file
+(function(h){var i=h.DOM,g=h.dom.Event,c=h.extend,f=h.each,a=h.util.Cookie,e,d=h.explode;function b(p,m){var k,l,o=p.dom,j="",n,r;previewStyles=p.settings.preview_styles;if(previewStyles===false){return""}if(!previewStyles){previewStyles="font-family font-size font-weight text-decoration text-transform color background-color"}function q(s){return s.replace(/%(\w+)/g,"")}k=m.block||m.inline||"span";l=o.create(k);f(m.styles,function(t,s){t=q(t);if(t){o.setStyle(l,s,t)}});f(m.attributes,function(t,s){t=q(t);if(t){o.setAttrib(l,s,t)}});f(m.classes,function(s){s=q(s);if(!o.hasClass(l,s)){o.addClass(l,s)}});o.setStyles(l,{position:"absolute",left:-65535});p.getBody().appendChild(l);n=o.getStyle(p.getBody(),"fontSize",true);n=/px$/.test(n)?parseInt(n,10):0;f(previewStyles.split(" "),function(s){var t=o.getStyle(l,s,true);if(s=="background-color"&&/transparent|rgba\s*\([^)]+,\s*0\)/.test(t)){t=o.getStyle(p.getBody(),s,true);if(o.toHex(t).toLowerCase()=="#ffffff"){return}}if(s=="font-size"){if(/em|%$/.test(t)){if(n===0){return}t=parseFloat(t,10)/(/%$/.test(t)?100:1);t=(t*n)+"px"}}j+=s+":"+t+";"});o.remove(l);return j}h.ThemeManager.requireLangPack("advanced");h.create("tinymce.themes.AdvancedTheme",{sizes:[8,10,12,14,18,24,36],controls:{bold:["bold_desc","Bold"],italic:["italic_desc","Italic"],underline:["underline_desc","Underline"],strikethrough:["striketrough_desc","Strikethrough"],justifyleft:["justifyleft_desc","JustifyLeft"],justifycenter:["justifycenter_desc","JustifyCenter"],justifyright:["justifyright_desc","JustifyRight"],justifyfull:["justifyfull_desc","JustifyFull"],bullist:["bullist_desc","InsertUnorderedList"],numlist:["numlist_desc","InsertOrderedList"],outdent:["outdent_desc","Outdent"],indent:["indent_desc","Indent"],cut:["cut_desc","Cut"],copy:["copy_desc","Copy"],paste:["paste_desc","Paste"],undo:["undo_desc","Undo"],redo:["redo_desc","Redo"],link:["link_desc","mceLink"],unlink:["unlink_desc","unlink"],image:["image_desc","mceImage"],cleanup:["cleanup_desc","mceCleanup"],help:["help_desc","mceHelp"],code:["code_desc","mceCodeEditor"],hr:["hr_desc","InsertHorizontalRule"],removeformat:["removeformat_desc","RemoveFormat"],sub:["sub_desc","subscript"],sup:["sup_desc","superscript"],forecolor:["forecolor_desc","ForeColor"],forecolorpicker:["forecolor_desc","mceForeColor"],backcolor:["backcolor_desc","HiliteColor"],backcolorpicker:["backcolor_desc","mceBackColor"],charmap:["charmap_desc","mceCharMap"],visualaid:["visualaid_desc","mceToggleVisualAid"],anchor:["anchor_desc","mceInsertAnchor"],newdocument:["newdocument_desc","mceNewDocument"],blockquote:["blockquote_desc","mceBlockQuote"]},stateControls:["bold","italic","underline","strikethrough","bullist","numlist","justifyleft","justifycenter","justifyright","justifyfull","sub","sup","blockquote"],init:function(k,l){var m=this,n,j,p;m.editor=k;m.url=l;m.onResolveName=new h.util.Dispatcher(this);n=k.settings;k.forcedHighContrastMode=k.settings.detect_highcontrast&&m._isHighContrast();k.settings.skin=k.forcedHighContrastMode?"highcontrast":k.settings.skin;if(!n.theme_advanced_buttons1){n=c({theme_advanced_buttons1:"bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",theme_advanced_buttons2:"bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",theme_advanced_buttons3:"hr,removeformat,visualaid,|,sub,sup,|,charmap"},n)}m.settings=n=c({theme_advanced_path:true,theme_advanced_toolbar_location:"top",theme_advanced_blockformats:"p,address,pre,h1,h2,h3,h4,h5,h6",theme_advanced_toolbar_align:"left",theme_advanced_statusbar_location:"bottom",theme_advanced_fonts:"Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",theme_advanced_more_colors:1,theme_advanced_row_height:23,theme_advanced_resize_horizontal:1,theme_advanced_resizing_use_cookie:1,theme_advanced_font_sizes:"1,2,3,4,5,6,7",theme_advanced_font_selector:"span",theme_advanced_show_current_color:0,readonly:k.settings.readonly},n);if(!n.font_size_style_values){n.font_size_style_values="8pt,10pt,12pt,14pt,18pt,24pt,36pt"}if(h.is(n.theme_advanced_font_sizes,"string")){n.font_size_style_values=h.explode(n.font_size_style_values);n.font_size_classes=h.explode(n.font_size_classes||"");p={};k.settings.theme_advanced_font_sizes=n.theme_advanced_font_sizes;f(k.getParam("theme_advanced_font_sizes","","hash"),function(r,q){var o;if(q==r&&r>=1&&r<=7){q=r+" ("+m.sizes[r-1]+"pt)";o=n.font_size_classes[r-1];r=n.font_size_style_values[r-1]||(m.sizes[r-1]+"pt")}if(/^\s*\./.test(r)){o=r.replace(/\./g,"")}p[q]=o?{"class":o}:{fontSize:r}});n.theme_advanced_font_sizes=p}if((j=n.theme_advanced_path_location)&&j!="none"){n.theme_advanced_statusbar_location=n.theme_advanced_path_location}if(n.theme_advanced_statusbar_location=="none"){n.theme_advanced_statusbar_location=0}if(k.settings.content_css!==false){k.contentCSS.push(k.baseURI.toAbsolute(l+"/skins/"+k.settings.skin+"/content.css"))}k.onInit.add(function(){if(!k.settings.readonly){k.onNodeChange.add(m._nodeChanged,m);k.onKeyUp.add(m._updateUndoStatus,m);k.onMouseUp.add(m._updateUndoStatus,m);k.dom.bind(k.dom.getRoot(),"dragend",function(){m._updateUndoStatus(k)})}});k.onSetProgressState.add(function(r,o,s){var t,u=r.id,q;if(o){m.progressTimer=setTimeout(function(){t=r.getContainer();t=t.insertBefore(i.create("DIV",{style:"position:relative"}),t.firstChild);q=i.get(r.id+"_tbl");i.add(t,"div",{id:u+"_blocker","class":"mceBlocker",style:{width:q.clientWidth+2,height:q.clientHeight+2}});i.add(t,"div",{id:u+"_progress","class":"mceProgress",style:{left:q.clientWidth/2,top:q.clientHeight/2}})},s||0)}else{i.remove(u+"_blocker");i.remove(u+"_progress");clearTimeout(m.progressTimer)}});i.loadCSS(n.editor_css?k.documentBaseURI.toAbsolute(n.editor_css):l+"/skins/"+k.settings.skin+"/ui.css");if(n.skin_variant){i.loadCSS(l+"/skins/"+k.settings.skin+"/ui_"+n.skin_variant+".css")}},_isHighContrast:function(){var j,k=i.add(i.getRoot(),"div",{style:"background-color: rgb(171,239,86);"});j=(i.getStyle(k,"background-color",true)+"").toLowerCase().replace(/ /g,"");i.remove(k);return j!="rgb(171,239,86)"&&j!="#abef56"},createControl:function(m,j){var k,l;if(l=j.createControl(m)){return l}switch(m){case"styleselect":return this._createStyleSelect();case"formatselect":return this._createBlockFormats();case"fontselect":return this._createFontSelect();case"fontsizeselect":return this._createFontSizeSelect();case"forecolor":return this._createForeColorMenu();case"backcolor":return this._createBackColorMenu()}if((k=this.controls[m])){return j.createButton(m,{title:"advanced."+k[0],cmd:k[1],ui:k[2],value:k[3]})}},execCommand:function(l,k,m){var j=this["_"+l];if(j){j.call(this,k,m);return true}return false},_importClasses:function(l){var j=this.editor,k=j.controlManager.get("styleselect");if(k.getLength()==0){f(j.dom.getClasses(),function(q,m){var p="style_"+m,n;n={inline:"span",attributes:{"class":q["class"]},selector:"*"};j.formatter.register(p,n);k.add(q["class"],p,{style:function(){return b(j,n)}})})}},_createStyleSelect:function(o){var l=this,j=l.editor,k=j.controlManager,m;m=k.createListBox("styleselect",{title:"advanced.style_select",onselect:function(q){var r,n=[],p;f(m.items,function(s){n.push(s.value)});j.focus();j.undoManager.add();r=j.formatter.matchAll(n);h.each(r,function(s){if(!q||s==q){if(s){j.formatter.remove(s)}p=true}});if(!p){j.formatter.apply(q)}j.undoManager.add();j.nodeChanged();return false}});j.onPreInit.add(function(){var p=0,n=j.getParam("style_formats");if(n){f(n,function(q){var r,s=0;f(q,function(){s++});if(s>1){r=q.name=q.name||"style_"+(p++);j.formatter.register(r,q);m.add(q.title,r,{style:function(){return b(j,q)}})}else{m.add(q.title)}})}else{f(j.getParam("theme_advanced_styles","","hash"),function(t,s){var r,q;if(t){r="style_"+(p++);q={inline:"span",classes:t,selector:"*"};j.formatter.register(r,q);m.add(l.editor.translate(s),r,{style:function(){return b(j,q)}})}})}});if(m.getLength()==0){m.onPostRender.add(function(p,q){if(!m.NativeListBox){g.add(q.id+"_text","focus",l._importClasses,l);g.add(q.id+"_text","mousedown",l._importClasses,l);g.add(q.id+"_open","focus",l._importClasses,l);g.add(q.id+"_open","mousedown",l._importClasses,l)}else{g.add(q.id,"focus",l._importClasses,l)}})}return m},_createFontSelect:function(){var l,k=this,j=k.editor;l=j.controlManager.createListBox("fontselect",{title:"advanced.fontdefault",onselect:function(m){var n=l.items[l.selectedIndex];if(!m&&n){j.execCommand("FontName",false,n.value);return}j.execCommand("FontName",false,m);l.select(function(o){return m==o});if(n&&n.value==m){l.select(null)}return false}});if(l){f(j.getParam("theme_advanced_fonts",k.settings.theme_advanced_fonts,"hash"),function(n,m){l.add(j.translate(m),n,{style:n.indexOf("dings")==-1?"font-family:"+n:""})})}return l},_createFontSizeSelect:function(){var m=this,k=m.editor,n,l=0,j=[];n=k.controlManager.createListBox("fontsizeselect",{title:"advanced.font_size",onselect:function(o){var p=n.items[n.selectedIndex];if(!o&&p){p=p.value;if(p["class"]){k.formatter.toggle("fontsize_class",{value:p["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,p.fontSize)}return}if(o["class"]){k.focus();k.undoManager.add();k.formatter.toggle("fontsize_class",{value:o["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,o.fontSize)}n.select(function(q){return o==q});if(p&&(p.value.fontSize==o.fontSize||p.value["class"]&&p.value["class"]==o["class"])){n.select(null)}return false}});if(n){f(m.settings.theme_advanced_font_sizes,function(p,o){var q=p.fontSize;if(q>=1&&q<=7){q=m.sizes[parseInt(q)-1]+"pt"}n.add(o,p,{style:"font-size:"+q,"class":"mceFontSize"+(l++)+(" "+(p["class"]||""))})})}return n},_createBlockFormats:function(){var l,j={p:"advanced.paragraph",address:"advanced.address",pre:"advanced.pre",h1:"advanced.h1",h2:"advanced.h2",h3:"advanced.h3",h4:"advanced.h4",h5:"advanced.h5",h6:"advanced.h6",div:"advanced.div",blockquote:"advanced.blockquote",code:"advanced.code",dt:"advanced.dt",dd:"advanced.dd",samp:"advanced.samp"},k=this;l=k.editor.controlManager.createListBox("formatselect",{title:"advanced.block",onselect:function(m){k.editor.execCommand("FormatBlock",false,m);return false}});if(l){f(k.editor.getParam("theme_advanced_blockformats",k.settings.theme_advanced_blockformats,"hash"),function(n,m){l.add(k.editor.translate(m!=n?m:j[n]),n,{"class":"mce_formatPreview mce_"+n,style:function(){return b(k.editor,{block:n})}})})}return l},_createForeColorMenu:function(){var n,k=this,l=k.settings,m={},j;if(l.theme_advanced_more_colors){m.more_colors_func=function(){k._mceColorPicker(0,{color:n.value,func:function(o){n.setColor(o)}})}}if(j=l.theme_advanced_text_colors){m.colors=j}if(l.theme_advanced_default_foreground_color){m.default_color=l.theme_advanced_default_foreground_color}m.title="advanced.forecolor_desc";m.cmd="ForeColor";m.scope=this;n=k.editor.controlManager.createColorSplitButton("forecolor",m);return n},_createBackColorMenu:function(){var n,k=this,l=k.settings,m={},j;if(l.theme_advanced_more_colors){m.more_colors_func=function(){k._mceColorPicker(0,{color:n.value,func:function(o){n.setColor(o)}})}}if(j=l.theme_advanced_background_colors){m.colors=j}if(l.theme_advanced_default_background_color){m.default_color=l.theme_advanced_default_background_color}m.title="advanced.backcolor_desc";m.cmd="HiliteColor";m.scope=this;n=k.editor.controlManager.createColorSplitButton("backcolor",m);return n},renderUI:function(l){var q,m,r,w=this,u=w.editor,x=w.settings,v,k,j;if(u.settings){u.settings.aria_label=x.aria_label+u.getLang("advanced.help_shortcut")}q=k=i.create("span",{role:"application","aria-labelledby":u.id+"_voice",id:u.id+"_parent","class":"mceEditor "+u.settings.skin+"Skin"+(x.skin_variant?" "+u.settings.skin+"Skin"+w._ufirst(x.skin_variant):"")+(u.settings.directionality=="rtl"?" mceRtl":"")});i.add(q,"span",{"class":"mceVoiceLabel",style:"display:none;",id:u.id+"_voice"},x.aria_label);if(!i.boxModel){q=i.add(q,"div",{"class":"mceOldBoxModel"})}q=v=i.add(q,"table",{role:"presentation",id:u.id+"_tbl","class":"mceLayout",cellSpacing:0,cellPadding:0});q=r=i.add(q,"tbody");switch((x.theme_advanced_layout_manager||"").toLowerCase()){case"rowlayout":m=w._rowLayout(x,r,l);break;case"customlayout":m=u.execCallback("theme_advanced_custom_layout",x,r,l,k);break;default:m=w._simpleLayout(x,r,l,k)}q=l.targetNode;j=v.rows;i.addClass(j[0],"mceFirst");i.addClass(j[j.length-1],"mceLast");f(i.select("tr",r),function(o){i.addClass(o.firstChild,"mceFirst");i.addClass(o.childNodes[o.childNodes.length-1],"mceLast")});if(i.get(x.theme_advanced_toolbar_container)){i.get(x.theme_advanced_toolbar_container).appendChild(k)}else{i.insertAfter(k,q)}g.add(u.id+"_path_row","click",function(n){n=n.target;if(n.nodeName=="A"){w._sel(n.className.replace(/^.*mcePath_([0-9]+).*$/,"$1"));return false}});if(!u.getParam("accessibility_focus")){g.add(i.add(k,"a",{href:"#"},"<!-- IE -->"),"focus",function(){tinyMCE.get(u.id).focus()})}if(x.theme_advanced_toolbar_location=="external"){l.deltaHeight=0}w.deltaHeight=l.deltaHeight;l.targetNode=null;u.onKeyDown.add(function(p,n){var s=121,o=122;if(n.altKey){if(n.keyCode===s){if(h.isWebKit){window.focus()}w.toolbarGroup.focus();return g.cancel(n)}else{if(n.keyCode===o){i.get(p.id+"_path_row").focus();return g.cancel(n)}}}});u.addShortcut("alt+0","","mceShortcuts",w);return{iframeContainer:m,editorContainer:u.id+"_parent",sizeContainer:v,deltaHeight:l.deltaHeight}},getInfo:function(){return{longname:"Advanced theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:h.majorVersion+"."+h.minorVersion}},resizeBy:function(j,k){var l=i.get(this.editor.id+"_ifr");this.resizeTo(l.clientWidth+j,l.clientHeight+k)},resizeTo:function(j,n,l){var k=this.editor,m=this.settings,o=i.get(k.id+"_tbl"),p=i.get(k.id+"_ifr");j=Math.max(m.theme_advanced_resizing_min_width||100,j);n=Math.max(m.theme_advanced_resizing_min_height||100,n);j=Math.min(m.theme_advanced_resizing_max_width||65535,j);n=Math.min(m.theme_advanced_resizing_max_height||65535,n);i.setStyle(o,"height","");i.setStyle(p,"height",n);if(m.theme_advanced_resize_horizontal){i.setStyle(o,"width","");i.setStyle(p,"width",j);if(j<o.clientWidth){j=o.clientWidth;i.setStyle(p,"width",o.clientWidth)}}if(l&&m.theme_advanced_resizing_use_cookie){a.setHash("TinyMCE_"+k.id+"_size",{cw:j,ch:n})}},destroy:function(){var j=this.editor.id;g.clear(j+"_resize");g.clear(j+"_path_row");g.clear(j+"_external_close")},_simpleLayout:function(z,u,l,j){var y=this,v=y.editor,w=z.theme_advanced_toolbar_location,q=z.theme_advanced_statusbar_location,m,k,r,x;if(z.readonly){m=i.add(u,"tr");m=k=i.add(m,"td",{"class":"mceIframeContainer"});return k}if(w=="top"){y._addToolbars(u,l)}if(w=="external"){m=x=i.create("div",{style:"position:relative"});m=i.add(m,"div",{id:v.id+"_external","class":"mceExternalToolbar"});i.add(m,"a",{id:v.id+"_external_close",href:"javascript:;","class":"mceExternalClose"});m=i.add(m,"table",{id:v.id+"_tblext",cellSpacing:0,cellPadding:0});r=i.add(m,"tbody");if(j.firstChild.className=="mceOldBoxModel"){j.firstChild.appendChild(x)}else{j.insertBefore(x,j.firstChild)}y._addToolbars(r,l);v.onMouseUp.add(function(){var o=i.get(v.id+"_external");i.show(o);i.hide(e);var n=g.add(v.id+"_external_close","click",function(){i.hide(v.id+"_external");g.remove(v.id+"_external_close","click",n);return false});i.show(o);i.setStyle(o,"top",0-i.getRect(v.id+"_tblext").h-1);i.hide(o);i.show(o);o.style.filter="";e=v.id+"_external";o=null})}if(q=="top"){y._addStatusBar(u,l)}if(!z.theme_advanced_toolbar_container){m=i.add(u,"tr");m=k=i.add(m,"td",{"class":"mceIframeContainer"})}if(w=="bottom"){y._addToolbars(u,l)}if(q=="bottom"){y._addStatusBar(u,l)}return k},_rowLayout:function(x,p,l){var w=this,q=w.editor,v,y,j=q.controlManager,m,k,u,r;v=x.theme_advanced_containers_default_class||"";y=x.theme_advanced_containers_default_align||"center";f(d(x.theme_advanced_containers||""),function(s,o){var n=x["theme_advanced_container_"+s]||"";switch(s.toLowerCase()){case"mceeditor":m=i.add(p,"tr");m=k=i.add(m,"td",{"class":"mceIframeContainer"});break;case"mceelementpath":w._addStatusBar(p,l);break;default:r=(x["theme_advanced_container_"+s+"_align"]||y).toLowerCase();r="mce"+w._ufirst(r);m=i.add(i.add(p,"tr"),"td",{"class":"mceToolbar "+(x["theme_advanced_container_"+s+"_class"]||v)+" "+r||y});u=j.createToolbar("toolbar"+o);w._addControls(n,u);i.setHTML(m,u.renderHTML());l.deltaHeight-=x.theme_advanced_row_height}});return k},_addControls:function(k,j){var l=this,m=l.settings,n,o=l.editor.controlManager;if(m.theme_advanced_disable&&!l._disabled){n={};f(d(m.theme_advanced_disable),function(p){n[p]=1});l._disabled=n}else{n=l._disabled}f(d(k),function(q){var p;if(n&&n[q]){return}if(q=="tablecontrols"){f(["table","|","row_props","cell_props","|","row_before","row_after","delete_row","|","col_before","col_after","delete_col","|","split_cells","merge_cells"],function(r){r=l.createControl(r,o);if(r){j.add(r)}});return}p=l.createControl(q,o);if(p){j.add(p)}})},_addToolbars:function(y,k){var B=this,q,p,u=B.editor,C=B.settings,A,j=u.controlManager,w,l,r=[],z,x,m=false;x=j.createToolbarGroup("toolbargroup",{name:u.getLang("advanced.toolbar"),tab_focus_toolbar:u.getParam("theme_advanced_tab_focus_toolbar")});B.toolbarGroup=x;z=C.theme_advanced_toolbar_align.toLowerCase();z="mce"+B._ufirst(z);l=i.add(i.add(y,"tr",{role:"presentation"}),"td",{"class":"mceToolbar "+z,role:"toolbar"});for(q=1;(A=C["theme_advanced_buttons"+q]);q++){m=true;p=j.createToolbar("toolbar"+q,{"class":"mceToolbarRow"+q});if(C["theme_advanced_buttons"+q+"_add"]){A+=","+C["theme_advanced_buttons"+q+"_add"]}if(C["theme_advanced_buttons"+q+"_add_before"]){A=C["theme_advanced_buttons"+q+"_add_before"]+","+A}B._addControls(A,p);x.add(p);k.deltaHeight-=C.theme_advanced_row_height}if(!m){k.deltaHeight-=C.theme_advanced_row_height}r.push(x.renderHTML());r.push(i.createHTML("a",{href:"#",accesskey:"z",title:u.getLang("advanced.toolbar_focus"),onfocus:"tinyMCE.getInstanceById('"+u.id+"').focus();"},"<!-- IE -->"));i.setHTML(l,r.join(""))},_addStatusBar:function(p,k){var l,w=this,q=w.editor,x=w.settings,j,u,v,m;l=i.add(p,"tr");l=m=i.add(l,"td",{"class":"mceStatusbar"});l=i.add(l,"div",{id:q.id+"_path_row",role:"group","aria-labelledby":q.id+"_path_voice"});if(x.theme_advanced_path){i.add(l,"span",{id:q.id+"_path_voice"},q.translate("advanced.path"));i.add(l,"span",{},": ")}else{i.add(l,"span",{},"&#160;")}if(x.theme_advanced_resizing){i.add(m,"a",{id:q.id+"_resize",href:"javascript:;",onclick:"return false;","class":"mceResize",tabIndex:"-1"});if(x.theme_advanced_resizing_use_cookie){q.onPostRender.add(function(){var n=a.getHash("TinyMCE_"+q.id+"_size"),r=i.get(q.id+"_tbl");if(!n){return}w.resizeTo(n.cw,n.ch)})}q.onPostRender.add(function(){g.add(q.id+"_resize","click",function(n){n.preventDefault()});g.add(q.id+"_resize","mousedown",function(E){var t,r,s,o,D,A,B,G,n,F,y;function z(H){H.preventDefault();n=B+(H.screenX-D);F=G+(H.screenY-A);w.resizeTo(n,F)}function C(H){g.remove(i.doc,"mousemove",t);g.remove(q.getDoc(),"mousemove",r);g.remove(i.doc,"mouseup",s);g.remove(q.getDoc(),"mouseup",o);n=B+(H.screenX-D);F=G+(H.screenY-A);w.resizeTo(n,F,true);q.nodeChanged()}E.preventDefault();D=E.screenX;A=E.screenY;y=i.get(w.editor.id+"_ifr");B=n=y.clientWidth;G=F=y.clientHeight;t=g.add(i.doc,"mousemove",z);r=g.add(q.getDoc(),"mousemove",z);s=g.add(i.doc,"mouseup",C);o=g.add(q.getDoc(),"mouseup",C)})})}k.deltaHeight-=21;l=p=null},_updateUndoStatus:function(k){var j=k.controlManager,l=k.undoManager;j.setDisabled("undo",!l.hasUndo()&&!l.typing);j.setDisabled("redo",!l.hasRedo())},_nodeChanged:function(o,u,E,r,F){var z=this,D,G=0,y,H,A=z.settings,x,l,w,C,m,k,j;h.each(z.stateControls,function(n){u.setActive(n,o.queryCommandState(z.controls[n][1]))});function q(p){var s,n=F.parents,t=p;if(typeof(p)=="string"){t=function(v){return v.nodeName==p}}for(s=0;s<n.length;s++){if(t(n[s])){return n[s]}}}u.setActive("visualaid",o.hasVisual);z._updateUndoStatus(o);u.setDisabled("outdent",!o.queryCommandState("Outdent"));D=q("A");if(H=u.get("link")){H.setDisabled((!D&&r)||(D&&!D.href));H.setActive(!!D&&(!D.name&&!D.id))}if(H=u.get("unlink")){H.setDisabled(!D&&r);H.setActive(!!D&&!D.name&&!D.id)}if(H=u.get("anchor")){H.setActive(!r&&!!D&&(D.name||(D.id&&!D.href)))}D=q("IMG");if(H=u.get("image")){H.setActive(!r&&!!D&&E.className.indexOf("mceItem")==-1)}if(H=u.get("styleselect")){z._importClasses();k=[];f(H.items,function(n){k.push(n.value)});j=o.formatter.matchAll(k);H.select(j[0]);h.each(j,function(p,n){if(n>0){H.mark(p)}})}if(H=u.get("formatselect")){D=q(o.dom.isBlock);if(D){H.select(D.nodeName.toLowerCase())}}q(function(p){if(p.nodeName==="SPAN"){if(!x&&p.className){x=p.className}}if(o.dom.is(p,A.theme_advanced_font_selector)){if(!l&&p.style.fontSize){l=p.style.fontSize}if(!w&&p.style.fontFamily){w=p.style.fontFamily.replace(/[\"\']+/g,"").replace(/^([^,]+).*/,"$1").toLowerCase()}if(!C&&p.style.color){C=p.style.color}if(!m&&p.style.backgroundColor){m=p.style.backgroundColor}}return false});if(H=u.get("fontselect")){H.select(function(n){return n.replace(/^([^,]+).*/,"$1").toLowerCase()==w})}if(H=u.get("fontsizeselect")){if(A.theme_advanced_runtime_fontsize&&!l&&!x){l=o.dom.getStyle(E,"fontSize",true)}H.select(function(n){if(n.fontSize&&n.fontSize===l){return true}if(n["class"]&&n["class"]===x){return true}})}if(A.theme_advanced_show_current_color){function B(p,n){if(H=u.get(p)){if(!n){n=H.settings.default_color}if(n!==H.value){H.displayColor(n)}}}B("forecolor",C);B("backcolor",m)}if(A.theme_advanced_show_current_color){function B(p,n){if(H=u.get(p)){if(!n){n=H.settings.default_color}if(n!==H.value){H.displayColor(n)}}}B("forecolor",C);B("backcolor",m)}if(A.theme_advanced_path&&A.theme_advanced_statusbar_location){D=i.get(o.id+"_path")||i.add(o.id+"_path_row","span",{id:o.id+"_path"});if(z.statusKeyboardNavigation){z.statusKeyboardNavigation.destroy();z.statusKeyboardNavigation=null}i.setHTML(D,"");q(function(I){var p=I.nodeName.toLowerCase(),s,v,t="";if(I.nodeType!=1||p==="br"||I.getAttribute("data-mce-bogus")||i.hasClass(I,"mceItemHidden")||i.hasClass(I,"mceItemRemoved")){return}if(h.isIE&&I.scopeName!=="HTML"&&I.scopeName){p=I.scopeName+":"+p}p=p.replace(/mce\:/g,"");switch(p){case"b":p="strong";break;case"i":p="em";break;case"img":if(y=i.getAttrib(I,"src")){t+="src: "+y+" "}break;case"a":if(y=i.getAttrib(I,"name")){t+="name: "+y+" ";p+="#"+y}if(y=i.getAttrib(I,"href")){t+="href: "+y+" "}break;case"font":if(y=i.getAttrib(I,"face")){t+="font: "+y+" "}if(y=i.getAttrib(I,"size")){t+="size: "+y+" "}if(y=i.getAttrib(I,"color")){t+="color: "+y+" "}break;case"span":if(y=i.getAttrib(I,"style")){t+="style: "+y+" "}break}if(y=i.getAttrib(I,"id")){t+="id: "+y+" "}if(y=I.className){y=y.replace(/\b\s*(webkit|mce|Apple-)\w+\s*\b/g,"");if(y){t+="class: "+y+" ";if(o.dom.isBlock(I)||p=="img"||p=="span"){p+="."+y}}}p=p.replace(/(html:)/g,"");p={name:p,node:I,title:t};z.onResolveName.dispatch(z,p);t=p.title;p=p.name;v=i.create("a",{href:"javascript:;",role:"button",onmousedown:"return false;",title:t,"class":"mcePath_"+(G++)},p);if(D.hasChildNodes()){D.insertBefore(i.create("span",{"aria-hidden":"true"},"\u00a0\u00bb "),D.firstChild);D.insertBefore(v,D.firstChild)}else{D.appendChild(v)}},o.getBody());if(i.select("a",D).length>0){z.statusKeyboardNavigation=new h.ui.KeyboardNavigation({root:o.id+"_path_row",items:i.select("a",D),excludeFromTabOrder:true,onCancel:function(){o.focus()}},i)}}},_sel:function(j){this.editor.execCommand("mceSelectNodeDepth",false,j)},_mceInsertAnchor:function(l,k){var j=this.editor;j.windowManager.open({url:this.url+"/anchor.htm",width:320+parseInt(j.getLang("advanced.anchor_delta_width",0)),height:90+parseInt(j.getLang("advanced.anchor_delta_height",0)),inline:true},{theme_url:this.url})},_mceCharMap:function(){var j=this.editor;j.windowManager.open({url:this.url+"/charmap.htm",width:550+parseInt(j.getLang("advanced.charmap_delta_width",0)),height:265+parseInt(j.getLang("advanced.charmap_delta_height",0)),inline:true},{theme_url:this.url})},_mceHelp:function(){var j=this.editor;j.windowManager.open({url:this.url+"/about.htm",width:480,height:380,inline:true},{theme_url:this.url})},_mceShortcuts:function(){var j=this.editor;j.windowManager.open({url:this.url+"/shortcuts.htm",width:480,height:380,inline:true},{theme_url:this.url})},_mceColorPicker:function(l,k){var j=this.editor;k=k||{};j.windowManager.open({url:this.url+"/color_picker.htm",width:375+parseInt(j.getLang("advanced.colorpicker_delta_width",0)),height:250+parseInt(j.getLang("advanced.colorpicker_delta_height",0)),close_previous:false,inline:true},{input_color:k.color,func:k.func,theme_url:this.url})},_mceCodeEditor:function(k,l){var j=this.editor;j.windowManager.open({url:this.url+"/source_editor.htm",width:parseInt(j.getParam("theme_advanced_source_editor_width",720)),height:parseInt(j.getParam("theme_advanced_source_editor_height",580)),inline:true,resizable:true,maximizable:true},{theme_url:this.url})},_mceImage:function(k,l){var j=this.editor;if(j.dom.getAttrib(j.selection.getNode(),"class","").indexOf("mceItem")!=-1){return}j.windowManager.open({url:this.url+"/image.htm",width:355+parseInt(j.getLang("advanced.image_delta_width",0)),height:275+parseInt(j.getLang("advanced.image_delta_height",0)),inline:true},{theme_url:this.url})},_mceLink:function(k,l){var j=this.editor;j.windowManager.open({url:this.url+"/link.htm",width:310+parseInt(j.getLang("advanced.link_delta_width",0)),height:200+parseInt(j.getLang("advanced.link_delta_height",0)),inline:true},{theme_url:this.url})},_mceNewDocument:function(){var j=this.editor;j.windowManager.confirm("advanced.newdocument",function(k){if(k){j.execCommand("mceSetContent",false,"")}})},_mceForeColor:function(){var j=this;this._mceColorPicker(0,{color:j.fgColor,func:function(k){j.fgColor=k;j.editor.execCommand("ForeColor",false,k)}})},_mceBackColor:function(){var j=this;this._mceColorPicker(0,{color:j.bgColor,func:function(k){j.bgColor=k;j.editor.execCommand("HiliteColor",false,k)}})},_ufirst:function(j){return j.substring(0,1).toUpperCase()+j.substring(1)}});h.ThemeManager.add("advanced",h.themes.AdvancedTheme)}(tinymce));
diff --git a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/image.htm b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/image.htm
index 884890fbb..4261ce191 100644
--- a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/image.htm
+++ b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/image.htm
@@ -52,7 +52,7 @@
 				<tr>
 					<td class="nowrap"><label for="width">{#advanced_dlg.image_dimensions}</label></td>
 					<td><input id="width" name="width" type="text" value="" size="3" maxlength="5" />
-					 x 
+					 x
 					<input id="height" name="height" type="text" value="" size="3" maxlength="5" /></td>
 				</tr>
 				<tr>
diff --git a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/js/charmap.js b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/js/charmap.js
index cbb4172ba..6a22d178f 100644
--- a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/js/charmap.js
+++ b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/js/charmap.js
@@ -290,7 +290,7 @@ function addKeyboardNavigation(){
 	cells[0].tabindex=0;
 	tinyMCEPopup.dom.addClass(cells[0], "mceFocus");
 	if (tinymce.isGecko) {
-		cells[0].focus();		
+		cells[0].focus();
 	} else {
 		setTimeout(function(){
 			cells[0].focus();
@@ -302,7 +302,7 @@ function addKeyboardNavigation(){
 function renderCharMapHTML() {
 	var charsPerRow = 20, tdWidth=20, tdHeight=20, i;
 	var html = '<div id="charmapgroup" aria-labelledby="charmap_label" tabindex="0" role="listbox">'+
-	'<table role="presentation" border="0" cellspacing="1" cellpadding="0" width="' + (tdWidth*charsPerRow) + 
+	'<table role="presentation" border="0" cellspacing="1" cellpadding="0" width="' + (tdWidth*charsPerRow) +
 	'"><tr height="' + tdHeight + '">';
 	var cols=-1;
 
diff --git a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/js/image.js b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/js/image.js
index 3f93e2d32..4fecb15a1 100644
--- a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/js/image.js
+++ b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/js/image.js
@@ -226,7 +226,7 @@ var ImageDialog = {
 	resetImageData : function() {
 		var f = document.forms[0];
 
-		f.width.value = f.height.value = "";	
+		f.width.value = f.height.value = "";
 	},
 
 	updateImageData : function() {
diff --git a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/js/link.js b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/js/link.js
index b08b2ba9c..fa5f93ee1 100644
--- a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/js/link.js
+++ b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/js/link.js
@@ -70,7 +70,7 @@ var LinkDialog = {
 				href : href,
 				title : f.linktitle.value
 			});
-	
+
 			if (f.target_list) {
 				ed.dom.setAttrib(e, 'target', getSelectValue(f, "target_list"));
 			}
diff --git a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/langs/en.js b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/langs/en.js
index 6e5848187..741893afe 100644
--- a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/langs/en.js
+++ b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/langs/en.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.advanced',{"underline_desc":"Underline (Ctrl+U)","italic_desc":"Italic (Ctrl+I)","bold_desc":"Bold (Ctrl+B)",dd:"Definition Description",dt:"Definition Term ",samp:"Code Sample",code:"Code",blockquote:"Block Quote",h6:"Heading 6",h5:"Heading 5",h4:"Heading 4",h3:"Heading 3",h2:"Heading 2",h1:"Heading 1",pre:"Preformatted",address:"Address",div:"DIV",paragraph:"Paragraph",block:"Format",fontdefault:"Font Family","font_size":"Font Size","style_select":"Styles","anchor_delta_height":"","anchor_delta_width":"","charmap_delta_height":"","charmap_delta_width":"","colorpicker_delta_height":"","colorpicker_delta_width":"","link_delta_height":"","link_delta_width":"","image_delta_height":"","image_delta_width":"","more_colors":"More Colors...","toolbar_focus":"Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X",newdocument:"Are you sure you want clear all contents?",path:"Path","clipboard_msg":"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?","blockquote_desc":"Block Quote","help_desc":"Help","newdocument_desc":"New Document","image_props_desc":"Image Properties","paste_desc":"Paste (Ctrl+V)","copy_desc":"Copy (Ctrl+C)","cut_desc":"Cut (Ctrl+X)","anchor_desc":"Insert/Edit Anchor","visualaid_desc":"show/Hide Guidelines/Invisible Elements","charmap_desc":"Insert Special Character","backcolor_desc":"Select Background Color","forecolor_desc":"Select Text Color","custom1_desc":"Your Custom Description Here","removeformat_desc":"Remove Formatting","hr_desc":"Insert Horizontal Line","sup_desc":"Superscript","sub_desc":"Subscript","code_desc":"Edit HTML Source","cleanup_desc":"Cleanup Messy Code","image_desc":"Insert/Edit Image","unlink_desc":"Unlink","link_desc":"Insert/Edit Link","redo_desc":"Redo (Ctrl+Y)","undo_desc":"Undo (Ctrl+Z)","indent_desc":"Increase Indent","outdent_desc":"Decrease Indent","numlist_desc":"Insert/Remove Numbered List","bullist_desc":"Insert/Remove Bulleted List","justifyfull_desc":"Align Full","justifyright_desc":"Align Right","justifycenter_desc":"Align Center","justifyleft_desc":"Align Left","striketrough_desc":"Strikethrough","help_shortcut":"Press ALT-F10 for toolbar. Press ALT-0 for help","rich_text_area":"Rich Text Area","shortcuts_desc":"Accessability Help",toolbar:"Toolbar"});
\ No newline at end of file
+tinyMCE.addI18n('en.advanced',{"underline_desc":"Underline (Ctrl+U)","italic_desc":"Italic (Ctrl+I)","bold_desc":"Bold (Ctrl+B)",dd:"Definition Description",dt:"Definition Term ",samp:"Code Sample",code:"Code",blockquote:"Block Quote",h6:"Heading 6",h5:"Heading 5",h4:"Heading 4",h3:"Heading 3",h2:"Heading 2",h1:"Heading 1",pre:"Preformatted",address:"Address",div:"DIV",paragraph:"Paragraph",block:"Format",fontdefault:"Font Family","font_size":"Font Size","style_select":"Styles","anchor_delta_height":"","anchor_delta_width":"","charmap_delta_height":"","charmap_delta_width":"","colorpicker_delta_height":"","colorpicker_delta_width":"","link_delta_height":"","link_delta_width":"","image_delta_height":"","image_delta_width":"","more_colors":"More Colors...","toolbar_focus":"Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X",newdocument:"Are you sure you want clear all contents?",path:"Path","clipboard_msg":"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?","blockquote_desc":"Block Quote","help_desc":"Help","newdocument_desc":"New Document","image_props_desc":"Image Properties","paste_desc":"Paste (Ctrl+V)","copy_desc":"Copy (Ctrl+C)","cut_desc":"Cut (Ctrl+X)","anchor_desc":"Insert/Edit Anchor","visualaid_desc":"show/Hide Guidelines/Invisible Elements","charmap_desc":"Insert Special Character","backcolor_desc":"Select Background Color","forecolor_desc":"Select Text Color","custom1_desc":"Your Custom Description Here","removeformat_desc":"Remove Formatting","hr_desc":"Insert Horizontal Line","sup_desc":"Superscript","sub_desc":"Subscript","code_desc":"Edit HTML Source","cleanup_desc":"Cleanup Messy Code","image_desc":"Insert/Edit Image","unlink_desc":"Unlink","link_desc":"Insert/Edit Link","redo_desc":"Redo (Ctrl+Y)","undo_desc":"Undo (Ctrl+Z)","indent_desc":"Increase Indent","outdent_desc":"Decrease Indent","numlist_desc":"Insert/Remove Numbered List","bullist_desc":"Insert/Remove Bulleted List","justifyfull_desc":"Align Full","justifyright_desc":"Align Right","justifycenter_desc":"Align Center","justifyleft_desc":"Align Left","striketrough_desc":"Strikethrough","help_shortcut":"Press ALT-F10 for toolbar. Press ALT-0 for help","rich_text_area":"Rich Text Area","shortcuts_desc":"Accessability Help",toolbar:"Toolbar"});
diff --git a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/link.htm b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/link.htm
index 4a2459f8a..f796268b7 100644
--- a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/link.htm
+++ b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/link.htm
@@ -21,11 +21,11 @@
 			<table border="0" cellpadding="4" cellspacing="0">
 				<tr>
 					<td class="nowrap"><label for="href">{#advanced_dlg.link_url}</label></td>
-					<td><table border="0" cellspacing="0" cellpadding="0"> 
-						<tr> 
-							<td><input id="href" name="href" type="text" class="mceFocus" value="" style="width: 200px" onchange="LinkDialog.checkPrefix(this);" /></td> 
+					<td><table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input id="href" name="href" type="text" class="mceFocus" value="" style="width: 200px" onchange="LinkDialog.checkPrefix(this);" /></td>
 							<td id="hrefbrowsercontainer">&nbsp;</td>
-						</tr> 
+						</tr>
 					</table></td>
 				</tr>
 				<tr>
diff --git a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/shortcuts.htm b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/shortcuts.htm
index 436091f14..ec34f95e3 100644
--- a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/shortcuts.htm
+++ b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/shortcuts.htm
@@ -11,15 +11,15 @@
 		<p>Press ALT-F10 to move focus to the toolbars. Navigate through the buttons using the arrow keys.
 		Press enter to activate a button and return focus to the editor.
 		Press escape to return focus to the editor without performing any actions.</p>
-		
+
 		<h2>Status Bar</h2>
 		<p>To access the editor status bar, press ALT-F11. Use the left and right arrow keys to navigate between elements in the path.
 		Press enter or space to select an element. Press escape to return focus to the editor without changing the selection.</p>
-		
+
 		<h2>Context Menu</h2>
 		<p>Press shift-F10 to activate the context menu. Use the up and down arrow keys to move between menu items. To open sub-menus press the right arrow key.
 		To close submenus press the left arrow key.  Press escape to close the context menu.</p>
-		
+
 		<h1>Keyboard Shortcuts</h1>
 		<table>
 			<thead>
diff --git a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/skins/highcontrast/ui.css b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/skins/highcontrast/ui.css
index 86829c59c..16ec276e7 100644
--- a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/skins/highcontrast/ui.css
+++ b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/skins/highcontrast/ui.css
@@ -52,7 +52,7 @@
 .highcontrastSkin table.mceSplitButton  { display: table; }
 .highcontrastSkin .mceSplitButton a.mceAction { padding: 5px 10px; display: block; height: 2em; line-height: 2em; overflow: hidden; border: 1px solid; border-right: 0; border-radius: 3px 0px 0px 3px; -moz-border-radius: 3px 0px 0px 3px; -webkit-border-radius: 3px 0px 0px 3px; -ms-border-radius: 3px 0px 0px 3px;}
 .highcontrastSkin .mceSplitButton a.mceOpen { padding: 5px 4px;  display: block; height: 2em; line-height: 2em; border: 1px solid; border-radius: 0px 3px 3px 0px; -moz-border-radius: 0px 3px 3px 0px; -webkit-border-radius: 0px 3px 3px 0px; -ms-border-radius: 0px 3px 3px 0px;}
-.highcontrastSkin .mceSplitButton .mceVoiceLabel { height: 2em; vertical-align: center; line-height: 2em; } 
+.highcontrastSkin .mceSplitButton .mceVoiceLabel { height: 2em; vertical-align: center; line-height: 2em; }
 .highcontrastSkin .mceSplitButton:focus a.mceAction, .highcontrastSkin .mceSplitButton:active a.mceAction { border-width: 5px; border-right-width: 1px; padding: 1px 10px 1px 6px;-webkit-focus-ring-color:none;outline:none;}
 .highcontrastSkin .mceSplitButton:focus a.mceOpen, .highcontrastSkin .mceSplitButton:active a.mceOpen { border-width: 5px; border-left-width: 1px; padding: 1px 0px 1px 4px;-webkit-focus-ring-color:none;outline:none;}
 
diff --git a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/skins/o2k7/ui_black.css b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
index 85812cde3..47733774d 100644
--- a/webapp/src/main/webapp/js/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
+++ b/webapp/src/main/webapp/js/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
@@ -5,4 +5,4 @@
 .o2k7SkinBlack table.mceListBoxEnabled:hover .mceText, .o2k7SkinBlack .mceListBoxHover .mceText, .o2k7SkinBlack .mceListBoxSelected .mceText {background:#FFF; border:1px solid #FFBD69; border-right:0}
 .o2k7SkinBlack .mceExternalToolbar, .o2k7SkinBlack .mceListBox .mceText, .o2k7SkinBlack div.mceMenu, .o2k7SkinBlack table.mceLayout, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack table.mceLayout tr.mceFirst td, .o2k7SkinBlack table.mceLayout, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack table.mceLayout tr.mceLast td, .o2k7SkinBlack .mceIframeContainer {border-color: #535353;}
 .o2k7SkinBlack table.mceSplitButtonEnabled:hover a.mceAction, .o2k7SkinBlack .mceSplitButtonHover a.mceAction, .o2k7SkinBlack .mceSplitButtonSelected {background-image:url(img/button_bg_black.png)}
-.o2k7SkinBlack .mceMenu .mceMenuItemEnabled a:hover, .o2k7SkinBlack .mceMenu .mceMenuItemActive {background-color:#FFE7A1}
\ No newline at end of file
+.o2k7SkinBlack .mceMenu .mceMenuItemEnabled a:hover, .o2k7SkinBlack .mceMenu .mceMenuItemActive {background-color:#FFE7A1}
diff --git a/webapp/src/main/webapp/js/tiny_mce/themes/simple/editor_template.js b/webapp/src/main/webapp/js/tiny_mce/themes/simple/editor_template.js
index 4b3209cc9..81fd39f49 100644
--- a/webapp/src/main/webapp/js/tiny_mce/themes/simple/editor_template.js
+++ b/webapp/src/main/webapp/js/tiny_mce/themes/simple/editor_template.js
@@ -1 +1 @@
-(function(){var a=tinymce.DOM;tinymce.ThemeManager.requireLangPack("simple");tinymce.create("tinymce.themes.SimpleTheme",{init:function(c,d){var e=this,b=["Bold","Italic","Underline","Strikethrough","InsertUnorderedList","InsertOrderedList"],f=c.settings;e.editor=c;c.contentCSS.push(d+"/skins/"+f.skin+"/content.css");c.onInit.add(function(){c.onNodeChange.add(function(h,g){tinymce.each(b,function(i){g.get(i.toLowerCase()).setActive(h.queryCommandState(i))})})});a.loadCSS((f.editor_css?c.documentBaseURI.toAbsolute(f.editor_css):"")||d+"/skins/"+f.skin+"/ui.css")},renderUI:function(h){var e=this,i=h.targetNode,b,c,d=e.editor,f=d.controlManager,g;i=a.insertAfter(a.create("span",{id:d.id+"_container","class":"mceEditor "+d.settings.skin+"SimpleSkin"}),i);i=g=a.add(i,"table",{cellPadding:0,cellSpacing:0,"class":"mceLayout"});i=c=a.add(i,"tbody");i=a.add(c,"tr");i=b=a.add(a.add(i,"td"),"div",{"class":"mceIframeContainer"});i=a.add(a.add(c,"tr",{"class":"last"}),"td",{"class":"mceToolbar mceLast",align:"center"});c=e.toolbar=f.createToolbar("tools1");c.add(f.createButton("bold",{title:"simple.bold_desc",cmd:"Bold"}));c.add(f.createButton("italic",{title:"simple.italic_desc",cmd:"Italic"}));c.add(f.createButton("underline",{title:"simple.underline_desc",cmd:"Underline"}));c.add(f.createButton("strikethrough",{title:"simple.striketrough_desc",cmd:"Strikethrough"}));c.add(f.createSeparator());c.add(f.createButton("undo",{title:"simple.undo_desc",cmd:"Undo"}));c.add(f.createButton("redo",{title:"simple.redo_desc",cmd:"Redo"}));c.add(f.createSeparator());c.add(f.createButton("cleanup",{title:"simple.cleanup_desc",cmd:"mceCleanup"}));c.add(f.createSeparator());c.add(f.createButton("insertunorderedlist",{title:"simple.bullist_desc",cmd:"InsertUnorderedList"}));c.add(f.createButton("insertorderedlist",{title:"simple.numlist_desc",cmd:"InsertOrderedList"}));c.renderTo(i);return{iframeContainer:b,editorContainer:d.id+"_container",sizeContainer:g,deltaHeight:-20}},getInfo:function(){return{longname:"Simple theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.ThemeManager.add("simple",tinymce.themes.SimpleTheme)})();
\ No newline at end of file
+(function(){var a=tinymce.DOM;tinymce.ThemeManager.requireLangPack("simple");tinymce.create("tinymce.themes.SimpleTheme",{init:function(c,d){var e=this,b=["Bold","Italic","Underline","Strikethrough","InsertUnorderedList","InsertOrderedList"],f=c.settings;e.editor=c;c.contentCSS.push(d+"/skins/"+f.skin+"/content.css");c.onInit.add(function(){c.onNodeChange.add(function(h,g){tinymce.each(b,function(i){g.get(i.toLowerCase()).setActive(h.queryCommandState(i))})})});a.loadCSS((f.editor_css?c.documentBaseURI.toAbsolute(f.editor_css):"")||d+"/skins/"+f.skin+"/ui.css")},renderUI:function(h){var e=this,i=h.targetNode,b,c,d=e.editor,f=d.controlManager,g;i=a.insertAfter(a.create("span",{id:d.id+"_container","class":"mceEditor "+d.settings.skin+"SimpleSkin"}),i);i=g=a.add(i,"table",{cellPadding:0,cellSpacing:0,"class":"mceLayout"});i=c=a.add(i,"tbody");i=a.add(c,"tr");i=b=a.add(a.add(i,"td"),"div",{"class":"mceIframeContainer"});i=a.add(a.add(c,"tr",{"class":"last"}),"td",{"class":"mceToolbar mceLast",align:"center"});c=e.toolbar=f.createToolbar("tools1");c.add(f.createButton("bold",{title:"simple.bold_desc",cmd:"Bold"}));c.add(f.createButton("italic",{title:"simple.italic_desc",cmd:"Italic"}));c.add(f.createButton("underline",{title:"simple.underline_desc",cmd:"Underline"}));c.add(f.createButton("strikethrough",{title:"simple.striketrough_desc",cmd:"Strikethrough"}));c.add(f.createSeparator());c.add(f.createButton("undo",{title:"simple.undo_desc",cmd:"Undo"}));c.add(f.createButton("redo",{title:"simple.redo_desc",cmd:"Redo"}));c.add(f.createSeparator());c.add(f.createButton("cleanup",{title:"simple.cleanup_desc",cmd:"mceCleanup"}));c.add(f.createSeparator());c.add(f.createButton("insertunorderedlist",{title:"simple.bullist_desc",cmd:"InsertUnorderedList"}));c.add(f.createButton("insertorderedlist",{title:"simple.numlist_desc",cmd:"InsertOrderedList"}));c.renderTo(i);return{iframeContainer:b,editorContainer:d.id+"_container",sizeContainer:g,deltaHeight:-20}},getInfo:function(){return{longname:"Simple theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.ThemeManager.add("simple",tinymce.themes.SimpleTheme)})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/themes/simple/editor_template_src.js b/webapp/src/main/webapp/js/tiny_mce/themes/simple/editor_template_src.js
index 35c19a6bc..c1c0c9ea3 100644
--- a/webapp/src/main/webapp/js/tiny_mce/themes/simple/editor_template_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/themes/simple/editor_template_src.js
@@ -81,4 +81,4 @@
 	});
 
 	tinymce.ThemeManager.add('simple', tinymce.themes.SimpleTheme);
-})();
\ No newline at end of file
+})();
diff --git a/webapp/src/main/webapp/js/tiny_mce/themes/simple/langs/en.js b/webapp/src/main/webapp/js/tiny_mce/themes/simple/langs/en.js
index 088ed0fcb..ba09813b8 100644
--- a/webapp/src/main/webapp/js/tiny_mce/themes/simple/langs/en.js
+++ b/webapp/src/main/webapp/js/tiny_mce/themes/simple/langs/en.js
@@ -1 +1 @@
-tinyMCE.addI18n('en.simple',{"cleanup_desc":"Cleanup Messy Code","redo_desc":"Redo (Ctrl+Y)","undo_desc":"Undo (Ctrl+Z)","numlist_desc":"Insert/Remove Numbered List","bullist_desc":"Insert/Remove Bulleted List","striketrough_desc":"Strikethrough","underline_desc":"Underline (Ctrl+U)","italic_desc":"Italic (Ctrl+I)","bold_desc":"Bold (Ctrl+B)"});
\ No newline at end of file
+tinyMCE.addI18n('en.simple',{"cleanup_desc":"Cleanup Messy Code","redo_desc":"Redo (Ctrl+Y)","undo_desc":"Undo (Ctrl+Z)","numlist_desc":"Insert/Remove Numbered List","bullist_desc":"Insert/Remove Bulleted List","striketrough_desc":"Strikethrough","underline_desc":"Underline (Ctrl+U)","italic_desc":"Italic (Ctrl+I)","bold_desc":"Bold (Ctrl+B)"});
diff --git a/webapp/src/main/webapp/js/tiny_mce/themes/simple/skins/default/content.css b/webapp/src/main/webapp/js/tiny_mce/themes/simple/skins/default/content.css
index 783b170f7..1c9856a03 100644
--- a/webapp/src/main/webapp/js/tiny_mce/themes/simple/skins/default/content.css
+++ b/webapp/src/main/webapp/js/tiny_mce/themes/simple/skins/default/content.css
@@ -21,5 +21,5 @@ body {
 	scrollbar-face-color: #E0E0DD;
 	scrollbar-highlight-color: #F0F0EE;
 	scrollbar-shadow-color: #F0F0EE;
-	scrollbar-track-color: #F5F5F5;	
+	scrollbar-track-color: #F5F5F5;
 }
diff --git a/webapp/src/main/webapp/js/tiny_mce/themes/simple/skins/o2k7/content.css b/webapp/src/main/webapp/js/tiny_mce/themes/simple/skins/o2k7/content.css
index e10558f9d..93551e331 100644
--- a/webapp/src/main/webapp/js/tiny_mce/themes/simple/skins/o2k7/content.css
+++ b/webapp/src/main/webapp/js/tiny_mce/themes/simple/skins/o2k7/content.css
@@ -13,5 +13,5 @@ scrollbar-darkshadow-color: #DDDDDD;
 scrollbar-face-color: #E0E0DD;
 scrollbar-highlight-color: #F0F0EE;
 scrollbar-shadow-color: #F0F0EE;
-scrollbar-track-color: #F5F5F5;	
+scrollbar-track-color: #F5F5F5;
 }
diff --git a/webapp/src/main/webapp/js/tiny_mce/tiny_mce.js b/webapp/src/main/webapp/js/tiny_mce/tiny_mce.js
index 53b68042a..050285bb2 100644
--- a/webapp/src/main/webapp/js/tiny_mce/tiny_mce.js
+++ b/webapp/src/main/webapp/js/tiny_mce/tiny_mce.js
@@ -1 +1 @@
-(function(e){var a=/^\s*|\s*$/g,b,d="B".replace(/A(.)|B/,"$1")==="$1";var c={majorVersion:"3",minorVersion:"5.11",releaseDate:"2014-05-08",_init:function(){var s=this,q=document,o=navigator,g=o.userAgent,m,f,l,k,j,r;s.isIE11=g.indexOf("Trident/")!=-1&&(g.indexOf("rv:")!=-1||o.appName.indexOf("Netscape")!=-1);s.isOpera=e.opera&&opera.buildNumber;s.isWebKit=/WebKit/.test(g);s.isIE=!s.isWebKit&&!s.isOpera&&(/MSIE/gi).test(g)&&(/Explorer/gi).test(o.appName)||s.isIE11;s.isIE6=s.isIE&&/MSIE [56]/.test(g);s.isIE7=s.isIE&&/MSIE [7]/.test(g);s.isIE8=s.isIE&&/MSIE [8]/.test(g);s.isIE9=s.isIE&&/MSIE [9]/.test(g);s.isGecko=!s.isWebKit&&!s.isIE11&&/Gecko/.test(g);s.isMac=g.indexOf("Mac")!=-1;s.isAir=/adobeair/i.test(g);s.isIDevice=/(iPad|iPhone)/.test(g);s.isIOS5=s.isIDevice&&g.match(/AppleWebKit\/(\d*)/)[1]>=534;if(e.tinyMCEPreInit){s.suffix=tinyMCEPreInit.suffix;s.baseURL=tinyMCEPreInit.base;s.query=tinyMCEPreInit.query;return}s.suffix="";f=q.getElementsByTagName("base");for(m=0;m<f.length;m++){r=f[m].href;if(r){if(/^https?:\/\/[^\/]+$/.test(r)){r+="/"}k=r?r.match(/.*\//)[0]:""}}function h(i){if(i.src&&/tiny_mce(|_gzip|_jquery|_prototype|_full)(_dev|_src)?.js/.test(i.src)){if(/_(src|dev)\.js/g.test(i.src)){s.suffix="_src"}if((j=i.src.indexOf("?"))!=-1){s.query=i.src.substring(j+1)}s.baseURL=i.src.substring(0,i.src.lastIndexOf("/"));if(k&&s.baseURL.indexOf("://")==-1&&s.baseURL.indexOf("/")!==0){s.baseURL=k+s.baseURL}return s.baseURL}return null}f=q.getElementsByTagName("script");for(m=0;m<f.length;m++){if(h(f[m])){return}}l=q.getElementsByTagName("head")[0];if(l){f=l.getElementsByTagName("script");for(m=0;m<f.length;m++){if(h(f[m])){return}}}return},is:function(g,f){if(!f){return g!==b}if(f=="array"&&c.isArray(g)){return true}return typeof(g)==f},isArray:Array.isArray||function(f){return Object.prototype.toString.call(f)==="[object Array]"},makeMap:function(f,j,h){var g;f=f||[];j=j||",";if(typeof(f)=="string"){f=f.split(j)}h=h||{};g=f.length;while(g--){h[f[g]]={}}return h},each:function(i,f,h){var j,g;if(!i){return 0}h=h||i;if(i.length!==b){for(j=0,g=i.length;j<g;j++){if(f.call(h,i[j],j,i)===false){return 0}}}else{for(j in i){if(i.hasOwnProperty(j)){if(f.call(h,i[j],j,i)===false){return 0}}}}return 1},trim:function(f){return(f?""+f:"").replace(a,"")},create:function(o,f,j){var n=this,g,i,k,l,h,m=0;o=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(o);k=o[3].match(/(^|\.)(\w+)$/i)[2];i=n.createNS(o[3].replace(/\.\w+$/,""),j);if(i[k]){return}if(o[2]=="static"){i[k]=f;if(this.onCreate){this.onCreate(o[2],o[3],i[k])}return}if(!f[k]){f[k]=function(){};m=1}i[k]=f[k];n.extend(i[k].prototype,f);if(o[5]){g=n.resolve(o[5]).prototype;l=o[5].match(/\.(\w+)$/i)[1];h=i[k];if(m){i[k]=function(){return g[l].apply(this,arguments)}}else{i[k]=function(){this.parent=g[l];return h.apply(this,arguments)}}i[k].prototype[k]=i[k];n.each(g,function(p,q){i[k].prototype[q]=g[q]});n.each(f,function(p,q){if(g[q]){i[k].prototype[q]=function(){this.parent=g[q];return p.apply(this,arguments)}}else{if(q!=k){i[k].prototype[q]=p}}})}n.each(f["static"],function(p,q){i[k][q]=p});if(this.onCreate){this.onCreate(o[2],o[3],i[k].prototype)}},walk:function(i,h,j,g){g=g||this;if(i){if(j){i=i[j]}c.each(i,function(k,f){if(h.call(g,k,f,j)===false){return false}c.walk(k,h,j,g)})}},createNS:function(j,h){var g,f;h=h||e;j=j.split(".");for(g=0;g<j.length;g++){f=j[g];if(!h[f]){h[f]={}}h=h[f]}return h},resolve:function(j,h){var g,f;h=h||e;j=j.split(".");for(g=0,f=j.length;g<f;g++){h=h[j[g]];if(!h){break}}return h},addUnload:function(j,i){var h=this,g;g=function(){var f=h.unloads,l,m;if(f){for(m in f){l=f[m];if(l&&l.func){l.func.call(l.scope,1)}}if(e.detachEvent){e.detachEvent("onbeforeunload",k);e.detachEvent("onunload",g)}else{if(e.removeEventListener){e.removeEventListener("unload",g,false)}}h.unloads=l=f=w=g=0;if(e.CollectGarbage){CollectGarbage()}}};function k(){var l=document;function f(){l.detachEvent("onstop",f);if(g){g()}l=0}if(l.readyState=="interactive"){if(l){l.attachEvent("onstop",f)}e.setTimeout(function(){if(l){l.detachEvent("onstop",f)}},0)}}j={func:j,scope:i||this};if(!h.unloads){if(e.attachEvent){e.attachEvent("onunload",g);e.attachEvent("onbeforeunload",k)}else{if(e.addEventListener){e.addEventListener("unload",g,false)}}h.unloads=[j]}else{h.unloads.push(j)}return j},removeUnload:function(i){var g=this.unloads,h=null;c.each(g,function(j,f){if(j&&j.func==i){g.splice(f,1);h=i;return false}});return h},explode:function(f,g){if(!f||c.is(f,"array")){return f}return c.map(f.split(g||","),c.trim)},_addVer:function(g){var f;if(!this.query){return g}f=(g.indexOf("?")==-1?"?":"&")+this.query;if(g.indexOf("#")==-1){return g+f}return g.replace("#",f+"#")},_replace:function(h,f,g){if(d){return g.replace(h,function(){var l=f,j=arguments,k;for(k=0;k<j.length-2;k++){if(j[k]===b){l=l.replace(new RegExp("\\$"+k,"g"),"")}else{l=l.replace(new RegExp("\\$"+k,"g"),j[k])}}return l})}return g.replace(h,f)}};c._init();e.tinymce=e.tinyMCE=c})(window);(function(f,e){var d=e.is,b=/^(href|src|style)$/i,c;if(!f&&window.console){return console.log("Load jQuery first!")}e.$=f;e.adapter={patchEditor:function(j){var i=f.fn;function h(m,n){var l=this;if(n){l.removeAttr("data-mce-style")}return i.css.apply(l,arguments)}function g(m,n){var l=this;if(b.test(m)){if(n!==c){l.each(function(o,p){j.dom.setAttrib(p,m,n)});return l}else{return l.attr("data-mce-"+m)}}return i.attr.apply(l,arguments)}function k(l){if(l.css!==h){l.css=h;l.attr=g;l.tinymce=j;l.pushStack=function(){return k(i.pushStack.apply(this,arguments))}}return l}j.$=function(l,m){var n=j.getDoc();return k(f(l||n,n||m))}}};e.extend=f.extend;e.extend(e,{map:f.map,grep:function(g,h){return f.grep(g,h||function(){return 1})},inArray:function(g,h){return f.inArray(h,g||[])}});var a={"tinymce.dom.DOMUtils":{select:function(i,h){var g=this;return f.find(i,g.get(h)||g.get(g.settings.root_element)||g.doc,[])},is:function(h,g){if(h.nodeType!==1&&g==="*"){return false}return f(this.get(h)).is(g)}}};e.onCreate=function(g,i,h){e.extend(h,a[i])}})(window.jQuery,tinymce);tinymce.create("tinymce.util.Dispatcher",{scope:null,listeners:null,inDispatch:false,Dispatcher:function(a){this.scope=a||this;this.listeners=[]},add:function(b,a){this.listeners.push({cb:b,scope:a||this.scope});return b},addToTop:function(d,b){var a=this,c={cb:d,scope:b||a.scope};if(a.inDispatch){a.listeners=[c].concat(a.listeners)}else{a.listeners.unshift(c)}return d},remove:function(c){var b=this.listeners,a=null;tinymce.each(b,function(e,d){if(c==e.cb){a=e;b.splice(d,1);return false}});return a},dispatch:function(){var a=this,e,b=arguments,c,d=a.listeners,f;a.inDispatch=true;for(c=0;c<d.length;c++){f=d[c];e=f.cb.apply(f.scope,b.length>0?b:[f.scope]);if(e===false){break}}a.inDispatch=false;return e}});(function(){var a=tinymce.each;tinymce.create("tinymce.util.URI",{URI:function(e,g){var f=this,i,d,c,h;e=tinymce.trim(e);g=f.settings=g||{};if(/^([\w\-]+):([^\/]{2})/i.test(e)||/^\s*#/.test(e)){f.source=e;return}if(e.indexOf("/")===0&&e.indexOf("//")!==0){e=(g.base_uri?g.base_uri.protocol||"http":"http")+"://mce_host"+e}if(!/^[\w\-]*:?\/\//.test(e)){h=g.base_uri?g.base_uri.path:new tinymce.util.URI(location.href).directory;e=((g.base_uri&&g.base_uri.protocol)||"http")+"://mce_host"+f.toAbsPath(h,e)}e=e.replace(/@@/g,"(mce_at)");e=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@\/]*):?([^:@\/]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e);a(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],function(b,j){var k=e[j];if(k){k=k.replace(/\(mce_at\)/g,"@@")}f[b]=k});c=g.base_uri;if(c){if(!f.protocol){f.protocol=c.protocol}if(!f.userInfo){f.userInfo=c.userInfo}if(!f.port&&f.host==="mce_host"){f.port=c.port}if(!f.host||f.host==="mce_host"){f.host=c.host}f.source=""}},setPath:function(c){var b=this;c=/^(.*?)\/?(\w+)?$/.exec(c);b.path=c[0];b.directory=c[1];b.file=c[2];b.source="";b.getURI()},toRelative:function(b){var d=this,f;if(b==="./"){return b}b=new tinymce.util.URI(b,{base_uri:d});if((b.host!="mce_host"&&d.host!=b.host&&b.host)||d.port!=b.port||d.protocol!=b.protocol){return b.getURI()}var c=d.getURI(),e=b.getURI();if(c==e||(c.charAt(c.length-1)=="/"&&c.substr(0,c.length-1)==e)){return c}f=d.toRelPath(d.path,b.path);if(b.query){f+="?"+b.query}if(b.anchor){f+="#"+b.anchor}return f},toAbsolute:function(b,c){b=new tinymce.util.URI(b,{base_uri:this});return b.getURI(this.host==b.host&&this.protocol==b.protocol?c:0)},toRelPath:function(g,h){var c,f=0,d="",e,b;g=g.substring(0,g.lastIndexOf("/"));g=g.split("/");c=h.split("/");if(g.length>=c.length){for(e=0,b=g.length;e<b;e++){if(e>=c.length||g[e]!=c[e]){f=e+1;break}}}if(g.length<c.length){for(e=0,b=c.length;e<b;e++){if(e>=g.length||g[e]!=c[e]){f=e+1;break}}}if(f===1){return h}for(e=0,b=g.length-(f-1);e<b;e++){d+="../"}for(e=f-1,b=c.length;e<b;e++){if(e!=f-1){d+="/"+c[e]}else{d+=c[e]}}return d},toAbsPath:function(e,f){var c,b=0,h=[],d,g;d=/\/$/.test(f)?"/":"";e=e.split("/");f=f.split("/");a(e,function(i){if(i){h.push(i)}});e=h;for(c=f.length-1,h=[];c>=0;c--){if(f[c].length===0||f[c]==="."){continue}if(f[c]===".."){b++;continue}if(b>0){b--;continue}h.push(f[c])}c=e.length-b;if(c<=0){g=h.reverse().join("/")}else{g=e.slice(0,c).join("/")+"/"+h.reverse().join("/")}if(g.indexOf("/")!==0){g="/"+g}if(d&&g.lastIndexOf("/")!==g.length-1){g+=d}return g},getURI:function(d){var c,b=this;if(!b.source||d){c="";if(!d){if(b.protocol){c+=b.protocol+"://"}if(b.userInfo){c+=b.userInfo+"@"}if(b.host){c+=b.host}if(b.port){c+=":"+b.port}}if(b.path){c+=b.path}if(b.query){c+="?"+b.query}if(b.anchor){c+="#"+b.anchor}b.source=c}return b.source}})})();(function(){var a=tinymce.each;tinymce.create("static tinymce.util.Cookie",{getHash:function(d){var b=this.get(d),c;if(b){a(b.split("&"),function(e){e=e.split("=");c=c||{};c[unescape(e[0])]=unescape(e[1])})}return c},setHash:function(j,b,g,f,i,c){var h="";a(b,function(e,d){h+=(!h?"":"&")+escape(d)+"="+escape(e)});this.set(j,h,g,f,i,c)},get:function(i){var h=document.cookie,g,f=i+"=",d;if(!h){return}d=h.indexOf("; "+f);if(d==-1){d=h.indexOf(f);if(d!==0){return null}}else{d+=2}g=h.indexOf(";",d);if(g==-1){g=h.length}return unescape(h.substring(d+f.length,g))},set:function(i,b,g,f,h,c){document.cookie=i+"="+escape(b)+((g)?"; expires="+g.toGMTString():"")+((f)?"; path="+escape(f):"")+((h)?"; domain="+h:"")+((c)?"; secure":"")},remove:function(c,e,d){var b=new Date();b.setTime(b.getTime()-1000);this.set(c,"",b,e,d)}})})();(function(){function serialize(o,quote){var i,v,t,name;quote=quote||'"';if(o==null){return"null"}t=typeof o;if(t=="string"){v="\bb\tt\nn\ff\rr\"\"''\\\\";return quote+o.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g,function(a,b){if(quote==='"'&&a==="'"){return a}i=v.indexOf(b);if(i+1){return"\\"+v.charAt(i+1)}a=b.charCodeAt().toString(16);return"\\u"+"0000".substring(a.length)+a})+quote}if(t=="object"){if(o.hasOwnProperty&&Object.prototype.toString.call(o)==="[object Array]"){for(i=0,v="[";i<o.length;i++){v+=(i>0?",":"")+serialize(o[i],quote)}return v+"]"}v="{";for(name in o){if(o.hasOwnProperty(name)){v+=typeof o[name]!="function"?(v.length>1?","+quote:quote)+name+quote+":"+serialize(o[name],quote):""}}return v+"}"}return""+o}tinymce.util.JSON={serialize:serialize,parse:function(s){try{return eval("("+s+")")}catch(ex){}}}})();tinymce.create("static tinymce.util.XHR",{send:function(g){var a,e,b=window,h=0;function f(){if(!g.async||a.readyState==4||h++>10000){if(g.success&&h<10000&&a.status==200){g.success.call(g.success_scope,""+a.responseText,a,g)}else{if(g.error){g.error.call(g.error_scope,h>10000?"TIMED_OUT":"GENERAL",a,g)}}a=null}else{b.setTimeout(f,10)}}g.scope=g.scope||this;g.success_scope=g.success_scope||g.scope;g.error_scope=g.error_scope||g.scope;g.async=g.async===false?false:true;g.data=g.data||"";function d(i){a=0;try{a=new ActiveXObject(i)}catch(c){}return a}a=b.XMLHttpRequest?new XMLHttpRequest():d("Microsoft.XMLHTTP")||d("Msxml2.XMLHTTP");if(a){if(a.overrideMimeType){a.overrideMimeType(g.content_type)}a.open(g.type||(g.data?"POST":"GET"),g.url,g.async);if(g.content_type){a.setRequestHeader("Content-Type",g.content_type)}a.setRequestHeader("X-Requested-With","XMLHttpRequest");a.send(g.data);if(!g.async){return f()}e=b.setTimeout(f,10)}}});(function(){var c=tinymce.extend,b=tinymce.util.JSON,a=tinymce.util.XHR;tinymce.create("tinymce.util.JSONRequest",{JSONRequest:function(d){this.settings=c({},d);this.count=0},send:function(f){var e=f.error,d=f.success;f=c(this.settings,f);f.success=function(h,g){h=b.parse(h);if(typeof(h)=="undefined"){h={error:"JSON Parse error."}}if(h.error){e.call(f.error_scope||f.scope,h.error,g)}else{d.call(f.success_scope||f.scope,h.result)}};f.error=function(h,g){if(e){e.call(f.error_scope||f.scope,h,g)}};f.data=b.serialize({id:f.id||"c"+(this.count++),method:f.method,params:f.params});f.content_type="application/json";a.send(f)},"static":{sendRPC:function(d){return new tinymce.util.JSONRequest().send(d)}}})}());(function(a){a.VK={BACKSPACE:8,DELETE:46,DOWN:40,ENTER:13,LEFT:37,RIGHT:39,SPACEBAR:32,TAB:9,UP:38,modifierPressed:function(b){return b.shiftKey||b.ctrlKey||b.altKey},metaKeyPressed:function(b){return a.isMac?b.metaKey:b.ctrlKey&&!b.altKey}}})(tinymce);tinymce.util.Quirks=function(a){var j=tinymce.VK,f=j.BACKSPACE,l=j.DELETE,e=a.dom,n=a.selection,J=a.settings,y=a.parser,q=a.serializer,G=tinymce.each;function C(P,O){try{a.getDoc().execCommand(P,false,O)}catch(N){}}function p(){var N=a.getDoc().documentMode;return N?N:6}function B(N){return N.isDefaultPrevented()}function L(){function N(T){var P,R,O,U,Q,S,V;function W(){if(Q.nodeType==3){if(T&&S==Q.length){return true}if(!T&&S===0){return true}}}P=n.getRng();var X=[P.startContainer,P.startOffset,P.endContainer,P.endOffset];if(!P.collapsed){T=true}Q=P[(T?"start":"end")+"Container"];S=P[(T?"start":"end")+"Offset"];if(Q.nodeType==3){R=e.getParent(P.startContainer,e.isBlock);if(T){R=e.getNext(R,e.isBlock)}if(R&&(W()||!P.collapsed)){O=e.create("em",{id:"__mceDel"});G(tinymce.grep(R.childNodes),function(Y){O.appendChild(Y)});R.appendChild(O)}}P=e.createRng();P.setStart(X[0],X[1]);P.setEnd(X[2],X[3]);n.setRng(P);a.getDoc().execCommand(T?"ForwardDelete":"Delete",false,null);if(O){U=n.getBookmark();while(V=e.get("__mceDel")){e.remove(V,true)}n.moveToBookmark(U)}}a.onKeyDown.add(function(O,Q){var P;P=Q.keyCode==l;if(!B(Q)&&(P||Q.keyCode==f)&&!j.modifierPressed(Q)){Q.preventDefault();N(P)}});a.addCommand("Delete",function(){N()})}function s(){function N(Q){var P=e.create("body");var R=Q.cloneContents();P.appendChild(R);return n.serializer.serialize(P,{format:"html"})}function O(P){var R=N(P);var S=e.createRng();S.selectNode(a.getBody());var Q=N(S);return R===Q}a.onKeyDown.add(function(Q,S){var R=S.keyCode,P;if(!B(S)&&(R==l||R==f)){P=Q.selection.isCollapsed();if(P&&!e.isEmpty(Q.getBody())){return}if(tinymce.isIE&&!P){return}if(!P&&!O(Q.selection.getRng())){return}Q.setContent("");Q.selection.setCursorLocation(Q.getBody(),0);Q.nodeChanged()}})}function K(){a.onKeyDown.add(function(N,O){if(!B(O)&&O.keyCode==65&&j.metaKeyPressed(O)){O.preventDefault();N.execCommand("SelectAll")}})}function M(){if(!a.settings.content_editable){e.bind(a.getDoc(),"focusin",function(N){n.setRng(n.getRng())});e.bind(a.getDoc(),"mousedown",function(N){if(N.target==a.getDoc().documentElement){a.getWin().focus();n.setRng(n.getRng())}})}}function D(){a.onKeyDown.add(function(N,Q){if(!B(Q)&&Q.keyCode===f){if(n.isCollapsed()&&n.getRng(true).startOffset===0){var P=n.getNode();var O=P.previousSibling;if(O&&O.nodeName&&O.nodeName.toLowerCase()==="hr"){e.remove(O);tinymce.dom.Event.cancel(Q)}}}})}function A(){if(!Range.prototype.getClientRects){a.onMouseDown.add(function(O,P){if(!B(P)&&P.target.nodeName==="HTML"){var N=O.getBody();N.blur();setTimeout(function(){N.focus()},0)}})}}function h(){a.onClick.add(function(N,O){O=O.target;if(/^(IMG|HR)$/.test(O.nodeName)){n.getSel().setBaseAndExtent(O,0,O,1)}if(O.nodeName=="A"&&e.hasClass(O,"mceItemAnchor")){n.select(O)}N.nodeChanged()})}function c(){function O(){var Q=e.getAttribs(n.getStart().cloneNode(false));return function(){var R=n.getStart();if(R!==a.getBody()){e.setAttrib(R,"style",null);G(Q,function(S){R.setAttributeNode(S.cloneNode(true))})}}}function N(){return !n.isCollapsed()&&e.getParent(n.getStart(),e.isBlock)!=e.getParent(n.getEnd(),e.isBlock)}function P(Q,R){R.preventDefault();return false}a.onKeyPress.add(function(Q,S){var R;if(!B(S)&&(S.keyCode==8||S.keyCode==46)&&N()){R=O();Q.getDoc().execCommand("delete",false,null);R();S.preventDefault();return false}});e.bind(a.getDoc(),"cut",function(R){var Q;if(!B(R)&&N()){Q=O();a.onKeyUp.addToTop(P);setTimeout(function(){Q();a.onKeyUp.remove(P)},0)}})}function b(){var O,N;e.bind(a.getDoc(),"selectionchange",function(){if(N){clearTimeout(N);N=0}N=window.setTimeout(function(){var P=n.getRng();if(!O||!tinymce.dom.RangeUtils.compareRanges(P,O)){a.nodeChanged();O=P}},50)})}function z(){document.body.setAttribute("role","application")}function v(){a.onKeyDown.add(function(N,P){if(!B(P)&&P.keyCode===f){if(n.isCollapsed()&&n.getRng(true).startOffset===0){var O=n.getNode().previousSibling;if(O&&O.nodeName&&O.nodeName.toLowerCase()==="table"){return tinymce.dom.Event.cancel(P)}}}})}function E(){if(p()>7){return}C("RespectVisibilityInDesign",true);a.contentStyles.push(".mceHideBrInPre pre br {display: none}");e.addClass(a.getBody(),"mceHideBrInPre");y.addNodeFilter("pre",function(N,P){var Q=N.length,S,O,T,R;while(Q--){S=N[Q].getAll("br");O=S.length;while(O--){T=S[O];R=T.prev;if(R&&R.type===3&&R.value.charAt(R.value-1)!="\n"){R.value+="\n"}else{T.parent.insert(new tinymce.html.Node("#text",3),T,true).value="\n"}}}});q.addNodeFilter("pre",function(N,P){var Q=N.length,S,O,T,R;while(Q--){S=N[Q].getAll("br");O=S.length;while(O--){T=S[O];R=T.prev;if(R&&R.type==3){R.value=R.value.replace(/\r?\n$/,"")}}}})}function g(){e.bind(a.getBody(),"mouseup",function(P){var O,N=n.getNode();if(N.nodeName=="IMG"){if(O=e.getStyle(N,"width")){e.setAttrib(N,"width",O.replace(/[^0-9%]+/g,""));e.setStyle(N,"width","")}if(O=e.getStyle(N,"height")){e.setAttrib(N,"height",O.replace(/[^0-9%]+/g,""));e.setStyle(N,"height","")}}})}function d(){a.onKeyDown.add(function(T,U){var S,N,O,Q,R,V,P;S=U.keyCode==l;if(!B(U)&&(S||U.keyCode==f)&&!j.modifierPressed(U)){N=n.getRng();O=N.startContainer;Q=N.startOffset;P=N.collapsed;if(O.nodeType==3&&O.nodeValue.length>0&&((Q===0&&!P)||(P&&Q===(S?0:1)))){V=O.previousSibling;if(V&&V.nodeName=="IMG"){return}nonEmptyElements=T.schema.getNonEmptyElements();U.preventDefault();R=e.create("br",{id:"__tmp"});O.parentNode.insertBefore(R,O);T.getDoc().execCommand(S?"ForwardDelete":"Delete",false,null);O=n.getRng().startContainer;V=O.previousSibling;if(V&&V.nodeType==1&&!e.isBlock(V)&&e.isEmpty(V)&&!nonEmptyElements[V.nodeName.toLowerCase()]){e.remove(V)}e.remove("__tmp")}}})}function I(){a.onKeyDown.add(function(R,S){var P,O,T,N,Q;if(B(S)||S.keyCode!=j.BACKSPACE){return}P=n.getRng();O=P.startContainer;T=P.startOffset;N=e.getRoot();Q=O;if(!P.collapsed||T!==0){return}while(Q&&Q.parentNode&&Q.parentNode.firstChild==Q&&Q.parentNode!=N){Q=Q.parentNode}if(Q.tagName==="BLOCKQUOTE"){R.formatter.toggle("blockquote",null,Q);P=e.createRng();P.setStart(O,0);P.setEnd(O,0);n.setRng(P)}})}function H(){function N(){a._refreshContentEditable();C("StyleWithCSS",false);C("enableInlineTableEditing",false);if(!J.object_resizing){C("enableObjectResizing",false)}}if(!J.readonly){a.onBeforeExecCommand.add(N);a.onMouseDown.add(N)}}function u(){function N(O,P){G(e.select("a"),function(S){var Q=S.parentNode,R=e.getRoot();if(Q.lastChild===S){while(Q&&!e.isBlock(Q)){if(Q.parentNode.lastChild!==Q||Q===R){return}Q=Q.parentNode}e.add(Q,"br",{"data-mce-bogus":1})}})}a.onExecCommand.add(function(O,P){if(P==="CreateLink"){N(O)}});a.onSetContent.add(n.onSetContent.add(N))}function o(){if(J.forced_root_block){a.onInit.add(function(){C("DefaultParagraphSeparator",J.forced_root_block)})}}function r(){function N(P,O){if(!P||!O.initial){a.execCommand("mceRepaint")}}a.onUndo.add(N);a.onRedo.add(N);a.onSetContent.add(N)}function i(){a.onKeyDown.add(function(O,P){var N;if(!B(P)&&P.keyCode==f){N=O.getDoc().selection.createRange();if(N&&N.item){P.preventDefault();O.undoManager.beforeChange();e.remove(N.item(0));O.undoManager.add()}}})}function t(){var N;if(p()>=10){N="";G("p div h1 h2 h3 h4 h5 h6".split(" "),function(O,P){N+=(P>0?",":"")+O+":empty"});a.contentStyles.push(N+"{padding-right: 1px !important}")}}function x(){var P,O,af,N,aa,ad,ab,ae,Q,R,ac,Y,X,Z=document,V=a.getDoc();if(!J.object_resizing||J.webkit_fake_resize===false){return}C("enableObjectResizing",false);ac={n:[0.5,0,0,-1],e:[1,0.5,1,0],s:[0.5,1,0,1],w:[0,0.5,-1,0],nw:[0,0,-1,-1],ne:[1,0,1,-1],se:[1,1,1,1],sw:[0,1,-1,1]};function T(aj){var ai,ah;ai=aj.screenX-ad;ah=aj.screenY-ab;Y=ai*aa[2]+ae;X=ah*aa[3]+Q;Y=Y<5?5:Y;X=X<5?5:X;if(j.modifierPressed(aj)||(af.nodeName=="IMG"&&aa[2]*aa[3]!==0)){Y=Math.round(X/R);X=Math.round(Y*R)}e.setStyles(N,{width:Y,height:X});if(aa[2]<0&&N.clientWidth<=Y){e.setStyle(N,"left",P+(ae-Y))}if(aa[3]<0&&N.clientHeight<=X){e.setStyle(N,"top",O+(Q-X))}}function ag(){function ah(ai,aj){if(aj){if(af.style[ai]||!a.schema.isValid(af.nodeName.toLowerCase(),ai)){e.setStyle(af,ai,aj)}else{e.setAttrib(af,ai,aj)}}}ah("width",Y);ah("height",X);e.unbind(V,"mousemove",T);e.unbind(V,"mouseup",ag);if(Z!=V){e.unbind(Z,"mousemove",T);e.unbind(Z,"mouseup",ag)}e.remove(N);S(af)}function S(ak){var ai,aj,ah;U();ai=e.getPos(ak);P=ai.x;O=ai.y;aj=ak.offsetWidth;ah=ak.offsetHeight;if(af!=ak){af=ak;Y=X=0}G(ac,function(an,al){var am;am=e.get("mceResizeHandle"+al);if(!am){am=e.add(V.documentElement,"div",{id:"mceResizeHandle"+al,"class":"mceResizeHandle",style:"cursor:"+al+"-resize; margin:0; padding:0"});e.bind(am,"mousedown",function(ao){ao.preventDefault();ag();ad=ao.screenX;ab=ao.screenY;ae=af.clientWidth;Q=af.clientHeight;R=Q/ae;aa=an;N=af.cloneNode(true);e.addClass(N,"mceClonedResizable");e.setStyles(N,{left:P,top:O,margin:0});V.documentElement.appendChild(N);e.bind(V,"mousemove",T);e.bind(V,"mouseup",ag);if(Z!=V){e.bind(Z,"mousemove",T);e.bind(Z,"mouseup",ag)}})}else{e.show(am)}e.setStyles(am,{left:(aj*an[0]+P)-(am.offsetWidth/2),top:(ah*an[1]+O)-(am.offsetHeight/2)})});if(!tinymce.isOpera&&af.nodeName=="IMG"){af.setAttribute("data-mce-selected","1")}}function U(){if(af){af.removeAttribute("data-mce-selected")}for(var ah in ac){e.hide("mceResizeHandle"+ah)}}a.contentStyles.push(".mceResizeHandle {position: absolute;border: 1px solid black;background: #FFF;width: 5px;height: 5px;z-index: 10000}.mceResizeHandle:hover {background: #000}img[data-mce-selected] {outline: 1px solid black}img.mceClonedResizable, table.mceClonedResizable {position: absolute;outline: 1px dashed black;opacity: .5;z-index: 10000}");function W(){var ah=e.getParent(n.getNode(),"table,img");G(e.select("img[data-mce-selected]"),function(ai){ai.removeAttribute("data-mce-selected")});if(ah){S(ah)}else{U()}}a.onNodeChange.add(W);e.bind(V,"selectionchange",W);a.serializer.addAttributeFilter("data-mce-selected",function(ah,ai){var aj=ah.length;while(aj--){ah[aj].attr(ai,null)}})}function F(){if(p()<9){y.addNodeFilter("noscript",function(N){var O=N.length,P,Q;while(O--){P=N[O];Q=P.firstChild;if(Q){P.attr("data-mce-innertext",Q.value)}}});q.addNodeFilter("noscript",function(N){var O=N.length,P,R,Q;while(O--){P=N[O];R=N[O].firstChild;if(R){R.value=tinymce.html.Entities.decode(R.value)}else{Q=P.attributes.map["data-mce-innertext"];if(Q){P.attr("data-mce-innertext",null);R=new tinymce.html.Node("#text",3);R.value=Q;R.raw=true;P.append(R)}}}})}}function m(){a.contentStyles.push("body {min-height: 100px}");a.onClick.add(function(N,O){if(O.target.nodeName=="HTML"){a.execCommand("SelectAll");a.selection.collapse(true);a.nodeChanged()}})}function k(){a.onInit.add(function(){var N;a.getBody().addEventListener("mscontrolselect",function(O){setTimeout(function(){if(a.selection.getNode()!=O.target){N=a.selection.getRng();n.fakeRng=a.dom.createRng();n.fakeRng.setStartBefore(O.target);n.fakeRng.setEndAfter(O.target)}},0)},false);a.getDoc().addEventListener("selectionchange",function(O){if(N&&!tinymce.dom.RangeUtils.compareRanges(a.selection.getRng(),N)){n.fakeRng=N=null}},false)})}v();I();s();if(tinymce.isWebKit){d();L();M();h();o();if(tinymce.isIDevice){b()}else{x();K()}}if(tinymce.isIE&&!tinymce.isIE11){D();z();E();g();i();t();F()}if(tinymce.isIE11){m();k()}if(tinymce.isGecko&&!tinymce.isIE11){D();A();c();H();u();r()}if(tinymce.isOpera){x()}};(function(j){var a,g,d,k=/[&<>\"\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,b=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,f=/[<>&\"\']/g,c=/&(#x|#)?([\w]+);/g,i={128:"\u20AC",130:"\u201A",131:"\u0192",132:"\u201E",133:"\u2026",134:"\u2020",135:"\u2021",136:"\u02C6",137:"\u2030",138:"\u0160",139:"\u2039",140:"\u0152",142:"\u017D",145:"\u2018",146:"\u2019",147:"\u201C",148:"\u201D",149:"\u2022",150:"\u2013",151:"\u2014",152:"\u02DC",153:"\u2122",154:"\u0161",155:"\u203A",156:"\u0153",158:"\u017E",159:"\u0178"};g={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;"};d={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"};function h(l){var m;m=document.createElement("div");m.innerHTML=l;return m.textContent||m.innerText||l}function e(m,p){var n,o,l,q={};if(m){m=m.split(",");p=p||10;for(n=0;n<m.length;n+=2){o=String.fromCharCode(parseInt(m[n],p));if(!g[o]){l="&"+m[n+1]+";";q[o]=l;q[l]=o}}return q}}a=e("50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,t9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro",32);j.html=j.html||{};j.html.Entities={encodeRaw:function(m,l){return m.replace(l?k:b,function(n){return g[n]||n})},encodeAllRaw:function(l){return(""+l).replace(f,function(m){return g[m]||m})},encodeNumeric:function(m,l){return m.replace(l?k:b,function(n){if(n.length>1){return"&#"+(((n.charCodeAt(0)-55296)*1024)+(n.charCodeAt(1)-56320)+65536)+";"}return g[n]||"&#"+n.charCodeAt(0)+";"})},encodeNamed:function(n,l,m){m=m||a;return n.replace(l?k:b,function(o){return g[o]||m[o]||o})},getEncodeFunc:function(l,o){var p=j.html.Entities;o=e(o)||a;function m(r,q){return r.replace(q?k:b,function(s){return g[s]||o[s]||"&#"+s.charCodeAt(0)+";"||s})}function n(r,q){return p.encodeNamed(r,q,o)}l=j.makeMap(l.replace(/\+/g,","));if(l.named&&l.numeric){return m}if(l.named){if(o){return n}return p.encodeNamed}if(l.numeric){return p.encodeNumeric}return p.encodeRaw},decode:function(l){return l.replace(c,function(n,m,o){if(m){o=parseInt(o,m.length===2?16:10);if(o>65535){o-=65536;return String.fromCharCode(55296+(o>>10),56320+(o&1023))}else{return i[o]||String.fromCharCode(o)}}return d[n]||a[n]||h(n)})}}})(tinymce);tinymce.html.Styles=function(d,f){var k=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,h=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,b=/\s*([^:]+):\s*([^;]+);?/g,l=/\s+$/,m=/rgb/,e,g,a={},j;d=d||{};j="\\\" \\' \\; \\: ; : \uFEFF".split(" ");for(g=0;g<j.length;g++){a[j[g]]="\uFEFF"+g;a["\uFEFF"+g]=j[g]}function c(n,q,p,i){function o(r){r=parseInt(r).toString(16);return r.length>1?r:"0"+r}return"#"+o(q)+o(p)+o(i)}return{toHex:function(i){return i.replace(k,c)},parse:function(s){var z={},q,n,x,r,v=d.url_converter,y=d.url_converter_scope||this;function p(D,G){var F,C,B,E;if(z["border-image"]==="none"){delete z["border-image"]}F=z[D+"-top"+G];if(!F){return}C=z[D+"-right"+G];if(F!=C){return}B=z[D+"-bottom"+G];if(C!=B){return}E=z[D+"-left"+G];if(B!=E){return}z[D+G]=E;delete z[D+"-top"+G];delete z[D+"-right"+G];delete z[D+"-bottom"+G];delete z[D+"-left"+G]}function u(C){var D=z[C],B;if(!D||D.indexOf(" ")<0){return}D=D.split(" ");B=D.length;while(B--){if(D[B]!==D[0]){return false}}z[C]=D[0];return true}function A(D,C,B,E){if(!u(C)){return}if(!u(B)){return}if(!u(E)){return}z[D]=z[C]+" "+z[B]+" "+z[E];delete z[C];delete z[B];delete z[E]}function t(B){r=true;return a[B]}function i(C,B){if(r){C=C.replace(/\uFEFF[0-9]/g,function(D){return a[D]})}if(!B){C=C.replace(/\\([\'\";:])/g,"$1")}return C}function o(C,B,F,E,G,D){G=G||D;if(G){G=i(G);return"'"+G.replace(/\'/g,"\\'")+"'"}B=i(B||F||E);if(v){B=v.call(y,B,"style")}return"url('"+B.replace(/\'/g,"\\'")+"')"}if(s){s=s.replace(/\\[\"\';:\uFEFF]/g,t).replace(/\"[^\"]+\"|\'[^\']+\'/g,function(B){return B.replace(/[;:]/g,t)});while(q=b.exec(s)){n=q[1].replace(l,"").toLowerCase();x=q[2].replace(l,"");if(n&&x.length>0){if(n==="font-weight"&&x==="700"){x="bold"}else{if(n==="color"||n==="background-color"){x=x.toLowerCase()}}x=x.replace(k,c);x=x.replace(h,o);z[n]=r?i(x,true):x}b.lastIndex=q.index+q[0].length}p("border","");p("border","-width");p("border","-color");p("border","-style");p("padding","");p("margin","");A("border","border-width","border-style","border-color");if(z.border==="medium none"){delete z.border}}return z},serialize:function(p,r){var o="",n,q;function i(t){var x,u,s,v;x=f.styles[t];if(x){for(u=0,s=x.length;u<s;u++){t=x[u];v=p[t];if(v!==e&&v.length>0){o+=(o.length>0?" ":"")+t+": "+v+";"}}}}if(r&&f&&f.styles){i("*");i(r)}else{for(n in p){q=p[n];if(q!==e&&q.length>0){o+=(o.length>0?" ":"")+n+": "+q+";"}}}return o}}};(function(f){var a={},e=f.makeMap,g=f.each;function d(j,i){return j.split(i||",")}function h(m,l){var j,k={};function i(n){return n.replace(/[A-Z]+/g,function(o){return i(m[o])})}for(j in m){if(m.hasOwnProperty(j)){m[j]=i(m[j])}}i(l).replace(/#/g,"#text").replace(/(\w+)\[([^\]]+)\]\[([^\]]*)\]/g,function(q,o,n,p){n=d(n,"|");k[o]={attributes:e(n),attributesOrder:n,children:e(p,"|",{"#comment":{}})}});return k}function b(){var i=a.html5;if(!i){i=a.html5=h({A:"id|accesskey|class|dir|draggable|item|hidden|itemprop|role|spellcheck|style|subject|title|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup",B:"#|a|abbr|area|audio|b|bdo|br|button|canvas|cite|code|command|datalist|del|dfn|em|embed|i|iframe|img|input|ins|kbd|keygen|label|link|map|mark|meta|meter|noscript|object|output|progress|q|ruby|samp|script|select|small|span|strong|sub|sup|svg|textarea|time|var|video|wbr",C:"#|a|abbr|area|address|article|aside|audio|b|bdo|blockquote|br|button|canvas|cite|code|command|datalist|del|details|dfn|dialog|div|dl|em|embed|fieldset|figure|footer|form|h1|h2|h3|h4|h5|h6|header|hgroup|hr|i|iframe|img|input|ins|kbd|keygen|label|link|map|mark|menu|meta|meter|nav|noscript|ol|object|output|p|pre|progress|q|ruby|samp|script|section|select|small|span|strong|style|sub|sup|svg|table|textarea|time|ul|var|video"},"html[A|manifest][body|head]head[A][base|command|link|meta|noscript|script|style|title]title[A][#]base[A|href|target][]link[A|href|rel|media|type|sizes][]meta[A|http-equiv|name|content|charset][]style[A|type|media|scoped][#]script[A|charset|type|src|defer|async][#]noscript[A][C]body[A][C]section[A][C]nav[A][C]article[A][C]aside[A][C]h1[A][B]h2[A][B]h3[A][B]h4[A][B]h5[A][B]h6[A][B]hgroup[A][h1|h2|h3|h4|h5|h6]header[A][C]footer[A][C]address[A][C]p[A][B]br[A][]pre[A][B]dialog[A][dd|dt]blockquote[A|cite][C]ol[A|start|reversed][li]ul[A][li]li[A|value][C]dl[A][dd|dt]dt[A][B]dd[A][C]a[A|href|target|ping|rel|media|type][B]em[A][B]strong[A][B]small[A][B]cite[A][B]q[A|cite][B]dfn[A][B]abbr[A][B]code[A][B]var[A][B]samp[A][B]kbd[A][B]sub[A][B]sup[A][B]i[A][B]b[A][B]mark[A][B]progress[A|value|max][B]meter[A|value|min|max|low|high|optimum][B]time[A|datetime][B]ruby[A][B|rt|rp]rt[A][B]rp[A][B]bdo[A][B]span[A][B]ins[A|cite|datetime][B]del[A|cite|datetime][B]figure[A][C|legend|figcaption]figcaption[A][C]img[A|alt|src|height|width|usemap|ismap][]iframe[A|name|src|height|width|sandbox|seamless][]embed[A|src|height|width|type][]object[A|data|type|height|width|usemap|name|form|classid][param]param[A|name|value][]details[A|open][C|legend]command[A|type|label|icon|disabled|checked|radiogroup][]menu[A|type|label][C|li]legend[A][C|B]div[A][C]source[A|src|type|media][]audio[A|src|autobuffer|autoplay|loop|controls][source]video[A|src|autobuffer|autoplay|loop|controls|width|height|poster][source]hr[A][]form[A|accept-charset|action|autocomplete|enctype|method|name|novalidate|target][C]fieldset[A|disabled|form|name][C|legend]label[A|form|for][B]input[A|type|accept|alt|autocomplete|autofocus|checked|disabled|form|formaction|formenctype|formmethod|formnovalidate|formtarget|height|list|max|maxlength|min|multiple|pattern|placeholder|readonly|required|size|src|step|width|files|value|name][]button[A|autofocus|disabled|form|formaction|formenctype|formmethod|formnovalidate|formtarget|name|value|type][B]select[A|autofocus|disabled|form|multiple|name|size][option|optgroup]datalist[A][B|option]optgroup[A|disabled|label][option]option[A|disabled|selected|label|value][]textarea[A|autofocus|disabled|form|maxlength|name|placeholder|readonly|required|rows|cols|wrap][]keygen[A|autofocus|challenge|disabled|form|keytype|name][]output[A|for|form|name][B]canvas[A|width|height][]map[A|name][B|C]area[A|shape|coords|href|alt|target|media|rel|ping|type][]mathml[A][]svg[A][]table[A|border][caption|colgroup|thead|tfoot|tbody|tr]caption[A][C]colgroup[A|span][col]col[A|span][]thead[A][tr]tfoot[A][tr]tbody[A][tr]tr[A][th|td]th[A|headers|rowspan|colspan|scope][B]td[A|headers|rowspan|colspan][C]wbr[A][]")}return i}function c(){var i=a.html4;if(!i){i=a.html4=h({Z:"H|K|N|O|P",Y:"X|form|R|Q",ZG:"E|span|width|align|char|charoff|valign",X:"p|T|div|U|W|isindex|fieldset|table",ZF:"E|align|char|charoff|valign",W:"pre|hr|blockquote|address|center|noframes",ZE:"abbr|axis|headers|scope|rowspan|colspan|align|char|charoff|valign|nowrap|bgcolor|width|height",ZD:"[E][S]",U:"ul|ol|dl|menu|dir",ZC:"p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q",T:"h1|h2|h3|h4|h5|h6",ZB:"X|S|Q",S:"R|P",ZA:"a|G|J|M|O|P",R:"a|H|K|N|O",Q:"noscript|P",P:"ins|del|script",O:"input|select|textarea|label|button",N:"M|L",M:"em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym",L:"sub|sup",K:"J|I",J:"tt|i|b|u|s|strike",I:"big|small|font|basefont",H:"G|F",G:"br|span|bdo",F:"object|applet|img|map|iframe",E:"A|B|C",D:"accesskey|tabindex|onfocus|onblur",C:"onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup",B:"lang|xml:lang|dir",A:"id|class|style|title"},"script[id|charset|type|language|src|defer|xml:space][]style[B|id|type|media|title|xml:space][]object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]param[id|name|value|valuetype|type][]p[E|align][#|S]a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]br[A|clear][]span[E][#|S]bdo[A|C|B][#|S]applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]h1[E|align][#|S]img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]map[B|C|A|name][X|form|Q|area]h2[E|align][#|S]iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]h3[E|align][#|S]tt[E][#|S]i[E][#|S]b[E][#|S]u[E][#|S]s[E][#|S]strike[E][#|S]big[E][#|S]small[E][#|S]font[A|B|size|color|face][#|S]basefont[id|size|color|face][]em[E][#|S]strong[E][#|S]dfn[E][#|S]code[E][#|S]q[E|cite][#|S]samp[E][#|S]kbd[E][#|S]var[E][#|S]cite[E][#|S]abbr[E][#|S]acronym[E][#|S]sub[E][#|S]sup[E][#|S]input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]optgroup[E|disabled|label][option]option[E|selected|disabled|label|value][]textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]label[E|for|accesskey|onfocus|onblur][#|S]button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]h4[E|align][#|S]ins[E|cite|datetime][#|Y]h5[E|align][#|S]del[E|cite|datetime][#|Y]h6[E|align][#|S]div[E|align][#|Y]ul[E|type|compact][li]li[E|type|value][#|Y]ol[E|type|compact|start][li]dl[E|compact][dt|dd]dt[E][#|S]dd[E][#|Y]menu[E|compact][li]dir[E|compact][li]pre[E|width|xml:space][#|ZA]hr[E|align|noshade|size|width][]blockquote[E|cite][#|Y]address[E][#|S|p]center[E][#|Y]noframes[E][#|Y]isindex[A|B|prompt][]fieldset[E][#|legend|Y]legend[E|accesskey|align][#|S]table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]caption[E|align][#|S]col[ZG][]colgroup[ZG][col]thead[ZF][tr]tr[ZF|bgcolor][th|td]th[E|ZE][#|Y]form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]noscript[E][#|Y]td[E|ZE][#|Y]tfoot[ZF][tr]tbody[ZF][tr]area[E|D|shape|coords|href|nohref|alt|target][]base[id|href|target][]body[E|onload|onunload|background|bgcolor|text|link|vlink|alink][#|Y]")}return i}f.html.Schema=function(A){var u=this,s={},k={},j=[],D,y;var o,q,z,r,v,n,p={};function m(F,E,H){var G=A[F];if(!G){G=a[F];if(!G){G=e(E," ",e(E.toUpperCase()," "));G=f.extend(G,H);a[F]=G}}else{G=e(G,",",e(G.toUpperCase()," "))}return G}A=A||{};y=A.schema=="html5"?b():c();if(A.verify_html===false){A.valid_elements="*[*]"}if(A.valid_styles){D={};g(A.valid_styles,function(F,E){D[E]=f.explode(F)})}o=m("whitespace_elements","pre script noscript style textarea");q=m("self_closing_elements","colgroup dd dt li option p td tfoot th thead tr");z=m("short_ended_elements","area base basefont br col frame hr img input isindex link meta param embed source wbr");r=m("boolean_attributes","checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected autoplay loop controls");n=m("non_empty_elements","td th iframe video audio object script",z);textBlockElementsMap=m("text_block_elements","h1 h2 h3 h4 h5 h6 p div address pre form blockquote center dir fieldset header footer article section hgroup aside nav figure");v=m("block_elements","hr table tbody thead tfoot th tr td li ol ul caption dl dt dd noscript menu isindex samp option datalist select optgroup",textBlockElementsMap);function i(E){return new RegExp("^"+E.replace(/([?+*])/g,".$1")+"$")}function C(L){var K,G,Z,V,aa,F,I,U,X,Q,Y,ac,O,J,W,E,S,H,ab,ad,P,T,N=/^([#+\-])?([^\[\/]+)(?:\/([^\[]+))?(?:\[([^\]]+)\])?$/,R=/^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,M=/[*?+]/;if(L){L=d(L);if(s["@"]){S=s["@"].attributes;H=s["@"].attributesOrder}for(K=0,G=L.length;K<G;K++){F=N.exec(L[K]);if(F){W=F[1];Q=F[2];E=F[3];X=F[4];O={};J=[];I={attributes:O,attributesOrder:J};if(W==="#"){I.paddEmpty=true}if(W==="-"){I.removeEmpty=true}if(S){for(ad in S){O[ad]=S[ad]}J.push.apply(J,H)}if(X){X=d(X,"|");for(Z=0,V=X.length;Z<V;Z++){F=R.exec(X[Z]);if(F){U={};ac=F[1];Y=F[2].replace(/::/g,":");W=F[3];T=F[4];if(ac==="!"){I.attributesRequired=I.attributesRequired||[];I.attributesRequired.push(Y);U.required=true}if(ac==="-"){delete O[Y];J.splice(f.inArray(J,Y),1);continue}if(W){if(W==="="){I.attributesDefault=I.attributesDefault||[];I.attributesDefault.push({name:Y,value:T});U.defaultValue=T}if(W===":"){I.attributesForced=I.attributesForced||[];I.attributesForced.push({name:Y,value:T});U.forcedValue=T}if(W==="<"){U.validValues=e(T,"?")}}if(M.test(Y)){I.attributePatterns=I.attributePatterns||[];U.pattern=i(Y);I.attributePatterns.push(U)}else{if(!O[Y]){J.push(Y)}O[Y]=U}}}}if(!S&&Q=="@"){S=O;H=J}if(E){I.outputName=Q;s[E]=I}if(M.test(Q)){I.pattern=i(Q);j.push(I)}else{s[Q]=I}}}}}function t(E){s={};j=[];C(E);g(y,function(G,F){k[F]=G.children})}function l(F){var E=/^(~)?(.+)$/;if(F){g(d(F),function(J){var H=E.exec(J),I=H[1]==="~",K=I?"span":"div",G=H[2];k[G]=k[K];p[G]=K;if(!I){v[G.toUpperCase()]={};v[G]={}}if(!s[G]){s[G]=s[K]}g(k,function(L,M){if(L[K]){L[G]=L[K]}})})}}function x(F){var E=/^([+\-]?)(\w+)\[([^\]]+)\]$/;if(F){g(d(F),function(J){var I=E.exec(J),G,H;if(I){H=I[1];if(H){G=k[I[2]]}else{G=k[I[2]]={"#comment":{}}}G=k[I[2]];g(d(I[3],"|"),function(K){if(H==="-"){delete G[K]}else{G[K]={}}})}})}}function B(E){var G=s[E],F;if(G){return G}F=j.length;while(F--){G=j[F];if(G.pattern.test(E)){return G}}}if(!A.valid_elements){g(y,function(F,E){s[E]={attributes:F.attributes,attributesOrder:F.attributesOrder};k[E]=F.children});if(A.schema!="html5"){g(d("strong/b,em/i"),function(E){E=d(E,"/");s[E[1]].outputName=E[0]})}s.img.attributesDefault=[{name:"alt",value:""}];g(d("ol,ul,sub,sup,blockquote,span,font,a,table,tbody,tr,strong,em,b,i"),function(E){if(s[E]){s[E].removeEmpty=true}});g(d("p,h1,h2,h3,h4,h5,h6,th,td,pre,div,address,caption"),function(E){s[E].paddEmpty=true})}else{t(A.valid_elements)}l(A.custom_elements);x(A.valid_children);C(A.extended_valid_elements);x("+ol[ul|ol],+ul[ul|ol]");if(A.invalid_elements){f.each(f.explode(A.invalid_elements),function(E){if(s[E]){delete s[E]}})}if(!B("span")){C("span[!data-mce-type|*]")}u.children=k;u.styles=D;u.getBoolAttrs=function(){return r};u.getBlockElements=function(){return v};u.getTextBlockElements=function(){return textBlockElementsMap};u.getShortEndedElements=function(){return z};u.getSelfClosingElements=function(){return q};u.getNonEmptyElements=function(){return n};u.getWhiteSpaceElements=function(){return o};u.isValidChild=function(E,G){var F=k[E];return !!(F&&F[G])};u.isValid=function(F,E){var H,G,I=B(F);if(I){if(E){if(I.attributes[E]){return true}H=I.attributePatterns;if(H){G=H.length;while(G--){if(H[G].pattern.test(F)){return true}}}}else{return true}}return false};u.getElementRule=B;u.getCustomElements=function(){return p};u.addValidElements=C;u.setValidElements=t;u.addCustomElements=l;u.addValidChildren=x;u.elements=s}})(tinymce);(function(a){a.html.SaxParser=function(c,e){var b=this,d=function(){};c=c||{};b.schema=e=e||new a.html.Schema();if(c.fix_self_closing!==false){c.fix_self_closing=true}a.each("comment cdata text start end pi doctype".split(" "),function(f){if(f){b[f]=c[f]||d}});b.parse=function(E){var n=this,g,G=0,I,B,A=[],N,Q,C,r,z,s,M,H,O,v,m,k,t,R,o,P,F,S,L,f,J,l,D,K,h,x=0,j=a.html.Entities.decode,y,q;function u(T){var V,U;V=A.length;while(V--){if(A[V].name===T){break}}if(V>=0){for(U=A.length-1;U>=V;U--){T=A[U];if(T.valid){n.end(T.name)}}A.length=V}}function p(U,T,Y,X,W){var Z,V;T=T.toLowerCase();Y=T in H?T:j(Y||X||W||"");if(v&&!z&&T.indexOf("data-")!==0){Z=P[T];if(!Z&&F){V=F.length;while(V--){Z=F[V];if(Z.pattern.test(T)){break}}if(V===-1){Z=null}}if(!Z){return}if(Z.validValues&&!(Y in Z.validValues)){return}}N.map[T]=Y;N.push({name:T,value:Y})}l=new RegExp("<(?:(?:!--([\\w\\W]*?)-->)|(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|(?:!DOCTYPE([\\w\\W]*?)>)|(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|(?:\\/([^>]+)>)|(?:([A-Za-z0-9\\-\\:\\.]+)((?:\\s+[^\"'>]+(?:(?:\"[^\"]*\")|(?:'[^']*')|[^>]*))*|\\/|\\s+)>))","g");D=/([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:[^\"])*)\")|(?:\'((?:[^\'])*)\')|([^>\s]+)))?/g;K={script:/<\/script[^>]*>/gi,style:/<\/style[^>]*>/gi,noscript:/<\/noscript[^>]*>/gi};M=e.getShortEndedElements();J=c.self_closing_elements||e.getSelfClosingElements();H=e.getBoolAttrs();v=c.validate;s=c.remove_internals;y=c.fix_self_closing;q=a.isIE;o=/^:/;while(g=l.exec(E)){if(G<g.index){n.text(j(E.substr(G,g.index-G)))}if(I=g[6]){I=I.toLowerCase();if(q&&o.test(I)){I=I.substr(1)}u(I)}else{if(I=g[7]){I=I.toLowerCase();if(q&&o.test(I)){I=I.substr(1)}O=I in M;if(y&&J[I]&&A.length>0&&A[A.length-1].name===I){u(I)}if(!v||(m=e.getElementRule(I))){k=true;if(v){P=m.attributes;F=m.attributePatterns}if(R=g[8]){z=R.indexOf("data-mce-type")!==-1;if(z&&s){k=false}N=[];N.map={};R.replace(D,p)}else{N=[];N.map={}}if(v&&!z){S=m.attributesRequired;L=m.attributesDefault;f=m.attributesForced;if(f){Q=f.length;while(Q--){t=f[Q];r=t.name;h=t.value;if(h==="{$uid}"){h="mce_"+x++}N.map[r]=h;N.push({name:r,value:h})}}if(L){Q=L.length;while(Q--){t=L[Q];r=t.name;if(!(r in N.map)){h=t.value;if(h==="{$uid}"){h="mce_"+x++}N.map[r]=h;N.push({name:r,value:h})}}}if(S){Q=S.length;while(Q--){if(S[Q] in N.map){break}}if(Q===-1){k=false}}if(N.map["data-mce-bogus"]){k=false}}if(k){n.start(I,N,O)}}else{k=false}if(B=K[I]){B.lastIndex=G=g.index+g[0].length;if(g=B.exec(E)){if(k){C=E.substr(G,g.index-G)}G=g.index+g[0].length}else{C=E.substr(G);G=E.length}if(k&&C.length>0){n.text(C,true)}if(k){n.end(I)}l.lastIndex=G;continue}if(!O){if(!R||R.indexOf("/")!=R.length-1){A.push({name:I,valid:k})}else{if(k){n.end(I)}}}}else{if(I=g[1]){n.comment(I)}else{if(I=g[2]){n.cdata(I)}else{if(I=g[3]){n.doctype(I)}else{if(I=g[4]){n.pi(I,g[5])}}}}}}G=g.index+g[0].length}if(G<E.length){n.text(j(E.substr(G)))}for(Q=A.length-1;Q>=0;Q--){I=A[Q];if(I.valid){n.end(I.name)}}}}})(tinymce);(function(d){var c=/^[ \t\r\n]*$/,e={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11};function a(k,l,j){var i,h,f=j?"lastChild":"firstChild",g=j?"prev":"next";if(k[f]){return k[f]}if(k!==l){i=k[g];if(i){return i}for(h=k.parent;h&&h!==l;h=h.parent){i=h[g];if(i){return i}}}}function b(f,g){this.name=f;this.type=g;if(g===1){this.attributes=[];this.attributes.map={}}}d.extend(b.prototype,{replace:function(g){var f=this;if(g.parent){g.remove()}f.insert(g,f);f.remove();return f},attr:function(h,l){var f=this,g,j,k;if(typeof h!=="string"){for(j in h){f.attr(j,h[j])}return f}if(g=f.attributes){if(l!==k){if(l===null){if(h in g.map){delete g.map[h];j=g.length;while(j--){if(g[j].name===h){g=g.splice(j,1);return f}}}return f}if(h in g.map){j=g.length;while(j--){if(g[j].name===h){g[j].value=l;break}}}else{g.push({name:h,value:l})}g.map[h]=l;return f}else{return g.map[h]}}},clone:function(){var g=this,n=new b(g.name,g.type),h,f,m,j,k;if(m=g.attributes){k=[];k.map={};for(h=0,f=m.length;h<f;h++){j=m[h];if(j.name!=="id"){k[k.length]={name:j.name,value:j.value};k.map[j.name]=j.value}}n.attributes=k}n.value=g.value;n.shortEnded=g.shortEnded;return n},wrap:function(g){var f=this;f.parent.insert(g,f);g.append(f);return f},unwrap:function(){var f=this,h,g;for(h=f.firstChild;h;){g=h.next;f.insert(h,f,true);h=g}f.remove()},remove:function(){var f=this,h=f.parent,g=f.next,i=f.prev;if(h){if(h.firstChild===f){h.firstChild=g;if(g){g.prev=null}}else{i.next=g}if(h.lastChild===f){h.lastChild=i;if(i){i.next=null}}else{g.prev=i}f.parent=f.next=f.prev=null}return f},append:function(h){var f=this,g;if(h.parent){h.remove()}g=f.lastChild;if(g){g.next=h;h.prev=g;f.lastChild=h}else{f.lastChild=f.firstChild=h}h.parent=f;return h},insert:function(h,f,i){var g;if(h.parent){h.remove()}g=f.parent||this;if(i){if(f===g.firstChild){g.firstChild=h}else{f.prev.next=h}h.prev=f.prev;h.next=f;f.prev=h}else{if(f===g.lastChild){g.lastChild=h}else{f.next.prev=h}h.next=f.next;h.prev=f;f.next=h}h.parent=g;return h},getAll:function(g){var f=this,h,i=[];for(h=f.firstChild;h;h=a(h,f)){if(h.name===g){i.push(h)}}return i},empty:function(){var g=this,f,h,j;if(g.firstChild){f=[];for(j=g.firstChild;j;j=a(j,g)){f.push(j)}h=f.length;while(h--){j=f[h];j.parent=j.firstChild=j.lastChild=j.next=j.prev=null}}g.firstChild=g.lastChild=null;return g},isEmpty:function(k){var f=this,j=f.firstChild,h,g;if(j){do{if(j.type===1){if(j.attributes.map["data-mce-bogus"]){continue}if(k[j.name]){return false}h=j.attributes.length;while(h--){g=j.attributes[h].name;if(g==="name"||g.indexOf("data-mce-")===0){return false}}}if(j.type===8){return false}if((j.type===3&&!c.test(j.value))){return false}}while(j=a(j,f))}return true},walk:function(f){return a(this,null,f)}});d.extend(b,{create:function(g,f){var i,h;i=new b(g,e[g]||1);if(f){for(h in f){i.attr(h,f[h])}}return i}});d.html.Node=b})(tinymce);(function(b){var a=b.html.Node;b.html.DomParser=function(g,h){var f=this,e={},d=[],i={},c={};g=g||{};g.validate="validate" in g?g.validate:true;g.root_name=g.root_name||"body";f.schema=h=h||new b.html.Schema();function j(n){var p,q,y,x,A,o,r,l,u,v,k,t,m,z,s;t=b.makeMap("tr,td,th,tbody,thead,tfoot,table");k=h.getNonEmptyElements();m=h.getTextBlockElements();for(p=0;p<n.length;p++){q=n[p];if(!q.parent||q.fixed){continue}if(m[q.name]&&q.parent.name=="li"){z=q.next;while(z){if(m[z.name]){z.name="li";z.fixed=true;q.parent.insert(z,q.parent)}else{break}z=z.next}q.unwrap(q);continue}x=[q];for(y=q.parent;y&&!h.isValidChild(y.name,q.name)&&!t[y.name];y=y.parent){x.push(y)}if(y&&x.length>1){x.reverse();A=o=f.filterNode(x[0].clone());for(u=0;u<x.length-1;u++){if(h.isValidChild(o.name,x[u].name)){r=f.filterNode(x[u].clone());o.append(r)}else{r=o}for(l=x[u].firstChild;l&&l!=x[u+1];){s=l.next;r.append(l);l=s}o=r}if(!A.isEmpty(k)){y.insert(A,x[0],true);y.insert(q,A)}else{y.insert(q,x[0],true)}y=x[0];if(y.isEmpty(k)||y.firstChild===y.lastChild&&y.firstChild.name==="br"){y.empty().remove()}}else{if(q.parent){if(q.name==="li"){z=q.prev;if(z&&(z.name==="ul"||z.name==="ul")){z.append(q);continue}z=q.next;if(z&&(z.name==="ul"||z.name==="ul")){z.insert(q,z.firstChild,true);continue}q.wrap(f.filterNode(new a("ul",1)));continue}if(h.isValidChild(q.parent.name,"div")&&h.isValidChild("div",q.name)){q.wrap(f.filterNode(new a("div",1)))}else{if(q.name==="style"||q.name==="script"){q.empty().remove()}else{q.unwrap()}}}}}}f.filterNode=function(m){var l,k,n;if(k in e){n=i[k];if(n){n.push(m)}else{i[k]=[m]}}l=d.length;while(l--){k=d[l].name;if(k in m.attributes.map){n=c[k];if(n){n.push(m)}else{c[k]=[m]}}}return m};f.addNodeFilter=function(k,l){b.each(b.explode(k),function(m){var n=e[m];if(!n){e[m]=n=[]}n.push(l)})};f.addAttributeFilter=function(k,l){b.each(b.explode(k),function(m){var n;for(n=0;n<d.length;n++){if(d[n].name===m){d[n].callbacks.push(l);return}}d.push({name:m,callbacks:[l]})})};f.parse=function(v,m){var n,J,B,A,D,C,x,r,F,N,z,o,E,M=[],L,t,k,y,s,p,u,q;m=m||{};i={};c={};o=b.extend(b.makeMap("script,style,head,html,body,title,meta,param"),h.getBlockElements());u=h.getNonEmptyElements();p=h.children;z=g.validate;q="forced_root_block" in m?m.forced_root_block:g.forced_root_block;s=h.getWhiteSpaceElements();E=/^[ \t\r\n]+/;t=/[ \t\r\n]+$/;k=/[ \t\r\n]+/g;y=/^[ \t\r\n]+$/;function G(){var O=J.firstChild,l,P;while(O){l=O.next;if(O.type==3||(O.type==1&&O.name!=="p"&&!o[O.name]&&!O.attr("data-mce-type"))){if(!P){P=K(q,1);J.insert(P,O);P.append(O)}else{P.append(O)}}else{P=null}O=l}}function K(l,O){var P=new a(l,O),Q;if(l in e){Q=i[l];if(Q){Q.push(P)}else{i[l]=[P]}}return P}function I(P){var Q,l,O;for(Q=P.prev;Q&&Q.type===3;){l=Q.value.replace(t,"");if(l.length>0){Q.value=l;Q=Q.prev}else{O=Q.prev;Q.remove();Q=O}}}function H(O){var P,l={};for(P in O){if(P!=="li"&&P!="p"){l[P]=O[P]}}return l}n=new b.html.SaxParser({validate:z,self_closing_elements:H(h.getSelfClosingElements()),cdata:function(l){B.append(K("#cdata",4)).value=l},text:function(P,l){var O;if(!L){P=P.replace(k," ");if(B.lastChild&&o[B.lastChild.name]){P=P.replace(E,"")}}if(P.length!==0){O=K("#text",3);O.raw=!!l;B.append(O).value=P}},comment:function(l){B.append(K("#comment",8)).value=l},pi:function(l,O){B.append(K(l,7)).value=O;I(B)},doctype:function(O){var l;l=B.append(K("#doctype",10));l.value=O;I(B)},start:function(l,W,P){var U,R,Q,O,S,X,V,T;Q=z?h.getElementRule(l):{};if(Q){U=K(Q.outputName||l,1);U.attributes=W;U.shortEnded=P;B.append(U);T=p[B.name];if(T&&p[U.name]&&!T[U.name]){M.push(U)}R=d.length;while(R--){S=d[R].name;if(S in W.map){F=c[S];if(F){F.push(U)}else{c[S]=[U]}}}if(o[l]){I(U)}if(!P){B=U}if(!L&&s[l]){L=true}}},end:function(l){var S,P,R,O,Q;P=z?h.getElementRule(l):{};if(P){if(o[l]){if(!L){S=B.firstChild;if(S&&S.type===3){R=S.value.replace(E,"");if(R.length>0){S.value=R;S=S.next}else{O=S.next;S.remove();S=O}while(S&&S.type===3){R=S.value;O=S.next;if(R.length===0||y.test(R)){S.remove();S=O}S=O}}S=B.lastChild;if(S&&S.type===3){R=S.value.replace(t,"");if(R.length>0){S.value=R;S=S.prev}else{O=S.prev;S.remove();S=O}while(S&&S.type===3){R=S.value;O=S.prev;if(R.length===0||y.test(R)){S.remove();S=O}S=O}}}}if(L&&s[l]){L=false}if(P.removeEmpty||P.paddEmpty){if(B.isEmpty(u)){if(P.paddEmpty){B.empty().append(new a("#text","3")).value="\u00a0"}else{if(!B.attributes.map.name&&!B.attributes.map.id){Q=B.parent;B.empty().remove();B=Q;return}}}}B=B.parent}}},h);J=B=new a(m.context||g.root_name,11);n.parse(v);if(z&&M.length){if(!m.context){j(M)}else{m.invalid=true}}if(q&&J.name=="body"){G()}if(!m.invalid){for(N in i){F=e[N];A=i[N];x=A.length;while(x--){if(!A[x].parent){A.splice(x,1)}}for(D=0,C=F.length;D<C;D++){F[D](A,N,m)}}for(D=0,C=d.length;D<C;D++){F=d[D];if(F.name in c){A=c[F.name];x=A.length;while(x--){if(!A[x].parent){A.splice(x,1)}}for(x=0,r=F.callbacks.length;x<r;x++){F.callbacks[x](A,F.name,m)}}}}return J};if(g.remove_trailing_brs){f.addNodeFilter("br",function(n,m){var r,q=n.length,o,v=b.extend({},h.getBlockElements()),k=h.getNonEmptyElements(),t,s,p,u;v.body=1;for(r=0;r<q;r++){o=n[r];t=o.parent;if(v[o.parent.name]&&o===t.lastChild){p=o.prev;while(p){u=p.name;if(u!=="span"||p.attr("data-mce-type")!=="bookmark"){if(u!=="br"){break}if(u==="br"){o=null;break}}p=p.prev}if(o){o.remove();if(t.isEmpty(k)){elementRule=h.getElementRule(t.name);if(elementRule){if(elementRule.removeEmpty){t.remove()}else{if(elementRule.paddEmpty){t.empty().append(new b.html.Node("#text",3)).value="\u00a0"}}}}}}else{s=o;while(t.firstChild===s&&t.lastChild===s){s=t;if(v[t.name]){break}t=t.parent}if(s===t){textNode=new b.html.Node("#text",3);textNode.value="\u00a0";o.replace(textNode)}}}})}if(!g.allow_html_in_named_anchor){f.addAttributeFilter("id,name",function(k,l){var n=k.length,p,m,o,q;while(n--){q=k[n];if(q.name==="a"&&q.firstChild&&!q.attr("href")){o=q.parent;p=q.lastChild;do{m=p.prev;o.insert(p,q);p=m}while(p)}}})}}})(tinymce);tinymce.html.Writer=function(e){var c=[],a,b,d,f,g;e=e||{};a=e.indent;b=tinymce.makeMap(e.indent_before||"");d=tinymce.makeMap(e.indent_after||"");f=tinymce.html.Entities.getEncodeFunc(e.entity_encoding||"raw",e.entities);g=e.element_format=="html";return{start:function(m,k,p){var n,j,h,o;if(a&&b[m]&&c.length>0){o=c[c.length-1];if(o.length>0&&o!=="\n"){c.push("\n")}}c.push("<",m);if(k){for(n=0,j=k.length;n<j;n++){h=k[n];c.push(" ",h.name,'="',f(h.value,true),'"')}}if(!p||g){c[c.length]=">"}else{c[c.length]=" />"}if(p&&a&&d[m]&&c.length>0){o=c[c.length-1];if(o.length>0&&o!=="\n"){c.push("\n")}}},end:function(h){var i;c.push("</",h,">");if(a&&d[h]&&c.length>0){i=c[c.length-1];if(i.length>0&&i!=="\n"){c.push("\n")}}},text:function(i,h){if(i.length>0){c[c.length]=h?i:f(i)}},cdata:function(h){c.push("<![CDATA[",h,"]]>")},comment:function(h){c.push("<!--",h,"-->")},pi:function(h,i){if(i){c.push("<?",h," ",i,"?>")}else{c.push("<?",h,"?>")}if(a){c.push("\n")}},doctype:function(h){c.push("<!DOCTYPE",h,">",a?"\n":"")},reset:function(){c.length=0},getContent:function(){return c.join("").replace(/\n$/,"")}}};(function(a){a.html.Serializer=function(c,d){var b=this,e=new a.html.Writer(c);c=c||{};c.validate="validate" in c?c.validate:true;b.schema=d=d||new a.html.Schema();b.writer=e;b.serialize=function(h){var g,i;i=c.validate;g={3:function(k,j){e.text(k.value,k.raw)},8:function(j){e.comment(j.value)},7:function(j){e.pi(j.name,j.value)},10:function(j){e.doctype(j.value)},4:function(j){e.cdata(j.value)},11:function(j){if((j=j.firstChild)){do{f(j)}while(j=j.next)}}};e.reset();function f(k){var t=g[k.type],j,o,s,r,p,u,n,m,q;if(!t){j=k.name;o=k.shortEnded;s=k.attributes;if(i&&s&&s.length>1){u=[];u.map={};q=d.getElementRule(k.name);for(n=0,m=q.attributesOrder.length;n<m;n++){r=q.attributesOrder[n];if(r in s.map){p=s.map[r];u.map[r]=p;u.push({name:r,value:p})}}for(n=0,m=s.length;n<m;n++){r=s[n].name;if(!(r in u.map)){p=s.map[r];u.map[r]=p;u.push({name:r,value:p})}}s=u}e.start(k.name,s,o);if(!o){if((k=k.firstChild)){do{f(k)}while(k=k.next)}e.end(j)}}else{t(k)}}if(h.type==1&&!c.inner){f(h)}else{g[11](h)}return e.getContent()}}})(tinymce);tinymce.dom={};(function(b,h){var g=!!document.addEventListener;function c(k,j,l,i){if(k.addEventListener){k.addEventListener(j,l,i||false)}else{if(k.attachEvent){k.attachEvent("on"+j,l)}}}function e(k,j,l,i){if(k.removeEventListener){k.removeEventListener(j,l,i||false)}else{if(k.detachEvent){k.detachEvent("on"+j,l)}}}function a(n,l){var i,k=l||{};function j(){return false}function m(){return true}for(i in n){if(i!=="layerX"&&i!=="layerY"){k[i]=n[i]}}if(!k.target){k.target=k.srcElement||document}k.preventDefault=function(){k.isDefaultPrevented=m;if(n){if(n.preventDefault){n.preventDefault()}else{n.returnValue=false}}};k.stopPropagation=function(){k.isPropagationStopped=m;if(n){if(n.stopPropagation){n.stopPropagation()}else{n.cancelBubble=true}}};k.stopImmediatePropagation=function(){k.isImmediatePropagationStopped=m;k.stopPropagation()};if(!k.isDefaultPrevented){k.isDefaultPrevented=j;k.isPropagationStopped=j;k.isImmediatePropagationStopped=j}return k}function d(m,n,l){var k=m.document,j={type:"ready"};function i(){if(!l.domLoaded){l.domLoaded=true;n(j)}}if(k.readyState=="complete"){i();return}if(g){c(m,"DOMContentLoaded",i)}else{c(k,"readystatechange",function(){if(k.readyState==="complete"){e(k,"readystatechange",arguments.callee);i()}});if(k.documentElement.doScroll&&m===m.top){(function(){try{k.documentElement.doScroll("left")}catch(o){setTimeout(arguments.callee,0);return}i()})()}}c(m,"load",i)}function f(k){var q=this,p={},i,o,n,m,l;m="onmouseenter" in document.documentElement;n="onfocusin" in document.documentElement;l={mouseenter:"mouseover",mouseleave:"mouseout"};i=1;q.domLoaded=false;q.events=p;function j(t,x){var s,u,r,v;s=p[x][t.type];if(s){for(u=0,r=s.length;u<r;u++){v=s[u];if(v&&v.func.call(v.scope,t)===false){t.preventDefault()}if(t.isImmediatePropagationStopped()){return}}}}q.bind=function(x,A,D,E){var s,t,u,r,B,z,C,v=window;function y(F){j(a(F||v.event),s)}if(!x||x.nodeType===3||x.nodeType===8){return}if(!x[h]){s=i++;x[h]=s;p[s]={}}else{s=x[h];if(!p[s]){p[s]={}}}E=E||x;A=A.split(" ");u=A.length;while(u--){r=A[u];z=y;B=C=false;if(r==="DOMContentLoaded"){r="ready"}if((q.domLoaded||x.readyState=="complete")&&r==="ready"){q.domLoaded=true;D.call(E,a({type:r}));continue}if(!m){B=l[r];if(B){z=function(F){var H,G;H=F.currentTarget;G=F.relatedTarget;if(G&&H.contains){G=H.contains(G)}else{while(G&&G!==H){G=G.parentNode}}if(!G){F=a(F||v.event);F.type=F.type==="mouseout"?"mouseleave":"mouseenter";F.target=H;j(F,s)}}}}if(!n&&(r==="focusin"||r==="focusout")){C=true;B=r==="focusin"?"focus":"blur";z=function(F){F=a(F||v.event);F.type=F.type==="focus"?"focusin":"focusout";j(F,s)}}t=p[s][r];if(!t){p[s][r]=t=[{func:D,scope:E}];t.fakeName=B;t.capture=C;t.nativeHandler=z;if(!g){t.proxyHandler=k(s)}if(r==="ready"){d(x,z,q)}else{c(x,B||r,g?z:t.proxyHandler,C)}}else{t.push({func:D,scope:E})}}x=t=0;return D};q.unbind=function(x,z,A){var s,u,v,B,r,t;if(!x||x.nodeType===3||x.nodeType===8){return q}s=x[h];if(s){t=p[s];if(z){z=z.split(" ");v=z.length;while(v--){r=z[v];u=t[r];if(u){if(A){B=u.length;while(B--){if(u[B].func===A){u.splice(B,1)}}}if(!A||u.length===0){delete t[r];e(x,u.fakeName||r,g?u.nativeHandler:u.proxyHandler,u.capture)}}}}else{for(r in t){u=t[r];e(x,u.fakeName||r,g?u.nativeHandler:u.proxyHandler,u.capture)}t={}}for(r in t){return q}delete p[s];try{delete x[h]}catch(y){x[h]=null}}return q};q.fire=function(u,s,r){var v,t;if(!u||u.nodeType===3||u.nodeType===8){return q}t=a(null,r);t.type=s;do{v=u[h];if(v){j(t,v)}u=u.parentNode||u.ownerDocument||u.defaultView||u.parentWindow}while(u&&!t.isPropagationStopped());return q};q.clean=function(u){var s,r,t=q.unbind;if(!u||u.nodeType===3||u.nodeType===8){return q}if(u[h]){t(u)}if(!u.getElementsByTagName){u=u.document}if(u&&u.getElementsByTagName){t(u);r=u.getElementsByTagName("*");s=r.length;while(s--){u=r[s];if(u[h]){t(u)}}}return q};q.callNativeHandler=function(s,r){if(p){p[s][r.type].nativeHandler(r)}};q.destory=function(){p={}};q.add=function(v,s,u,t){if(typeof(v)==="string"){v=document.getElementById(v)}if(v&&v instanceof Array){var r=v.length;while(r--){q.add(v[r],s,u,t)}return}if(s==="init"){s="ready"}return q.bind(v,s instanceof Array?s.join(" "):s,u,t)};q.remove=function(v,s,u,t){if(!v){return q}if(typeof(v)==="string"){v=document.getElementById(v)}if(v instanceof Array){var r=v.length;while(r--){q.remove(v[r],s,u,t)}return q}return q.unbind(v,s instanceof Array?s.join(" "):s,u)};q.clear=function(r){if(typeof(r)==="string"){r=document.getElementById(r)}return q.clean(r)};q.cancel=function(r){if(r){q.prevent(r);q.stop(r)}return false};q.prevent=function(r){if(!r.preventDefault){r=a(r)}r.preventDefault();return false};q.stop=function(r){if(!r.stopPropagation){r=a(r)}r.stopPropagation();return false}}b.EventUtils=f;b.Event=new f(function(i){return function(j){tinymce.dom.Event.callNativeHandler(i,j)}});b.Event.bind(window,"ready",function(){});b=0})(tinymce.dom,"data-mce-expando");tinymce.dom.TreeWalker=function(a,c){var b=a;function d(i,f,e,j){var h,g;if(i){if(!j&&i[f]){return i[f]}if(i!=c){h=i[e];if(h){return h}for(g=i.parentNode;g&&g!=c;g=g.parentNode){h=g[e];if(h){return h}}}}}this.current=function(){return b};this.next=function(e){return(b=d(b,"firstChild","nextSibling",e))};this.prev=function(e){return(b=d(b,"lastChild","previousSibling",e))}};(function(e){var g=e.each,d=e.is,f=e.isWebKit,b=e.isIE,h=e.html.Entities,c=/^([a-z0-9],?)+$/i,a=/^[ \t\r\n]*$/;e.create("tinymce.dom.DOMUtils",{doc:null,root:null,files:null,pixelStyles:/^(top|left|bottom|right|width|height|borderWidth)$/,props:{"for":"htmlFor","class":"className",className:"className",checked:"checked",disabled:"disabled",maxlength:"maxLength",readonly:"readOnly",selected:"selected",value:"value",id:"id",name:"name",type:"type"},DOMUtils:function(o,l){var k=this,i,j,n;k.doc=o;k.win=window;k.files={};k.cssFlicker=false;k.counter=0;k.stdMode=!e.isIE||o.documentMode>=8;k.boxModel=!e.isIE||o.compatMode=="CSS1Compat"||k.stdMode;k.hasOuterHTML="outerHTML" in o.createElement("a");k.settings=l=e.extend({keep_values:false,hex_colors:1},l);k.schema=l.schema;k.styles=new e.html.Styles({url_converter:l.url_converter,url_converter_scope:l.url_converter_scope},l.schema);if(e.isIE6){try{o.execCommand("BackgroundImageCache",false,true)}catch(m){k.cssFlicker=true}}k.fixDoc(o);k.events=l.ownEvents?new e.dom.EventUtils(l.proxy):e.dom.Event;e.addUnload(k.destroy,k);n=l.schema?l.schema.getBlockElements():{};k.isBlock=function(q){if(!q){return false}var p=q.nodeType;if(p){return !!(p===1&&n[q.nodeName])}return !!n[q]}},fixDoc:function(k){var j=this.settings,i;if(b&&!e.isIE11&&j.schema){("abbr article aside audio canvas details figcaption figure footer header hgroup mark menu meter nav output progress section summary time video").replace(/\w+/g,function(l){k.createElement(l)});for(i in j.schema.getCustomElements()){k.createElement(i)}}},clone:function(k,i){var j=this,m,l;if(!b||e.isIE11||k.nodeType!==1||i){return k.cloneNode(i)}l=j.doc;if(!i){m=l.createElement(k.nodeName);g(j.getAttribs(k),function(n){j.setAttrib(m,n.nodeName,j.getAttrib(k,n.nodeName))});return m}return m.firstChild},getRoot:function(){var i=this,j=i.settings;return(j&&i.get(j.root_element))||i.doc.body},getViewPort:function(j){var k,i;j=!j?this.win:j;k=j.document;i=this.boxModel?k.documentElement:k.body;return{x:j.pageXOffset||i.scrollLeft,y:j.pageYOffset||i.scrollTop,w:j.innerWidth||i.clientWidth,h:j.innerHeight||i.clientHeight}},getRect:function(l){var k,i=this,j;l=i.get(l);k=i.getPos(l);j=i.getSize(l);return{x:k.x,y:k.y,w:j.w,h:j.h}},getSize:function(l){var j=this,i,k;l=j.get(l);i=j.getStyle(l,"width");k=j.getStyle(l,"height");if(i.indexOf("px")===-1){i=0}if(k.indexOf("px")===-1){k=0}return{w:parseInt(i,10)||l.offsetWidth||l.clientWidth,h:parseInt(k,10)||l.offsetHeight||l.clientHeight}},getParent:function(k,j,i){return this.getParents(k,j,i,false)},getParents:function(s,m,k,q){var j=this,i,l=j.settings,p=[];s=j.get(s);q=q===undefined;if(l.strict_root){k=k||j.getRoot()}if(d(m,"string")){i=m;if(m==="*"){m=function(o){return o.nodeType==1}}else{m=function(o){return j.is(o,i)}}}while(s){if(s==k||!s.nodeType||s.nodeType===9){break}if(!m||m(s)){if(q){p.push(s)}else{return s}}s=s.parentNode}return q?p:null},get:function(i){var j;if(i&&this.doc&&typeof(i)=="string"){j=i;i=this.doc.getElementById(i);if(i&&i.id!==j){return this.doc.getElementsByName(j)[1]}}return i},getNext:function(j,i){return this._findSib(j,i,"nextSibling")},getPrev:function(j,i){return this._findSib(j,i,"previousSibling")},add:function(l,o,i,k,m){var j=this;return this.run(l,function(r){var q,n;q=d(o,"string")?j.doc.createElement(o):o;j.setAttribs(q,i);if(k){if(k.nodeType){q.appendChild(k)}else{j.setHTML(q,k)}}return !m?r.appendChild(q):q})},create:function(k,i,j){return this.add(this.doc.createElement(k),k,i,j,1)},createHTML:function(q,i,m){var p="",l=this,j;p+="<"+q;for(j in i){if(i.hasOwnProperty(j)){p+=" "+j+'="'+l.encode(i[j])+'"'}}if(typeof(m)!="undefined"){return p+">"+m+"</"+q+">"}return p+" />"},remove:function(i,j){return this.run(i,function(l){var m,k=l.parentNode;if(!k){return null}if(j){while(m=l.firstChild){if(!e.isIE||m.nodeType!==3||m.nodeValue){k.insertBefore(m,l)}else{l.removeChild(m)}}}return k.removeChild(l)})},setStyle:function(l,i,j){var k=this;return k.run(l,function(o){var n,m;n=o.style;i=i.replace(/-(\D)/g,function(q,p){return p.toUpperCase()});if(k.pixelStyles.test(i)&&(e.is(j,"number")||/^[\-0-9\.]+$/.test(j))){j+="px"}switch(i){case"opacity":if(b&&!e.isIE11){n.filter=j===""?"":"alpha(opacity="+(j*100)+")";if(!l.currentStyle||!l.currentStyle.hasLayout){n.display="inline-block"}}n[i]=n["-moz-opacity"]=n["-khtml-opacity"]=j||"";break;case"float":(b&&!e.isIE11)?n.styleFloat=j:n.cssFloat=j;break;default:n[i]=j||""}if(k.settings.update_styles){k.setAttrib(o,"data-mce-style")}})},getStyle:function(l,i,k){l=this.get(l);if(!l){return}if(this.doc.defaultView&&k){i=i.replace(/[A-Z]/g,function(m){return"-"+m});try{return this.doc.defaultView.getComputedStyle(l,null).getPropertyValue(i)}catch(j){return null}}i=i.replace(/-(\D)/g,function(n,m){return m.toUpperCase()});if(i=="float"){i=b?"styleFloat":"cssFloat"}if(l.currentStyle&&k){return l.currentStyle[i]}return l.style?l.style[i]:undefined},setStyles:function(l,m){var j=this,k=j.settings,i;i=k.update_styles;k.update_styles=0;g(m,function(o,p){j.setStyle(l,p,o)});k.update_styles=i;if(k.update_styles){j.setAttrib(l,k.cssText)}},removeAllAttribs:function(i){return this.run(i,function(l){var k,j=l.attributes;for(k=j.length-1;k>=0;k--){l.removeAttributeNode(j.item(k))}})},setAttrib:function(k,l,i){var j=this;if(!k||!l){return}if(j.settings.strict){l=l.toLowerCase()}return this.run(k,function(p){var o=j.settings;var m=p.getAttribute(l);if(i!==null){switch(l){case"style":if(!d(i,"string")){g(i,function(q,r){j.setStyle(p,r,q)});return}if(o.keep_values){if(i&&!j._isRes(i)){p.setAttribute("data-mce-style",i,2)}else{p.removeAttribute("data-mce-style",2)}}p.style.cssText=i;break;case"class":p.className=i||"";break;case"src":case"href":if(o.keep_values){if(o.url_converter){i=o.url_converter.call(o.url_converter_scope||j,i,l,p)}j.setAttrib(p,"data-mce-"+l,i,2)}break;case"shape":p.setAttribute("data-mce-style",i);break}}if(d(i)&&i!==null&&i.length!==0){p.setAttribute(l,""+i,2)}else{p.removeAttribute(l,2)}if(tinyMCE.activeEditor&&m!=i){var n=tinyMCE.activeEditor;n.onSetAttrib.dispatch(n,p,l,i)}})},setAttribs:function(j,k){var i=this;return this.run(j,function(l){g(k,function(m,o){i.setAttrib(l,o,m)})})},getAttrib:function(m,o,k){var i,j=this,l;m=j.get(m);if(!m||m.nodeType!==1){return k===l?false:k}if(!d(k)){k=""}if(/^(src|href|style|coords|shape)$/.test(o)){i=m.getAttribute("data-mce-"+o);if(i){return i}}if(b&&j.props[o]){i=m[j.props[o]];i=i&&i.nodeValue?i.nodeValue:i}if(!i){i=m.getAttribute(o,2)}if(/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(o)){if(m[j.props[o]]===true&&i===""){return o}return i?o:""}if(m.nodeName==="FORM"&&m.getAttributeNode(o)){return m.getAttributeNode(o).nodeValue}if(o==="style"){i=i||m.style.cssText;if(i){i=j.serializeStyle(j.parseStyle(i),m.nodeName);if(j.settings.keep_values&&!j._isRes(i)){m.setAttribute("data-mce-style",i)}}}if(f&&o==="class"&&i){i=i.replace(/(apple|webkit)\-[a-z\-]+/gi,"")}if(b){switch(o){case"rowspan":case"colspan":if(i===1){i=""}break;case"size":if(i==="+0"||i===20||i===0){i=""}break;case"width":case"height":case"vspace":case"checked":case"disabled":case"readonly":if(i===0){i=""}break;case"hspace":if(i===-1){i=""}break;case"maxlength":case"tabindex":if(i===32768||i===2147483647||i==="32768"){i=""}break;case"multiple":case"compact":case"noshade":case"nowrap":if(i===65535){return o}return k;case"shape":i=i.toLowerCase();break;default:if(o.indexOf("on")===0&&i){i=e._replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/,"$1",""+i)}}}return(i!==l&&i!==null&&i!=="")?""+i:k},getPos:function(q,l){var j=this,i=0,p=0,m,o=j.doc,k;q=j.get(q);l=l||o.body;if(q){if(q.getBoundingClientRect){q=q.getBoundingClientRect();m=j.boxModel?o.documentElement:o.body;i=q.left+(o.documentElement.scrollLeft||o.body.scrollLeft)-m.clientTop;p=q.top+(o.documentElement.scrollTop||o.body.scrollTop)-m.clientLeft;return{x:i,y:p}}k=q;while(k&&k!=l&&k.nodeType){i+=k.offsetLeft||0;p+=k.offsetTop||0;k=k.offsetParent}k=q.parentNode;while(k&&k!=l&&k.nodeType){i-=k.scrollLeft||0;p-=k.scrollTop||0;k=k.parentNode}}return{x:i,y:p}},parseStyle:function(i){return this.styles.parse(i)},serializeStyle:function(j,i){return this.styles.serialize(j,i)},addStyle:function(j){var k=this.doc,i;styleElm=k.getElementById("mceDefaultStyles");if(!styleElm){styleElm=k.createElement("style"),styleElm.id="mceDefaultStyles";styleElm.type="text/css";i=k.getElementsByTagName("head")[0];if(i.firstChild){i.insertBefore(styleElm,i.firstChild)}else{i.appendChild(styleElm)}}if(styleElm.styleSheet){styleElm.styleSheet.cssText+=j}else{styleElm.appendChild(k.createTextNode(j))}},loadCSS:function(i){var k=this,l=k.doc,j;if(!i){i=""}j=l.getElementsByTagName("head")[0];g(i.split(","),function(m){var n;if(k.files[m]){return}k.files[m]=true;n=k.create("link",{rel:"stylesheet",href:e._addVer(m)});if(b&&!e.isIE11&&l.documentMode&&l.recalc){n.onload=function(){if(l.recalc){l.recalc()}n.onload=null}}j.appendChild(n)})},addClass:function(i,j){return this.run(i,function(k){var l;if(!j){return 0}if(this.hasClass(k,j)){return k.className}l=this.removeClass(k,j);return k.className=(l!=""?(l+" "):"")+j})},removeClass:function(k,l){var i=this,j;return i.run(k,function(n){var m;if(i.hasClass(n,l)){if(!j){j=new RegExp("(^|\\s+)"+l+"(\\s+|$)","g")}m=n.className.replace(j," ");m=e.trim(m!=" "?m:"");n.className=m;if(!m){n.removeAttribute("class");n.removeAttribute("className")}return m}return n.className})},hasClass:function(j,i){j=this.get(j);if(!j||!i){return false}return(" "+j.className+" ").indexOf(" "+i+" ")!==-1},show:function(i){return this.setStyle(i,"display","block")},hide:function(i){return this.setStyle(i,"display","none")},isHidden:function(i){i=this.get(i);return !i||i.style.display=="none"||this.getStyle(i,"display")=="none"},uniqueId:function(i){return(!i?"mce_":i)+(this.counter++)},setHTML:function(k,j){var i=this;return i.run(k,function(m){if(b){while(m.firstChild){m.removeChild(m.firstChild)}try{m.innerHTML="<br />"+j;m.removeChild(m.firstChild)}catch(l){var n=i.create("div");n.innerHTML="<br />"+j;g(e.grep(n.childNodes),function(p,o){if(o&&m.canHaveHTML){m.appendChild(p)}})}}else{m.innerHTML=j}return j})},getOuterHTML:function(k){var j,i=this;k=i.get(k);if(!k){return null}if(k.nodeType===1&&i.hasOuterHTML){return k.outerHTML}j=(k.ownerDocument||i.doc).createElement("body");j.appendChild(k.cloneNode(true));return j.innerHTML},setOuterHTML:function(l,j,m){var i=this;function k(p,o,r){var s,q;q=r.createElement("body");q.innerHTML=o;s=q.lastChild;while(s){i.insertAfter(s.cloneNode(true),p);s=s.previousSibling}i.remove(p)}return this.run(l,function(o){o=i.get(o);if(o.nodeType==1){m=m||o.ownerDocument||i.doc;if(b){try{if(b&&o.nodeType==1){o.outerHTML=j}else{k(o,j,m)}}catch(n){k(o,j,m)}}else{k(o,j,m)}}})},decode:h.decode,encode:h.encodeAllRaw,insertAfter:function(i,j){j=this.get(j);return this.run(i,function(l){var k,m;k=j.parentNode;m=j.nextSibling;if(m){k.insertBefore(l,m)}else{k.appendChild(l)}return l})},replace:function(m,l,i){var j=this;if(d(l,"array")){m=m.cloneNode(true)}return j.run(l,function(k){if(i){g(e.grep(k.childNodes),function(n){m.appendChild(n)})}return k.parentNode.replaceChild(m,k)})},rename:function(l,i){var k=this,j;if(l.nodeName!=i.toUpperCase()){j=k.create(i);g(k.getAttribs(l),function(m){k.setAttrib(j,m.nodeName,k.getAttrib(l,m.nodeName))});k.replace(j,l,1)}return j||l},findCommonAncestor:function(k,i){var l=k,j;while(l){j=i;while(j&&l!=j){j=j.parentNode}if(l==j){break}l=l.parentNode}if(!l&&k.ownerDocument){return k.ownerDocument.documentElement}return l},toHex:function(i){var k=/^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(i);function j(l){l=parseInt(l,10).toString(16);return l.length>1?l:"0"+l}if(k){i="#"+j(k[1])+j(k[2])+j(k[3]);return i}return i},getClasses:function(){var n=this,j=[],m,o={},p=n.settings.class_filter,l;if(n.classes){return n.classes}function q(i){g(i.imports,function(s){q(s)});g(i.cssRules||i.rules,function(t){switch(t.type||1){case 1:if(t.selectorText){g(t.selectorText.split(","),function(r){r=r.replace(/^\s*|\s*$|^\s\./g,"");if(/\.mce/.test(r)||!/\.[\w\-]+$/.test(r)){return}l=r;r=e._replace(/.*\.([a-z0-9_\-]+).*/i,"$1",r);if(p&&!(r=p(r,l))){return}if(!o[r]){j.push({"class":r});o[r]=1}})}break;case 3:try{q(t.styleSheet)}catch(s){}break}})}try{g(n.doc.styleSheets,q)}catch(k){}if(j.length>0){n.classes=j}return j},run:function(l,k,j){var i=this,m;if(i.doc&&typeof(l)==="string"){l=i.get(l)}if(!l){return false}j=j||this;if(!l.nodeType&&(l.length||l.length===0)){m=[];g(l,function(o,n){if(o){if(typeof(o)=="string"){o=i.doc.getElementById(o)}m.push(k.call(j,o,n))}});return m}return k.call(j,l)},getAttribs:function(j){var i;j=this.get(j);if(!j){return[]}if(b){i=[];if(j.nodeName=="OBJECT"){return j.attributes}if(j.nodeName==="OPTION"&&this.getAttrib(j,"selected")){i.push({specified:1,nodeName:"selected"})}j.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi,"").replace(/[\w:\-]+/gi,function(k){i.push({specified:1,nodeName:k})});return i}return j.attributes},isEmpty:function(m,k){var r=this,o,n,q,j,l,p=0;m=m.firstChild;if(m){j=new e.dom.TreeWalker(m,m.parentNode);k=k||r.schema?r.schema.getNonEmptyElements():null;do{q=m.nodeType;if(q===1){if(m.getAttribute("data-mce-bogus")){continue}l=m.nodeName.toLowerCase();if(k&&k[l]){if(l==="br"){p++;continue}return false}n=r.getAttribs(m);o=m.attributes.length;while(o--){l=m.attributes[o].nodeName;if(l==="name"||l==="data-mce-bookmark"){return false}}}if(q==8){return false}if((q===3&&!a.test(m.nodeValue))){return false}}while(m=j.next())}return p<=1},destroy:function(j){var i=this;i.win=i.doc=i.root=i.events=i.frag=null;if(!j){e.removeUnload(i.destroy)}},createRng:function(){var i=this.doc;return i.createRange?i.createRange():new e.dom.Range(this)},nodeIndex:function(m,n){var i=0,k,l,j;if(m){for(k=m.nodeType,m=m.previousSibling,l=m;m;m=m.previousSibling){j=m.nodeType;if(n&&j==3){if(j==k||!m.nodeValue.length){continue}}i++;k=j}}return i},split:function(m,l,p){var q=this,i=q.createRng(),n,k,o;function j(v){var t,s=v.childNodes,u=v.nodeType;function x(A){var z=A.previousSibling&&A.previousSibling.nodeName=="SPAN";var y=A.nextSibling&&A.nextSibling.nodeName=="SPAN";return z&&y}if(u==1&&v.getAttribute("data-mce-type")=="bookmark"){return}for(t=s.length-1;t>=0;t--){j(s[t])}if(u!=9){if(u==3&&v.nodeValue.length>0){var r=e.trim(v.nodeValue).length;if(!q.isBlock(v.parentNode)||r>0||r===0&&x(v)){return}}else{if(u==1){s=v.childNodes;if(s.length==1&&s[0]&&s[0].nodeType==1&&s[0].getAttribute("data-mce-type")=="bookmark"){v.parentNode.insertBefore(s[0],v)}if(s.length||/^(br|hr|input|img)$/i.test(v.nodeName)){return}}}q.remove(v)}return v}if(m&&l){i.setStart(m.parentNode,q.nodeIndex(m));i.setEnd(l.parentNode,q.nodeIndex(l));n=i.extractContents();i=q.createRng();i.setStart(l.parentNode,q.nodeIndex(l)+1);i.setEnd(m.parentNode,q.nodeIndex(m)+1);k=i.extractContents();o=m.parentNode;o.insertBefore(j(n),m);if(p){o.replaceChild(p,l)}else{o.insertBefore(l,m)}o.insertBefore(j(k),m);q.remove(m);return p||l}},bind:function(l,i,k,j){return this.events.add(l,i,k,j||this)},unbind:function(k,i,j){return this.events.remove(k,i,j)},fire:function(k,j,i){return this.events.fire(k,j,i)},getContentEditable:function(j){var i;if(j.nodeType!=1){return null}i=j.getAttribute("data-mce-contenteditable");if(i&&i!=="inherit"){return i}return j.contentEditable!=="inherit"?j.contentEditable:null},_findSib:function(l,i,j){var k=this,m=i;if(l){if(d(m,"string")){m=function(n){return k.is(n,i)}}for(l=l[j];l;l=l[j]){if(m(l)){return l}}}return null},_isRes:function(i){return/^(top|left|bottom|right|width|height)/i.test(i)||/;\s*(top|left|bottom|right|width|height)/i.test(i)}});e.DOM=new e.dom.DOMUtils(document,{process_html:0})})(tinymce);(function(a){function b(c){var O=this,e=c.doc,U=0,F=1,j=2,E=true,S=false,W="startOffset",h="startContainer",Q="endContainer",A="endOffset",k=tinymce.extend,n=c.nodeIndex;k(O,{startContainer:e,startOffset:0,endContainer:e,endOffset:0,collapsed:E,commonAncestorContainer:e,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3,setStart:q,setEnd:s,setStartBefore:g,setStartAfter:J,setEndBefore:K,setEndAfter:u,collapse:B,selectNode:y,selectNodeContents:G,compareBoundaryPoints:v,deleteContents:p,extractContents:I,cloneContents:d,insertNode:D,surroundContents:N,cloneRange:L,toStringIE:T});function x(){return e.createDocumentFragment()}function q(X,t){C(E,X,t)}function s(X,t){C(S,X,t)}function g(t){q(t.parentNode,n(t))}function J(t){q(t.parentNode,n(t)+1)}function K(t){s(t.parentNode,n(t))}function u(t){s(t.parentNode,n(t)+1)}function B(t){if(t){O[Q]=O[h];O[A]=O[W]}else{O[h]=O[Q];O[W]=O[A]}O.collapsed=E}function y(t){g(t);u(t)}function G(t){q(t,0);s(t,t.nodeType===1?t.childNodes.length:t.nodeValue.length)}function v(aa,t){var ad=O[h],Y=O[W],ac=O[Q],X=O[A],ab=t.startContainer,af=t.startOffset,Z=t.endContainer,ae=t.endOffset;if(aa===0){return H(ad,Y,ab,af)}if(aa===1){return H(ac,X,ab,af)}if(aa===2){return H(ac,X,Z,ae)}if(aa===3){return H(ad,Y,Z,ae)}}function p(){l(j)}function I(){return l(U)}function d(){return l(F)}function D(aa){var X=this[h],t=this[W],Z,Y;if((X.nodeType===3||X.nodeType===4)&&X.nodeValue){if(!t){X.parentNode.insertBefore(aa,X)}else{if(t>=X.nodeValue.length){c.insertAfter(aa,X)}else{Z=X.splitText(t);X.parentNode.insertBefore(aa,Z)}}}else{if(X.childNodes.length>0){Y=X.childNodes[t]}if(Y){X.insertBefore(aa,Y)}else{X.appendChild(aa)}}}function N(X){var t=O.extractContents();O.insertNode(X);X.appendChild(t);O.selectNode(X)}function L(){return k(new b(c),{startContainer:O[h],startOffset:O[W],endContainer:O[Q],endOffset:O[A],collapsed:O.collapsed,commonAncestorContainer:O.commonAncestorContainer})}function P(t,X){var Y;if(t.nodeType==3){return t}if(X<0){return t}Y=t.firstChild;while(Y&&X>0){--X;Y=Y.nextSibling}if(Y){return Y}return t}function m(){return(O[h]==O[Q]&&O[W]==O[A])}function H(Z,ab,X,aa){var ac,Y,t,ad,af,ae;if(Z==X){if(ab==aa){return 0}if(ab<aa){return -1}return 1}ac=X;while(ac&&ac.parentNode!=Z){ac=ac.parentNode}if(ac){Y=0;t=Z.firstChild;while(t!=ac&&Y<ab){Y++;t=t.nextSibling}if(ab<=Y){return -1}return 1}ac=Z;while(ac&&ac.parentNode!=X){ac=ac.parentNode}if(ac){Y=0;t=X.firstChild;while(t!=ac&&Y<aa){Y++;t=t.nextSibling}if(Y<aa){return -1}return 1}ad=c.findCommonAncestor(Z,X);af=Z;while(af&&af.parentNode!=ad){af=af.parentNode}if(!af){af=ad}ae=X;while(ae&&ae.parentNode!=ad){ae=ae.parentNode}if(!ae){ae=ad}if(af==ae){return 0}t=ad.firstChild;while(t){if(t==af){return -1}if(t==ae){return 1}t=t.nextSibling}}function C(X,aa,Z){var t,Y;if(X){O[h]=aa;O[W]=Z}else{O[Q]=aa;O[A]=Z}t=O[Q];while(t.parentNode){t=t.parentNode}Y=O[h];while(Y.parentNode){Y=Y.parentNode}if(Y==t){if(H(O[h],O[W],O[Q],O[A])>0){O.collapse(X)}}else{O.collapse(X)}O.collapsed=m();O.commonAncestorContainer=c.findCommonAncestor(O[h],O[Q])}function l(ad){var ac,Z=0,af=0,X,ab,Y,aa,t,ae;if(O[h]==O[Q]){return f(ad)}for(ac=O[Q],X=ac.parentNode;X;ac=X,X=X.parentNode){if(X==O[h]){return r(ac,ad)}++Z}for(ac=O[h],X=ac.parentNode;X;ac=X,X=X.parentNode){if(X==O[Q]){return V(ac,ad)}++af}ab=af-Z;Y=O[h];while(ab>0){Y=Y.parentNode;ab--}aa=O[Q];while(ab<0){aa=aa.parentNode;ab++}for(t=Y.parentNode,ae=aa.parentNode;t!=ae;t=t.parentNode,ae=ae.parentNode){Y=t;aa=ae}return o(Y,aa,ad)}function f(ac){var ae,af,t,Y,Z,ad,aa,X,ab;if(ac!=j){ae=x()}if(O[W]==O[A]){return ae}if(O[h].nodeType==3){af=O[h].nodeValue;t=af.substring(O[W],O[A]);if(ac!=F){Y=O[h];X=O[W];ab=O[A]-O[W];if(X===0&&ab>=Y.nodeValue.length-1){Y.parentNode.removeChild(Y)}else{Y.deleteData(X,ab)}O.collapse(E)}if(ac==j){return}if(t.length>0){ae.appendChild(e.createTextNode(t))}return ae}Y=P(O[h],O[W]);Z=O[A]-O[W];while(Y&&Z>0){ad=Y.nextSibling;aa=z(Y,ac);if(ae){ae.appendChild(aa)}--Z;Y=ad}if(ac!=F){O.collapse(E)}return ae}function r(ad,aa){var ac,ab,X,t,Z,Y;if(aa!=j){ac=x()}ab=i(ad,aa);if(ac){ac.appendChild(ab)}X=n(ad);t=X-O[W];if(t<=0){if(aa!=F){O.setEndBefore(ad);O.collapse(S)}return ac}ab=ad.previousSibling;while(t>0){Z=ab.previousSibling;Y=z(ab,aa);if(ac){ac.insertBefore(Y,ac.firstChild)}--t;ab=Z}if(aa!=F){O.setEndBefore(ad);O.collapse(S)}return ac}function V(ab,aa){var ad,X,ac,t,Z,Y;if(aa!=j){ad=x()}ac=R(ab,aa);if(ad){ad.appendChild(ac)}X=n(ab);++X;t=O[A]-X;ac=ab.nextSibling;while(ac&&t>0){Z=ac.nextSibling;Y=z(ac,aa);if(ad){ad.appendChild(Y)}--t;ac=Z}if(aa!=F){O.setStartAfter(ab);O.collapse(E)}return ad}function o(ab,t,ae){var Y,ag,aa,ac,ad,X,af,Z;if(ae!=j){ag=x()}Y=R(ab,ae);if(ag){ag.appendChild(Y)}aa=ab.parentNode;ac=n(ab);ad=n(t);++ac;X=ad-ac;af=ab.nextSibling;while(X>0){Z=af.nextSibling;Y=z(af,ae);if(ag){ag.appendChild(Y)}af=Z;--X}Y=i(t,ae);if(ag){ag.appendChild(Y)}if(ae!=F){O.setStartAfter(ab);O.collapse(E)}return ag}function i(ac,ad){var Y=P(O[Q],O[A]-1),ae,ab,aa,t,X,Z=Y!=O[Q];if(Y==ac){return M(Y,Z,S,ad)}ae=Y.parentNode;ab=M(ae,S,S,ad);while(ae){while(Y){aa=Y.previousSibling;t=M(Y,Z,S,ad);if(ad!=j){ab.insertBefore(t,ab.firstChild)}Z=E;Y=aa}if(ae==ac){return ab}Y=ae.previousSibling;ae=ae.parentNode;X=M(ae,S,S,ad);if(ad!=j){X.appendChild(ab)}ab=X}}function R(ac,ad){var Z=P(O[h],O[W]),aa=Z!=O[h],ae,ab,Y,t,X;if(Z==ac){return M(Z,aa,E,ad)}ae=Z.parentNode;ab=M(ae,S,E,ad);while(ae){while(Z){Y=Z.nextSibling;t=M(Z,aa,E,ad);if(ad!=j){ab.appendChild(t)}aa=E;Z=Y}if(ae==ac){return ab}Z=ae.nextSibling;ae=ae.parentNode;X=M(ae,S,E,ad);if(ad!=j){X.appendChild(ab)}ab=X}}function M(t,aa,ad,ae){var Z,Y,ab,X,ac;if(aa){return z(t,ae)}if(t.nodeType==3){Z=t.nodeValue;if(ad){X=O[W];Y=Z.substring(X);ab=Z.substring(0,X)}else{X=O[A];Y=Z.substring(0,X);ab=Z.substring(X)}if(ae!=F){t.nodeValue=ab}if(ae==j){return}ac=c.clone(t,S);ac.nodeValue=Y;return ac}if(ae==j){return}return c.clone(t,S)}function z(X,t){if(t!=j){return t==F?c.clone(X,E):X}X.parentNode.removeChild(X)}function T(){return c.create("body",null,d()).outerText}return O}a.Range=b;b.prototype.toString=function(){return this.toStringIE()}})(tinymce.dom);(function(){function a(d){var b=this,h=d.dom,c=true,f=false;function e(i,j){var k,t=0,q,n,m,l,o,r,p=-1,s;k=i.duplicate();k.collapse(j);s=k.parentElement();if(s.ownerDocument!==d.dom.doc){return}while(s.contentEditable==="false"){s=s.parentNode}if(!s.hasChildNodes()){return{node:s,inside:1}}m=s.children;q=m.length-1;while(t<=q){r=Math.floor((t+q)/2);l=m[r];k.moveToElementText(l);p=k.compareEndPoints(j?"StartToStart":"EndToEnd",i);if(p>0){q=r-1}else{if(p<0){t=r+1}else{return{node:l}}}}if(p<0){if(!l){k.moveToElementText(s);k.collapse(true);l=s;n=true}else{k.collapse(false)}o=0;while(k.compareEndPoints(j?"StartToStart":"StartToEnd",i)!==0){if(k.move("character",1)===0||s!=k.parentElement()){break}o++}}else{k.collapse(true);o=0;while(k.compareEndPoints(j?"StartToStart":"StartToEnd",i)!==0){if(k.move("character",-1)===0||s!=k.parentElement()){break}o++}}return{node:l,position:p,offset:o,inside:n}}function g(){var i=d.getRng(),r=h.createRng(),l,k,p,q,m,j;l=i.item?i.item(0):i.parentElement();if(l.ownerDocument!=h.doc){return r}k=d.isCollapsed();if(i.item){r.setStart(l.parentNode,h.nodeIndex(l));r.setEnd(r.startContainer,r.startOffset+1);return r}function o(A){var u=e(i,A),s,y,z=0,x,v,t;s=u.node;y=u.offset;if(u.inside&&!s.hasChildNodes()){r[A?"setStart":"setEnd"](s,0);return}if(y===v){r[A?"setStartBefore":"setEndAfter"](s);return}if(u.position<0){x=u.inside?s.firstChild:s.nextSibling;if(!x){r[A?"setStartAfter":"setEndAfter"](s);return}if(!y){if(x.nodeType==3){r[A?"setStart":"setEnd"](x,0)}else{r[A?"setStartBefore":"setEndBefore"](x)}return}while(x){t=x.nodeValue;z+=t.length;if(z>=y){s=x;z-=y;z=t.length-z;break}x=x.nextSibling}}else{x=s.previousSibling;if(!x){return r[A?"setStartBefore":"setEndBefore"](s)}if(!y){if(s.nodeType==3){r[A?"setStart":"setEnd"](x,s.nodeValue.length)}else{r[A?"setStartAfter":"setEndAfter"](x)}return}while(x){z+=x.nodeValue.length;if(z>=y){s=x;z-=y;break}x=x.previousSibling}}r[A?"setStart":"setEnd"](s,z)}try{o(true);if(!k){o()}}catch(n){if(n.number==-2147024809){m=b.getBookmark(2);p=i.duplicate();p.collapse(true);l=p.parentElement();if(!k){p=i.duplicate();p.collapse(false);q=p.parentElement();q.innerHTML=q.innerHTML}l.innerHTML=l.innerHTML;b.moveToBookmark(m);i=d.getRng();o(true);if(!k){o()}}else{throw n}}return r}this.getBookmark=function(m){var j=d.getRng(),o,i,l={};function n(u){var t,p,s,r,q=[];t=u.parentNode;p=h.getRoot().parentNode;while(t!=p&&t.nodeType!==9){s=t.children;r=s.length;while(r--){if(u===s[r]){q.push(r);break}}u=t;t=t.parentNode}return q}function k(q){var p;p=e(j,q);if(p){return{position:p.position,offset:p.offset,indexes:n(p.node),inside:p.inside}}}if(m===2){if(!j.item){l.start=k(true);if(!d.isCollapsed()){l.end=k()}}else{l.start={ctrl:true,indexes:n(j.item(0))}}}return l};this.moveToBookmark=function(k){var j,i=h.doc.body;function m(o){var r,q,n,p;r=h.getRoot();for(q=o.length-1;q>=0;q--){p=r.children;n=o[q];if(n<=p.length-1){r=p[n]}}return r}function l(r){var n=k[r?"start":"end"],q,p,o;if(n){q=n.position>0;p=i.createTextRange();p.moveToElementText(m(n.indexes));offset=n.offset;if(offset!==o){p.collapse(n.inside||q);p.moveStart("character",q?-offset:offset)}else{p.collapse(r)}j.setEndPoint(r?"StartToStart":"EndToStart",p);if(r){j.collapse(true)}}}if(k.start){if(k.start.ctrl){j=i.createControlRange();j.addElement(m(k.start.indexes));j.select()}else{j=i.createTextRange();l(true);l();j.select()}}};this.addRange=function(i){var n,l,k,p,v,q,t,s=d.dom.doc,m=s.body,r,u;function j(C){var y,B,x,A,z;x=h.create("a");y=C?k:v;B=C?p:q;A=n.duplicate();if(y==s||y==s.documentElement){y=m;B=0}if(y.nodeType==3){y.parentNode.insertBefore(x,y);A.moveToElementText(x);A.moveStart("character",B);h.remove(x);n.setEndPoint(C?"StartToStart":"EndToEnd",A)}else{z=y.childNodes;if(z.length){if(B>=z.length){h.insertAfter(x,z[z.length-1])}else{y.insertBefore(x,z[B])}A.moveToElementText(x)}else{if(y.canHaveHTML){y.innerHTML="<span>\uFEFF</span>";x=y.firstChild;A.moveToElementText(x);A.collapse(f)}}n.setEndPoint(C?"StartToStart":"EndToEnd",A);h.remove(x)}}k=i.startContainer;p=i.startOffset;v=i.endContainer;q=i.endOffset;n=m.createTextRange();if(k==v&&k.nodeType==1){if(p==q&&!k.hasChildNodes()){if(k.canHaveHTML){t=k.previousSibling;if(t&&!t.hasChildNodes()&&h.isBlock(t)){t.innerHTML="\uFEFF"}else{t=null}k.innerHTML="<span>\uFEFF</span><span>\uFEFF</span>";n.moveToElementText(k.lastChild);n.select();h.doc.selection.clear();k.innerHTML="";if(t){t.innerHTML=""}return}else{p=h.nodeIndex(k);k=k.parentNode}}if(p==q-1){try{u=k.childNodes[p];l=m.createControlRange();l.addElement(u);l.select();r=d.getRng();if(r.item&&u===r.item(0)){return}}catch(o){}}}j(true);j();n.select()};this.getRangeAt=g}tinymce.dom.TridentSelection=a})();(function(a){a.dom.Element=function(f,d){var b=this,e,c;b.settings=d=d||{};b.id=f;b.dom=e=d.dom||a.DOM;if(!a.isIE){c=e.get(b.id)}a.each(("getPos,getRect,getParent,add,setStyle,getStyle,setStyles,setAttrib,setAttribs,getAttrib,addClass,removeClass,hasClass,getOuterHTML,setOuterHTML,remove,show,hide,isHidden,setHTML,get").split(/,/),function(g){b[g]=function(){var h=[f],j;for(j=0;j<arguments.length;j++){h.push(arguments[j])}h=e[g].apply(e,h);b.update(g);return h}});a.extend(b,{on:function(i,h,g){return a.dom.Event.add(b.id,i,h,g)},getXY:function(){return{x:parseInt(b.getStyle("left")),y:parseInt(b.getStyle("top"))}},getSize:function(){var g=e.get(b.id);return{w:parseInt(b.getStyle("width")||g.clientWidth),h:parseInt(b.getStyle("height")||g.clientHeight)}},moveTo:function(g,h){b.setStyles({left:g,top:h})},moveBy:function(g,i){var h=b.getXY();b.moveTo(h.x+g,h.y+i)},resizeTo:function(g,i){b.setStyles({width:g,height:i})},resizeBy:function(g,j){var i=b.getSize();b.resizeTo(i.w+g,i.h+j)},update:function(h){var g;if(a.isIE6&&d.blocker){h=h||"";if(h.indexOf("get")===0||h.indexOf("has")===0||h.indexOf("is")===0){return}if(h=="remove"){e.remove(b.blocker);return}if(!b.blocker){b.blocker=e.uniqueId();g=e.add(d.container||e.getRoot(),"iframe",{id:b.blocker,style:"position:absolute;",frameBorder:0,src:'javascript:""'});e.setStyle(g,"opacity",0)}else{g=e.get(b.blocker)}e.setStyles(g,{left:b.getStyle("left",1),top:b.getStyle("top",1),width:b.getStyle("width",1),height:b.getStyle("height",1),display:b.getStyle("display",1),zIndex:parseInt(b.getStyle("zIndex",1)||0)-1})}}})}})(tinymce);(function(d){function f(g){return g.replace(/[\n\r]+/g,"")}var c=d.is,b=d.isIE,e=d.each,a=d.dom.TreeWalker;d.create("tinymce.dom.Selection",{Selection:function(k,j,i,h){var g=this;g.dom=k;g.win=j;g.serializer=i;g.editor=h;e(["onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent"],function(l){g[l]=new d.util.Dispatcher(g)});if(!g.win.getSelection){g.tridentSel=new d.dom.TridentSelection(g)}if(d.isIE&&!d.isIE11&&k.boxModel){this._fixIESelection()}d.addUnload(g.destroy,g)},setCursorLocation:function(i,j){var g=this;var h=g.dom.createRng();h.setStart(i,j);h.setEnd(i,j);g.setRng(h);g.collapse(false)},getContent:function(h){var g=this,i=g.getRng(),m=g.dom.create("body"),k=g.getSel(),j,l,o;h=h||{};j=l="";h.get=true;h.format=h.format||"html";h.forced_root_block="";g.onBeforeGetContent.dispatch(g,h);if(h.format=="text"){return g.isCollapsed()?"":(i.text||(k.toString?k.toString():""))}if(i.cloneContents){o=i.cloneContents();if(o){m.appendChild(o)}}else{if(c(i.item)||c(i.htmlText)){m.innerHTML="<br>"+(i.item?i.item(0).outerHTML:i.htmlText);m.removeChild(m.firstChild)}else{m.innerHTML=i.toString()}}if(/^\s/.test(m.innerHTML)){j=" "}if(/\s+$/.test(m.innerHTML)){l=" "}h.getInner=true;h.content=g.isCollapsed()?"":j+g.serializer.serialize(m,h)+l;g.onGetContent.dispatch(g,h);return h.content},setContent:function(h,j){var o=this,g=o.getRng(),k,l=o.win.document,n,m;j=j||{format:"html"};j.set=true;h=j.content=h;if(!j.no_events){o.onBeforeSetContent.dispatch(o,j)}h=j.content;if(g.insertNode){h+='<span id="__caret">_</span>';if(g.startContainer==l&&g.endContainer==l){l.body.innerHTML=h}else{g.deleteContents();if(l.body.childNodes.length===0){l.body.innerHTML=h}else{if(g.createContextualFragment){g.insertNode(g.createContextualFragment(h))}else{n=l.createDocumentFragment();m=l.createElement("div");n.appendChild(m);m.outerHTML=h;g.insertNode(n)}}}k=o.dom.get("__caret");g=l.createRange();g.setStartBefore(k);g.setEndBefore(k);o.setRng(g);o.dom.remove("__caret");try{o.setRng(g)}catch(i){}}else{if(g.item){l.execCommand("Delete",false,null);g=o.getRng()}if(/^\s+/.test(h)){g.pasteHTML('<span id="__mce_tmp">_</span>'+h);o.dom.remove("__mce_tmp")}else{g.pasteHTML(h)}}if(!j.no_events){o.onSetContent.dispatch(o,j)}},getStart:function(){var i=this,h=i.getRng(),j,g,l,k;if(h.duplicate||h.item){if(h.item){return h.item(0)}l=h.duplicate();l.collapse(1);j=l.parentElement();if(j.ownerDocument!==i.dom.doc){j=i.dom.getRoot()}g=k=h.parentElement();while(k=k.parentNode){if(k==j){j=g;break}}return j}else{j=h.startContainer;if(j.nodeType==1&&j.hasChildNodes()){j=j.childNodes[Math.min(j.childNodes.length-1,h.startOffset)]}if(j&&j.nodeType==3){return j.parentNode}return j}},getEnd:function(){var h=this,g=h.getRng(),j,i;if(g.duplicate||g.item){if(g.item){return g.item(0)}g=g.duplicate();g.collapse(0);j=g.parentElement();if(j.ownerDocument!==h.dom.doc){j=h.dom.getRoot()}if(j&&j.nodeName=="BODY"){return j.lastChild||j}return j}else{j=g.endContainer;i=g.endOffset;if(j.nodeType==1&&j.hasChildNodes()){j=j.childNodes[i>0?i-1:i]}if(j&&j.nodeType==3){return j.parentNode}return j}},getBookmark:function(s,v){var y=this,n=y.dom,h,k,j,o,i,p,q,m="\uFEFF",x;function g(z,A){var t=0;e(n.select(z),function(C,B){if(C==A){t=B}});return t}function u(t){function z(E){var A,D,C,B=E?"start":"end";A=t[B+"Container"];D=t[B+"Offset"];if(A.nodeType==1&&A.nodeName=="TR"){C=A.childNodes;A=C[Math.min(E?D:D-1,C.length-1)];if(A){D=E?0:A.childNodes.length;t["set"+(E?"Start":"End")](A,D)}}}z(true);z();return t}function l(){var z=y.getRng(true),t=n.getRoot(),A={};function B(E,J){var D=E[J?"startContainer":"endContainer"],I=E[J?"startOffset":"endOffset"],C=[],F,H,G=0;if(D.nodeType==3){if(v){for(F=D.previousSibling;F&&F.nodeType==3;F=F.previousSibling){I+=F.nodeValue.length}}C.push(I)}else{H=D.childNodes;if(I>=H.length&&H.length){G=1;I=Math.max(0,H.length-1)}C.push(y.dom.nodeIndex(H[I],v)+G)}for(;D&&D!=t;D=D.parentNode){C.push(y.dom.nodeIndex(D,v))}return C}A.start=B(z,true);if(!y.isCollapsed()){A.end=B(z)}return A}if(s==2){if(y.tridentSel){return y.tridentSel.getBookmark(s)}return l()}if(s){h=y.getRng();if(h.setStart){h={startContainer:h.startContainer,startOffset:h.startOffset,endContainer:h.endContainer,endOffset:h.endOffset}}return{rng:h}}h=y.getRng();j=n.uniqueId();o=tinyMCE.activeEditor.selection.isCollapsed();x="overflow:hidden;line-height:0px";if(h.duplicate||h.item){if(!h.item){k=h.duplicate();try{h.collapse();h.pasteHTML('<span data-mce-type="bookmark" id="'+j+'_start" style="'+x+'">'+m+"</span>");if(!o){k.collapse(false);h.moveToElementText(k.parentElement());if(h.compareEndPoints("StartToEnd",k)===0){k.move("character",-1)}k.pasteHTML('<span data-mce-type="bookmark" id="'+j+'_end" style="'+x+'">'+m+"</span>")}}catch(r){return null}}else{p=h.item(0);i=p.nodeName;return{name:i,index:g(i,p)}}}else{p=y.getNode();i=p.nodeName;if(i=="IMG"){return{name:i,index:g(i,p)}}k=u(h.cloneRange());if(!o){k.collapse(false);k.insertNode(n.create("span",{"data-mce-type":"bookmark",id:j+"_end",style:x},m))}h=u(h);h.collapse(true);h.insertNode(n.create("span",{"data-mce-type":"bookmark",id:j+"_start",style:x},m))}y.moveToBookmark({id:j,keep:1});return{id:j}},moveToBookmark:function(q){var v=this,n=v.dom,l,j,g,i,u,k,x,r,s;function h(C){var t=q[C?"start":"end"],z,A,B,y;if(t){B=t[0];for(A=u,z=t.length-1;z>=1;z--){y=A.childNodes;if(t[z]>y.length-1){return}A=y[t[z]]}if(A.nodeType===3){B=Math.min(t[0],A.nodeValue.length)}if(A.nodeType===1){B=Math.min(t[0],A.childNodes.length)}if(C){g.setStart(A,B)}else{g.setEnd(A,B)}}return true}function m(D){var y=n.get(q.id+"_"+D),C,t,A,B,z=q.keep;if(y){C=y.parentNode;if(D=="start"){if(!z){t=n.nodeIndex(y)}else{C=y.firstChild;t=1}k=x=C;r=s=t}else{if(!z){t=n.nodeIndex(y)}else{C=y.firstChild;t=1}x=C;s=t}if(!z){B=y.previousSibling;A=y.nextSibling;e(d.grep(y.childNodes),function(E){if(E.nodeType==3){E.nodeValue=E.nodeValue.replace(/\uFEFF/g,"")}});while(y=n.get(q.id+"_"+D)){n.remove(y,1)}if(B&&A&&B.nodeType==A.nodeType&&B.nodeType==3&&!d.isOpera){t=B.nodeValue.length;B.appendData(A.nodeValue);n.remove(A);if(D=="start"){k=x=B;r=s=t}else{x=B;s=t}}}}}function o(t){if(n.isBlock(t)&&!t.innerHTML&&!b){t.innerHTML='<br data-mce-bogus="1" />'}return t}if(q){if(q.start){g=n.createRng();u=n.getRoot();if(v.tridentSel){return v.tridentSel.moveToBookmark(q)}if(h(true)&&h()){v.setRng(g)}}else{if(q.id){m("start");m("end");if(k){g=n.createRng();g.setStart(o(k),r);g.setEnd(o(x),s);v.setRng(g)}}else{if(q.name){v.select(n.select(q.name)[q.index])}else{if(q.rng){g=q.rng;if(g.startContainer){i=v.dom.createRng();try{i.setStart(g.startContainer,g.startOffset);i.setEnd(g.endContainer,g.endOffset)}catch(p){}g=i}v.setRng(g)}}}}}},select:function(l,k){var j=this,m=j.dom,h=m.createRng(),g;function i(n,p){var o=new a(n,n);do{if(n.nodeType==3&&d.trim(n.nodeValue).length!==0){if(p){h.setStart(n,0)}else{h.setEnd(n,n.nodeValue.length)}return}if(n.nodeName=="BR"){if(p){h.setStartBefore(n)}else{h.setEndBefore(n)}return}}while(n=(p?o.next():o.prev()))}if(l){g=m.nodeIndex(l);h.setStart(l.parentNode,g);h.setEnd(l.parentNode,g+1);if(k){i(l,1);i(l)}j.setRng(h)}return l},isCollapsed:function(){var g=this,i=g.getRng(),h=g.getSel();if(!i||i.item){return false}if(i.compareEndPoints){return i.compareEndPoints("StartToEnd",i)===0}return !h||i.collapsed},collapse:function(g){var i=this,h=i.getRng(),j;if(h.item){j=h.item(0);h=i.win.document.body.createTextRange();h.moveToElementText(j)}h.collapse(!!g);i.setRng(h)},getSel:function(){var h=this,g=this.win;return g.getSelection?g.getSelection():g.document.selection},getRng:function(m){var h=this,j,g,l,k=h.win.document;if(h.fakeRng){return h.fakeRng}if(m&&h.tridentSel){return h.tridentSel.getRangeAt(0)}try{if(j=h.getSel()){g=j.rangeCount>0?j.getRangeAt(0):(j.createRange?j.createRange():k.createRange())}}catch(i){}if(d.isIE&&!d.isIE11&&g&&g.setStart&&k.selection.createRange().item){l=k.selection.createRange().item(0);g=k.createRange();g.setStartBefore(l);g.setEndAfter(l)}if(!g){g=k.createRange?k.createRange():k.body.createTextRange()}if(g.setStart&&g.startContainer.nodeType===9&&g.collapsed){l=h.dom.getRoot();g.setStart(l,0);g.setEnd(l,0)}if(h.selectedRange&&h.explicitRange){if(g.compareBoundaryPoints(g.START_TO_START,h.selectedRange)===0&&g.compareBoundaryPoints(g.END_TO_END,h.selectedRange)===0){g=h.explicitRange}else{h.selectedRange=null;h.explicitRange=null}}return g},setRng:function(k,g){var j,i=this;if(!i.tridentSel){j=i.getSel();if(j){i.explicitRange=k;try{j.removeAllRanges()}catch(h){}j.addRange(k);if(g===false&&j.extend){j.collapse(k.endContainer,k.endOffset);j.extend(k.startContainer,k.startOffset)}i.selectedRange=j.rangeCount>0?j.getRangeAt(0):null}}else{if(k.cloneRange){try{i.tridentSel.addRange(k);return}catch(h){}}try{k.select()}catch(h){}}},setNode:function(h){var g=this;g.setContent(g.dom.getOuterHTML(h));return h},getNode:function(){var i=this,h=i.getRng(),j=i.getSel(),m,l=h.startContainer,g=h.endContainer;function k(q,o){var p=q;while(q&&q.nodeType===3&&q.length===0){q=o?q.nextSibling:q.previousSibling}return q||p}if(!h){return i.dom.getRoot()}if(h.setStart){m=h.commonAncestorContainer;if(!h.collapsed){if(h.startContainer==h.endContainer){if(h.endOffset-h.startOffset<2){if(h.startContainer.hasChildNodes()){m=h.startContainer.childNodes[h.startOffset]}}}if(l.nodeType===3&&g.nodeType===3){if(l.length===h.startOffset){l=k(l.nextSibling,true)}else{l=l.parentNode}if(h.endOffset===0){g=k(g.previousSibling,false)}else{g=g.parentNode}if(l&&l===g){return l}}}if(m&&m.nodeType==3){return m.parentNode}return m}return h.item?h.item(0):h.parentElement()},getSelectedBlocks:function(p,h){var o=this,k=o.dom,m,l,i,j=[];m=k.getParent(p||o.getStart(),k.isBlock);l=k.getParent(h||o.getEnd(),k.isBlock);if(m){j.push(m)}if(m&&l&&m!=l){i=m;var g=new a(m,k.getRoot());while((i=g.next())&&i!=l){if(k.isBlock(i)){j.push(i)}}}if(l&&m!=l){j.push(l)}return j},isForward:function(){var i=this.dom,g=this.getSel(),j,h;if(!g||g.anchorNode==null||g.focusNode==null){return true}j=i.createRng();j.setStart(g.anchorNode,g.anchorOffset);j.collapse(true);h=i.createRng();h.setStart(g.focusNode,g.focusOffset);h.collapse(true);return j.compareBoundaryPoints(j.START_TO_START,h)<=0},normalize:function(){var h=this,g,m,l,j,i;function k(p){var o,r,n,s=h.dom,u=s.getRoot(),q,t,v;function y(z,A){var B=new a(z,s.getParent(z.parentNode,s.isBlock)||u);while(z=B[A?"prev":"next"]()){if(z.nodeName==="BR"){return true}}}function x(B,z){var C,A;z=z||o;C=new a(z,s.getParent(z.parentNode,s.isBlock)||u);while(q=C[B?"prev":"next"]()){if(q.nodeType===3&&q.nodeValue.length>0){o=q;r=B?q.nodeValue.length:0;m=true;return}if(s.isBlock(q)||t[q.nodeName.toLowerCase()]){return}A=q}if(l&&A){o=A;m=true;r=0}}o=g[(p?"start":"end")+"Container"];r=g[(p?"start":"end")+"Offset"];t=s.schema.getNonEmptyElements();if(o.nodeType===9){o=s.getRoot();r=0}if(o===u){if(p){q=o.childNodes[r>0?r-1:0];if(q){v=q.nodeName.toLowerCase();if(t[q.nodeName]||q.nodeName=="TABLE"){return}}}if(o.hasChildNodes()){o=o.childNodes[Math.min(!p&&r>0?r-1:r,o.childNodes.length-1)];r=0;if(o.hasChildNodes()&&!/TABLE/.test(o.nodeName)){q=o;n=new a(o,u);do{if(q.nodeType===3&&q.nodeValue.length>0){r=p?0:q.nodeValue.length;o=q;m=true;break}if(t[q.nodeName.toLowerCase()]){r=s.nodeIndex(q);o=q.parentNode;if(q.nodeName=="IMG"&&!p){r++}m=true;break}}while(q=(p?n.next():n.prev()))}}}if(l){if(o.nodeType===3&&r===0){x(true)}if(o.nodeType===1){q=o.childNodes[r];if(q&&q.nodeName==="BR"&&!y(q)&&!y(q,true)){x(true,o.childNodes[r])}}}if(p&&!l&&o.nodeType===3&&r===o.nodeValue.length){x(false)}if(m){g["set"+(p?"Start":"End")](o,r)}}if(d.isIE){return}g=h.getRng();l=g.collapsed;k(true);if(!l){k()}if(m){if(l){g.collapse(true)}h.setRng(g,h.isForward())}},selectorChanged:function(g,j){var h=this,i;if(!h.selectorChangedData){h.selectorChangedData={};i={};h.editor.onNodeChange.addToTop(function(l,k,o){var p=h.dom,m=p.getParents(o,null,p.getRoot()),n={};e(h.selectorChangedData,function(r,q){e(m,function(s){if(p.is(s,q)){if(!i[q]){e(r,function(t){t(true,{node:s,selector:q,parents:m})});i[q]=r}n[q]=r;return false}})});e(i,function(r,q){if(!n[q]){delete i[q];e(r,function(s){s(false,{node:o,selector:q,parents:m})})}})})}if(!h.selectorChangedData[g]){h.selectorChangedData[g]=[]}h.selectorChangedData[g].push(j);return h},scrollIntoView:function(k){var j,h,g=this,i=g.dom;h=i.getViewPort(g.editor.getWin());j=i.getPos(k).y;if(j<h.y||j+25>h.y+h.h){g.editor.getWin().scrollTo(0,j<h.y?j:j-h.h+25)}},destroy:function(h){var g=this;g.win=null;if(!h){d.removeUnload(g.destroy)}},_fixIESelection:function(){var h=this.dom,n=h.doc,i=n.body,k,o,g;function j(p,s){var q=i.createTextRange();try{q.moveToPoint(p,s)}catch(r){q=null}return q}function m(q){var p;if(q.button){p=j(q.x,q.y);if(p){if(p.compareEndPoints("StartToStart",o)>0){p.setEndPoint("StartToStart",o)}else{p.setEndPoint("EndToEnd",o)}p.select()}}else{l()}}function l(){var p=n.selection.createRange();if(o&&!p.item&&p.compareEndPoints("StartToEnd",p)===0){o.select()}h.unbind(n,"mouseup",l);h.unbind(n,"mousemove",m);o=k=0}n.documentElement.unselectable=true;h.bind(n,["mousedown","contextmenu"],function(p){if(p.target.nodeName==="HTML"){if(k){l()}g=n.documentElement;if(g.scrollHeight>g.clientHeight){return}k=1;o=j(p.x,p.y);if(o){h.bind(n,"mouseup",l);h.bind(n,"mousemove",m);h.win.focus();o.select()}}})}})})(tinymce);(function(a){a.dom.Serializer=function(e,i,f){var h,b,d=a.isIE,g=a.each,c;if(!e.apply_source_formatting){e.indent=false}i=i||a.DOM;f=f||new a.html.Schema(e);e.entity_encoding=e.entity_encoding||"named";e.remove_trailing_brs="remove_trailing_brs" in e?e.remove_trailing_brs:true;h=new a.util.Dispatcher(self);b=new a.util.Dispatcher(self);c=new a.html.DomParser(e,f);c.addAttributeFilter("src,href,style",function(k,j){var o=k.length,l,q,n="data-mce-"+j,p=e.url_converter,r=e.url_converter_scope,m;while(o--){l=k[o];q=l.attributes.map[n];if(q!==m){l.attr(j,q.length>0?q:null);l.attr(n,null)}else{q=l.attributes.map[j];if(j==="style"){q=i.serializeStyle(i.parseStyle(q),l.name)}else{if(p){q=p.call(r,q,j,l.name)}}l.attr(j,q.length>0?q:null)}}});c.addAttributeFilter("class",function(j,k){var l=j.length,m,n;while(l--){m=j[l];n=m.attr("class").replace(/(?:^|\s)mce(Item\w+|Selected)(?!\S)/g,"");m.attr("class",n.length>0?n:null)}});c.addAttributeFilter("data-mce-type",function(j,l,k){var m=j.length,n;while(m--){n=j[m];if(n.attributes.map["data-mce-type"]==="bookmark"&&!k.cleanup){n.remove()}}});c.addAttributeFilter("data-mce-expando",function(j,l,k){var m=j.length;while(m--){j[m].attr(l,null)}});c.addNodeFilter("noscript",function(j){var k=j.length,l;while(k--){l=j[k].firstChild;if(l){l.value=a.html.Entities.decode(l.value)}}});c.addNodeFilter("script,style",function(k,l){var m=k.length,n,o;function j(p){return p.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*((<!--)?(\s*\/\/)?\s*<!\[CDATA\[|(<!--\s*)?\/\*\s*<!\[CDATA\[\s*\*\/|(\/\/)?\s*<!--|\/\*\s*<!--\s*\*\/)\s*[\r\n]*/gi,"").replace(/\s*(\/\*\s*\]\]>\s*\*\/(-->)?|\s*\/\/\s*\]\]>(-->)?|\/\/\s*(-->)?|\]\]>|\/\*\s*-->\s*\*\/|\s*-->\s*)\s*$/g,"")}while(m--){n=k[m];o=n.firstChild?n.firstChild.value:"";if(l==="script"){n.attr("type",(n.attr("type")||"text/javascript").replace(/^mce\-/,""));if(o.length>0){n.firstChild.value="// <![CDATA[\n"+j(o)+"\n// ]]>"}}else{if(o.length>0){n.firstChild.value="<!--\n"+j(o)+"\n-->"}}}});c.addNodeFilter("#comment",function(j,k){var l=j.length,m;while(l--){m=j[l];if(m.value.indexOf("[CDATA[")===0){m.name="#cdata";m.type=4;m.value=m.value.replace(/^\[CDATA\[|\]\]$/g,"")}else{if(m.value.indexOf("mce:protected ")===0){m.name="#text";m.type=3;m.raw=true;m.value=unescape(m.value).substr(14)}}}});c.addNodeFilter("xml:namespace,input",function(j,k){var l=j.length,m;while(l--){m=j[l];if(m.type===7){m.remove()}else{if(m.type===1){if(k==="input"&&!("type" in m.attributes.map)){m.attr("type","text")}}}}});if(e.fix_list_elements){c.addNodeFilter("ul,ol",function(k,l){var m=k.length,n,j;while(m--){n=k[m];j=n.parent;if(j.name==="ul"||j.name==="ol"){if(n.prev&&n.prev.name==="li"){n.prev.append(n)}}}})}c.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style",function(j,k){var l=j.length;while(l--){j[l].attr(k,null)}});return{schema:f,addNodeFilter:c.addNodeFilter,addAttributeFilter:c.addAttributeFilter,onPreProcess:h,onPostProcess:b,serialize:function(o,m){var l,p,k,j,n;if(d&&i.select("script,style,select,map").length>0){n=o.innerHTML;o=o.cloneNode(false);i.setHTML(o,n)}else{o=o.cloneNode(true)}l=o.ownerDocument.implementation;if(l.createHTMLDocument){p=l.createHTMLDocument("");g(o.nodeName=="BODY"?o.childNodes:[o],function(q){p.body.appendChild(p.importNode(q,true))});if(o.nodeName!="BODY"){o=p.body.firstChild}else{o=p.body}k=i.doc;i.doc=p}m=m||{};m.format=m.format||"html";if(!m.no_events){m.node=o;h.dispatch(self,m)}j=new a.html.Serializer(e,f);m.content=j.serialize(c.parse(a.trim(m.getInner?o.innerHTML:i.getOuterHTML(o)),m));if(!m.cleanup){m.content=m.content.replace(/\uFEFF/g,"")}if(!m.no_events){b.dispatch(self,m)}if(k){i.doc=k}m.node=null;return m.content},addRules:function(j){f.addValidElements(j)},setRules:function(j){f.setValidElements(j)}}}})(tinymce);(function(a){a.dom.ScriptLoader=function(h){var c=0,k=1,i=2,l={},j=[],e={},d=[],g=0,f;function b(m,v){var x=this,q=a.DOM,s,o,r,n;function p(){q.remove(n);if(s){s.onreadystatechange=s.onload=s=null}v()}function u(){if(typeof(console)!=="undefined"&&console.log){console.log("Failed to load: "+m)}}n=q.uniqueId();if(a.isIE6){o=new a.util.URI(m);r=location;if(o.host==r.hostname&&o.port==r.port&&(o.protocol+":")==r.protocol&&o.protocol.toLowerCase()!="file"){a.util.XHR.send({url:a._addVer(o.getURI()),success:function(y){var t=q.create("script",{type:"text/javascript"});t.text=y;document.getElementsByTagName("head")[0].appendChild(t);q.remove(t);p()},error:u});return}}s=document.createElement("script");s.id=n;s.type="text/javascript";s.src=a._addVer(m);if(!a.isIE||a.isIE11){s.onload=p}s.onerror=u;if(!a.isOpera){s.onreadystatechange=function(){var t=s.readyState;if(t=="complete"||t=="loaded"){p()}}}(document.getElementsByTagName("head")[0]||document.body).appendChild(s)}this.isDone=function(m){return l[m]==i};this.markDone=function(m){l[m]=i};this.add=this.load=function(m,q,n){var o,p=l[m];if(p==f){j.push(m);l[m]=c}if(q){if(!e[m]){e[m]=[]}e[m].push({func:q,scope:n||this})}};this.loadQueue=function(n,m){this.loadScripts(j,n,m)};this.loadScripts=function(m,q,p){var o;function n(r){a.each(e[r],function(s){s.func.call(s.scope)});e[r]=f}d.push({func:q,scope:p||this});o=function(){var r=a.grep(m);m.length=0;a.each(r,function(s){if(l[s]==i){n(s);return}if(l[s]!=k){l[s]=k;g++;b(s,function(){l[s]=i;g--;n(s);o()})}});if(!g){a.each(d,function(s){s.func.call(s.scope)});d.length=0}};o()}};a.ScriptLoader=new a.dom.ScriptLoader()})(tinymce);(function(a){a.dom.RangeUtils=function(c){var b="\uFEFF";this.walk=function(d,s){var i=d.startContainer,l=d.startOffset,t=d.endContainer,m=d.endOffset,j,g,o,h,r,q,e;e=c.select("td.mceSelected,th.mceSelected");if(e.length>0){a.each(e,function(u){s([u])});return}function f(u){var v;v=u[0];if(v.nodeType===3&&v===i&&l>=v.nodeValue.length){u.splice(0,1)}v=u[u.length-1];if(m===0&&u.length>0&&v===t&&v.nodeType===3){u.splice(u.length-1,1)}return u}function p(x,v,u){var y=[];for(;x&&x!=u;x=x[v]){y.push(x)}return y}function n(v,u){do{if(v.parentNode==u){return v}v=v.parentNode}while(v)}function k(x,v,y){var u=y?"nextSibling":"previousSibling";for(h=x,r=h.parentNode;h&&h!=v;h=r){r=h.parentNode;q=p(h==x?h:h[u],u);if(q.length){if(!y){q.reverse()}s(f(q))}}}if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[l]}if(t.nodeType==1&&t.hasChildNodes()){t=t.childNodes[Math.min(m-1,t.childNodes.length-1)]}if(i==t){return s(f([i]))}j=c.findCommonAncestor(i,t);for(h=i;h;h=h.parentNode){if(h===t){return k(i,j,true)}if(h===j){break}}for(h=t;h;h=h.parentNode){if(h===i){return k(t,j)}if(h===j){break}}g=n(i,j)||i;o=n(t,j)||t;k(i,g,true);q=p(g==i?g:g.nextSibling,"nextSibling",o==t?o.nextSibling:o);if(q.length){s(f(q))}k(t,o)};this.split=function(e){var h=e.startContainer,d=e.startOffset,i=e.endContainer,g=e.endOffset;function f(j,k){return j.splitText(k)}if(h==i&&h.nodeType==3){if(d>0&&d<h.nodeValue.length){i=f(h,d);h=i.previousSibling;if(g>d){g=g-d;h=i=f(i,g).previousSibling;g=i.nodeValue.length;d=0}else{g=0}}}else{if(h.nodeType==3&&d>0&&d<h.nodeValue.length){h=f(h,d);d=0}if(i.nodeType==3&&g>0&&g<i.nodeValue.length){i=f(i,g).previousSibling;g=i.nodeValue.length}}return{startContainer:h,startOffset:d,endContainer:i,endOffset:g}}};a.dom.RangeUtils.compareRanges=function(c,b){if(c&&b){if(c.item||c.duplicate){if(c.item&&b.item&&c.item(0)===b.item(0)){return true}if(c.isEqual&&b.isEqual&&b.isEqual(c)){return true}}else{return c.startContainer==b.startContainer&&c.startOffset==b.startOffset}}return false}})(tinymce);(function(b){var a=b.dom.Event,c=b.each;b.create("tinymce.ui.KeyboardNavigation",{KeyboardNavigation:function(e,f){var q=this,n=e.root,m=e.items,o=e.enableUpDown,i=e.enableLeftRight||!e.enableUpDown,l=e.excludeFromTabOrder,k,h,p,d,g;f=f||b.DOM;k=function(r){g=r.target.id};h=function(r){f.setAttrib(r.target.id,"tabindex","-1")};d=function(r){var s=f.get(g);f.setAttrib(s,"tabindex","0");s.focus()};q.focus=function(){f.get(g).focus()};q.destroy=function(){c(m,function(s){var t=f.get(s.id);f.unbind(t,"focus",k);f.unbind(t,"blur",h)});var r=f.get(n);f.unbind(r,"focus",d);f.unbind(r,"keydown",p);m=f=n=q.focus=k=h=p=d=null;q.destroy=function(){}};q.moveFocus=function(v,s){var r=-1,u=q.controls,t;if(!g){return}c(m,function(y,x){if(y.id===g){r=x;return false}});r+=v;if(r<0){r=m.length-1}else{if(r>=m.length){r=0}}t=m[r];f.setAttrib(g,"tabindex","-1");f.setAttrib(t.id,"tabindex","0");f.get(t.id).focus();if(e.actOnFocus){e.onAction(t.id)}if(s){a.cancel(s)}};p=function(z){var v=37,u=39,y=38,A=40,r=27,t=14,s=13,x=32;switch(z.keyCode){case v:if(i){q.moveFocus(-1)}a.cancel(z);break;case u:if(i){q.moveFocus(1)}a.cancel(z);break;case y:if(o){q.moveFocus(-1)}a.cancel(z);break;case A:if(o){q.moveFocus(1)}a.cancel(z);break;case r:if(e.onCancel){e.onCancel();a.cancel(z)}break;case t:case s:case x:if(e.onAction){e.onAction(g);a.cancel(z)}break}};c(m,function(t,r){var s,u;if(!t.id){t.id=f.uniqueId("_mce_item_")}u=f.get(t.id);if(l){f.bind(u,"blur",h);s="-1"}else{s=(r===0?"0":"-1")}u.setAttribute("tabindex",s);f.bind(u,"focus",k)});if(m[0]){g=m[0].id}f.setAttrib(n,"tabindex","-1");var j=f.get(n);f.bind(j,"focus",d);f.bind(j,"keydown",p)}})})(tinymce);(function(c){var b=c.DOM,a=c.is;c.create("tinymce.ui.Control",{Control:function(f,e,d){this.id=f;this.settings=e=e||{};this.rendered=false;this.onRender=new c.util.Dispatcher(this);this.classPrefix="";this.scope=e.scope||this;this.disabled=0;this.active=0;this.editor=d},setAriaProperty:function(f,e){var d=b.get(this.id+"_aria")||b.get(this.id);if(d){b.setAttrib(d,"aria-"+f,!!e)}},focus:function(){b.get(this.id).focus()},setDisabled:function(d){if(d!=this.disabled){this.setAriaProperty("disabled",d);this.setState("Disabled",d);this.setState("Enabled",!d);this.disabled=d}},isDisabled:function(){return this.disabled},setActive:function(d){if(d!=this.active){this.setState("Active",d);this.active=d;this.setAriaProperty("pressed",d)}},isActive:function(){return this.active},setState:function(f,d){var e=b.get(this.id);f=this.classPrefix+f;if(d){b.addClass(e,f)}else{b.removeClass(e,f)}},isRendered:function(){return this.rendered},renderHTML:function(){},renderTo:function(d){b.setHTML(d,this.renderHTML())},postRender:function(){var e=this,d;if(a(e.disabled)){d=e.disabled;e.disabled=-1;e.setDisabled(d)}if(a(e.active)){d=e.active;e.active=-1;e.setActive(d)}},remove:function(){b.remove(this.id);this.destroy()},destroy:function(){c.dom.Event.clear(this.id)}})})(tinymce);tinymce.create("tinymce.ui.Container:tinymce.ui.Control",{Container:function(c,b,a){this.parent(c,b,a);this.controls=[];this.lookup={}},add:function(a){this.lookup[a.id]=a;this.controls.push(a);return a},get:function(a){return this.lookup[a]}});tinymce.create("tinymce.ui.Separator:tinymce.ui.Control",{Separator:function(b,a){this.parent(b,a);this.classPrefix="mceSeparator";this.setDisabled(true)},renderHTML:function(){return tinymce.DOM.createHTML("span",{"class":this.classPrefix,role:"separator","aria-orientation":"vertical",tabindex:"-1"})}});(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.MenuItem:tinymce.ui.Control",{MenuItem:function(g,f){this.parent(g,f);this.classPrefix="mceMenuItem"},setSelected:function(f){this.setState("Selected",f);this.setAriaProperty("checked",!!f);this.selected=f},isSelected:function(){return this.selected},postRender:function(){var f=this;f.parent();if(c(f.selected)){f.setSelected(f.selected)}}})})(tinymce);(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.Menu:tinymce.ui.MenuItem",{Menu:function(h,g){var f=this;f.parent(h,g);f.items={};f.collapsed=false;f.menuCount=0;f.onAddItem=new d.util.Dispatcher(this)},expand:function(g){var f=this;if(g){a(f,function(h){if(h.expand){h.expand()}},"items",f)}f.collapsed=false},collapse:function(g){var f=this;if(g){a(f,function(h){if(h.collapse){h.collapse()}},"items",f)}f.collapsed=true},isCollapsed:function(){return this.collapsed},add:function(f){if(!f.settings){f=new d.ui.MenuItem(f.id||b.uniqueId(),f)}this.onAddItem.dispatch(this,f);return this.items[f.id]=f},addSeparator:function(){return this.add({separator:true})},addMenu:function(f){if(!f.collapse){f=this.createMenu(f)}this.menuCount++;return this.add(f)},hasMenus:function(){return this.menuCount!==0},remove:function(f){delete this.items[f.id]},removeAll:function(){var f=this;a(f,function(g){if(g.removeAll){g.removeAll()}else{g.remove()}g.destroy()},"items",f);f.items={}},createMenu:function(g){var f=new d.ui.Menu(g.id||b.uniqueId(),g);f.onAddItem.add(this.onAddItem.dispatch,this.onAddItem);return f}})})(tinymce);(function(e){var d=e.is,c=e.DOM,f=e.each,a=e.dom.Event,b=e.dom.Element;e.create("tinymce.ui.DropMenu:tinymce.ui.Menu",{DropMenu:function(h,g){g=g||{};g.container=g.container||c.doc.body;g.offset_x=g.offset_x||0;g.offset_y=g.offset_y||0;g.vp_offset_x=g.vp_offset_x||0;g.vp_offset_y=g.vp_offset_y||0;if(d(g.icons)&&!g.icons){g["class"]+=" mceNoIcons"}this.parent(h,g);this.onShowMenu=new e.util.Dispatcher(this);this.onHideMenu=new e.util.Dispatcher(this);this.classPrefix="mceMenu"},createMenu:function(j){var h=this,i=h.settings,g;j.container=j.container||i.container;j.parent=h;j.constrain=j.constrain||i.constrain;j["class"]=j["class"]||i["class"];j.vp_offset_x=j.vp_offset_x||i.vp_offset_x;j.vp_offset_y=j.vp_offset_y||i.vp_offset_y;j.keyboard_focus=i.keyboard_focus;g=new e.ui.DropMenu(j.id||c.uniqueId(),j);g.onAddItem.add(h.onAddItem.dispatch,h.onAddItem);return g},focus:function(){var g=this;if(g.keyboardNav){g.keyboardNav.focus()}},update:function(){var i=this,j=i.settings,g=c.get("menu_"+i.id+"_tbl"),l=c.get("menu_"+i.id+"_co"),h,k;h=j.max_width?Math.min(g.offsetWidth,j.max_width):g.offsetWidth;k=j.max_height?Math.min(g.offsetHeight,j.max_height):g.offsetHeight;if(!c.boxModel){i.element.setStyles({width:h+2,height:k+2})}else{i.element.setStyles({width:h,height:k})}if(j.max_width){c.setStyle(l,"width",h)}if(j.max_height){c.setStyle(l,"height",k);if(g.clientHeight<j.max_height){c.setStyle(l,"overflow","hidden")}}},showMenu:function(p,n,r){var z=this,A=z.settings,o,g=c.getViewPort(),u,l,v,q,i=2,k,j,m=z.classPrefix;z.collapse(1);if(z.isMenuVisible){return}if(!z.rendered){o=c.add(z.settings.container,z.renderNode());f(z.items,function(h){h.postRender()});z.element=new b("menu_"+z.id,{blocker:1,container:A.container})}else{o=c.get("menu_"+z.id)}if(!e.isOpera){c.setStyles(o,{left:-65535,top:-65535})}c.show(o);z.update();p+=A.offset_x||0;n+=A.offset_y||0;g.w-=4;g.h-=4;if(A.constrain){u=o.clientWidth-i;l=o.clientHeight-i;v=g.x+g.w;q=g.y+g.h;if((p+A.vp_offset_x+u)>v){p=r?r-u:Math.max(0,(v-A.vp_offset_x)-u)}if((n+A.vp_offset_y+l)>q){n=Math.max(0,(q-A.vp_offset_y)-l)}}c.setStyles(o,{left:p,top:n});z.element.update();z.isMenuVisible=1;z.mouseClickFunc=a.add(o,"click",function(s){var h;s=s.target;if(s&&(s=c.getParent(s,"tr"))&&!c.hasClass(s,m+"ItemSub")){h=z.items[s.id];if(h.isDisabled()){return}k=z;while(k){if(k.hideMenu){k.hideMenu()}k=k.settings.parent}if(h.settings.onclick){h.settings.onclick(s)}return false}});if(z.hasMenus()){z.mouseOverFunc=a.add(o,"mouseover",function(x){var h,t,s;x=x.target;if(x&&(x=c.getParent(x,"tr"))){h=z.items[x.id];if(z.lastMenu){z.lastMenu.collapse(1)}if(h.isDisabled()){return}if(x&&c.hasClass(x,m+"ItemSub")){t=c.getRect(x);h.showMenu((t.x+t.w-i),t.y-i,t.x);z.lastMenu=h;c.addClass(c.get(h.id).firstChild,m+"ItemActive")}}})}a.add(o,"keydown",z._keyHandler,z);z.onShowMenu.dispatch(z);if(A.keyboard_focus){z._setupKeyboardNav()}},hideMenu:function(j){var g=this,i=c.get("menu_"+g.id),h;if(!g.isMenuVisible){return}if(g.keyboardNav){g.keyboardNav.destroy()}a.remove(i,"mouseover",g.mouseOverFunc);a.remove(i,"click",g.mouseClickFunc);a.remove(i,"keydown",g._keyHandler);c.hide(i);g.isMenuVisible=0;if(!j){g.collapse(1)}if(g.element){g.element.hide()}if(h=c.get(g.id)){c.removeClass(h.firstChild,g.classPrefix+"ItemActive")}g.onHideMenu.dispatch(g)},add:function(i){var g=this,h;i=g.parent(i);if(g.isRendered&&(h=c.get("menu_"+g.id))){g._add(c.select("tbody",h)[0],i)}return i},collapse:function(g){this.parent(g);this.hideMenu(1)},remove:function(g){c.remove(g.id);this.destroy();return this.parent(g)},destroy:function(){var g=this,h=c.get("menu_"+g.id);if(g.keyboardNav){g.keyboardNav.destroy()}a.remove(h,"mouseover",g.mouseOverFunc);a.remove(c.select("a",h),"focus",g.mouseOverFunc);a.remove(h,"click",g.mouseClickFunc);a.remove(h,"keydown",g._keyHandler);if(g.element){g.element.remove()}c.remove(h)},renderNode:function(){var i=this,j=i.settings,l,h,k,g;g=c.create("div",{role:"listbox",id:"menu_"+i.id,"class":j["class"],style:"position:absolute;left:0;top:0;z-index:200000;outline:0"});if(i.settings.parent){c.setAttrib(g,"aria-parent","menu_"+i.settings.parent.id)}k=c.add(g,"div",{role:"presentation",id:"menu_"+i.id+"_co","class":i.classPrefix+(j["class"]?" "+j["class"]:"")});i.element=new b("menu_"+i.id,{blocker:1,container:j.container});if(j.menu_line){c.add(k,"span",{"class":i.classPrefix+"Line"})}l=c.add(k,"table",{role:"presentation",id:"menu_"+i.id+"_tbl",border:0,cellPadding:0,cellSpacing:0});h=c.add(l,"tbody");f(i.items,function(m){i._add(h,m)});i.rendered=true;return g},_setupKeyboardNav:function(){var i,h,g=this;i=c.get("menu_"+g.id);h=c.select("a[role=option]","menu_"+g.id);h.splice(0,0,i);g.keyboardNav=new e.ui.KeyboardNavigation({root:"menu_"+g.id,items:h,onCancel:function(){g.hideMenu()},enableUpDown:true});i.focus()},_keyHandler:function(g){var h=this,i;switch(g.keyCode){case 37:if(h.settings.parent){h.hideMenu();h.settings.parent.focus();a.cancel(g)}break;case 39:if(h.mouseOverFunc){h.mouseOverFunc(g)}break}},_add:function(j,h){var i,q=h.settings,p,l,k,m=this.classPrefix,g;if(q.separator){l=c.add(j,"tr",{id:h.id,"class":m+"ItemSeparator"});c.add(l,"td",{"class":m+"ItemSeparator"});if(i=l.previousSibling){c.addClass(i,"mceLast")}return}i=l=c.add(j,"tr",{id:h.id,"class":m+"Item "+m+"ItemEnabled"});i=k=c.add(i,q.titleItem?"th":"td");i=p=c.add(i,"a",{id:h.id+"_aria",role:q.titleItem?"presentation":"option",href:"javascript:;",onclick:"return false;",onmousedown:"return false;"});if(q.parent){c.setAttrib(p,"aria-haspopup","true");c.setAttrib(p,"aria-owns","menu_"+h.id)}c.addClass(k,q["class"]);g=c.add(i,"span",{"class":"mceIcon"+(q.icon?" mce_"+q.icon:"")});if(q.icon_src){c.add(g,"img",{src:q.icon_src})}i=c.add(i,q.element||"span",{"class":"mceText",title:h.settings.title},h.settings.title);if(h.settings.style){if(typeof h.settings.style=="function"){h.settings.style=h.settings.style()}c.setAttrib(i,"style",h.settings.style)}if(j.childNodes.length==1){c.addClass(l,"mceFirst")}if((i=l.previousSibling)&&c.hasClass(i,m+"ItemSeparator")){c.addClass(l,"mceFirst")}if(h.collapse){c.addClass(l,m+"ItemSub")}if(i=l.previousSibling){c.removeClass(i,"mceLast")}c.addClass(l,"mceLast")}})})(tinymce);(function(b){var a=b.DOM;b.create("tinymce.ui.Button:tinymce.ui.Control",{Button:function(e,d,c){this.parent(e,d,c);this.classPrefix="mceButton"},renderHTML:function(){var f=this.classPrefix,e=this.settings,d,c;c=a.encode(e.label||"");d='<a role="button" id="'+this.id+'" href="javascript:;" class="'+f+" "+f+"Enabled "+e["class"]+(c?" "+f+"Labeled":"")+'" onmousedown="return false;" onclick="return false;" aria-labelledby="'+this.id+'_voice" title="'+a.encode(e.title)+'">';if(e.image&&!(this.editor&&this.editor.forcedHighContrastMode)){d+='<span class="mceIcon '+e["class"]+'"><img class="mceIcon" src="'+e.image+'" alt="'+a.encode(e.title)+'" /></span>'+(c?'<span class="'+f+'Label">'+c+"</span>":"")}else{d+='<span class="mceIcon '+e["class"]+'"></span>'+(c?'<span class="'+f+'Label">'+c+"</span>":"")}d+='<span class="mceVoiceLabel mceIconOnly" style="display: none;" id="'+this.id+'_voice">'+e.title+"</span>";d+="</a>";return d},postRender:function(){var d=this,e=d.settings,c;if(b.isIE&&d.editor){b.dom.Event.add(d.id,"mousedown",function(f){var g=d.editor.selection.getNode().nodeName;c=g==="IMG"?d.editor.selection.getBookmark():null})}b.dom.Event.add(d.id,"click",function(f){if(!d.isDisabled()){if(b.isIE&&d.editor&&c!==null){d.editor.selection.moveToBookmark(c)}return e.onclick.call(e.scope,f)}});b.dom.Event.add(d.id,"keydown",function(f){if(!d.isDisabled()&&f.keyCode==b.VK.SPACEBAR){b.dom.Event.cancel(f);return e.onclick.call(e.scope,f)}})}})})(tinymce);(function(e){var d=e.DOM,b=e.dom.Event,f=e.each,a=e.util.Dispatcher,c;e.create("tinymce.ui.ListBox:tinymce.ui.Control",{ListBox:function(j,i,g){var h=this;h.parent(j,i,g);h.items=[];h.onChange=new a(h);h.onPostRender=new a(h);h.onAdd=new a(h);h.onRenderMenu=new e.util.Dispatcher(this);h.classPrefix="mceListBox";h.marked={}},select:function(h){var g=this,j,i;g.marked={};if(h==c){return g.selectByIndex(-1)}if(h&&typeof(h)=="function"){i=h}else{i=function(k){return k==h}}if(h!=g.selectedValue){f(g.items,function(l,k){if(i(l.value)){j=1;g.selectByIndex(k);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(g){var i=this,j,k,h;i.marked={};if(g!=i.selectedIndex){j=d.get(i.id+"_text");h=d.get(i.id+"_voiceDesc");k=i.items[g];if(k){i.selectedValue=k.value;i.selectedIndex=g;d.setHTML(j,d.encode(k.title));d.setHTML(h,i.settings.title+" - "+k.title);d.removeClass(j,"mceTitle");d.setAttrib(i.id,"aria-valuenow",k.title)}else{d.setHTML(j,d.encode(i.settings.title));d.setHTML(h,d.encode(i.settings.title));d.addClass(j,"mceTitle");i.selectedValue=i.selectedIndex=null;d.setAttrib(i.id,"aria-valuenow",i.settings.title)}j=0}},mark:function(g){this.marked[g]=true},add:function(j,g,i){var h=this;i=i||{};i=e.extend(i,{title:j,value:g});h.items.push(i);h.onAdd.dispatch(h,i)},getLength:function(){return this.items.length},renderHTML:function(){var j="",g=this,i=g.settings,k=g.classPrefix;j='<span role="listbox" aria-haspopup="true" aria-labelledby="'+g.id+'_voiceDesc" aria-describedby="'+g.id+'_voiceDesc"><table role="presentation" tabindex="0" id="'+g.id+'" cellpadding="0" cellspacing="0" class="'+k+" "+k+"Enabled"+(i["class"]?(" "+i["class"]):"")+'"><tbody><tr>';j+="<td>"+d.createHTML("span",{id:g.id+"_voiceDesc","class":"voiceLabel",style:"display:none;"},g.settings.title);j+=d.createHTML("a",{id:g.id+"_text",tabindex:-1,href:"javascript:;","class":"mceText",onclick:"return false;",onmousedown:"return false;"},d.encode(g.settings.title))+"</td>";j+="<td>"+d.createHTML("a",{id:g.id+"_open",tabindex:-1,href:"javascript:;","class":"mceOpen",onclick:"return false;",onmousedown:"return false;"},'<span><span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span></span>')+"</td>";j+="</tr></tbody></table></span>";return j},showMenu:function(){var h=this,j,i=d.get(this.id),g;if(h.isDisabled()||h.items.length===0){return}if(h.menu&&h.menu.isMenuVisible){return h.hideMenu()}if(!h.isMenuRendered){h.renderMenu();h.isMenuRendered=true}j=d.getPos(i);g=h.menu;g.settings.offset_x=j.x;g.settings.offset_y=j.y;g.settings.keyboard_focus=!e.isOpera;f(h.items,function(k){if(g.items[k.id]){g.items[k.id].setSelected(0)}});f(h.items,function(k){if(g.items[k.id]&&h.marked[k.value]){g.items[k.id].setSelected(1)}if(k.value===h.selectedValue){g.items[k.id].setSelected(1)}});g.showMenu(0,i.clientHeight);b.add(d.doc,"mousedown",h.hideMenu,h);d.addClass(h.id,h.classPrefix+"Selected")},hideMenu:function(h){var g=this;if(g.menu&&g.menu.isMenuVisible){d.removeClass(g.id,g.classPrefix+"Selected");if(h&&h.type=="mousedown"&&(h.target.id==g.id+"_text"||h.target.id==g.id+"_open")){return}if(!h||!d.getParent(h.target,".mceMenu")){d.removeClass(g.id,g.classPrefix+"Selected");b.remove(d.doc,"mousedown",g.hideMenu,g);g.menu.hideMenu()}}},renderMenu:function(){var h=this,g;g=h.settings.control_manager.createDropMenu(h.id+"_menu",{menu_line:1,"class":h.classPrefix+"Menu mceNoIcons",max_width:250,max_height:150});g.onHideMenu.add(function(){h.hideMenu();h.focus()});g.add({title:h.settings.title,"class":"mceMenuItemTitle",onclick:function(){if(h.settings.onselect("")!==false){h.select("")}}});f(h.items,function(i){if(i.value===c){g.add({title:i.title,role:"option","class":"mceMenuItemTitle",onclick:function(){if(h.settings.onselect("")!==false){h.select("")}}})}else{i.id=d.uniqueId();i.role="option";i.onclick=function(){if(h.settings.onselect(i.value)!==false){h.select(i.value)}};g.add(i)}});h.onRenderMenu.dispatch(h,g);h.menu=g},postRender:function(){var g=this,h=g.classPrefix;b.add(g.id,"click",g.showMenu,g);b.add(g.id,"keydown",function(i){if(i.keyCode==32){g.showMenu(i);b.cancel(i)}});b.add(g.id,"focus",function(){if(!g._focused){g.keyDownHandler=b.add(g.id,"keydown",function(i){if(i.keyCode==40){g.showMenu();b.cancel(i)}});g.keyPressHandler=b.add(g.id,"keypress",function(j){var i;if(j.keyCode==13){i=g.selectedValue;g.selectedValue=null;b.cancel(j);g.settings.onselect(i)}})}g._focused=1});b.add(g.id,"blur",function(){b.remove(g.id,"keydown",g.keyDownHandler);b.remove(g.id,"keypress",g.keyPressHandler);g._focused=0});if(e.isIE6||!d.boxModel){b.add(g.id,"mouseover",function(){if(!d.hasClass(g.id,h+"Disabled")){d.addClass(g.id,h+"Hover")}});b.add(g.id,"mouseout",function(){if(!d.hasClass(g.id,h+"Disabled")){d.removeClass(g.id,h+"Hover")}})}g.onPostRender.dispatch(g,d.get(g.id))},destroy:function(){this.parent();b.clear(this.id+"_text");b.clear(this.id+"_open")}})})(tinymce);(function(e){var d=e.DOM,b=e.dom.Event,f=e.each,a=e.util.Dispatcher,c;e.create("tinymce.ui.NativeListBox:tinymce.ui.ListBox",{NativeListBox:function(h,g){this.parent(h,g);this.classPrefix="mceNativeListBox"},setDisabled:function(g){d.get(this.id).disabled=g;this.setAriaProperty("disabled",g)},isDisabled:function(){return d.get(this.id).disabled},select:function(h){var g=this,j,i;if(h==c){return g.selectByIndex(-1)}if(h&&typeof(h)=="function"){i=h}else{i=function(k){return k==h}}if(h!=g.selectedValue){f(g.items,function(l,k){if(i(l.value)){j=1;g.selectByIndex(k);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(g){d.get(this.id).selectedIndex=g+1;this.selectedValue=this.items[g]?this.items[g].value:null},add:function(k,h,g){var j,i=this;g=g||{};g.value=h;if(i.isRendered()){d.add(d.get(this.id),"option",g,k)}j={title:k,value:h,attribs:g};i.items.push(j);i.onAdd.dispatch(i,j)},getLength:function(){return this.items.length},renderHTML:function(){var i,g=this;i=d.createHTML("option",{value:""},"-- "+g.settings.title+" --");f(g.items,function(h){i+=d.createHTML("option",{value:h.value},h.title)});i=d.createHTML("select",{id:g.id,"class":"mceNativeListBox","aria-labelledby":g.id+"_aria"},i);i+=d.createHTML("span",{id:g.id+"_aria",style:"display: none"},g.settings.title);return i},postRender:function(){var h=this,i,j=true;h.rendered=true;function g(l){var k=h.items[l.target.selectedIndex-1];if(k&&(k=k.value)){h.onChange.dispatch(h,k);if(h.settings.onselect){h.settings.onselect(k)}}}b.add(h.id,"change",g);b.add(h.id,"keydown",function(q){var n,p=37,m=39,l=38,r=40,k=13,o=32;b.remove(h.id,"change",i);j=false;n=b.add(h.id,"blur",function(){if(j){return}j=true;b.add(h.id,"change",g);b.remove(h.id,"blur",n)});if(q.keyCode==k||q.keyCode==o){g(q);return b.cancel(q)}else{if(q.keyCode==r||q.keyCode==l){q.stopImmediatePropagation()}}});h.onPostRender.dispatch(h,d.get(h.id))}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.MenuButton:tinymce.ui.Button",{MenuButton:function(g,f,e){this.parent(g,f,e);this.onRenderMenu=new c.util.Dispatcher(this);f.menu_container=f.menu_container||b.doc.body},showMenu:function(){var g=this,j,i,h=b.get(g.id),f;if(g.isDisabled()){return}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}if(g.isMenuVisible){return g.hideMenu()}j=b.getPos(g.settings.menu_container);i=b.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.vp_offset_x=i.x;f.settings.vp_offset_y=i.y;f.settings.keyboard_focus=g._focused;f.showMenu(0,h.firstChild.clientHeight);a.add(b.doc,"mousedown",g.hideMenu,g);g.setState("Selected",1);g.isMenuVisible=1},renderMenu:function(){var f=this,e;e=f.settings.control_manager.createDropMenu(f.id+"_menu",{menu_line:1,"class":this.classPrefix+"Menu",icons:f.settings.icons});e.onHideMenu.add(function(){f.hideMenu();f.focus()});f.onRenderMenu.dispatch(f,e);f.menu=e},hideMenu:function(g){var f=this;if(g&&g.type=="mousedown"&&b.getParent(g.target,function(h){return h.id===f.id||h.id===f.id+"_open"})){return}if(!g||!b.getParent(g.target,".mceMenu")){f.setState("Selected",0);a.remove(b.doc,"mousedown",f.hideMenu,f);if(f.menu){f.menu.hideMenu()}}f.isMenuVisible=0},postRender:function(){var e=this,f=e.settings;a.add(e.id,"click",function(){if(!e.isDisabled()){if(f.onclick){f.onclick(e.value)}e.showMenu()}})}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.SplitButton:tinymce.ui.MenuButton",{SplitButton:function(g,f,e){this.parent(g,f,e);this.classPrefix="mceSplitButton"},renderHTML:function(){var i,f=this,g=f.settings,e;i="<tbody><tr>";if(g.image){e=b.createHTML("img ",{src:g.image,role:"presentation","class":"mceAction "+g["class"]})}else{e=b.createHTML("span",{"class":"mceAction "+g["class"]},"")}e+=b.createHTML("span",{"class":"mceVoiceLabel mceIconOnly",id:f.id+"_voice",style:"display:none;"},g.title);i+="<td >"+b.createHTML("a",{role:"button",id:f.id+"_action",tabindex:"-1",href:"javascript:;","class":"mceAction "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";e=b.createHTML("span",{"class":"mceOpen "+g["class"]},'<span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span>');i+="<td >"+b.createHTML("a",{role:"button",id:f.id+"_open",tabindex:"-1",href:"javascript:;","class":"mceOpen "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";i+="</tr></tbody>";i=b.createHTML("table",{role:"presentation","class":"mceSplitButton mceSplitButtonEnabled "+g["class"],cellpadding:"0",cellspacing:"0",title:g.title},i);return b.createHTML("div",{id:f.id,role:"button",tabindex:"0","aria-labelledby":f.id+"_voice","aria-haspopup":"true"},i)},postRender:function(){var e=this,g=e.settings,f;if(g.onclick){f=function(h){if(!e.isDisabled()){g.onclick(e.value);a.cancel(h)}};a.add(e.id+"_action","click",f);a.add(e.id,["click","keydown"],function(h){var k=32,m=14,i=13,j=38,l=40;if((h.keyCode===32||h.keyCode===13||h.keyCode===14)&&!h.altKey&&!h.ctrlKey&&!h.metaKey){f();a.cancel(h)}else{if(h.type==="click"||h.keyCode===l){e.showMenu();a.cancel(h)}}})}a.add(e.id+"_open","click",function(h){e.showMenu();a.cancel(h)});a.add([e.id,e.id+"_open"],"focus",function(){e._focused=1});a.add([e.id,e.id+"_open"],"blur",function(){e._focused=0});if(c.isIE6||!b.boxModel){a.add(e.id,"mouseover",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.addClass(e.id,"mceSplitButtonHover")}});a.add(e.id,"mouseout",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.removeClass(e.id,"mceSplitButtonHover")}})}},destroy:function(){this.parent();a.clear(this.id+"_action");a.clear(this.id+"_open");a.clear(this.id)}})})(tinymce);(function(d){var c=d.DOM,a=d.dom.Event,b=d.is,e=d.each;d.create("tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton",{ColorSplitButton:function(i,h,f){var g=this;g.parent(i,h,f);g.settings=h=d.extend({colors:"000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,008000,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF",grid_width:8,default_color:"#888888"},g.settings);g.onShowMenu=new d.util.Dispatcher(g);g.onHideMenu=new d.util.Dispatcher(g);g.value=h.default_color},showMenu:function(){var f=this,g,j,i,h;if(f.isDisabled()){return}if(!f.isMenuRendered){f.renderMenu();f.isMenuRendered=true}if(f.isMenuVisible){return f.hideMenu()}i=c.get(f.id);c.show(f.id+"_menu");c.addClass(i,"mceSplitButtonSelected");h=c.getPos(i);c.setStyles(f.id+"_menu",{left:h.x,top:h.y+i.firstChild.clientHeight,zIndex:200000});i=0;a.add(c.doc,"mousedown",f.hideMenu,f);f.onShowMenu.dispatch(f);if(f._focused){f._keyHandler=a.add(f.id+"_menu","keydown",function(k){if(k.keyCode==27){f.hideMenu()}});c.select("a",f.id+"_menu")[0].focus()}f.keyboardNav=new d.ui.KeyboardNavigation({root:f.id+"_menu",items:c.select("a",f.id+"_menu"),onCancel:function(){f.hideMenu();f.focus()}});f.keyboardNav.focus();f.isMenuVisible=1},hideMenu:function(g){var f=this;if(f.isMenuVisible){if(g&&g.type=="mousedown"&&c.getParent(g.target,function(h){return h.id===f.id+"_open"})){return}if(!g||!c.getParent(g.target,".mceSplitButtonMenu")){c.removeClass(f.id,"mceSplitButtonSelected");a.remove(c.doc,"mousedown",f.hideMenu,f);a.remove(f.id+"_menu","keydown",f._keyHandler);c.hide(f.id+"_menu")}f.isMenuVisible=0;f.onHideMenu.dispatch();f.keyboardNav.destroy()}},renderMenu:function(){var p=this,h,k=0,q=p.settings,g,j,l,o,f;o=c.add(q.menu_container,"div",{role:"listbox",id:p.id+"_menu","class":q.menu_class+" "+q["class"],style:"position:absolute;left:0;top:-1000px;"});h=c.add(o,"div",{"class":q["class"]+" mceSplitButtonMenu"});c.add(h,"span",{"class":"mceMenuLine"});g=c.add(h,"table",{role:"presentation","class":"mceColorSplitMenu"});j=c.add(g,"tbody");k=0;e(b(q.colors,"array")?q.colors:q.colors.split(","),function(m){m=m.replace(/^#/,"");if(!k--){l=c.add(j,"tr");k=q.grid_width-1}g=c.add(l,"td");var i={href:"javascript:;",style:{backgroundColor:"#"+m},title:p.editor.getLang("colors."+m,m),"data-mce-color":"#"+m};if(!d.isIE){i.role="option"}g=c.add(g,"a",i);if(p.editor.forcedHighContrastMode){g=c.add(g,"canvas",{width:16,height:16,"aria-hidden":"true"});if(g.getContext&&(f=g.getContext("2d"))){f.fillStyle="#"+m;f.fillRect(0,0,16,16)}else{c.remove(g)}}});if(q.more_colors_func){g=c.add(j,"tr");g=c.add(g,"td",{colspan:q.grid_width,"class":"mceMoreColors"});g=c.add(g,"a",{role:"option",id:p.id+"_more",href:"javascript:;",onclick:"return false;","class":"mceMoreColors"},q.more_colors_title);a.add(g,"click",function(i){q.more_colors_func.call(q.more_colors_scope||this);return a.cancel(i)})}c.addClass(h,"mceColorSplitMenu");a.add(p.id+"_menu","mousedown",function(i){return a.cancel(i)});a.add(p.id+"_menu","click",function(i){var m;i=c.getParent(i.target,"a",j);if(i&&i.nodeName.toLowerCase()=="a"&&(m=i.getAttribute("data-mce-color"))){p.setColor(m)}return false});return o},setColor:function(f){this.displayColor(f);this.hideMenu();this.settings.onselect(f)},displayColor:function(g){var f=this;c.setStyle(f.id+"_preview","backgroundColor",g);f.value=g},postRender:function(){var f=this,g=f.id;f.parent();c.add(g+"_action","div",{id:g+"_preview","class":"mceColorPreview"});c.setStyle(f.id+"_preview","backgroundColor",f.value)},destroy:function(){var f=this;f.parent();a.clear(f.id+"_menu");a.clear(f.id+"_more");c.remove(f.id+"_menu");if(f.keyboardNav){f.keyboardNav.destroy()}}})})(tinymce);(function(b){var d=b.DOM,c=b.each,a=b.dom.Event;b.create("tinymce.ui.ToolbarGroup:tinymce.ui.Container",{renderHTML:function(){var f=this,i=[],e=f.controls,j=b.each,g=f.settings;i.push('<div id="'+f.id+'" role="group" aria-labelledby="'+f.id+'_voice">');i.push("<span role='application'>");i.push('<span id="'+f.id+'_voice" class="mceVoiceLabel" style="display:none;">'+d.encode(g.name)+"</span>");j(e,function(h){i.push(h.renderHTML())});i.push("</span>");i.push("</div>");return i.join("")},focus:function(){var e=this;d.get(e.id).focus()},postRender:function(){var f=this,e=[];c(f.controls,function(g){c(g.controls,function(h){if(h.id){e.push(h)}})});f.keyNav=new b.ui.KeyboardNavigation({root:f.id,items:e,onCancel:function(){if(b.isWebKit){d.get(f.editor.id+"_ifr").focus()}f.editor.focus()},excludeFromTabOrder:!f.settings.tab_focus_toolbar})},destroy:function(){var e=this;e.parent();e.keyNav.destroy();a.clear(e.id)}})})(tinymce);(function(a){var c=a.DOM,b=a.each;a.create("tinymce.ui.Toolbar:tinymce.ui.Container",{renderHTML:function(){var m=this,f="",j,k,n=m.settings,e,d,g,l;l=m.controls;for(e=0;e<l.length;e++){k=l[e];d=l[e-1];g=l[e+1];if(e===0){j="mceToolbarStart";if(k.Button){j+=" mceToolbarStartButton"}else{if(k.SplitButton){j+=" mceToolbarStartSplitButton"}else{if(k.ListBox){j+=" mceToolbarStartListBox"}}}f+=c.createHTML("td",{"class":j},c.createHTML("span",null,"<!-- IE -->"))}if(d&&k.ListBox){if(d.Button||d.SplitButton){f+=c.createHTML("td",{"class":"mceToolbarEnd"},c.createHTML("span",null,"<!-- IE -->"))}}if(c.stdMode){f+='<td style="position: relative">'+k.renderHTML()+"</td>"}else{f+="<td>"+k.renderHTML()+"</td>"}if(g&&k.ListBox){if(g.Button||g.SplitButton){f+=c.createHTML("td",{"class":"mceToolbarStart"},c.createHTML("span",null,"<!-- IE -->"))}}}j="mceToolbarEnd";if(k.Button){j+=" mceToolbarEndButton"}else{if(k.SplitButton){j+=" mceToolbarEndSplitButton"}else{if(k.ListBox){j+=" mceToolbarEndListBox"}}}f+=c.createHTML("td",{"class":j},c.createHTML("span",null,"<!-- IE -->"));return c.createHTML("table",{id:m.id,"class":"mceToolbar"+(n["class"]?" "+n["class"]:""),cellpadding:"0",cellspacing:"0",align:m.settings.align||"",role:"presentation",tabindex:"-1"},"<tbody><tr>"+f+"</tr></tbody>")}})})(tinymce);(function(b){var a=b.util.Dispatcher,c=b.each;b.create("tinymce.AddOnManager",{AddOnManager:function(){var d=this;d.items=[];d.urls={};d.lookup={};d.onAdd=new a(d)},get:function(d){if(this.lookup[d]){return this.lookup[d].instance}else{return undefined}},dependencies:function(e){var d;if(this.lookup[e]){d=this.lookup[e].dependencies}return d||[]},requireLangPack:function(e){var d=b.settings;if(d&&d.language&&d.language_load!==false){b.ScriptLoader.add(this.urls[e]+"/langs/"+d.language+".js")}},add:function(f,e,d){this.items.push(e);this.lookup[f]={instance:e,dependencies:d};this.onAdd.dispatch(this,f,e);return e},createUrl:function(d,e){if(typeof e==="object"){return e}else{return{prefix:d.prefix,resource:e,suffix:d.suffix}}},addComponents:function(f,d){var e=this.urls[f];b.each(d,function(g){b.ScriptLoader.add(e+"/"+g)})},load:function(j,f,d,h){var g=this,e=f;function i(){var k=g.dependencies(j);b.each(k,function(m){var l=g.createUrl(f,m);g.load(l.resource,l,undefined,undefined)});if(d){if(h){d.call(h)}else{d.call(b.ScriptLoader)}}}if(g.urls[j]){return}if(typeof f==="object"){e=f.prefix+f.resource+f.suffix}if(e.indexOf("/")!==0&&e.indexOf("://")==-1){e=b.baseURL+"/"+e}g.urls[j]=e.substring(0,e.lastIndexOf("/"));if(g.lookup[j]){i()}else{b.ScriptLoader.add(e,i,h)}}});b.PluginManager=new b.AddOnManager();b.ThemeManager=new b.AddOnManager()}(tinymce));(function(j){var g=j.each,d=j.extend,k=j.DOM,i=j.dom.Event,f=j.ThemeManager,b=j.PluginManager,e=j.explode,h=j.util.Dispatcher,a,c=0;j.documentBaseURL=window.location.href.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,"");if(!/[\/\\]$/.test(j.documentBaseURL)){j.documentBaseURL+="/"}j.baseURL=new j.util.URI(j.documentBaseURL).toAbsolute(j.baseURL);j.baseURI=new j.util.URI(j.baseURL);j.onBeforeUnload=new h(j);i.add(window,"beforeunload",function(l){j.onBeforeUnload.dispatch(j,l)});j.onAddEditor=new h(j);j.onRemoveEditor=new h(j);j.EditorManager=d(j,{editors:[],i18n:{},activeEditor:null,init:function(x){var v=this,o,n=j.ScriptLoader,u,l=[],r;function q(t){var s=t.id;if(!s){s=t.name;if(s&&!k.get(s)){s=t.name}else{s=k.uniqueId()}t.setAttribute("id",s)}return s}function m(z,A,t){var y=z[A];if(!y){return}if(j.is(y,"string")){t=y.replace(/\.\w+$/,"");t=t?j.resolve(t):0;y=j.resolve(y)}return y.apply(t||this,Array.prototype.slice.call(arguments,2))}function p(t,s){return s.constructor===RegExp?s.test(t.className):k.hasClass(t,s)}v.settings=x;i.bind(window,"ready",function(){var s,t;m(x,"onpageload");switch(x.mode){case"exact":s=x.elements||"";if(s.length>0){g(e(s),function(y){if(k.get(y)){r=new j.Editor(y,x);l.push(r);r.render(1)}else{g(document.forms,function(z){g(z.elements,function(A){if(A.name===y){y="mce_editor_"+c++;k.setAttrib(A,"id",y);r=new j.Editor(y,x);l.push(r);r.render(1)}})})}})}break;case"textareas":case"specific_textareas":g(k.select("textarea"),function(y){if(x.editor_deselector&&p(y,x.editor_deselector)){return}if(!x.editor_selector||p(y,x.editor_selector)){r=new j.Editor(q(y),x);l.push(r);r.render(1)}});break;default:if(x.types){g(x.types,function(y){g(k.select(y.selector),function(A){var z=new j.Editor(q(A),j.extend({},x,y));l.push(z);z.render(1)})})}else{if(x.selector){g(k.select(x.selector),function(z){var y=new j.Editor(q(z),x);l.push(y);y.render(1)})}}}if(x.oninit){s=t=0;g(l,function(y){t++;if(!y.initialized){y.onInit.add(function(){s++;if(s==t){m(x,"oninit")}})}else{s++}if(s==t){m(x,"oninit")}})}})},get:function(l){if(l===a){return this.editors}if(!this.editors.hasOwnProperty(l)){return a}return this.editors[l]},getInstanceById:function(l){return this.get(l)},add:function(m){var l=this,n=l.editors;n[m.id]=m;n.push(m);l._setActive(m);l.onAddEditor.dispatch(l,m);if(j.adapter){j.adapter.patchEditor(m)}return m},remove:function(n){var m=this,l,o=m.editors;if(!o[n.id]){return null}delete o[n.id];for(l=0;l<o.length;l++){if(o[l]==n){o.splice(l,1);break}}if(m.activeEditor==n){m._setActive(o[0])}n.destroy();m.onRemoveEditor.dispatch(m,n);return n},execCommand:function(r,p,o){var q=this,n=q.get(o),l;function m(){n.destroy();l.detachEvent("onunload",m);l=l.tinyMCE=l.tinymce=null}switch(r){case"mceFocus":n.focus();return true;case"mceAddEditor":case"mceAddControl":if(!q.get(o)){new j.Editor(o,q.settings).render()}return true;case"mceAddFrameControl":l=o.window;l.tinyMCE=tinyMCE;l.tinymce=j;j.DOM.doc=l.document;j.DOM.win=l;n=new j.Editor(o.element_id,o);n.render();if(j.isIE&&!j.isIE11){l.attachEvent("onunload",m)}o.page_window=null;return true;case"mceRemoveEditor":case"mceRemoveControl":if(n){n.remove()}return true;case"mceToggleEditor":if(!n){q.execCommand("mceAddControl",0,o);return true}if(n.isHidden()){n.show()}else{n.hide()}return true}if(q.activeEditor){return q.activeEditor.execCommand(r,p,o)}return false},execInstanceCommand:function(p,o,n,m){var l=this.get(p);if(l){return l.execCommand(o,n,m)}return false},triggerSave:function(){g(this.editors,function(l){l.save()})},addI18n:function(n,q){var l,m=this.i18n;if(!j.is(n,"string")){g(n,function(r,p){g(r,function(t,s){g(t,function(v,u){if(s==="common"){m[p+"."+u]=v}else{m[p+"."+s+"."+u]=v}})})})}else{g(q,function(r,p){m[n+"."+p]=r})}},_setActive:function(l){this.selectedInstance=this.activeEditor=l}})})(tinymce);(function(k){var l=k.DOM,j=k.dom.Event,f=k.extend,i=k.each,a=k.isGecko,b=k.isIE,e=k.isWebKit,d=k.is,h=k.ThemeManager,c=k.PluginManager,g=k.explode;k.create("tinymce.Editor",{Editor:function(p,o){var m=this,n=true;m.settings=o=f({id:p,language:"en",theme:"advanced",skin:"default",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:k.documentBaseURL,add_form_submit_trigger:n,submit_patch:n,add_unload_trigger:n,convert_urls:n,relative_urls:n,remove_script_host:n,table_inline_editing:false,object_resizing:n,accessibility_focus:n,doctype:k.isIE6?'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">':"<!DOCTYPE>",visual:n,font_size_style_values:"xx-small,x-small,small,medium,large,x-large,xx-large",font_size_legacy_values:"xx-small,small,medium,large,x-large,xx-large,300%",apply_source_formatting:n,directionality:"ltr",forced_root_block:"p",hidden_input:n,padd_empty_editor:n,render_ui:n,indentation:"30px",fix_table_elements:n,inline_styles:n,convert_fonts_to_spans:n,indent:"simple",indent_before:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside,figure,option,optgroup,datalist",indent_after:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside,figure,option,optgroup,datalist",validate:n,entity_encoding:"named",url_converter:m.convertURL,url_converter_scope:m,ie7_compat:n},o);m.id=m.editorId=p;m.isNotDirty=false;m.plugins={};m.documentBaseURI=new k.util.URI(o.document_base_url||k.documentBaseURL,{base_uri:tinyMCE.baseURI});m.baseURI=k.baseURI;m.contentCSS=[];m.contentStyles=[];m.setupEvents();m.execCommands={};m.queryStateCommands={};m.queryValueCommands={};m.execCallback("setup",m)},render:function(o){var p=this,q=p.settings,r=p.id,m=k.ScriptLoader;if(!j.domLoaded){j.add(window,"ready",function(){p.render()});return}tinyMCE.settings=q;if(!p.getElement()){return}if(k.isIDevice&&!k.isIOS5){return}if(!/TEXTAREA|INPUT/i.test(p.getElement().nodeName)&&q.hidden_input&&l.getParent(r,"form")){l.insertAfter(l.create("input",{type:"hidden",name:r}),r)}if(!q.content_editable){p.orgVisibility=p.getElement().style.visibility;p.getElement().style.visibility="hidden"}if(k.WindowManager){p.windowManager=new k.WindowManager(p)}if(q.encoding=="xml"){p.onGetContent.add(function(s,t){if(t.save){t.content=l.encode(t.content)}})}if(q.add_form_submit_trigger){p.onSubmit.addToTop(function(){if(p.initialized){p.save();p.isNotDirty=1}})}if(q.add_unload_trigger){p._beforeUnload=tinyMCE.onBeforeUnload.add(function(){if(p.initialized&&!p.destroyed&&!p.isHidden()){p.save({format:"raw",no_events:true})}})}k.addUnload(p.destroy,p);if(q.submit_patch){p.onBeforeRenderUI.add(function(){var s=p.getElement().form;if(!s){return}if(s._mceOldSubmit){return}if(!s.submit.nodeType&&!s.submit.length){p.formElement=s;s._mceOldSubmit=s.submit;s.submit=function(){k.triggerSave();p.isNotDirty=1;return p.formElement._mceOldSubmit(p.formElement)}}s=null})}function n(){if(q.language&&q.language_load!==false){m.add(k.baseURL+"/langs/"+q.language+".js")}if(q.theme&&typeof q.theme!="function"&&q.theme.charAt(0)!="-"&&!h.urls[q.theme]){h.load(q.theme,"themes/"+q.theme+"/editor_template"+k.suffix+".js")}i(g(q.plugins),function(t){if(t&&!c.urls[t]){if(t.charAt(0)=="-"){t=t.substr(1,t.length);var s=c.dependencies(t);i(s,function(v){var u={prefix:"plugins/",resource:v,suffix:"/editor_plugin"+k.suffix+".js"};v=c.createUrl(u,v);c.load(v.resource,v)})}else{if(t=="safari"){return}c.load(t,{prefix:"plugins/",resource:t,suffix:"/editor_plugin"+k.suffix+".js"})}}});m.loadQueue(function(){if(!p.removed){p.init()}})}n()},init:function(){var q,G=this,H=G.settings,D,y,z,C=G.getElement(),p,m,E,v,B,F,x,r=[];k.add(G);H.aria_label=H.aria_label||l.getAttrib(C,"aria-label",G.getLang("aria.rich_text_area"));if(H.theme){if(typeof H.theme!="function"){H.theme=H.theme.replace(/-/,"");p=h.get(H.theme);G.theme=new p();if(G.theme.init){G.theme.init(G,h.urls[H.theme]||k.documentBaseURL.replace(/\/$/,""))}}else{G.theme=H.theme}}function A(s){var t=c.get(s),o=c.urls[s]||k.documentBaseURL.replace(/\/$/,""),n;if(t&&k.inArray(r,s)===-1){i(c.dependencies(s),function(u){A(u)});n=new t(G,o);G.plugins[s]=n;if(n.init){n.init(G,o);r.push(s)}}}i(g(H.plugins.replace(/\-/g,"")),A);if(H.popup_css!==false){if(H.popup_css){H.popup_css=G.documentBaseURI.toAbsolute(H.popup_css)}else{H.popup_css=G.baseURI.toAbsolute("themes/"+H.theme+"/skins/"+H.skin+"/dialog.css")}}if(H.popup_css_add){H.popup_css+=","+G.documentBaseURI.toAbsolute(H.popup_css_add)}G.controlManager=new k.ControlManager(G);G.onBeforeRenderUI.dispatch(G,G.controlManager);if(H.render_ui&&G.theme){G.orgDisplay=C.style.display;if(typeof H.theme!="function"){D=H.width||C.style.width||C.offsetWidth;y=H.height||C.style.height||C.offsetHeight;z=H.min_height||100;F=/^[0-9\.]+(|px)$/i;if(F.test(""+D)){D=Math.max(parseInt(D,10)+(p.deltaWidth||0),100)}if(F.test(""+y)){y=Math.max(parseInt(y,10)+(p.deltaHeight||0),z)}p=G.theme.renderUI({targetNode:C,width:D,height:y,deltaWidth:H.delta_width,deltaHeight:H.delta_height});l.setStyles(p.sizeContainer||p.editorContainer,{width:D,height:y});y=(p.iframeHeight||y)+(typeof(y)=="number"?(p.deltaHeight||0):"");if(y<z){y=z}}else{p=H.theme(G,C);if(p.editorContainer.nodeType){p.editorContainer=p.editorContainer.id=p.editorContainer.id||G.id+"_parent"}if(p.iframeContainer.nodeType){p.iframeContainer=p.iframeContainer.id=p.iframeContainer.id||G.id+"_iframecontainer"}y=p.iframeHeight||C.offsetHeight;if(b){G.onInit.add(function(n){n.dom.bind(n.getBody(),"beforedeactivate keydown keyup",function(){n.bookmark=n.selection.getBookmark(1)})});G.onNodeChange.add(function(n){if(document.activeElement.id==n.id+"_ifr"){n.bookmark=n.selection.getBookmark(1)}})}}G.editorContainer=p.editorContainer}if(H.content_css){i(g(H.content_css),function(n){G.contentCSS.push(G.documentBaseURI.toAbsolute(n))})}if(H.content_style){G.contentStyles.push(H.content_style)}if(H.content_editable){C=q=p=null;return G.initContentBody()}if(document.domain&&location.hostname!=document.domain){k.relaxedDomain=document.domain}G.iframeHTML=H.doctype+'<html><head xmlns="http://www.w3.org/1999/xhtml">';if(H.document_base_url!=k.documentBaseURL){G.iframeHTML+='<base href="'+G.documentBaseURI.getURI()+'" />'}if(k.isIE8){if(H.ie7_compat){G.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=7" />'}else{G.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=edge" />'}}G.iframeHTML+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';for(x=0;x<G.contentCSS.length;x++){G.iframeHTML+='<link type="text/css" rel="stylesheet" href="'+G.contentCSS[x]+'" />'}G.contentCSS=[];v=H.body_id||"tinymce";if(v.indexOf("=")!=-1){v=G.getParam("body_id","","hash");v=v[G.id]||v}B=H.body_class||"";if(B.indexOf("=")!=-1){B=G.getParam("body_class","","hash");B=B[G.id]||""}G.iframeHTML+='</head><body id="'+v+'" class="mceContentBody '+B+'" onload="window.parent.tinyMCE.get(\''+G.id+"').onLoad.dispatch();\"><br></body></html>";if(k.relaxedDomain&&(b||(k.isOpera&&parseFloat(opera.version())<11))){E='javascript:(function(){document.open();document.domain="'+document.domain+'";var ed = window.parent.tinyMCE.get("'+G.id+'");document.write(ed.iframeHTML);document.close();ed.initContentBody();})()'}q=l.add(p.iframeContainer,"iframe",{id:G.id+"_ifr",src:E||'javascript:""',frameBorder:"0",allowTransparency:"true",title:H.aria_label,style:{width:"100%",height:y,display:"block"}});G.contentAreaContainer=p.iframeContainer;if(p.editorContainer){l.get(p.editorContainer).style.display=G.orgDisplay}C.style.visibility=G.orgVisibility;l.get(G.id).style.display="none";l.setAttrib(G.id,"aria-hidden",true);if(!k.relaxedDomain||!E){G.initContentBody()}C=q=p=null},initContentBody:function(){var n=this,p=n.settings,q=l.get(n.id),r=n.getDoc(),o,m,s;if((!b||!k.relaxedDomain)&&!p.content_editable){r.open();r.write(n.iframeHTML);r.close();if(k.relaxedDomain){r.domain=k.relaxedDomain}}if(p.content_editable){l.addClass(q,"mceContentBody");n.contentDocument=r=p.content_document||document;n.contentWindow=p.content_window||window;n.bodyElement=q;p.content_document=p.content_window=null}m=n.getBody();m.disabled=true;if(!p.readonly){m.contentEditable=n.getParam("content_editable_state",true)}m.disabled=false;n.schema=new k.html.Schema(p);n.dom=new k.dom.DOMUtils(r,{keep_values:true,url_converter:n.convertURL,url_converter_scope:n,hex_colors:p.force_hex_style_colors,class_filter:p.class_filter,update_styles:true,root_element:p.content_editable?n.id:null,schema:n.schema});n.parser=new k.html.DomParser(p,n.schema);n.parser.addAttributeFilter("src,href,style",function(t,u){var v=t.length,y,A=n.dom,z,x;while(v--){y=t[v];z=y.attr(u);x="data-mce-"+u;if(!y.attributes.map[x]){if(u==="style"){y.attr(x,A.serializeStyle(A.parseStyle(z),y.name))}else{y.attr(x,n.convertURL(z,u,y.name))}}}});n.parser.addNodeFilter("script",function(t,u){var v=t.length,x;while(v--){x=t[v];x.attr("type","mce-"+(x.attr("type")||"text/javascript"))}});n.parser.addNodeFilter("#cdata",function(t,u){var v=t.length,x;while(v--){x=t[v];x.type=8;x.name="#comment";x.value="[CDATA["+x.value+"]]"}});n.parser.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",function(u,v){var x=u.length,y,t=n.schema.getNonEmptyElements();while(x--){y=u[x];if(y.isEmpty(t)){y.empty().append(new k.html.Node("br",1)).shortEnded=true}}});n.serializer=new k.dom.Serializer(p,n.dom,n.schema);n.selection=new k.dom.Selection(n.dom,n.getWin(),n.serializer,n);n.formatter=new k.Formatter(n);n.undoManager=new k.UndoManager(n);n.forceBlocks=new k.ForceBlocks(n);n.enterKey=new k.EnterKey(n);n.editorCommands=new k.EditorCommands(n);n.onExecCommand.add(function(t,u){if(!/^(FontName|FontSize)$/.test(u)){n.nodeChanged()}});n.serializer.onPreProcess.add(function(t,u){return n.onPreProcess.dispatch(n,u,t)});n.serializer.onPostProcess.add(function(t,u){return n.onPostProcess.dispatch(n,u,t)});n.onPreInit.dispatch(n);if(!p.browser_spellcheck&&!p.gecko_spellcheck){r.body.spellcheck=false}if(!p.readonly){n.bindNativeEvents()}n.controlManager.onPostRender.dispatch(n,n.controlManager);n.onPostRender.dispatch(n);n.quirks=k.util.Quirks(n);if(p.directionality){m.dir=p.directionality}if(p.nowrap){m.style.whiteSpace="nowrap"}if(p.protect){n.onBeforeSetContent.add(function(t,u){i(p.protect,function(v){u.content=u.content.replace(v,function(x){return"<!--mce:protected "+escape(x)+"-->"})})})}n.onSetContent.add(function(){n.addVisual(n.getBody())});if(p.padd_empty_editor){n.onPostProcess.add(function(t,u){u.content=u.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/,"")})}n.load({initial:true,format:"html"});n.startContent=n.getContent({format:"raw"});n.initialized=true;n.onInit.dispatch(n);n.execCallback("setupcontent_callback",n.id,m,r);n.execCallback("init_instance_callback",n);n.focus(true);n.nodeChanged({initial:true});if(n.contentStyles.length>0){s="";i(n.contentStyles,function(t){s+=t+"\r\n"});n.dom.addStyle(s)}i(n.contentCSS,function(t){n.dom.loadCSS(t)});if(p.auto_focus){setTimeout(function(){var t=k.get(p.auto_focus);t.selection.select(t.getBody(),1);t.selection.collapse(1);t.getBody().focus();t.getWin().focus()},100)}q=r=m=null},focus:function(p){var o,u=this,t=u.selection,q=u.settings.content_editable,n,r,s=u.getDoc(),m;if(!p){if(u.bookmark){t.moveToBookmark(u.bookmark);u.bookmark=null}n=t.getRng();if(n.item){r=n.item(0)}u._refreshContentEditable();if(!q){u.getWin().focus()}if(k.isGecko||q){m=u.getBody();if(m.setActive&&!k.isIE11){m.setActive()}else{m.focus()}if(q){t.normalize()}}if(r&&r.ownerDocument==s){n=s.body.createControlRange();n.addElement(r);n.select()}}if(k.activeEditor!=u){if((o=k.activeEditor)!=null){o.onDeactivate.dispatch(o,u)}u.onActivate.dispatch(u,o)}k._setActive(u)},execCallback:function(q){var m=this,p=m.settings[q],o;if(!p){return}if(m.callbackLookup&&(o=m.callbackLookup[q])){p=o.func;o=o.scope}if(d(p,"string")){o=p.replace(/\.\w+$/,"");o=o?k.resolve(o):0;p=k.resolve(p);m.callbackLookup=m.callbackLookup||{};m.callbackLookup[q]={func:p,scope:o}}return p.apply(o||m,Array.prototype.slice.call(arguments,1))},translate:function(m){var o=this.settings.language||"en",n=k.i18n;if(!m){return""}return n[o+"."+m]||m.replace(/\{\#([^\}]+)\}/g,function(q,p){return n[o+"."+p]||"{#"+p+"}"})},getLang:function(o,m){return k.i18n[(this.settings.language||"en")+"."+o]||(d(m)?m:"{#"+o+"}")},getParam:function(t,q,m){var r=k.trim,p=d(this.settings[t])?this.settings[t]:q,s;if(m==="hash"){s={};if(d(p,"string")){i(p.indexOf("=")>0?p.split(/[;,](?![^=;,]*(?:[;,]|$))/):p.split(","),function(n){n=n.split("=");if(n.length>1){s[r(n[0])]=r(n[1])}else{s[r(n[0])]=r(n)}})}else{s=p}return s}return p},nodeChanged:function(q){var m=this,n=m.selection,p;if(m.initialized){q=q||{};p=n.getStart()||m.getBody();p=b&&p.ownerDocument!=m.getDoc()?m.getBody():p;q.parents=[];m.dom.getParent(p,function(o){if(o.nodeName=="BODY"){return true}q.parents.push(o)});m.onNodeChange.dispatch(m,q?q.controlManager||m.controlManager:m.controlManager,p,n.isCollapsed(),q)}},addButton:function(n,o){var m=this;m.buttons=m.buttons||{};m.buttons[n]=o},addCommand:function(m,o,n){this.execCommands[m]={func:o,scope:n||this}},addQueryStateHandler:function(m,o,n){this.queryStateCommands[m]={func:o,scope:n||this}},addQueryValueHandler:function(m,o,n){this.queryValueCommands[m]={func:o,scope:n||this}},addShortcut:function(o,q,m,p){var n=this,r;if(n.settings.custom_shortcuts===false){return false}n.shortcuts=n.shortcuts||{};if(d(m,"string")){r=m;m=function(){n.execCommand(r,false,null)}}if(d(m,"object")){r=m;m=function(){n.execCommand(r[0],r[1],r[2])}}i(g(o),function(s){var t={func:m,scope:p||this,desc:n.translate(q),alt:false,ctrl:false,shift:false};i(g(s,"+"),function(u){switch(u){case"alt":case"ctrl":case"shift":t[u]=true;break;default:t.charCode=u.charCodeAt(0);t.keyCode=u.toUpperCase().charCodeAt(0)}});n.shortcuts[(t.ctrl?"ctrl":"")+","+(t.alt?"alt":"")+","+(t.shift?"shift":"")+","+t.keyCode]=t});return true},execCommand:function(u,r,x,m){var p=this,q=0,v,n;if(!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(u)&&(!m||!m.skip_focus)){p.focus()}m=f({},m);p.onBeforeExecCommand.dispatch(p,u,r,x,m);if(m.terminate){return false}if(p.execCallback("execcommand_callback",p.id,p.selection.getNode(),u,r,x)){p.onExecCommand.dispatch(p,u,r,x,m);return true}if(v=p.execCommands[u]){n=v.func.call(v.scope,r,x);if(n!==true){p.onExecCommand.dispatch(p,u,r,x,m);return n}}i(p.plugins,function(o){if(o.execCommand&&o.execCommand(u,r,x)){p.onExecCommand.dispatch(p,u,r,x,m);q=1;return false}});if(q){return true}if(p.theme&&p.theme.execCommand&&p.theme.execCommand(u,r,x)){p.onExecCommand.dispatch(p,u,r,x,m);return true}if(p.editorCommands.execCommand(u,r,x)){p.onExecCommand.dispatch(p,u,r,x,m);return true}p.getDoc().execCommand(u,r,x);p.onExecCommand.dispatch(p,u,r,x,m)},queryCommandState:function(q){var n=this,r,p;if(n._isHidden()){return}if(r=n.queryStateCommands[q]){p=r.func.call(r.scope);if(p!==true){return p}}r=n.editorCommands.queryCommandState(q);if(r!==-1){return r}try{return this.getDoc().queryCommandState(q)}catch(m){}},queryCommandValue:function(r){var n=this,q,p;if(n._isHidden()){return}if(q=n.queryValueCommands[r]){p=q.func.call(q.scope);if(p!==true){return p}}q=n.editorCommands.queryCommandValue(r);if(d(q)){return q}try{return this.getDoc().queryCommandValue(r)}catch(m){}},show:function(){var m=this;l.show(m.getContainer());l.hide(m.id);m.load()},hide:function(){var m=this,n=m.getDoc();if(b&&n){n.execCommand("SelectAll")}m.save();l.hide(m.getContainer());l.setStyle(m.id,"display",m.orgDisplay)},isHidden:function(){return !l.isHidden(this.id)},setProgressState:function(m,n,p){this.onSetProgressState.dispatch(this,m,n,p);return m},load:function(q){var m=this,p=m.getElement(),n;if(p){q=q||{};q.load=true;n=m.setContent(d(p.value)?p.value:p.innerHTML,q);q.element=p;if(!q.no_events){m.onLoadContent.dispatch(m,q)}q.element=p=null;return n}},save:function(r){var m=this,q=m.getElement(),n,p;if(!q||!m.initialized){return}r=r||{};r.save=true;r.element=q;n=r.content=m.getContent(r);if(!r.no_events){m.onSaveContent.dispatch(m,r)}n=r.content;if(!/TEXTAREA|INPUT/i.test(q.nodeName)){q.innerHTML=n;if(p=l.getParent(m.id,"form")){i(p.elements,function(o){if(o.name==m.id){o.value=n;return false}})}}else{q.value=n}r.element=q=null;return n},setContent:function(r,p){var o=this,n,m=o.getBody(),q;p=p||{};p.format=p.format||"html";p.set=true;p.content=r;if(!p.no_events){o.onBeforeSetContent.dispatch(o,p)}r=p.content;if(!k.isIE&&(r.length===0||/^\s+$/.test(r))){q=o.settings.forced_root_block;if(q){r="<"+q+'><br data-mce-bogus="1"></'+q+">"}else{r='<br data-mce-bogus="1">'}m.innerHTML=r;o.selection.select(m,true);o.selection.collapse(true);return}if(p.format!=="raw"){r=new k.html.Serializer({},o.schema).serialize(o.parser.parse(r))}p.content=k.trim(r);o.dom.setHTML(m,p.content);if(!p.no_events){o.onSetContent.dispatch(o,p)}if(!o.settings.content_editable||document.activeElement===o.getBody()){o.selection.normalize()}return p.content},getContent:function(o){var n=this,p,m=n.getBody();o=o||{};o.format=o.format||"html";o.get=true;o.getInner=true;if(!o.no_events){n.onBeforeGetContent.dispatch(n,o)}if(o.format=="raw"){p=m.innerHTML}else{if(o.format=="text"){p=m.innerText||m.textContent}else{p=n.serializer.serialize(m,o)}}if(o.format!="text"){o.content=k.trim(p)}else{o.content=p}if(!o.no_events){n.onGetContent.dispatch(n,o)}return o.content},isDirty:function(){var m=this;return k.trim(m.startContent)!=k.trim(m.getContent({format:"raw",no_events:1}))&&!m.isNotDirty},getContainer:function(){var m=this;if(!m.container){m.container=l.get(m.editorContainer||m.id+"_parent")}return m.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return l.get(this.settings.content_element||this.id)},getWin:function(){var m=this,n;if(!m.contentWindow){n=l.get(m.id+"_ifr");if(n){m.contentWindow=n.contentWindow}}return m.contentWindow},getDoc:function(){var m=this,n;if(!m.contentDocument){n=m.getWin();if(n){m.contentDocument=n.document}}return m.contentDocument},getBody:function(){return this.bodyElement||this.getDoc().body},convertURL:function(o,n,q){var m=this,p=m.settings;if(p.urlconverter_callback){return m.execCallback("urlconverter_callback",o,q,true,n)}if(!p.convert_urls||(q&&q.nodeName=="LINK")||o.indexOf("file:")===0){return o}if(p.relative_urls){return m.documentBaseURI.toRelative(o)}o=m.documentBaseURI.toAbsolute(o,p.remove_script_host);return o},addVisual:function(q){var n=this,o=n.settings,p=n.dom,m;q=q||n.getBody();if(!d(n.hasVisual)){n.hasVisual=o.visual}i(p.select("table,a",q),function(s){var r;switch(s.nodeName){case"TABLE":m=o.visual_table_class||"mceItemTable";r=p.getAttrib(s,"border");if(!r||r=="0"){if(n.hasVisual){p.addClass(s,m)}else{p.removeClass(s,m)}}return;case"A":if(!p.getAttrib(s,"href",false)){r=p.getAttrib(s,"name")||s.id;m="mceItemAnchor";if(r){if(n.hasVisual){p.addClass(s,m)}else{p.removeClass(s,m)}}}return}});n.onVisualAid.dispatch(n,q,n.hasVisual)},remove:function(){var m=this,o=m.getContainer(),n=m.getDoc();if(!m.removed){m.removed=1;if(b&&n){n.execCommand("SelectAll")}m.save();l.setStyle(m.id,"display",m.orgDisplay);if(!m.settings.content_editable){j.unbind(m.getWin());j.unbind(m.getDoc())}j.unbind(m.getBody());j.clear(o);m.execCallback("remove_instance_callback",m);m.onRemove.dispatch(m);m.onExecCommand.listeners=[];k.remove(m);l.remove(o)}},destroy:function(n){var m=this;if(m.destroyed){return}if(a){j.unbind(m.getDoc());j.unbind(m.getWin());j.unbind(m.getBody())}if(!n){k.removeUnload(m.destroy);tinyMCE.onBeforeUnload.remove(m._beforeUnload);if(m.theme&&m.theme.destroy){m.theme.destroy()}m.controlManager.destroy();m.selection.destroy();m.dom.destroy()}if(m.formElement){m.formElement.submit=m.formElement._mceOldSubmit;m.formElement._mceOldSubmit=null}m.contentAreaContainer=m.formElement=m.container=m.settings.content_element=m.bodyElement=m.contentDocument=m.contentWindow=null;if(m.selection){m.selection=m.selection.win=m.selection.dom=m.selection.dom.doc=null}m.destroyed=1},_refreshContentEditable:function(){var n=this,m,o;if(n._isHidden()){m=n.getBody();o=m.parentNode;o.removeChild(m);o.appendChild(m);m.focus()}},_isHidden:function(){var m;if(!a){return 0}m=this.selection.getSel();return(!m||!m.rangeCount||m.rangeCount===0)}})})(tinymce);(function(a){var b=a.each;a.Editor.prototype.setupEvents=function(){var c=this,d=c.settings;b(["onPreInit","onBeforeRenderUI","onPostRender","onLoad","onInit","onRemove","onActivate","onDeactivate","onClick","onEvent","onMouseUp","onMouseDown","onDblClick","onKeyDown","onKeyUp","onKeyPress","onContextMenu","onSubmit","onReset","onPaste","onPreProcess","onPostProcess","onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent","onLoadContent","onSaveContent","onNodeChange","onChange","onBeforeExecCommand","onExecCommand","onUndo","onRedo","onVisualAid","onSetProgressState","onSetAttrib"],function(e){c[e]=new a.util.Dispatcher(c)});if(d.cleanup_callback){c.onBeforeSetContent.add(function(e,f){f.content=e.execCallback("cleanup_callback","insert_to_editor",f.content,f)});c.onPreProcess.add(function(e,f){if(f.set){e.execCallback("cleanup_callback","insert_to_editor_dom",f.node,f)}if(f.get){e.execCallback("cleanup_callback","get_from_editor_dom",f.node,f)}});c.onPostProcess.add(function(e,f){if(f.set){f.content=e.execCallback("cleanup_callback","insert_to_editor",f.content,f)}if(f.get){f.content=e.execCallback("cleanup_callback","get_from_editor",f.content,f)}})}if(d.save_callback){c.onGetContent.add(function(e,f){if(f.save){f.content=e.execCallback("save_callback",e.id,f.content,e.getBody())}})}if(d.handle_event_callback){c.onEvent.add(function(f,g,h){if(c.execCallback("handle_event_callback",g,f,h)===false){g.preventDefault();g.stopPropagation()}})}if(d.handle_node_change_callback){c.onNodeChange.add(function(f,e,g){f.execCallback("handle_node_change_callback",f.id,g,-1,-1,true,f.selection.isCollapsed())})}if(d.save_callback){c.onSaveContent.add(function(e,g){var f=e.execCallback("save_callback",e.id,g.content,e.getBody());if(f){g.content=f}})}if(d.onchange_callback){c.onChange.add(function(f,e){f.execCallback("onchange_callback",f,e)})}};a.Editor.prototype.bindNativeEvents=function(){var l=this,f,d=l.settings,e=l.dom,h;h={mouseup:"onMouseUp",mousedown:"onMouseDown",click:"onClick",keyup:"onKeyUp",keydown:"onKeyDown",keypress:"onKeyPress",submit:"onSubmit",reset:"onReset",contextmenu:"onContextMenu",dblclick:"onDblClick",paste:"onPaste"};function c(i,m){var n=i.type;if(l.removed){return}if(l.onEvent.dispatch(l,i,m)!==false){l[h[i.fakeType||i.type]].dispatch(l,i,m)}}function j(i){l.focus(true)}function k(i,m){if(m.keyCode!=65||!a.VK.metaKeyPressed(m)){l.selection.normalize()}l.nodeChanged()}b(h,function(m,n){var i=d.content_editable?l.getBody():l.getDoc();switch(n){case"contextmenu":e.bind(i,n,c);break;case"paste":e.bind(l.getBody(),n,c);break;case"submit":case"reset":e.bind(l.getElement().form||a.DOM.getParent(l.id,"form"),n,c);break;default:e.bind(i,n,c)}});e.bind(d.content_editable?l.getBody():(a.isGecko?l.getDoc():l.getWin()),"focus",function(i){l.focus(true)});if(d.content_editable&&a.isOpera){e.bind(l.getBody(),"click",j);e.bind(l.getBody(),"keydown",j)}l.onMouseUp.add(k);l.onKeyUp.add(function(i,n){var m=n.keyCode;if((m>=33&&m<=36)||(m>=37&&m<=40)||m==13||m==45||m==46||m==8||(a.isMac&&(m==91||m==93))||n.ctrlKey){k(i,n)}});l.onReset.add(function(){l.setContent(l.startContent,{format:"raw"})});function g(m,i){if(m.altKey||m.ctrlKey||m.metaKey){b(l.shortcuts,function(n){var o=a.isMac?m.metaKey:m.ctrlKey;if(n.ctrl!=o||n.alt!=m.altKey||n.shift!=m.shiftKey){return}if(m.keyCode==n.keyCode||(m.charCode&&m.charCode==n.charCode)){m.preventDefault();if(i){n.func.call(n.scope)}return true}})}}l.onKeyUp.add(function(i,m){g(m)});l.onKeyPress.add(function(i,m){g(m)});l.onKeyDown.add(function(i,m){g(m,true)});if(a.isOpera){l.onClick.add(function(i,m){m.preventDefault()})}}})(tinymce);(function(d){var e=d.each,b,a=true,c=false;d.EditorCommands=function(n){var m=n.dom,p=n.selection,j={state:{},exec:{},value:{}},k=n.settings,q=n.formatter,o;function r(z,y,x){var v;z=z.toLowerCase();if(v=j.exec[z]){v(z,y,x);return a}return c}function l(x){var v;x=x.toLowerCase();if(v=j.state[x]){return v(x)}return -1}function h(x){var v;x=x.toLowerCase();if(v=j.value[x]){return v(x)}return c}function u(v,x){x=x||"exec";e(v,function(z,y){e(y.toLowerCase().split(","),function(A){j[x][A]=z})})}d.extend(this,{execCommand:r,queryCommandState:l,queryCommandValue:h,addCommands:u});function f(y,x,v){if(x===b){x=c}if(v===b){v=null}return n.getDoc().execCommand(y,x,v)}function t(v){return q.match(v)}function s(v,x){q.toggle(v,x?{value:x}:b)}function i(v){o=p.getBookmark(v)}function g(){p.moveToBookmark(o)}u({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){n.undoManager.add()},"Cut,Copy,Paste":function(z){var y=n.getDoc(),v;try{f(z)}catch(x){v=a}if(v||!y.queryCommandSupported(z)){if(d.isGecko){n.windowManager.confirm(n.getLang("clipboard_msg"),function(A){if(A){open("http://www.mozilla.org/editor/midasdemo/securityprefs.html","_blank")}})}else{n.windowManager.alert(n.getLang("clipboard_no_support"))}}},unlink:function(v){if(p.isCollapsed()){p.select(p.getNode())}f(v);p.collapse(c)},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(v){var x=v.substring(7);e("left,center,right,full".split(","),function(y){if(x!=y){q.remove("align"+y)}});s("align"+x);r("mceRepaint")},"InsertUnorderedList,InsertOrderedList":function(y){var v,x;f(y);v=m.getParent(p.getNode(),"ol,ul");if(v){x=v.parentNode;if(/^(H[1-6]|P|ADDRESS|PRE)$/.test(x.nodeName)){i();m.split(x,v);g()}}},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(v){s(v)},"ForeColor,HiliteColor,FontName":function(y,x,v){s(y,v)},FontSize:function(z,y,x){var v,A;if(x>=1&&x<=7){A=d.explode(k.font_size_style_values);v=d.explode(k.font_size_classes);if(v){x=v[x-1]||x}else{x=A[x-1]||x}}s(z,x)},RemoveFormat:function(v){q.remove(v)},mceBlockQuote:function(v){s("blockquote")},FormatBlock:function(y,x,v){return s(v||"p")},mceCleanup:function(){var v=p.getBookmark();n.setContent(n.getContent({cleanup:a}),{cleanup:a});p.moveToBookmark(v)},mceRemoveNode:function(z,y,x){var v=x||p.getNode();if(v!=n.getBody()){i();n.dom.remove(v,a);g()}},mceSelectNodeDepth:function(z,y,x){var v=0;m.getParent(p.getNode(),function(A){if(A.nodeType==1&&v++==x){p.select(A);return c}},n.getBody())},mceSelectNode:function(y,x,v){p.select(v)},mceInsertContent:function(B,I,K){var y,J,E,z,F,G,D,C,L,x,A,M,v,H;y=n.parser;J=new d.html.Serializer({},n.schema);v='<span id="mce_marker" data-mce-type="bookmark">\uFEFF</span>';G={content:K,format:"html"};p.onBeforeSetContent.dispatch(p,G);K=G.content;if(K.indexOf("{$caret}")==-1){K+="{$caret}"}K=K.replace(/\{\$caret\}/,v);if(!p.isCollapsed()){n.getDoc().execCommand("Delete",false,null)}E=p.getNode();G={context:E.nodeName.toLowerCase()};F=y.parse(K,G);A=F.lastChild;if(A.attr("id")=="mce_marker"){D=A;for(A=A.prev;A;A=A.walk(true)){if(A.type==3||!m.isBlock(A.name)){A.parent.insert(D,A,A.name==="br");break}}}if(!G.invalid){K=J.serialize(F);A=E.firstChild;M=E.lastChild;if(!A||(A===M&&A.nodeName==="BR")){m.setHTML(E,K)}else{p.setContent(K)}}else{p.setContent(v);E=p.getNode();z=n.getBody();if(E.nodeType==9){E=A=z}else{A=E}while(A!==z){E=A;A=A.parentNode}K=E==z?z.innerHTML:m.getOuterHTML(E);K=J.serialize(y.parse(K.replace(/<span (id="mce_marker"|id=mce_marker).+?<\/span>/i,function(){return J.serialize(F)})));if(E==z){m.setHTML(z,K)}else{m.setOuterHTML(E,K)}}D=m.get("mce_marker");C=m.getRect(D);L=m.getViewPort(n.getWin());if((C.y+C.h>L.y+L.h||C.y<L.y)||(C.x>L.x+L.w||C.x<L.x)){H=d.isIE?n.getDoc().documentElement:n.getBody();H.scrollLeft=C.x;H.scrollTop=C.y-L.h+25}x=m.createRng();A=D.previousSibling;if(A&&A.nodeType==3){x.setStart(A,A.nodeValue.length)}else{x.setStartBefore(D);x.setEndBefore(D)}m.remove(D);p.setRng(x);p.onSetContent.dispatch(p,G);n.addVisual()},mceInsertRawHTML:function(y,x,v){p.setContent("tiny_mce_marker");n.setContent(n.getContent().replace(/tiny_mce_marker/g,function(){return v}))},mceToggleFormat:function(y,x,v){s(v)},mceSetContent:function(y,x,v){n.setContent(v)},"Indent,Outdent":function(z){var x,v,y;x=k.indentation;v=/[a-z%]+$/i.exec(x);x=parseInt(x);if(!l("InsertUnorderedList")&&!l("InsertOrderedList")){if(!k.forced_root_block&&!m.getParent(p.getNode(),m.isBlock)){q.apply("div")}e(p.getSelectedBlocks(),function(A){if(z=="outdent"){y=Math.max(0,parseInt(A.style.paddingLeft||0)-x);m.setStyle(A,"paddingLeft",y?y+v:"")}else{m.setStyle(A,"paddingLeft",(parseInt(A.style.paddingLeft||0)+x)+v)}})}else{f(z)}},mceRepaint:function(){var x;if(d.isGecko){try{i(a);if(p.getSel()){p.getSel().selectAllChildren(n.getBody())}p.collapse(a);g()}catch(v){}}},mceToggleFormat:function(y,x,v){q.toggle(v)},InsertHorizontalRule:function(){n.execCommand("mceInsertContent",false,"<hr />")},mceToggleVisualAid:function(){n.hasVisual=!n.hasVisual;n.addVisual()},mceReplaceContent:function(y,x,v){n.execCommand("mceInsertContent",false,v.replace(/\{\$selection\}/g,p.getContent({format:"text"})))},mceInsertLink:function(z,y,x){var v;if(typeof(x)=="string"){x={href:x}}v=m.getParent(p.getNode(),"a");x.href=x.href.replace(" ","%20");if(!v||!x.href){q.remove("link")}if(x.href){q.apply("link",x,v)}},selectAll:function(){var x=m.getRoot(),v=m.createRng();if(p.getRng().setStart){v.setStart(x,0);v.setEnd(x,x.childNodes.length);p.setRng(v)}else{f("SelectAll")}}});u({"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(z){var x="align"+z.substring(7);var v=p.isCollapsed()?[m.getParent(p.getNode(),m.isBlock)]:p.getSelectedBlocks();var y=d.map(v,function(A){return !!q.matchNode(A,x)});return d.inArray(y,a)!==-1},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(v){return t(v)},mceBlockQuote:function(){return t("blockquote")},Outdent:function(){var v;if(k.inline_styles){if((v=m.getParent(p.getStart(),m.isBlock))&&parseInt(v.style.paddingLeft)>0){return a}if((v=m.getParent(p.getEnd(),m.isBlock))&&parseInt(v.style.paddingLeft)>0){return a}}return l("InsertUnorderedList")||l("InsertOrderedList")||(!k.inline_styles&&!!m.getParent(p.getNode(),"BLOCKQUOTE"))},"InsertUnorderedList,InsertOrderedList":function(x){var v=m.getParent(p.getNode(),"ul,ol");return v&&(x==="insertunorderedlist"&&v.tagName==="UL"||x==="insertorderedlist"&&v.tagName==="OL")}},"state");u({"FontSize,FontName":function(y){var x=0,v;if(v=m.getParent(p.getNode(),"span")){if(y=="fontsize"){x=v.style.fontSize}else{x=v.style.fontFamily.replace(/, /g,",").replace(/[\'\"]/g,"").toLowerCase()}}return x}},"value");u({Undo:function(){n.undoManager.undo()},Redo:function(){n.undoManager.redo()}})}})(tinymce);(function(b){var a=b.util.Dispatcher;b.UndoManager=function(h){var l,i=0,e=[],g,k,j,f;function c(){return b.trim(h.getContent({format:"raw",no_events:1}).replace(/<span[^>]+data-mce-bogus[^>]+>[\u200B\uFEFF]+<\/span>/g,""))}function d(){l.typing=false;l.add()}onBeforeAdd=new a(l);k=new a(l);j=new a(l);f=new a(l);k.add(function(m,n){if(m.hasUndo()){return h.onChange.dispatch(h,n,m)}});j.add(function(m,n){return h.onUndo.dispatch(h,n,m)});f.add(function(m,n){return h.onRedo.dispatch(h,n,m)});h.onInit.add(function(){l.add()});h.onBeforeExecCommand.add(function(m,p,o,q,n){if(p!="Undo"&&p!="Redo"&&p!="mceRepaint"&&(!n||!n.skip_undo)){l.beforeChange()}});h.onExecCommand.add(function(m,p,o,q,n){if(p!="Undo"&&p!="Redo"&&p!="mceRepaint"&&(!n||!n.skip_undo)){l.add()}});h.onSaveContent.add(d);h.dom.bind(h.dom.getRoot(),"dragend",d);h.dom.bind(h.getBody(),"focusout",function(m){if(!h.removed&&l.typing){d()}});h.onKeyUp.add(function(m,o){var n=o.keyCode;if((n>=33&&n<=36)||(n>=37&&n<=40)||n==45||n==13||o.ctrlKey){d()}});h.onKeyDown.add(function(m,o){var n=o.keyCode;if((n>=33&&n<=36)||(n>=37&&n<=40)||n==45){if(l.typing){d()}return}if((n<16||n>20)&&n!=224&&n!=91&&!l.typing){l.beforeChange();l.typing=true;l.add()}});h.onMouseDown.add(function(m,n){if(l.typing){d()}});h.addShortcut("ctrl+z","undo_desc","Undo");h.addShortcut("ctrl+y","redo_desc","Redo");l={data:e,typing:false,onBeforeAdd:onBeforeAdd,onAdd:k,onUndo:j,onRedo:f,beforeChange:function(){g=h.selection.getBookmark(2,true)},add:function(p){var m,n=h.settings,o;p=p||{};p.content=c();l.onBeforeAdd.dispatch(l,p);o=e[i];if(o&&o.content==p.content){return null}if(e[i]){e[i].beforeBookmark=g}if(n.custom_undo_redo_levels){if(e.length>n.custom_undo_redo_levels){for(m=0;m<e.length-1;m++){e[m]=e[m+1]}e.length--;i=e.length}}p.bookmark=h.selection.getBookmark(2,true);if(i<e.length-1){e.length=i+1}e.push(p);i=e.length-1;l.onAdd.dispatch(l,p);h.isNotDirty=0;return p},undo:function(){var n,m;if(l.typing){l.add();l.typing=false}if(i>0){n=e[--i];h.setContent(n.content,{format:"raw"});h.selection.moveToBookmark(n.beforeBookmark);l.onUndo.dispatch(l,n)}return n},redo:function(){var m;if(i<e.length-1){m=e[++i];h.setContent(m.content,{format:"raw"});h.selection.moveToBookmark(m.bookmark);l.onRedo.dispatch(l,m)}return m},clear:function(){e=[];i=0;l.typing=false},hasUndo:function(){return i>0||this.typing},hasRedo:function(){return i<e.length-1&&!this.typing}};return l}})(tinymce);tinymce.ForceBlocks=function(c){var b=c.settings,e=c.dom,a=c.selection,d=c.schema.getBlockElements();function f(){var j=a.getStart(),h=c.getBody(),g,k,o,s,q,i,l,m=-16777215,p,r;if(!j||j.nodeType!==1||!b.forced_root_block){return}while(j&&j!=h){if(d[j.nodeName]){return}j=j.parentNode}g=a.getRng();if(g.setStart){k=g.startContainer;o=g.startOffset;s=g.endContainer;q=g.endOffset}else{if(g.item){j=g.item(0);g=c.getDoc().body.createTextRange();g.moveToElementText(j)}r=g.parentElement().ownerDocument===c.getDoc();tmpRng=g.duplicate();tmpRng.collapse(true);o=tmpRng.move("character",m)*-1;if(!tmpRng.collapsed){tmpRng=g.duplicate();tmpRng.collapse(false);q=(tmpRng.move("character",m)*-1)-o}}j=h.firstChild;while(j){if(j.nodeType===3||(j.nodeType==1&&!d[j.nodeName])){if(j.nodeType===3&&j.nodeValue.length==0){l=j;j=j.nextSibling;e.remove(l);continue}if(!i){i=e.create(b.forced_root_block);j.parentNode.insertBefore(i,j);p=true}l=j;j=j.nextSibling;i.appendChild(l)}else{i=null;j=j.nextSibling}}if(p){if(g.setStart){g.setStart(k,o);g.setEnd(s,q);a.setRng(g)}else{if(r){try{g=c.getDoc().body.createTextRange();g.moveToElementText(h);g.collapse(true);g.moveStart("character",o);if(q>0){g.moveEnd("character",q)}g.select()}catch(n){}}}c.nodeChanged()}}if(b.forced_root_block){c.onKeyUp.add(f);c.onNodeChange.add(f)}};(function(c){var b=c.DOM,a=c.dom.Event,d=c.each,e=c.extend;c.create("tinymce.ControlManager",{ControlManager:function(f,j){var h=this,g;j=j||{};h.editor=f;h.controls={};h.onAdd=new c.util.Dispatcher(h);h.onPostRender=new c.util.Dispatcher(h);h.prefix=j.prefix||f.id+"_";h._cls={};h.onPostRender.add(function(){d(h.controls,function(i){i.postRender()})})},get:function(f){return this.controls[this.prefix+f]||this.controls[f]},setActive:function(h,f){var g=null;if(g=this.get(h)){g.setActive(f)}return g},setDisabled:function(h,f){var g=null;if(g=this.get(h)){g.setDisabled(f)}return g},add:function(g){var f=this;if(g){f.controls[g.id]=g;f.onAdd.dispatch(g,f)}return g},createControl:function(j){var o,k,g,h=this,m=h.editor,n,f;if(!h.controlFactories){h.controlFactories=[];d(m.plugins,function(i){if(i.createControl){h.controlFactories.push(i)}})}n=h.controlFactories;for(k=0,g=n.length;k<g;k++){o=n[k].createControl(j,h);if(o){return h.add(o)}}if(j==="|"||j==="separator"){return h.createSeparator()}if(m.buttons&&(o=m.buttons[j])){return h.createButton(j,o)}return h.add(o)},createDropMenu:function(f,n,h){var m=this,i=m.editor,j,g,k,l;n=e({"class":"mceDropDown",constrain:i.settings.constrain_menus},n);n["class"]=n["class"]+" "+i.getParam("skin")+"Skin";if(k=i.getParam("skin_variant")){n["class"]+=" "+i.getParam("skin")+"Skin"+k.substring(0,1).toUpperCase()+k.substring(1)}n["class"]+=i.settings.directionality=="rtl"?" mceRtl":"";f=m.prefix+f;l=h||m._cls.dropmenu||c.ui.DropMenu;j=m.controls[f]=new l(f,n);j.onAddItem.add(function(r,q){var p=q.settings;p.title=i.getLang(p.title,p.title);if(!p.onclick){p.onclick=function(o){if(p.cmd){i.execCommand(p.cmd,p.ui||false,p.value)}}}});i.onRemove.add(function(){j.destroy()});if(c.isIE){j.onShowMenu.add(function(){i.focus();g=i.selection.getBookmark(1)});j.onHideMenu.add(function(){if(g){i.selection.moveToBookmark(g);g=0}})}return m.add(j)},createListBox:function(f,n,h){var l=this,j=l.editor,i,k,m;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,scope:n.scope,control_manager:l},n);f=l.prefix+f;function g(o){return o.settings.use_accessible_selects&&!c.isGecko}if(j.settings.use_native_selects||g(j)){k=new c.ui.NativeListBox(f,n)}else{m=h||l._cls.listbox||c.ui.ListBox;k=new m(f,n,j)}l.controls[f]=k;if(c.isWebKit){k.onPostRender.add(function(p,o){a.add(o,"mousedown",function(){j.bookmark=j.selection.getBookmark(1)});a.add(o,"focus",function(){j.selection.moveToBookmark(j.bookmark);j.bookmark=null})})}if(k.hideMenu){j.onMouseDown.add(k.hideMenu,k)}return l.add(k)},createButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.label=g.translate(i.label);i.scope=i.scope||g;if(!i.onclick&&!i.menu_button){i.onclick=function(){g.execCommand(i.cmd,i.ui||false,i.value)}}i=e({title:i.title,"class":"mce_"+m,unavailable_prefix:g.getLang("unavailable",""),scope:i.scope,control_manager:h},i);m=h.prefix+m;if(i.menu_button){f=l||h._cls.menubutton||c.ui.MenuButton;k=new f(m,i,g);g.onMouseDown.add(k.hideMenu,k)}else{f=h._cls.button||c.ui.Button;k=new f(m,i,g)}return h.add(k)},createMenuButton:function(h,f,g){f=f||{};f.menu_button=1;return this.createButton(h,f,g)},createSplitButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.scope=i.scope||g;if(!i.onclick){i.onclick=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}if(!i.onselect){i.onselect=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}i=e({title:i.title,"class":"mce_"+m,scope:i.scope,control_manager:h},i);m=h.prefix+m;f=l||h._cls.splitbutton||c.ui.SplitButton;k=h.add(new f(m,i,g));g.onMouseDown.add(k.hideMenu,k);return k},createColorSplitButton:function(f,n,h){var l=this,j=l.editor,i,k,m,g;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onclick){n.onclick=function(o){if(c.isIE){g=j.selection.getBookmark(1)}j.execCommand(n.cmd,n.ui||false,o||n.value)}}if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,menu_class:j.getParam("skin")+"Skin",scope:n.scope,more_colors_title:j.getLang("more_colors")},n);f=l.prefix+f;m=h||l._cls.colorsplitbutton||c.ui.ColorSplitButton;k=new m(f,n,j);j.onMouseDown.add(k.hideMenu,k);j.onRemove.add(function(){k.destroy()});if(c.isIE){k.onShowMenu.add(function(){j.focus();g=j.selection.getBookmark(1)});k.onHideMenu.add(function(){if(g){j.selection.moveToBookmark(g);g=0}})}return l.add(k)},createToolbar:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||g._cls.toolbar||c.ui.Toolbar;i=new f(k,h,g.editor);if(g.get(k)){return null}return g.add(i)},createToolbarGroup:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||this._cls.toolbarGroup||c.ui.ToolbarGroup;i=new f(k,h,g.editor);if(g.get(k)){return null}return g.add(i)},createSeparator:function(g){var f=g||this._cls.separator||c.ui.Separator;return new f()},setControlType:function(g,f){return this._cls[g.toLowerCase()]=f},destroy:function(){d(this.controls,function(f){f.destroy()});this.controls=null}})})(tinymce);(function(d){var a=d.util.Dispatcher,e=d.each,c=d.isIE,b=d.isOpera;d.create("tinymce.WindowManager",{WindowManager:function(f){var g=this;g.editor=f;g.onOpen=new a(g);g.onClose=new a(g);g.params={};g.features={}},open:function(z,h){var v=this,k="",n,m,i=v.editor.settings.dialog_type=="modal",q,o,j,g=d.DOM.getViewPort(),r;z=z||{};h=h||{};o=b?g.w:screen.width;j=b?g.h:screen.height;z.name=z.name||"mc_"+new Date().getTime();z.width=parseInt(z.width||320);z.height=parseInt(z.height||240);z.resizable=true;z.left=z.left||parseInt(o/2)-(z.width/2);z.top=z.top||parseInt(j/2)-(z.height/2);h.inline=false;h.mce_width=z.width;h.mce_height=z.height;h.mce_auto_focus=z.auto_focus;if(i){if(c){z.center=true;z.help=false;z.dialogWidth=z.width+"px";z.dialogHeight=z.height+"px";z.scroll=z.scrollbars||false}}e(z,function(p,f){if(d.is(p,"boolean")){p=p?"yes":"no"}if(!/^(name|url)$/.test(f)){if(c&&i){k+=(k?";":"")+f+":"+p}else{k+=(k?",":"")+f+"="+p}}});v.features=z;v.params=h;v.onOpen.dispatch(v,z,h);r=z.url||z.file;r=d._addVer(r);try{if(c&&i){q=1;window.showModalDialog(r,window,k)}else{q=window.open(r,z.name,k)}}catch(l){}if(!q){alert(v.editor.getLang("popup_blocked"))}},close:function(f){f.close();this.onClose.dispatch(this)},createInstance:function(i,h,g,m,l,k){var j=d.resolve(i);return new j(h,g,m,l,k)},confirm:function(h,f,i,g){g=g||window;f.call(i||this,g.confirm(this._decode(this.editor.getLang(h,h))))},alert:function(h,f,j,g){var i=this;g=g||window;g.alert(i._decode(i.editor.getLang(h,h)));if(f){f.call(j||i)}},resizeBy:function(f,g,h){h.resizeBy(f,g)},_decode:function(f){return d.DOM.decode(f).replace(/\\n/g,"\n")}})}(tinymce));(function(a){a.Formatter=function(aa){var Q={},T=a.each,c=aa.dom,r=aa.selection,t=a.dom.TreeWalker,N=new a.dom.RangeUtils(c),d=aa.schema.isValidChild,A=a.isArray,H=c.isBlock,m=aa.settings.forced_root_block,s=c.nodeIndex,G="\uFEFF",e=/^(src|href|style)$/,X=false,C=true,P,D,x=c.getContentEditable;function I(ab){if(ab.nodeType){ab=ab.nodeName}return !!aa.schema.getTextBlockElements()[ab.toLowerCase()]}function n(ac,ab){return c.getParents(ac,ab,c.getRoot())}function b(ab){return ab.nodeType===1&&ab.id==="_mce_caret"}function j(){l({alignleft:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"left"},defaultBlock:"div"},{selector:"img,table",collapsed:false,styles:{"float":"left"}}],aligncenter:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"center"},defaultBlock:"div"},{selector:"img",collapsed:false,styles:{display:"block",marginLeft:"auto",marginRight:"auto"}},{selector:"table",collapsed:false,styles:{marginLeft:"auto",marginRight:"auto"}}],alignright:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"right"},defaultBlock:"div"},{selector:"img,table",collapsed:false,styles:{"float":"right"}}],alignfull:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"justify"},defaultBlock:"div"}],bold:[{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}},{inline:"b",remove:"all"}],italic:[{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}},{inline:"i",remove:"all"}],underline:[{inline:"span",styles:{textDecoration:"underline"},exact:true},{inline:"u",remove:"all"}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:true},{inline:"strike",remove:"all"}],forecolor:{inline:"span",styles:{color:"%value"},wrap_links:false},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},wrap_links:false},fontname:{inline:"span",styles:{fontFamily:"%value"}},fontsize:{inline:"span",styles:{fontSize:"%value"}},fontsize_class:{inline:"span",attributes:{"class":"%value"}},blockquote:{block:"blockquote",wrapper:1,remove:"all"},subscript:{inline:"sub"},superscript:{inline:"sup"},link:{inline:"a",selector:"a",remove:"all",split:true,deep:true,onmatch:function(ab){return true},onformat:function(ad,ab,ac){T(ac,function(af,ae){c.setAttrib(ad,ae,af)})}},removeformat:[{selector:"b,strong,em,i,font,u,strike",remove:"all",split:true,expand:false,block_expand:true,deep:true},{selector:"span",attributes:["style","class"],remove:"empty",split:true,expand:false,deep:true},{selector:"*",attributes:["style","class"],split:false,expand:false,deep:true}]});T("p h1 h2 h3 h4 h5 h6 div address pre div code dt dd samp".split(/\s/),function(ab){l(ab,{block:ab,remove:"all"})});l(aa.settings.formats)}function W(){aa.addShortcut("ctrl+b","bold_desc","Bold");aa.addShortcut("ctrl+i","italic_desc","Italic");aa.addShortcut("ctrl+u","underline_desc","Underline");for(var ab=1;ab<=6;ab++){aa.addShortcut("ctrl+"+ab,"",["FormatBlock",false,"h"+ab])}aa.addShortcut("ctrl+7","",["FormatBlock",false,"p"]);aa.addShortcut("ctrl+8","",["FormatBlock",false,"div"]);aa.addShortcut("ctrl+9","",["FormatBlock",false,"address"])}function V(ab){return ab?Q[ab]:Q}function l(ab,ac){if(ab){if(typeof(ab)!=="string"){T(ab,function(ae,ad){l(ad,ae)})}else{ac=ac.length?ac:[ac];T(ac,function(ad){if(ad.deep===D){ad.deep=!ad.selector}if(ad.split===D){ad.split=!ad.selector||ad.inline}if(ad.remove===D&&ad.selector&&!ad.inline){ad.remove="none"}if(ad.selector&&ad.inline){ad.mixed=true;ad.block_expand=true}if(typeof(ad.classes)==="string"){ad.classes=ad.classes.split(/\s+/)}});Q[ab]=ac}}}var i=function(ac){var ab;aa.dom.getParent(ac,function(ad){ab=aa.dom.getStyle(ad,"text-decoration");return ab&&ab!=="none"});return ab};var L=function(ab){var ac;if(ab.nodeType===1&&ab.parentNode&&ab.parentNode.nodeType===1){ac=i(ab.parentNode);if(aa.dom.getStyle(ab,"color")&&ac){aa.dom.setStyle(ab,"text-decoration",ac)}else{if(aa.dom.getStyle(ab,"textdecoration")===ac){aa.dom.setStyle(ab,"text-decoration",null)}}}};function Y(ae,al,ag){var ah=V(ae),am=ah[0],ak,ac,aj,ai=r.isCollapsed();function ab(aq,ap){ap=ap||am;if(aq){if(ap.onformat){ap.onformat(aq,ap,al,ag)}T(ap.styles,function(at,ar){c.setStyle(aq,ar,q(at,al))});T(ap.attributes,function(at,ar){c.setAttrib(aq,ar,q(at,al))});T(ap.classes,function(ar){ar=q(ar,al);if(!c.hasClass(aq,ar)){c.addClass(aq,ar)}})}}function af(){function ar(ay,aw){var ax=new t(aw);for(ag=ax.current();ag;ag=ax.prev()){if(ag.childNodes.length>1||ag==ay||ag.tagName=="BR"){return ag}}}var aq=aa.selection.getRng();var av=aq.startContainer;var ap=aq.endContainer;if(av!=ap&&aq.endOffset===0){var au=ar(av,ap);var at=au.nodeType==3?au.length:au.childNodes.length;aq.setEnd(au,at)}return aq}function ad(at,ay,aw,av,aq){var ap=[],ar=-1,ax,aA=-1,au=-1,az;T(at.childNodes,function(aC,aB){if(aC.nodeName==="UL"||aC.nodeName==="OL"){ar=aB;ax=aC;return false}});T(at.childNodes,function(aC,aB){if(aC.nodeName==="SPAN"&&c.getAttrib(aC,"data-mce-type")=="bookmark"){if(aC.id==ay.id+"_start"){aA=aB}else{if(aC.id==ay.id+"_end"){au=aB}}}});if(ar<=0||(aA<ar&&au>ar)){T(a.grep(at.childNodes),aq);return 0}else{az=c.clone(aw,X);T(a.grep(at.childNodes),function(aC,aB){if((aA<ar&&aB<ar)||(aA>ar&&aB>ar)){ap.push(aC);aC.parentNode.removeChild(aC)}});if(aA<ar){at.insertBefore(az,ax)}else{if(aA>ar){at.insertBefore(az,ax.nextSibling)}}av.push(az);T(ap,function(aB){az.appendChild(aB)});return az}}function an(aq,at,aw){var ap=[],av,ar,au=true;av=am.inline||am.block;ar=c.create(av);ab(ar);N.walk(aq,function(ax){var ay;function az(aA){var aF,aD,aB,aC,aE;aE=au;aF=aA.nodeName.toLowerCase();aD=aA.parentNode.nodeName.toLowerCase();if(aA.nodeType===1&&x(aA)){aE=au;au=x(aA)==="true";aC=true}if(g(aF,"br")){ay=0;if(am.block){c.remove(aA)}return}if(am.wrapper&&y(aA,ae,al)){ay=0;return}if(au&&!aC&&am.block&&!am.wrapper&&I(aF)){aA=c.rename(aA,av);ab(aA);ap.push(aA);ay=0;return}if(am.selector){T(ah,function(aG){if("collapsed" in aG&&aG.collapsed!==ai){return}if(c.is(aA,aG.selector)&&!b(aA)){ab(aA,aG);aB=true}});if(!am.inline||aB){ay=0;return}}if(au&&!aC&&d(av,aF)&&d(aD,av)&&!(!aw&&aA.nodeType===3&&aA.nodeValue.length===1&&aA.nodeValue.charCodeAt(0)===65279)&&!b(aA)&&(!am.inline||!H(aA))){if(!ay){ay=c.clone(ar,X);aA.parentNode.insertBefore(ay,aA);ap.push(ay)}ay.appendChild(aA)}else{if(aF=="li"&&at){ay=ad(aA,at,ar,ap,az)}else{ay=0;T(a.grep(aA.childNodes),az);if(aC){au=aE}ay=0}}}T(ax,az)});if(am.wrap_links===false){T(ap,function(ax){function ay(aC){var aB,aA,az;if(aC.nodeName==="A"){aA=c.clone(ar,X);ap.push(aA);az=a.grep(aC.childNodes);for(aB=0;aB<az.length;aB++){aA.appendChild(az[aB])}aC.appendChild(aA)}T(a.grep(aC.childNodes),ay)}ay(ax)})}T(ap,function(az){var ax;function aA(aC){var aB=0;T(aC.childNodes,function(aD){if(!f(aD)&&!K(aD)){aB++}});return aB}function ay(aB){var aD,aC;T(aB.childNodes,function(aE){if(aE.nodeType==1&&!K(aE)&&!b(aE)){aD=aE;return X}});if(aD&&h(aD,am)){aC=c.clone(aD,X);ab(aC);c.replace(aC,aB,C);c.remove(aD,1)}return aC||aB}ax=aA(az);if((ap.length>1||!H(az))&&ax===0){c.remove(az,1);return}if(am.inline||am.wrapper){if(!am.exact&&ax===1){az=ay(az)}T(ah,function(aB){T(c.select(aB.inline,az),function(aD){var aC;if(aB.wrap_links===false){aC=aD.parentNode;do{if(aC.nodeName==="A"){return}}while(aC=aC.parentNode)}Z(aB,al,aD,aB.exact?aD:null)})});if(y(az.parentNode,ae,al)){c.remove(az,1);az=0;return C}if(am.merge_with_parents){c.getParent(az.parentNode,function(aB){if(y(aB,ae,al)){c.remove(az,1);az=0;return C}})}if(az&&am.merge_siblings!==false){az=u(E(az),az);az=u(az,E(az,C))}}})}if(am){if(ag){if(ag.nodeType){ac=c.createRng();ac.setStartBefore(ag);ac.setEndAfter(ag);an(p(ac,ah),null,true)}else{an(ag,null,true)}}else{if(!ai||!am.inline||c.select("td.mceSelected,th.mceSelected").length){var ao=aa.selection.getNode();if(!m&&ah[0].defaultBlock&&!c.getParent(ao,c.isBlock)){Y(ah[0].defaultBlock)}aa.selection.setRng(af());ak=r.getBookmark();an(p(r.getRng(C),ah),ak);if(am.styles&&(am.styles.color||am.styles.textDecoration)){a.walk(ao,L,"childNodes");L(ao)}r.moveToBookmark(ak);R(r.getRng(C));aa.nodeChanged()}else{U("apply",ae,al)}}}}function B(ad,am,af){var ag=V(ad),ao=ag[0],ak,aj,ac,al=true;function ae(av){var au,at,ar,aq,ax,aw;if(av.nodeType===3){return}if(av.nodeType===1&&x(av)){ax=al;al=x(av)==="true";aw=true}au=a.grep(av.childNodes);if(al&&!aw){for(at=0,ar=ag.length;at<ar;at++){if(Z(ag[at],am,av,av)){break}}}if(ao.deep){if(au.length){for(at=0,ar=au.length;at<ar;at++){ae(au[at])}if(aw){al=ax}}}}function ah(aq){var ar;T(n(aq.parentNode).reverse(),function(at){var au;if(!ar&&at.id!="_start"&&at.id!="_end"){au=y(at,ad,am);if(au&&au.split!==false){ar=at}}});return ar}function ab(au,aq,aw,az){var aA,ay,ax,at,av,ar;if(au){ar=au.parentNode;for(aA=aq.parentNode;aA&&aA!=ar;aA=aA.parentNode){ay=c.clone(aA,X);for(av=0;av<ag.length;av++){if(Z(ag[av],am,ay,ay)){ay=0;break}}if(ay){if(ax){ay.appendChild(ax)}if(!at){at=ay}ax=ay}}if(az&&(!ao.mixed||!H(au))){aq=c.split(au,aq)}if(ax){aw.parentNode.insertBefore(ax,aw);at.appendChild(aw)}}return aq}function an(aq){return ab(ah(aq),aq,aq,true)}function ai(at){var ar=c.get(at?"_start":"_end"),aq=ar[at?"firstChild":"lastChild"];if(K(aq)){aq=aq[at?"firstChild":"lastChild"]}c.remove(ar,true);return aq}function ap(aq){var at,au,ar;aq=p(aq,ag,C);if(ao.split){at=M(aq,C);au=M(aq);if(at!=au){if(/^(TR|TD)$/.test(at.nodeName)&&at.firstChild){at=(at.nodeName=="TD"?at.firstChild:at.firstChild.firstChild)||at}at=S(at,"span",{id:"_start","data-mce-type":"bookmark"});au=S(au,"span",{id:"_end","data-mce-type":"bookmark"});an(at);an(au);at=ai(C);au=ai()}else{at=au=an(at)}aq.startContainer=at.parentNode;aq.startOffset=s(at);aq.endContainer=au.parentNode;aq.endOffset=s(au)+1}N.walk(aq,function(av){T(av,function(aw){ae(aw);if(aw.nodeType===1&&aa.dom.getStyle(aw,"text-decoration")==="underline"&&aw.parentNode&&i(aw.parentNode)==="underline"){Z({deep:false,exact:true,inline:"span",styles:{textDecoration:"underline"}},null,aw)}})})}if(af){if(af.nodeType){ac=c.createRng();ac.setStartBefore(af);ac.setEndAfter(af);ap(ac)}else{ap(af)}return}if(!r.isCollapsed()||!ao.inline||c.select("td.mceSelected,th.mceSelected").length){ak=r.getBookmark();ap(r.getRng(C));r.moveToBookmark(ak);if(ao.inline&&k(ad,am,r.getStart())){R(r.getRng(true))}aa.nodeChanged()}else{U("remove",ad,am)}}function F(ac,ae,ad){var ab=V(ac);if(k(ac,ae,ad)&&(!("toggle" in ab[0])||ab[0].toggle)){B(ac,ae,ad)}else{Y(ac,ae,ad)}}function y(ac,ab,ah,af){var ad=V(ab),ai,ag,ae;function aj(an,ap,aq){var am,ao,ak=ap[aq],al;if(ap.onmatch){return ap.onmatch(an,ap,aq)}if(ak){if(ak.length===D){for(am in ak){if(ak.hasOwnProperty(am)){if(aq==="attributes"){ao=c.getAttrib(an,am)}else{ao=O(an,am)}if(af&&!ao&&!ap.exact){return}if((!af||ap.exact)&&!g(ao,q(ak[am],ah))){return}}}}else{for(al=0;al<ak.length;al++){if(aq==="attributes"?c.getAttrib(an,ak[al]):O(an,ak[al])){return ap}}}}return ap}if(ad&&ac){for(ag=0;ag<ad.length;ag++){ai=ad[ag];if(h(ac,ai)&&aj(ac,ai,"attributes")&&aj(ac,ai,"styles")){if(ae=ai.classes){for(ag=0;ag<ae.length;ag++){if(!c.hasClass(ac,ae[ag])){return}}}return ai}}}}function k(ad,af,ae){var ac;function ab(ag){ag=c.getParent(ag,function(ah){return !!y(ah,ad,af,true)});return y(ag,ad,af)}if(ae){return ab(ae)}ae=r.getNode();if(ab(ae)){return C}ac=r.getStart();if(ac!=ae){if(ab(ac)){return C}}return X}function v(ai,ah){var af,ag=[],ae={},ad,ac,ab;af=r.getStart();c.getParent(af,function(al){var ak,aj;for(ak=0;ak<ai.length;ak++){aj=ai[ak];if(!ae[aj]&&y(al,aj,ah)){ae[aj]=true;ag.push(aj)}}},c.getRoot());return ag}function z(af){var ah=V(af),ae,ad,ag,ac,ab;if(ah){ae=r.getStart();ad=n(ae);for(ac=ah.length-1;ac>=0;ac--){ab=ah[ac].selector;if(!ab){return C}for(ag=ad.length-1;ag>=0;ag--){if(c.is(ad[ag],ab)){return C}}}}return X}function J(ab,ae,ac){var ad;if(!P){P={};ad={};aa.onNodeChange.addToTop(function(ag,af,ai){var ah=n(ai),aj={};T(P,function(ak,al){T(ah,function(am){if(y(am,al,{},ak.similar)){if(!ad[al]){T(ak,function(an){an(true,{node:am,format:al,parents:ah})});ad[al]=ak}aj[al]=ak;return false}})});T(ad,function(ak,al){if(!aj[al]){delete ad[al];T(ak,function(am){am(false,{node:ai,format:al,parents:ah})})}})})}T(ab.split(","),function(af){if(!P[af]){P[af]=[];P[af].similar=ac}P[af].push(ae)});return this}a.extend(this,{get:V,register:l,apply:Y,remove:B,toggle:F,match:k,matchAll:v,matchNode:y,canApply:z,formatChanged:J});j();W();function h(ab,ac){if(g(ab,ac.inline)){return C}if(g(ab,ac.block)){return C}if(ac.selector){return c.is(ab,ac.selector)}}function g(ac,ab){ac=ac||"";ab=ab||"";ac=""+(ac.nodeName||ac);ab=""+(ab.nodeName||ab);return ac.toLowerCase()==ab.toLowerCase()}function O(ac,ab){var ad=c.getStyle(ac,ab);if(ab=="color"||ab=="backgroundColor"){ad=c.toHex(ad)}if(ab=="fontWeight"&&ad==700){ad="bold"}return""+ad}function q(ab,ac){if(typeof(ab)!="string"){ab=ab(ac)}else{if(ac){ab=ab.replace(/%(\w+)/g,function(ae,ad){return ac[ad]||ae})}}return ab}function f(ab){return ab&&ab.nodeType===3&&/^([\t \r\n]+|)$/.test(ab.nodeValue)}function S(ad,ac,ab){var ae=c.create(ac,ab);ad.parentNode.insertBefore(ae,ad);ae.appendChild(ad);return ae}function p(ab,am,ae){var ap,an,ah,al,ad=ab.startContainer,ai=ab.startOffset,ar=ab.endContainer,ak=ab.endOffset;function ao(aA){var au,ax,az,aw,av,at;au=ax=aA?ad:ar;av=aA?"previousSibling":"nextSibling";at=c.getRoot();function ay(aB){return aB.nodeName=="BR"&&aB.getAttribute("data-mce-bogus")&&!aB.nextSibling}if(au.nodeType==3&&!f(au)){if(aA?ai>0:ak<au.nodeValue.length){return au}}for(;;){if(!am[0].block_expand&&H(ax)){return ax}for(aw=ax[av];aw;aw=aw[av]){if(!K(aw)&&!f(aw)&&!ay(aw)){return ax}}if(ax.parentNode==at){au=ax;break}ax=ax.parentNode}return au}function ag(at,au){if(au===D){au=at.nodeType===3?at.length:at.childNodes.length}while(at&&at.hasChildNodes()){at=at.childNodes[au];if(at){au=at.nodeType===3?at.length:at.childNodes.length}}return{node:at,offset:au}}if(ad.nodeType==1&&ad.hasChildNodes()){an=ad.childNodes.length-1;ad=ad.childNodes[ai>an?an:ai];if(ad.nodeType==3){ai=0}}if(ar.nodeType==1&&ar.hasChildNodes()){an=ar.childNodes.length-1;ar=ar.childNodes[ak>an?an:ak-1];if(ar.nodeType==3){ak=ar.nodeValue.length}}function aq(au){var at=au;while(at){if(at.nodeType===1&&x(at)){return x(at)==="false"?at:au}at=at.parentNode}return au}function aj(au,ay,aA){var ax,av,az,at;function aw(aC,aE){var aF,aB,aD=aC.nodeValue;if(typeof(aE)=="undefined"){aE=aA?aD.length:0}if(aA){aF=aD.lastIndexOf(" ",aE);aB=aD.lastIndexOf("\u00a0",aE);aF=aF>aB?aF:aB;if(aF!==-1&&!ae){aF++}}else{aF=aD.indexOf(" ",aE);aB=aD.indexOf("\u00a0",aE);aF=aF!==-1&&(aB===-1||aF<aB)?aF:aB}return aF}if(au.nodeType===3){az=aw(au,ay);if(az!==-1){return{container:au,offset:az}}at=au}ax=new t(au,c.getParent(au,H)||aa.getBody());while(av=ax[aA?"prev":"next"]()){if(av.nodeType===3){at=av;az=aw(av);if(az!==-1){return{container:av,offset:az}}}else{if(H(av)){break}}}if(at){if(aA){ay=0}else{ay=at.length}return{container:at,offset:ay}}}function af(au,at){var av,aw,ay,ax;if(au.nodeType==3&&au.nodeValue.length===0&&au[at]){au=au[at]}av=n(au);for(aw=0;aw<av.length;aw++){for(ay=0;ay<am.length;ay++){ax=am[ay];if("collapsed" in ax&&ax.collapsed!==ab.collapsed){continue}if(c.is(av[aw],ax.selector)){return av[aw]}}}return au}function ac(au,at,aw){var av;if(!am[0].wrapper){av=c.getParent(au,am[0].block)}if(!av){av=c.getParent(au.nodeType==3?au.parentNode:au,I)}if(av&&am[0].wrapper){av=n(av,"ul,ol").reverse()[0]||av}if(!av){av=au;while(av[at]&&!H(av[at])){av=av[at];if(g(av,"br")){break}}}return av||au}ad=aq(ad);ar=aq(ar);if(K(ad.parentNode)||K(ad)){ad=K(ad)?ad:ad.parentNode;ad=ad.nextSibling||ad;if(ad.nodeType==3){ai=0}}if(K(ar.parentNode)||K(ar)){ar=K(ar)?ar:ar.parentNode;ar=ar.previousSibling||ar;if(ar.nodeType==3){ak=ar.length}}if(am[0].inline){if(ab.collapsed){al=aj(ad,ai,true);if(al){ad=al.container;ai=al.offset}al=aj(ar,ak);if(al){ar=al.container;ak=al.offset}}ah=ag(ar,ak);if(ah.node){while(ah.node&&ah.offset===0&&ah.node.previousSibling){ah=ag(ah.node.previousSibling)}if(ah.node&&ah.offset>0&&ah.node.nodeType===3&&ah.node.nodeValue.charAt(ah.offset-1)===" "){if(ah.offset>1){ar=ah.node;ar.splitText(ah.offset-1)}}}}if(am[0].inline||am[0].block_expand){if(!am[0].inline||(ad.nodeType!=3||ai===0)){ad=ao(true)}if(!am[0].inline||(ar.nodeType!=3||ak===ar.nodeValue.length)){ar=ao()}}if(am[0].selector&&am[0].expand!==X&&!am[0].inline){ad=af(ad,"previousSibling");ar=af(ar,"nextSibling")}if(am[0].block||am[0].selector){ad=ac(ad,"previousSibling");ar=ac(ar,"nextSibling");if(am[0].block){if(!H(ad)){ad=ao(true)}if(!H(ar)){ar=ao()}}}if(ad.nodeType==1){ai=s(ad);ad=ad.parentNode}if(ar.nodeType==1){ak=s(ar)+1;ar=ar.parentNode}return{startContainer:ad,startOffset:ai,endContainer:ar,endOffset:ak}}function Z(ah,ag,ae,ab){var ad,ac,af;if(!h(ae,ah)){return X}if(ah.remove!="all"){T(ah.styles,function(aj,ai){aj=q(aj,ag);if(typeof(ai)==="number"){ai=aj;ab=0}if(!ab||g(O(ab,ai),aj)){c.setStyle(ae,ai,"")}af=1});if(af&&c.getAttrib(ae,"style")==""){ae.removeAttribute("style");ae.removeAttribute("data-mce-style")}T(ah.attributes,function(ak,ai){var aj;ak=q(ak,ag);if(typeof(ai)==="number"){ai=ak;ab=0}if(!ab||g(c.getAttrib(ab,ai),ak)){if(ai=="class"){ak=c.getAttrib(ae,ai);if(ak){aj="";T(ak.split(/\s+/),function(al){if(/mce\w+/.test(al)){aj+=(aj?" ":"")+al}});if(aj){c.setAttrib(ae,ai,aj);return}}}if(ai=="class"){ae.removeAttribute("className")}if(e.test(ai)){ae.removeAttribute("data-mce-"+ai)}ae.removeAttribute(ai)}});T(ah.classes,function(ai){ai=q(ai,ag);if(!ab||c.hasClass(ab,ai)){c.removeClass(ae,ai)}});ac=c.getAttribs(ae);for(ad=0;ad<ac.length;ad++){if(ac[ad].nodeName.indexOf("_")!==0){return X}}}if(ah.remove!="none"){o(ae,ah);return C}}function o(ad,ae){var ab=ad.parentNode,ac;function af(ah,ag,ai){ah=E(ah,ag,ai);return !ah||(ah.nodeName=="BR"||H(ah))}if(ae.block){if(!m){if(H(ad)&&!H(ab)){if(!af(ad,X)&&!af(ad.firstChild,C,1)){ad.insertBefore(c.create("br"),ad.firstChild)}if(!af(ad,C)&&!af(ad.lastChild,X,1)){ad.appendChild(c.create("br"))}}}else{if(ab==c.getRoot()){if(!ae.list_block||!g(ad,ae.list_block)){T(a.grep(ad.childNodes),function(ag){if(d(m,ag.nodeName.toLowerCase())){if(!ac){ac=S(ag,m)}else{ac.appendChild(ag)}}else{ac=0}})}}}}if(ae.selector&&ae.inline&&!g(ae.inline,ad)){return}c.remove(ad,1)}function E(ac,ab,ad){if(ac){ab=ab?"nextSibling":"previousSibling";for(ac=ad?ac:ac[ab];ac;ac=ac[ab]){if(ac.nodeType==1||!f(ac)){return ac}}}}function K(ab){return ab&&ab.nodeType==1&&ab.getAttribute("data-mce-type")=="bookmark"}function u(af,ae){var ab,ad,ac;function ah(ak,aj){if(ak.nodeName!=aj.nodeName){return X}function ai(am){var an={};T(c.getAttribs(am),function(ao){var ap=ao.nodeName.toLowerCase();if(ap.indexOf("_")!==0&&ap!=="style"){an[ap]=c.getAttrib(am,ap)}});return an}function al(ap,ao){var an,am;for(am in ap){if(ap.hasOwnProperty(am)){an=ao[am];if(an===D){return X}if(ap[am]!=an){return X}delete ao[am]}}for(am in ao){if(ao.hasOwnProperty(am)){return X}}return C}if(!al(ai(ak),ai(aj))){return X}if(!al(c.parseStyle(c.getAttrib(ak,"style")),c.parseStyle(c.getAttrib(aj,"style")))){return X}return C}function ag(aj,ai){for(ad=aj;ad;ad=ad[ai]){if(ad.nodeType==3&&ad.nodeValue.length!==0){return aj}if(ad.nodeType==1&&!K(ad)){return ad}}return aj}if(af&&ae){af=ag(af,"previousSibling");ae=ag(ae,"nextSibling");if(ah(af,ae)){for(ad=af.nextSibling;ad&&ad!=ae;){ac=ad;ad=ad.nextSibling;af.appendChild(ac)}c.remove(ae);T(a.grep(ae.childNodes),function(ai){af.appendChild(ai)});return af}}return ae}function M(ac,ag){var ab,af,ad,ae;ab=ac[ag?"startContainer":"endContainer"];af=ac[ag?"startOffset":"endOffset"];if(ab.nodeType==1){ad=ab.childNodes.length-1;if(!ag&&af){af--}ab=ab.childNodes[af>ad?ad:af]}if(ab.nodeType===3&&ag&&af>=ab.nodeValue.length){ab=new t(ab,aa.getBody()).next()||ab}if(ab.nodeType===3&&!ag&&af===0){ab=new t(ab,aa.getBody()).prev()||ab}return ab}function U(ak,ab,ai){var al="_mce_caret",ac=aa.settings.caret_debug;function ad(ap){var ao=c.create("span",{id:al,"data-mce-bogus":true,style:ac?"color:red":""});if(ap){ao.appendChild(aa.getDoc().createTextNode(G))}return ao}function aj(ap,ao){while(ap){if((ap.nodeType===3&&ap.nodeValue!==G)||ap.childNodes.length>1){return false}if(ao&&ap.nodeType===1){ao.push(ap)}ap=ap.firstChild}return true}function ag(ao){while(ao){if(ao.id===al){return ao}ao=ao.parentNode}}function af(ao){var ap;if(ao){ap=new t(ao,ao);for(ao=ap.current();ao;ao=ap.next()){if(ao.nodeType===3){return ao}}}}function ae(aq,ap){var ar,ao;if(!aq){aq=ag(r.getStart());if(!aq){while(aq=c.get(al)){ae(aq,false)}}}else{ao=r.getRng(true);if(aj(aq)){if(ap!==false){ao.setStartBefore(aq);ao.setEndBefore(aq)}c.remove(aq)}else{ar=af(aq);if(ar.nodeValue.charAt(0)===G){ar=ar.deleteData(0,1)}c.remove(aq,1)}r.setRng(ao)}}function ah(){var aq,ao,av,au,ar,ap,at;aq=r.getRng(true);au=aq.startOffset;ap=aq.startContainer;at=ap.nodeValue;ao=ag(r.getStart());if(ao){av=af(ao)}if(at&&au>0&&au<at.length&&/\w/.test(at.charAt(au))&&/\w/.test(at.charAt(au-1))){ar=r.getBookmark();aq.collapse(true);aq=p(aq,V(ab));aq=N.split(aq);Y(ab,ai,aq);r.moveToBookmark(ar)}else{if(!ao||av.nodeValue!==G){ao=ad(true);av=ao.firstChild;aq.insertNode(ao);au=1;Y(ab,ai,ao)}else{Y(ab,ai,ao)}r.setCursorLocation(av,au)}}function am(){var ao=r.getRng(true),ap,at,aw,av,aq,az,ay=[],au,ax;ap=ao.startContainer;at=ao.startOffset;aq=ap;if(ap.nodeType==3){if(at!=ap.nodeValue.length||ap.nodeValue===G){av=true}aq=aq.parentNode}while(aq){if(y(aq,ab,ai)){az=aq;break}if(aq.nextSibling){av=true}ay.push(aq);aq=aq.parentNode}if(!az){return}if(av){aw=r.getBookmark();ao.collapse(true);ao=p(ao,V(ab),true);ao=N.split(ao);B(ab,ai,ao);r.moveToBookmark(aw)}else{ax=ad();aq=ax;for(au=ay.length-1;au>=0;au--){aq.appendChild(c.clone(ay[au],false));aq=aq.firstChild}aq.appendChild(c.doc.createTextNode(G));aq=aq.firstChild;var ar=c.getParent(az,I);if(ar&&c.isEmpty(ar)){az.parentNode.replaceChild(ax,az)}else{c.insertAfter(ax,az)}r.setCursorLocation(aq,1);if(c.isEmpty(az)){c.remove(az)}}}function an(){var ap,ao,aq;ao=ag(r.getStart());if(ao&&!c.isEmpty(ao)){a.walk(ao,function(ar){if(ar.nodeType==1&&ar.id!==al&&!c.isEmpty(ar)){c.setAttrib(ar,"data-mce-bogus",null)}},"childNodes")}}if(!self._hasCaretEvents){aa.onBeforeGetContent.addToTop(function(){var ao=[],ap;if(aj(ag(r.getStart()),ao)){ap=ao.length;while(ap--){c.setAttrib(ao[ap],"data-mce-bogus","1")}}});a.each("onMouseUp onKeyUp".split(" "),function(ao){aa[ao].addToTop(function(){ae();an()})});aa.onKeyDown.addToTop(function(ao,aq){var ap=aq.keyCode;if(ap==8||ap==37||ap==39){ae(ag(r.getStart()))}an()});r.onSetContent.add(an);self._hasCaretEvents=true}if(ak=="apply"){ah()}else{am()}}function R(ac){var ab=ac.startContainer,ai=ac.startOffset,ae,ah,ag,ad,af;if(ab.nodeType==3&&ai>=ab.nodeValue.length){ai=s(ab);ab=ab.parentNode;ae=true}if(ab.nodeType==1){ad=ab.childNodes;ab=ad[Math.min(ai,ad.length-1)];ah=new t(ab,c.getParent(ab,c.isBlock));if(ai>ad.length-1||ae){ah.next()}for(ag=ah.current();ag;ag=ah.next()){if(ag.nodeType==3&&!f(ag)){af=c.create("a",null,G);ag.parentNode.insertBefore(af,ag);ac.setStart(ag,0);r.setRng(ac);c.remove(af);return}}}}}})(tinymce);tinymce.onAddEditor.add(function(e,a){var d,h,g,c=a.settings;function b(j,i){e.each(i,function(l,k){if(l){g.setStyle(j,k,l)}});g.rename(j,"span")}function f(i,j){g=i.dom;if(c.convert_fonts_to_spans){e.each(g.select("font,u,strike",j.node),function(k){d[k.nodeName.toLowerCase()](a.dom,k)})}}if(c.inline_styles){h=e.explode(c.font_size_legacy_values);d={font:function(j,i){b(i,{backgroundColor:i.style.backgroundColor,color:i.color,fontFamily:i.face,fontSize:h[parseInt(i.size,10)-1]})},u:function(j,i){b(i,{textDecoration:"underline"})},strike:function(j,i){b(i,{textDecoration:"line-through"})}};a.onPreProcess.add(f);a.onSetContent.add(f);a.onInit.add(function(){a.selection.onSetContent.add(f)})}});(function(b){var a=b.dom.TreeWalker;b.EnterKey=function(f){var i=f.dom,e=f.selection,d=f.settings,h=f.undoManager,c=f.schema.getNonEmptyElements();function g(B){var v=e.getRng(true),G,j,A,u,p,M,C,o,k,n,t,J,x,D;function E(N){return N&&i.isBlock(N)&&!/^(TD|TH|CAPTION|FORM)$/.test(N.nodeName)&&!/^(fixed|absolute)/i.test(N.style.position)&&i.getContentEditable(N)!=="true"}function F(O){var N;if(b.isIE&&!b.isIE11&&i.isBlock(O)){N=e.getRng();O.appendChild(i.create("span",null,"\u00a0"));e.select(O);O.lastChild.outerHTML="";e.setRng(N)}}function z(P){var O=P,Q=[],N;while(O=O.firstChild){if(i.isBlock(O)){return}if(O.nodeType==1&&!c[O.nodeName.toLowerCase()]){Q.push(O)}}N=Q.length;while(N--){O=Q[N];if(!O.hasChildNodes()||(O.firstChild==O.lastChild&&O.firstChild.nodeValue==="")){i.remove(O)}else{if(O.nodeName=="A"&&(O.innerText||O.textContent)===" "){i.remove(O)}}}}function m(O){var T,R,N,U,S,Q=O,P;N=i.createRng();if(O.hasChildNodes()){T=new a(O,O);while(R=T.current()){if(R.nodeType==3){N.setStart(R,0);N.setEnd(R,0);break}if(c[R.nodeName.toLowerCase()]){N.setStartBefore(R);N.setEndBefore(R);break}Q=R;R=T.next()}if(!R){N.setStart(Q,0);N.setEnd(Q,0)}}else{if(O.nodeName=="BR"){if(O.nextSibling&&i.isBlock(O.nextSibling)){if(!M||M<9){P=i.create("br");O.parentNode.insertBefore(P,O)}N.setStartBefore(O);N.setEndBefore(O)}else{N.setStartAfter(O);N.setEndAfter(O)}}else{N.setStart(O,0);N.setEnd(O,0)}}e.setRng(N);i.remove(P);S=i.getViewPort(f.getWin());U=i.getPos(O).y;if(U<S.y||U+25>S.y+S.h){f.getWin().scrollTo(0,U<S.y?U:U-S.h+25)}}function r(O){var P=A,R,Q,N;R=O||t=="TABLE"?i.create(O||x):p.cloneNode(false);N=R;if(d.keep_styles!==false){do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(P.nodeName)){if(P.id=="_mce_caret"){continue}Q=P.cloneNode(false);i.setAttrib(Q,"id","");if(R.hasChildNodes()){Q.appendChild(R.firstChild);R.appendChild(Q)}else{N=Q;R.appendChild(Q)}}}while(P=P.parentNode)}if(!b.isIE||b.isIE11){N.innerHTML='<br data-mce-bogus="1">'}return R}function q(Q){var P,O,N;if(A.nodeType==3&&(Q?u>0:u<A.nodeValue.length)){return false}if(A.parentNode==p&&D&&!Q){return true}if(Q&&A.nodeType==1&&A==p.firstChild){return true}if(A.nodeName==="TABLE"||(A.previousSibling&&A.previousSibling.nodeName=="TABLE")){return(D&&!Q)||(!D&&Q)}P=new a(A,p);if(A.nodeType==3){if(Q&&u==0){P.prev()}else{if(!Q&&u==A.nodeValue.length){P.next()}}}while(O=P.current()){if(O.nodeType===1){if(!O.getAttribute("data-mce-bogus")){N=O.nodeName.toLowerCase();if(c[N]&&N!=="br"){return false}}}else{if(O.nodeType===3&&!/^[ \t\r\n]*$/.test(O.nodeValue)){return false}}if(Q){P.prev()}else{P.next()}}return true}function l(N,T){var U,S,P,R,Q,O=x||"P";S=i.getParent(N,i.isBlock);if(!S||!E(S)){S=S||j;if(!S.hasChildNodes()){U=i.create(O);S.appendChild(U);v.setStart(U,0);v.setEnd(U,0);return U}R=N;while(R.parentNode!=S){R=R.parentNode}while(R&&!i.isBlock(R)){P=R;R=R.previousSibling}if(P){U=i.create(O);P.parentNode.insertBefore(U,P);R=P;while(R&&!i.isBlock(R)){Q=R.nextSibling;U.appendChild(R);R=Q}v.setStart(N,T);v.setEnd(N,T)}}return N}function H(){function N(P){var O=n[P?"firstChild":"lastChild"];while(O){if(O.nodeType==1){break}O=O[P?"nextSibling":"previousSibling"]}return O===p}o=x?r(x):i.create("BR");if(N(true)&&N()){i.replace(o,n)}else{if(N(true)){n.parentNode.insertBefore(o,n)}else{if(N()){i.insertAfter(o,n);F(o)}else{G=v.cloneRange();G.setStartAfter(p);G.setEndAfter(n);k=G.extractContents();i.insertAfter(k,n);i.insertAfter(o,n)}}}i.remove(p);m(o);h.add()}function y(){var O=new a(A,p),N;while(N=O.next()){if(c[N.nodeName.toLowerCase()]||N.length>0){return true}}}function L(){var P,O,N;if(A&&A.nodeType==3&&u>=A.nodeValue.length){if((!b.isIE||b.isIE11)&&!y()){P=i.create("br");v.insertNode(P);v.setStartAfter(P);v.setEndAfter(P);O=true}}P=i.create("br");v.insertNode(P);if((b.isIE&&!b.isIE11)&&t=="PRE"&&(!M||M<8)){P.parentNode.insertBefore(i.doc.createTextNode("\r"),P)}N=i.create("span",{},"&nbsp;");P.parentNode.insertBefore(N,P);e.scrollIntoView(N);i.remove(N);if(!O){v.setStartAfter(P);v.setEndAfter(P)}else{v.setStartBefore(P);v.setEndBefore(P)}e.setRng(v);h.add()}function s(N){do{if(N.nodeType===3){N.nodeValue=N.nodeValue.replace(/^[\r\n]+/,"")}N=N.firstChild}while(N)}function K(P){var N=i.getRoot(),O,Q;O=P;while(O!==N&&i.getContentEditable(O)!=="false"){if(i.getContentEditable(O)==="true"){Q=O}O=O.parentNode}return O!==N?Q:N}function I(O){var N;if(!b.isIE||b.isIE11){O.normalize();N=O.lastChild;if(!N||(/^(left|right)$/gi.test(i.getStyle(N,"float",true)))){i.add(O,"br")}}}if(!v.collapsed){f.execCommand("Delete");return}if(B.isDefaultPrevented()){return}A=v.startContainer;u=v.startOffset;x=(d.force_p_newlines?"p":"")||d.forced_root_block;x=x?x.toUpperCase():"";M=i.doc.documentMode;C=B.shiftKey;if(A.nodeType==1&&A.hasChildNodes()){D=u>A.childNodes.length-1;A=A.childNodes[Math.min(u,A.childNodes.length-1)]||A;if(D&&A.nodeType==3){u=A.nodeValue.length}else{u=0}}j=K(A);if(!j){return}h.beforeChange();if(!i.isBlock(j)&&j!=i.getRoot()){if(!x||C){L()}return}if((x&&!C)||(!x&&C)){A=l(A,u)}p=i.getParent(A,i.isBlock);n=p?i.getParent(p.parentNode,i.isBlock):null;t=p?p.nodeName.toUpperCase():"";J=n?n.nodeName.toUpperCase():"";if(J=="LI"&&!B.ctrlKey){p=n;t=J}if(t=="LI"){if(!x&&C){L();return}if(i.isEmpty(p)){if(/^(UL|OL|LI)$/.test(n.parentNode.nodeName)){return false}H();return}}if(t=="PRE"&&d.br_in_pre!==false){if(!C){L();return}}else{if((!x&&!C&&t!="LI")||(x&&C)){L();return}}x=x||"P";if(q()){if(/^(H[1-6]|PRE)$/.test(t)&&J!="HGROUP"){o=r(x)}else{o=r()}if(d.end_container_on_empty_block&&E(n)&&i.isEmpty(p)){o=i.split(n,p)}else{i.insertAfter(o,p)}m(o)}else{if(q(true)){o=p.parentNode.insertBefore(r(),p);F(o)}else{G=v.cloneRange();G.setEndAfter(p);k=G.extractContents();s(k);o=k.firstChild;i.insertAfter(k,p);z(o);I(p);m(o)}}i.setAttrib(o,"id","");h.add()}f.onKeyDown.add(function(k,j){if(j.keyCode==13){if(g(j)!==false){j.preventDefault()}}})}})(tinymce);
\ No newline at end of file
+(function(e){var a=/^\s*|\s*$/g,b,d="B".replace(/A(.)|B/,"$1")==="$1";var c={majorVersion:"3",minorVersion:"5.11",releaseDate:"2014-05-08",_init:function(){var s=this,q=document,o=navigator,g=o.userAgent,m,f,l,k,j,r;s.isIE11=g.indexOf("Trident/")!=-1&&(g.indexOf("rv:")!=-1||o.appName.indexOf("Netscape")!=-1);s.isOpera=e.opera&&opera.buildNumber;s.isWebKit=/WebKit/.test(g);s.isIE=!s.isWebKit&&!s.isOpera&&(/MSIE/gi).test(g)&&(/Explorer/gi).test(o.appName)||s.isIE11;s.isIE6=s.isIE&&/MSIE [56]/.test(g);s.isIE7=s.isIE&&/MSIE [7]/.test(g);s.isIE8=s.isIE&&/MSIE [8]/.test(g);s.isIE9=s.isIE&&/MSIE [9]/.test(g);s.isGecko=!s.isWebKit&&!s.isIE11&&/Gecko/.test(g);s.isMac=g.indexOf("Mac")!=-1;s.isAir=/adobeair/i.test(g);s.isIDevice=/(iPad|iPhone)/.test(g);s.isIOS5=s.isIDevice&&g.match(/AppleWebKit\/(\d*)/)[1]>=534;if(e.tinyMCEPreInit){s.suffix=tinyMCEPreInit.suffix;s.baseURL=tinyMCEPreInit.base;s.query=tinyMCEPreInit.query;return}s.suffix="";f=q.getElementsByTagName("base");for(m=0;m<f.length;m++){r=f[m].href;if(r){if(/^https?:\/\/[^\/]+$/.test(r)){r+="/"}k=r?r.match(/.*\//)[0]:""}}function h(i){if(i.src&&/tiny_mce(|_gzip|_jquery|_prototype|_full)(_dev|_src)?.js/.test(i.src)){if(/_(src|dev)\.js/g.test(i.src)){s.suffix="_src"}if((j=i.src.indexOf("?"))!=-1){s.query=i.src.substring(j+1)}s.baseURL=i.src.substring(0,i.src.lastIndexOf("/"));if(k&&s.baseURL.indexOf("://")==-1&&s.baseURL.indexOf("/")!==0){s.baseURL=k+s.baseURL}return s.baseURL}return null}f=q.getElementsByTagName("script");for(m=0;m<f.length;m++){if(h(f[m])){return}}l=q.getElementsByTagName("head")[0];if(l){f=l.getElementsByTagName("script");for(m=0;m<f.length;m++){if(h(f[m])){return}}}return},is:function(g,f){if(!f){return g!==b}if(f=="array"&&c.isArray(g)){return true}return typeof(g)==f},isArray:Array.isArray||function(f){return Object.prototype.toString.call(f)==="[object Array]"},makeMap:function(f,j,h){var g;f=f||[];j=j||",";if(typeof(f)=="string"){f=f.split(j)}h=h||{};g=f.length;while(g--){h[f[g]]={}}return h},each:function(i,f,h){var j,g;if(!i){return 0}h=h||i;if(i.length!==b){for(j=0,g=i.length;j<g;j++){if(f.call(h,i[j],j,i)===false){return 0}}}else{for(j in i){if(i.hasOwnProperty(j)){if(f.call(h,i[j],j,i)===false){return 0}}}}return 1},trim:function(f){return(f?""+f:"").replace(a,"")},create:function(o,f,j){var n=this,g,i,k,l,h,m=0;o=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(o);k=o[3].match(/(^|\.)(\w+)$/i)[2];i=n.createNS(o[3].replace(/\.\w+$/,""),j);if(i[k]){return}if(o[2]=="static"){i[k]=f;if(this.onCreate){this.onCreate(o[2],o[3],i[k])}return}if(!f[k]){f[k]=function(){};m=1}i[k]=f[k];n.extend(i[k].prototype,f);if(o[5]){g=n.resolve(o[5]).prototype;l=o[5].match(/\.(\w+)$/i)[1];h=i[k];if(m){i[k]=function(){return g[l].apply(this,arguments)}}else{i[k]=function(){this.parent=g[l];return h.apply(this,arguments)}}i[k].prototype[k]=i[k];n.each(g,function(p,q){i[k].prototype[q]=g[q]});n.each(f,function(p,q){if(g[q]){i[k].prototype[q]=function(){this.parent=g[q];return p.apply(this,arguments)}}else{if(q!=k){i[k].prototype[q]=p}}})}n.each(f["static"],function(p,q){i[k][q]=p});if(this.onCreate){this.onCreate(o[2],o[3],i[k].prototype)}},walk:function(i,h,j,g){g=g||this;if(i){if(j){i=i[j]}c.each(i,function(k,f){if(h.call(g,k,f,j)===false){return false}c.walk(k,h,j,g)})}},createNS:function(j,h){var g,f;h=h||e;j=j.split(".");for(g=0;g<j.length;g++){f=j[g];if(!h[f]){h[f]={}}h=h[f]}return h},resolve:function(j,h){var g,f;h=h||e;j=j.split(".");for(g=0,f=j.length;g<f;g++){h=h[j[g]];if(!h){break}}return h},addUnload:function(j,i){var h=this,g;g=function(){var f=h.unloads,l,m;if(f){for(m in f){l=f[m];if(l&&l.func){l.func.call(l.scope,1)}}if(e.detachEvent){e.detachEvent("onbeforeunload",k);e.detachEvent("onunload",g)}else{if(e.removeEventListener){e.removeEventListener("unload",g,false)}}h.unloads=l=f=w=g=0;if(e.CollectGarbage){CollectGarbage()}}};function k(){var l=document;function f(){l.detachEvent("onstop",f);if(g){g()}l=0}if(l.readyState=="interactive"){if(l){l.attachEvent("onstop",f)}e.setTimeout(function(){if(l){l.detachEvent("onstop",f)}},0)}}j={func:j,scope:i||this};if(!h.unloads){if(e.attachEvent){e.attachEvent("onunload",g);e.attachEvent("onbeforeunload",k)}else{if(e.addEventListener){e.addEventListener("unload",g,false)}}h.unloads=[j]}else{h.unloads.push(j)}return j},removeUnload:function(i){var g=this.unloads,h=null;c.each(g,function(j,f){if(j&&j.func==i){g.splice(f,1);h=i;return false}});return h},explode:function(f,g){if(!f||c.is(f,"array")){return f}return c.map(f.split(g||","),c.trim)},_addVer:function(g){var f;if(!this.query){return g}f=(g.indexOf("?")==-1?"?":"&")+this.query;if(g.indexOf("#")==-1){return g+f}return g.replace("#",f+"#")},_replace:function(h,f,g){if(d){return g.replace(h,function(){var l=f,j=arguments,k;for(k=0;k<j.length-2;k++){if(j[k]===b){l=l.replace(new RegExp("\\$"+k,"g"),"")}else{l=l.replace(new RegExp("\\$"+k,"g"),j[k])}}return l})}return g.replace(h,f)}};c._init();e.tinymce=e.tinyMCE=c})(window);(function(f,e){var d=e.is,b=/^(href|src|style)$/i,c;if(!f&&window.console){return console.log("Load jQuery first!")}e.$=f;e.adapter={patchEditor:function(j){var i=f.fn;function h(m,n){var l=this;if(n){l.removeAttr("data-mce-style")}return i.css.apply(l,arguments)}function g(m,n){var l=this;if(b.test(m)){if(n!==c){l.each(function(o,p){j.dom.setAttrib(p,m,n)});return l}else{return l.attr("data-mce-"+m)}}return i.attr.apply(l,arguments)}function k(l){if(l.css!==h){l.css=h;l.attr=g;l.tinymce=j;l.pushStack=function(){return k(i.pushStack.apply(this,arguments))}}return l}j.$=function(l,m){var n=j.getDoc();return k(f(l||n,n||m))}}};e.extend=f.extend;e.extend(e,{map:f.map,grep:function(g,h){return f.grep(g,h||function(){return 1})},inArray:function(g,h){return f.inArray(h,g||[])}});var a={"tinymce.dom.DOMUtils":{select:function(i,h){var g=this;return f.find(i,g.get(h)||g.get(g.settings.root_element)||g.doc,[])},is:function(h,g){if(h.nodeType!==1&&g==="*"){return false}return f(this.get(h)).is(g)}}};e.onCreate=function(g,i,h){e.extend(h,a[i])}})(window.jQuery,tinymce);tinymce.create("tinymce.util.Dispatcher",{scope:null,listeners:null,inDispatch:false,Dispatcher:function(a){this.scope=a||this;this.listeners=[]},add:function(b,a){this.listeners.push({cb:b,scope:a||this.scope});return b},addToTop:function(d,b){var a=this,c={cb:d,scope:b||a.scope};if(a.inDispatch){a.listeners=[c].concat(a.listeners)}else{a.listeners.unshift(c)}return d},remove:function(c){var b=this.listeners,a=null;tinymce.each(b,function(e,d){if(c==e.cb){a=e;b.splice(d,1);return false}});return a},dispatch:function(){var a=this,e,b=arguments,c,d=a.listeners,f;a.inDispatch=true;for(c=0;c<d.length;c++){f=d[c];e=f.cb.apply(f.scope,b.length>0?b:[f.scope]);if(e===false){break}}a.inDispatch=false;return e}});(function(){var a=tinymce.each;tinymce.create("tinymce.util.URI",{URI:function(e,g){var f=this,i,d,c,h;e=tinymce.trim(e);g=f.settings=g||{};if(/^([\w\-]+):([^\/]{2})/i.test(e)||/^\s*#/.test(e)){f.source=e;return}if(e.indexOf("/")===0&&e.indexOf("//")!==0){e=(g.base_uri?g.base_uri.protocol||"http":"http")+"://mce_host"+e}if(!/^[\w\-]*:?\/\//.test(e)){h=g.base_uri?g.base_uri.path:new tinymce.util.URI(location.href).directory;e=((g.base_uri&&g.base_uri.protocol)||"http")+"://mce_host"+f.toAbsPath(h,e)}e=e.replace(/@@/g,"(mce_at)");e=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@\/]*):?([^:@\/]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e);a(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],function(b,j){var k=e[j];if(k){k=k.replace(/\(mce_at\)/g,"@@")}f[b]=k});c=g.base_uri;if(c){if(!f.protocol){f.protocol=c.protocol}if(!f.userInfo){f.userInfo=c.userInfo}if(!f.port&&f.host==="mce_host"){f.port=c.port}if(!f.host||f.host==="mce_host"){f.host=c.host}f.source=""}},setPath:function(c){var b=this;c=/^(.*?)\/?(\w+)?$/.exec(c);b.path=c[0];b.directory=c[1];b.file=c[2];b.source="";b.getURI()},toRelative:function(b){var d=this,f;if(b==="./"){return b}b=new tinymce.util.URI(b,{base_uri:d});if((b.host!="mce_host"&&d.host!=b.host&&b.host)||d.port!=b.port||d.protocol!=b.protocol){return b.getURI()}var c=d.getURI(),e=b.getURI();if(c==e||(c.charAt(c.length-1)=="/"&&c.substr(0,c.length-1)==e)){return c}f=d.toRelPath(d.path,b.path);if(b.query){f+="?"+b.query}if(b.anchor){f+="#"+b.anchor}return f},toAbsolute:function(b,c){b=new tinymce.util.URI(b,{base_uri:this});return b.getURI(this.host==b.host&&this.protocol==b.protocol?c:0)},toRelPath:function(g,h){var c,f=0,d="",e,b;g=g.substring(0,g.lastIndexOf("/"));g=g.split("/");c=h.split("/");if(g.length>=c.length){for(e=0,b=g.length;e<b;e++){if(e>=c.length||g[e]!=c[e]){f=e+1;break}}}if(g.length<c.length){for(e=0,b=c.length;e<b;e++){if(e>=g.length||g[e]!=c[e]){f=e+1;break}}}if(f===1){return h}for(e=0,b=g.length-(f-1);e<b;e++){d+="../"}for(e=f-1,b=c.length;e<b;e++){if(e!=f-1){d+="/"+c[e]}else{d+=c[e]}}return d},toAbsPath:function(e,f){var c,b=0,h=[],d,g;d=/\/$/.test(f)?"/":"";e=e.split("/");f=f.split("/");a(e,function(i){if(i){h.push(i)}});e=h;for(c=f.length-1,h=[];c>=0;c--){if(f[c].length===0||f[c]==="."){continue}if(f[c]===".."){b++;continue}if(b>0){b--;continue}h.push(f[c])}c=e.length-b;if(c<=0){g=h.reverse().join("/")}else{g=e.slice(0,c).join("/")+"/"+h.reverse().join("/")}if(g.indexOf("/")!==0){g="/"+g}if(d&&g.lastIndexOf("/")!==g.length-1){g+=d}return g},getURI:function(d){var c,b=this;if(!b.source||d){c="";if(!d){if(b.protocol){c+=b.protocol+"://"}if(b.userInfo){c+=b.userInfo+"@"}if(b.host){c+=b.host}if(b.port){c+=":"+b.port}}if(b.path){c+=b.path}if(b.query){c+="?"+b.query}if(b.anchor){c+="#"+b.anchor}b.source=c}return b.source}})})();(function(){var a=tinymce.each;tinymce.create("static tinymce.util.Cookie",{getHash:function(d){var b=this.get(d),c;if(b){a(b.split("&"),function(e){e=e.split("=");c=c||{};c[unescape(e[0])]=unescape(e[1])})}return c},setHash:function(j,b,g,f,i,c){var h="";a(b,function(e,d){h+=(!h?"":"&")+escape(d)+"="+escape(e)});this.set(j,h,g,f,i,c)},get:function(i){var h=document.cookie,g,f=i+"=",d;if(!h){return}d=h.indexOf("; "+f);if(d==-1){d=h.indexOf(f);if(d!==0){return null}}else{d+=2}g=h.indexOf(";",d);if(g==-1){g=h.length}return unescape(h.substring(d+f.length,g))},set:function(i,b,g,f,h,c){document.cookie=i+"="+escape(b)+((g)?"; expires="+g.toGMTString():"")+((f)?"; path="+escape(f):"")+((h)?"; domain="+h:"")+((c)?"; secure":"")},remove:function(c,e,d){var b=new Date();b.setTime(b.getTime()-1000);this.set(c,"",b,e,d)}})})();(function(){function serialize(o,quote){var i,v,t,name;quote=quote||'"';if(o==null){return"null"}t=typeof o;if(t=="string"){v="\bb\tt\nn\ff\rr\"\"''\\\\";return quote+o.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g,function(a,b){if(quote==='"'&&a==="'"){return a}i=v.indexOf(b);if(i+1){return"\\"+v.charAt(i+1)}a=b.charCodeAt().toString(16);return"\\u"+"0000".substring(a.length)+a})+quote}if(t=="object"){if(o.hasOwnProperty&&Object.prototype.toString.call(o)==="[object Array]"){for(i=0,v="[";i<o.length;i++){v+=(i>0?",":"")+serialize(o[i],quote)}return v+"]"}v="{";for(name in o){if(o.hasOwnProperty(name)){v+=typeof o[name]!="function"?(v.length>1?","+quote:quote)+name+quote+":"+serialize(o[name],quote):""}}return v+"}"}return""+o}tinymce.util.JSON={serialize:serialize,parse:function(s){try{return eval("("+s+")")}catch(ex){}}}})();tinymce.create("static tinymce.util.XHR",{send:function(g){var a,e,b=window,h=0;function f(){if(!g.async||a.readyState==4||h++>10000){if(g.success&&h<10000&&a.status==200){g.success.call(g.success_scope,""+a.responseText,a,g)}else{if(g.error){g.error.call(g.error_scope,h>10000?"TIMED_OUT":"GENERAL",a,g)}}a=null}else{b.setTimeout(f,10)}}g.scope=g.scope||this;g.success_scope=g.success_scope||g.scope;g.error_scope=g.error_scope||g.scope;g.async=g.async===false?false:true;g.data=g.data||"";function d(i){a=0;try{a=new ActiveXObject(i)}catch(c){}return a}a=b.XMLHttpRequest?new XMLHttpRequest():d("Microsoft.XMLHTTP")||d("Msxml2.XMLHTTP");if(a){if(a.overrideMimeType){a.overrideMimeType(g.content_type)}a.open(g.type||(g.data?"POST":"GET"),g.url,g.async);if(g.content_type){a.setRequestHeader("Content-Type",g.content_type)}a.setRequestHeader("X-Requested-With","XMLHttpRequest");a.send(g.data);if(!g.async){return f()}e=b.setTimeout(f,10)}}});(function(){var c=tinymce.extend,b=tinymce.util.JSON,a=tinymce.util.XHR;tinymce.create("tinymce.util.JSONRequest",{JSONRequest:function(d){this.settings=c({},d);this.count=0},send:function(f){var e=f.error,d=f.success;f=c(this.settings,f);f.success=function(h,g){h=b.parse(h);if(typeof(h)=="undefined"){h={error:"JSON Parse error."}}if(h.error){e.call(f.error_scope||f.scope,h.error,g)}else{d.call(f.success_scope||f.scope,h.result)}};f.error=function(h,g){if(e){e.call(f.error_scope||f.scope,h,g)}};f.data=b.serialize({id:f.id||"c"+(this.count++),method:f.method,params:f.params});f.content_type="application/json";a.send(f)},"static":{sendRPC:function(d){return new tinymce.util.JSONRequest().send(d)}}})}());(function(a){a.VK={BACKSPACE:8,DELETE:46,DOWN:40,ENTER:13,LEFT:37,RIGHT:39,SPACEBAR:32,TAB:9,UP:38,modifierPressed:function(b){return b.shiftKey||b.ctrlKey||b.altKey},metaKeyPressed:function(b){return a.isMac?b.metaKey:b.ctrlKey&&!b.altKey}}})(tinymce);tinymce.util.Quirks=function(a){var j=tinymce.VK,f=j.BACKSPACE,l=j.DELETE,e=a.dom,n=a.selection,J=a.settings,y=a.parser,q=a.serializer,G=tinymce.each;function C(P,O){try{a.getDoc().execCommand(P,false,O)}catch(N){}}function p(){var N=a.getDoc().documentMode;return N?N:6}function B(N){return N.isDefaultPrevented()}function L(){function N(T){var P,R,O,U,Q,S,V;function W(){if(Q.nodeType==3){if(T&&S==Q.length){return true}if(!T&&S===0){return true}}}P=n.getRng();var X=[P.startContainer,P.startOffset,P.endContainer,P.endOffset];if(!P.collapsed){T=true}Q=P[(T?"start":"end")+"Container"];S=P[(T?"start":"end")+"Offset"];if(Q.nodeType==3){R=e.getParent(P.startContainer,e.isBlock);if(T){R=e.getNext(R,e.isBlock)}if(R&&(W()||!P.collapsed)){O=e.create("em",{id:"__mceDel"});G(tinymce.grep(R.childNodes),function(Y){O.appendChild(Y)});R.appendChild(O)}}P=e.createRng();P.setStart(X[0],X[1]);P.setEnd(X[2],X[3]);n.setRng(P);a.getDoc().execCommand(T?"ForwardDelete":"Delete",false,null);if(O){U=n.getBookmark();while(V=e.get("__mceDel")){e.remove(V,true)}n.moveToBookmark(U)}}a.onKeyDown.add(function(O,Q){var P;P=Q.keyCode==l;if(!B(Q)&&(P||Q.keyCode==f)&&!j.modifierPressed(Q)){Q.preventDefault();N(P)}});a.addCommand("Delete",function(){N()})}function s(){function N(Q){var P=e.create("body");var R=Q.cloneContents();P.appendChild(R);return n.serializer.serialize(P,{format:"html"})}function O(P){var R=N(P);var S=e.createRng();S.selectNode(a.getBody());var Q=N(S);return R===Q}a.onKeyDown.add(function(Q,S){var R=S.keyCode,P;if(!B(S)&&(R==l||R==f)){P=Q.selection.isCollapsed();if(P&&!e.isEmpty(Q.getBody())){return}if(tinymce.isIE&&!P){return}if(!P&&!O(Q.selection.getRng())){return}Q.setContent("");Q.selection.setCursorLocation(Q.getBody(),0);Q.nodeChanged()}})}function K(){a.onKeyDown.add(function(N,O){if(!B(O)&&O.keyCode==65&&j.metaKeyPressed(O)){O.preventDefault();N.execCommand("SelectAll")}})}function M(){if(!a.settings.content_editable){e.bind(a.getDoc(),"focusin",function(N){n.setRng(n.getRng())});e.bind(a.getDoc(),"mousedown",function(N){if(N.target==a.getDoc().documentElement){a.getWin().focus();n.setRng(n.getRng())}})}}function D(){a.onKeyDown.add(function(N,Q){if(!B(Q)&&Q.keyCode===f){if(n.isCollapsed()&&n.getRng(true).startOffset===0){var P=n.getNode();var O=P.previousSibling;if(O&&O.nodeName&&O.nodeName.toLowerCase()==="hr"){e.remove(O);tinymce.dom.Event.cancel(Q)}}}})}function A(){if(!Range.prototype.getClientRects){a.onMouseDown.add(function(O,P){if(!B(P)&&P.target.nodeName==="HTML"){var N=O.getBody();N.blur();setTimeout(function(){N.focus()},0)}})}}function h(){a.onClick.add(function(N,O){O=O.target;if(/^(IMG|HR)$/.test(O.nodeName)){n.getSel().setBaseAndExtent(O,0,O,1)}if(O.nodeName=="A"&&e.hasClass(O,"mceItemAnchor")){n.select(O)}N.nodeChanged()})}function c(){function O(){var Q=e.getAttribs(n.getStart().cloneNode(false));return function(){var R=n.getStart();if(R!==a.getBody()){e.setAttrib(R,"style",null);G(Q,function(S){R.setAttributeNode(S.cloneNode(true))})}}}function N(){return !n.isCollapsed()&&e.getParent(n.getStart(),e.isBlock)!=e.getParent(n.getEnd(),e.isBlock)}function P(Q,R){R.preventDefault();return false}a.onKeyPress.add(function(Q,S){var R;if(!B(S)&&(S.keyCode==8||S.keyCode==46)&&N()){R=O();Q.getDoc().execCommand("delete",false,null);R();S.preventDefault();return false}});e.bind(a.getDoc(),"cut",function(R){var Q;if(!B(R)&&N()){Q=O();a.onKeyUp.addToTop(P);setTimeout(function(){Q();a.onKeyUp.remove(P)},0)}})}function b(){var O,N;e.bind(a.getDoc(),"selectionchange",function(){if(N){clearTimeout(N);N=0}N=window.setTimeout(function(){var P=n.getRng();if(!O||!tinymce.dom.RangeUtils.compareRanges(P,O)){a.nodeChanged();O=P}},50)})}function z(){document.body.setAttribute("role","application")}function v(){a.onKeyDown.add(function(N,P){if(!B(P)&&P.keyCode===f){if(n.isCollapsed()&&n.getRng(true).startOffset===0){var O=n.getNode().previousSibling;if(O&&O.nodeName&&O.nodeName.toLowerCase()==="table"){return tinymce.dom.Event.cancel(P)}}}})}function E(){if(p()>7){return}C("RespectVisibilityInDesign",true);a.contentStyles.push(".mceHideBrInPre pre br {display: none}");e.addClass(a.getBody(),"mceHideBrInPre");y.addNodeFilter("pre",function(N,P){var Q=N.length,S,O,T,R;while(Q--){S=N[Q].getAll("br");O=S.length;while(O--){T=S[O];R=T.prev;if(R&&R.type===3&&R.value.charAt(R.value-1)!="\n"){R.value+="\n"}else{T.parent.insert(new tinymce.html.Node("#text",3),T,true).value="\n"}}}});q.addNodeFilter("pre",function(N,P){var Q=N.length,S,O,T,R;while(Q--){S=N[Q].getAll("br");O=S.length;while(O--){T=S[O];R=T.prev;if(R&&R.type==3){R.value=R.value.replace(/\r?\n$/,"")}}}})}function g(){e.bind(a.getBody(),"mouseup",function(P){var O,N=n.getNode();if(N.nodeName=="IMG"){if(O=e.getStyle(N,"width")){e.setAttrib(N,"width",O.replace(/[^0-9%]+/g,""));e.setStyle(N,"width","")}if(O=e.getStyle(N,"height")){e.setAttrib(N,"height",O.replace(/[^0-9%]+/g,""));e.setStyle(N,"height","")}}})}function d(){a.onKeyDown.add(function(T,U){var S,N,O,Q,R,V,P;S=U.keyCode==l;if(!B(U)&&(S||U.keyCode==f)&&!j.modifierPressed(U)){N=n.getRng();O=N.startContainer;Q=N.startOffset;P=N.collapsed;if(O.nodeType==3&&O.nodeValue.length>0&&((Q===0&&!P)||(P&&Q===(S?0:1)))){V=O.previousSibling;if(V&&V.nodeName=="IMG"){return}nonEmptyElements=T.schema.getNonEmptyElements();U.preventDefault();R=e.create("br",{id:"__tmp"});O.parentNode.insertBefore(R,O);T.getDoc().execCommand(S?"ForwardDelete":"Delete",false,null);O=n.getRng().startContainer;V=O.previousSibling;if(V&&V.nodeType==1&&!e.isBlock(V)&&e.isEmpty(V)&&!nonEmptyElements[V.nodeName.toLowerCase()]){e.remove(V)}e.remove("__tmp")}}})}function I(){a.onKeyDown.add(function(R,S){var P,O,T,N,Q;if(B(S)||S.keyCode!=j.BACKSPACE){return}P=n.getRng();O=P.startContainer;T=P.startOffset;N=e.getRoot();Q=O;if(!P.collapsed||T!==0){return}while(Q&&Q.parentNode&&Q.parentNode.firstChild==Q&&Q.parentNode!=N){Q=Q.parentNode}if(Q.tagName==="BLOCKQUOTE"){R.formatter.toggle("blockquote",null,Q);P=e.createRng();P.setStart(O,0);P.setEnd(O,0);n.setRng(P)}})}function H(){function N(){a._refreshContentEditable();C("StyleWithCSS",false);C("enableInlineTableEditing",false);if(!J.object_resizing){C("enableObjectResizing",false)}}if(!J.readonly){a.onBeforeExecCommand.add(N);a.onMouseDown.add(N)}}function u(){function N(O,P){G(e.select("a"),function(S){var Q=S.parentNode,R=e.getRoot();if(Q.lastChild===S){while(Q&&!e.isBlock(Q)){if(Q.parentNode.lastChild!==Q||Q===R){return}Q=Q.parentNode}e.add(Q,"br",{"data-mce-bogus":1})}})}a.onExecCommand.add(function(O,P){if(P==="CreateLink"){N(O)}});a.onSetContent.add(n.onSetContent.add(N))}function o(){if(J.forced_root_block){a.onInit.add(function(){C("DefaultParagraphSeparator",J.forced_root_block)})}}function r(){function N(P,O){if(!P||!O.initial){a.execCommand("mceRepaint")}}a.onUndo.add(N);a.onRedo.add(N);a.onSetContent.add(N)}function i(){a.onKeyDown.add(function(O,P){var N;if(!B(P)&&P.keyCode==f){N=O.getDoc().selection.createRange();if(N&&N.item){P.preventDefault();O.undoManager.beforeChange();e.remove(N.item(0));O.undoManager.add()}}})}function t(){var N;if(p()>=10){N="";G("p div h1 h2 h3 h4 h5 h6".split(" "),function(O,P){N+=(P>0?",":"")+O+":empty"});a.contentStyles.push(N+"{padding-right: 1px !important}")}}function x(){var P,O,af,N,aa,ad,ab,ae,Q,R,ac,Y,X,Z=document,V=a.getDoc();if(!J.object_resizing||J.webkit_fake_resize===false){return}C("enableObjectResizing",false);ac={n:[0.5,0,0,-1],e:[1,0.5,1,0],s:[0.5,1,0,1],w:[0,0.5,-1,0],nw:[0,0,-1,-1],ne:[1,0,1,-1],se:[1,1,1,1],sw:[0,1,-1,1]};function T(aj){var ai,ah;ai=aj.screenX-ad;ah=aj.screenY-ab;Y=ai*aa[2]+ae;X=ah*aa[3]+Q;Y=Y<5?5:Y;X=X<5?5:X;if(j.modifierPressed(aj)||(af.nodeName=="IMG"&&aa[2]*aa[3]!==0)){Y=Math.round(X/R);X=Math.round(Y*R)}e.setStyles(N,{width:Y,height:X});if(aa[2]<0&&N.clientWidth<=Y){e.setStyle(N,"left",P+(ae-Y))}if(aa[3]<0&&N.clientHeight<=X){e.setStyle(N,"top",O+(Q-X))}}function ag(){function ah(ai,aj){if(aj){if(af.style[ai]||!a.schema.isValid(af.nodeName.toLowerCase(),ai)){e.setStyle(af,ai,aj)}else{e.setAttrib(af,ai,aj)}}}ah("width",Y);ah("height",X);e.unbind(V,"mousemove",T);e.unbind(V,"mouseup",ag);if(Z!=V){e.unbind(Z,"mousemove",T);e.unbind(Z,"mouseup",ag)}e.remove(N);S(af)}function S(ak){var ai,aj,ah;U();ai=e.getPos(ak);P=ai.x;O=ai.y;aj=ak.offsetWidth;ah=ak.offsetHeight;if(af!=ak){af=ak;Y=X=0}G(ac,function(an,al){var am;am=e.get("mceResizeHandle"+al);if(!am){am=e.add(V.documentElement,"div",{id:"mceResizeHandle"+al,"class":"mceResizeHandle",style:"cursor:"+al+"-resize; margin:0; padding:0"});e.bind(am,"mousedown",function(ao){ao.preventDefault();ag();ad=ao.screenX;ab=ao.screenY;ae=af.clientWidth;Q=af.clientHeight;R=Q/ae;aa=an;N=af.cloneNode(true);e.addClass(N,"mceClonedResizable");e.setStyles(N,{left:P,top:O,margin:0});V.documentElement.appendChild(N);e.bind(V,"mousemove",T);e.bind(V,"mouseup",ag);if(Z!=V){e.bind(Z,"mousemove",T);e.bind(Z,"mouseup",ag)}})}else{e.show(am)}e.setStyles(am,{left:(aj*an[0]+P)-(am.offsetWidth/2),top:(ah*an[1]+O)-(am.offsetHeight/2)})});if(!tinymce.isOpera&&af.nodeName=="IMG"){af.setAttribute("data-mce-selected","1")}}function U(){if(af){af.removeAttribute("data-mce-selected")}for(var ah in ac){e.hide("mceResizeHandle"+ah)}}a.contentStyles.push(".mceResizeHandle {position: absolute;border: 1px solid black;background: #FFF;width: 5px;height: 5px;z-index: 10000}.mceResizeHandle:hover {background: #000}img[data-mce-selected] {outline: 1px solid black}img.mceClonedResizable, table.mceClonedResizable {position: absolute;outline: 1px dashed black;opacity: .5;z-index: 10000}");function W(){var ah=e.getParent(n.getNode(),"table,img");G(e.select("img[data-mce-selected]"),function(ai){ai.removeAttribute("data-mce-selected")});if(ah){S(ah)}else{U()}}a.onNodeChange.add(W);e.bind(V,"selectionchange",W);a.serializer.addAttributeFilter("data-mce-selected",function(ah,ai){var aj=ah.length;while(aj--){ah[aj].attr(ai,null)}})}function F(){if(p()<9){y.addNodeFilter("noscript",function(N){var O=N.length,P,Q;while(O--){P=N[O];Q=P.firstChild;if(Q){P.attr("data-mce-innertext",Q.value)}}});q.addNodeFilter("noscript",function(N){var O=N.length,P,R,Q;while(O--){P=N[O];R=N[O].firstChild;if(R){R.value=tinymce.html.Entities.decode(R.value)}else{Q=P.attributes.map["data-mce-innertext"];if(Q){P.attr("data-mce-innertext",null);R=new tinymce.html.Node("#text",3);R.value=Q;R.raw=true;P.append(R)}}}})}}function m(){a.contentStyles.push("body {min-height: 100px}");a.onClick.add(function(N,O){if(O.target.nodeName=="HTML"){a.execCommand("SelectAll");a.selection.collapse(true);a.nodeChanged()}})}function k(){a.onInit.add(function(){var N;a.getBody().addEventListener("mscontrolselect",function(O){setTimeout(function(){if(a.selection.getNode()!=O.target){N=a.selection.getRng();n.fakeRng=a.dom.createRng();n.fakeRng.setStartBefore(O.target);n.fakeRng.setEndAfter(O.target)}},0)},false);a.getDoc().addEventListener("selectionchange",function(O){if(N&&!tinymce.dom.RangeUtils.compareRanges(a.selection.getRng(),N)){n.fakeRng=N=null}},false)})}v();I();s();if(tinymce.isWebKit){d();L();M();h();o();if(tinymce.isIDevice){b()}else{x();K()}}if(tinymce.isIE&&!tinymce.isIE11){D();z();E();g();i();t();F()}if(tinymce.isIE11){m();k()}if(tinymce.isGecko&&!tinymce.isIE11){D();A();c();H();u();r()}if(tinymce.isOpera){x()}};(function(j){var a,g,d,k=/[&<>\"\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,b=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,f=/[<>&\"\']/g,c=/&(#x|#)?([\w]+);/g,i={128:"\u20AC",130:"\u201A",131:"\u0192",132:"\u201E",133:"\u2026",134:"\u2020",135:"\u2021",136:"\u02C6",137:"\u2030",138:"\u0160",139:"\u2039",140:"\u0152",142:"\u017D",145:"\u2018",146:"\u2019",147:"\u201C",148:"\u201D",149:"\u2022",150:"\u2013",151:"\u2014",152:"\u02DC",153:"\u2122",154:"\u0161",155:"\u203A",156:"\u0153",158:"\u017E",159:"\u0178"};g={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;"};d={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"};function h(l){var m;m=document.createElement("div");m.innerHTML=l;return m.textContent||m.innerText||l}function e(m,p){var n,o,l,q={};if(m){m=m.split(",");p=p||10;for(n=0;n<m.length;n+=2){o=String.fromCharCode(parseInt(m[n],p));if(!g[o]){l="&"+m[n+1]+";";q[o]=l;q[l]=o}}return q}}a=e("50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,t9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro",32);j.html=j.html||{};j.html.Entities={encodeRaw:function(m,l){return m.replace(l?k:b,function(n){return g[n]||n})},encodeAllRaw:function(l){return(""+l).replace(f,function(m){return g[m]||m})},encodeNumeric:function(m,l){return m.replace(l?k:b,function(n){if(n.length>1){return"&#"+(((n.charCodeAt(0)-55296)*1024)+(n.charCodeAt(1)-56320)+65536)+";"}return g[n]||"&#"+n.charCodeAt(0)+";"})},encodeNamed:function(n,l,m){m=m||a;return n.replace(l?k:b,function(o){return g[o]||m[o]||o})},getEncodeFunc:function(l,o){var p=j.html.Entities;o=e(o)||a;function m(r,q){return r.replace(q?k:b,function(s){return g[s]||o[s]||"&#"+s.charCodeAt(0)+";"||s})}function n(r,q){return p.encodeNamed(r,q,o)}l=j.makeMap(l.replace(/\+/g,","));if(l.named&&l.numeric){return m}if(l.named){if(o){return n}return p.encodeNamed}if(l.numeric){return p.encodeNumeric}return p.encodeRaw},decode:function(l){return l.replace(c,function(n,m,o){if(m){o=parseInt(o,m.length===2?16:10);if(o>65535){o-=65536;return String.fromCharCode(55296+(o>>10),56320+(o&1023))}else{return i[o]||String.fromCharCode(o)}}return d[n]||a[n]||h(n)})}}})(tinymce);tinymce.html.Styles=function(d,f){var k=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,h=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,b=/\s*([^:]+):\s*([^;]+);?/g,l=/\s+$/,m=/rgb/,e,g,a={},j;d=d||{};j="\\\" \\' \\; \\: ; : \uFEFF".split(" ");for(g=0;g<j.length;g++){a[j[g]]="\uFEFF"+g;a["\uFEFF"+g]=j[g]}function c(n,q,p,i){function o(r){r=parseInt(r).toString(16);return r.length>1?r:"0"+r}return"#"+o(q)+o(p)+o(i)}return{toHex:function(i){return i.replace(k,c)},parse:function(s){var z={},q,n,x,r,v=d.url_converter,y=d.url_converter_scope||this;function p(D,G){var F,C,B,E;if(z["border-image"]==="none"){delete z["border-image"]}F=z[D+"-top"+G];if(!F){return}C=z[D+"-right"+G];if(F!=C){return}B=z[D+"-bottom"+G];if(C!=B){return}E=z[D+"-left"+G];if(B!=E){return}z[D+G]=E;delete z[D+"-top"+G];delete z[D+"-right"+G];delete z[D+"-bottom"+G];delete z[D+"-left"+G]}function u(C){var D=z[C],B;if(!D||D.indexOf(" ")<0){return}D=D.split(" ");B=D.length;while(B--){if(D[B]!==D[0]){return false}}z[C]=D[0];return true}function A(D,C,B,E){if(!u(C)){return}if(!u(B)){return}if(!u(E)){return}z[D]=z[C]+" "+z[B]+" "+z[E];delete z[C];delete z[B];delete z[E]}function t(B){r=true;return a[B]}function i(C,B){if(r){C=C.replace(/\uFEFF[0-9]/g,function(D){return a[D]})}if(!B){C=C.replace(/\\([\'\";:])/g,"$1")}return C}function o(C,B,F,E,G,D){G=G||D;if(G){G=i(G);return"'"+G.replace(/\'/g,"\\'")+"'"}B=i(B||F||E);if(v){B=v.call(y,B,"style")}return"url('"+B.replace(/\'/g,"\\'")+"')"}if(s){s=s.replace(/\\[\"\';:\uFEFF]/g,t).replace(/\"[^\"]+\"|\'[^\']+\'/g,function(B){return B.replace(/[;:]/g,t)});while(q=b.exec(s)){n=q[1].replace(l,"").toLowerCase();x=q[2].replace(l,"");if(n&&x.length>0){if(n==="font-weight"&&x==="700"){x="bold"}else{if(n==="color"||n==="background-color"){x=x.toLowerCase()}}x=x.replace(k,c);x=x.replace(h,o);z[n]=r?i(x,true):x}b.lastIndex=q.index+q[0].length}p("border","");p("border","-width");p("border","-color");p("border","-style");p("padding","");p("margin","");A("border","border-width","border-style","border-color");if(z.border==="medium none"){delete z.border}}return z},serialize:function(p,r){var o="",n,q;function i(t){var x,u,s,v;x=f.styles[t];if(x){for(u=0,s=x.length;u<s;u++){t=x[u];v=p[t];if(v!==e&&v.length>0){o+=(o.length>0?" ":"")+t+": "+v+";"}}}}if(r&&f&&f.styles){i("*");i(r)}else{for(n in p){q=p[n];if(q!==e&&q.length>0){o+=(o.length>0?" ":"")+n+": "+q+";"}}}return o}}};(function(f){var a={},e=f.makeMap,g=f.each;function d(j,i){return j.split(i||",")}function h(m,l){var j,k={};function i(n){return n.replace(/[A-Z]+/g,function(o){return i(m[o])})}for(j in m){if(m.hasOwnProperty(j)){m[j]=i(m[j])}}i(l).replace(/#/g,"#text").replace(/(\w+)\[([^\]]+)\]\[([^\]]*)\]/g,function(q,o,n,p){n=d(n,"|");k[o]={attributes:e(n),attributesOrder:n,children:e(p,"|",{"#comment":{}})}});return k}function b(){var i=a.html5;if(!i){i=a.html5=h({A:"id|accesskey|class|dir|draggable|item|hidden|itemprop|role|spellcheck|style|subject|title|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup",B:"#|a|abbr|area|audio|b|bdo|br|button|canvas|cite|code|command|datalist|del|dfn|em|embed|i|iframe|img|input|ins|kbd|keygen|label|link|map|mark|meta|meter|noscript|object|output|progress|q|ruby|samp|script|select|small|span|strong|sub|sup|svg|textarea|time|var|video|wbr",C:"#|a|abbr|area|address|article|aside|audio|b|bdo|blockquote|br|button|canvas|cite|code|command|datalist|del|details|dfn|dialog|div|dl|em|embed|fieldset|figure|footer|form|h1|h2|h3|h4|h5|h6|header|hgroup|hr|i|iframe|img|input|ins|kbd|keygen|label|link|map|mark|menu|meta|meter|nav|noscript|ol|object|output|p|pre|progress|q|ruby|samp|script|section|select|small|span|strong|style|sub|sup|svg|table|textarea|time|ul|var|video"},"html[A|manifest][body|head]head[A][base|command|link|meta|noscript|script|style|title]title[A][#]base[A|href|target][]link[A|href|rel|media|type|sizes][]meta[A|http-equiv|name|content|charset][]style[A|type|media|scoped][#]script[A|charset|type|src|defer|async][#]noscript[A][C]body[A][C]section[A][C]nav[A][C]article[A][C]aside[A][C]h1[A][B]h2[A][B]h3[A][B]h4[A][B]h5[A][B]h6[A][B]hgroup[A][h1|h2|h3|h4|h5|h6]header[A][C]footer[A][C]address[A][C]p[A][B]br[A][]pre[A][B]dialog[A][dd|dt]blockquote[A|cite][C]ol[A|start|reversed][li]ul[A][li]li[A|value][C]dl[A][dd|dt]dt[A][B]dd[A][C]a[A|href|target|ping|rel|media|type][B]em[A][B]strong[A][B]small[A][B]cite[A][B]q[A|cite][B]dfn[A][B]abbr[A][B]code[A][B]var[A][B]samp[A][B]kbd[A][B]sub[A][B]sup[A][B]i[A][B]b[A][B]mark[A][B]progress[A|value|max][B]meter[A|value|min|max|low|high|optimum][B]time[A|datetime][B]ruby[A][B|rt|rp]rt[A][B]rp[A][B]bdo[A][B]span[A][B]ins[A|cite|datetime][B]del[A|cite|datetime][B]figure[A][C|legend|figcaption]figcaption[A][C]img[A|alt|src|height|width|usemap|ismap][]iframe[A|name|src|height|width|sandbox|seamless][]embed[A|src|height|width|type][]object[A|data|type|height|width|usemap|name|form|classid][param]param[A|name|value][]details[A|open][C|legend]command[A|type|label|icon|disabled|checked|radiogroup][]menu[A|type|label][C|li]legend[A][C|B]div[A][C]source[A|src|type|media][]audio[A|src|autobuffer|autoplay|loop|controls][source]video[A|src|autobuffer|autoplay|loop|controls|width|height|poster][source]hr[A][]form[A|accept-charset|action|autocomplete|enctype|method|name|novalidate|target][C]fieldset[A|disabled|form|name][C|legend]label[A|form|for][B]input[A|type|accept|alt|autocomplete|autofocus|checked|disabled|form|formaction|formenctype|formmethod|formnovalidate|formtarget|height|list|max|maxlength|min|multiple|pattern|placeholder|readonly|required|size|src|step|width|files|value|name][]button[A|autofocus|disabled|form|formaction|formenctype|formmethod|formnovalidate|formtarget|name|value|type][B]select[A|autofocus|disabled|form|multiple|name|size][option|optgroup]datalist[A][B|option]optgroup[A|disabled|label][option]option[A|disabled|selected|label|value][]textarea[A|autofocus|disabled|form|maxlength|name|placeholder|readonly|required|rows|cols|wrap][]keygen[A|autofocus|challenge|disabled|form|keytype|name][]output[A|for|form|name][B]canvas[A|width|height][]map[A|name][B|C]area[A|shape|coords|href|alt|target|media|rel|ping|type][]mathml[A][]svg[A][]table[A|border][caption|colgroup|thead|tfoot|tbody|tr]caption[A][C]colgroup[A|span][col]col[A|span][]thead[A][tr]tfoot[A][tr]tbody[A][tr]tr[A][th|td]th[A|headers|rowspan|colspan|scope][B]td[A|headers|rowspan|colspan][C]wbr[A][]")}return i}function c(){var i=a.html4;if(!i){i=a.html4=h({Z:"H|K|N|O|P",Y:"X|form|R|Q",ZG:"E|span|width|align|char|charoff|valign",X:"p|T|div|U|W|isindex|fieldset|table",ZF:"E|align|char|charoff|valign",W:"pre|hr|blockquote|address|center|noframes",ZE:"abbr|axis|headers|scope|rowspan|colspan|align|char|charoff|valign|nowrap|bgcolor|width|height",ZD:"[E][S]",U:"ul|ol|dl|menu|dir",ZC:"p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q",T:"h1|h2|h3|h4|h5|h6",ZB:"X|S|Q",S:"R|P",ZA:"a|G|J|M|O|P",R:"a|H|K|N|O",Q:"noscript|P",P:"ins|del|script",O:"input|select|textarea|label|button",N:"M|L",M:"em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym",L:"sub|sup",K:"J|I",J:"tt|i|b|u|s|strike",I:"big|small|font|basefont",H:"G|F",G:"br|span|bdo",F:"object|applet|img|map|iframe",E:"A|B|C",D:"accesskey|tabindex|onfocus|onblur",C:"onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup",B:"lang|xml:lang|dir",A:"id|class|style|title"},"script[id|charset|type|language|src|defer|xml:space][]style[B|id|type|media|title|xml:space][]object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]param[id|name|value|valuetype|type][]p[E|align][#|S]a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]br[A|clear][]span[E][#|S]bdo[A|C|B][#|S]applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]h1[E|align][#|S]img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]map[B|C|A|name][X|form|Q|area]h2[E|align][#|S]iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]h3[E|align][#|S]tt[E][#|S]i[E][#|S]b[E][#|S]u[E][#|S]s[E][#|S]strike[E][#|S]big[E][#|S]small[E][#|S]font[A|B|size|color|face][#|S]basefont[id|size|color|face][]em[E][#|S]strong[E][#|S]dfn[E][#|S]code[E][#|S]q[E|cite][#|S]samp[E][#|S]kbd[E][#|S]var[E][#|S]cite[E][#|S]abbr[E][#|S]acronym[E][#|S]sub[E][#|S]sup[E][#|S]input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]optgroup[E|disabled|label][option]option[E|selected|disabled|label|value][]textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]label[E|for|accesskey|onfocus|onblur][#|S]button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]h4[E|align][#|S]ins[E|cite|datetime][#|Y]h5[E|align][#|S]del[E|cite|datetime][#|Y]h6[E|align][#|S]div[E|align][#|Y]ul[E|type|compact][li]li[E|type|value][#|Y]ol[E|type|compact|start][li]dl[E|compact][dt|dd]dt[E][#|S]dd[E][#|Y]menu[E|compact][li]dir[E|compact][li]pre[E|width|xml:space][#|ZA]hr[E|align|noshade|size|width][]blockquote[E|cite][#|Y]address[E][#|S|p]center[E][#|Y]noframes[E][#|Y]isindex[A|B|prompt][]fieldset[E][#|legend|Y]legend[E|accesskey|align][#|S]table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]caption[E|align][#|S]col[ZG][]colgroup[ZG][col]thead[ZF][tr]tr[ZF|bgcolor][th|td]th[E|ZE][#|Y]form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]noscript[E][#|Y]td[E|ZE][#|Y]tfoot[ZF][tr]tbody[ZF][tr]area[E|D|shape|coords|href|nohref|alt|target][]base[id|href|target][]body[E|onload|onunload|background|bgcolor|text|link|vlink|alink][#|Y]")}return i}f.html.Schema=function(A){var u=this,s={},k={},j=[],D,y;var o,q,z,r,v,n,p={};function m(F,E,H){var G=A[F];if(!G){G=a[F];if(!G){G=e(E," ",e(E.toUpperCase()," "));G=f.extend(G,H);a[F]=G}}else{G=e(G,",",e(G.toUpperCase()," "))}return G}A=A||{};y=A.schema=="html5"?b():c();if(A.verify_html===false){A.valid_elements="*[*]"}if(A.valid_styles){D={};g(A.valid_styles,function(F,E){D[E]=f.explode(F)})}o=m("whitespace_elements","pre script noscript style textarea");q=m("self_closing_elements","colgroup dd dt li option p td tfoot th thead tr");z=m("short_ended_elements","area base basefont br col frame hr img input isindex link meta param embed source wbr");r=m("boolean_attributes","checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected autoplay loop controls");n=m("non_empty_elements","td th iframe video audio object script",z);textBlockElementsMap=m("text_block_elements","h1 h2 h3 h4 h5 h6 p div address pre form blockquote center dir fieldset header footer article section hgroup aside nav figure");v=m("block_elements","hr table tbody thead tfoot th tr td li ol ul caption dl dt dd noscript menu isindex samp option datalist select optgroup",textBlockElementsMap);function i(E){return new RegExp("^"+E.replace(/([?+*])/g,".$1")+"$")}function C(L){var K,G,Z,V,aa,F,I,U,X,Q,Y,ac,O,J,W,E,S,H,ab,ad,P,T,N=/^([#+\-])?([^\[\/]+)(?:\/([^\[]+))?(?:\[([^\]]+)\])?$/,R=/^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,M=/[*?+]/;if(L){L=d(L);if(s["@"]){S=s["@"].attributes;H=s["@"].attributesOrder}for(K=0,G=L.length;K<G;K++){F=N.exec(L[K]);if(F){W=F[1];Q=F[2];E=F[3];X=F[4];O={};J=[];I={attributes:O,attributesOrder:J};if(W==="#"){I.paddEmpty=true}if(W==="-"){I.removeEmpty=true}if(S){for(ad in S){O[ad]=S[ad]}J.push.apply(J,H)}if(X){X=d(X,"|");for(Z=0,V=X.length;Z<V;Z++){F=R.exec(X[Z]);if(F){U={};ac=F[1];Y=F[2].replace(/::/g,":");W=F[3];T=F[4];if(ac==="!"){I.attributesRequired=I.attributesRequired||[];I.attributesRequired.push(Y);U.required=true}if(ac==="-"){delete O[Y];J.splice(f.inArray(J,Y),1);continue}if(W){if(W==="="){I.attributesDefault=I.attributesDefault||[];I.attributesDefault.push({name:Y,value:T});U.defaultValue=T}if(W===":"){I.attributesForced=I.attributesForced||[];I.attributesForced.push({name:Y,value:T});U.forcedValue=T}if(W==="<"){U.validValues=e(T,"?")}}if(M.test(Y)){I.attributePatterns=I.attributePatterns||[];U.pattern=i(Y);I.attributePatterns.push(U)}else{if(!O[Y]){J.push(Y)}O[Y]=U}}}}if(!S&&Q=="@"){S=O;H=J}if(E){I.outputName=Q;s[E]=I}if(M.test(Q)){I.pattern=i(Q);j.push(I)}else{s[Q]=I}}}}}function t(E){s={};j=[];C(E);g(y,function(G,F){k[F]=G.children})}function l(F){var E=/^(~)?(.+)$/;if(F){g(d(F),function(J){var H=E.exec(J),I=H[1]==="~",K=I?"span":"div",G=H[2];k[G]=k[K];p[G]=K;if(!I){v[G.toUpperCase()]={};v[G]={}}if(!s[G]){s[G]=s[K]}g(k,function(L,M){if(L[K]){L[G]=L[K]}})})}}function x(F){var E=/^([+\-]?)(\w+)\[([^\]]+)\]$/;if(F){g(d(F),function(J){var I=E.exec(J),G,H;if(I){H=I[1];if(H){G=k[I[2]]}else{G=k[I[2]]={"#comment":{}}}G=k[I[2]];g(d(I[3],"|"),function(K){if(H==="-"){delete G[K]}else{G[K]={}}})}})}}function B(E){var G=s[E],F;if(G){return G}F=j.length;while(F--){G=j[F];if(G.pattern.test(E)){return G}}}if(!A.valid_elements){g(y,function(F,E){s[E]={attributes:F.attributes,attributesOrder:F.attributesOrder};k[E]=F.children});if(A.schema!="html5"){g(d("strong/b,em/i"),function(E){E=d(E,"/");s[E[1]].outputName=E[0]})}s.img.attributesDefault=[{name:"alt",value:""}];g(d("ol,ul,sub,sup,blockquote,span,font,a,table,tbody,tr,strong,em,b,i"),function(E){if(s[E]){s[E].removeEmpty=true}});g(d("p,h1,h2,h3,h4,h5,h6,th,td,pre,div,address,caption"),function(E){s[E].paddEmpty=true})}else{t(A.valid_elements)}l(A.custom_elements);x(A.valid_children);C(A.extended_valid_elements);x("+ol[ul|ol],+ul[ul|ol]");if(A.invalid_elements){f.each(f.explode(A.invalid_elements),function(E){if(s[E]){delete s[E]}})}if(!B("span")){C("span[!data-mce-type|*]")}u.children=k;u.styles=D;u.getBoolAttrs=function(){return r};u.getBlockElements=function(){return v};u.getTextBlockElements=function(){return textBlockElementsMap};u.getShortEndedElements=function(){return z};u.getSelfClosingElements=function(){return q};u.getNonEmptyElements=function(){return n};u.getWhiteSpaceElements=function(){return o};u.isValidChild=function(E,G){var F=k[E];return !!(F&&F[G])};u.isValid=function(F,E){var H,G,I=B(F);if(I){if(E){if(I.attributes[E]){return true}H=I.attributePatterns;if(H){G=H.length;while(G--){if(H[G].pattern.test(F)){return true}}}}else{return true}}return false};u.getElementRule=B;u.getCustomElements=function(){return p};u.addValidElements=C;u.setValidElements=t;u.addCustomElements=l;u.addValidChildren=x;u.elements=s}})(tinymce);(function(a){a.html.SaxParser=function(c,e){var b=this,d=function(){};c=c||{};b.schema=e=e||new a.html.Schema();if(c.fix_self_closing!==false){c.fix_self_closing=true}a.each("comment cdata text start end pi doctype".split(" "),function(f){if(f){b[f]=c[f]||d}});b.parse=function(E){var n=this,g,G=0,I,B,A=[],N,Q,C,r,z,s,M,H,O,v,m,k,t,R,o,P,F,S,L,f,J,l,D,K,h,x=0,j=a.html.Entities.decode,y,q;function u(T){var V,U;V=A.length;while(V--){if(A[V].name===T){break}}if(V>=0){for(U=A.length-1;U>=V;U--){T=A[U];if(T.valid){n.end(T.name)}}A.length=V}}function p(U,T,Y,X,W){var Z,V;T=T.toLowerCase();Y=T in H?T:j(Y||X||W||"");if(v&&!z&&T.indexOf("data-")!==0){Z=P[T];if(!Z&&F){V=F.length;while(V--){Z=F[V];if(Z.pattern.test(T)){break}}if(V===-1){Z=null}}if(!Z){return}if(Z.validValues&&!(Y in Z.validValues)){return}}N.map[T]=Y;N.push({name:T,value:Y})}l=new RegExp("<(?:(?:!--([\\w\\W]*?)-->)|(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|(?:!DOCTYPE([\\w\\W]*?)>)|(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|(?:\\/([^>]+)>)|(?:([A-Za-z0-9\\-\\:\\.]+)((?:\\s+[^\"'>]+(?:(?:\"[^\"]*\")|(?:'[^']*')|[^>]*))*|\\/|\\s+)>))","g");D=/([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:[^\"])*)\")|(?:\'((?:[^\'])*)\')|([^>\s]+)))?/g;K={script:/<\/script[^>]*>/gi,style:/<\/style[^>]*>/gi,noscript:/<\/noscript[^>]*>/gi};M=e.getShortEndedElements();J=c.self_closing_elements||e.getSelfClosingElements();H=e.getBoolAttrs();v=c.validate;s=c.remove_internals;y=c.fix_self_closing;q=a.isIE;o=/^:/;while(g=l.exec(E)){if(G<g.index){n.text(j(E.substr(G,g.index-G)))}if(I=g[6]){I=I.toLowerCase();if(q&&o.test(I)){I=I.substr(1)}u(I)}else{if(I=g[7]){I=I.toLowerCase();if(q&&o.test(I)){I=I.substr(1)}O=I in M;if(y&&J[I]&&A.length>0&&A[A.length-1].name===I){u(I)}if(!v||(m=e.getElementRule(I))){k=true;if(v){P=m.attributes;F=m.attributePatterns}if(R=g[8]){z=R.indexOf("data-mce-type")!==-1;if(z&&s){k=false}N=[];N.map={};R.replace(D,p)}else{N=[];N.map={}}if(v&&!z){S=m.attributesRequired;L=m.attributesDefault;f=m.attributesForced;if(f){Q=f.length;while(Q--){t=f[Q];r=t.name;h=t.value;if(h==="{$uid}"){h="mce_"+x++}N.map[r]=h;N.push({name:r,value:h})}}if(L){Q=L.length;while(Q--){t=L[Q];r=t.name;if(!(r in N.map)){h=t.value;if(h==="{$uid}"){h="mce_"+x++}N.map[r]=h;N.push({name:r,value:h})}}}if(S){Q=S.length;while(Q--){if(S[Q] in N.map){break}}if(Q===-1){k=false}}if(N.map["data-mce-bogus"]){k=false}}if(k){n.start(I,N,O)}}else{k=false}if(B=K[I]){B.lastIndex=G=g.index+g[0].length;if(g=B.exec(E)){if(k){C=E.substr(G,g.index-G)}G=g.index+g[0].length}else{C=E.substr(G);G=E.length}if(k&&C.length>0){n.text(C,true)}if(k){n.end(I)}l.lastIndex=G;continue}if(!O){if(!R||R.indexOf("/")!=R.length-1){A.push({name:I,valid:k})}else{if(k){n.end(I)}}}}else{if(I=g[1]){n.comment(I)}else{if(I=g[2]){n.cdata(I)}else{if(I=g[3]){n.doctype(I)}else{if(I=g[4]){n.pi(I,g[5])}}}}}}G=g.index+g[0].length}if(G<E.length){n.text(j(E.substr(G)))}for(Q=A.length-1;Q>=0;Q--){I=A[Q];if(I.valid){n.end(I.name)}}}}})(tinymce);(function(d){var c=/^[ \t\r\n]*$/,e={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11};function a(k,l,j){var i,h,f=j?"lastChild":"firstChild",g=j?"prev":"next";if(k[f]){return k[f]}if(k!==l){i=k[g];if(i){return i}for(h=k.parent;h&&h!==l;h=h.parent){i=h[g];if(i){return i}}}}function b(f,g){this.name=f;this.type=g;if(g===1){this.attributes=[];this.attributes.map={}}}d.extend(b.prototype,{replace:function(g){var f=this;if(g.parent){g.remove()}f.insert(g,f);f.remove();return f},attr:function(h,l){var f=this,g,j,k;if(typeof h!=="string"){for(j in h){f.attr(j,h[j])}return f}if(g=f.attributes){if(l!==k){if(l===null){if(h in g.map){delete g.map[h];j=g.length;while(j--){if(g[j].name===h){g=g.splice(j,1);return f}}}return f}if(h in g.map){j=g.length;while(j--){if(g[j].name===h){g[j].value=l;break}}}else{g.push({name:h,value:l})}g.map[h]=l;return f}else{return g.map[h]}}},clone:function(){var g=this,n=new b(g.name,g.type),h,f,m,j,k;if(m=g.attributes){k=[];k.map={};for(h=0,f=m.length;h<f;h++){j=m[h];if(j.name!=="id"){k[k.length]={name:j.name,value:j.value};k.map[j.name]=j.value}}n.attributes=k}n.value=g.value;n.shortEnded=g.shortEnded;return n},wrap:function(g){var f=this;f.parent.insert(g,f);g.append(f);return f},unwrap:function(){var f=this,h,g;for(h=f.firstChild;h;){g=h.next;f.insert(h,f,true);h=g}f.remove()},remove:function(){var f=this,h=f.parent,g=f.next,i=f.prev;if(h){if(h.firstChild===f){h.firstChild=g;if(g){g.prev=null}}else{i.next=g}if(h.lastChild===f){h.lastChild=i;if(i){i.next=null}}else{g.prev=i}f.parent=f.next=f.prev=null}return f},append:function(h){var f=this,g;if(h.parent){h.remove()}g=f.lastChild;if(g){g.next=h;h.prev=g;f.lastChild=h}else{f.lastChild=f.firstChild=h}h.parent=f;return h},insert:function(h,f,i){var g;if(h.parent){h.remove()}g=f.parent||this;if(i){if(f===g.firstChild){g.firstChild=h}else{f.prev.next=h}h.prev=f.prev;h.next=f;f.prev=h}else{if(f===g.lastChild){g.lastChild=h}else{f.next.prev=h}h.next=f.next;h.prev=f;f.next=h}h.parent=g;return h},getAll:function(g){var f=this,h,i=[];for(h=f.firstChild;h;h=a(h,f)){if(h.name===g){i.push(h)}}return i},empty:function(){var g=this,f,h,j;if(g.firstChild){f=[];for(j=g.firstChild;j;j=a(j,g)){f.push(j)}h=f.length;while(h--){j=f[h];j.parent=j.firstChild=j.lastChild=j.next=j.prev=null}}g.firstChild=g.lastChild=null;return g},isEmpty:function(k){var f=this,j=f.firstChild,h,g;if(j){do{if(j.type===1){if(j.attributes.map["data-mce-bogus"]){continue}if(k[j.name]){return false}h=j.attributes.length;while(h--){g=j.attributes[h].name;if(g==="name"||g.indexOf("data-mce-")===0){return false}}}if(j.type===8){return false}if((j.type===3&&!c.test(j.value))){return false}}while(j=a(j,f))}return true},walk:function(f){return a(this,null,f)}});d.extend(b,{create:function(g,f){var i,h;i=new b(g,e[g]||1);if(f){for(h in f){i.attr(h,f[h])}}return i}});d.html.Node=b})(tinymce);(function(b){var a=b.html.Node;b.html.DomParser=function(g,h){var f=this,e={},d=[],i={},c={};g=g||{};g.validate="validate" in g?g.validate:true;g.root_name=g.root_name||"body";f.schema=h=h||new b.html.Schema();function j(n){var p,q,y,x,A,o,r,l,u,v,k,t,m,z,s;t=b.makeMap("tr,td,th,tbody,thead,tfoot,table");k=h.getNonEmptyElements();m=h.getTextBlockElements();for(p=0;p<n.length;p++){q=n[p];if(!q.parent||q.fixed){continue}if(m[q.name]&&q.parent.name=="li"){z=q.next;while(z){if(m[z.name]){z.name="li";z.fixed=true;q.parent.insert(z,q.parent)}else{break}z=z.next}q.unwrap(q);continue}x=[q];for(y=q.parent;y&&!h.isValidChild(y.name,q.name)&&!t[y.name];y=y.parent){x.push(y)}if(y&&x.length>1){x.reverse();A=o=f.filterNode(x[0].clone());for(u=0;u<x.length-1;u++){if(h.isValidChild(o.name,x[u].name)){r=f.filterNode(x[u].clone());o.append(r)}else{r=o}for(l=x[u].firstChild;l&&l!=x[u+1];){s=l.next;r.append(l);l=s}o=r}if(!A.isEmpty(k)){y.insert(A,x[0],true);y.insert(q,A)}else{y.insert(q,x[0],true)}y=x[0];if(y.isEmpty(k)||y.firstChild===y.lastChild&&y.firstChild.name==="br"){y.empty().remove()}}else{if(q.parent){if(q.name==="li"){z=q.prev;if(z&&(z.name==="ul"||z.name==="ul")){z.append(q);continue}z=q.next;if(z&&(z.name==="ul"||z.name==="ul")){z.insert(q,z.firstChild,true);continue}q.wrap(f.filterNode(new a("ul",1)));continue}if(h.isValidChild(q.parent.name,"div")&&h.isValidChild("div",q.name)){q.wrap(f.filterNode(new a("div",1)))}else{if(q.name==="style"||q.name==="script"){q.empty().remove()}else{q.unwrap()}}}}}}f.filterNode=function(m){var l,k,n;if(k in e){n=i[k];if(n){n.push(m)}else{i[k]=[m]}}l=d.length;while(l--){k=d[l].name;if(k in m.attributes.map){n=c[k];if(n){n.push(m)}else{c[k]=[m]}}}return m};f.addNodeFilter=function(k,l){b.each(b.explode(k),function(m){var n=e[m];if(!n){e[m]=n=[]}n.push(l)})};f.addAttributeFilter=function(k,l){b.each(b.explode(k),function(m){var n;for(n=0;n<d.length;n++){if(d[n].name===m){d[n].callbacks.push(l);return}}d.push({name:m,callbacks:[l]})})};f.parse=function(v,m){var n,J,B,A,D,C,x,r,F,N,z,o,E,M=[],L,t,k,y,s,p,u,q;m=m||{};i={};c={};o=b.extend(b.makeMap("script,style,head,html,body,title,meta,param"),h.getBlockElements());u=h.getNonEmptyElements();p=h.children;z=g.validate;q="forced_root_block" in m?m.forced_root_block:g.forced_root_block;s=h.getWhiteSpaceElements();E=/^[ \t\r\n]+/;t=/[ \t\r\n]+$/;k=/[ \t\r\n]+/g;y=/^[ \t\r\n]+$/;function G(){var O=J.firstChild,l,P;while(O){l=O.next;if(O.type==3||(O.type==1&&O.name!=="p"&&!o[O.name]&&!O.attr("data-mce-type"))){if(!P){P=K(q,1);J.insert(P,O);P.append(O)}else{P.append(O)}}else{P=null}O=l}}function K(l,O){var P=new a(l,O),Q;if(l in e){Q=i[l];if(Q){Q.push(P)}else{i[l]=[P]}}return P}function I(P){var Q,l,O;for(Q=P.prev;Q&&Q.type===3;){l=Q.value.replace(t,"");if(l.length>0){Q.value=l;Q=Q.prev}else{O=Q.prev;Q.remove();Q=O}}}function H(O){var P,l={};for(P in O){if(P!=="li"&&P!="p"){l[P]=O[P]}}return l}n=new b.html.SaxParser({validate:z,self_closing_elements:H(h.getSelfClosingElements()),cdata:function(l){B.append(K("#cdata",4)).value=l},text:function(P,l){var O;if(!L){P=P.replace(k," ");if(B.lastChild&&o[B.lastChild.name]){P=P.replace(E,"")}}if(P.length!==0){O=K("#text",3);O.raw=!!l;B.append(O).value=P}},comment:function(l){B.append(K("#comment",8)).value=l},pi:function(l,O){B.append(K(l,7)).value=O;I(B)},doctype:function(O){var l;l=B.append(K("#doctype",10));l.value=O;I(B)},start:function(l,W,P){var U,R,Q,O,S,X,V,T;Q=z?h.getElementRule(l):{};if(Q){U=K(Q.outputName||l,1);U.attributes=W;U.shortEnded=P;B.append(U);T=p[B.name];if(T&&p[U.name]&&!T[U.name]){M.push(U)}R=d.length;while(R--){S=d[R].name;if(S in W.map){F=c[S];if(F){F.push(U)}else{c[S]=[U]}}}if(o[l]){I(U)}if(!P){B=U}if(!L&&s[l]){L=true}}},end:function(l){var S,P,R,O,Q;P=z?h.getElementRule(l):{};if(P){if(o[l]){if(!L){S=B.firstChild;if(S&&S.type===3){R=S.value.replace(E,"");if(R.length>0){S.value=R;S=S.next}else{O=S.next;S.remove();S=O}while(S&&S.type===3){R=S.value;O=S.next;if(R.length===0||y.test(R)){S.remove();S=O}S=O}}S=B.lastChild;if(S&&S.type===3){R=S.value.replace(t,"");if(R.length>0){S.value=R;S=S.prev}else{O=S.prev;S.remove();S=O}while(S&&S.type===3){R=S.value;O=S.prev;if(R.length===0||y.test(R)){S.remove();S=O}S=O}}}}if(L&&s[l]){L=false}if(P.removeEmpty||P.paddEmpty){if(B.isEmpty(u)){if(P.paddEmpty){B.empty().append(new a("#text","3")).value="\u00a0"}else{if(!B.attributes.map.name&&!B.attributes.map.id){Q=B.parent;B.empty().remove();B=Q;return}}}}B=B.parent}}},h);J=B=new a(m.context||g.root_name,11);n.parse(v);if(z&&M.length){if(!m.context){j(M)}else{m.invalid=true}}if(q&&J.name=="body"){G()}if(!m.invalid){for(N in i){F=e[N];A=i[N];x=A.length;while(x--){if(!A[x].parent){A.splice(x,1)}}for(D=0,C=F.length;D<C;D++){F[D](A,N,m)}}for(D=0,C=d.length;D<C;D++){F=d[D];if(F.name in c){A=c[F.name];x=A.length;while(x--){if(!A[x].parent){A.splice(x,1)}}for(x=0,r=F.callbacks.length;x<r;x++){F.callbacks[x](A,F.name,m)}}}}return J};if(g.remove_trailing_brs){f.addNodeFilter("br",function(n,m){var r,q=n.length,o,v=b.extend({},h.getBlockElements()),k=h.getNonEmptyElements(),t,s,p,u;v.body=1;for(r=0;r<q;r++){o=n[r];t=o.parent;if(v[o.parent.name]&&o===t.lastChild){p=o.prev;while(p){u=p.name;if(u!=="span"||p.attr("data-mce-type")!=="bookmark"){if(u!=="br"){break}if(u==="br"){o=null;break}}p=p.prev}if(o){o.remove();if(t.isEmpty(k)){elementRule=h.getElementRule(t.name);if(elementRule){if(elementRule.removeEmpty){t.remove()}else{if(elementRule.paddEmpty){t.empty().append(new b.html.Node("#text",3)).value="\u00a0"}}}}}}else{s=o;while(t.firstChild===s&&t.lastChild===s){s=t;if(v[t.name]){break}t=t.parent}if(s===t){textNode=new b.html.Node("#text",3);textNode.value="\u00a0";o.replace(textNode)}}}})}if(!g.allow_html_in_named_anchor){f.addAttributeFilter("id,name",function(k,l){var n=k.length,p,m,o,q;while(n--){q=k[n];if(q.name==="a"&&q.firstChild&&!q.attr("href")){o=q.parent;p=q.lastChild;do{m=p.prev;o.insert(p,q);p=m}while(p)}}})}}})(tinymce);tinymce.html.Writer=function(e){var c=[],a,b,d,f,g;e=e||{};a=e.indent;b=tinymce.makeMap(e.indent_before||"");d=tinymce.makeMap(e.indent_after||"");f=tinymce.html.Entities.getEncodeFunc(e.entity_encoding||"raw",e.entities);g=e.element_format=="html";return{start:function(m,k,p){var n,j,h,o;if(a&&b[m]&&c.length>0){o=c[c.length-1];if(o.length>0&&o!=="\n"){c.push("\n")}}c.push("<",m);if(k){for(n=0,j=k.length;n<j;n++){h=k[n];c.push(" ",h.name,'="',f(h.value,true),'"')}}if(!p||g){c[c.length]=">"}else{c[c.length]=" />"}if(p&&a&&d[m]&&c.length>0){o=c[c.length-1];if(o.length>0&&o!=="\n"){c.push("\n")}}},end:function(h){var i;c.push("</",h,">");if(a&&d[h]&&c.length>0){i=c[c.length-1];if(i.length>0&&i!=="\n"){c.push("\n")}}},text:function(i,h){if(i.length>0){c[c.length]=h?i:f(i)}},cdata:function(h){c.push("<![CDATA[",h,"]]>")},comment:function(h){c.push("<!--",h,"-->")},pi:function(h,i){if(i){c.push("<?",h," ",i,"?>")}else{c.push("<?",h,"?>")}if(a){c.push("\n")}},doctype:function(h){c.push("<!DOCTYPE",h,">",a?"\n":"")},reset:function(){c.length=0},getContent:function(){return c.join("").replace(/\n$/,"")}}};(function(a){a.html.Serializer=function(c,d){var b=this,e=new a.html.Writer(c);c=c||{};c.validate="validate" in c?c.validate:true;b.schema=d=d||new a.html.Schema();b.writer=e;b.serialize=function(h){var g,i;i=c.validate;g={3:function(k,j){e.text(k.value,k.raw)},8:function(j){e.comment(j.value)},7:function(j){e.pi(j.name,j.value)},10:function(j){e.doctype(j.value)},4:function(j){e.cdata(j.value)},11:function(j){if((j=j.firstChild)){do{f(j)}while(j=j.next)}}};e.reset();function f(k){var t=g[k.type],j,o,s,r,p,u,n,m,q;if(!t){j=k.name;o=k.shortEnded;s=k.attributes;if(i&&s&&s.length>1){u=[];u.map={};q=d.getElementRule(k.name);for(n=0,m=q.attributesOrder.length;n<m;n++){r=q.attributesOrder[n];if(r in s.map){p=s.map[r];u.map[r]=p;u.push({name:r,value:p})}}for(n=0,m=s.length;n<m;n++){r=s[n].name;if(!(r in u.map)){p=s.map[r];u.map[r]=p;u.push({name:r,value:p})}}s=u}e.start(k.name,s,o);if(!o){if((k=k.firstChild)){do{f(k)}while(k=k.next)}e.end(j)}}else{t(k)}}if(h.type==1&&!c.inner){f(h)}else{g[11](h)}return e.getContent()}}})(tinymce);tinymce.dom={};(function(b,h){var g=!!document.addEventListener;function c(k,j,l,i){if(k.addEventListener){k.addEventListener(j,l,i||false)}else{if(k.attachEvent){k.attachEvent("on"+j,l)}}}function e(k,j,l,i){if(k.removeEventListener){k.removeEventListener(j,l,i||false)}else{if(k.detachEvent){k.detachEvent("on"+j,l)}}}function a(n,l){var i,k=l||{};function j(){return false}function m(){return true}for(i in n){if(i!=="layerX"&&i!=="layerY"){k[i]=n[i]}}if(!k.target){k.target=k.srcElement||document}k.preventDefault=function(){k.isDefaultPrevented=m;if(n){if(n.preventDefault){n.preventDefault()}else{n.returnValue=false}}};k.stopPropagation=function(){k.isPropagationStopped=m;if(n){if(n.stopPropagation){n.stopPropagation()}else{n.cancelBubble=true}}};k.stopImmediatePropagation=function(){k.isImmediatePropagationStopped=m;k.stopPropagation()};if(!k.isDefaultPrevented){k.isDefaultPrevented=j;k.isPropagationStopped=j;k.isImmediatePropagationStopped=j}return k}function d(m,n,l){var k=m.document,j={type:"ready"};function i(){if(!l.domLoaded){l.domLoaded=true;n(j)}}if(k.readyState=="complete"){i();return}if(g){c(m,"DOMContentLoaded",i)}else{c(k,"readystatechange",function(){if(k.readyState==="complete"){e(k,"readystatechange",arguments.callee);i()}});if(k.documentElement.doScroll&&m===m.top){(function(){try{k.documentElement.doScroll("left")}catch(o){setTimeout(arguments.callee,0);return}i()})()}}c(m,"load",i)}function f(k){var q=this,p={},i,o,n,m,l;m="onmouseenter" in document.documentElement;n="onfocusin" in document.documentElement;l={mouseenter:"mouseover",mouseleave:"mouseout"};i=1;q.domLoaded=false;q.events=p;function j(t,x){var s,u,r,v;s=p[x][t.type];if(s){for(u=0,r=s.length;u<r;u++){v=s[u];if(v&&v.func.call(v.scope,t)===false){t.preventDefault()}if(t.isImmediatePropagationStopped()){return}}}}q.bind=function(x,A,D,E){var s,t,u,r,B,z,C,v=window;function y(F){j(a(F||v.event),s)}if(!x||x.nodeType===3||x.nodeType===8){return}if(!x[h]){s=i++;x[h]=s;p[s]={}}else{s=x[h];if(!p[s]){p[s]={}}}E=E||x;A=A.split(" ");u=A.length;while(u--){r=A[u];z=y;B=C=false;if(r==="DOMContentLoaded"){r="ready"}if((q.domLoaded||x.readyState=="complete")&&r==="ready"){q.domLoaded=true;D.call(E,a({type:r}));continue}if(!m){B=l[r];if(B){z=function(F){var H,G;H=F.currentTarget;G=F.relatedTarget;if(G&&H.contains){G=H.contains(G)}else{while(G&&G!==H){G=G.parentNode}}if(!G){F=a(F||v.event);F.type=F.type==="mouseout"?"mouseleave":"mouseenter";F.target=H;j(F,s)}}}}if(!n&&(r==="focusin"||r==="focusout")){C=true;B=r==="focusin"?"focus":"blur";z=function(F){F=a(F||v.event);F.type=F.type==="focus"?"focusin":"focusout";j(F,s)}}t=p[s][r];if(!t){p[s][r]=t=[{func:D,scope:E}];t.fakeName=B;t.capture=C;t.nativeHandler=z;if(!g){t.proxyHandler=k(s)}if(r==="ready"){d(x,z,q)}else{c(x,B||r,g?z:t.proxyHandler,C)}}else{t.push({func:D,scope:E})}}x=t=0;return D};q.unbind=function(x,z,A){var s,u,v,B,r,t;if(!x||x.nodeType===3||x.nodeType===8){return q}s=x[h];if(s){t=p[s];if(z){z=z.split(" ");v=z.length;while(v--){r=z[v];u=t[r];if(u){if(A){B=u.length;while(B--){if(u[B].func===A){u.splice(B,1)}}}if(!A||u.length===0){delete t[r];e(x,u.fakeName||r,g?u.nativeHandler:u.proxyHandler,u.capture)}}}}else{for(r in t){u=t[r];e(x,u.fakeName||r,g?u.nativeHandler:u.proxyHandler,u.capture)}t={}}for(r in t){return q}delete p[s];try{delete x[h]}catch(y){x[h]=null}}return q};q.fire=function(u,s,r){var v,t;if(!u||u.nodeType===3||u.nodeType===8){return q}t=a(null,r);t.type=s;do{v=u[h];if(v){j(t,v)}u=u.parentNode||u.ownerDocument||u.defaultView||u.parentWindow}while(u&&!t.isPropagationStopped());return q};q.clean=function(u){var s,r,t=q.unbind;if(!u||u.nodeType===3||u.nodeType===8){return q}if(u[h]){t(u)}if(!u.getElementsByTagName){u=u.document}if(u&&u.getElementsByTagName){t(u);r=u.getElementsByTagName("*");s=r.length;while(s--){u=r[s];if(u[h]){t(u)}}}return q};q.callNativeHandler=function(s,r){if(p){p[s][r.type].nativeHandler(r)}};q.destory=function(){p={}};q.add=function(v,s,u,t){if(typeof(v)==="string"){v=document.getElementById(v)}if(v&&v instanceof Array){var r=v.length;while(r--){q.add(v[r],s,u,t)}return}if(s==="init"){s="ready"}return q.bind(v,s instanceof Array?s.join(" "):s,u,t)};q.remove=function(v,s,u,t){if(!v){return q}if(typeof(v)==="string"){v=document.getElementById(v)}if(v instanceof Array){var r=v.length;while(r--){q.remove(v[r],s,u,t)}return q}return q.unbind(v,s instanceof Array?s.join(" "):s,u)};q.clear=function(r){if(typeof(r)==="string"){r=document.getElementById(r)}return q.clean(r)};q.cancel=function(r){if(r){q.prevent(r);q.stop(r)}return false};q.prevent=function(r){if(!r.preventDefault){r=a(r)}r.preventDefault();return false};q.stop=function(r){if(!r.stopPropagation){r=a(r)}r.stopPropagation();return false}}b.EventUtils=f;b.Event=new f(function(i){return function(j){tinymce.dom.Event.callNativeHandler(i,j)}});b.Event.bind(window,"ready",function(){});b=0})(tinymce.dom,"data-mce-expando");tinymce.dom.TreeWalker=function(a,c){var b=a;function d(i,f,e,j){var h,g;if(i){if(!j&&i[f]){return i[f]}if(i!=c){h=i[e];if(h){return h}for(g=i.parentNode;g&&g!=c;g=g.parentNode){h=g[e];if(h){return h}}}}}this.current=function(){return b};this.next=function(e){return(b=d(b,"firstChild","nextSibling",e))};this.prev=function(e){return(b=d(b,"lastChild","previousSibling",e))}};(function(e){var g=e.each,d=e.is,f=e.isWebKit,b=e.isIE,h=e.html.Entities,c=/^([a-z0-9],?)+$/i,a=/^[ \t\r\n]*$/;e.create("tinymce.dom.DOMUtils",{doc:null,root:null,files:null,pixelStyles:/^(top|left|bottom|right|width|height|borderWidth)$/,props:{"for":"htmlFor","class":"className",className:"className",checked:"checked",disabled:"disabled",maxlength:"maxLength",readonly:"readOnly",selected:"selected",value:"value",id:"id",name:"name",type:"type"},DOMUtils:function(o,l){var k=this,i,j,n;k.doc=o;k.win=window;k.files={};k.cssFlicker=false;k.counter=0;k.stdMode=!e.isIE||o.documentMode>=8;k.boxModel=!e.isIE||o.compatMode=="CSS1Compat"||k.stdMode;k.hasOuterHTML="outerHTML" in o.createElement("a");k.settings=l=e.extend({keep_values:false,hex_colors:1},l);k.schema=l.schema;k.styles=new e.html.Styles({url_converter:l.url_converter,url_converter_scope:l.url_converter_scope},l.schema);if(e.isIE6){try{o.execCommand("BackgroundImageCache",false,true)}catch(m){k.cssFlicker=true}}k.fixDoc(o);k.events=l.ownEvents?new e.dom.EventUtils(l.proxy):e.dom.Event;e.addUnload(k.destroy,k);n=l.schema?l.schema.getBlockElements():{};k.isBlock=function(q){if(!q){return false}var p=q.nodeType;if(p){return !!(p===1&&n[q.nodeName])}return !!n[q]}},fixDoc:function(k){var j=this.settings,i;if(b&&!e.isIE11&&j.schema){("abbr article aside audio canvas details figcaption figure footer header hgroup mark menu meter nav output progress section summary time video").replace(/\w+/g,function(l){k.createElement(l)});for(i in j.schema.getCustomElements()){k.createElement(i)}}},clone:function(k,i){var j=this,m,l;if(!b||e.isIE11||k.nodeType!==1||i){return k.cloneNode(i)}l=j.doc;if(!i){m=l.createElement(k.nodeName);g(j.getAttribs(k),function(n){j.setAttrib(m,n.nodeName,j.getAttrib(k,n.nodeName))});return m}return m.firstChild},getRoot:function(){var i=this,j=i.settings;return(j&&i.get(j.root_element))||i.doc.body},getViewPort:function(j){var k,i;j=!j?this.win:j;k=j.document;i=this.boxModel?k.documentElement:k.body;return{x:j.pageXOffset||i.scrollLeft,y:j.pageYOffset||i.scrollTop,w:j.innerWidth||i.clientWidth,h:j.innerHeight||i.clientHeight}},getRect:function(l){var k,i=this,j;l=i.get(l);k=i.getPos(l);j=i.getSize(l);return{x:k.x,y:k.y,w:j.w,h:j.h}},getSize:function(l){var j=this,i,k;l=j.get(l);i=j.getStyle(l,"width");k=j.getStyle(l,"height");if(i.indexOf("px")===-1){i=0}if(k.indexOf("px")===-1){k=0}return{w:parseInt(i,10)||l.offsetWidth||l.clientWidth,h:parseInt(k,10)||l.offsetHeight||l.clientHeight}},getParent:function(k,j,i){return this.getParents(k,j,i,false)},getParents:function(s,m,k,q){var j=this,i,l=j.settings,p=[];s=j.get(s);q=q===undefined;if(l.strict_root){k=k||j.getRoot()}if(d(m,"string")){i=m;if(m==="*"){m=function(o){return o.nodeType==1}}else{m=function(o){return j.is(o,i)}}}while(s){if(s==k||!s.nodeType||s.nodeType===9){break}if(!m||m(s)){if(q){p.push(s)}else{return s}}s=s.parentNode}return q?p:null},get:function(i){var j;if(i&&this.doc&&typeof(i)=="string"){j=i;i=this.doc.getElementById(i);if(i&&i.id!==j){return this.doc.getElementsByName(j)[1]}}return i},getNext:function(j,i){return this._findSib(j,i,"nextSibling")},getPrev:function(j,i){return this._findSib(j,i,"previousSibling")},add:function(l,o,i,k,m){var j=this;return this.run(l,function(r){var q,n;q=d(o,"string")?j.doc.createElement(o):o;j.setAttribs(q,i);if(k){if(k.nodeType){q.appendChild(k)}else{j.setHTML(q,k)}}return !m?r.appendChild(q):q})},create:function(k,i,j){return this.add(this.doc.createElement(k),k,i,j,1)},createHTML:function(q,i,m){var p="",l=this,j;p+="<"+q;for(j in i){if(i.hasOwnProperty(j)){p+=" "+j+'="'+l.encode(i[j])+'"'}}if(typeof(m)!="undefined"){return p+">"+m+"</"+q+">"}return p+" />"},remove:function(i,j){return this.run(i,function(l){var m,k=l.parentNode;if(!k){return null}if(j){while(m=l.firstChild){if(!e.isIE||m.nodeType!==3||m.nodeValue){k.insertBefore(m,l)}else{l.removeChild(m)}}}return k.removeChild(l)})},setStyle:function(l,i,j){var k=this;return k.run(l,function(o){var n,m;n=o.style;i=i.replace(/-(\D)/g,function(q,p){return p.toUpperCase()});if(k.pixelStyles.test(i)&&(e.is(j,"number")||/^[\-0-9\.]+$/.test(j))){j+="px"}switch(i){case"opacity":if(b&&!e.isIE11){n.filter=j===""?"":"alpha(opacity="+(j*100)+")";if(!l.currentStyle||!l.currentStyle.hasLayout){n.display="inline-block"}}n[i]=n["-moz-opacity"]=n["-khtml-opacity"]=j||"";break;case"float":(b&&!e.isIE11)?n.styleFloat=j:n.cssFloat=j;break;default:n[i]=j||""}if(k.settings.update_styles){k.setAttrib(o,"data-mce-style")}})},getStyle:function(l,i,k){l=this.get(l);if(!l){return}if(this.doc.defaultView&&k){i=i.replace(/[A-Z]/g,function(m){return"-"+m});try{return this.doc.defaultView.getComputedStyle(l,null).getPropertyValue(i)}catch(j){return null}}i=i.replace(/-(\D)/g,function(n,m){return m.toUpperCase()});if(i=="float"){i=b?"styleFloat":"cssFloat"}if(l.currentStyle&&k){return l.currentStyle[i]}return l.style?l.style[i]:undefined},setStyles:function(l,m){var j=this,k=j.settings,i;i=k.update_styles;k.update_styles=0;g(m,function(o,p){j.setStyle(l,p,o)});k.update_styles=i;if(k.update_styles){j.setAttrib(l,k.cssText)}},removeAllAttribs:function(i){return this.run(i,function(l){var k,j=l.attributes;for(k=j.length-1;k>=0;k--){l.removeAttributeNode(j.item(k))}})},setAttrib:function(k,l,i){var j=this;if(!k||!l){return}if(j.settings.strict){l=l.toLowerCase()}return this.run(k,function(p){var o=j.settings;var m=p.getAttribute(l);if(i!==null){switch(l){case"style":if(!d(i,"string")){g(i,function(q,r){j.setStyle(p,r,q)});return}if(o.keep_values){if(i&&!j._isRes(i)){p.setAttribute("data-mce-style",i,2)}else{p.removeAttribute("data-mce-style",2)}}p.style.cssText=i;break;case"class":p.className=i||"";break;case"src":case"href":if(o.keep_values){if(o.url_converter){i=o.url_converter.call(o.url_converter_scope||j,i,l,p)}j.setAttrib(p,"data-mce-"+l,i,2)}break;case"shape":p.setAttribute("data-mce-style",i);break}}if(d(i)&&i!==null&&i.length!==0){p.setAttribute(l,""+i,2)}else{p.removeAttribute(l,2)}if(tinyMCE.activeEditor&&m!=i){var n=tinyMCE.activeEditor;n.onSetAttrib.dispatch(n,p,l,i)}})},setAttribs:function(j,k){var i=this;return this.run(j,function(l){g(k,function(m,o){i.setAttrib(l,o,m)})})},getAttrib:function(m,o,k){var i,j=this,l;m=j.get(m);if(!m||m.nodeType!==1){return k===l?false:k}if(!d(k)){k=""}if(/^(src|href|style|coords|shape)$/.test(o)){i=m.getAttribute("data-mce-"+o);if(i){return i}}if(b&&j.props[o]){i=m[j.props[o]];i=i&&i.nodeValue?i.nodeValue:i}if(!i){i=m.getAttribute(o,2)}if(/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(o)){if(m[j.props[o]]===true&&i===""){return o}return i?o:""}if(m.nodeName==="FORM"&&m.getAttributeNode(o)){return m.getAttributeNode(o).nodeValue}if(o==="style"){i=i||m.style.cssText;if(i){i=j.serializeStyle(j.parseStyle(i),m.nodeName);if(j.settings.keep_values&&!j._isRes(i)){m.setAttribute("data-mce-style",i)}}}if(f&&o==="class"&&i){i=i.replace(/(apple|webkit)\-[a-z\-]+/gi,"")}if(b){switch(o){case"rowspan":case"colspan":if(i===1){i=""}break;case"size":if(i==="+0"||i===20||i===0){i=""}break;case"width":case"height":case"vspace":case"checked":case"disabled":case"readonly":if(i===0){i=""}break;case"hspace":if(i===-1){i=""}break;case"maxlength":case"tabindex":if(i===32768||i===2147483647||i==="32768"){i=""}break;case"multiple":case"compact":case"noshade":case"nowrap":if(i===65535){return o}return k;case"shape":i=i.toLowerCase();break;default:if(o.indexOf("on")===0&&i){i=e._replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/,"$1",""+i)}}}return(i!==l&&i!==null&&i!=="")?""+i:k},getPos:function(q,l){var j=this,i=0,p=0,m,o=j.doc,k;q=j.get(q);l=l||o.body;if(q){if(q.getBoundingClientRect){q=q.getBoundingClientRect();m=j.boxModel?o.documentElement:o.body;i=q.left+(o.documentElement.scrollLeft||o.body.scrollLeft)-m.clientTop;p=q.top+(o.documentElement.scrollTop||o.body.scrollTop)-m.clientLeft;return{x:i,y:p}}k=q;while(k&&k!=l&&k.nodeType){i+=k.offsetLeft||0;p+=k.offsetTop||0;k=k.offsetParent}k=q.parentNode;while(k&&k!=l&&k.nodeType){i-=k.scrollLeft||0;p-=k.scrollTop||0;k=k.parentNode}}return{x:i,y:p}},parseStyle:function(i){return this.styles.parse(i)},serializeStyle:function(j,i){return this.styles.serialize(j,i)},addStyle:function(j){var k=this.doc,i;styleElm=k.getElementById("mceDefaultStyles");if(!styleElm){styleElm=k.createElement("style"),styleElm.id="mceDefaultStyles";styleElm.type="text/css";i=k.getElementsByTagName("head")[0];if(i.firstChild){i.insertBefore(styleElm,i.firstChild)}else{i.appendChild(styleElm)}}if(styleElm.styleSheet){styleElm.styleSheet.cssText+=j}else{styleElm.appendChild(k.createTextNode(j))}},loadCSS:function(i){var k=this,l=k.doc,j;if(!i){i=""}j=l.getElementsByTagName("head")[0];g(i.split(","),function(m){var n;if(k.files[m]){return}k.files[m]=true;n=k.create("link",{rel:"stylesheet",href:e._addVer(m)});if(b&&!e.isIE11&&l.documentMode&&l.recalc){n.onload=function(){if(l.recalc){l.recalc()}n.onload=null}}j.appendChild(n)})},addClass:function(i,j){return this.run(i,function(k){var l;if(!j){return 0}if(this.hasClass(k,j)){return k.className}l=this.removeClass(k,j);return k.className=(l!=""?(l+" "):"")+j})},removeClass:function(k,l){var i=this,j;return i.run(k,function(n){var m;if(i.hasClass(n,l)){if(!j){j=new RegExp("(^|\\s+)"+l+"(\\s+|$)","g")}m=n.className.replace(j," ");m=e.trim(m!=" "?m:"");n.className=m;if(!m){n.removeAttribute("class");n.removeAttribute("className")}return m}return n.className})},hasClass:function(j,i){j=this.get(j);if(!j||!i){return false}return(" "+j.className+" ").indexOf(" "+i+" ")!==-1},show:function(i){return this.setStyle(i,"display","block")},hide:function(i){return this.setStyle(i,"display","none")},isHidden:function(i){i=this.get(i);return !i||i.style.display=="none"||this.getStyle(i,"display")=="none"},uniqueId:function(i){return(!i?"mce_":i)+(this.counter++)},setHTML:function(k,j){var i=this;return i.run(k,function(m){if(b){while(m.firstChild){m.removeChild(m.firstChild)}try{m.innerHTML="<br />"+j;m.removeChild(m.firstChild)}catch(l){var n=i.create("div");n.innerHTML="<br />"+j;g(e.grep(n.childNodes),function(p,o){if(o&&m.canHaveHTML){m.appendChild(p)}})}}else{m.innerHTML=j}return j})},getOuterHTML:function(k){var j,i=this;k=i.get(k);if(!k){return null}if(k.nodeType===1&&i.hasOuterHTML){return k.outerHTML}j=(k.ownerDocument||i.doc).createElement("body");j.appendChild(k.cloneNode(true));return j.innerHTML},setOuterHTML:function(l,j,m){var i=this;function k(p,o,r){var s,q;q=r.createElement("body");q.innerHTML=o;s=q.lastChild;while(s){i.insertAfter(s.cloneNode(true),p);s=s.previousSibling}i.remove(p)}return this.run(l,function(o){o=i.get(o);if(o.nodeType==1){m=m||o.ownerDocument||i.doc;if(b){try{if(b&&o.nodeType==1){o.outerHTML=j}else{k(o,j,m)}}catch(n){k(o,j,m)}}else{k(o,j,m)}}})},decode:h.decode,encode:h.encodeAllRaw,insertAfter:function(i,j){j=this.get(j);return this.run(i,function(l){var k,m;k=j.parentNode;m=j.nextSibling;if(m){k.insertBefore(l,m)}else{k.appendChild(l)}return l})},replace:function(m,l,i){var j=this;if(d(l,"array")){m=m.cloneNode(true)}return j.run(l,function(k){if(i){g(e.grep(k.childNodes),function(n){m.appendChild(n)})}return k.parentNode.replaceChild(m,k)})},rename:function(l,i){var k=this,j;if(l.nodeName!=i.toUpperCase()){j=k.create(i);g(k.getAttribs(l),function(m){k.setAttrib(j,m.nodeName,k.getAttrib(l,m.nodeName))});k.replace(j,l,1)}return j||l},findCommonAncestor:function(k,i){var l=k,j;while(l){j=i;while(j&&l!=j){j=j.parentNode}if(l==j){break}l=l.parentNode}if(!l&&k.ownerDocument){return k.ownerDocument.documentElement}return l},toHex:function(i){var k=/^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(i);function j(l){l=parseInt(l,10).toString(16);return l.length>1?l:"0"+l}if(k){i="#"+j(k[1])+j(k[2])+j(k[3]);return i}return i},getClasses:function(){var n=this,j=[],m,o={},p=n.settings.class_filter,l;if(n.classes){return n.classes}function q(i){g(i.imports,function(s){q(s)});g(i.cssRules||i.rules,function(t){switch(t.type||1){case 1:if(t.selectorText){g(t.selectorText.split(","),function(r){r=r.replace(/^\s*|\s*$|^\s\./g,"");if(/\.mce/.test(r)||!/\.[\w\-]+$/.test(r)){return}l=r;r=e._replace(/.*\.([a-z0-9_\-]+).*/i,"$1",r);if(p&&!(r=p(r,l))){return}if(!o[r]){j.push({"class":r});o[r]=1}})}break;case 3:try{q(t.styleSheet)}catch(s){}break}})}try{g(n.doc.styleSheets,q)}catch(k){}if(j.length>0){n.classes=j}return j},run:function(l,k,j){var i=this,m;if(i.doc&&typeof(l)==="string"){l=i.get(l)}if(!l){return false}j=j||this;if(!l.nodeType&&(l.length||l.length===0)){m=[];g(l,function(o,n){if(o){if(typeof(o)=="string"){o=i.doc.getElementById(o)}m.push(k.call(j,o,n))}});return m}return k.call(j,l)},getAttribs:function(j){var i;j=this.get(j);if(!j){return[]}if(b){i=[];if(j.nodeName=="OBJECT"){return j.attributes}if(j.nodeName==="OPTION"&&this.getAttrib(j,"selected")){i.push({specified:1,nodeName:"selected"})}j.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi,"").replace(/[\w:\-]+/gi,function(k){i.push({specified:1,nodeName:k})});return i}return j.attributes},isEmpty:function(m,k){var r=this,o,n,q,j,l,p=0;m=m.firstChild;if(m){j=new e.dom.TreeWalker(m,m.parentNode);k=k||r.schema?r.schema.getNonEmptyElements():null;do{q=m.nodeType;if(q===1){if(m.getAttribute("data-mce-bogus")){continue}l=m.nodeName.toLowerCase();if(k&&k[l]){if(l==="br"){p++;continue}return false}n=r.getAttribs(m);o=m.attributes.length;while(o--){l=m.attributes[o].nodeName;if(l==="name"||l==="data-mce-bookmark"){return false}}}if(q==8){return false}if((q===3&&!a.test(m.nodeValue))){return false}}while(m=j.next())}return p<=1},destroy:function(j){var i=this;i.win=i.doc=i.root=i.events=i.frag=null;if(!j){e.removeUnload(i.destroy)}},createRng:function(){var i=this.doc;return i.createRange?i.createRange():new e.dom.Range(this)},nodeIndex:function(m,n){var i=0,k,l,j;if(m){for(k=m.nodeType,m=m.previousSibling,l=m;m;m=m.previousSibling){j=m.nodeType;if(n&&j==3){if(j==k||!m.nodeValue.length){continue}}i++;k=j}}return i},split:function(m,l,p){var q=this,i=q.createRng(),n,k,o;function j(v){var t,s=v.childNodes,u=v.nodeType;function x(A){var z=A.previousSibling&&A.previousSibling.nodeName=="SPAN";var y=A.nextSibling&&A.nextSibling.nodeName=="SPAN";return z&&y}if(u==1&&v.getAttribute("data-mce-type")=="bookmark"){return}for(t=s.length-1;t>=0;t--){j(s[t])}if(u!=9){if(u==3&&v.nodeValue.length>0){var r=e.trim(v.nodeValue).length;if(!q.isBlock(v.parentNode)||r>0||r===0&&x(v)){return}}else{if(u==1){s=v.childNodes;if(s.length==1&&s[0]&&s[0].nodeType==1&&s[0].getAttribute("data-mce-type")=="bookmark"){v.parentNode.insertBefore(s[0],v)}if(s.length||/^(br|hr|input|img)$/i.test(v.nodeName)){return}}}q.remove(v)}return v}if(m&&l){i.setStart(m.parentNode,q.nodeIndex(m));i.setEnd(l.parentNode,q.nodeIndex(l));n=i.extractContents();i=q.createRng();i.setStart(l.parentNode,q.nodeIndex(l)+1);i.setEnd(m.parentNode,q.nodeIndex(m)+1);k=i.extractContents();o=m.parentNode;o.insertBefore(j(n),m);if(p){o.replaceChild(p,l)}else{o.insertBefore(l,m)}o.insertBefore(j(k),m);q.remove(m);return p||l}},bind:function(l,i,k,j){return this.events.add(l,i,k,j||this)},unbind:function(k,i,j){return this.events.remove(k,i,j)},fire:function(k,j,i){return this.events.fire(k,j,i)},getContentEditable:function(j){var i;if(j.nodeType!=1){return null}i=j.getAttribute("data-mce-contenteditable");if(i&&i!=="inherit"){return i}return j.contentEditable!=="inherit"?j.contentEditable:null},_findSib:function(l,i,j){var k=this,m=i;if(l){if(d(m,"string")){m=function(n){return k.is(n,i)}}for(l=l[j];l;l=l[j]){if(m(l)){return l}}}return null},_isRes:function(i){return/^(top|left|bottom|right|width|height)/i.test(i)||/;\s*(top|left|bottom|right|width|height)/i.test(i)}});e.DOM=new e.dom.DOMUtils(document,{process_html:0})})(tinymce);(function(a){function b(c){var O=this,e=c.doc,U=0,F=1,j=2,E=true,S=false,W="startOffset",h="startContainer",Q="endContainer",A="endOffset",k=tinymce.extend,n=c.nodeIndex;k(O,{startContainer:e,startOffset:0,endContainer:e,endOffset:0,collapsed:E,commonAncestorContainer:e,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3,setStart:q,setEnd:s,setStartBefore:g,setStartAfter:J,setEndBefore:K,setEndAfter:u,collapse:B,selectNode:y,selectNodeContents:G,compareBoundaryPoints:v,deleteContents:p,extractContents:I,cloneContents:d,insertNode:D,surroundContents:N,cloneRange:L,toStringIE:T});function x(){return e.createDocumentFragment()}function q(X,t){C(E,X,t)}function s(X,t){C(S,X,t)}function g(t){q(t.parentNode,n(t))}function J(t){q(t.parentNode,n(t)+1)}function K(t){s(t.parentNode,n(t))}function u(t){s(t.parentNode,n(t)+1)}function B(t){if(t){O[Q]=O[h];O[A]=O[W]}else{O[h]=O[Q];O[W]=O[A]}O.collapsed=E}function y(t){g(t);u(t)}function G(t){q(t,0);s(t,t.nodeType===1?t.childNodes.length:t.nodeValue.length)}function v(aa,t){var ad=O[h],Y=O[W],ac=O[Q],X=O[A],ab=t.startContainer,af=t.startOffset,Z=t.endContainer,ae=t.endOffset;if(aa===0){return H(ad,Y,ab,af)}if(aa===1){return H(ac,X,ab,af)}if(aa===2){return H(ac,X,Z,ae)}if(aa===3){return H(ad,Y,Z,ae)}}function p(){l(j)}function I(){return l(U)}function d(){return l(F)}function D(aa){var X=this[h],t=this[W],Z,Y;if((X.nodeType===3||X.nodeType===4)&&X.nodeValue){if(!t){X.parentNode.insertBefore(aa,X)}else{if(t>=X.nodeValue.length){c.insertAfter(aa,X)}else{Z=X.splitText(t);X.parentNode.insertBefore(aa,Z)}}}else{if(X.childNodes.length>0){Y=X.childNodes[t]}if(Y){X.insertBefore(aa,Y)}else{X.appendChild(aa)}}}function N(X){var t=O.extractContents();O.insertNode(X);X.appendChild(t);O.selectNode(X)}function L(){return k(new b(c),{startContainer:O[h],startOffset:O[W],endContainer:O[Q],endOffset:O[A],collapsed:O.collapsed,commonAncestorContainer:O.commonAncestorContainer})}function P(t,X){var Y;if(t.nodeType==3){return t}if(X<0){return t}Y=t.firstChild;while(Y&&X>0){--X;Y=Y.nextSibling}if(Y){return Y}return t}function m(){return(O[h]==O[Q]&&O[W]==O[A])}function H(Z,ab,X,aa){var ac,Y,t,ad,af,ae;if(Z==X){if(ab==aa){return 0}if(ab<aa){return -1}return 1}ac=X;while(ac&&ac.parentNode!=Z){ac=ac.parentNode}if(ac){Y=0;t=Z.firstChild;while(t!=ac&&Y<ab){Y++;t=t.nextSibling}if(ab<=Y){return -1}return 1}ac=Z;while(ac&&ac.parentNode!=X){ac=ac.parentNode}if(ac){Y=0;t=X.firstChild;while(t!=ac&&Y<aa){Y++;t=t.nextSibling}if(Y<aa){return -1}return 1}ad=c.findCommonAncestor(Z,X);af=Z;while(af&&af.parentNode!=ad){af=af.parentNode}if(!af){af=ad}ae=X;while(ae&&ae.parentNode!=ad){ae=ae.parentNode}if(!ae){ae=ad}if(af==ae){return 0}t=ad.firstChild;while(t){if(t==af){return -1}if(t==ae){return 1}t=t.nextSibling}}function C(X,aa,Z){var t,Y;if(X){O[h]=aa;O[W]=Z}else{O[Q]=aa;O[A]=Z}t=O[Q];while(t.parentNode){t=t.parentNode}Y=O[h];while(Y.parentNode){Y=Y.parentNode}if(Y==t){if(H(O[h],O[W],O[Q],O[A])>0){O.collapse(X)}}else{O.collapse(X)}O.collapsed=m();O.commonAncestorContainer=c.findCommonAncestor(O[h],O[Q])}function l(ad){var ac,Z=0,af=0,X,ab,Y,aa,t,ae;if(O[h]==O[Q]){return f(ad)}for(ac=O[Q],X=ac.parentNode;X;ac=X,X=X.parentNode){if(X==O[h]){return r(ac,ad)}++Z}for(ac=O[h],X=ac.parentNode;X;ac=X,X=X.parentNode){if(X==O[Q]){return V(ac,ad)}++af}ab=af-Z;Y=O[h];while(ab>0){Y=Y.parentNode;ab--}aa=O[Q];while(ab<0){aa=aa.parentNode;ab++}for(t=Y.parentNode,ae=aa.parentNode;t!=ae;t=t.parentNode,ae=ae.parentNode){Y=t;aa=ae}return o(Y,aa,ad)}function f(ac){var ae,af,t,Y,Z,ad,aa,X,ab;if(ac!=j){ae=x()}if(O[W]==O[A]){return ae}if(O[h].nodeType==3){af=O[h].nodeValue;t=af.substring(O[W],O[A]);if(ac!=F){Y=O[h];X=O[W];ab=O[A]-O[W];if(X===0&&ab>=Y.nodeValue.length-1){Y.parentNode.removeChild(Y)}else{Y.deleteData(X,ab)}O.collapse(E)}if(ac==j){return}if(t.length>0){ae.appendChild(e.createTextNode(t))}return ae}Y=P(O[h],O[W]);Z=O[A]-O[W];while(Y&&Z>0){ad=Y.nextSibling;aa=z(Y,ac);if(ae){ae.appendChild(aa)}--Z;Y=ad}if(ac!=F){O.collapse(E)}return ae}function r(ad,aa){var ac,ab,X,t,Z,Y;if(aa!=j){ac=x()}ab=i(ad,aa);if(ac){ac.appendChild(ab)}X=n(ad);t=X-O[W];if(t<=0){if(aa!=F){O.setEndBefore(ad);O.collapse(S)}return ac}ab=ad.previousSibling;while(t>0){Z=ab.previousSibling;Y=z(ab,aa);if(ac){ac.insertBefore(Y,ac.firstChild)}--t;ab=Z}if(aa!=F){O.setEndBefore(ad);O.collapse(S)}return ac}function V(ab,aa){var ad,X,ac,t,Z,Y;if(aa!=j){ad=x()}ac=R(ab,aa);if(ad){ad.appendChild(ac)}X=n(ab);++X;t=O[A]-X;ac=ab.nextSibling;while(ac&&t>0){Z=ac.nextSibling;Y=z(ac,aa);if(ad){ad.appendChild(Y)}--t;ac=Z}if(aa!=F){O.setStartAfter(ab);O.collapse(E)}return ad}function o(ab,t,ae){var Y,ag,aa,ac,ad,X,af,Z;if(ae!=j){ag=x()}Y=R(ab,ae);if(ag){ag.appendChild(Y)}aa=ab.parentNode;ac=n(ab);ad=n(t);++ac;X=ad-ac;af=ab.nextSibling;while(X>0){Z=af.nextSibling;Y=z(af,ae);if(ag){ag.appendChild(Y)}af=Z;--X}Y=i(t,ae);if(ag){ag.appendChild(Y)}if(ae!=F){O.setStartAfter(ab);O.collapse(E)}return ag}function i(ac,ad){var Y=P(O[Q],O[A]-1),ae,ab,aa,t,X,Z=Y!=O[Q];if(Y==ac){return M(Y,Z,S,ad)}ae=Y.parentNode;ab=M(ae,S,S,ad);while(ae){while(Y){aa=Y.previousSibling;t=M(Y,Z,S,ad);if(ad!=j){ab.insertBefore(t,ab.firstChild)}Z=E;Y=aa}if(ae==ac){return ab}Y=ae.previousSibling;ae=ae.parentNode;X=M(ae,S,S,ad);if(ad!=j){X.appendChild(ab)}ab=X}}function R(ac,ad){var Z=P(O[h],O[W]),aa=Z!=O[h],ae,ab,Y,t,X;if(Z==ac){return M(Z,aa,E,ad)}ae=Z.parentNode;ab=M(ae,S,E,ad);while(ae){while(Z){Y=Z.nextSibling;t=M(Z,aa,E,ad);if(ad!=j){ab.appendChild(t)}aa=E;Z=Y}if(ae==ac){return ab}Z=ae.nextSibling;ae=ae.parentNode;X=M(ae,S,E,ad);if(ad!=j){X.appendChild(ab)}ab=X}}function M(t,aa,ad,ae){var Z,Y,ab,X,ac;if(aa){return z(t,ae)}if(t.nodeType==3){Z=t.nodeValue;if(ad){X=O[W];Y=Z.substring(X);ab=Z.substring(0,X)}else{X=O[A];Y=Z.substring(0,X);ab=Z.substring(X)}if(ae!=F){t.nodeValue=ab}if(ae==j){return}ac=c.clone(t,S);ac.nodeValue=Y;return ac}if(ae==j){return}return c.clone(t,S)}function z(X,t){if(t!=j){return t==F?c.clone(X,E):X}X.parentNode.removeChild(X)}function T(){return c.create("body",null,d()).outerText}return O}a.Range=b;b.prototype.toString=function(){return this.toStringIE()}})(tinymce.dom);(function(){function a(d){var b=this,h=d.dom,c=true,f=false;function e(i,j){var k,t=0,q,n,m,l,o,r,p=-1,s;k=i.duplicate();k.collapse(j);s=k.parentElement();if(s.ownerDocument!==d.dom.doc){return}while(s.contentEditable==="false"){s=s.parentNode}if(!s.hasChildNodes()){return{node:s,inside:1}}m=s.children;q=m.length-1;while(t<=q){r=Math.floor((t+q)/2);l=m[r];k.moveToElementText(l);p=k.compareEndPoints(j?"StartToStart":"EndToEnd",i);if(p>0){q=r-1}else{if(p<0){t=r+1}else{return{node:l}}}}if(p<0){if(!l){k.moveToElementText(s);k.collapse(true);l=s;n=true}else{k.collapse(false)}o=0;while(k.compareEndPoints(j?"StartToStart":"StartToEnd",i)!==0){if(k.move("character",1)===0||s!=k.parentElement()){break}o++}}else{k.collapse(true);o=0;while(k.compareEndPoints(j?"StartToStart":"StartToEnd",i)!==0){if(k.move("character",-1)===0||s!=k.parentElement()){break}o++}}return{node:l,position:p,offset:o,inside:n}}function g(){var i=d.getRng(),r=h.createRng(),l,k,p,q,m,j;l=i.item?i.item(0):i.parentElement();if(l.ownerDocument!=h.doc){return r}k=d.isCollapsed();if(i.item){r.setStart(l.parentNode,h.nodeIndex(l));r.setEnd(r.startContainer,r.startOffset+1);return r}function o(A){var u=e(i,A),s,y,z=0,x,v,t;s=u.node;y=u.offset;if(u.inside&&!s.hasChildNodes()){r[A?"setStart":"setEnd"](s,0);return}if(y===v){r[A?"setStartBefore":"setEndAfter"](s);return}if(u.position<0){x=u.inside?s.firstChild:s.nextSibling;if(!x){r[A?"setStartAfter":"setEndAfter"](s);return}if(!y){if(x.nodeType==3){r[A?"setStart":"setEnd"](x,0)}else{r[A?"setStartBefore":"setEndBefore"](x)}return}while(x){t=x.nodeValue;z+=t.length;if(z>=y){s=x;z-=y;z=t.length-z;break}x=x.nextSibling}}else{x=s.previousSibling;if(!x){return r[A?"setStartBefore":"setEndBefore"](s)}if(!y){if(s.nodeType==3){r[A?"setStart":"setEnd"](x,s.nodeValue.length)}else{r[A?"setStartAfter":"setEndAfter"](x)}return}while(x){z+=x.nodeValue.length;if(z>=y){s=x;z-=y;break}x=x.previousSibling}}r[A?"setStart":"setEnd"](s,z)}try{o(true);if(!k){o()}}catch(n){if(n.number==-2147024809){m=b.getBookmark(2);p=i.duplicate();p.collapse(true);l=p.parentElement();if(!k){p=i.duplicate();p.collapse(false);q=p.parentElement();q.innerHTML=q.innerHTML}l.innerHTML=l.innerHTML;b.moveToBookmark(m);i=d.getRng();o(true);if(!k){o()}}else{throw n}}return r}this.getBookmark=function(m){var j=d.getRng(),o,i,l={};function n(u){var t,p,s,r,q=[];t=u.parentNode;p=h.getRoot().parentNode;while(t!=p&&t.nodeType!==9){s=t.children;r=s.length;while(r--){if(u===s[r]){q.push(r);break}}u=t;t=t.parentNode}return q}function k(q){var p;p=e(j,q);if(p){return{position:p.position,offset:p.offset,indexes:n(p.node),inside:p.inside}}}if(m===2){if(!j.item){l.start=k(true);if(!d.isCollapsed()){l.end=k()}}else{l.start={ctrl:true,indexes:n(j.item(0))}}}return l};this.moveToBookmark=function(k){var j,i=h.doc.body;function m(o){var r,q,n,p;r=h.getRoot();for(q=o.length-1;q>=0;q--){p=r.children;n=o[q];if(n<=p.length-1){r=p[n]}}return r}function l(r){var n=k[r?"start":"end"],q,p,o;if(n){q=n.position>0;p=i.createTextRange();p.moveToElementText(m(n.indexes));offset=n.offset;if(offset!==o){p.collapse(n.inside||q);p.moveStart("character",q?-offset:offset)}else{p.collapse(r)}j.setEndPoint(r?"StartToStart":"EndToStart",p);if(r){j.collapse(true)}}}if(k.start){if(k.start.ctrl){j=i.createControlRange();j.addElement(m(k.start.indexes));j.select()}else{j=i.createTextRange();l(true);l();j.select()}}};this.addRange=function(i){var n,l,k,p,v,q,t,s=d.dom.doc,m=s.body,r,u;function j(C){var y,B,x,A,z;x=h.create("a");y=C?k:v;B=C?p:q;A=n.duplicate();if(y==s||y==s.documentElement){y=m;B=0}if(y.nodeType==3){y.parentNode.insertBefore(x,y);A.moveToElementText(x);A.moveStart("character",B);h.remove(x);n.setEndPoint(C?"StartToStart":"EndToEnd",A)}else{z=y.childNodes;if(z.length){if(B>=z.length){h.insertAfter(x,z[z.length-1])}else{y.insertBefore(x,z[B])}A.moveToElementText(x)}else{if(y.canHaveHTML){y.innerHTML="<span>\uFEFF</span>";x=y.firstChild;A.moveToElementText(x);A.collapse(f)}}n.setEndPoint(C?"StartToStart":"EndToEnd",A);h.remove(x)}}k=i.startContainer;p=i.startOffset;v=i.endContainer;q=i.endOffset;n=m.createTextRange();if(k==v&&k.nodeType==1){if(p==q&&!k.hasChildNodes()){if(k.canHaveHTML){t=k.previousSibling;if(t&&!t.hasChildNodes()&&h.isBlock(t)){t.innerHTML="\uFEFF"}else{t=null}k.innerHTML="<span>\uFEFF</span><span>\uFEFF</span>";n.moveToElementText(k.lastChild);n.select();h.doc.selection.clear();k.innerHTML="";if(t){t.innerHTML=""}return}else{p=h.nodeIndex(k);k=k.parentNode}}if(p==q-1){try{u=k.childNodes[p];l=m.createControlRange();l.addElement(u);l.select();r=d.getRng();if(r.item&&u===r.item(0)){return}}catch(o){}}}j(true);j();n.select()};this.getRangeAt=g}tinymce.dom.TridentSelection=a})();(function(a){a.dom.Element=function(f,d){var b=this,e,c;b.settings=d=d||{};b.id=f;b.dom=e=d.dom||a.DOM;if(!a.isIE){c=e.get(b.id)}a.each(("getPos,getRect,getParent,add,setStyle,getStyle,setStyles,setAttrib,setAttribs,getAttrib,addClass,removeClass,hasClass,getOuterHTML,setOuterHTML,remove,show,hide,isHidden,setHTML,get").split(/,/),function(g){b[g]=function(){var h=[f],j;for(j=0;j<arguments.length;j++){h.push(arguments[j])}h=e[g].apply(e,h);b.update(g);return h}});a.extend(b,{on:function(i,h,g){return a.dom.Event.add(b.id,i,h,g)},getXY:function(){return{x:parseInt(b.getStyle("left")),y:parseInt(b.getStyle("top"))}},getSize:function(){var g=e.get(b.id);return{w:parseInt(b.getStyle("width")||g.clientWidth),h:parseInt(b.getStyle("height")||g.clientHeight)}},moveTo:function(g,h){b.setStyles({left:g,top:h})},moveBy:function(g,i){var h=b.getXY();b.moveTo(h.x+g,h.y+i)},resizeTo:function(g,i){b.setStyles({width:g,height:i})},resizeBy:function(g,j){var i=b.getSize();b.resizeTo(i.w+g,i.h+j)},update:function(h){var g;if(a.isIE6&&d.blocker){h=h||"";if(h.indexOf("get")===0||h.indexOf("has")===0||h.indexOf("is")===0){return}if(h=="remove"){e.remove(b.blocker);return}if(!b.blocker){b.blocker=e.uniqueId();g=e.add(d.container||e.getRoot(),"iframe",{id:b.blocker,style:"position:absolute;",frameBorder:0,src:'javascript:""'});e.setStyle(g,"opacity",0)}else{g=e.get(b.blocker)}e.setStyles(g,{left:b.getStyle("left",1),top:b.getStyle("top",1),width:b.getStyle("width",1),height:b.getStyle("height",1),display:b.getStyle("display",1),zIndex:parseInt(b.getStyle("zIndex",1)||0)-1})}}})}})(tinymce);(function(d){function f(g){return g.replace(/[\n\r]+/g,"")}var c=d.is,b=d.isIE,e=d.each,a=d.dom.TreeWalker;d.create("tinymce.dom.Selection",{Selection:function(k,j,i,h){var g=this;g.dom=k;g.win=j;g.serializer=i;g.editor=h;e(["onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent"],function(l){g[l]=new d.util.Dispatcher(g)});if(!g.win.getSelection){g.tridentSel=new d.dom.TridentSelection(g)}if(d.isIE&&!d.isIE11&&k.boxModel){this._fixIESelection()}d.addUnload(g.destroy,g)},setCursorLocation:function(i,j){var g=this;var h=g.dom.createRng();h.setStart(i,j);h.setEnd(i,j);g.setRng(h);g.collapse(false)},getContent:function(h){var g=this,i=g.getRng(),m=g.dom.create("body"),k=g.getSel(),j,l,o;h=h||{};j=l="";h.get=true;h.format=h.format||"html";h.forced_root_block="";g.onBeforeGetContent.dispatch(g,h);if(h.format=="text"){return g.isCollapsed()?"":(i.text||(k.toString?k.toString():""))}if(i.cloneContents){o=i.cloneContents();if(o){m.appendChild(o)}}else{if(c(i.item)||c(i.htmlText)){m.innerHTML="<br>"+(i.item?i.item(0).outerHTML:i.htmlText);m.removeChild(m.firstChild)}else{m.innerHTML=i.toString()}}if(/^\s/.test(m.innerHTML)){j=" "}if(/\s+$/.test(m.innerHTML)){l=" "}h.getInner=true;h.content=g.isCollapsed()?"":j+g.serializer.serialize(m,h)+l;g.onGetContent.dispatch(g,h);return h.content},setContent:function(h,j){var o=this,g=o.getRng(),k,l=o.win.document,n,m;j=j||{format:"html"};j.set=true;h=j.content=h;if(!j.no_events){o.onBeforeSetContent.dispatch(o,j)}h=j.content;if(g.insertNode){h+='<span id="__caret">_</span>';if(g.startContainer==l&&g.endContainer==l){l.body.innerHTML=h}else{g.deleteContents();if(l.body.childNodes.length===0){l.body.innerHTML=h}else{if(g.createContextualFragment){g.insertNode(g.createContextualFragment(h))}else{n=l.createDocumentFragment();m=l.createElement("div");n.appendChild(m);m.outerHTML=h;g.insertNode(n)}}}k=o.dom.get("__caret");g=l.createRange();g.setStartBefore(k);g.setEndBefore(k);o.setRng(g);o.dom.remove("__caret");try{o.setRng(g)}catch(i){}}else{if(g.item){l.execCommand("Delete",false,null);g=o.getRng()}if(/^\s+/.test(h)){g.pasteHTML('<span id="__mce_tmp">_</span>'+h);o.dom.remove("__mce_tmp")}else{g.pasteHTML(h)}}if(!j.no_events){o.onSetContent.dispatch(o,j)}},getStart:function(){var i=this,h=i.getRng(),j,g,l,k;if(h.duplicate||h.item){if(h.item){return h.item(0)}l=h.duplicate();l.collapse(1);j=l.parentElement();if(j.ownerDocument!==i.dom.doc){j=i.dom.getRoot()}g=k=h.parentElement();while(k=k.parentNode){if(k==j){j=g;break}}return j}else{j=h.startContainer;if(j.nodeType==1&&j.hasChildNodes()){j=j.childNodes[Math.min(j.childNodes.length-1,h.startOffset)]}if(j&&j.nodeType==3){return j.parentNode}return j}},getEnd:function(){var h=this,g=h.getRng(),j,i;if(g.duplicate||g.item){if(g.item){return g.item(0)}g=g.duplicate();g.collapse(0);j=g.parentElement();if(j.ownerDocument!==h.dom.doc){j=h.dom.getRoot()}if(j&&j.nodeName=="BODY"){return j.lastChild||j}return j}else{j=g.endContainer;i=g.endOffset;if(j.nodeType==1&&j.hasChildNodes()){j=j.childNodes[i>0?i-1:i]}if(j&&j.nodeType==3){return j.parentNode}return j}},getBookmark:function(s,v){var y=this,n=y.dom,h,k,j,o,i,p,q,m="\uFEFF",x;function g(z,A){var t=0;e(n.select(z),function(C,B){if(C==A){t=B}});return t}function u(t){function z(E){var A,D,C,B=E?"start":"end";A=t[B+"Container"];D=t[B+"Offset"];if(A.nodeType==1&&A.nodeName=="TR"){C=A.childNodes;A=C[Math.min(E?D:D-1,C.length-1)];if(A){D=E?0:A.childNodes.length;t["set"+(E?"Start":"End")](A,D)}}}z(true);z();return t}function l(){var z=y.getRng(true),t=n.getRoot(),A={};function B(E,J){var D=E[J?"startContainer":"endContainer"],I=E[J?"startOffset":"endOffset"],C=[],F,H,G=0;if(D.nodeType==3){if(v){for(F=D.previousSibling;F&&F.nodeType==3;F=F.previousSibling){I+=F.nodeValue.length}}C.push(I)}else{H=D.childNodes;if(I>=H.length&&H.length){G=1;I=Math.max(0,H.length-1)}C.push(y.dom.nodeIndex(H[I],v)+G)}for(;D&&D!=t;D=D.parentNode){C.push(y.dom.nodeIndex(D,v))}return C}A.start=B(z,true);if(!y.isCollapsed()){A.end=B(z)}return A}if(s==2){if(y.tridentSel){return y.tridentSel.getBookmark(s)}return l()}if(s){h=y.getRng();if(h.setStart){h={startContainer:h.startContainer,startOffset:h.startOffset,endContainer:h.endContainer,endOffset:h.endOffset}}return{rng:h}}h=y.getRng();j=n.uniqueId();o=tinyMCE.activeEditor.selection.isCollapsed();x="overflow:hidden;line-height:0px";if(h.duplicate||h.item){if(!h.item){k=h.duplicate();try{h.collapse();h.pasteHTML('<span data-mce-type="bookmark" id="'+j+'_start" style="'+x+'">'+m+"</span>");if(!o){k.collapse(false);h.moveToElementText(k.parentElement());if(h.compareEndPoints("StartToEnd",k)===0){k.move("character",-1)}k.pasteHTML('<span data-mce-type="bookmark" id="'+j+'_end" style="'+x+'">'+m+"</span>")}}catch(r){return null}}else{p=h.item(0);i=p.nodeName;return{name:i,index:g(i,p)}}}else{p=y.getNode();i=p.nodeName;if(i=="IMG"){return{name:i,index:g(i,p)}}k=u(h.cloneRange());if(!o){k.collapse(false);k.insertNode(n.create("span",{"data-mce-type":"bookmark",id:j+"_end",style:x},m))}h=u(h);h.collapse(true);h.insertNode(n.create("span",{"data-mce-type":"bookmark",id:j+"_start",style:x},m))}y.moveToBookmark({id:j,keep:1});return{id:j}},moveToBookmark:function(q){var v=this,n=v.dom,l,j,g,i,u,k,x,r,s;function h(C){var t=q[C?"start":"end"],z,A,B,y;if(t){B=t[0];for(A=u,z=t.length-1;z>=1;z--){y=A.childNodes;if(t[z]>y.length-1){return}A=y[t[z]]}if(A.nodeType===3){B=Math.min(t[0],A.nodeValue.length)}if(A.nodeType===1){B=Math.min(t[0],A.childNodes.length)}if(C){g.setStart(A,B)}else{g.setEnd(A,B)}}return true}function m(D){var y=n.get(q.id+"_"+D),C,t,A,B,z=q.keep;if(y){C=y.parentNode;if(D=="start"){if(!z){t=n.nodeIndex(y)}else{C=y.firstChild;t=1}k=x=C;r=s=t}else{if(!z){t=n.nodeIndex(y)}else{C=y.firstChild;t=1}x=C;s=t}if(!z){B=y.previousSibling;A=y.nextSibling;e(d.grep(y.childNodes),function(E){if(E.nodeType==3){E.nodeValue=E.nodeValue.replace(/\uFEFF/g,"")}});while(y=n.get(q.id+"_"+D)){n.remove(y,1)}if(B&&A&&B.nodeType==A.nodeType&&B.nodeType==3&&!d.isOpera){t=B.nodeValue.length;B.appendData(A.nodeValue);n.remove(A);if(D=="start"){k=x=B;r=s=t}else{x=B;s=t}}}}}function o(t){if(n.isBlock(t)&&!t.innerHTML&&!b){t.innerHTML='<br data-mce-bogus="1" />'}return t}if(q){if(q.start){g=n.createRng();u=n.getRoot();if(v.tridentSel){return v.tridentSel.moveToBookmark(q)}if(h(true)&&h()){v.setRng(g)}}else{if(q.id){m("start");m("end");if(k){g=n.createRng();g.setStart(o(k),r);g.setEnd(o(x),s);v.setRng(g)}}else{if(q.name){v.select(n.select(q.name)[q.index])}else{if(q.rng){g=q.rng;if(g.startContainer){i=v.dom.createRng();try{i.setStart(g.startContainer,g.startOffset);i.setEnd(g.endContainer,g.endOffset)}catch(p){}g=i}v.setRng(g)}}}}}},select:function(l,k){var j=this,m=j.dom,h=m.createRng(),g;function i(n,p){var o=new a(n,n);do{if(n.nodeType==3&&d.trim(n.nodeValue).length!==0){if(p){h.setStart(n,0)}else{h.setEnd(n,n.nodeValue.length)}return}if(n.nodeName=="BR"){if(p){h.setStartBefore(n)}else{h.setEndBefore(n)}return}}while(n=(p?o.next():o.prev()))}if(l){g=m.nodeIndex(l);h.setStart(l.parentNode,g);h.setEnd(l.parentNode,g+1);if(k){i(l,1);i(l)}j.setRng(h)}return l},isCollapsed:function(){var g=this,i=g.getRng(),h=g.getSel();if(!i||i.item){return false}if(i.compareEndPoints){return i.compareEndPoints("StartToEnd",i)===0}return !h||i.collapsed},collapse:function(g){var i=this,h=i.getRng(),j;if(h.item){j=h.item(0);h=i.win.document.body.createTextRange();h.moveToElementText(j)}h.collapse(!!g);i.setRng(h)},getSel:function(){var h=this,g=this.win;return g.getSelection?g.getSelection():g.document.selection},getRng:function(m){var h=this,j,g,l,k=h.win.document;if(h.fakeRng){return h.fakeRng}if(m&&h.tridentSel){return h.tridentSel.getRangeAt(0)}try{if(j=h.getSel()){g=j.rangeCount>0?j.getRangeAt(0):(j.createRange?j.createRange():k.createRange())}}catch(i){}if(d.isIE&&!d.isIE11&&g&&g.setStart&&k.selection.createRange().item){l=k.selection.createRange().item(0);g=k.createRange();g.setStartBefore(l);g.setEndAfter(l)}if(!g){g=k.createRange?k.createRange():k.body.createTextRange()}if(g.setStart&&g.startContainer.nodeType===9&&g.collapsed){l=h.dom.getRoot();g.setStart(l,0);g.setEnd(l,0)}if(h.selectedRange&&h.explicitRange){if(g.compareBoundaryPoints(g.START_TO_START,h.selectedRange)===0&&g.compareBoundaryPoints(g.END_TO_END,h.selectedRange)===0){g=h.explicitRange}else{h.selectedRange=null;h.explicitRange=null}}return g},setRng:function(k,g){var j,i=this;if(!i.tridentSel){j=i.getSel();if(j){i.explicitRange=k;try{j.removeAllRanges()}catch(h){}j.addRange(k);if(g===false&&j.extend){j.collapse(k.endContainer,k.endOffset);j.extend(k.startContainer,k.startOffset)}i.selectedRange=j.rangeCount>0?j.getRangeAt(0):null}}else{if(k.cloneRange){try{i.tridentSel.addRange(k);return}catch(h){}}try{k.select()}catch(h){}}},setNode:function(h){var g=this;g.setContent(g.dom.getOuterHTML(h));return h},getNode:function(){var i=this,h=i.getRng(),j=i.getSel(),m,l=h.startContainer,g=h.endContainer;function k(q,o){var p=q;while(q&&q.nodeType===3&&q.length===0){q=o?q.nextSibling:q.previousSibling}return q||p}if(!h){return i.dom.getRoot()}if(h.setStart){m=h.commonAncestorContainer;if(!h.collapsed){if(h.startContainer==h.endContainer){if(h.endOffset-h.startOffset<2){if(h.startContainer.hasChildNodes()){m=h.startContainer.childNodes[h.startOffset]}}}if(l.nodeType===3&&g.nodeType===3){if(l.length===h.startOffset){l=k(l.nextSibling,true)}else{l=l.parentNode}if(h.endOffset===0){g=k(g.previousSibling,false)}else{g=g.parentNode}if(l&&l===g){return l}}}if(m&&m.nodeType==3){return m.parentNode}return m}return h.item?h.item(0):h.parentElement()},getSelectedBlocks:function(p,h){var o=this,k=o.dom,m,l,i,j=[];m=k.getParent(p||o.getStart(),k.isBlock);l=k.getParent(h||o.getEnd(),k.isBlock);if(m){j.push(m)}if(m&&l&&m!=l){i=m;var g=new a(m,k.getRoot());while((i=g.next())&&i!=l){if(k.isBlock(i)){j.push(i)}}}if(l&&m!=l){j.push(l)}return j},isForward:function(){var i=this.dom,g=this.getSel(),j,h;if(!g||g.anchorNode==null||g.focusNode==null){return true}j=i.createRng();j.setStart(g.anchorNode,g.anchorOffset);j.collapse(true);h=i.createRng();h.setStart(g.focusNode,g.focusOffset);h.collapse(true);return j.compareBoundaryPoints(j.START_TO_START,h)<=0},normalize:function(){var h=this,g,m,l,j,i;function k(p){var o,r,n,s=h.dom,u=s.getRoot(),q,t,v;function y(z,A){var B=new a(z,s.getParent(z.parentNode,s.isBlock)||u);while(z=B[A?"prev":"next"]()){if(z.nodeName==="BR"){return true}}}function x(B,z){var C,A;z=z||o;C=new a(z,s.getParent(z.parentNode,s.isBlock)||u);while(q=C[B?"prev":"next"]()){if(q.nodeType===3&&q.nodeValue.length>0){o=q;r=B?q.nodeValue.length:0;m=true;return}if(s.isBlock(q)||t[q.nodeName.toLowerCase()]){return}A=q}if(l&&A){o=A;m=true;r=0}}o=g[(p?"start":"end")+"Container"];r=g[(p?"start":"end")+"Offset"];t=s.schema.getNonEmptyElements();if(o.nodeType===9){o=s.getRoot();r=0}if(o===u){if(p){q=o.childNodes[r>0?r-1:0];if(q){v=q.nodeName.toLowerCase();if(t[q.nodeName]||q.nodeName=="TABLE"){return}}}if(o.hasChildNodes()){o=o.childNodes[Math.min(!p&&r>0?r-1:r,o.childNodes.length-1)];r=0;if(o.hasChildNodes()&&!/TABLE/.test(o.nodeName)){q=o;n=new a(o,u);do{if(q.nodeType===3&&q.nodeValue.length>0){r=p?0:q.nodeValue.length;o=q;m=true;break}if(t[q.nodeName.toLowerCase()]){r=s.nodeIndex(q);o=q.parentNode;if(q.nodeName=="IMG"&&!p){r++}m=true;break}}while(q=(p?n.next():n.prev()))}}}if(l){if(o.nodeType===3&&r===0){x(true)}if(o.nodeType===1){q=o.childNodes[r];if(q&&q.nodeName==="BR"&&!y(q)&&!y(q,true)){x(true,o.childNodes[r])}}}if(p&&!l&&o.nodeType===3&&r===o.nodeValue.length){x(false)}if(m){g["set"+(p?"Start":"End")](o,r)}}if(d.isIE){return}g=h.getRng();l=g.collapsed;k(true);if(!l){k()}if(m){if(l){g.collapse(true)}h.setRng(g,h.isForward())}},selectorChanged:function(g,j){var h=this,i;if(!h.selectorChangedData){h.selectorChangedData={};i={};h.editor.onNodeChange.addToTop(function(l,k,o){var p=h.dom,m=p.getParents(o,null,p.getRoot()),n={};e(h.selectorChangedData,function(r,q){e(m,function(s){if(p.is(s,q)){if(!i[q]){e(r,function(t){t(true,{node:s,selector:q,parents:m})});i[q]=r}n[q]=r;return false}})});e(i,function(r,q){if(!n[q]){delete i[q];e(r,function(s){s(false,{node:o,selector:q,parents:m})})}})})}if(!h.selectorChangedData[g]){h.selectorChangedData[g]=[]}h.selectorChangedData[g].push(j);return h},scrollIntoView:function(k){var j,h,g=this,i=g.dom;h=i.getViewPort(g.editor.getWin());j=i.getPos(k).y;if(j<h.y||j+25>h.y+h.h){g.editor.getWin().scrollTo(0,j<h.y?j:j-h.h+25)}},destroy:function(h){var g=this;g.win=null;if(!h){d.removeUnload(g.destroy)}},_fixIESelection:function(){var h=this.dom,n=h.doc,i=n.body,k,o,g;function j(p,s){var q=i.createTextRange();try{q.moveToPoint(p,s)}catch(r){q=null}return q}function m(q){var p;if(q.button){p=j(q.x,q.y);if(p){if(p.compareEndPoints("StartToStart",o)>0){p.setEndPoint("StartToStart",o)}else{p.setEndPoint("EndToEnd",o)}p.select()}}else{l()}}function l(){var p=n.selection.createRange();if(o&&!p.item&&p.compareEndPoints("StartToEnd",p)===0){o.select()}h.unbind(n,"mouseup",l);h.unbind(n,"mousemove",m);o=k=0}n.documentElement.unselectable=true;h.bind(n,["mousedown","contextmenu"],function(p){if(p.target.nodeName==="HTML"){if(k){l()}g=n.documentElement;if(g.scrollHeight>g.clientHeight){return}k=1;o=j(p.x,p.y);if(o){h.bind(n,"mouseup",l);h.bind(n,"mousemove",m);h.win.focus();o.select()}}})}})})(tinymce);(function(a){a.dom.Serializer=function(e,i,f){var h,b,d=a.isIE,g=a.each,c;if(!e.apply_source_formatting){e.indent=false}i=i||a.DOM;f=f||new a.html.Schema(e);e.entity_encoding=e.entity_encoding||"named";e.remove_trailing_brs="remove_trailing_brs" in e?e.remove_trailing_brs:true;h=new a.util.Dispatcher(self);b=new a.util.Dispatcher(self);c=new a.html.DomParser(e,f);c.addAttributeFilter("src,href,style",function(k,j){var o=k.length,l,q,n="data-mce-"+j,p=e.url_converter,r=e.url_converter_scope,m;while(o--){l=k[o];q=l.attributes.map[n];if(q!==m){l.attr(j,q.length>0?q:null);l.attr(n,null)}else{q=l.attributes.map[j];if(j==="style"){q=i.serializeStyle(i.parseStyle(q),l.name)}else{if(p){q=p.call(r,q,j,l.name)}}l.attr(j,q.length>0?q:null)}}});c.addAttributeFilter("class",function(j,k){var l=j.length,m,n;while(l--){m=j[l];n=m.attr("class").replace(/(?:^|\s)mce(Item\w+|Selected)(?!\S)/g,"");m.attr("class",n.length>0?n:null)}});c.addAttributeFilter("data-mce-type",function(j,l,k){var m=j.length,n;while(m--){n=j[m];if(n.attributes.map["data-mce-type"]==="bookmark"&&!k.cleanup){n.remove()}}});c.addAttributeFilter("data-mce-expando",function(j,l,k){var m=j.length;while(m--){j[m].attr(l,null)}});c.addNodeFilter("noscript",function(j){var k=j.length,l;while(k--){l=j[k].firstChild;if(l){l.value=a.html.Entities.decode(l.value)}}});c.addNodeFilter("script,style",function(k,l){var m=k.length,n,o;function j(p){return p.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*((<!--)?(\s*\/\/)?\s*<!\[CDATA\[|(<!--\s*)?\/\*\s*<!\[CDATA\[\s*\*\/|(\/\/)?\s*<!--|\/\*\s*<!--\s*\*\/)\s*[\r\n]*/gi,"").replace(/\s*(\/\*\s*\]\]>\s*\*\/(-->)?|\s*\/\/\s*\]\]>(-->)?|\/\/\s*(-->)?|\]\]>|\/\*\s*-->\s*\*\/|\s*-->\s*)\s*$/g,"")}while(m--){n=k[m];o=n.firstChild?n.firstChild.value:"";if(l==="script"){n.attr("type",(n.attr("type")||"text/javascript").replace(/^mce\-/,""));if(o.length>0){n.firstChild.value="// <![CDATA[\n"+j(o)+"\n// ]]>"}}else{if(o.length>0){n.firstChild.value="<!--\n"+j(o)+"\n-->"}}}});c.addNodeFilter("#comment",function(j,k){var l=j.length,m;while(l--){m=j[l];if(m.value.indexOf("[CDATA[")===0){m.name="#cdata";m.type=4;m.value=m.value.replace(/^\[CDATA\[|\]\]$/g,"")}else{if(m.value.indexOf("mce:protected ")===0){m.name="#text";m.type=3;m.raw=true;m.value=unescape(m.value).substr(14)}}}});c.addNodeFilter("xml:namespace,input",function(j,k){var l=j.length,m;while(l--){m=j[l];if(m.type===7){m.remove()}else{if(m.type===1){if(k==="input"&&!("type" in m.attributes.map)){m.attr("type","text")}}}}});if(e.fix_list_elements){c.addNodeFilter("ul,ol",function(k,l){var m=k.length,n,j;while(m--){n=k[m];j=n.parent;if(j.name==="ul"||j.name==="ol"){if(n.prev&&n.prev.name==="li"){n.prev.append(n)}}}})}c.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style",function(j,k){var l=j.length;while(l--){j[l].attr(k,null)}});return{schema:f,addNodeFilter:c.addNodeFilter,addAttributeFilter:c.addAttributeFilter,onPreProcess:h,onPostProcess:b,serialize:function(o,m){var l,p,k,j,n;if(d&&i.select("script,style,select,map").length>0){n=o.innerHTML;o=o.cloneNode(false);i.setHTML(o,n)}else{o=o.cloneNode(true)}l=o.ownerDocument.implementation;if(l.createHTMLDocument){p=l.createHTMLDocument("");g(o.nodeName=="BODY"?o.childNodes:[o],function(q){p.body.appendChild(p.importNode(q,true))});if(o.nodeName!="BODY"){o=p.body.firstChild}else{o=p.body}k=i.doc;i.doc=p}m=m||{};m.format=m.format||"html";if(!m.no_events){m.node=o;h.dispatch(self,m)}j=new a.html.Serializer(e,f);m.content=j.serialize(c.parse(a.trim(m.getInner?o.innerHTML:i.getOuterHTML(o)),m));if(!m.cleanup){m.content=m.content.replace(/\uFEFF/g,"")}if(!m.no_events){b.dispatch(self,m)}if(k){i.doc=k}m.node=null;return m.content},addRules:function(j){f.addValidElements(j)},setRules:function(j){f.setValidElements(j)}}}})(tinymce);(function(a){a.dom.ScriptLoader=function(h){var c=0,k=1,i=2,l={},j=[],e={},d=[],g=0,f;function b(m,v){var x=this,q=a.DOM,s,o,r,n;function p(){q.remove(n);if(s){s.onreadystatechange=s.onload=s=null}v()}function u(){if(typeof(console)!=="undefined"&&console.log){console.log("Failed to load: "+m)}}n=q.uniqueId();if(a.isIE6){o=new a.util.URI(m);r=location;if(o.host==r.hostname&&o.port==r.port&&(o.protocol+":")==r.protocol&&o.protocol.toLowerCase()!="file"){a.util.XHR.send({url:a._addVer(o.getURI()),success:function(y){var t=q.create("script",{type:"text/javascript"});t.text=y;document.getElementsByTagName("head")[0].appendChild(t);q.remove(t);p()},error:u});return}}s=document.createElement("script");s.id=n;s.type="text/javascript";s.src=a._addVer(m);if(!a.isIE||a.isIE11){s.onload=p}s.onerror=u;if(!a.isOpera){s.onreadystatechange=function(){var t=s.readyState;if(t=="complete"||t=="loaded"){p()}}}(document.getElementsByTagName("head")[0]||document.body).appendChild(s)}this.isDone=function(m){return l[m]==i};this.markDone=function(m){l[m]=i};this.add=this.load=function(m,q,n){var o,p=l[m];if(p==f){j.push(m);l[m]=c}if(q){if(!e[m]){e[m]=[]}e[m].push({func:q,scope:n||this})}};this.loadQueue=function(n,m){this.loadScripts(j,n,m)};this.loadScripts=function(m,q,p){var o;function n(r){a.each(e[r],function(s){s.func.call(s.scope)});e[r]=f}d.push({func:q,scope:p||this});o=function(){var r=a.grep(m);m.length=0;a.each(r,function(s){if(l[s]==i){n(s);return}if(l[s]!=k){l[s]=k;g++;b(s,function(){l[s]=i;g--;n(s);o()})}});if(!g){a.each(d,function(s){s.func.call(s.scope)});d.length=0}};o()}};a.ScriptLoader=new a.dom.ScriptLoader()})(tinymce);(function(a){a.dom.RangeUtils=function(c){var b="\uFEFF";this.walk=function(d,s){var i=d.startContainer,l=d.startOffset,t=d.endContainer,m=d.endOffset,j,g,o,h,r,q,e;e=c.select("td.mceSelected,th.mceSelected");if(e.length>0){a.each(e,function(u){s([u])});return}function f(u){var v;v=u[0];if(v.nodeType===3&&v===i&&l>=v.nodeValue.length){u.splice(0,1)}v=u[u.length-1];if(m===0&&u.length>0&&v===t&&v.nodeType===3){u.splice(u.length-1,1)}return u}function p(x,v,u){var y=[];for(;x&&x!=u;x=x[v]){y.push(x)}return y}function n(v,u){do{if(v.parentNode==u){return v}v=v.parentNode}while(v)}function k(x,v,y){var u=y?"nextSibling":"previousSibling";for(h=x,r=h.parentNode;h&&h!=v;h=r){r=h.parentNode;q=p(h==x?h:h[u],u);if(q.length){if(!y){q.reverse()}s(f(q))}}}if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[l]}if(t.nodeType==1&&t.hasChildNodes()){t=t.childNodes[Math.min(m-1,t.childNodes.length-1)]}if(i==t){return s(f([i]))}j=c.findCommonAncestor(i,t);for(h=i;h;h=h.parentNode){if(h===t){return k(i,j,true)}if(h===j){break}}for(h=t;h;h=h.parentNode){if(h===i){return k(t,j)}if(h===j){break}}g=n(i,j)||i;o=n(t,j)||t;k(i,g,true);q=p(g==i?g:g.nextSibling,"nextSibling",o==t?o.nextSibling:o);if(q.length){s(f(q))}k(t,o)};this.split=function(e){var h=e.startContainer,d=e.startOffset,i=e.endContainer,g=e.endOffset;function f(j,k){return j.splitText(k)}if(h==i&&h.nodeType==3){if(d>0&&d<h.nodeValue.length){i=f(h,d);h=i.previousSibling;if(g>d){g=g-d;h=i=f(i,g).previousSibling;g=i.nodeValue.length;d=0}else{g=0}}}else{if(h.nodeType==3&&d>0&&d<h.nodeValue.length){h=f(h,d);d=0}if(i.nodeType==3&&g>0&&g<i.nodeValue.length){i=f(i,g).previousSibling;g=i.nodeValue.length}}return{startContainer:h,startOffset:d,endContainer:i,endOffset:g}}};a.dom.RangeUtils.compareRanges=function(c,b){if(c&&b){if(c.item||c.duplicate){if(c.item&&b.item&&c.item(0)===b.item(0)){return true}if(c.isEqual&&b.isEqual&&b.isEqual(c)){return true}}else{return c.startContainer==b.startContainer&&c.startOffset==b.startOffset}}return false}})(tinymce);(function(b){var a=b.dom.Event,c=b.each;b.create("tinymce.ui.KeyboardNavigation",{KeyboardNavigation:function(e,f){var q=this,n=e.root,m=e.items,o=e.enableUpDown,i=e.enableLeftRight||!e.enableUpDown,l=e.excludeFromTabOrder,k,h,p,d,g;f=f||b.DOM;k=function(r){g=r.target.id};h=function(r){f.setAttrib(r.target.id,"tabindex","-1")};d=function(r){var s=f.get(g);f.setAttrib(s,"tabindex","0");s.focus()};q.focus=function(){f.get(g).focus()};q.destroy=function(){c(m,function(s){var t=f.get(s.id);f.unbind(t,"focus",k);f.unbind(t,"blur",h)});var r=f.get(n);f.unbind(r,"focus",d);f.unbind(r,"keydown",p);m=f=n=q.focus=k=h=p=d=null;q.destroy=function(){}};q.moveFocus=function(v,s){var r=-1,u=q.controls,t;if(!g){return}c(m,function(y,x){if(y.id===g){r=x;return false}});r+=v;if(r<0){r=m.length-1}else{if(r>=m.length){r=0}}t=m[r];f.setAttrib(g,"tabindex","-1");f.setAttrib(t.id,"tabindex","0");f.get(t.id).focus();if(e.actOnFocus){e.onAction(t.id)}if(s){a.cancel(s)}};p=function(z){var v=37,u=39,y=38,A=40,r=27,t=14,s=13,x=32;switch(z.keyCode){case v:if(i){q.moveFocus(-1)}a.cancel(z);break;case u:if(i){q.moveFocus(1)}a.cancel(z);break;case y:if(o){q.moveFocus(-1)}a.cancel(z);break;case A:if(o){q.moveFocus(1)}a.cancel(z);break;case r:if(e.onCancel){e.onCancel();a.cancel(z)}break;case t:case s:case x:if(e.onAction){e.onAction(g);a.cancel(z)}break}};c(m,function(t,r){var s,u;if(!t.id){t.id=f.uniqueId("_mce_item_")}u=f.get(t.id);if(l){f.bind(u,"blur",h);s="-1"}else{s=(r===0?"0":"-1")}u.setAttribute("tabindex",s);f.bind(u,"focus",k)});if(m[0]){g=m[0].id}f.setAttrib(n,"tabindex","-1");var j=f.get(n);f.bind(j,"focus",d);f.bind(j,"keydown",p)}})})(tinymce);(function(c){var b=c.DOM,a=c.is;c.create("tinymce.ui.Control",{Control:function(f,e,d){this.id=f;this.settings=e=e||{};this.rendered=false;this.onRender=new c.util.Dispatcher(this);this.classPrefix="";this.scope=e.scope||this;this.disabled=0;this.active=0;this.editor=d},setAriaProperty:function(f,e){var d=b.get(this.id+"_aria")||b.get(this.id);if(d){b.setAttrib(d,"aria-"+f,!!e)}},focus:function(){b.get(this.id).focus()},setDisabled:function(d){if(d!=this.disabled){this.setAriaProperty("disabled",d);this.setState("Disabled",d);this.setState("Enabled",!d);this.disabled=d}},isDisabled:function(){return this.disabled},setActive:function(d){if(d!=this.active){this.setState("Active",d);this.active=d;this.setAriaProperty("pressed",d)}},isActive:function(){return this.active},setState:function(f,d){var e=b.get(this.id);f=this.classPrefix+f;if(d){b.addClass(e,f)}else{b.removeClass(e,f)}},isRendered:function(){return this.rendered},renderHTML:function(){},renderTo:function(d){b.setHTML(d,this.renderHTML())},postRender:function(){var e=this,d;if(a(e.disabled)){d=e.disabled;e.disabled=-1;e.setDisabled(d)}if(a(e.active)){d=e.active;e.active=-1;e.setActive(d)}},remove:function(){b.remove(this.id);this.destroy()},destroy:function(){c.dom.Event.clear(this.id)}})})(tinymce);tinymce.create("tinymce.ui.Container:tinymce.ui.Control",{Container:function(c,b,a){this.parent(c,b,a);this.controls=[];this.lookup={}},add:function(a){this.lookup[a.id]=a;this.controls.push(a);return a},get:function(a){return this.lookup[a]}});tinymce.create("tinymce.ui.Separator:tinymce.ui.Control",{Separator:function(b,a){this.parent(b,a);this.classPrefix="mceSeparator";this.setDisabled(true)},renderHTML:function(){return tinymce.DOM.createHTML("span",{"class":this.classPrefix,role:"separator","aria-orientation":"vertical",tabindex:"-1"})}});(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.MenuItem:tinymce.ui.Control",{MenuItem:function(g,f){this.parent(g,f);this.classPrefix="mceMenuItem"},setSelected:function(f){this.setState("Selected",f);this.setAriaProperty("checked",!!f);this.selected=f},isSelected:function(){return this.selected},postRender:function(){var f=this;f.parent();if(c(f.selected)){f.setSelected(f.selected)}}})})(tinymce);(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.Menu:tinymce.ui.MenuItem",{Menu:function(h,g){var f=this;f.parent(h,g);f.items={};f.collapsed=false;f.menuCount=0;f.onAddItem=new d.util.Dispatcher(this)},expand:function(g){var f=this;if(g){a(f,function(h){if(h.expand){h.expand()}},"items",f)}f.collapsed=false},collapse:function(g){var f=this;if(g){a(f,function(h){if(h.collapse){h.collapse()}},"items",f)}f.collapsed=true},isCollapsed:function(){return this.collapsed},add:function(f){if(!f.settings){f=new d.ui.MenuItem(f.id||b.uniqueId(),f)}this.onAddItem.dispatch(this,f);return this.items[f.id]=f},addSeparator:function(){return this.add({separator:true})},addMenu:function(f){if(!f.collapse){f=this.createMenu(f)}this.menuCount++;return this.add(f)},hasMenus:function(){return this.menuCount!==0},remove:function(f){delete this.items[f.id]},removeAll:function(){var f=this;a(f,function(g){if(g.removeAll){g.removeAll()}else{g.remove()}g.destroy()},"items",f);f.items={}},createMenu:function(g){var f=new d.ui.Menu(g.id||b.uniqueId(),g);f.onAddItem.add(this.onAddItem.dispatch,this.onAddItem);return f}})})(tinymce);(function(e){var d=e.is,c=e.DOM,f=e.each,a=e.dom.Event,b=e.dom.Element;e.create("tinymce.ui.DropMenu:tinymce.ui.Menu",{DropMenu:function(h,g){g=g||{};g.container=g.container||c.doc.body;g.offset_x=g.offset_x||0;g.offset_y=g.offset_y||0;g.vp_offset_x=g.vp_offset_x||0;g.vp_offset_y=g.vp_offset_y||0;if(d(g.icons)&&!g.icons){g["class"]+=" mceNoIcons"}this.parent(h,g);this.onShowMenu=new e.util.Dispatcher(this);this.onHideMenu=new e.util.Dispatcher(this);this.classPrefix="mceMenu"},createMenu:function(j){var h=this,i=h.settings,g;j.container=j.container||i.container;j.parent=h;j.constrain=j.constrain||i.constrain;j["class"]=j["class"]||i["class"];j.vp_offset_x=j.vp_offset_x||i.vp_offset_x;j.vp_offset_y=j.vp_offset_y||i.vp_offset_y;j.keyboard_focus=i.keyboard_focus;g=new e.ui.DropMenu(j.id||c.uniqueId(),j);g.onAddItem.add(h.onAddItem.dispatch,h.onAddItem);return g},focus:function(){var g=this;if(g.keyboardNav){g.keyboardNav.focus()}},update:function(){var i=this,j=i.settings,g=c.get("menu_"+i.id+"_tbl"),l=c.get("menu_"+i.id+"_co"),h,k;h=j.max_width?Math.min(g.offsetWidth,j.max_width):g.offsetWidth;k=j.max_height?Math.min(g.offsetHeight,j.max_height):g.offsetHeight;if(!c.boxModel){i.element.setStyles({width:h+2,height:k+2})}else{i.element.setStyles({width:h,height:k})}if(j.max_width){c.setStyle(l,"width",h)}if(j.max_height){c.setStyle(l,"height",k);if(g.clientHeight<j.max_height){c.setStyle(l,"overflow","hidden")}}},showMenu:function(p,n,r){var z=this,A=z.settings,o,g=c.getViewPort(),u,l,v,q,i=2,k,j,m=z.classPrefix;z.collapse(1);if(z.isMenuVisible){return}if(!z.rendered){o=c.add(z.settings.container,z.renderNode());f(z.items,function(h){h.postRender()});z.element=new b("menu_"+z.id,{blocker:1,container:A.container})}else{o=c.get("menu_"+z.id)}if(!e.isOpera){c.setStyles(o,{left:-65535,top:-65535})}c.show(o);z.update();p+=A.offset_x||0;n+=A.offset_y||0;g.w-=4;g.h-=4;if(A.constrain){u=o.clientWidth-i;l=o.clientHeight-i;v=g.x+g.w;q=g.y+g.h;if((p+A.vp_offset_x+u)>v){p=r?r-u:Math.max(0,(v-A.vp_offset_x)-u)}if((n+A.vp_offset_y+l)>q){n=Math.max(0,(q-A.vp_offset_y)-l)}}c.setStyles(o,{left:p,top:n});z.element.update();z.isMenuVisible=1;z.mouseClickFunc=a.add(o,"click",function(s){var h;s=s.target;if(s&&(s=c.getParent(s,"tr"))&&!c.hasClass(s,m+"ItemSub")){h=z.items[s.id];if(h.isDisabled()){return}k=z;while(k){if(k.hideMenu){k.hideMenu()}k=k.settings.parent}if(h.settings.onclick){h.settings.onclick(s)}return false}});if(z.hasMenus()){z.mouseOverFunc=a.add(o,"mouseover",function(x){var h,t,s;x=x.target;if(x&&(x=c.getParent(x,"tr"))){h=z.items[x.id];if(z.lastMenu){z.lastMenu.collapse(1)}if(h.isDisabled()){return}if(x&&c.hasClass(x,m+"ItemSub")){t=c.getRect(x);h.showMenu((t.x+t.w-i),t.y-i,t.x);z.lastMenu=h;c.addClass(c.get(h.id).firstChild,m+"ItemActive")}}})}a.add(o,"keydown",z._keyHandler,z);z.onShowMenu.dispatch(z);if(A.keyboard_focus){z._setupKeyboardNav()}},hideMenu:function(j){var g=this,i=c.get("menu_"+g.id),h;if(!g.isMenuVisible){return}if(g.keyboardNav){g.keyboardNav.destroy()}a.remove(i,"mouseover",g.mouseOverFunc);a.remove(i,"click",g.mouseClickFunc);a.remove(i,"keydown",g._keyHandler);c.hide(i);g.isMenuVisible=0;if(!j){g.collapse(1)}if(g.element){g.element.hide()}if(h=c.get(g.id)){c.removeClass(h.firstChild,g.classPrefix+"ItemActive")}g.onHideMenu.dispatch(g)},add:function(i){var g=this,h;i=g.parent(i);if(g.isRendered&&(h=c.get("menu_"+g.id))){g._add(c.select("tbody",h)[0],i)}return i},collapse:function(g){this.parent(g);this.hideMenu(1)},remove:function(g){c.remove(g.id);this.destroy();return this.parent(g)},destroy:function(){var g=this,h=c.get("menu_"+g.id);if(g.keyboardNav){g.keyboardNav.destroy()}a.remove(h,"mouseover",g.mouseOverFunc);a.remove(c.select("a",h),"focus",g.mouseOverFunc);a.remove(h,"click",g.mouseClickFunc);a.remove(h,"keydown",g._keyHandler);if(g.element){g.element.remove()}c.remove(h)},renderNode:function(){var i=this,j=i.settings,l,h,k,g;g=c.create("div",{role:"listbox",id:"menu_"+i.id,"class":j["class"],style:"position:absolute;left:0;top:0;z-index:200000;outline:0"});if(i.settings.parent){c.setAttrib(g,"aria-parent","menu_"+i.settings.parent.id)}k=c.add(g,"div",{role:"presentation",id:"menu_"+i.id+"_co","class":i.classPrefix+(j["class"]?" "+j["class"]:"")});i.element=new b("menu_"+i.id,{blocker:1,container:j.container});if(j.menu_line){c.add(k,"span",{"class":i.classPrefix+"Line"})}l=c.add(k,"table",{role:"presentation",id:"menu_"+i.id+"_tbl",border:0,cellPadding:0,cellSpacing:0});h=c.add(l,"tbody");f(i.items,function(m){i._add(h,m)});i.rendered=true;return g},_setupKeyboardNav:function(){var i,h,g=this;i=c.get("menu_"+g.id);h=c.select("a[role=option]","menu_"+g.id);h.splice(0,0,i);g.keyboardNav=new e.ui.KeyboardNavigation({root:"menu_"+g.id,items:h,onCancel:function(){g.hideMenu()},enableUpDown:true});i.focus()},_keyHandler:function(g){var h=this,i;switch(g.keyCode){case 37:if(h.settings.parent){h.hideMenu();h.settings.parent.focus();a.cancel(g)}break;case 39:if(h.mouseOverFunc){h.mouseOverFunc(g)}break}},_add:function(j,h){var i,q=h.settings,p,l,k,m=this.classPrefix,g;if(q.separator){l=c.add(j,"tr",{id:h.id,"class":m+"ItemSeparator"});c.add(l,"td",{"class":m+"ItemSeparator"});if(i=l.previousSibling){c.addClass(i,"mceLast")}return}i=l=c.add(j,"tr",{id:h.id,"class":m+"Item "+m+"ItemEnabled"});i=k=c.add(i,q.titleItem?"th":"td");i=p=c.add(i,"a",{id:h.id+"_aria",role:q.titleItem?"presentation":"option",href:"javascript:;",onclick:"return false;",onmousedown:"return false;"});if(q.parent){c.setAttrib(p,"aria-haspopup","true");c.setAttrib(p,"aria-owns","menu_"+h.id)}c.addClass(k,q["class"]);g=c.add(i,"span",{"class":"mceIcon"+(q.icon?" mce_"+q.icon:"")});if(q.icon_src){c.add(g,"img",{src:q.icon_src})}i=c.add(i,q.element||"span",{"class":"mceText",title:h.settings.title},h.settings.title);if(h.settings.style){if(typeof h.settings.style=="function"){h.settings.style=h.settings.style()}c.setAttrib(i,"style",h.settings.style)}if(j.childNodes.length==1){c.addClass(l,"mceFirst")}if((i=l.previousSibling)&&c.hasClass(i,m+"ItemSeparator")){c.addClass(l,"mceFirst")}if(h.collapse){c.addClass(l,m+"ItemSub")}if(i=l.previousSibling){c.removeClass(i,"mceLast")}c.addClass(l,"mceLast")}})})(tinymce);(function(b){var a=b.DOM;b.create("tinymce.ui.Button:tinymce.ui.Control",{Button:function(e,d,c){this.parent(e,d,c);this.classPrefix="mceButton"},renderHTML:function(){var f=this.classPrefix,e=this.settings,d,c;c=a.encode(e.label||"");d='<a role="button" id="'+this.id+'" href="javascript:;" class="'+f+" "+f+"Enabled "+e["class"]+(c?" "+f+"Labeled":"")+'" onmousedown="return false;" onclick="return false;" aria-labelledby="'+this.id+'_voice" title="'+a.encode(e.title)+'">';if(e.image&&!(this.editor&&this.editor.forcedHighContrastMode)){d+='<span class="mceIcon '+e["class"]+'"><img class="mceIcon" src="'+e.image+'" alt="'+a.encode(e.title)+'" /></span>'+(c?'<span class="'+f+'Label">'+c+"</span>":"")}else{d+='<span class="mceIcon '+e["class"]+'"></span>'+(c?'<span class="'+f+'Label">'+c+"</span>":"")}d+='<span class="mceVoiceLabel mceIconOnly" style="display: none;" id="'+this.id+'_voice">'+e.title+"</span>";d+="</a>";return d},postRender:function(){var d=this,e=d.settings,c;if(b.isIE&&d.editor){b.dom.Event.add(d.id,"mousedown",function(f){var g=d.editor.selection.getNode().nodeName;c=g==="IMG"?d.editor.selection.getBookmark():null})}b.dom.Event.add(d.id,"click",function(f){if(!d.isDisabled()){if(b.isIE&&d.editor&&c!==null){d.editor.selection.moveToBookmark(c)}return e.onclick.call(e.scope,f)}});b.dom.Event.add(d.id,"keydown",function(f){if(!d.isDisabled()&&f.keyCode==b.VK.SPACEBAR){b.dom.Event.cancel(f);return e.onclick.call(e.scope,f)}})}})})(tinymce);(function(e){var d=e.DOM,b=e.dom.Event,f=e.each,a=e.util.Dispatcher,c;e.create("tinymce.ui.ListBox:tinymce.ui.Control",{ListBox:function(j,i,g){var h=this;h.parent(j,i,g);h.items=[];h.onChange=new a(h);h.onPostRender=new a(h);h.onAdd=new a(h);h.onRenderMenu=new e.util.Dispatcher(this);h.classPrefix="mceListBox";h.marked={}},select:function(h){var g=this,j,i;g.marked={};if(h==c){return g.selectByIndex(-1)}if(h&&typeof(h)=="function"){i=h}else{i=function(k){return k==h}}if(h!=g.selectedValue){f(g.items,function(l,k){if(i(l.value)){j=1;g.selectByIndex(k);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(g){var i=this,j,k,h;i.marked={};if(g!=i.selectedIndex){j=d.get(i.id+"_text");h=d.get(i.id+"_voiceDesc");k=i.items[g];if(k){i.selectedValue=k.value;i.selectedIndex=g;d.setHTML(j,d.encode(k.title));d.setHTML(h,i.settings.title+" - "+k.title);d.removeClass(j,"mceTitle");d.setAttrib(i.id,"aria-valuenow",k.title)}else{d.setHTML(j,d.encode(i.settings.title));d.setHTML(h,d.encode(i.settings.title));d.addClass(j,"mceTitle");i.selectedValue=i.selectedIndex=null;d.setAttrib(i.id,"aria-valuenow",i.settings.title)}j=0}},mark:function(g){this.marked[g]=true},add:function(j,g,i){var h=this;i=i||{};i=e.extend(i,{title:j,value:g});h.items.push(i);h.onAdd.dispatch(h,i)},getLength:function(){return this.items.length},renderHTML:function(){var j="",g=this,i=g.settings,k=g.classPrefix;j='<span role="listbox" aria-haspopup="true" aria-labelledby="'+g.id+'_voiceDesc" aria-describedby="'+g.id+'_voiceDesc"><table role="presentation" tabindex="0" id="'+g.id+'" cellpadding="0" cellspacing="0" class="'+k+" "+k+"Enabled"+(i["class"]?(" "+i["class"]):"")+'"><tbody><tr>';j+="<td>"+d.createHTML("span",{id:g.id+"_voiceDesc","class":"voiceLabel",style:"display:none;"},g.settings.title);j+=d.createHTML("a",{id:g.id+"_text",tabindex:-1,href:"javascript:;","class":"mceText",onclick:"return false;",onmousedown:"return false;"},d.encode(g.settings.title))+"</td>";j+="<td>"+d.createHTML("a",{id:g.id+"_open",tabindex:-1,href:"javascript:;","class":"mceOpen",onclick:"return false;",onmousedown:"return false;"},'<span><span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span></span>')+"</td>";j+="</tr></tbody></table></span>";return j},showMenu:function(){var h=this,j,i=d.get(this.id),g;if(h.isDisabled()||h.items.length===0){return}if(h.menu&&h.menu.isMenuVisible){return h.hideMenu()}if(!h.isMenuRendered){h.renderMenu();h.isMenuRendered=true}j=d.getPos(i);g=h.menu;g.settings.offset_x=j.x;g.settings.offset_y=j.y;g.settings.keyboard_focus=!e.isOpera;f(h.items,function(k){if(g.items[k.id]){g.items[k.id].setSelected(0)}});f(h.items,function(k){if(g.items[k.id]&&h.marked[k.value]){g.items[k.id].setSelected(1)}if(k.value===h.selectedValue){g.items[k.id].setSelected(1)}});g.showMenu(0,i.clientHeight);b.add(d.doc,"mousedown",h.hideMenu,h);d.addClass(h.id,h.classPrefix+"Selected")},hideMenu:function(h){var g=this;if(g.menu&&g.menu.isMenuVisible){d.removeClass(g.id,g.classPrefix+"Selected");if(h&&h.type=="mousedown"&&(h.target.id==g.id+"_text"||h.target.id==g.id+"_open")){return}if(!h||!d.getParent(h.target,".mceMenu")){d.removeClass(g.id,g.classPrefix+"Selected");b.remove(d.doc,"mousedown",g.hideMenu,g);g.menu.hideMenu()}}},renderMenu:function(){var h=this,g;g=h.settings.control_manager.createDropMenu(h.id+"_menu",{menu_line:1,"class":h.classPrefix+"Menu mceNoIcons",max_width:250,max_height:150});g.onHideMenu.add(function(){h.hideMenu();h.focus()});g.add({title:h.settings.title,"class":"mceMenuItemTitle",onclick:function(){if(h.settings.onselect("")!==false){h.select("")}}});f(h.items,function(i){if(i.value===c){g.add({title:i.title,role:"option","class":"mceMenuItemTitle",onclick:function(){if(h.settings.onselect("")!==false){h.select("")}}})}else{i.id=d.uniqueId();i.role="option";i.onclick=function(){if(h.settings.onselect(i.value)!==false){h.select(i.value)}};g.add(i)}});h.onRenderMenu.dispatch(h,g);h.menu=g},postRender:function(){var g=this,h=g.classPrefix;b.add(g.id,"click",g.showMenu,g);b.add(g.id,"keydown",function(i){if(i.keyCode==32){g.showMenu(i);b.cancel(i)}});b.add(g.id,"focus",function(){if(!g._focused){g.keyDownHandler=b.add(g.id,"keydown",function(i){if(i.keyCode==40){g.showMenu();b.cancel(i)}});g.keyPressHandler=b.add(g.id,"keypress",function(j){var i;if(j.keyCode==13){i=g.selectedValue;g.selectedValue=null;b.cancel(j);g.settings.onselect(i)}})}g._focused=1});b.add(g.id,"blur",function(){b.remove(g.id,"keydown",g.keyDownHandler);b.remove(g.id,"keypress",g.keyPressHandler);g._focused=0});if(e.isIE6||!d.boxModel){b.add(g.id,"mouseover",function(){if(!d.hasClass(g.id,h+"Disabled")){d.addClass(g.id,h+"Hover")}});b.add(g.id,"mouseout",function(){if(!d.hasClass(g.id,h+"Disabled")){d.removeClass(g.id,h+"Hover")}})}g.onPostRender.dispatch(g,d.get(g.id))},destroy:function(){this.parent();b.clear(this.id+"_text");b.clear(this.id+"_open")}})})(tinymce);(function(e){var d=e.DOM,b=e.dom.Event,f=e.each,a=e.util.Dispatcher,c;e.create("tinymce.ui.NativeListBox:tinymce.ui.ListBox",{NativeListBox:function(h,g){this.parent(h,g);this.classPrefix="mceNativeListBox"},setDisabled:function(g){d.get(this.id).disabled=g;this.setAriaProperty("disabled",g)},isDisabled:function(){return d.get(this.id).disabled},select:function(h){var g=this,j,i;if(h==c){return g.selectByIndex(-1)}if(h&&typeof(h)=="function"){i=h}else{i=function(k){return k==h}}if(h!=g.selectedValue){f(g.items,function(l,k){if(i(l.value)){j=1;g.selectByIndex(k);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(g){d.get(this.id).selectedIndex=g+1;this.selectedValue=this.items[g]?this.items[g].value:null},add:function(k,h,g){var j,i=this;g=g||{};g.value=h;if(i.isRendered()){d.add(d.get(this.id),"option",g,k)}j={title:k,value:h,attribs:g};i.items.push(j);i.onAdd.dispatch(i,j)},getLength:function(){return this.items.length},renderHTML:function(){var i,g=this;i=d.createHTML("option",{value:""},"-- "+g.settings.title+" --");f(g.items,function(h){i+=d.createHTML("option",{value:h.value},h.title)});i=d.createHTML("select",{id:g.id,"class":"mceNativeListBox","aria-labelledby":g.id+"_aria"},i);i+=d.createHTML("span",{id:g.id+"_aria",style:"display: none"},g.settings.title);return i},postRender:function(){var h=this,i,j=true;h.rendered=true;function g(l){var k=h.items[l.target.selectedIndex-1];if(k&&(k=k.value)){h.onChange.dispatch(h,k);if(h.settings.onselect){h.settings.onselect(k)}}}b.add(h.id,"change",g);b.add(h.id,"keydown",function(q){var n,p=37,m=39,l=38,r=40,k=13,o=32;b.remove(h.id,"change",i);j=false;n=b.add(h.id,"blur",function(){if(j){return}j=true;b.add(h.id,"change",g);b.remove(h.id,"blur",n)});if(q.keyCode==k||q.keyCode==o){g(q);return b.cancel(q)}else{if(q.keyCode==r||q.keyCode==l){q.stopImmediatePropagation()}}});h.onPostRender.dispatch(h,d.get(h.id))}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.MenuButton:tinymce.ui.Button",{MenuButton:function(g,f,e){this.parent(g,f,e);this.onRenderMenu=new c.util.Dispatcher(this);f.menu_container=f.menu_container||b.doc.body},showMenu:function(){var g=this,j,i,h=b.get(g.id),f;if(g.isDisabled()){return}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}if(g.isMenuVisible){return g.hideMenu()}j=b.getPos(g.settings.menu_container);i=b.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.vp_offset_x=i.x;f.settings.vp_offset_y=i.y;f.settings.keyboard_focus=g._focused;f.showMenu(0,h.firstChild.clientHeight);a.add(b.doc,"mousedown",g.hideMenu,g);g.setState("Selected",1);g.isMenuVisible=1},renderMenu:function(){var f=this,e;e=f.settings.control_manager.createDropMenu(f.id+"_menu",{menu_line:1,"class":this.classPrefix+"Menu",icons:f.settings.icons});e.onHideMenu.add(function(){f.hideMenu();f.focus()});f.onRenderMenu.dispatch(f,e);f.menu=e},hideMenu:function(g){var f=this;if(g&&g.type=="mousedown"&&b.getParent(g.target,function(h){return h.id===f.id||h.id===f.id+"_open"})){return}if(!g||!b.getParent(g.target,".mceMenu")){f.setState("Selected",0);a.remove(b.doc,"mousedown",f.hideMenu,f);if(f.menu){f.menu.hideMenu()}}f.isMenuVisible=0},postRender:function(){var e=this,f=e.settings;a.add(e.id,"click",function(){if(!e.isDisabled()){if(f.onclick){f.onclick(e.value)}e.showMenu()}})}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.SplitButton:tinymce.ui.MenuButton",{SplitButton:function(g,f,e){this.parent(g,f,e);this.classPrefix="mceSplitButton"},renderHTML:function(){var i,f=this,g=f.settings,e;i="<tbody><tr>";if(g.image){e=b.createHTML("img ",{src:g.image,role:"presentation","class":"mceAction "+g["class"]})}else{e=b.createHTML("span",{"class":"mceAction "+g["class"]},"")}e+=b.createHTML("span",{"class":"mceVoiceLabel mceIconOnly",id:f.id+"_voice",style:"display:none;"},g.title);i+="<td >"+b.createHTML("a",{role:"button",id:f.id+"_action",tabindex:"-1",href:"javascript:;","class":"mceAction "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";e=b.createHTML("span",{"class":"mceOpen "+g["class"]},'<span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span>');i+="<td >"+b.createHTML("a",{role:"button",id:f.id+"_open",tabindex:"-1",href:"javascript:;","class":"mceOpen "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";i+="</tr></tbody>";i=b.createHTML("table",{role:"presentation","class":"mceSplitButton mceSplitButtonEnabled "+g["class"],cellpadding:"0",cellspacing:"0",title:g.title},i);return b.createHTML("div",{id:f.id,role:"button",tabindex:"0","aria-labelledby":f.id+"_voice","aria-haspopup":"true"},i)},postRender:function(){var e=this,g=e.settings,f;if(g.onclick){f=function(h){if(!e.isDisabled()){g.onclick(e.value);a.cancel(h)}};a.add(e.id+"_action","click",f);a.add(e.id,["click","keydown"],function(h){var k=32,m=14,i=13,j=38,l=40;if((h.keyCode===32||h.keyCode===13||h.keyCode===14)&&!h.altKey&&!h.ctrlKey&&!h.metaKey){f();a.cancel(h)}else{if(h.type==="click"||h.keyCode===l){e.showMenu();a.cancel(h)}}})}a.add(e.id+"_open","click",function(h){e.showMenu();a.cancel(h)});a.add([e.id,e.id+"_open"],"focus",function(){e._focused=1});a.add([e.id,e.id+"_open"],"blur",function(){e._focused=0});if(c.isIE6||!b.boxModel){a.add(e.id,"mouseover",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.addClass(e.id,"mceSplitButtonHover")}});a.add(e.id,"mouseout",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.removeClass(e.id,"mceSplitButtonHover")}})}},destroy:function(){this.parent();a.clear(this.id+"_action");a.clear(this.id+"_open");a.clear(this.id)}})})(tinymce);(function(d){var c=d.DOM,a=d.dom.Event,b=d.is,e=d.each;d.create("tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton",{ColorSplitButton:function(i,h,f){var g=this;g.parent(i,h,f);g.settings=h=d.extend({colors:"000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,008000,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF",grid_width:8,default_color:"#888888"},g.settings);g.onShowMenu=new d.util.Dispatcher(g);g.onHideMenu=new d.util.Dispatcher(g);g.value=h.default_color},showMenu:function(){var f=this,g,j,i,h;if(f.isDisabled()){return}if(!f.isMenuRendered){f.renderMenu();f.isMenuRendered=true}if(f.isMenuVisible){return f.hideMenu()}i=c.get(f.id);c.show(f.id+"_menu");c.addClass(i,"mceSplitButtonSelected");h=c.getPos(i);c.setStyles(f.id+"_menu",{left:h.x,top:h.y+i.firstChild.clientHeight,zIndex:200000});i=0;a.add(c.doc,"mousedown",f.hideMenu,f);f.onShowMenu.dispatch(f);if(f._focused){f._keyHandler=a.add(f.id+"_menu","keydown",function(k){if(k.keyCode==27){f.hideMenu()}});c.select("a",f.id+"_menu")[0].focus()}f.keyboardNav=new d.ui.KeyboardNavigation({root:f.id+"_menu",items:c.select("a",f.id+"_menu"),onCancel:function(){f.hideMenu();f.focus()}});f.keyboardNav.focus();f.isMenuVisible=1},hideMenu:function(g){var f=this;if(f.isMenuVisible){if(g&&g.type=="mousedown"&&c.getParent(g.target,function(h){return h.id===f.id+"_open"})){return}if(!g||!c.getParent(g.target,".mceSplitButtonMenu")){c.removeClass(f.id,"mceSplitButtonSelected");a.remove(c.doc,"mousedown",f.hideMenu,f);a.remove(f.id+"_menu","keydown",f._keyHandler);c.hide(f.id+"_menu")}f.isMenuVisible=0;f.onHideMenu.dispatch();f.keyboardNav.destroy()}},renderMenu:function(){var p=this,h,k=0,q=p.settings,g,j,l,o,f;o=c.add(q.menu_container,"div",{role:"listbox",id:p.id+"_menu","class":q.menu_class+" "+q["class"],style:"position:absolute;left:0;top:-1000px;"});h=c.add(o,"div",{"class":q["class"]+" mceSplitButtonMenu"});c.add(h,"span",{"class":"mceMenuLine"});g=c.add(h,"table",{role:"presentation","class":"mceColorSplitMenu"});j=c.add(g,"tbody");k=0;e(b(q.colors,"array")?q.colors:q.colors.split(","),function(m){m=m.replace(/^#/,"");if(!k--){l=c.add(j,"tr");k=q.grid_width-1}g=c.add(l,"td");var i={href:"javascript:;",style:{backgroundColor:"#"+m},title:p.editor.getLang("colors."+m,m),"data-mce-color":"#"+m};if(!d.isIE){i.role="option"}g=c.add(g,"a",i);if(p.editor.forcedHighContrastMode){g=c.add(g,"canvas",{width:16,height:16,"aria-hidden":"true"});if(g.getContext&&(f=g.getContext("2d"))){f.fillStyle="#"+m;f.fillRect(0,0,16,16)}else{c.remove(g)}}});if(q.more_colors_func){g=c.add(j,"tr");g=c.add(g,"td",{colspan:q.grid_width,"class":"mceMoreColors"});g=c.add(g,"a",{role:"option",id:p.id+"_more",href:"javascript:;",onclick:"return false;","class":"mceMoreColors"},q.more_colors_title);a.add(g,"click",function(i){q.more_colors_func.call(q.more_colors_scope||this);return a.cancel(i)})}c.addClass(h,"mceColorSplitMenu");a.add(p.id+"_menu","mousedown",function(i){return a.cancel(i)});a.add(p.id+"_menu","click",function(i){var m;i=c.getParent(i.target,"a",j);if(i&&i.nodeName.toLowerCase()=="a"&&(m=i.getAttribute("data-mce-color"))){p.setColor(m)}return false});return o},setColor:function(f){this.displayColor(f);this.hideMenu();this.settings.onselect(f)},displayColor:function(g){var f=this;c.setStyle(f.id+"_preview","backgroundColor",g);f.value=g},postRender:function(){var f=this,g=f.id;f.parent();c.add(g+"_action","div",{id:g+"_preview","class":"mceColorPreview"});c.setStyle(f.id+"_preview","backgroundColor",f.value)},destroy:function(){var f=this;f.parent();a.clear(f.id+"_menu");a.clear(f.id+"_more");c.remove(f.id+"_menu");if(f.keyboardNav){f.keyboardNav.destroy()}}})})(tinymce);(function(b){var d=b.DOM,c=b.each,a=b.dom.Event;b.create("tinymce.ui.ToolbarGroup:tinymce.ui.Container",{renderHTML:function(){var f=this,i=[],e=f.controls,j=b.each,g=f.settings;i.push('<div id="'+f.id+'" role="group" aria-labelledby="'+f.id+'_voice">');i.push("<span role='application'>");i.push('<span id="'+f.id+'_voice" class="mceVoiceLabel" style="display:none;">'+d.encode(g.name)+"</span>");j(e,function(h){i.push(h.renderHTML())});i.push("</span>");i.push("</div>");return i.join("")},focus:function(){var e=this;d.get(e.id).focus()},postRender:function(){var f=this,e=[];c(f.controls,function(g){c(g.controls,function(h){if(h.id){e.push(h)}})});f.keyNav=new b.ui.KeyboardNavigation({root:f.id,items:e,onCancel:function(){if(b.isWebKit){d.get(f.editor.id+"_ifr").focus()}f.editor.focus()},excludeFromTabOrder:!f.settings.tab_focus_toolbar})},destroy:function(){var e=this;e.parent();e.keyNav.destroy();a.clear(e.id)}})})(tinymce);(function(a){var c=a.DOM,b=a.each;a.create("tinymce.ui.Toolbar:tinymce.ui.Container",{renderHTML:function(){var m=this,f="",j,k,n=m.settings,e,d,g,l;l=m.controls;for(e=0;e<l.length;e++){k=l[e];d=l[e-1];g=l[e+1];if(e===0){j="mceToolbarStart";if(k.Button){j+=" mceToolbarStartButton"}else{if(k.SplitButton){j+=" mceToolbarStartSplitButton"}else{if(k.ListBox){j+=" mceToolbarStartListBox"}}}f+=c.createHTML("td",{"class":j},c.createHTML("span",null,"<!-- IE -->"))}if(d&&k.ListBox){if(d.Button||d.SplitButton){f+=c.createHTML("td",{"class":"mceToolbarEnd"},c.createHTML("span",null,"<!-- IE -->"))}}if(c.stdMode){f+='<td style="position: relative">'+k.renderHTML()+"</td>"}else{f+="<td>"+k.renderHTML()+"</td>"}if(g&&k.ListBox){if(g.Button||g.SplitButton){f+=c.createHTML("td",{"class":"mceToolbarStart"},c.createHTML("span",null,"<!-- IE -->"))}}}j="mceToolbarEnd";if(k.Button){j+=" mceToolbarEndButton"}else{if(k.SplitButton){j+=" mceToolbarEndSplitButton"}else{if(k.ListBox){j+=" mceToolbarEndListBox"}}}f+=c.createHTML("td",{"class":j},c.createHTML("span",null,"<!-- IE -->"));return c.createHTML("table",{id:m.id,"class":"mceToolbar"+(n["class"]?" "+n["class"]:""),cellpadding:"0",cellspacing:"0",align:m.settings.align||"",role:"presentation",tabindex:"-1"},"<tbody><tr>"+f+"</tr></tbody>")}})})(tinymce);(function(b){var a=b.util.Dispatcher,c=b.each;b.create("tinymce.AddOnManager",{AddOnManager:function(){var d=this;d.items=[];d.urls={};d.lookup={};d.onAdd=new a(d)},get:function(d){if(this.lookup[d]){return this.lookup[d].instance}else{return undefined}},dependencies:function(e){var d;if(this.lookup[e]){d=this.lookup[e].dependencies}return d||[]},requireLangPack:function(e){var d=b.settings;if(d&&d.language&&d.language_load!==false){b.ScriptLoader.add(this.urls[e]+"/langs/"+d.language+".js")}},add:function(f,e,d){this.items.push(e);this.lookup[f]={instance:e,dependencies:d};this.onAdd.dispatch(this,f,e);return e},createUrl:function(d,e){if(typeof e==="object"){return e}else{return{prefix:d.prefix,resource:e,suffix:d.suffix}}},addComponents:function(f,d){var e=this.urls[f];b.each(d,function(g){b.ScriptLoader.add(e+"/"+g)})},load:function(j,f,d,h){var g=this,e=f;function i(){var k=g.dependencies(j);b.each(k,function(m){var l=g.createUrl(f,m);g.load(l.resource,l,undefined,undefined)});if(d){if(h){d.call(h)}else{d.call(b.ScriptLoader)}}}if(g.urls[j]){return}if(typeof f==="object"){e=f.prefix+f.resource+f.suffix}if(e.indexOf("/")!==0&&e.indexOf("://")==-1){e=b.baseURL+"/"+e}g.urls[j]=e.substring(0,e.lastIndexOf("/"));if(g.lookup[j]){i()}else{b.ScriptLoader.add(e,i,h)}}});b.PluginManager=new b.AddOnManager();b.ThemeManager=new b.AddOnManager()}(tinymce));(function(j){var g=j.each,d=j.extend,k=j.DOM,i=j.dom.Event,f=j.ThemeManager,b=j.PluginManager,e=j.explode,h=j.util.Dispatcher,a,c=0;j.documentBaseURL=window.location.href.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,"");if(!/[\/\\]$/.test(j.documentBaseURL)){j.documentBaseURL+="/"}j.baseURL=new j.util.URI(j.documentBaseURL).toAbsolute(j.baseURL);j.baseURI=new j.util.URI(j.baseURL);j.onBeforeUnload=new h(j);i.add(window,"beforeunload",function(l){j.onBeforeUnload.dispatch(j,l)});j.onAddEditor=new h(j);j.onRemoveEditor=new h(j);j.EditorManager=d(j,{editors:[],i18n:{},activeEditor:null,init:function(x){var v=this,o,n=j.ScriptLoader,u,l=[],r;function q(t){var s=t.id;if(!s){s=t.name;if(s&&!k.get(s)){s=t.name}else{s=k.uniqueId()}t.setAttribute("id",s)}return s}function m(z,A,t){var y=z[A];if(!y){return}if(j.is(y,"string")){t=y.replace(/\.\w+$/,"");t=t?j.resolve(t):0;y=j.resolve(y)}return y.apply(t||this,Array.prototype.slice.call(arguments,2))}function p(t,s){return s.constructor===RegExp?s.test(t.className):k.hasClass(t,s)}v.settings=x;i.bind(window,"ready",function(){var s,t;m(x,"onpageload");switch(x.mode){case"exact":s=x.elements||"";if(s.length>0){g(e(s),function(y){if(k.get(y)){r=new j.Editor(y,x);l.push(r);r.render(1)}else{g(document.forms,function(z){g(z.elements,function(A){if(A.name===y){y="mce_editor_"+c++;k.setAttrib(A,"id",y);r=new j.Editor(y,x);l.push(r);r.render(1)}})})}})}break;case"textareas":case"specific_textareas":g(k.select("textarea"),function(y){if(x.editor_deselector&&p(y,x.editor_deselector)){return}if(!x.editor_selector||p(y,x.editor_selector)){r=new j.Editor(q(y),x);l.push(r);r.render(1)}});break;default:if(x.types){g(x.types,function(y){g(k.select(y.selector),function(A){var z=new j.Editor(q(A),j.extend({},x,y));l.push(z);z.render(1)})})}else{if(x.selector){g(k.select(x.selector),function(z){var y=new j.Editor(q(z),x);l.push(y);y.render(1)})}}}if(x.oninit){s=t=0;g(l,function(y){t++;if(!y.initialized){y.onInit.add(function(){s++;if(s==t){m(x,"oninit")}})}else{s++}if(s==t){m(x,"oninit")}})}})},get:function(l){if(l===a){return this.editors}if(!this.editors.hasOwnProperty(l)){return a}return this.editors[l]},getInstanceById:function(l){return this.get(l)},add:function(m){var l=this,n=l.editors;n[m.id]=m;n.push(m);l._setActive(m);l.onAddEditor.dispatch(l,m);if(j.adapter){j.adapter.patchEditor(m)}return m},remove:function(n){var m=this,l,o=m.editors;if(!o[n.id]){return null}delete o[n.id];for(l=0;l<o.length;l++){if(o[l]==n){o.splice(l,1);break}}if(m.activeEditor==n){m._setActive(o[0])}n.destroy();m.onRemoveEditor.dispatch(m,n);return n},execCommand:function(r,p,o){var q=this,n=q.get(o),l;function m(){n.destroy();l.detachEvent("onunload",m);l=l.tinyMCE=l.tinymce=null}switch(r){case"mceFocus":n.focus();return true;case"mceAddEditor":case"mceAddControl":if(!q.get(o)){new j.Editor(o,q.settings).render()}return true;case"mceAddFrameControl":l=o.window;l.tinyMCE=tinyMCE;l.tinymce=j;j.DOM.doc=l.document;j.DOM.win=l;n=new j.Editor(o.element_id,o);n.render();if(j.isIE&&!j.isIE11){l.attachEvent("onunload",m)}o.page_window=null;return true;case"mceRemoveEditor":case"mceRemoveControl":if(n){n.remove()}return true;case"mceToggleEditor":if(!n){q.execCommand("mceAddControl",0,o);return true}if(n.isHidden()){n.show()}else{n.hide()}return true}if(q.activeEditor){return q.activeEditor.execCommand(r,p,o)}return false},execInstanceCommand:function(p,o,n,m){var l=this.get(p);if(l){return l.execCommand(o,n,m)}return false},triggerSave:function(){g(this.editors,function(l){l.save()})},addI18n:function(n,q){var l,m=this.i18n;if(!j.is(n,"string")){g(n,function(r,p){g(r,function(t,s){g(t,function(v,u){if(s==="common"){m[p+"."+u]=v}else{m[p+"."+s+"."+u]=v}})})})}else{g(q,function(r,p){m[n+"."+p]=r})}},_setActive:function(l){this.selectedInstance=this.activeEditor=l}})})(tinymce);(function(k){var l=k.DOM,j=k.dom.Event,f=k.extend,i=k.each,a=k.isGecko,b=k.isIE,e=k.isWebKit,d=k.is,h=k.ThemeManager,c=k.PluginManager,g=k.explode;k.create("tinymce.Editor",{Editor:function(p,o){var m=this,n=true;m.settings=o=f({id:p,language:"en",theme:"advanced",skin:"default",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:k.documentBaseURL,add_form_submit_trigger:n,submit_patch:n,add_unload_trigger:n,convert_urls:n,relative_urls:n,remove_script_host:n,table_inline_editing:false,object_resizing:n,accessibility_focus:n,doctype:k.isIE6?'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">':"<!DOCTYPE>",visual:n,font_size_style_values:"xx-small,x-small,small,medium,large,x-large,xx-large",font_size_legacy_values:"xx-small,small,medium,large,x-large,xx-large,300%",apply_source_formatting:n,directionality:"ltr",forced_root_block:"p",hidden_input:n,padd_empty_editor:n,render_ui:n,indentation:"30px",fix_table_elements:n,inline_styles:n,convert_fonts_to_spans:n,indent:"simple",indent_before:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside,figure,option,optgroup,datalist",indent_after:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside,figure,option,optgroup,datalist",validate:n,entity_encoding:"named",url_converter:m.convertURL,url_converter_scope:m,ie7_compat:n},o);m.id=m.editorId=p;m.isNotDirty=false;m.plugins={};m.documentBaseURI=new k.util.URI(o.document_base_url||k.documentBaseURL,{base_uri:tinyMCE.baseURI});m.baseURI=k.baseURI;m.contentCSS=[];m.contentStyles=[];m.setupEvents();m.execCommands={};m.queryStateCommands={};m.queryValueCommands={};m.execCallback("setup",m)},render:function(o){var p=this,q=p.settings,r=p.id,m=k.ScriptLoader;if(!j.domLoaded){j.add(window,"ready",function(){p.render()});return}tinyMCE.settings=q;if(!p.getElement()){return}if(k.isIDevice&&!k.isIOS5){return}if(!/TEXTAREA|INPUT/i.test(p.getElement().nodeName)&&q.hidden_input&&l.getParent(r,"form")){l.insertAfter(l.create("input",{type:"hidden",name:r}),r)}if(!q.content_editable){p.orgVisibility=p.getElement().style.visibility;p.getElement().style.visibility="hidden"}if(k.WindowManager){p.windowManager=new k.WindowManager(p)}if(q.encoding=="xml"){p.onGetContent.add(function(s,t){if(t.save){t.content=l.encode(t.content)}})}if(q.add_form_submit_trigger){p.onSubmit.addToTop(function(){if(p.initialized){p.save();p.isNotDirty=1}})}if(q.add_unload_trigger){p._beforeUnload=tinyMCE.onBeforeUnload.add(function(){if(p.initialized&&!p.destroyed&&!p.isHidden()){p.save({format:"raw",no_events:true})}})}k.addUnload(p.destroy,p);if(q.submit_patch){p.onBeforeRenderUI.add(function(){var s=p.getElement().form;if(!s){return}if(s._mceOldSubmit){return}if(!s.submit.nodeType&&!s.submit.length){p.formElement=s;s._mceOldSubmit=s.submit;s.submit=function(){k.triggerSave();p.isNotDirty=1;return p.formElement._mceOldSubmit(p.formElement)}}s=null})}function n(){if(q.language&&q.language_load!==false){m.add(k.baseURL+"/langs/"+q.language+".js")}if(q.theme&&typeof q.theme!="function"&&q.theme.charAt(0)!="-"&&!h.urls[q.theme]){h.load(q.theme,"themes/"+q.theme+"/editor_template"+k.suffix+".js")}i(g(q.plugins),function(t){if(t&&!c.urls[t]){if(t.charAt(0)=="-"){t=t.substr(1,t.length);var s=c.dependencies(t);i(s,function(v){var u={prefix:"plugins/",resource:v,suffix:"/editor_plugin"+k.suffix+".js"};v=c.createUrl(u,v);c.load(v.resource,v)})}else{if(t=="safari"){return}c.load(t,{prefix:"plugins/",resource:t,suffix:"/editor_plugin"+k.suffix+".js"})}}});m.loadQueue(function(){if(!p.removed){p.init()}})}n()},init:function(){var q,G=this,H=G.settings,D,y,z,C=G.getElement(),p,m,E,v,B,F,x,r=[];k.add(G);H.aria_label=H.aria_label||l.getAttrib(C,"aria-label",G.getLang("aria.rich_text_area"));if(H.theme){if(typeof H.theme!="function"){H.theme=H.theme.replace(/-/,"");p=h.get(H.theme);G.theme=new p();if(G.theme.init){G.theme.init(G,h.urls[H.theme]||k.documentBaseURL.replace(/\/$/,""))}}else{G.theme=H.theme}}function A(s){var t=c.get(s),o=c.urls[s]||k.documentBaseURL.replace(/\/$/,""),n;if(t&&k.inArray(r,s)===-1){i(c.dependencies(s),function(u){A(u)});n=new t(G,o);G.plugins[s]=n;if(n.init){n.init(G,o);r.push(s)}}}i(g(H.plugins.replace(/\-/g,"")),A);if(H.popup_css!==false){if(H.popup_css){H.popup_css=G.documentBaseURI.toAbsolute(H.popup_css)}else{H.popup_css=G.baseURI.toAbsolute("themes/"+H.theme+"/skins/"+H.skin+"/dialog.css")}}if(H.popup_css_add){H.popup_css+=","+G.documentBaseURI.toAbsolute(H.popup_css_add)}G.controlManager=new k.ControlManager(G);G.onBeforeRenderUI.dispatch(G,G.controlManager);if(H.render_ui&&G.theme){G.orgDisplay=C.style.display;if(typeof H.theme!="function"){D=H.width||C.style.width||C.offsetWidth;y=H.height||C.style.height||C.offsetHeight;z=H.min_height||100;F=/^[0-9\.]+(|px)$/i;if(F.test(""+D)){D=Math.max(parseInt(D,10)+(p.deltaWidth||0),100)}if(F.test(""+y)){y=Math.max(parseInt(y,10)+(p.deltaHeight||0),z)}p=G.theme.renderUI({targetNode:C,width:D,height:y,deltaWidth:H.delta_width,deltaHeight:H.delta_height});l.setStyles(p.sizeContainer||p.editorContainer,{width:D,height:y});y=(p.iframeHeight||y)+(typeof(y)=="number"?(p.deltaHeight||0):"");if(y<z){y=z}}else{p=H.theme(G,C);if(p.editorContainer.nodeType){p.editorContainer=p.editorContainer.id=p.editorContainer.id||G.id+"_parent"}if(p.iframeContainer.nodeType){p.iframeContainer=p.iframeContainer.id=p.iframeContainer.id||G.id+"_iframecontainer"}y=p.iframeHeight||C.offsetHeight;if(b){G.onInit.add(function(n){n.dom.bind(n.getBody(),"beforedeactivate keydown keyup",function(){n.bookmark=n.selection.getBookmark(1)})});G.onNodeChange.add(function(n){if(document.activeElement.id==n.id+"_ifr"){n.bookmark=n.selection.getBookmark(1)}})}}G.editorContainer=p.editorContainer}if(H.content_css){i(g(H.content_css),function(n){G.contentCSS.push(G.documentBaseURI.toAbsolute(n))})}if(H.content_style){G.contentStyles.push(H.content_style)}if(H.content_editable){C=q=p=null;return G.initContentBody()}if(document.domain&&location.hostname!=document.domain){k.relaxedDomain=document.domain}G.iframeHTML=H.doctype+'<html><head xmlns="http://www.w3.org/1999/xhtml">';if(H.document_base_url!=k.documentBaseURL){G.iframeHTML+='<base href="'+G.documentBaseURI.getURI()+'" />'}if(k.isIE8){if(H.ie7_compat){G.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=7" />'}else{G.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=edge" />'}}G.iframeHTML+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';for(x=0;x<G.contentCSS.length;x++){G.iframeHTML+='<link type="text/css" rel="stylesheet" href="'+G.contentCSS[x]+'" />'}G.contentCSS=[];v=H.body_id||"tinymce";if(v.indexOf("=")!=-1){v=G.getParam("body_id","","hash");v=v[G.id]||v}B=H.body_class||"";if(B.indexOf("=")!=-1){B=G.getParam("body_class","","hash");B=B[G.id]||""}G.iframeHTML+='</head><body id="'+v+'" class="mceContentBody '+B+'" onload="window.parent.tinyMCE.get(\''+G.id+"').onLoad.dispatch();\"><br></body></html>";if(k.relaxedDomain&&(b||(k.isOpera&&parseFloat(opera.version())<11))){E='javascript:(function(){document.open();document.domain="'+document.domain+'";var ed = window.parent.tinyMCE.get("'+G.id+'");document.write(ed.iframeHTML);document.close();ed.initContentBody();})()'}q=l.add(p.iframeContainer,"iframe",{id:G.id+"_ifr",src:E||'javascript:""',frameBorder:"0",allowTransparency:"true",title:H.aria_label,style:{width:"100%",height:y,display:"block"}});G.contentAreaContainer=p.iframeContainer;if(p.editorContainer){l.get(p.editorContainer).style.display=G.orgDisplay}C.style.visibility=G.orgVisibility;l.get(G.id).style.display="none";l.setAttrib(G.id,"aria-hidden",true);if(!k.relaxedDomain||!E){G.initContentBody()}C=q=p=null},initContentBody:function(){var n=this,p=n.settings,q=l.get(n.id),r=n.getDoc(),o,m,s;if((!b||!k.relaxedDomain)&&!p.content_editable){r.open();r.write(n.iframeHTML);r.close();if(k.relaxedDomain){r.domain=k.relaxedDomain}}if(p.content_editable){l.addClass(q,"mceContentBody");n.contentDocument=r=p.content_document||document;n.contentWindow=p.content_window||window;n.bodyElement=q;p.content_document=p.content_window=null}m=n.getBody();m.disabled=true;if(!p.readonly){m.contentEditable=n.getParam("content_editable_state",true)}m.disabled=false;n.schema=new k.html.Schema(p);n.dom=new k.dom.DOMUtils(r,{keep_values:true,url_converter:n.convertURL,url_converter_scope:n,hex_colors:p.force_hex_style_colors,class_filter:p.class_filter,update_styles:true,root_element:p.content_editable?n.id:null,schema:n.schema});n.parser=new k.html.DomParser(p,n.schema);n.parser.addAttributeFilter("src,href,style",function(t,u){var v=t.length,y,A=n.dom,z,x;while(v--){y=t[v];z=y.attr(u);x="data-mce-"+u;if(!y.attributes.map[x]){if(u==="style"){y.attr(x,A.serializeStyle(A.parseStyle(z),y.name))}else{y.attr(x,n.convertURL(z,u,y.name))}}}});n.parser.addNodeFilter("script",function(t,u){var v=t.length,x;while(v--){x=t[v];x.attr("type","mce-"+(x.attr("type")||"text/javascript"))}});n.parser.addNodeFilter("#cdata",function(t,u){var v=t.length,x;while(v--){x=t[v];x.type=8;x.name="#comment";x.value="[CDATA["+x.value+"]]"}});n.parser.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",function(u,v){var x=u.length,y,t=n.schema.getNonEmptyElements();while(x--){y=u[x];if(y.isEmpty(t)){y.empty().append(new k.html.Node("br",1)).shortEnded=true}}});n.serializer=new k.dom.Serializer(p,n.dom,n.schema);n.selection=new k.dom.Selection(n.dom,n.getWin(),n.serializer,n);n.formatter=new k.Formatter(n);n.undoManager=new k.UndoManager(n);n.forceBlocks=new k.ForceBlocks(n);n.enterKey=new k.EnterKey(n);n.editorCommands=new k.EditorCommands(n);n.onExecCommand.add(function(t,u){if(!/^(FontName|FontSize)$/.test(u)){n.nodeChanged()}});n.serializer.onPreProcess.add(function(t,u){return n.onPreProcess.dispatch(n,u,t)});n.serializer.onPostProcess.add(function(t,u){return n.onPostProcess.dispatch(n,u,t)});n.onPreInit.dispatch(n);if(!p.browser_spellcheck&&!p.gecko_spellcheck){r.body.spellcheck=false}if(!p.readonly){n.bindNativeEvents()}n.controlManager.onPostRender.dispatch(n,n.controlManager);n.onPostRender.dispatch(n);n.quirks=k.util.Quirks(n);if(p.directionality){m.dir=p.directionality}if(p.nowrap){m.style.whiteSpace="nowrap"}if(p.protect){n.onBeforeSetContent.add(function(t,u){i(p.protect,function(v){u.content=u.content.replace(v,function(x){return"<!--mce:protected "+escape(x)+"-->"})})})}n.onSetContent.add(function(){n.addVisual(n.getBody())});if(p.padd_empty_editor){n.onPostProcess.add(function(t,u){u.content=u.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/,"")})}n.load({initial:true,format:"html"});n.startContent=n.getContent({format:"raw"});n.initialized=true;n.onInit.dispatch(n);n.execCallback("setupcontent_callback",n.id,m,r);n.execCallback("init_instance_callback",n);n.focus(true);n.nodeChanged({initial:true});if(n.contentStyles.length>0){s="";i(n.contentStyles,function(t){s+=t+"\r\n"});n.dom.addStyle(s)}i(n.contentCSS,function(t){n.dom.loadCSS(t)});if(p.auto_focus){setTimeout(function(){var t=k.get(p.auto_focus);t.selection.select(t.getBody(),1);t.selection.collapse(1);t.getBody().focus();t.getWin().focus()},100)}q=r=m=null},focus:function(p){var o,u=this,t=u.selection,q=u.settings.content_editable,n,r,s=u.getDoc(),m;if(!p){if(u.bookmark){t.moveToBookmark(u.bookmark);u.bookmark=null}n=t.getRng();if(n.item){r=n.item(0)}u._refreshContentEditable();if(!q){u.getWin().focus()}if(k.isGecko||q){m=u.getBody();if(m.setActive&&!k.isIE11){m.setActive()}else{m.focus()}if(q){t.normalize()}}if(r&&r.ownerDocument==s){n=s.body.createControlRange();n.addElement(r);n.select()}}if(k.activeEditor!=u){if((o=k.activeEditor)!=null){o.onDeactivate.dispatch(o,u)}u.onActivate.dispatch(u,o)}k._setActive(u)},execCallback:function(q){var m=this,p=m.settings[q],o;if(!p){return}if(m.callbackLookup&&(o=m.callbackLookup[q])){p=o.func;o=o.scope}if(d(p,"string")){o=p.replace(/\.\w+$/,"");o=o?k.resolve(o):0;p=k.resolve(p);m.callbackLookup=m.callbackLookup||{};m.callbackLookup[q]={func:p,scope:o}}return p.apply(o||m,Array.prototype.slice.call(arguments,1))},translate:function(m){var o=this.settings.language||"en",n=k.i18n;if(!m){return""}return n[o+"."+m]||m.replace(/\{\#([^\}]+)\}/g,function(q,p){return n[o+"."+p]||"{#"+p+"}"})},getLang:function(o,m){return k.i18n[(this.settings.language||"en")+"."+o]||(d(m)?m:"{#"+o+"}")},getParam:function(t,q,m){var r=k.trim,p=d(this.settings[t])?this.settings[t]:q,s;if(m==="hash"){s={};if(d(p,"string")){i(p.indexOf("=")>0?p.split(/[;,](?![^=;,]*(?:[;,]|$))/):p.split(","),function(n){n=n.split("=");if(n.length>1){s[r(n[0])]=r(n[1])}else{s[r(n[0])]=r(n)}})}else{s=p}return s}return p},nodeChanged:function(q){var m=this,n=m.selection,p;if(m.initialized){q=q||{};p=n.getStart()||m.getBody();p=b&&p.ownerDocument!=m.getDoc()?m.getBody():p;q.parents=[];m.dom.getParent(p,function(o){if(o.nodeName=="BODY"){return true}q.parents.push(o)});m.onNodeChange.dispatch(m,q?q.controlManager||m.controlManager:m.controlManager,p,n.isCollapsed(),q)}},addButton:function(n,o){var m=this;m.buttons=m.buttons||{};m.buttons[n]=o},addCommand:function(m,o,n){this.execCommands[m]={func:o,scope:n||this}},addQueryStateHandler:function(m,o,n){this.queryStateCommands[m]={func:o,scope:n||this}},addQueryValueHandler:function(m,o,n){this.queryValueCommands[m]={func:o,scope:n||this}},addShortcut:function(o,q,m,p){var n=this,r;if(n.settings.custom_shortcuts===false){return false}n.shortcuts=n.shortcuts||{};if(d(m,"string")){r=m;m=function(){n.execCommand(r,false,null)}}if(d(m,"object")){r=m;m=function(){n.execCommand(r[0],r[1],r[2])}}i(g(o),function(s){var t={func:m,scope:p||this,desc:n.translate(q),alt:false,ctrl:false,shift:false};i(g(s,"+"),function(u){switch(u){case"alt":case"ctrl":case"shift":t[u]=true;break;default:t.charCode=u.charCodeAt(0);t.keyCode=u.toUpperCase().charCodeAt(0)}});n.shortcuts[(t.ctrl?"ctrl":"")+","+(t.alt?"alt":"")+","+(t.shift?"shift":"")+","+t.keyCode]=t});return true},execCommand:function(u,r,x,m){var p=this,q=0,v,n;if(!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(u)&&(!m||!m.skip_focus)){p.focus()}m=f({},m);p.onBeforeExecCommand.dispatch(p,u,r,x,m);if(m.terminate){return false}if(p.execCallback("execcommand_callback",p.id,p.selection.getNode(),u,r,x)){p.onExecCommand.dispatch(p,u,r,x,m);return true}if(v=p.execCommands[u]){n=v.func.call(v.scope,r,x);if(n!==true){p.onExecCommand.dispatch(p,u,r,x,m);return n}}i(p.plugins,function(o){if(o.execCommand&&o.execCommand(u,r,x)){p.onExecCommand.dispatch(p,u,r,x,m);q=1;return false}});if(q){return true}if(p.theme&&p.theme.execCommand&&p.theme.execCommand(u,r,x)){p.onExecCommand.dispatch(p,u,r,x,m);return true}if(p.editorCommands.execCommand(u,r,x)){p.onExecCommand.dispatch(p,u,r,x,m);return true}p.getDoc().execCommand(u,r,x);p.onExecCommand.dispatch(p,u,r,x,m)},queryCommandState:function(q){var n=this,r,p;if(n._isHidden()){return}if(r=n.queryStateCommands[q]){p=r.func.call(r.scope);if(p!==true){return p}}r=n.editorCommands.queryCommandState(q);if(r!==-1){return r}try{return this.getDoc().queryCommandState(q)}catch(m){}},queryCommandValue:function(r){var n=this,q,p;if(n._isHidden()){return}if(q=n.queryValueCommands[r]){p=q.func.call(q.scope);if(p!==true){return p}}q=n.editorCommands.queryCommandValue(r);if(d(q)){return q}try{return this.getDoc().queryCommandValue(r)}catch(m){}},show:function(){var m=this;l.show(m.getContainer());l.hide(m.id);m.load()},hide:function(){var m=this,n=m.getDoc();if(b&&n){n.execCommand("SelectAll")}m.save();l.hide(m.getContainer());l.setStyle(m.id,"display",m.orgDisplay)},isHidden:function(){return !l.isHidden(this.id)},setProgressState:function(m,n,p){this.onSetProgressState.dispatch(this,m,n,p);return m},load:function(q){var m=this,p=m.getElement(),n;if(p){q=q||{};q.load=true;n=m.setContent(d(p.value)?p.value:p.innerHTML,q);q.element=p;if(!q.no_events){m.onLoadContent.dispatch(m,q)}q.element=p=null;return n}},save:function(r){var m=this,q=m.getElement(),n,p;if(!q||!m.initialized){return}r=r||{};r.save=true;r.element=q;n=r.content=m.getContent(r);if(!r.no_events){m.onSaveContent.dispatch(m,r)}n=r.content;if(!/TEXTAREA|INPUT/i.test(q.nodeName)){q.innerHTML=n;if(p=l.getParent(m.id,"form")){i(p.elements,function(o){if(o.name==m.id){o.value=n;return false}})}}else{q.value=n}r.element=q=null;return n},setContent:function(r,p){var o=this,n,m=o.getBody(),q;p=p||{};p.format=p.format||"html";p.set=true;p.content=r;if(!p.no_events){o.onBeforeSetContent.dispatch(o,p)}r=p.content;if(!k.isIE&&(r.length===0||/^\s+$/.test(r))){q=o.settings.forced_root_block;if(q){r="<"+q+'><br data-mce-bogus="1"></'+q+">"}else{r='<br data-mce-bogus="1">'}m.innerHTML=r;o.selection.select(m,true);o.selection.collapse(true);return}if(p.format!=="raw"){r=new k.html.Serializer({},o.schema).serialize(o.parser.parse(r))}p.content=k.trim(r);o.dom.setHTML(m,p.content);if(!p.no_events){o.onSetContent.dispatch(o,p)}if(!o.settings.content_editable||document.activeElement===o.getBody()){o.selection.normalize()}return p.content},getContent:function(o){var n=this,p,m=n.getBody();o=o||{};o.format=o.format||"html";o.get=true;o.getInner=true;if(!o.no_events){n.onBeforeGetContent.dispatch(n,o)}if(o.format=="raw"){p=m.innerHTML}else{if(o.format=="text"){p=m.innerText||m.textContent}else{p=n.serializer.serialize(m,o)}}if(o.format!="text"){o.content=k.trim(p)}else{o.content=p}if(!o.no_events){n.onGetContent.dispatch(n,o)}return o.content},isDirty:function(){var m=this;return k.trim(m.startContent)!=k.trim(m.getContent({format:"raw",no_events:1}))&&!m.isNotDirty},getContainer:function(){var m=this;if(!m.container){m.container=l.get(m.editorContainer||m.id+"_parent")}return m.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return l.get(this.settings.content_element||this.id)},getWin:function(){var m=this,n;if(!m.contentWindow){n=l.get(m.id+"_ifr");if(n){m.contentWindow=n.contentWindow}}return m.contentWindow},getDoc:function(){var m=this,n;if(!m.contentDocument){n=m.getWin();if(n){m.contentDocument=n.document}}return m.contentDocument},getBody:function(){return this.bodyElement||this.getDoc().body},convertURL:function(o,n,q){var m=this,p=m.settings;if(p.urlconverter_callback){return m.execCallback("urlconverter_callback",o,q,true,n)}if(!p.convert_urls||(q&&q.nodeName=="LINK")||o.indexOf("file:")===0){return o}if(p.relative_urls){return m.documentBaseURI.toRelative(o)}o=m.documentBaseURI.toAbsolute(o,p.remove_script_host);return o},addVisual:function(q){var n=this,o=n.settings,p=n.dom,m;q=q||n.getBody();if(!d(n.hasVisual)){n.hasVisual=o.visual}i(p.select("table,a",q),function(s){var r;switch(s.nodeName){case"TABLE":m=o.visual_table_class||"mceItemTable";r=p.getAttrib(s,"border");if(!r||r=="0"){if(n.hasVisual){p.addClass(s,m)}else{p.removeClass(s,m)}}return;case"A":if(!p.getAttrib(s,"href",false)){r=p.getAttrib(s,"name")||s.id;m="mceItemAnchor";if(r){if(n.hasVisual){p.addClass(s,m)}else{p.removeClass(s,m)}}}return}});n.onVisualAid.dispatch(n,q,n.hasVisual)},remove:function(){var m=this,o=m.getContainer(),n=m.getDoc();if(!m.removed){m.removed=1;if(b&&n){n.execCommand("SelectAll")}m.save();l.setStyle(m.id,"display",m.orgDisplay);if(!m.settings.content_editable){j.unbind(m.getWin());j.unbind(m.getDoc())}j.unbind(m.getBody());j.clear(o);m.execCallback("remove_instance_callback",m);m.onRemove.dispatch(m);m.onExecCommand.listeners=[];k.remove(m);l.remove(o)}},destroy:function(n){var m=this;if(m.destroyed){return}if(a){j.unbind(m.getDoc());j.unbind(m.getWin());j.unbind(m.getBody())}if(!n){k.removeUnload(m.destroy);tinyMCE.onBeforeUnload.remove(m._beforeUnload);if(m.theme&&m.theme.destroy){m.theme.destroy()}m.controlManager.destroy();m.selection.destroy();m.dom.destroy()}if(m.formElement){m.formElement.submit=m.formElement._mceOldSubmit;m.formElement._mceOldSubmit=null}m.contentAreaContainer=m.formElement=m.container=m.settings.content_element=m.bodyElement=m.contentDocument=m.contentWindow=null;if(m.selection){m.selection=m.selection.win=m.selection.dom=m.selection.dom.doc=null}m.destroyed=1},_refreshContentEditable:function(){var n=this,m,o;if(n._isHidden()){m=n.getBody();o=m.parentNode;o.removeChild(m);o.appendChild(m);m.focus()}},_isHidden:function(){var m;if(!a){return 0}m=this.selection.getSel();return(!m||!m.rangeCount||m.rangeCount===0)}})})(tinymce);(function(a){var b=a.each;a.Editor.prototype.setupEvents=function(){var c=this,d=c.settings;b(["onPreInit","onBeforeRenderUI","onPostRender","onLoad","onInit","onRemove","onActivate","onDeactivate","onClick","onEvent","onMouseUp","onMouseDown","onDblClick","onKeyDown","onKeyUp","onKeyPress","onContextMenu","onSubmit","onReset","onPaste","onPreProcess","onPostProcess","onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent","onLoadContent","onSaveContent","onNodeChange","onChange","onBeforeExecCommand","onExecCommand","onUndo","onRedo","onVisualAid","onSetProgressState","onSetAttrib"],function(e){c[e]=new a.util.Dispatcher(c)});if(d.cleanup_callback){c.onBeforeSetContent.add(function(e,f){f.content=e.execCallback("cleanup_callback","insert_to_editor",f.content,f)});c.onPreProcess.add(function(e,f){if(f.set){e.execCallback("cleanup_callback","insert_to_editor_dom",f.node,f)}if(f.get){e.execCallback("cleanup_callback","get_from_editor_dom",f.node,f)}});c.onPostProcess.add(function(e,f){if(f.set){f.content=e.execCallback("cleanup_callback","insert_to_editor",f.content,f)}if(f.get){f.content=e.execCallback("cleanup_callback","get_from_editor",f.content,f)}})}if(d.save_callback){c.onGetContent.add(function(e,f){if(f.save){f.content=e.execCallback("save_callback",e.id,f.content,e.getBody())}})}if(d.handle_event_callback){c.onEvent.add(function(f,g,h){if(c.execCallback("handle_event_callback",g,f,h)===false){g.preventDefault();g.stopPropagation()}})}if(d.handle_node_change_callback){c.onNodeChange.add(function(f,e,g){f.execCallback("handle_node_change_callback",f.id,g,-1,-1,true,f.selection.isCollapsed())})}if(d.save_callback){c.onSaveContent.add(function(e,g){var f=e.execCallback("save_callback",e.id,g.content,e.getBody());if(f){g.content=f}})}if(d.onchange_callback){c.onChange.add(function(f,e){f.execCallback("onchange_callback",f,e)})}};a.Editor.prototype.bindNativeEvents=function(){var l=this,f,d=l.settings,e=l.dom,h;h={mouseup:"onMouseUp",mousedown:"onMouseDown",click:"onClick",keyup:"onKeyUp",keydown:"onKeyDown",keypress:"onKeyPress",submit:"onSubmit",reset:"onReset",contextmenu:"onContextMenu",dblclick:"onDblClick",paste:"onPaste"};function c(i,m){var n=i.type;if(l.removed){return}if(l.onEvent.dispatch(l,i,m)!==false){l[h[i.fakeType||i.type]].dispatch(l,i,m)}}function j(i){l.focus(true)}function k(i,m){if(m.keyCode!=65||!a.VK.metaKeyPressed(m)){l.selection.normalize()}l.nodeChanged()}b(h,function(m,n){var i=d.content_editable?l.getBody():l.getDoc();switch(n){case"contextmenu":e.bind(i,n,c);break;case"paste":e.bind(l.getBody(),n,c);break;case"submit":case"reset":e.bind(l.getElement().form||a.DOM.getParent(l.id,"form"),n,c);break;default:e.bind(i,n,c)}});e.bind(d.content_editable?l.getBody():(a.isGecko?l.getDoc():l.getWin()),"focus",function(i){l.focus(true)});if(d.content_editable&&a.isOpera){e.bind(l.getBody(),"click",j);e.bind(l.getBody(),"keydown",j)}l.onMouseUp.add(k);l.onKeyUp.add(function(i,n){var m=n.keyCode;if((m>=33&&m<=36)||(m>=37&&m<=40)||m==13||m==45||m==46||m==8||(a.isMac&&(m==91||m==93))||n.ctrlKey){k(i,n)}});l.onReset.add(function(){l.setContent(l.startContent,{format:"raw"})});function g(m,i){if(m.altKey||m.ctrlKey||m.metaKey){b(l.shortcuts,function(n){var o=a.isMac?m.metaKey:m.ctrlKey;if(n.ctrl!=o||n.alt!=m.altKey||n.shift!=m.shiftKey){return}if(m.keyCode==n.keyCode||(m.charCode&&m.charCode==n.charCode)){m.preventDefault();if(i){n.func.call(n.scope)}return true}})}}l.onKeyUp.add(function(i,m){g(m)});l.onKeyPress.add(function(i,m){g(m)});l.onKeyDown.add(function(i,m){g(m,true)});if(a.isOpera){l.onClick.add(function(i,m){m.preventDefault()})}}})(tinymce);(function(d){var e=d.each,b,a=true,c=false;d.EditorCommands=function(n){var m=n.dom,p=n.selection,j={state:{},exec:{},value:{}},k=n.settings,q=n.formatter,o;function r(z,y,x){var v;z=z.toLowerCase();if(v=j.exec[z]){v(z,y,x);return a}return c}function l(x){var v;x=x.toLowerCase();if(v=j.state[x]){return v(x)}return -1}function h(x){var v;x=x.toLowerCase();if(v=j.value[x]){return v(x)}return c}function u(v,x){x=x||"exec";e(v,function(z,y){e(y.toLowerCase().split(","),function(A){j[x][A]=z})})}d.extend(this,{execCommand:r,queryCommandState:l,queryCommandValue:h,addCommands:u});function f(y,x,v){if(x===b){x=c}if(v===b){v=null}return n.getDoc().execCommand(y,x,v)}function t(v){return q.match(v)}function s(v,x){q.toggle(v,x?{value:x}:b)}function i(v){o=p.getBookmark(v)}function g(){p.moveToBookmark(o)}u({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){n.undoManager.add()},"Cut,Copy,Paste":function(z){var y=n.getDoc(),v;try{f(z)}catch(x){v=a}if(v||!y.queryCommandSupported(z)){if(d.isGecko){n.windowManager.confirm(n.getLang("clipboard_msg"),function(A){if(A){open("http://www.mozilla.org/editor/midasdemo/securityprefs.html","_blank")}})}else{n.windowManager.alert(n.getLang("clipboard_no_support"))}}},unlink:function(v){if(p.isCollapsed()){p.select(p.getNode())}f(v);p.collapse(c)},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(v){var x=v.substring(7);e("left,center,right,full".split(","),function(y){if(x!=y){q.remove("align"+y)}});s("align"+x);r("mceRepaint")},"InsertUnorderedList,InsertOrderedList":function(y){var v,x;f(y);v=m.getParent(p.getNode(),"ol,ul");if(v){x=v.parentNode;if(/^(H[1-6]|P|ADDRESS|PRE)$/.test(x.nodeName)){i();m.split(x,v);g()}}},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(v){s(v)},"ForeColor,HiliteColor,FontName":function(y,x,v){s(y,v)},FontSize:function(z,y,x){var v,A;if(x>=1&&x<=7){A=d.explode(k.font_size_style_values);v=d.explode(k.font_size_classes);if(v){x=v[x-1]||x}else{x=A[x-1]||x}}s(z,x)},RemoveFormat:function(v){q.remove(v)},mceBlockQuote:function(v){s("blockquote")},FormatBlock:function(y,x,v){return s(v||"p")},mceCleanup:function(){var v=p.getBookmark();n.setContent(n.getContent({cleanup:a}),{cleanup:a});p.moveToBookmark(v)},mceRemoveNode:function(z,y,x){var v=x||p.getNode();if(v!=n.getBody()){i();n.dom.remove(v,a);g()}},mceSelectNodeDepth:function(z,y,x){var v=0;m.getParent(p.getNode(),function(A){if(A.nodeType==1&&v++==x){p.select(A);return c}},n.getBody())},mceSelectNode:function(y,x,v){p.select(v)},mceInsertContent:function(B,I,K){var y,J,E,z,F,G,D,C,L,x,A,M,v,H;y=n.parser;J=new d.html.Serializer({},n.schema);v='<span id="mce_marker" data-mce-type="bookmark">\uFEFF</span>';G={content:K,format:"html"};p.onBeforeSetContent.dispatch(p,G);K=G.content;if(K.indexOf("{$caret}")==-1){K+="{$caret}"}K=K.replace(/\{\$caret\}/,v);if(!p.isCollapsed()){n.getDoc().execCommand("Delete",false,null)}E=p.getNode();G={context:E.nodeName.toLowerCase()};F=y.parse(K,G);A=F.lastChild;if(A.attr("id")=="mce_marker"){D=A;for(A=A.prev;A;A=A.walk(true)){if(A.type==3||!m.isBlock(A.name)){A.parent.insert(D,A,A.name==="br");break}}}if(!G.invalid){K=J.serialize(F);A=E.firstChild;M=E.lastChild;if(!A||(A===M&&A.nodeName==="BR")){m.setHTML(E,K)}else{p.setContent(K)}}else{p.setContent(v);E=p.getNode();z=n.getBody();if(E.nodeType==9){E=A=z}else{A=E}while(A!==z){E=A;A=A.parentNode}K=E==z?z.innerHTML:m.getOuterHTML(E);K=J.serialize(y.parse(K.replace(/<span (id="mce_marker"|id=mce_marker).+?<\/span>/i,function(){return J.serialize(F)})));if(E==z){m.setHTML(z,K)}else{m.setOuterHTML(E,K)}}D=m.get("mce_marker");C=m.getRect(D);L=m.getViewPort(n.getWin());if((C.y+C.h>L.y+L.h||C.y<L.y)||(C.x>L.x+L.w||C.x<L.x)){H=d.isIE?n.getDoc().documentElement:n.getBody();H.scrollLeft=C.x;H.scrollTop=C.y-L.h+25}x=m.createRng();A=D.previousSibling;if(A&&A.nodeType==3){x.setStart(A,A.nodeValue.length)}else{x.setStartBefore(D);x.setEndBefore(D)}m.remove(D);p.setRng(x);p.onSetContent.dispatch(p,G);n.addVisual()},mceInsertRawHTML:function(y,x,v){p.setContent("tiny_mce_marker");n.setContent(n.getContent().replace(/tiny_mce_marker/g,function(){return v}))},mceToggleFormat:function(y,x,v){s(v)},mceSetContent:function(y,x,v){n.setContent(v)},"Indent,Outdent":function(z){var x,v,y;x=k.indentation;v=/[a-z%]+$/i.exec(x);x=parseInt(x);if(!l("InsertUnorderedList")&&!l("InsertOrderedList")){if(!k.forced_root_block&&!m.getParent(p.getNode(),m.isBlock)){q.apply("div")}e(p.getSelectedBlocks(),function(A){if(z=="outdent"){y=Math.max(0,parseInt(A.style.paddingLeft||0)-x);m.setStyle(A,"paddingLeft",y?y+v:"")}else{m.setStyle(A,"paddingLeft",(parseInt(A.style.paddingLeft||0)+x)+v)}})}else{f(z)}},mceRepaint:function(){var x;if(d.isGecko){try{i(a);if(p.getSel()){p.getSel().selectAllChildren(n.getBody())}p.collapse(a);g()}catch(v){}}},mceToggleFormat:function(y,x,v){q.toggle(v)},InsertHorizontalRule:function(){n.execCommand("mceInsertContent",false,"<hr />")},mceToggleVisualAid:function(){n.hasVisual=!n.hasVisual;n.addVisual()},mceReplaceContent:function(y,x,v){n.execCommand("mceInsertContent",false,v.replace(/\{\$selection\}/g,p.getContent({format:"text"})))},mceInsertLink:function(z,y,x){var v;if(typeof(x)=="string"){x={href:x}}v=m.getParent(p.getNode(),"a");x.href=x.href.replace(" ","%20");if(!v||!x.href){q.remove("link")}if(x.href){q.apply("link",x,v)}},selectAll:function(){var x=m.getRoot(),v=m.createRng();if(p.getRng().setStart){v.setStart(x,0);v.setEnd(x,x.childNodes.length);p.setRng(v)}else{f("SelectAll")}}});u({"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(z){var x="align"+z.substring(7);var v=p.isCollapsed()?[m.getParent(p.getNode(),m.isBlock)]:p.getSelectedBlocks();var y=d.map(v,function(A){return !!q.matchNode(A,x)});return d.inArray(y,a)!==-1},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(v){return t(v)},mceBlockQuote:function(){return t("blockquote")},Outdent:function(){var v;if(k.inline_styles){if((v=m.getParent(p.getStart(),m.isBlock))&&parseInt(v.style.paddingLeft)>0){return a}if((v=m.getParent(p.getEnd(),m.isBlock))&&parseInt(v.style.paddingLeft)>0){return a}}return l("InsertUnorderedList")||l("InsertOrderedList")||(!k.inline_styles&&!!m.getParent(p.getNode(),"BLOCKQUOTE"))},"InsertUnorderedList,InsertOrderedList":function(x){var v=m.getParent(p.getNode(),"ul,ol");return v&&(x==="insertunorderedlist"&&v.tagName==="UL"||x==="insertorderedlist"&&v.tagName==="OL")}},"state");u({"FontSize,FontName":function(y){var x=0,v;if(v=m.getParent(p.getNode(),"span")){if(y=="fontsize"){x=v.style.fontSize}else{x=v.style.fontFamily.replace(/, /g,",").replace(/[\'\"]/g,"").toLowerCase()}}return x}},"value");u({Undo:function(){n.undoManager.undo()},Redo:function(){n.undoManager.redo()}})}})(tinymce);(function(b){var a=b.util.Dispatcher;b.UndoManager=function(h){var l,i=0,e=[],g,k,j,f;function c(){return b.trim(h.getContent({format:"raw",no_events:1}).replace(/<span[^>]+data-mce-bogus[^>]+>[\u200B\uFEFF]+<\/span>/g,""))}function d(){l.typing=false;l.add()}onBeforeAdd=new a(l);k=new a(l);j=new a(l);f=new a(l);k.add(function(m,n){if(m.hasUndo()){return h.onChange.dispatch(h,n,m)}});j.add(function(m,n){return h.onUndo.dispatch(h,n,m)});f.add(function(m,n){return h.onRedo.dispatch(h,n,m)});h.onInit.add(function(){l.add()});h.onBeforeExecCommand.add(function(m,p,o,q,n){if(p!="Undo"&&p!="Redo"&&p!="mceRepaint"&&(!n||!n.skip_undo)){l.beforeChange()}});h.onExecCommand.add(function(m,p,o,q,n){if(p!="Undo"&&p!="Redo"&&p!="mceRepaint"&&(!n||!n.skip_undo)){l.add()}});h.onSaveContent.add(d);h.dom.bind(h.dom.getRoot(),"dragend",d);h.dom.bind(h.getBody(),"focusout",function(m){if(!h.removed&&l.typing){d()}});h.onKeyUp.add(function(m,o){var n=o.keyCode;if((n>=33&&n<=36)||(n>=37&&n<=40)||n==45||n==13||o.ctrlKey){d()}});h.onKeyDown.add(function(m,o){var n=o.keyCode;if((n>=33&&n<=36)||(n>=37&&n<=40)||n==45){if(l.typing){d()}return}if((n<16||n>20)&&n!=224&&n!=91&&!l.typing){l.beforeChange();l.typing=true;l.add()}});h.onMouseDown.add(function(m,n){if(l.typing){d()}});h.addShortcut("ctrl+z","undo_desc","Undo");h.addShortcut("ctrl+y","redo_desc","Redo");l={data:e,typing:false,onBeforeAdd:onBeforeAdd,onAdd:k,onUndo:j,onRedo:f,beforeChange:function(){g=h.selection.getBookmark(2,true)},add:function(p){var m,n=h.settings,o;p=p||{};p.content=c();l.onBeforeAdd.dispatch(l,p);o=e[i];if(o&&o.content==p.content){return null}if(e[i]){e[i].beforeBookmark=g}if(n.custom_undo_redo_levels){if(e.length>n.custom_undo_redo_levels){for(m=0;m<e.length-1;m++){e[m]=e[m+1]}e.length--;i=e.length}}p.bookmark=h.selection.getBookmark(2,true);if(i<e.length-1){e.length=i+1}e.push(p);i=e.length-1;l.onAdd.dispatch(l,p);h.isNotDirty=0;return p},undo:function(){var n,m;if(l.typing){l.add();l.typing=false}if(i>0){n=e[--i];h.setContent(n.content,{format:"raw"});h.selection.moveToBookmark(n.beforeBookmark);l.onUndo.dispatch(l,n)}return n},redo:function(){var m;if(i<e.length-1){m=e[++i];h.setContent(m.content,{format:"raw"});h.selection.moveToBookmark(m.bookmark);l.onRedo.dispatch(l,m)}return m},clear:function(){e=[];i=0;l.typing=false},hasUndo:function(){return i>0||this.typing},hasRedo:function(){return i<e.length-1&&!this.typing}};return l}})(tinymce);tinymce.ForceBlocks=function(c){var b=c.settings,e=c.dom,a=c.selection,d=c.schema.getBlockElements();function f(){var j=a.getStart(),h=c.getBody(),g,k,o,s,q,i,l,m=-16777215,p,r;if(!j||j.nodeType!==1||!b.forced_root_block){return}while(j&&j!=h){if(d[j.nodeName]){return}j=j.parentNode}g=a.getRng();if(g.setStart){k=g.startContainer;o=g.startOffset;s=g.endContainer;q=g.endOffset}else{if(g.item){j=g.item(0);g=c.getDoc().body.createTextRange();g.moveToElementText(j)}r=g.parentElement().ownerDocument===c.getDoc();tmpRng=g.duplicate();tmpRng.collapse(true);o=tmpRng.move("character",m)*-1;if(!tmpRng.collapsed){tmpRng=g.duplicate();tmpRng.collapse(false);q=(tmpRng.move("character",m)*-1)-o}}j=h.firstChild;while(j){if(j.nodeType===3||(j.nodeType==1&&!d[j.nodeName])){if(j.nodeType===3&&j.nodeValue.length==0){l=j;j=j.nextSibling;e.remove(l);continue}if(!i){i=e.create(b.forced_root_block);j.parentNode.insertBefore(i,j);p=true}l=j;j=j.nextSibling;i.appendChild(l)}else{i=null;j=j.nextSibling}}if(p){if(g.setStart){g.setStart(k,o);g.setEnd(s,q);a.setRng(g)}else{if(r){try{g=c.getDoc().body.createTextRange();g.moveToElementText(h);g.collapse(true);g.moveStart("character",o);if(q>0){g.moveEnd("character",q)}g.select()}catch(n){}}}c.nodeChanged()}}if(b.forced_root_block){c.onKeyUp.add(f);c.onNodeChange.add(f)}};(function(c){var b=c.DOM,a=c.dom.Event,d=c.each,e=c.extend;c.create("tinymce.ControlManager",{ControlManager:function(f,j){var h=this,g;j=j||{};h.editor=f;h.controls={};h.onAdd=new c.util.Dispatcher(h);h.onPostRender=new c.util.Dispatcher(h);h.prefix=j.prefix||f.id+"_";h._cls={};h.onPostRender.add(function(){d(h.controls,function(i){i.postRender()})})},get:function(f){return this.controls[this.prefix+f]||this.controls[f]},setActive:function(h,f){var g=null;if(g=this.get(h)){g.setActive(f)}return g},setDisabled:function(h,f){var g=null;if(g=this.get(h)){g.setDisabled(f)}return g},add:function(g){var f=this;if(g){f.controls[g.id]=g;f.onAdd.dispatch(g,f)}return g},createControl:function(j){var o,k,g,h=this,m=h.editor,n,f;if(!h.controlFactories){h.controlFactories=[];d(m.plugins,function(i){if(i.createControl){h.controlFactories.push(i)}})}n=h.controlFactories;for(k=0,g=n.length;k<g;k++){o=n[k].createControl(j,h);if(o){return h.add(o)}}if(j==="|"||j==="separator"){return h.createSeparator()}if(m.buttons&&(o=m.buttons[j])){return h.createButton(j,o)}return h.add(o)},createDropMenu:function(f,n,h){var m=this,i=m.editor,j,g,k,l;n=e({"class":"mceDropDown",constrain:i.settings.constrain_menus},n);n["class"]=n["class"]+" "+i.getParam("skin")+"Skin";if(k=i.getParam("skin_variant")){n["class"]+=" "+i.getParam("skin")+"Skin"+k.substring(0,1).toUpperCase()+k.substring(1)}n["class"]+=i.settings.directionality=="rtl"?" mceRtl":"";f=m.prefix+f;l=h||m._cls.dropmenu||c.ui.DropMenu;j=m.controls[f]=new l(f,n);j.onAddItem.add(function(r,q){var p=q.settings;p.title=i.getLang(p.title,p.title);if(!p.onclick){p.onclick=function(o){if(p.cmd){i.execCommand(p.cmd,p.ui||false,p.value)}}}});i.onRemove.add(function(){j.destroy()});if(c.isIE){j.onShowMenu.add(function(){i.focus();g=i.selection.getBookmark(1)});j.onHideMenu.add(function(){if(g){i.selection.moveToBookmark(g);g=0}})}return m.add(j)},createListBox:function(f,n,h){var l=this,j=l.editor,i,k,m;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,scope:n.scope,control_manager:l},n);f=l.prefix+f;function g(o){return o.settings.use_accessible_selects&&!c.isGecko}if(j.settings.use_native_selects||g(j)){k=new c.ui.NativeListBox(f,n)}else{m=h||l._cls.listbox||c.ui.ListBox;k=new m(f,n,j)}l.controls[f]=k;if(c.isWebKit){k.onPostRender.add(function(p,o){a.add(o,"mousedown",function(){j.bookmark=j.selection.getBookmark(1)});a.add(o,"focus",function(){j.selection.moveToBookmark(j.bookmark);j.bookmark=null})})}if(k.hideMenu){j.onMouseDown.add(k.hideMenu,k)}return l.add(k)},createButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.label=g.translate(i.label);i.scope=i.scope||g;if(!i.onclick&&!i.menu_button){i.onclick=function(){g.execCommand(i.cmd,i.ui||false,i.value)}}i=e({title:i.title,"class":"mce_"+m,unavailable_prefix:g.getLang("unavailable",""),scope:i.scope,control_manager:h},i);m=h.prefix+m;if(i.menu_button){f=l||h._cls.menubutton||c.ui.MenuButton;k=new f(m,i,g);g.onMouseDown.add(k.hideMenu,k)}else{f=h._cls.button||c.ui.Button;k=new f(m,i,g)}return h.add(k)},createMenuButton:function(h,f,g){f=f||{};f.menu_button=1;return this.createButton(h,f,g)},createSplitButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.scope=i.scope||g;if(!i.onclick){i.onclick=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}if(!i.onselect){i.onselect=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}i=e({title:i.title,"class":"mce_"+m,scope:i.scope,control_manager:h},i);m=h.prefix+m;f=l||h._cls.splitbutton||c.ui.SplitButton;k=h.add(new f(m,i,g));g.onMouseDown.add(k.hideMenu,k);return k},createColorSplitButton:function(f,n,h){var l=this,j=l.editor,i,k,m,g;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onclick){n.onclick=function(o){if(c.isIE){g=j.selection.getBookmark(1)}j.execCommand(n.cmd,n.ui||false,o||n.value)}}if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,menu_class:j.getParam("skin")+"Skin",scope:n.scope,more_colors_title:j.getLang("more_colors")},n);f=l.prefix+f;m=h||l._cls.colorsplitbutton||c.ui.ColorSplitButton;k=new m(f,n,j);j.onMouseDown.add(k.hideMenu,k);j.onRemove.add(function(){k.destroy()});if(c.isIE){k.onShowMenu.add(function(){j.focus();g=j.selection.getBookmark(1)});k.onHideMenu.add(function(){if(g){j.selection.moveToBookmark(g);g=0}})}return l.add(k)},createToolbar:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||g._cls.toolbar||c.ui.Toolbar;i=new f(k,h,g.editor);if(g.get(k)){return null}return g.add(i)},createToolbarGroup:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||this._cls.toolbarGroup||c.ui.ToolbarGroup;i=new f(k,h,g.editor);if(g.get(k)){return null}return g.add(i)},createSeparator:function(g){var f=g||this._cls.separator||c.ui.Separator;return new f()},setControlType:function(g,f){return this._cls[g.toLowerCase()]=f},destroy:function(){d(this.controls,function(f){f.destroy()});this.controls=null}})})(tinymce);(function(d){var a=d.util.Dispatcher,e=d.each,c=d.isIE,b=d.isOpera;d.create("tinymce.WindowManager",{WindowManager:function(f){var g=this;g.editor=f;g.onOpen=new a(g);g.onClose=new a(g);g.params={};g.features={}},open:function(z,h){var v=this,k="",n,m,i=v.editor.settings.dialog_type=="modal",q,o,j,g=d.DOM.getViewPort(),r;z=z||{};h=h||{};o=b?g.w:screen.width;j=b?g.h:screen.height;z.name=z.name||"mc_"+new Date().getTime();z.width=parseInt(z.width||320);z.height=parseInt(z.height||240);z.resizable=true;z.left=z.left||parseInt(o/2)-(z.width/2);z.top=z.top||parseInt(j/2)-(z.height/2);h.inline=false;h.mce_width=z.width;h.mce_height=z.height;h.mce_auto_focus=z.auto_focus;if(i){if(c){z.center=true;z.help=false;z.dialogWidth=z.width+"px";z.dialogHeight=z.height+"px";z.scroll=z.scrollbars||false}}e(z,function(p,f){if(d.is(p,"boolean")){p=p?"yes":"no"}if(!/^(name|url)$/.test(f)){if(c&&i){k+=(k?";":"")+f+":"+p}else{k+=(k?",":"")+f+"="+p}}});v.features=z;v.params=h;v.onOpen.dispatch(v,z,h);r=z.url||z.file;r=d._addVer(r);try{if(c&&i){q=1;window.showModalDialog(r,window,k)}else{q=window.open(r,z.name,k)}}catch(l){}if(!q){alert(v.editor.getLang("popup_blocked"))}},close:function(f){f.close();this.onClose.dispatch(this)},createInstance:function(i,h,g,m,l,k){var j=d.resolve(i);return new j(h,g,m,l,k)},confirm:function(h,f,i,g){g=g||window;f.call(i||this,g.confirm(this._decode(this.editor.getLang(h,h))))},alert:function(h,f,j,g){var i=this;g=g||window;g.alert(i._decode(i.editor.getLang(h,h)));if(f){f.call(j||i)}},resizeBy:function(f,g,h){h.resizeBy(f,g)},_decode:function(f){return d.DOM.decode(f).replace(/\\n/g,"\n")}})}(tinymce));(function(a){a.Formatter=function(aa){var Q={},T=a.each,c=aa.dom,r=aa.selection,t=a.dom.TreeWalker,N=new a.dom.RangeUtils(c),d=aa.schema.isValidChild,A=a.isArray,H=c.isBlock,m=aa.settings.forced_root_block,s=c.nodeIndex,G="\uFEFF",e=/^(src|href|style)$/,X=false,C=true,P,D,x=c.getContentEditable;function I(ab){if(ab.nodeType){ab=ab.nodeName}return !!aa.schema.getTextBlockElements()[ab.toLowerCase()]}function n(ac,ab){return c.getParents(ac,ab,c.getRoot())}function b(ab){return ab.nodeType===1&&ab.id==="_mce_caret"}function j(){l({alignleft:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"left"},defaultBlock:"div"},{selector:"img,table",collapsed:false,styles:{"float":"left"}}],aligncenter:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"center"},defaultBlock:"div"},{selector:"img",collapsed:false,styles:{display:"block",marginLeft:"auto",marginRight:"auto"}},{selector:"table",collapsed:false,styles:{marginLeft:"auto",marginRight:"auto"}}],alignright:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"right"},defaultBlock:"div"},{selector:"img,table",collapsed:false,styles:{"float":"right"}}],alignfull:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"justify"},defaultBlock:"div"}],bold:[{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}},{inline:"b",remove:"all"}],italic:[{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}},{inline:"i",remove:"all"}],underline:[{inline:"span",styles:{textDecoration:"underline"},exact:true},{inline:"u",remove:"all"}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:true},{inline:"strike",remove:"all"}],forecolor:{inline:"span",styles:{color:"%value"},wrap_links:false},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},wrap_links:false},fontname:{inline:"span",styles:{fontFamily:"%value"}},fontsize:{inline:"span",styles:{fontSize:"%value"}},fontsize_class:{inline:"span",attributes:{"class":"%value"}},blockquote:{block:"blockquote",wrapper:1,remove:"all"},subscript:{inline:"sub"},superscript:{inline:"sup"},link:{inline:"a",selector:"a",remove:"all",split:true,deep:true,onmatch:function(ab){return true},onformat:function(ad,ab,ac){T(ac,function(af,ae){c.setAttrib(ad,ae,af)})}},removeformat:[{selector:"b,strong,em,i,font,u,strike",remove:"all",split:true,expand:false,block_expand:true,deep:true},{selector:"span",attributes:["style","class"],remove:"empty",split:true,expand:false,deep:true},{selector:"*",attributes:["style","class"],split:false,expand:false,deep:true}]});T("p h1 h2 h3 h4 h5 h6 div address pre div code dt dd samp".split(/\s/),function(ab){l(ab,{block:ab,remove:"all"})});l(aa.settings.formats)}function W(){aa.addShortcut("ctrl+b","bold_desc","Bold");aa.addShortcut("ctrl+i","italic_desc","Italic");aa.addShortcut("ctrl+u","underline_desc","Underline");for(var ab=1;ab<=6;ab++){aa.addShortcut("ctrl+"+ab,"",["FormatBlock",false,"h"+ab])}aa.addShortcut("ctrl+7","",["FormatBlock",false,"p"]);aa.addShortcut("ctrl+8","",["FormatBlock",false,"div"]);aa.addShortcut("ctrl+9","",["FormatBlock",false,"address"])}function V(ab){return ab?Q[ab]:Q}function l(ab,ac){if(ab){if(typeof(ab)!=="string"){T(ab,function(ae,ad){l(ad,ae)})}else{ac=ac.length?ac:[ac];T(ac,function(ad){if(ad.deep===D){ad.deep=!ad.selector}if(ad.split===D){ad.split=!ad.selector||ad.inline}if(ad.remove===D&&ad.selector&&!ad.inline){ad.remove="none"}if(ad.selector&&ad.inline){ad.mixed=true;ad.block_expand=true}if(typeof(ad.classes)==="string"){ad.classes=ad.classes.split(/\s+/)}});Q[ab]=ac}}}var i=function(ac){var ab;aa.dom.getParent(ac,function(ad){ab=aa.dom.getStyle(ad,"text-decoration");return ab&&ab!=="none"});return ab};var L=function(ab){var ac;if(ab.nodeType===1&&ab.parentNode&&ab.parentNode.nodeType===1){ac=i(ab.parentNode);if(aa.dom.getStyle(ab,"color")&&ac){aa.dom.setStyle(ab,"text-decoration",ac)}else{if(aa.dom.getStyle(ab,"textdecoration")===ac){aa.dom.setStyle(ab,"text-decoration",null)}}}};function Y(ae,al,ag){var ah=V(ae),am=ah[0],ak,ac,aj,ai=r.isCollapsed();function ab(aq,ap){ap=ap||am;if(aq){if(ap.onformat){ap.onformat(aq,ap,al,ag)}T(ap.styles,function(at,ar){c.setStyle(aq,ar,q(at,al))});T(ap.attributes,function(at,ar){c.setAttrib(aq,ar,q(at,al))});T(ap.classes,function(ar){ar=q(ar,al);if(!c.hasClass(aq,ar)){c.addClass(aq,ar)}})}}function af(){function ar(ay,aw){var ax=new t(aw);for(ag=ax.current();ag;ag=ax.prev()){if(ag.childNodes.length>1||ag==ay||ag.tagName=="BR"){return ag}}}var aq=aa.selection.getRng();var av=aq.startContainer;var ap=aq.endContainer;if(av!=ap&&aq.endOffset===0){var au=ar(av,ap);var at=au.nodeType==3?au.length:au.childNodes.length;aq.setEnd(au,at)}return aq}function ad(at,ay,aw,av,aq){var ap=[],ar=-1,ax,aA=-1,au=-1,az;T(at.childNodes,function(aC,aB){if(aC.nodeName==="UL"||aC.nodeName==="OL"){ar=aB;ax=aC;return false}});T(at.childNodes,function(aC,aB){if(aC.nodeName==="SPAN"&&c.getAttrib(aC,"data-mce-type")=="bookmark"){if(aC.id==ay.id+"_start"){aA=aB}else{if(aC.id==ay.id+"_end"){au=aB}}}});if(ar<=0||(aA<ar&&au>ar)){T(a.grep(at.childNodes),aq);return 0}else{az=c.clone(aw,X);T(a.grep(at.childNodes),function(aC,aB){if((aA<ar&&aB<ar)||(aA>ar&&aB>ar)){ap.push(aC);aC.parentNode.removeChild(aC)}});if(aA<ar){at.insertBefore(az,ax)}else{if(aA>ar){at.insertBefore(az,ax.nextSibling)}}av.push(az);T(ap,function(aB){az.appendChild(aB)});return az}}function an(aq,at,aw){var ap=[],av,ar,au=true;av=am.inline||am.block;ar=c.create(av);ab(ar);N.walk(aq,function(ax){var ay;function az(aA){var aF,aD,aB,aC,aE;aE=au;aF=aA.nodeName.toLowerCase();aD=aA.parentNode.nodeName.toLowerCase();if(aA.nodeType===1&&x(aA)){aE=au;au=x(aA)==="true";aC=true}if(g(aF,"br")){ay=0;if(am.block){c.remove(aA)}return}if(am.wrapper&&y(aA,ae,al)){ay=0;return}if(au&&!aC&&am.block&&!am.wrapper&&I(aF)){aA=c.rename(aA,av);ab(aA);ap.push(aA);ay=0;return}if(am.selector){T(ah,function(aG){if("collapsed" in aG&&aG.collapsed!==ai){return}if(c.is(aA,aG.selector)&&!b(aA)){ab(aA,aG);aB=true}});if(!am.inline||aB){ay=0;return}}if(au&&!aC&&d(av,aF)&&d(aD,av)&&!(!aw&&aA.nodeType===3&&aA.nodeValue.length===1&&aA.nodeValue.charCodeAt(0)===65279)&&!b(aA)&&(!am.inline||!H(aA))){if(!ay){ay=c.clone(ar,X);aA.parentNode.insertBefore(ay,aA);ap.push(ay)}ay.appendChild(aA)}else{if(aF=="li"&&at){ay=ad(aA,at,ar,ap,az)}else{ay=0;T(a.grep(aA.childNodes),az);if(aC){au=aE}ay=0}}}T(ax,az)});if(am.wrap_links===false){T(ap,function(ax){function ay(aC){var aB,aA,az;if(aC.nodeName==="A"){aA=c.clone(ar,X);ap.push(aA);az=a.grep(aC.childNodes);for(aB=0;aB<az.length;aB++){aA.appendChild(az[aB])}aC.appendChild(aA)}T(a.grep(aC.childNodes),ay)}ay(ax)})}T(ap,function(az){var ax;function aA(aC){var aB=0;T(aC.childNodes,function(aD){if(!f(aD)&&!K(aD)){aB++}});return aB}function ay(aB){var aD,aC;T(aB.childNodes,function(aE){if(aE.nodeType==1&&!K(aE)&&!b(aE)){aD=aE;return X}});if(aD&&h(aD,am)){aC=c.clone(aD,X);ab(aC);c.replace(aC,aB,C);c.remove(aD,1)}return aC||aB}ax=aA(az);if((ap.length>1||!H(az))&&ax===0){c.remove(az,1);return}if(am.inline||am.wrapper){if(!am.exact&&ax===1){az=ay(az)}T(ah,function(aB){T(c.select(aB.inline,az),function(aD){var aC;if(aB.wrap_links===false){aC=aD.parentNode;do{if(aC.nodeName==="A"){return}}while(aC=aC.parentNode)}Z(aB,al,aD,aB.exact?aD:null)})});if(y(az.parentNode,ae,al)){c.remove(az,1);az=0;return C}if(am.merge_with_parents){c.getParent(az.parentNode,function(aB){if(y(aB,ae,al)){c.remove(az,1);az=0;return C}})}if(az&&am.merge_siblings!==false){az=u(E(az),az);az=u(az,E(az,C))}}})}if(am){if(ag){if(ag.nodeType){ac=c.createRng();ac.setStartBefore(ag);ac.setEndAfter(ag);an(p(ac,ah),null,true)}else{an(ag,null,true)}}else{if(!ai||!am.inline||c.select("td.mceSelected,th.mceSelected").length){var ao=aa.selection.getNode();if(!m&&ah[0].defaultBlock&&!c.getParent(ao,c.isBlock)){Y(ah[0].defaultBlock)}aa.selection.setRng(af());ak=r.getBookmark();an(p(r.getRng(C),ah),ak);if(am.styles&&(am.styles.color||am.styles.textDecoration)){a.walk(ao,L,"childNodes");L(ao)}r.moveToBookmark(ak);R(r.getRng(C));aa.nodeChanged()}else{U("apply",ae,al)}}}}function B(ad,am,af){var ag=V(ad),ao=ag[0],ak,aj,ac,al=true;function ae(av){var au,at,ar,aq,ax,aw;if(av.nodeType===3){return}if(av.nodeType===1&&x(av)){ax=al;al=x(av)==="true";aw=true}au=a.grep(av.childNodes);if(al&&!aw){for(at=0,ar=ag.length;at<ar;at++){if(Z(ag[at],am,av,av)){break}}}if(ao.deep){if(au.length){for(at=0,ar=au.length;at<ar;at++){ae(au[at])}if(aw){al=ax}}}}function ah(aq){var ar;T(n(aq.parentNode).reverse(),function(at){var au;if(!ar&&at.id!="_start"&&at.id!="_end"){au=y(at,ad,am);if(au&&au.split!==false){ar=at}}});return ar}function ab(au,aq,aw,az){var aA,ay,ax,at,av,ar;if(au){ar=au.parentNode;for(aA=aq.parentNode;aA&&aA!=ar;aA=aA.parentNode){ay=c.clone(aA,X);for(av=0;av<ag.length;av++){if(Z(ag[av],am,ay,ay)){ay=0;break}}if(ay){if(ax){ay.appendChild(ax)}if(!at){at=ay}ax=ay}}if(az&&(!ao.mixed||!H(au))){aq=c.split(au,aq)}if(ax){aw.parentNode.insertBefore(ax,aw);at.appendChild(aw)}}return aq}function an(aq){return ab(ah(aq),aq,aq,true)}function ai(at){var ar=c.get(at?"_start":"_end"),aq=ar[at?"firstChild":"lastChild"];if(K(aq)){aq=aq[at?"firstChild":"lastChild"]}c.remove(ar,true);return aq}function ap(aq){var at,au,ar;aq=p(aq,ag,C);if(ao.split){at=M(aq,C);au=M(aq);if(at!=au){if(/^(TR|TD)$/.test(at.nodeName)&&at.firstChild){at=(at.nodeName=="TD"?at.firstChild:at.firstChild.firstChild)||at}at=S(at,"span",{id:"_start","data-mce-type":"bookmark"});au=S(au,"span",{id:"_end","data-mce-type":"bookmark"});an(at);an(au);at=ai(C);au=ai()}else{at=au=an(at)}aq.startContainer=at.parentNode;aq.startOffset=s(at);aq.endContainer=au.parentNode;aq.endOffset=s(au)+1}N.walk(aq,function(av){T(av,function(aw){ae(aw);if(aw.nodeType===1&&aa.dom.getStyle(aw,"text-decoration")==="underline"&&aw.parentNode&&i(aw.parentNode)==="underline"){Z({deep:false,exact:true,inline:"span",styles:{textDecoration:"underline"}},null,aw)}})})}if(af){if(af.nodeType){ac=c.createRng();ac.setStartBefore(af);ac.setEndAfter(af);ap(ac)}else{ap(af)}return}if(!r.isCollapsed()||!ao.inline||c.select("td.mceSelected,th.mceSelected").length){ak=r.getBookmark();ap(r.getRng(C));r.moveToBookmark(ak);if(ao.inline&&k(ad,am,r.getStart())){R(r.getRng(true))}aa.nodeChanged()}else{U("remove",ad,am)}}function F(ac,ae,ad){var ab=V(ac);if(k(ac,ae,ad)&&(!("toggle" in ab[0])||ab[0].toggle)){B(ac,ae,ad)}else{Y(ac,ae,ad)}}function y(ac,ab,ah,af){var ad=V(ab),ai,ag,ae;function aj(an,ap,aq){var am,ao,ak=ap[aq],al;if(ap.onmatch){return ap.onmatch(an,ap,aq)}if(ak){if(ak.length===D){for(am in ak){if(ak.hasOwnProperty(am)){if(aq==="attributes"){ao=c.getAttrib(an,am)}else{ao=O(an,am)}if(af&&!ao&&!ap.exact){return}if((!af||ap.exact)&&!g(ao,q(ak[am],ah))){return}}}}else{for(al=0;al<ak.length;al++){if(aq==="attributes"?c.getAttrib(an,ak[al]):O(an,ak[al])){return ap}}}}return ap}if(ad&&ac){for(ag=0;ag<ad.length;ag++){ai=ad[ag];if(h(ac,ai)&&aj(ac,ai,"attributes")&&aj(ac,ai,"styles")){if(ae=ai.classes){for(ag=0;ag<ae.length;ag++){if(!c.hasClass(ac,ae[ag])){return}}}return ai}}}}function k(ad,af,ae){var ac;function ab(ag){ag=c.getParent(ag,function(ah){return !!y(ah,ad,af,true)});return y(ag,ad,af)}if(ae){return ab(ae)}ae=r.getNode();if(ab(ae)){return C}ac=r.getStart();if(ac!=ae){if(ab(ac)){return C}}return X}function v(ai,ah){var af,ag=[],ae={},ad,ac,ab;af=r.getStart();c.getParent(af,function(al){var ak,aj;for(ak=0;ak<ai.length;ak++){aj=ai[ak];if(!ae[aj]&&y(al,aj,ah)){ae[aj]=true;ag.push(aj)}}},c.getRoot());return ag}function z(af){var ah=V(af),ae,ad,ag,ac,ab;if(ah){ae=r.getStart();ad=n(ae);for(ac=ah.length-1;ac>=0;ac--){ab=ah[ac].selector;if(!ab){return C}for(ag=ad.length-1;ag>=0;ag--){if(c.is(ad[ag],ab)){return C}}}}return X}function J(ab,ae,ac){var ad;if(!P){P={};ad={};aa.onNodeChange.addToTop(function(ag,af,ai){var ah=n(ai),aj={};T(P,function(ak,al){T(ah,function(am){if(y(am,al,{},ak.similar)){if(!ad[al]){T(ak,function(an){an(true,{node:am,format:al,parents:ah})});ad[al]=ak}aj[al]=ak;return false}})});T(ad,function(ak,al){if(!aj[al]){delete ad[al];T(ak,function(am){am(false,{node:ai,format:al,parents:ah})})}})})}T(ab.split(","),function(af){if(!P[af]){P[af]=[];P[af].similar=ac}P[af].push(ae)});return this}a.extend(this,{get:V,register:l,apply:Y,remove:B,toggle:F,match:k,matchAll:v,matchNode:y,canApply:z,formatChanged:J});j();W();function h(ab,ac){if(g(ab,ac.inline)){return C}if(g(ab,ac.block)){return C}if(ac.selector){return c.is(ab,ac.selector)}}function g(ac,ab){ac=ac||"";ab=ab||"";ac=""+(ac.nodeName||ac);ab=""+(ab.nodeName||ab);return ac.toLowerCase()==ab.toLowerCase()}function O(ac,ab){var ad=c.getStyle(ac,ab);if(ab=="color"||ab=="backgroundColor"){ad=c.toHex(ad)}if(ab=="fontWeight"&&ad==700){ad="bold"}return""+ad}function q(ab,ac){if(typeof(ab)!="string"){ab=ab(ac)}else{if(ac){ab=ab.replace(/%(\w+)/g,function(ae,ad){return ac[ad]||ae})}}return ab}function f(ab){return ab&&ab.nodeType===3&&/^([\t \r\n]+|)$/.test(ab.nodeValue)}function S(ad,ac,ab){var ae=c.create(ac,ab);ad.parentNode.insertBefore(ae,ad);ae.appendChild(ad);return ae}function p(ab,am,ae){var ap,an,ah,al,ad=ab.startContainer,ai=ab.startOffset,ar=ab.endContainer,ak=ab.endOffset;function ao(aA){var au,ax,az,aw,av,at;au=ax=aA?ad:ar;av=aA?"previousSibling":"nextSibling";at=c.getRoot();function ay(aB){return aB.nodeName=="BR"&&aB.getAttribute("data-mce-bogus")&&!aB.nextSibling}if(au.nodeType==3&&!f(au)){if(aA?ai>0:ak<au.nodeValue.length){return au}}for(;;){if(!am[0].block_expand&&H(ax)){return ax}for(aw=ax[av];aw;aw=aw[av]){if(!K(aw)&&!f(aw)&&!ay(aw)){return ax}}if(ax.parentNode==at){au=ax;break}ax=ax.parentNode}return au}function ag(at,au){if(au===D){au=at.nodeType===3?at.length:at.childNodes.length}while(at&&at.hasChildNodes()){at=at.childNodes[au];if(at){au=at.nodeType===3?at.length:at.childNodes.length}}return{node:at,offset:au}}if(ad.nodeType==1&&ad.hasChildNodes()){an=ad.childNodes.length-1;ad=ad.childNodes[ai>an?an:ai];if(ad.nodeType==3){ai=0}}if(ar.nodeType==1&&ar.hasChildNodes()){an=ar.childNodes.length-1;ar=ar.childNodes[ak>an?an:ak-1];if(ar.nodeType==3){ak=ar.nodeValue.length}}function aq(au){var at=au;while(at){if(at.nodeType===1&&x(at)){return x(at)==="false"?at:au}at=at.parentNode}return au}function aj(au,ay,aA){var ax,av,az,at;function aw(aC,aE){var aF,aB,aD=aC.nodeValue;if(typeof(aE)=="undefined"){aE=aA?aD.length:0}if(aA){aF=aD.lastIndexOf(" ",aE);aB=aD.lastIndexOf("\u00a0",aE);aF=aF>aB?aF:aB;if(aF!==-1&&!ae){aF++}}else{aF=aD.indexOf(" ",aE);aB=aD.indexOf("\u00a0",aE);aF=aF!==-1&&(aB===-1||aF<aB)?aF:aB}return aF}if(au.nodeType===3){az=aw(au,ay);if(az!==-1){return{container:au,offset:az}}at=au}ax=new t(au,c.getParent(au,H)||aa.getBody());while(av=ax[aA?"prev":"next"]()){if(av.nodeType===3){at=av;az=aw(av);if(az!==-1){return{container:av,offset:az}}}else{if(H(av)){break}}}if(at){if(aA){ay=0}else{ay=at.length}return{container:at,offset:ay}}}function af(au,at){var av,aw,ay,ax;if(au.nodeType==3&&au.nodeValue.length===0&&au[at]){au=au[at]}av=n(au);for(aw=0;aw<av.length;aw++){for(ay=0;ay<am.length;ay++){ax=am[ay];if("collapsed" in ax&&ax.collapsed!==ab.collapsed){continue}if(c.is(av[aw],ax.selector)){return av[aw]}}}return au}function ac(au,at,aw){var av;if(!am[0].wrapper){av=c.getParent(au,am[0].block)}if(!av){av=c.getParent(au.nodeType==3?au.parentNode:au,I)}if(av&&am[0].wrapper){av=n(av,"ul,ol").reverse()[0]||av}if(!av){av=au;while(av[at]&&!H(av[at])){av=av[at];if(g(av,"br")){break}}}return av||au}ad=aq(ad);ar=aq(ar);if(K(ad.parentNode)||K(ad)){ad=K(ad)?ad:ad.parentNode;ad=ad.nextSibling||ad;if(ad.nodeType==3){ai=0}}if(K(ar.parentNode)||K(ar)){ar=K(ar)?ar:ar.parentNode;ar=ar.previousSibling||ar;if(ar.nodeType==3){ak=ar.length}}if(am[0].inline){if(ab.collapsed){al=aj(ad,ai,true);if(al){ad=al.container;ai=al.offset}al=aj(ar,ak);if(al){ar=al.container;ak=al.offset}}ah=ag(ar,ak);if(ah.node){while(ah.node&&ah.offset===0&&ah.node.previousSibling){ah=ag(ah.node.previousSibling)}if(ah.node&&ah.offset>0&&ah.node.nodeType===3&&ah.node.nodeValue.charAt(ah.offset-1)===" "){if(ah.offset>1){ar=ah.node;ar.splitText(ah.offset-1)}}}}if(am[0].inline||am[0].block_expand){if(!am[0].inline||(ad.nodeType!=3||ai===0)){ad=ao(true)}if(!am[0].inline||(ar.nodeType!=3||ak===ar.nodeValue.length)){ar=ao()}}if(am[0].selector&&am[0].expand!==X&&!am[0].inline){ad=af(ad,"previousSibling");ar=af(ar,"nextSibling")}if(am[0].block||am[0].selector){ad=ac(ad,"previousSibling");ar=ac(ar,"nextSibling");if(am[0].block){if(!H(ad)){ad=ao(true)}if(!H(ar)){ar=ao()}}}if(ad.nodeType==1){ai=s(ad);ad=ad.parentNode}if(ar.nodeType==1){ak=s(ar)+1;ar=ar.parentNode}return{startContainer:ad,startOffset:ai,endContainer:ar,endOffset:ak}}function Z(ah,ag,ae,ab){var ad,ac,af;if(!h(ae,ah)){return X}if(ah.remove!="all"){T(ah.styles,function(aj,ai){aj=q(aj,ag);if(typeof(ai)==="number"){ai=aj;ab=0}if(!ab||g(O(ab,ai),aj)){c.setStyle(ae,ai,"")}af=1});if(af&&c.getAttrib(ae,"style")==""){ae.removeAttribute("style");ae.removeAttribute("data-mce-style")}T(ah.attributes,function(ak,ai){var aj;ak=q(ak,ag);if(typeof(ai)==="number"){ai=ak;ab=0}if(!ab||g(c.getAttrib(ab,ai),ak)){if(ai=="class"){ak=c.getAttrib(ae,ai);if(ak){aj="";T(ak.split(/\s+/),function(al){if(/mce\w+/.test(al)){aj+=(aj?" ":"")+al}});if(aj){c.setAttrib(ae,ai,aj);return}}}if(ai=="class"){ae.removeAttribute("className")}if(e.test(ai)){ae.removeAttribute("data-mce-"+ai)}ae.removeAttribute(ai)}});T(ah.classes,function(ai){ai=q(ai,ag);if(!ab||c.hasClass(ab,ai)){c.removeClass(ae,ai)}});ac=c.getAttribs(ae);for(ad=0;ad<ac.length;ad++){if(ac[ad].nodeName.indexOf("_")!==0){return X}}}if(ah.remove!="none"){o(ae,ah);return C}}function o(ad,ae){var ab=ad.parentNode,ac;function af(ah,ag,ai){ah=E(ah,ag,ai);return !ah||(ah.nodeName=="BR"||H(ah))}if(ae.block){if(!m){if(H(ad)&&!H(ab)){if(!af(ad,X)&&!af(ad.firstChild,C,1)){ad.insertBefore(c.create("br"),ad.firstChild)}if(!af(ad,C)&&!af(ad.lastChild,X,1)){ad.appendChild(c.create("br"))}}}else{if(ab==c.getRoot()){if(!ae.list_block||!g(ad,ae.list_block)){T(a.grep(ad.childNodes),function(ag){if(d(m,ag.nodeName.toLowerCase())){if(!ac){ac=S(ag,m)}else{ac.appendChild(ag)}}else{ac=0}})}}}}if(ae.selector&&ae.inline&&!g(ae.inline,ad)){return}c.remove(ad,1)}function E(ac,ab,ad){if(ac){ab=ab?"nextSibling":"previousSibling";for(ac=ad?ac:ac[ab];ac;ac=ac[ab]){if(ac.nodeType==1||!f(ac)){return ac}}}}function K(ab){return ab&&ab.nodeType==1&&ab.getAttribute("data-mce-type")=="bookmark"}function u(af,ae){var ab,ad,ac;function ah(ak,aj){if(ak.nodeName!=aj.nodeName){return X}function ai(am){var an={};T(c.getAttribs(am),function(ao){var ap=ao.nodeName.toLowerCase();if(ap.indexOf("_")!==0&&ap!=="style"){an[ap]=c.getAttrib(am,ap)}});return an}function al(ap,ao){var an,am;for(am in ap){if(ap.hasOwnProperty(am)){an=ao[am];if(an===D){return X}if(ap[am]!=an){return X}delete ao[am]}}for(am in ao){if(ao.hasOwnProperty(am)){return X}}return C}if(!al(ai(ak),ai(aj))){return X}if(!al(c.parseStyle(c.getAttrib(ak,"style")),c.parseStyle(c.getAttrib(aj,"style")))){return X}return C}function ag(aj,ai){for(ad=aj;ad;ad=ad[ai]){if(ad.nodeType==3&&ad.nodeValue.length!==0){return aj}if(ad.nodeType==1&&!K(ad)){return ad}}return aj}if(af&&ae){af=ag(af,"previousSibling");ae=ag(ae,"nextSibling");if(ah(af,ae)){for(ad=af.nextSibling;ad&&ad!=ae;){ac=ad;ad=ad.nextSibling;af.appendChild(ac)}c.remove(ae);T(a.grep(ae.childNodes),function(ai){af.appendChild(ai)});return af}}return ae}function M(ac,ag){var ab,af,ad,ae;ab=ac[ag?"startContainer":"endContainer"];af=ac[ag?"startOffset":"endOffset"];if(ab.nodeType==1){ad=ab.childNodes.length-1;if(!ag&&af){af--}ab=ab.childNodes[af>ad?ad:af]}if(ab.nodeType===3&&ag&&af>=ab.nodeValue.length){ab=new t(ab,aa.getBody()).next()||ab}if(ab.nodeType===3&&!ag&&af===0){ab=new t(ab,aa.getBody()).prev()||ab}return ab}function U(ak,ab,ai){var al="_mce_caret",ac=aa.settings.caret_debug;function ad(ap){var ao=c.create("span",{id:al,"data-mce-bogus":true,style:ac?"color:red":""});if(ap){ao.appendChild(aa.getDoc().createTextNode(G))}return ao}function aj(ap,ao){while(ap){if((ap.nodeType===3&&ap.nodeValue!==G)||ap.childNodes.length>1){return false}if(ao&&ap.nodeType===1){ao.push(ap)}ap=ap.firstChild}return true}function ag(ao){while(ao){if(ao.id===al){return ao}ao=ao.parentNode}}function af(ao){var ap;if(ao){ap=new t(ao,ao);for(ao=ap.current();ao;ao=ap.next()){if(ao.nodeType===3){return ao}}}}function ae(aq,ap){var ar,ao;if(!aq){aq=ag(r.getStart());if(!aq){while(aq=c.get(al)){ae(aq,false)}}}else{ao=r.getRng(true);if(aj(aq)){if(ap!==false){ao.setStartBefore(aq);ao.setEndBefore(aq)}c.remove(aq)}else{ar=af(aq);if(ar.nodeValue.charAt(0)===G){ar=ar.deleteData(0,1)}c.remove(aq,1)}r.setRng(ao)}}function ah(){var aq,ao,av,au,ar,ap,at;aq=r.getRng(true);au=aq.startOffset;ap=aq.startContainer;at=ap.nodeValue;ao=ag(r.getStart());if(ao){av=af(ao)}if(at&&au>0&&au<at.length&&/\w/.test(at.charAt(au))&&/\w/.test(at.charAt(au-1))){ar=r.getBookmark();aq.collapse(true);aq=p(aq,V(ab));aq=N.split(aq);Y(ab,ai,aq);r.moveToBookmark(ar)}else{if(!ao||av.nodeValue!==G){ao=ad(true);av=ao.firstChild;aq.insertNode(ao);au=1;Y(ab,ai,ao)}else{Y(ab,ai,ao)}r.setCursorLocation(av,au)}}function am(){var ao=r.getRng(true),ap,at,aw,av,aq,az,ay=[],au,ax;ap=ao.startContainer;at=ao.startOffset;aq=ap;if(ap.nodeType==3){if(at!=ap.nodeValue.length||ap.nodeValue===G){av=true}aq=aq.parentNode}while(aq){if(y(aq,ab,ai)){az=aq;break}if(aq.nextSibling){av=true}ay.push(aq);aq=aq.parentNode}if(!az){return}if(av){aw=r.getBookmark();ao.collapse(true);ao=p(ao,V(ab),true);ao=N.split(ao);B(ab,ai,ao);r.moveToBookmark(aw)}else{ax=ad();aq=ax;for(au=ay.length-1;au>=0;au--){aq.appendChild(c.clone(ay[au],false));aq=aq.firstChild}aq.appendChild(c.doc.createTextNode(G));aq=aq.firstChild;var ar=c.getParent(az,I);if(ar&&c.isEmpty(ar)){az.parentNode.replaceChild(ax,az)}else{c.insertAfter(ax,az)}r.setCursorLocation(aq,1);if(c.isEmpty(az)){c.remove(az)}}}function an(){var ap,ao,aq;ao=ag(r.getStart());if(ao&&!c.isEmpty(ao)){a.walk(ao,function(ar){if(ar.nodeType==1&&ar.id!==al&&!c.isEmpty(ar)){c.setAttrib(ar,"data-mce-bogus",null)}},"childNodes")}}if(!self._hasCaretEvents){aa.onBeforeGetContent.addToTop(function(){var ao=[],ap;if(aj(ag(r.getStart()),ao)){ap=ao.length;while(ap--){c.setAttrib(ao[ap],"data-mce-bogus","1")}}});a.each("onMouseUp onKeyUp".split(" "),function(ao){aa[ao].addToTop(function(){ae();an()})});aa.onKeyDown.addToTop(function(ao,aq){var ap=aq.keyCode;if(ap==8||ap==37||ap==39){ae(ag(r.getStart()))}an()});r.onSetContent.add(an);self._hasCaretEvents=true}if(ak=="apply"){ah()}else{am()}}function R(ac){var ab=ac.startContainer,ai=ac.startOffset,ae,ah,ag,ad,af;if(ab.nodeType==3&&ai>=ab.nodeValue.length){ai=s(ab);ab=ab.parentNode;ae=true}if(ab.nodeType==1){ad=ab.childNodes;ab=ad[Math.min(ai,ad.length-1)];ah=new t(ab,c.getParent(ab,c.isBlock));if(ai>ad.length-1||ae){ah.next()}for(ag=ah.current();ag;ag=ah.next()){if(ag.nodeType==3&&!f(ag)){af=c.create("a",null,G);ag.parentNode.insertBefore(af,ag);ac.setStart(ag,0);r.setRng(ac);c.remove(af);return}}}}}})(tinymce);tinymce.onAddEditor.add(function(e,a){var d,h,g,c=a.settings;function b(j,i){e.each(i,function(l,k){if(l){g.setStyle(j,k,l)}});g.rename(j,"span")}function f(i,j){g=i.dom;if(c.convert_fonts_to_spans){e.each(g.select("font,u,strike",j.node),function(k){d[k.nodeName.toLowerCase()](a.dom,k)})}}if(c.inline_styles){h=e.explode(c.font_size_legacy_values);d={font:function(j,i){b(i,{backgroundColor:i.style.backgroundColor,color:i.color,fontFamily:i.face,fontSize:h[parseInt(i.size,10)-1]})},u:function(j,i){b(i,{textDecoration:"underline"})},strike:function(j,i){b(i,{textDecoration:"line-through"})}};a.onPreProcess.add(f);a.onSetContent.add(f);a.onInit.add(function(){a.selection.onSetContent.add(f)})}});(function(b){var a=b.dom.TreeWalker;b.EnterKey=function(f){var i=f.dom,e=f.selection,d=f.settings,h=f.undoManager,c=f.schema.getNonEmptyElements();function g(B){var v=e.getRng(true),G,j,A,u,p,M,C,o,k,n,t,J,x,D;function E(N){return N&&i.isBlock(N)&&!/^(TD|TH|CAPTION|FORM)$/.test(N.nodeName)&&!/^(fixed|absolute)/i.test(N.style.position)&&i.getContentEditable(N)!=="true"}function F(O){var N;if(b.isIE&&!b.isIE11&&i.isBlock(O)){N=e.getRng();O.appendChild(i.create("span",null,"\u00a0"));e.select(O);O.lastChild.outerHTML="";e.setRng(N)}}function z(P){var O=P,Q=[],N;while(O=O.firstChild){if(i.isBlock(O)){return}if(O.nodeType==1&&!c[O.nodeName.toLowerCase()]){Q.push(O)}}N=Q.length;while(N--){O=Q[N];if(!O.hasChildNodes()||(O.firstChild==O.lastChild&&O.firstChild.nodeValue==="")){i.remove(O)}else{if(O.nodeName=="A"&&(O.innerText||O.textContent)===" "){i.remove(O)}}}}function m(O){var T,R,N,U,S,Q=O,P;N=i.createRng();if(O.hasChildNodes()){T=new a(O,O);while(R=T.current()){if(R.nodeType==3){N.setStart(R,0);N.setEnd(R,0);break}if(c[R.nodeName.toLowerCase()]){N.setStartBefore(R);N.setEndBefore(R);break}Q=R;R=T.next()}if(!R){N.setStart(Q,0);N.setEnd(Q,0)}}else{if(O.nodeName=="BR"){if(O.nextSibling&&i.isBlock(O.nextSibling)){if(!M||M<9){P=i.create("br");O.parentNode.insertBefore(P,O)}N.setStartBefore(O);N.setEndBefore(O)}else{N.setStartAfter(O);N.setEndAfter(O)}}else{N.setStart(O,0);N.setEnd(O,0)}}e.setRng(N);i.remove(P);S=i.getViewPort(f.getWin());U=i.getPos(O).y;if(U<S.y||U+25>S.y+S.h){f.getWin().scrollTo(0,U<S.y?U:U-S.h+25)}}function r(O){var P=A,R,Q,N;R=O||t=="TABLE"?i.create(O||x):p.cloneNode(false);N=R;if(d.keep_styles!==false){do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(P.nodeName)){if(P.id=="_mce_caret"){continue}Q=P.cloneNode(false);i.setAttrib(Q,"id","");if(R.hasChildNodes()){Q.appendChild(R.firstChild);R.appendChild(Q)}else{N=Q;R.appendChild(Q)}}}while(P=P.parentNode)}if(!b.isIE||b.isIE11){N.innerHTML='<br data-mce-bogus="1">'}return R}function q(Q){var P,O,N;if(A.nodeType==3&&(Q?u>0:u<A.nodeValue.length)){return false}if(A.parentNode==p&&D&&!Q){return true}if(Q&&A.nodeType==1&&A==p.firstChild){return true}if(A.nodeName==="TABLE"||(A.previousSibling&&A.previousSibling.nodeName=="TABLE")){return(D&&!Q)||(!D&&Q)}P=new a(A,p);if(A.nodeType==3){if(Q&&u==0){P.prev()}else{if(!Q&&u==A.nodeValue.length){P.next()}}}while(O=P.current()){if(O.nodeType===1){if(!O.getAttribute("data-mce-bogus")){N=O.nodeName.toLowerCase();if(c[N]&&N!=="br"){return false}}}else{if(O.nodeType===3&&!/^[ \t\r\n]*$/.test(O.nodeValue)){return false}}if(Q){P.prev()}else{P.next()}}return true}function l(N,T){var U,S,P,R,Q,O=x||"P";S=i.getParent(N,i.isBlock);if(!S||!E(S)){S=S||j;if(!S.hasChildNodes()){U=i.create(O);S.appendChild(U);v.setStart(U,0);v.setEnd(U,0);return U}R=N;while(R.parentNode!=S){R=R.parentNode}while(R&&!i.isBlock(R)){P=R;R=R.previousSibling}if(P){U=i.create(O);P.parentNode.insertBefore(U,P);R=P;while(R&&!i.isBlock(R)){Q=R.nextSibling;U.appendChild(R);R=Q}v.setStart(N,T);v.setEnd(N,T)}}return N}function H(){function N(P){var O=n[P?"firstChild":"lastChild"];while(O){if(O.nodeType==1){break}O=O[P?"nextSibling":"previousSibling"]}return O===p}o=x?r(x):i.create("BR");if(N(true)&&N()){i.replace(o,n)}else{if(N(true)){n.parentNode.insertBefore(o,n)}else{if(N()){i.insertAfter(o,n);F(o)}else{G=v.cloneRange();G.setStartAfter(p);G.setEndAfter(n);k=G.extractContents();i.insertAfter(k,n);i.insertAfter(o,n)}}}i.remove(p);m(o);h.add()}function y(){var O=new a(A,p),N;while(N=O.next()){if(c[N.nodeName.toLowerCase()]||N.length>0){return true}}}function L(){var P,O,N;if(A&&A.nodeType==3&&u>=A.nodeValue.length){if((!b.isIE||b.isIE11)&&!y()){P=i.create("br");v.insertNode(P);v.setStartAfter(P);v.setEndAfter(P);O=true}}P=i.create("br");v.insertNode(P);if((b.isIE&&!b.isIE11)&&t=="PRE"&&(!M||M<8)){P.parentNode.insertBefore(i.doc.createTextNode("\r"),P)}N=i.create("span",{},"&nbsp;");P.parentNode.insertBefore(N,P);e.scrollIntoView(N);i.remove(N);if(!O){v.setStartAfter(P);v.setEndAfter(P)}else{v.setStartBefore(P);v.setEndBefore(P)}e.setRng(v);h.add()}function s(N){do{if(N.nodeType===3){N.nodeValue=N.nodeValue.replace(/^[\r\n]+/,"")}N=N.firstChild}while(N)}function K(P){var N=i.getRoot(),O,Q;O=P;while(O!==N&&i.getContentEditable(O)!=="false"){if(i.getContentEditable(O)==="true"){Q=O}O=O.parentNode}return O!==N?Q:N}function I(O){var N;if(!b.isIE||b.isIE11){O.normalize();N=O.lastChild;if(!N||(/^(left|right)$/gi.test(i.getStyle(N,"float",true)))){i.add(O,"br")}}}if(!v.collapsed){f.execCommand("Delete");return}if(B.isDefaultPrevented()){return}A=v.startContainer;u=v.startOffset;x=(d.force_p_newlines?"p":"")||d.forced_root_block;x=x?x.toUpperCase():"";M=i.doc.documentMode;C=B.shiftKey;if(A.nodeType==1&&A.hasChildNodes()){D=u>A.childNodes.length-1;A=A.childNodes[Math.min(u,A.childNodes.length-1)]||A;if(D&&A.nodeType==3){u=A.nodeValue.length}else{u=0}}j=K(A);if(!j){return}h.beforeChange();if(!i.isBlock(j)&&j!=i.getRoot()){if(!x||C){L()}return}if((x&&!C)||(!x&&C)){A=l(A,u)}p=i.getParent(A,i.isBlock);n=p?i.getParent(p.parentNode,i.isBlock):null;t=p?p.nodeName.toUpperCase():"";J=n?n.nodeName.toUpperCase():"";if(J=="LI"&&!B.ctrlKey){p=n;t=J}if(t=="LI"){if(!x&&C){L();return}if(i.isEmpty(p)){if(/^(UL|OL|LI)$/.test(n.parentNode.nodeName)){return false}H();return}}if(t=="PRE"&&d.br_in_pre!==false){if(!C){L();return}}else{if((!x&&!C&&t!="LI")||(x&&C)){L();return}}x=x||"P";if(q()){if(/^(H[1-6]|PRE)$/.test(t)&&J!="HGROUP"){o=r(x)}else{o=r()}if(d.end_container_on_empty_block&&E(n)&&i.isEmpty(p)){o=i.split(n,p)}else{i.insertAfter(o,p)}m(o)}else{if(q(true)){o=p.parentNode.insertBefore(r(),p);F(o)}else{G=v.cloneRange();G.setEndAfter(p);k=G.extractContents();s(k);o=k.firstChild;i.insertAfter(k,p);z(o);I(p);m(o)}}i.setAttrib(o,"id","");h.add()}f.onKeyDown.add(function(k,j){if(j.keyCode==13){if(g(j)!==false){j.preventDefault()}}})}})(tinymce);
diff --git a/webapp/src/main/webapp/js/tiny_mce/tiny_mce_popup.js b/webapp/src/main/webapp/js/tiny_mce/tiny_mce_popup.js
index 0808f8f9b..ff55f955b 100644
--- a/webapp/src/main/webapp/js/tiny_mce/tiny_mce_popup.js
+++ b/webapp/src/main/webapp/js/tiny_mce/tiny_mce_popup.js
@@ -2,4 +2,4 @@
 // Uncomment and change this document.domain value if you are loading the script cross subdomains
 // document.domain = 'moxiecode.com';
 
-var tinymce=null,tinyMCEPopup,tinyMCE;tinyMCEPopup={init:function(){var b=this,a,c;a=b.getWin();tinymce=a.tinymce;tinyMCE=a.tinyMCE;b.editor=tinymce.EditorManager.activeEditor;b.params=b.editor.windowManager.params;b.features=b.editor.windowManager.features;b.dom=b.editor.windowManager.createInstance("tinymce.dom.DOMUtils",document,{ownEvents:true,proxy:tinyMCEPopup._eventProxy});b.dom.bind(window,"ready",b._onDOMLoaded,b);if(b.features.popup_css!==false){b.dom.loadCSS(b.features.popup_css||b.editor.settings.popup_css)}b.listeners=[];b.onInit={add:function(e,d){b.listeners.push({func:e,scope:d})}};b.isWindow=!b.getWindowArg("mce_inline");b.id=b.getWindowArg("mce_window_id");b.editor.windowManager.onOpen.dispatch(b.editor.windowManager,window)},getWin:function(){return(!window.frameElement&&window.dialogArguments)||opener||parent||top},getWindowArg:function(c,b){var a=this.params[c];return tinymce.is(a)?a:b},getParam:function(b,a){return this.editor.getParam(b,a)},getLang:function(b,a){return this.editor.getLang(b,a)},execCommand:function(d,c,e,b){b=b||{};b.skip_focus=1;this.restoreSelection();return this.editor.execCommand(d,c,e,b)},resizeToInnerSize:function(){var a=this;setTimeout(function(){var b=a.dom.getViewPort(window);a.editor.windowManager.resizeBy(a.getWindowArg("mce_width")-b.w,a.getWindowArg("mce_height")-b.h,a.id||window)},10)},executeOnLoad:function(s){this.onInit.add(function(){eval(s)})},storeSelection:function(){this.editor.windowManager.bookmark=tinyMCEPopup.editor.selection.getBookmark(1)},restoreSelection:function(){var a=tinyMCEPopup;if(!a.isWindow&&tinymce.isIE){a.editor.selection.moveToBookmark(a.editor.windowManager.bookmark)}},requireLangPack:function(){var b=this,a=b.getWindowArg("plugin_url")||b.getWindowArg("theme_url");if(a&&b.editor.settings.language&&b.features.translate_i18n!==false&&b.editor.settings.language_load!==false){a+="/langs/"+b.editor.settings.language+"_dlg.js";if(!tinymce.ScriptLoader.isDone(a)){document.write('<script type="text/javascript" src="'+tinymce._addVer(a)+'"><\/script>');tinymce.ScriptLoader.markDone(a)}}},pickColor:function(b,a){this.execCommand("mceColorPicker",true,{color:document.getElementById(a).value,func:function(e){document.getElementById(a).value=e;try{document.getElementById(a).onchange()}catch(d){}}})},openBrowser:function(a,c,b){tinyMCEPopup.restoreSelection();this.editor.execCallback("file_browser_callback",a,document.getElementById(a).value,c,window)},confirm:function(b,a,c){this.editor.windowManager.confirm(b,a,c,window)},alert:function(b,a,c){this.editor.windowManager.alert(b,a,c,window)},close:function(){var a=this;function b(){a.editor.windowManager.close(window);tinymce=tinyMCE=a.editor=a.params=a.dom=a.dom.doc=null}if(tinymce.isOpera){a.getWin().setTimeout(b,0)}else{b()}},_restoreSelection:function(a){var a=(a&&a.target)||window.event.srcElement;if(a.nodeName=="INPUT"&&(a.type=="submit"||a.type=="button")){tinyMCEPopup.restoreSelection()}},_onDOMLoaded:function(){var b=tinyMCEPopup,d=document.title,e,c,a;if(b.features.translate_i18n!==false){c=document.body.innerHTML;if(tinymce.isIE){c=c.replace(/ (value|title|alt)=([^"][^\s>]+)/gi,' $1="$2"')}document.dir=b.editor.getParam("directionality","");if((a=b.editor.translate(c))&&a!=c){document.body.innerHTML=a}if((a=b.editor.translate(d))&&a!=d){document.title=d=a}}if(!b.editor.getParam("browser_preferred_colors",false)||!b.isWindow){b.dom.addClass(document.body,"forceColors")}document.body.style.display="";if(tinymce.isIE&&!tinymce.isIE11){document.attachEvent("onmouseup",tinyMCEPopup._restoreSelection);b.dom.add(b.dom.select("head")[0],"base",{target:"_self"})}else{if(tinymce.isIE11){document.addEventListener("mouseup",tinyMCEPopup._restoreSelection,false)}}b.restoreSelection();b.resizeToInnerSize();if(!b.isWindow){b.editor.windowManager.setTitle(window,d)}else{window.focus()}if(!tinymce.isIE&&!b.isWindow){b.dom.bind(document,"focus",function(){b.editor.windowManager.focus(b.id)})}tinymce.each(b.dom.select("select"),function(f){f.onkeydown=tinyMCEPopup._accessHandler});tinymce.each(b.listeners,function(f){f.func.call(f.scope,b.editor)});if(b.getWindowArg("mce_auto_focus",true)){window.focus();tinymce.each(document.forms,function(g){tinymce.each(g.elements,function(f){if(b.dom.hasClass(f,"mceFocus")&&!f.disabled){f.focus();return false}})})}document.onkeyup=tinyMCEPopup._closeWinKeyHandler},_accessHandler:function(a){a=a||window.event;if(a.keyCode==13||a.keyCode==32){var b=a.target||a.srcElement;if(b.onchange){b.onchange()}return tinymce.dom.Event.cancel(a)}},_closeWinKeyHandler:function(a){a=a||window.event;if(a.keyCode==27){tinyMCEPopup.close()}},_eventProxy:function(a){return function(b){tinyMCEPopup.dom.events.callNativeHandler(a,b)}}};tinyMCEPopup.init();
\ No newline at end of file
+var tinymce=null,tinyMCEPopup,tinyMCE;tinyMCEPopup={init:function(){var b=this,a,c;a=b.getWin();tinymce=a.tinymce;tinyMCE=a.tinyMCE;b.editor=tinymce.EditorManager.activeEditor;b.params=b.editor.windowManager.params;b.features=b.editor.windowManager.features;b.dom=b.editor.windowManager.createInstance("tinymce.dom.DOMUtils",document,{ownEvents:true,proxy:tinyMCEPopup._eventProxy});b.dom.bind(window,"ready",b._onDOMLoaded,b);if(b.features.popup_css!==false){b.dom.loadCSS(b.features.popup_css||b.editor.settings.popup_css)}b.listeners=[];b.onInit={add:function(e,d){b.listeners.push({func:e,scope:d})}};b.isWindow=!b.getWindowArg("mce_inline");b.id=b.getWindowArg("mce_window_id");b.editor.windowManager.onOpen.dispatch(b.editor.windowManager,window)},getWin:function(){return(!window.frameElement&&window.dialogArguments)||opener||parent||top},getWindowArg:function(c,b){var a=this.params[c];return tinymce.is(a)?a:b},getParam:function(b,a){return this.editor.getParam(b,a)},getLang:function(b,a){return this.editor.getLang(b,a)},execCommand:function(d,c,e,b){b=b||{};b.skip_focus=1;this.restoreSelection();return this.editor.execCommand(d,c,e,b)},resizeToInnerSize:function(){var a=this;setTimeout(function(){var b=a.dom.getViewPort(window);a.editor.windowManager.resizeBy(a.getWindowArg("mce_width")-b.w,a.getWindowArg("mce_height")-b.h,a.id||window)},10)},executeOnLoad:function(s){this.onInit.add(function(){eval(s)})},storeSelection:function(){this.editor.windowManager.bookmark=tinyMCEPopup.editor.selection.getBookmark(1)},restoreSelection:function(){var a=tinyMCEPopup;if(!a.isWindow&&tinymce.isIE){a.editor.selection.moveToBookmark(a.editor.windowManager.bookmark)}},requireLangPack:function(){var b=this,a=b.getWindowArg("plugin_url")||b.getWindowArg("theme_url");if(a&&b.editor.settings.language&&b.features.translate_i18n!==false&&b.editor.settings.language_load!==false){a+="/langs/"+b.editor.settings.language+"_dlg.js";if(!tinymce.ScriptLoader.isDone(a)){document.write('<script type="text/javascript" src="'+tinymce._addVer(a)+'"><\/script>');tinymce.ScriptLoader.markDone(a)}}},pickColor:function(b,a){this.execCommand("mceColorPicker",true,{color:document.getElementById(a).value,func:function(e){document.getElementById(a).value=e;try{document.getElementById(a).onchange()}catch(d){}}})},openBrowser:function(a,c,b){tinyMCEPopup.restoreSelection();this.editor.execCallback("file_browser_callback",a,document.getElementById(a).value,c,window)},confirm:function(b,a,c){this.editor.windowManager.confirm(b,a,c,window)},alert:function(b,a,c){this.editor.windowManager.alert(b,a,c,window)},close:function(){var a=this;function b(){a.editor.windowManager.close(window);tinymce=tinyMCE=a.editor=a.params=a.dom=a.dom.doc=null}if(tinymce.isOpera){a.getWin().setTimeout(b,0)}else{b()}},_restoreSelection:function(a){var a=(a&&a.target)||window.event.srcElement;if(a.nodeName=="INPUT"&&(a.type=="submit"||a.type=="button")){tinyMCEPopup.restoreSelection()}},_onDOMLoaded:function(){var b=tinyMCEPopup,d=document.title,e,c,a;if(b.features.translate_i18n!==false){c=document.body.innerHTML;if(tinymce.isIE){c=c.replace(/ (value|title|alt)=([^"][^\s>]+)/gi,' $1="$2"')}document.dir=b.editor.getParam("directionality","");if((a=b.editor.translate(c))&&a!=c){document.body.innerHTML=a}if((a=b.editor.translate(d))&&a!=d){document.title=d=a}}if(!b.editor.getParam("browser_preferred_colors",false)||!b.isWindow){b.dom.addClass(document.body,"forceColors")}document.body.style.display="";if(tinymce.isIE&&!tinymce.isIE11){document.attachEvent("onmouseup",tinyMCEPopup._restoreSelection);b.dom.add(b.dom.select("head")[0],"base",{target:"_self"})}else{if(tinymce.isIE11){document.addEventListener("mouseup",tinyMCEPopup._restoreSelection,false)}}b.restoreSelection();b.resizeToInnerSize();if(!b.isWindow){b.editor.windowManager.setTitle(window,d)}else{window.focus()}if(!tinymce.isIE&&!b.isWindow){b.dom.bind(document,"focus",function(){b.editor.windowManager.focus(b.id)})}tinymce.each(b.dom.select("select"),function(f){f.onkeydown=tinyMCEPopup._accessHandler});tinymce.each(b.listeners,function(f){f.func.call(f.scope,b.editor)});if(b.getWindowArg("mce_auto_focus",true)){window.focus();tinymce.each(document.forms,function(g){tinymce.each(g.elements,function(f){if(b.dom.hasClass(f,"mceFocus")&&!f.disabled){f.focus();return false}})})}document.onkeyup=tinyMCEPopup._closeWinKeyHandler},_accessHandler:function(a){a=a||window.event;if(a.keyCode==13||a.keyCode==32){var b=a.target||a.srcElement;if(b.onchange){b.onchange()}return tinymce.dom.Event.cancel(a)}},_closeWinKeyHandler:function(a){a=a||window.event;if(a.keyCode==27){tinyMCEPopup.close()}},_eventProxy:function(a){return function(b){tinyMCEPopup.dom.events.callNativeHandler(a,b)}}};tinyMCEPopup.init();
diff --git a/webapp/src/main/webapp/js/tiny_mce/tiny_mce_src.js b/webapp/src/main/webapp/js/tiny_mce/tiny_mce_src.js
index 363506135..82418a211 100644
--- a/webapp/src/main/webapp/js/tiny_mce/tiny_mce_src.js
+++ b/webapp/src/main/webapp/js/tiny_mce/tiny_mce_src.js
@@ -36,7 +36,7 @@
 			t.isAir = /adobeair/i.test(ua);
 
 			t.isIDevice = /(iPad|iPhone)/.test(ua);
-			
+
 			t.isIOS5 = t.isIDevice && ua.match(/AppleWebKit\/(\d*)/)[1]>=534;
 
 			// TinyMCE .NET webcontrol might be setting the values for TinyMCE
@@ -813,7 +813,7 @@ tinymce.create('tinymce.util.Dispatcher', {
 		var self = this, returnValue, args = arguments, i, listeners = self.listeners, listener;
 
 		self.inDispatch = true;
-		
+
 		// Needs to be a real loop since the listener count might change while looping
 		// And this is also more efficient
 		for (i = 0; i < listeners.length; i++) {
@@ -922,7 +922,7 @@ tinymce.create('tinymce.util.Dispatcher', {
 				return u.getURI();
 
 			var tu = t.getURI(), uu = u.getURI();
-			
+
 			// Allow usage of the base_uri when relative_urls = true
 			if(tu == uu || (tu.charAt(tu.length - 1) == "/" && tu.substr(0, tu.length - 1) == uu))
 				return tu;
@@ -939,7 +939,7 @@ tinymce.create('tinymce.util.Dispatcher', {
 
 			return o;
 		},
-	
+
 		toAbsolute : function(u, nh) {
 			u = new tinymce.util.URI(u, {base_uri : this});
 
@@ -1455,7 +1455,7 @@ tinymce.util.Quirks = function(editor) {
 
 		editor.addCommand('Delete', function() {removeMergedFormatSpans();});
 	};
-	
+
 	function emptyEditorWhenDeleting() {
 		function serializeRng(rng) {
 			var body = dom.create("body");
@@ -2635,7 +2635,7 @@ tinymce.html.Styles = function(settings, schema) {
 						if (name === 'font-weight' && value === '700')
 							value = 'bold';
 						else if (name === 'color' || name === 'background-color') // Lowercase colors like RED
-							value = value.toLowerCase();		
+							value = value.toLowerCase();
 
 						// Convert RGB colors to HEX
 						value = value.replace(rgbRegExp, toHex);
@@ -2901,89 +2901,89 @@ tinymce.html.Styles = function(settings, schema) {
 				C : 'onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup',
 				B : 'lang|xml:lang|dir',
 				A : 'id|class|style|title'
-			}, 'script[id|charset|type|language|src|defer|xml:space][]' + 
-				'style[B|id|type|media|title|xml:space][]' + 
-				'object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]' + 
-				'param[id|name|value|valuetype|type][]' + 
-				'p[E|align][#|S]' + 
-				'a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]' + 
-				'br[A|clear][]' + 
-				'span[E][#|S]' + 
-				'bdo[A|C|B][#|S]' + 
-				'applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]' + 
-				'h1[E|align][#|S]' + 
-				'img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]' + 
-				'map[B|C|A|name][X|form|Q|area]' + 
-				'h2[E|align][#|S]' + 
-				'iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]' + 
-				'h3[E|align][#|S]' + 
-				'tt[E][#|S]' + 
-				'i[E][#|S]' + 
-				'b[E][#|S]' + 
-				'u[E][#|S]' + 
-				's[E][#|S]' + 
-				'strike[E][#|S]' + 
-				'big[E][#|S]' + 
-				'small[E][#|S]' + 
-				'font[A|B|size|color|face][#|S]' + 
-				'basefont[id|size|color|face][]' + 
-				'em[E][#|S]' + 
-				'strong[E][#|S]' + 
-				'dfn[E][#|S]' + 
-				'code[E][#|S]' + 
-				'q[E|cite][#|S]' + 
-				'samp[E][#|S]' + 
-				'kbd[E][#|S]' + 
-				'var[E][#|S]' + 
-				'cite[E][#|S]' + 
-				'abbr[E][#|S]' + 
-				'acronym[E][#|S]' + 
-				'sub[E][#|S]' + 
-				'sup[E][#|S]' + 
-				'input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]' + 
-				'select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]' + 
-				'optgroup[E|disabled|label][option]' + 
-				'option[E|selected|disabled|label|value][]' + 
-				'textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]' + 
-				'label[E|for|accesskey|onfocus|onblur][#|S]' + 
-				'button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]' + 
-				'h4[E|align][#|S]' + 
-				'ins[E|cite|datetime][#|Y]' + 
-				'h5[E|align][#|S]' + 
-				'del[E|cite|datetime][#|Y]' + 
-				'h6[E|align][#|S]' + 
-				'div[E|align][#|Y]' + 
-				'ul[E|type|compact][li]' + 
-				'li[E|type|value][#|Y]' + 
-				'ol[E|type|compact|start][li]' + 
-				'dl[E|compact][dt|dd]' + 
-				'dt[E][#|S]' + 
-				'dd[E][#|Y]' + 
-				'menu[E|compact][li]' + 
-				'dir[E|compact][li]' + 
-				'pre[E|width|xml:space][#|ZA]' + 
-				'hr[E|align|noshade|size|width][]' + 
-				'blockquote[E|cite][#|Y]' + 
-				'address[E][#|S|p]' + 
-				'center[E][#|Y]' + 
-				'noframes[E][#|Y]' + 
-				'isindex[A|B|prompt][]' + 
-				'fieldset[E][#|legend|Y]' + 
-				'legend[E|accesskey|align][#|S]' + 
-				'table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]' + 
-				'caption[E|align][#|S]' + 
-				'col[ZG][]' + 
-				'colgroup[ZG][col]' + 
-				'thead[ZF][tr]' + 
-				'tr[ZF|bgcolor][th|td]' + 
-				'th[E|ZE][#|Y]' + 
-				'form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]' + 
-				'noscript[E][#|Y]' + 
-				'td[E|ZE][#|Y]' + 
-				'tfoot[ZF][tr]' + 
-				'tbody[ZF][tr]' + 
-				'area[E|D|shape|coords|href|nohref|alt|target][]' + 
-				'base[id|href|target][]' + 
+			}, 'script[id|charset|type|language|src|defer|xml:space][]' +
+				'style[B|id|type|media|title|xml:space][]' +
+				'object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]' +
+				'param[id|name|value|valuetype|type][]' +
+				'p[E|align][#|S]' +
+				'a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]' +
+				'br[A|clear][]' +
+				'span[E][#|S]' +
+				'bdo[A|C|B][#|S]' +
+				'applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]' +
+				'h1[E|align][#|S]' +
+				'img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]' +
+				'map[B|C|A|name][X|form|Q|area]' +
+				'h2[E|align][#|S]' +
+				'iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]' +
+				'h3[E|align][#|S]' +
+				'tt[E][#|S]' +
+				'i[E][#|S]' +
+				'b[E][#|S]' +
+				'u[E][#|S]' +
+				's[E][#|S]' +
+				'strike[E][#|S]' +
+				'big[E][#|S]' +
+				'small[E][#|S]' +
+				'font[A|B|size|color|face][#|S]' +
+				'basefont[id|size|color|face][]' +
+				'em[E][#|S]' +
+				'strong[E][#|S]' +
+				'dfn[E][#|S]' +
+				'code[E][#|S]' +
+				'q[E|cite][#|S]' +
+				'samp[E][#|S]' +
+				'kbd[E][#|S]' +
+				'var[E][#|S]' +
+				'cite[E][#|S]' +
+				'abbr[E][#|S]' +
+				'acronym[E][#|S]' +
+				'sub[E][#|S]' +
+				'sup[E][#|S]' +
+				'input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]' +
+				'select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]' +
+				'optgroup[E|disabled|label][option]' +
+				'option[E|selected|disabled|label|value][]' +
+				'textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]' +
+				'label[E|for|accesskey|onfocus|onblur][#|S]' +
+				'button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]' +
+				'h4[E|align][#|S]' +
+				'ins[E|cite|datetime][#|Y]' +
+				'h5[E|align][#|S]' +
+				'del[E|cite|datetime][#|Y]' +
+				'h6[E|align][#|S]' +
+				'div[E|align][#|Y]' +
+				'ul[E|type|compact][li]' +
+				'li[E|type|value][#|Y]' +
+				'ol[E|type|compact|start][li]' +
+				'dl[E|compact][dt|dd]' +
+				'dt[E][#|S]' +
+				'dd[E][#|Y]' +
+				'menu[E|compact][li]' +
+				'dir[E|compact][li]' +
+				'pre[E|width|xml:space][#|ZA]' +
+				'hr[E|align|noshade|size|width][]' +
+				'blockquote[E|cite][#|Y]' +
+				'address[E][#|S|p]' +
+				'center[E][#|Y]' +
+				'noframes[E][#|Y]' +
+				'isindex[A|B|prompt][]' +
+				'fieldset[E][#|legend|Y]' +
+				'legend[E|accesskey|align][#|S]' +
+				'table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]' +
+				'caption[E|align][#|S]' +
+				'col[ZG][]' +
+				'colgroup[ZG][col]' +
+				'thead[ZF][tr]' +
+				'tr[ZF|bgcolor][th|td]' +
+				'th[E|ZE][#|Y]' +
+				'form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]' +
+				'noscript[E][#|Y]' +
+				'td[E|ZE][#|Y]' +
+				'tfoot[ZF][tr]' +
+				'tbody[ZF][tr]' +
+				'area[E|D|shape|coords|href|nohref|alt|target][]' +
+				'base[id|href|target][]' +
 				'body[E|onload|onunload|background|bgcolor|text|link|vlink|alink][#|Y]'
 			);
 		}
@@ -3040,9 +3040,9 @@ tinymce.html.Styles = function(settings, schema) {
 		shortEndedElementsMap = createLookupTable('short_ended_elements', 'area base basefont br col frame hr img input isindex link meta param embed source wbr');
 		boolAttrMap = createLookupTable('boolean_attributes', 'checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected autoplay loop controls');
 		nonEmptyElementsMap = createLookupTable('non_empty_elements', 'td th iframe video audio object script', shortEndedElementsMap);
-		textBlockElementsMap = createLookupTable('text_block_elements', 'h1 h2 h3 h4 h5 h6 p div address pre form ' + 
+		textBlockElementsMap = createLookupTable('text_block_elements', 'h1 h2 h3 h4 h5 h6 p div address pre form ' +
 						'blockquote center dir fieldset header footer article section hgroup aside nav figure');
-		blockElementsMap = createLookupTable('block_elements', 'hr table tbody thead tfoot ' + 
+		blockElementsMap = createLookupTable('block_elements', 'hr table tbody thead tfoot ' +
 						'th tr td li ol ul caption dl dt dd noscript menu isindex samp option datalist select optgroup', textBlockElementsMap);
 
 		// Converts a wildcard expression string to a regexp for example *a will become /.*a/.
@@ -3405,7 +3405,7 @@ tinymce.html.Styles = function(settings, schema) {
 			// No match
 			return false;
 		};
-		
+
 		self.getElementRule = getElementRule;
 
 		self.getCustomElements = function() {
@@ -3453,7 +3453,7 @@ tinymce.html.Styles = function(settings, schema) {
 				pos = stack.length;
 				while (pos--) {
 					if (stack[pos].name === name)
-						break;						
+						break;
 				}
 
 				// Found parent
@@ -4013,7 +4013,7 @@ tinymce.html.Styles = function(settings, schema) {
 					// Keep comments
 					if (node.type === 8)
 						return false;
-					
+
 					// Keep non whitespace text nodes
 					if ((node.type === 3 && !whiteSpaceRegExp.test(node.value)))
 						return false;
@@ -4354,7 +4354,7 @@ tinymce.html.Styles = function(settings, schema) {
 
 				doctype: function(text) {
 					var newNode;
-		
+
 					newNode = node.append(createNode('#doctype', 10));
 					newNode.value = text;
 					removeWhitespaceBefore(node);
@@ -4597,7 +4597,7 @@ tinymce.html.Styles = function(settings, schema) {
 								// Found a non BR element
 								if (prevName !== "br")
 									break;
-	
+
 								// Found another br it's a <br><br> structure then don't remove anything
 								if (prevName === 'br') {
 									node = null;
@@ -4625,7 +4625,7 @@ tinymce.html.Styles = function(settings, schema) {
 							}
 						}
 					} else {
-						// Replaces BR elements inside inline elements like <p><b><i><br></i></b></p> so they become <p><b><i>&nbsp;</i></b></p> 
+						// Replaces BR elements inside inline elements like <p><b><i><br></i></b></p> so they become <p><b><i>&nbsp;</i></b></p>
 						lastParent = node;
 						while (parent.firstChild === lastParent && parent.lastChild === lastParent) {
 							lastParent = parent;
@@ -5050,7 +5050,7 @@ tinymce.dom = {};
 			if (callbackList) {
 				for (i = 0, l = callbackList.length; i < l; i++) {
 					callback = callbackList[i];
-					
+
 					// Check if callback exists might be removed if a unbind is called inside the callback
 					if (callback && callback.func.call(callback.scope, evt) === false) {
 						evt.preventDefault();
@@ -5285,7 +5285,7 @@ tinymce.dom = {};
 
 		self.clean = function(target) {
 			var i, children, unbind = self.unbind;
-	
+
 			// Don't bind to text nodes or comments
 			if (!target || target.nodeType === 3 || target.nodeType === 8) {
 				return self;
@@ -5519,7 +5519,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 				keep_values : false,
 				hex_colors : 1
 			}, s);
-			
+
 			t.schema = s.schema;
 			t.styles = new tinymce.html.Styles({
 				url_converter : s.url_converter,
@@ -5835,7 +5835,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 					case 'float':
 						(isIE && ! tinymce.isIE11) ? s.styleFloat = v : s.cssFloat = v;
 						break;
-					
+
 					default:
 						s[na] = v || '';
 				}
@@ -6969,17 +6969,17 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 			// Check START_TO_START
 			if (h === 0)
 				return _compareBoundaryPoints(sc, so, rsc, rso);
-	
+
 			// Check START_TO_END
 			if (h === 1)
 				return _compareBoundaryPoints(ec, eo, rsc, rso);
-	
+
 			// Check END_TO_END
 			if (h === 2)
 				return _compareBoundaryPoints(ec, eo, rec, reo);
-	
+
 			// Check END_TO_START
-			if (h === 3) 
+			if (h === 3)
 				return _compareBoundaryPoints(sc, so, rec, reo);
 		};
 
@@ -7072,7 +7072,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 
 		function _compareBoundaryPoints(containerA, offsetA, containerB, offsetB) {
 			var c, offsetC, n, cmnRoot, childA, childB;
-			
+
 			// In the first case the boundary-points have the same container. A is before B
 			// if its offset is less than the offset of B, A is equal to B if its offset is
 			// equal to the offset of B, and A is after B if its offset is greater than the
@@ -7553,7 +7553,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 		function toStringIE() {
 			return dom.create('body', null, cloneContents()).outerText;
 		}
-		
+
 		return t;
 	};
 
@@ -7879,7 +7879,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 
 				return node;
 			};
-			
+
 			function setBookmarkEndPoint(start) {
 				var endPoint = bookmark[start ? 'start' : 'end'], moveLeft, moveRng, undef;
 
@@ -8052,9 +8052,9 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 			el = dom.get(t.id);
 
 		tinymce.each(
-				('getPos,getRect,getParent,add,setStyle,getStyle,setStyles,' + 
-				'setAttrib,setAttribs,getAttrib,addClass,removeClass,' + 
-				'hasClass,getOuterHTML,setOuterHTML,remove,show,hide,' + 
+				('getPos,getRect,getParent,add,setStyle,getStyle,setStyles,' +
+				'setAttrib,setAttribs,getAttrib,addClass,removeClass,' +
+				'hasClass,getOuterHTML,setOuterHTML,remove,show,hide,' +
 				'isHidden,setHTML,get').split(/,/), function(k) {
 					t[k] = function() {
 						var a = [id], i;
@@ -9143,7 +9143,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 			// Normalize only on non IE browsers for now
 			if (tinymce.isIE)
 				return;
-			
+
 			rng = self.getRng();
 			collapsed = rng.collapsed;
 
@@ -9292,7 +9292,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 
 			// Make HTML element unselectable since we are going to handle selection by hand
 			doc.documentElement.unselectable = true;
-			
+
 			// Detect when user selects outside BODY
 			dom.bind(doc, ['mousedown', 'contextmenu'], function(e) {
 				if (e.target.nodeName === 'HTML') {
@@ -9617,7 +9617,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 
 				callback();
 			};
-			
+
 			function error() {
 				// Report the error so it's easier for people to spot loading errors
 				if (typeof(console) !== "undefined" && console.log)
@@ -9653,7 +9653,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 
 							done();
 						},
-						
+
 						error : error
 					});
 
@@ -9887,7 +9887,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 
 			// Find common ancestor and end points
 			ancestor = dom.findCommonAncestor(startContainer, endContainer);
-				
+
 			// Process left side
 			for (node = startContainer; node; node = node.parentNode) {
 				if (node === endContainer)
@@ -10012,17 +10012,17 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 			itemFocussed = function(evt) {
 				focussedId = evt.target.id;
 			};
-			
+
 			itemBlurred = function(evt) {
 				dom.setAttrib(evt.target.id, 'tabindex', '-1');
 			};
-			
+
 			rootFocussed = function(evt) {
 				var item = dom.get(focussedId);
 				dom.setAttrib(item, 'tabindex', '0');
 				item.focus();
 			};
-			
+
 			t.focus = function() {
 				dom.get(focussedId).focus();
 			};
@@ -10042,7 +10042,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 				items = dom = root = t.focus = itemFocussed = itemBlurred = rootKeydown = rootFocussed = null;
 				t.destroy = function() {};
 			};
-			
+
 			t.moveFocus = function(dir, evt) {
 				var idx = -1, controls = t.controls, newFocus;
 
@@ -10062,7 +10062,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 				} else if (idx >= items.length) {
 					idx = 0;
 				}
-				
+
 				newFocus = items[idx];
 				dom.setAttrib(focussedId, 'tabindex', '-1');
 				dom.setAttrib(newFocus.id, 'tabindex', '0');
@@ -10075,21 +10075,21 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 				if (evt)
 					Event.cancel(evt);
 			};
-			
+
 			rootKeydown = function(evt) {
 				var DOM_VK_LEFT = 37, DOM_VK_RIGHT = 39, DOM_VK_UP = 38, DOM_VK_DOWN = 40, DOM_VK_ESCAPE = 27, DOM_VK_ENTER = 14, DOM_VK_RETURN = 13, DOM_VK_SPACE = 32;
-				
+
 				switch (evt.keyCode) {
 					case DOM_VK_LEFT:
 						if (enableLeftRight) t.moveFocus(-1);
 						Event.cancel(evt);
 						break;
-	
+
 					case DOM_VK_RIGHT:
 						if (enableLeftRight) t.moveFocus(1);
 						Event.cancel(evt);
 						break;
-	
+
 					case DOM_VK_UP:
 						if (enableUpDown) t.moveFocus(-1);
 						Event.cancel(evt);
@@ -10138,7 +10138,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 				elm.setAttribute('tabindex', tabindex);
 				dom.bind(elm, 'focus', itemFocussed);
 			});
-			
+
 			// Setup initial state for root element.
 			if (items[0]){
 				focussedId = items[0].id;
@@ -10170,14 +10170,14 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
 			this.active = 0;
 			this.editor = editor;
 		},
-		
+
 		setAriaProperty : function(property, value) {
 			var element = DOM.get(this.id + '_aria') || DOM.get(this.id);
 			if (element) {
 				DOM.setAttrib(element, 'aria-' + property, !!value);
 			}
 		},
-		
+
 		focus : function() {
 			DOM.get(this.id).focus();
 		},
@@ -10312,7 +10312,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 
 		postRender : function() {
 			var t = this;
-			
+
 			t.parent();
 
 			// Set pending state
@@ -10457,7 +10457,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 
 			return m;
 		},
-		
+
 		focus : function() {
 			var t = this;
 			if (t.keyboardNav) {
@@ -10587,13 +10587,13 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 					}
 				});
 			}
-			
+
 			Event.add(co, 'keydown', t._keyHandler, t);
 
 			t.onShowMenu.dispatch(t);
 
-			if (s.keyboard_focus) { 
-				t._setupKeyboardNav(); 
+			if (s.keyboard_focus) {
+				t._setupKeyboardNav();
 			}
 		},
 
@@ -10688,7 +10688,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 
 		// Internal functions
 		_setupKeyboardNav : function(){
-			var contextMenu, menuItems, t=this; 
+			var contextMenu, menuItems, t=this;
 			contextMenu = DOM.get('menu_' + t.id);
 			menuItems = DOM.select('a[role=option]', 'menu_' + t.id);
 			menuItems.splice(0,0,contextMenu);
@@ -10938,7 +10938,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			var h = '', t = this, s = t.settings, cp = t.classPrefix;
 
 			h = '<span role="listbox" aria-haspopup="true" aria-labelledby="' + t.id +'_voiceDesc" aria-describedby="' + t.id + '_voiceDesc"><table role="presentation" tabindex="0" id="' + t.id + '" cellpadding="0" cellspacing="0" class="' + cp + ' ' + cp + 'Enabled' + (s['class'] ? (' ' + s['class']) : '') + '"><tbody><tr>';
-			h += '<td>' + DOM.createHTML('span', {id: t.id + '_voiceDesc', 'class': 'voiceLabel', style:'display:none;'}, t.settings.title); 
+			h += '<td>' + DOM.createHTML('span', {id: t.id + '_voiceDesc', 'class': 'voiceLabel', style:'display:none;'}, t.settings.title);
 			h += DOM.createHTML('a', {id : t.id + '_text', tabindex : -1, href : 'javascript:;', 'class' : 'mceText', onclick : "return false;", onmousedown : 'return false;'}, DOM.encode(t.settings.title)) + '</td>';
 			h += '<td>' + DOM.createHTML('a', {id : t.id + '_open', tabindex : -1, href : 'javascript:;', 'class' : 'mceOpen', onclick : "return false;", onmousedown : 'return false;'}, '<span><span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span></span>') + '</td>';
 			h += '</tr></tbody></table></span>';
@@ -11376,7 +11376,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 
 			h1 += DOM.createHTML('span', {'class': 'mceVoiceLabel mceIconOnly', id: t.id + '_voice', style: 'display:none;'}, s.title);
 			h += '<td >' + DOM.createHTML('a', {role: 'button', id : t.id + '_action', tabindex: '-1', href : 'javascript:;', 'class' : 'mceAction ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';
-	
+
 			h1 = DOM.createHTML('span', {'class' : 'mceOpen ' + s['class']}, '<span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span>');
 			h += '<td >' + DOM.createHTML('a', {role: 'button', id : t.id + '_open', tabindex: '-1', href : 'javascript:;', 'class' : 'mceOpen ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';
 
@@ -11616,7 +11616,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
 			this.hideMenu();
 			this.settings.onselect(c);
 		},
-		
+
 		displayColor : function(c) {
 			var t = this;
 
@@ -11668,12 +11668,12 @@ tinymce.create('tinymce.ui.ToolbarGroup:tinymce.ui.Container', {
 
 		return h.join('');
 	},
-	
+
 	focus : function() {
 		var t = this;
 		dom.get(t.id).focus();
 	},
-	
+
 	postRender : function() {
 		var t = this, items = [];
 
@@ -11698,7 +11698,7 @@ tinymce.create('tinymce.ui.ToolbarGroup:tinymce.ui.Container', {
 			excludeFromTabOrder: !t.settings.tab_focus_toolbar
 		});
 	},
-	
+
 	destroy : function() {
 		var self = this;
 
@@ -11830,7 +11830,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 		addComponents: function(pluginName, scripts) {
 			var pluginUrl = this.urls[pluginName];
 			tinymce.each(scripts, function(script){
-				tinymce.ScriptLoader.add(pluginUrl+"/"+script);	
+				tinymce.ScriptLoader.add(pluginUrl+"/"+script);
 			});
 		},
 
@@ -11918,11 +11918,11 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 			function createId(elm) {
 				var id = elm.id;
-	
+
 				// Use element id, or unique name or generate a unique id
 				if (!id) {
 					id = elm.name;
-	
+
 					if (id && !DOM.get(id)) {
 						id = elm.name;
 					} else {
@@ -12004,7 +12004,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 							}
 						});
 						break;
-					
+
 					default:
 						if (s.types) {
 							// Process type specific selector
@@ -12046,7 +12046,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 						// All done
 						if (l == co)
-							execCallback(s, 'oninit');					
+							execCallback(s, 'oninit');
 					});
 				}
 			});
@@ -12327,7 +12327,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			if (!t.getElement())
 				return;
 
-			// Is a iPad/iPhone and not on iOS5, then skip initialization. We need to sniff 
+			// Is a iPad/iPhone and not on iOS5, then skip initialization. We need to sniff
 			// here since the browser says it has contentEditable support but there is no visible caret.
 			if (tinymce.isIDevice && !tinymce.isIOS5)
 				return;
@@ -12472,7 +12472,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					}
 				}
 			}
-			
+
 			// Create all plugins
 			each(explode(s.plugins.replace(/\-/g, '')), initPlugin);
 
@@ -12629,7 +12629,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 			// Create iframe
 			// TODO: ACC add the appropriate description on this.
-			n = DOM.add(o.iframeContainer, 'iframe', { 
+			n = DOM.add(o.iframeContainer, 'iframe', {
 				id : t.id + "_ifr",
 				src : u || 'javascript:""', // Workaround for HTTPS warning in IE6/7
 				frameBorder : '0',
@@ -12717,7 +12717,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 					internalName = 'data-mce-' + name;
 
 					// Add internal attribute if we need to we don't on a refresh of the document
-					if (!node.attributes.map[internalName]) {	
+					if (!node.attributes.map[internalName]) {
 						if (name === "style")
 							node.attr(internalName, dom.serializeStyle(dom.parseStyle(value), node.name));
 						else
@@ -13714,7 +13714,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				if (o.set)
 					o.content = ed.execCallback('cleanup_callback', 'insert_to_editor', o.content, o);
 
-				if (o.get)						
+				if (o.get)
 					o.content = ed.execCallback('cleanup_callback', 'get_from_editor', o.content, o);
 			});
 		}
@@ -14357,7 +14357,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				// Remove existing links if there could be child links or that the href isn't specified
 				if (!anchor || !value.href) {
 					formatter.remove('link');
-				}		
+				}
 
 				// Apply new link to selection
 				if (value.href) {
@@ -14416,7 +14416,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 			'InsertUnorderedList,InsertOrderedList' : function(command) {
 				var list = dom.getParent(selection.getNode(), 'ul,ol');
-				return list && 
+				return list &&
 				     (command === 'insertunorderedlist' && list.tagName === 'UL'
 				   || command === 'insertorderedlist' && list.tagName === 'OL');
 			}
@@ -14560,7 +14560,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			data : data,
 
 			typing : false,
-			
+
 			onBeforeAdd: onBeforeAdd,
 
 			onAdd : onAdd,
@@ -14578,7 +14578,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 				level = level || {};
 				level.content = getContent();
-				
+
 				self.onBeforeAdd.dispatch(self, level);
 
 				// Add undo level if needed
@@ -15137,16 +15137,16 @@ tinymce.ForceBlocks = function(editor) {
 
 			return t.add(c);
 		},
-		
+
 		createToolbarGroup : function(id, s, cc) {
 			var c, t = this, cls;
 			id = t.prefix + id;
 			cls = cc || this._cls.toolbarGroup || tinymce.ui.ToolbarGroup;
 			c = new cls(id, s, t.editor);
-			
+
 			if (t.get(id))
 				return null;
-			
+
 			return t.add(c);
 		},
 
@@ -15159,7 +15159,7 @@ tinymce.ForceBlocks = function(editor) {
 		setControlType : function(n, c) {
 			return this._cls[n.toLowerCase()] = c;
 		},
-	
+
 		destroy : function() {
 			each(this.controls, function(c) {
 				c.destroy();
@@ -15540,10 +15540,10 @@ tinymce.ForceBlocks = function(editor) {
 
 				return rng;
 			}
-			
+
 			function applyStyleToList(node, bookmark, wrapElm, newWrappers, process){
 				var nodes = [], listIndex = -1, list, startIndex = -1, endIndex = -1, currentWrapElm;
-				
+
 				// find the index of the first child list.
 				each(node.childNodes, function(n, index) {
 					if (n.nodeName === "UL" || n.nodeName === "OL") {
@@ -15552,7 +15552,7 @@ tinymce.ForceBlocks = function(editor) {
 						return false;
 					}
 				});
-				
+
 				// get the index of the bookmarks
 				each(node.childNodes, function(n, index) {
 					if (n.nodeName === "SPAN" && dom.getAttrib(n, "data-mce-type") == "bookmark") {
@@ -15563,7 +15563,7 @@ tinymce.ForceBlocks = function(editor) {
 						}
 					}
 				});
-				
+
 				// if the selection spans across an embedded list, or there isn't an embedded list - handle processing normally
 				if (listIndex <= 0 || (startIndex < listIndex && endIndex > listIndex)) {
 					each(tinymce.grep(node.childNodes), process);
@@ -15574,7 +15574,7 @@ tinymce.ForceBlocks = function(editor) {
 					// create a list of the nodes on the same side of the list as the selection
 					each(tinymce.grep(node.childNodes), function(n, index) {
 						if ((startIndex < listIndex && index < listIndex) || (startIndex > listIndex && index > listIndex)) {
-							nodes.push(n); 
+							nodes.push(n);
 							n.parentNode.removeChild(n);
 						}
 					});
@@ -15585,7 +15585,7 @@ tinymce.ForceBlocks = function(editor) {
 					} else if (startIndex > listIndex) {
 						node.insertBefore(currentWrapElm, list.nextSibling);
 					}
-					
+
 					// add the new nodes to the list.
 					newWrappers.push(currentWrapElm);
 
@@ -15688,7 +15688,7 @@ tinymce.ForceBlocks = function(editor) {
 						} else {
 							// Start a new wrapper for possible children
 							currentWrapElm = 0;
-							
+
 							each(tinymce.grep(node.childNodes), process);
 
 							if (hasContentEditableState) {
@@ -15729,7 +15729,7 @@ tinymce.ForceBlocks = function(editor) {
 				}
 
 				// Cleanup
-				
+
 				each(newWrappers, function(node) {
 					var childCount;
 
@@ -15903,7 +15903,7 @@ tinymce.ForceBlocks = function(editor) {
 
 				// Process the children
 				if (format.deep) {
-					if (children.length) {					
+					if (children.length) {
 						for (i = 0, l = children.length; i < l; i++)
 							process(children[i]);
 
@@ -17010,7 +17010,7 @@ tinymce.ForceBlocks = function(editor) {
 
 				return true;
 			};
-			
+
 			// Returns any parent caret container element
 			function getParentCaretContainer(node) {
 				while (node) {
@@ -17072,7 +17072,7 @@ tinymce.ForceBlocks = function(editor) {
 					selection.setRng(rng);
 				}
 			};
-			
+
 			// Applies formatting to the caret postion
 			function applyCaretFormat() {
 				var rng, caretContainer, textNode, offset, bookmark, container, text;
@@ -17200,7 +17200,7 @@ tinymce.ForceBlocks = function(editor) {
 					// Move selection to text node
 					selection.setCursorLocation(node, 1);
 
-					// If the formatNode is empty, we can remove it safely. 
+					// If the formatNode is empty, we can remove it safely.
 					if (dom.isEmpty(formatNode)) {
 						dom.remove(formatNode);
 					}
@@ -17385,7 +17385,7 @@ tinymce.onAddEditor.add(function(tinymce, ed) {
 				return node &&
 					dom.isBlock(node) &&
 					!/^(TD|TH|CAPTION|FORM)$/.test(node.nodeName) &&
-					!/^(fixed|absolute)/i.test(node.style.position) && 
+					!/^(fixed|absolute)/i.test(node.style.position) &&
 					dom.getContentEditable(node) !== "true";
 			};
 
@@ -17430,7 +17430,7 @@ tinymce.onAddEditor.add(function(tinymce, ed) {
 					}
 				}
 			};
-			
+
 			// Moves the caret to a suitable position within the root for example in the first non pure whitespace text node or before an image
 			function moveToCaretPosition(root) {
 				var walker, node, rng, y, viewPort, lastNode = root, tempElm;
@@ -17561,7 +17561,7 @@ tinymce.onAddEditor.add(function(tinymce, ed) {
 
 				// Walk the DOM and look for text nodes or non empty elements
 				walker = new TreeWalker(container, parentBlock);
-	
+
 				// If caret is in beginning or end of a text block then jump to the next/previous node
 				if (container.nodeType == 3) {
 					if (start && offset == 0) {
@@ -17765,7 +17765,7 @@ tinymce.onAddEditor.add(function(tinymce, ed) {
 
 					parent = parent.parentNode;
 				}
-				
+
 				return parent !== root ? editableRoot : root;
 			};
 
diff --git a/webapp/src/main/webapp/js/tiny_mce/utils/mctabs.js b/webapp/src/main/webapp/js/tiny_mce/utils/mctabs.js
index 027ef40e7..5f88945c1 100644
--- a/webapp/src/main/webapp/js/tiny_mce/utils/mctabs.js
+++ b/webapp/src/main/webapp/js/tiny_mce/utils/mctabs.js
@@ -46,14 +46,14 @@ MCTabs.prototype.hideTab =function(tab){
 };
 
 MCTabs.prototype.showPanel = function(panel) {
-	panel.className = 'current'; 
+	panel.className = 'current';
 	panel.setAttribute("aria-hidden", false);
 };
 
 MCTabs.prototype.hidePanel = function(panel) {
 	panel.className = 'panel';
 	panel.setAttribute("aria-hidden", true);
-}; 
+};
 
 MCTabs.prototype.getPanelForTab = function(tabElm) {
 	return tinyMCEPopup.dom.getAttrib(tabElm, "aria-controls");
@@ -96,7 +96,7 @@ MCTabs.prototype.displayTab = function(tab_id, panel_id, avoid_focus) {
 				t.hidePanel(nodes[i]);
 		}
 
-		if (!avoid_focus) { 
+		if (!avoid_focus) {
 			tabElm.focus();
 		}
 
@@ -124,7 +124,7 @@ tinyMCEPopup.onInit.add(function() {
 	each(dom.select('div.tabs'), function(tabContainerElm) {
 		var keyNav;
 
-		dom.setAttrib(tabContainerElm, "role", "tablist"); 
+		dom.setAttrib(tabContainerElm, "role", "tablist");
 
 		var items = tinyMCEPopup.dom.select('li', tabContainerElm);
 		var action = function(id) {
@@ -159,4 +159,4 @@ tinyMCEPopup.onInit.add(function() {
 			enableUpDown: true
 		}, tinyMCEPopup.dom);
 	});
-});
\ No newline at end of file
+});
diff --git a/webapp/src/main/webapp/js/tiny_mce/utils/validate.js b/webapp/src/main/webapp/js/tiny_mce/utils/validate.js
index 760d0290f..a922a942d 100644
--- a/webapp/src/main/webapp/js/tiny_mce/utils/validate.js
+++ b/webapp/src/main/webapp/js/tiny_mce/utils/validate.js
@@ -111,7 +111,7 @@ var AutoValidator = {
 	invalidate : function(n) {
 		this.mark(n.form, n);
 	},
-	
+
 	getErrorMessages : function(f) {
 		var nl, i, s = this.settings, field, msg, values, messages = [], ed = tinyMCEPopup.editor;
 		nl = this.tags(f, "label");
@@ -129,7 +129,7 @@ var AutoValidator = {
 				} else {
 					message = ed.getLang('invalid_data');
 				}
-				
+
 				message = message.replace(/{\#([^}]+)\}/g, function(a, b) {
 					return values[b] || '{#' + b + '}';
 				});
diff --git a/webapp/src/main/webapp/js/userMenu/userMenuUtils.js b/webapp/src/main/webapp/js/userMenu/userMenuUtils.js
index 5529f1627..8c5ae5346 100644
--- a/webapp/src/main/webapp/js/userMenu/userMenuUtils.js
+++ b/webapp/src/main/webapp/js/userMenu/userMenuUtils.js
@@ -2,21 +2,21 @@
 
 $(function(){
 
-    $("ul.dropdown li").hover(function(){  
+    $("ul.dropdown li").hover(function(){
         $(this).addClass("hover");
         $('ul:first',this).css('visibility', 'visible');
         if ( $('ul.dropdown').width() > 88 ) {
             $('ul:first li',this).css('width', ($("ul.dropdown").width() - 22) + 'px');
         }
         $("ul.dropdown ul.sub_menu li:last-child").css('width', ($("ul.dropdown").width() - 14) + 'px');
-    
+
     }, function(){
-    
+
         $(this).removeClass("hover");
         $('ul:first',this).css('visibility', 'hidden');
-    
+
     });
-    
+
     $("ul.dropdown li ul li:has(ul)").find("a:first").append(" &raquo; ");
 
-});
\ No newline at end of file
+});
diff --git a/webapp/src/main/webapp/js/utils.js b/webapp/src/main/webapp/js/utils.js
index 3e79ccf85..5e82e8d67 100644
--- a/webapp/src/main/webapp/js/utils.js
+++ b/webapp/src/main/webapp/js/utils.js
@@ -19,7 +19,7 @@ vitro.utils = {
 	borrowPrototypeMethods: function(borrowFrom, addTo) {
 		borrowMethods(borrowFrom.prototype, addTo.prototype);
 	},
-	
+
 	borrowMethods: function(borrowFrom, addTo) {
 		for (m in borrowFrom) { // loop through all properties of the prototype
 			if (typeof borrowFrom[m] != "function") { continue; } // ignore non-functions
@@ -27,4 +27,4 @@ vitro.utils = {
 		}
 	}
 
-};
\ No newline at end of file
+};
diff --git a/webapp/src/main/webapp/js/vitro.js b/webapp/src/main/webapp/js/vitro.js
index d31d6c175..ceae2943b 100755
--- a/webapp/src/main/webapp/js/vitro.js
+++ b/webapp/src/main/webapp/js/vitro.js
@@ -47,7 +47,7 @@ function encodeUrl(pstrString) {
 /**
    @param ele - element to addRows to
    @param data - array of data to add as rows to ele
-   @param rowFunc - function that returns a <tr> element 
+   @param rowFunc - function that returns a <tr> element
    @param cellFuncs - array of funcs, data will be passed as a parameter
     and the result will be added to the <tr> as a <td>. something like:
     function(row){return dosument.createElement("tr");}
@@ -67,10 +67,10 @@ function addRows(ele, data, cellFuncs, rowFunc) {
 }
 
 function makeRow( row, cellFuncs, rowFunc){
-  if( rowFunc != null ){ 
-    var tr = rowFunc(row); 
-  }  else { 
-    var tr = document.createElement("tr"); 
+  if( rowFunc != null ){
+    var tr = rowFunc(row);
+  }  else {
+    var tr = document.createElement("tr");
   }
 
   for(var j=0; j < cellFuncs.length; j++) {
@@ -92,8 +92,8 @@ function makeRow( row, cellFuncs, rowFunc){
 }
 
 /** added this from the dwr.util.js */
-isDate = function(data) {     
-    return (data && data.toUTCString) ? true : false; 
+isDate = function(data) {
+    return (data && data.toUTCString) ? true : false;
 };
 
 /** returns the summed colspan of the cells of the row.  */
@@ -144,7 +144,7 @@ function date2iso8601( jdate ){
   return year + "-" + monthS + "-" + dayS;
 }
 
-function setDateValue(ele, date, date2StrFunc){  
+function setDateValue(ele, date, date2StrFunc){
   if( date == null || ! isDate(date)) { return; }
   if( date2StrFunc == null ) { date2StrFunc = date2iso8601; }
   ele = dwr.util.byId(ele);
@@ -161,7 +161,7 @@ function clear(ele){
 
 function hideElementById(eleId){
   var ele = dwr.util.byId(eleId);
-  if( ele != null ){  ele.style.display="none"; } 
+  if( ele != null ){  ele.style.display="none"; }
 }
 
 function makeEntLinkElement(entityURI, text){
@@ -185,8 +185,8 @@ function makePropLinkElement(propURI, text){
     @returns on error a string with description of what went wrong.
 */
 function iso8601toDate( str ){
-  if( str == null || str.length < 8 || str.length > 10 ) { 
-    return "too long or short"; 
+  if( str == null || str.length < 8 || str.length > 10 ) {
+    return "too long or short";
   }
   parts = str.split("-");
   if( parts.length != 3 ) { return "bad split, use -"; }
@@ -202,7 +202,7 @@ function iso8601toDate( str ){
   if( month > 12 || month < 1 ) {return "month bad"; }
   if( day > 31 || day < 1 ) {return "day bad"; } //could be better
   month = month - 1; //months are jan=0, feb=1, etc
-  return new Date(year, month, day);   //do we need a try/catch here?  
+  return new Date(year, month, day);   //do we need a try/catch here?
 }
 
 /** use with Date.getYear() which is broken to get the correct year.
@@ -243,7 +243,7 @@ function addEvent(obj, evType, fn){
 // @version   1.0-RC1
 // @author    Adam Michela
 var Fat = {
-	make_hex : function (r,g,b) 
+	make_hex : function (r,g,b)
 	{
 		r = r.toString(16); if (r.length == 1) r = '0' + r;
 		g = g.toString(16); if (g.length == 1) g = '0' + g;
@@ -253,7 +253,7 @@ var Fat = {
 	fade_all : function ()
 	{
 		var a = document.getElementsByTagName("*");
-		for (var i = 0; i < a.length; i++) 
+		for (var i = 0; i < a.length; i++)
 		{
 			var o = a[i];
 			var r = /fade-?(\w{3,6})?/.exec(o.className);
@@ -264,28 +264,28 @@ var Fat = {
 			}
 		}
 	},
-	fade_element : function (id, fps, duration, from, to) 
+	fade_element : function (id, fps, duration, from, to)
 	{
 		if (!fps) fps = 30;
 		if (!duration) duration = 3000;
 		if (!from || from=="#") from = "#FFFF33";
 		if (!to) to = this.get_bgcolor(id);
-		
+
 		var frames = Math.round(fps * (duration / 1000));
 		var interval = duration / frames;
 		var delay = interval;
 		var frame = 0;
-		
+
 		if (from.length < 7) from += from.substr(1,3);
 		if (to.length < 7) to += to.substr(1,3);
-		
+
 		var rf = parseInt(from.substr(1,2),16);
 		var gf = parseInt(from.substr(3,2),16);
 		var bf = parseInt(from.substr(5,2),16);
 		var rt = parseInt(to.substr(1,2),16);
 		var gt = parseInt(to.substr(3,2),16);
 		var bt = parseInt(to.substr(5,2),16);
-		
+
 		var r,g,b,h;
 		while (frame < frames)
 		{
@@ -293,11 +293,11 @@ var Fat = {
 			g = Math.floor(gf * ((frames-frame)/frames) + gt * (frame/frames));
 			b = Math.floor(bf * ((frames-frame)/frames) + bt * (frame/frames));
 			h = this.make_hex(r,g,b);
-		
+
 			setTimeout("Fat.set_bgcolor('"+id+"','"+h+"')", delay);
 
 			frame++;
-			delay = interval * frame; 
+			delay = interval * frame;
 		}
 		setTimeout("Fat.set_bgcolor('"+id+"','"+to+"')", delay);
 	},
@@ -324,7 +324,7 @@ var Fat = {
 	}
 }
 
-// window.onload = function () 
+// window.onload = function ()
 // 	{
 // 	Fat.fade_all();
 // 	}
@@ -335,8 +335,8 @@ var Fat = {
 
 /* note that when an iframe is stuck into a page the iframe nees to be resized */
 
-/* <iframe id="myFrame" frameborder="0" vspace="0" hspace="0" marginwidth="0" 
-marginheight="0" width="100%" src="external.html" scrolling="no" 
+/* <iframe id="myFrame" frameborder="0" vspace="0" hspace="0" marginwidth="0"
+marginheight="0" width="100%" src="external.html" scrolling="no"
 style="overflow:visible"></iframe>
 ...
 <body ... onload = "adjustIFrameSize('myFrame');">
@@ -347,7 +347,7 @@ style="overflow:visible"></iframe>
 //     if (myIframe) {
 //         if (myIframe .contentDocument && myIframe.contentDocument.body.offsetHeight) {
 //             // W3C DOM (and Mozilla) syntax
-//             myIframe.height = myIframe.contentDocument.body.offsetHeight;    
+//             myIframe.height = myIframe.contentDocument.body.offsetHeight;
 //         } else if (myIframe.Document && myIframe.Document.body.scrollHeight) {
 //             // IE DOM syntax
 //             myIframe.height = myIframe.Document.body.scrollHeight;
@@ -360,7 +360,7 @@ function adjustIFrameSize(id) {
     if (myIframe) {
         if (myIframe.contentDocument && myIframe.contentDocument.body.offsetHeight) {
             // W3C DOM (and Mozilla) syntax
-            myIframe.height = myIframe.contentDocument.body.offsetHeight;    
+            myIframe.height = myIframe.contentDocument.body.offsetHeight;
         } else if (myIframe.Document && myIframe.Document.body.scrollHeight) {
             // IE DOM syntax
             myIframe.height = myIframe.Document.body.scrollHeight;
@@ -386,7 +386,7 @@ function resizeIframe(evt) {
     // take care of W3C event processing from iframe's root document
     if (target.nodeType == 9) {
       if (evt.currentTarget && evt.currentTarget.tagName.toLowerCase() == "iframe") {
-            target = evt.currentTarget;    
+            target = evt.currentTarget;
         }
     }
     if (target) {
diff --git a/webapp/src/main/webapp/js/vitroUtils.js b/webapp/src/main/webapp/js/vitroUtils.js
index 0e5b37332..3ff040942 100644
--- a/webapp/src/main/webapp/js/vitroUtils.js
+++ b/webapp/src/main/webapp/js/vitroUtils.js
@@ -2,18 +2,18 @@
 
 $(document).ready(function(){
 
-    // Use jQuery() instead of $() alias, because dwr/util.js, loaded on back end editing 
+    // Use jQuery() instead of $() alias, because dwr/util.js, loaded on back end editing
     // pages, overwrites $.
     // fade out welcome-message when user logs in
     jQuery.extend(this, i18nStrings);
-    
+
     jQuery('section#welcome-message').css('display', 'block').delay(2000).fadeOut(1500, function() { jQuery('section#welcome-msg-container').remove(); });
-    
+
     // fade in flash-message when user logs out
     jQuery('section#flash-message').css('display', 'none').fadeIn(1500, function() {
         $(this).delay(2000).fadeOut(1500, function() { jQuery('section#flash-msg-container').remove(); });
     });
-    
+
     /////////////////////////////
      // Home search filter
      // Toggle filter select list
diff --git a/webapp/src/main/webapp/jsp/checkDatatypeProperties.jsp b/webapp/src/main/webapp/jsp/checkDatatypeProperties.jsp
index 25bdd43b5..f52b23223 100644
--- a/webapp/src/main/webapp/jsp/checkDatatypeProperties.jsp
+++ b/webapp/src/main/webapp/jsp/checkDatatypeProperties.jsp
@@ -48,8 +48,8 @@ ArrayList<String> logResults = (ArrayList<String>)request.getAttribute("results"
 			%><tr>
 				<td><%=logResults.get(i)%></td>
 				</tr>
-				
-		<%			
+
+		<%
 		}
 	%>
 	</table>
diff --git a/webapp/src/main/webapp/local/css/local.css b/webapp/src/main/webapp/local/css/local.css
index 4a441c963..b12c01cc8 100644
--- a/webapp/src/main/webapp/local/css/local.css
+++ b/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/webapp/src/main/webapp/src/AdapterRegistry.js b/webapp/src/main/webapp/src/AdapterRegistry.js
index 0ba621966..72f6f177c 100644
--- a/webapp/src/main/webapp/src/AdapterRegistry.js
+++ b/webapp/src/main/webapp/src/AdapterRegistry.js
@@ -16,7 +16,7 @@ dojo.AdapterRegistry = function(){
         A registry to facilitate adaptation.
 
         Pairs is an array of [name, check, wrap] triples
-        
+
         All check/wrap functions in this registry should be of the same arity.
     ***/
     this.pairs = [];
diff --git a/webapp/src/main/webapp/src/Deferred.js b/webapp/src/main/webapp/src/Deferred.js
index 3dee6a720..6ec3dc3b6 100644
--- a/webapp/src/main/webapp/src/Deferred.js
+++ b/webapp/src/main/webapp/src/Deferred.js
@@ -13,7 +13,7 @@ dojo.require("dojo.lang.func");
 
 dojo.Deferred = function(/* optional */ canceller){
 	/*
-	NOTE: this namespace and documentation are imported wholesale 
+	NOTE: this namespace and documentation are imported wholesale
 		from MochiKit
 
 	Encapsulates a sequence of callbacks in response to a value that
@@ -101,7 +101,7 @@ dojo.Deferred = function(/* optional */ canceller){
 	cancellable Deferreds.
 
 	*/
-	
+
 	this.chain = [];
 	this.id = this._nextId();
 	this.fired = -1;
@@ -168,7 +168,7 @@ dojo.lang.extend(dojo.Deferred, {
 			this.results[0].cancel();
 		}
 	},
-			
+
 
 	_pause: function(){
 		// Used internally to signal that it's waiting on another Deferred
@@ -210,7 +210,7 @@ dojo.lang.extend(dojo.Deferred, {
 	callback: function(res){
 		/*
 		Begin the callback sequence with a non-error value.
-		
+
 		callback or errback should only be called once on a given
 		Deferred.
 		*/
diff --git a/webapp/src/main/webapp/src/animation/Animation.js b/webapp/src/main/webapp/src/animation/Animation.js
index 15445c780..b9bdc5678 100644
--- a/webapp/src/main/webapp/src/animation/Animation.js
+++ b/webapp/src/main/webapp/src/animation/Animation.js
@@ -177,7 +177,7 @@ dojo.lang.extend(dojo.animation.Animation, {
 			} else {
 				this._percent = step * 100;
 			}
-			
+
 			// Perform accelleration
 			if(this.accel && this.accel.getValue) {
 				step = this.accel.getValue(step);
diff --git a/webapp/src/main/webapp/src/behavior.js b/webapp/src/main/webapp/src/behavior.js
index 26995d673..8b9c4bc99 100644
--- a/webapp/src/main/webapp/src/behavior.js
+++ b/webapp/src/main/webapp/src/behavior.js
@@ -38,7 +38,7 @@ dojo.behavior = new function(){
 	this.add = function(behaviorObj){
 		/*	behavior objects are specified in the following format:
 		 *
-		 *	{ 
+		 *	{
 		 *	 	"#id": {
 		 *			"found": function(element){
 		 *				// ...
@@ -107,7 +107,7 @@ dojo.behavior = new function(){
 		 *	The "found" method is a generalized handler that's called as soon
 		 *	as the node matches the selector. Rules for values that follow also
 		 *	apply to the "found" key.
-		 *	
+		 *
 		 *	The "on*" handlers are attached with dojo.event.connect(). If the
 		 *	value is not a function but is rather an object, it's assumed to be
 		 *	the "other half" of a dojo.event.kwConnect() argument object. It
@@ -208,7 +208,7 @@ dojo.behavior = new function(){
 		// fast DOM queries...wheeee!
 		forIn(this.behaviors, function(tBehavior, id){
 			var elems = dojo.behavior.elementsById(id);
-			dojo.lang.forEach(elems.added, 
+			dojo.lang.forEach(elems.added,
 				function(elem){
 					forIn(tBehavior, function(ruleSet, ruleSetName){
 						if(dojo.lang.isArray(ruleSet)){
@@ -222,7 +222,7 @@ dojo.behavior = new function(){
 		});
 		dojo.profile.end("dojo.behavior.applyFast");
 	}
-	
+
 	this.applySlow = function(){
 		// iterate. Ugg.
 		dojo.profile.start("dojo.behavior.applySlow");
diff --git a/webapp/src/main/webapp/src/bootstrap1.js b/webapp/src/main/webapp/src/bootstrap1.js
index 9b3896dc1..982fc11f2 100644
--- a/webapp/src/main/webapp/src/bootstrap1.js
+++ b/webapp/src/main/webapp/src/bootstrap1.js
@@ -13,9 +13,9 @@
 
 // TODOC: HOW TO DOC THE BELOW?
 // @global: djConfig
-// summary:  
+// summary:
 //		Application code can set the global 'djConfig' prior to loading
-//		the library to override certain global settings for how dojo works.  
+//		the library to override certain global settings for how dojo works.
 // description:  The variables that can be set are as follows:
 //			- isDebug: false
 //			- allowQueryConfig: false
@@ -30,10 +30,10 @@
 // TODOC: HOW TO DOC THESE VARIABLES?
 // TODOC: IS THIS A COMPLETE LIST?
 // note:
-//		'djConfig' does not exist under 'dojo.*' so that it can be set before the 
-//		'dojo' variable exists.  
+//		'djConfig' does not exist under 'dojo.*' so that it can be set before the
+//		'dojo' variable exists.
 // note:
-//		Setting any of these variables *after* the library has loaded does nothing at all. 
+//		Setting any of these variables *after* the library has loaded does nothing at all.
 // TODOC: is this still true?  Release notes for 0.3 indicated they could be set after load.
 //
 
@@ -41,10 +41,10 @@
 
 //TODOC:  HOW TO DOC THIS?
 // @global: dj_global
-// summary: 
+// summary:
 //		an alias for the top-level global object in the host environment
 //		(e.g., the window object in a browser).
-// description:  
+// description:
 //		Refer to 'dj_global' rather than referring to window to ensure your
 //		code runs correctly in contexts other than web browsers (eg: Rhino on a server).
 var dj_global = this;
@@ -61,15 +61,15 @@ function dj_undef(/*String*/ name, /*Object?*/ object){
 
 
 // make sure djConfig is defined
-if(dj_undef("djConfig")){ 
-	var djConfig = {}; 
+if(dj_undef("djConfig")){
+	var djConfig = {};
 }
 
 
 //TODOC:  HOW TO DOC THIS?
 // dojo is the root variable of (almost all) our public symbols -- make sure it is defined.
-if(dj_undef("dojo")){ 
-	var dojo = {}; 
+if(dj_undef("dojo")){
+	var dojo = {};
 }
 
 //TODOC:  HOW TO DOC THIS?
@@ -86,17 +86,17 @@ dojo.version = {
 
 dojo.evalProp = function(/*String*/ name, /*Object*/ object, /*Boolean?*/ create){
 	// summary: Returns 'object[name]'.  If not defined and 'create' is true, will return a new Object.
-	// description: 
+	// description:
 	//		Returns null if 'object[name]' is not defined and 'create' is not true.
-	// 		Note: 'defined' and 'exists' are not the same concept.	
+	// 		Note: 'defined' and 'exists' are not the same concept.
 	return (object && !dj_undef(name, object) ? object[name] : (create ? (object[name]={}) : undefined));	// mixed
 }
 
 
 dojo.parseObjPath = function(/*String*/ path, /*Object?*/ context, /*Boolean?*/ create){
 	// summary: Parse string path to an object, and return corresponding object reference and property name.
-	// description: 
-	//		Returns an object with two properties, 'obj' and 'prop'.  
+	// description:
+	//		Returns an object with two properties, 'obj' and 'prop'.
 	//		'obj[prop]' is the reference indicated by 'path'.
 	// path: Path to an object, in the form "A.B.C".
 	// context: Object to use as root of path.  Defaults to 'dj_global'.
@@ -115,8 +115,8 @@ dojo.evalObjPath = function(/*String*/ path, /*Boolean?*/ create){
 	// summary: Return the value of object at 'path' in the global scope, without using 'eval()'.
 	// path: Path to an object, in the form "A.B.C".
 	// create: If true, Objects will be created at any point along the 'path' that is undefined.
-	if(typeof path != "string"){ 
-		return dj_global; 
+	if(typeof path != "string"){
+		return dj_global;
 	}
 	// fast path for no periods
 	if(path.indexOf('.') == -1){
@@ -171,7 +171,7 @@ dojo.debugShallow = function(obj){}
 dojo.profile = { start: function(){}, end: function(){}, stop: function(){}, dump: function(){} };
 
 
-function dj_eval(/*String*/ scriptFragment){ 
+function dj_eval(/*String*/ scriptFragment){
 	// summary: Perform an evaluation in the global scope.  Use this rather than calling 'eval()' directly.
 	// description: Placed in a separate function to minimize size of trapped evaluation context.
 	// note:
@@ -206,7 +206,7 @@ dojo.deprecated = function(/*String*/ behaviour, /*String?*/ extra, /*String?*/
 
 dojo.inherits = function(/*Function*/ subclass, /*Function*/ superclass){
 	// summary: Set up inheritance between two classes.
-	if(typeof superclass != 'function'){ 
+	if(typeof superclass != 'function'){
 		dojo.raise("dojo.inherits: superclass argument ["+superclass+"] must be a function (subclass: [" + subclass + "']");
 	}
 	subclass.prototype = new superclass();
@@ -261,11 +261,11 @@ dojo.render = (function(){
  */
 dojo.hostenv = (function(){
 	// TODOC:  HOW TO DOC THIS?
-	// summary: Provides encapsulation of behavior that changes across different 'host environments' 
+	// summary: Provides encapsulation of behavior that changes across different 'host environments'
 	//			(different browsers, server via Rhino, etc).
 	// description: None of these methods should ever be called directly by library users.
 	//				Use public methods such as 'loadModule' instead.
-	
+
 	// default configuration options
 	var config = {
 		isDebug: false,
@@ -294,21 +294,21 @@ dojo.hostenv = (function(){
 		version_: '(unset)',
 
 
-		getName: function(){ 
+		getName: function(){
 			// sumary: Return the name of the host environment.
 			return this.name_; 	// String
 		},
 
 
-		getVersion: function(){ 
+		getVersion: function(){
 			// summary: Return the version of the hostenv.
 			return this.version_; // String
 		},
 
 		getText: function(/*String*/ uri){
 			// summary:	Read the plain/text contents at the specified 'uri'.
-			// description: 
-			//			If 'getText()' is not implemented, then it is necessary to override 
+			// description:
+			//			If 'getText()' is not implemented, then it is necessary to override
 			//			'loadUri()' with an implementation that doesn't rely on it.
 
 			dojo.unimplemented('getText', "uri=" + uri);
@@ -322,7 +322,7 @@ dojo.hostenv.getBaseScriptUri = function(){
 	// TODOC: HUH?  This comment means nothing to me.  What other scripts? Is this the path to other dojo libraries?
 	//		MAYBE:  Return the base uri to scripts in the dojo library.	 ???
 	// return: Empty string or a path ending in '/'.
-	if(djConfig.baseScriptUri.length){ 
+	if(djConfig.baseScriptUri.length){
 		return djConfig.baseScriptUri;
 	}
 
diff --git a/webapp/src/main/webapp/src/bootstrap2.js b/webapp/src/main/webapp/src/bootstrap2.js
index 647bc4355..40e61ace9 100644
--- a/webapp/src/main/webapp/src/bootstrap2.js
+++ b/webapp/src/main/webapp/src/bootstrap2.js
@@ -136,7 +136,7 @@ dojo.requireLocalization = function(modulename, bundlename, locale /*optional*/)
 	var bundlepackage = [modulename, "_nls", bundlename].join(".");
 	var bundle = dojo.hostenv.startPackage(bundlepackage);
 	dojo.hostenv.loaded_modules_[bundlepackage] = bundle;
-	
+
 	var inherit = false;
 	for(var i = searchlist.length - 1; i >= 0; i--){
 		var loc = searchlist[i];
diff --git a/webapp/src/main/webapp/src/browser_debug.js b/webapp/src/main/webapp/src/browser_debug.js
index 4eb14b750..a43375f00 100644
--- a/webapp/src/main/webapp/src/browser_debug.js
+++ b/webapp/src/main/webapp/src/browser_debug.js
@@ -25,7 +25,7 @@ function removeComments(contents){
 dojo.hostenv.getRequiresAndProvides = function(contents){
 	// FIXME: should probably memoize this!
 	if(!contents){ return []; }
-	
+
 
 	// check to see if we need to load anything else first. Ugg.
 	var deps = [];
@@ -128,7 +128,7 @@ dojo.hostenv.loadUri = function(uri){
 		dojo.hostenv.loadedUris[uri] = true;
 		var delayRequires = dojo.hostenv.getDelayRequiresAndProvides(text);
 		eval(delayRequires.join(";"));
-	}catch(e){ 
+	}catch(e){
 		alert(e);
 	}
 	return true;
diff --git a/webapp/src/main/webapp/src/collections/BinaryTree.js b/webapp/src/main/webapp/src/collections/BinaryTree.js
index 51212c2c9..bc3628efb 100644
--- a/webapp/src/main/webapp/src/collections/BinaryTree.js
+++ b/webapp/src/main/webapp/src/collections/BinaryTree.js
@@ -73,7 +73,7 @@ dojo.collections.BinaryTree=function(data){
 		}
 		return s;
 	}
-	
+
 	function searchHelper(current, data){
 		if (!current) return null;
 		var i=current.compareData(data);
diff --git a/webapp/src/main/webapp/src/collections/Collections.js b/webapp/src/main/webapp/src/collections/Collections.js
index c39fd8fd1..3d698e616 100644
--- a/webapp/src/main/webapp/src/collections/Collections.js
+++ b/webapp/src/main/webapp/src/collections/Collections.js
@@ -16,11 +16,11 @@ dojo.collections.DictionaryEntry=function(/* string */k, /* object */v){
 	//	return an object of type dojo.collections.DictionaryEntry
 	this.key=k;
 	this.value=v;
-	this.valueOf=function(){ 
+	this.valueOf=function(){
 		return this.value; 	//	object
 	};
-	this.toString=function(){ 
-		return String(this.value);	//	string 
+	this.toString=function(){
+		return String(this.value);	//	string
 	};
 }
 
@@ -116,10 +116,10 @@ dojo.collections.DictionaryIterator=function(/* object */obj){
 			return arr;		//	array
 		}
 	};
-	this.reset=function() { 
+	this.reset=function() {
 		//	summary
 		//	reset the internal cursor.
-		position=0; 
+		position=0;
 		this.element=a[position];
 	};
 };
diff --git a/webapp/src/main/webapp/src/collections/Dictionary.js b/webapp/src/main/webapp/src/collections/Dictionary.js
index e150bd410..a96936a12 100644
--- a/webapp/src/main/webapp/src/collections/Dictionary.js
+++ b/webapp/src/main/webapp/src/collections/Dictionary.js
@@ -85,15 +85,15 @@ dojo.collections.Dictionary=function(/* dojo.collections.Dictionary? */dictionar
 	this.getKeyList=function(){
 		//	summary
 		//	Returns an array of the keys in the dictionary.
-		return (this.getIterator()).map(function(entry){ 
-			return entry.key; 
+		return (this.getIterator()).map(function(entry){
+			return entry.key;
 		});	//	array
 	};
 	this.getValueList=function(){
 		//	summary
 		//	Returns an array of the values in the dictionary.
-		return (this.getIterator()).map(function(entry){ 
-			return entry.value; 
+		return (this.getIterator()).map(function(entry){
+			return entry.value;
 		});	//	array
 	};
 	this.item=function(/* string */k){
diff --git a/webapp/src/main/webapp/src/collections/Graph.js b/webapp/src/main/webapp/src/collections/Graph.js
index 0428975fa..1b328be25 100644
--- a/webapp/src/main/webapp/src/collections/Graph.js
+++ b/webapp/src/main/webapp/src/collections/Graph.js
@@ -66,7 +66,7 @@ dojo.collections.Graph=function(nodes){
 				this.element=o[position];
 			};
 		}
-		
+
 		this.add=function(node){
 			d.add(node.key, node);
 		};
diff --git a/webapp/src/main/webapp/src/collections/SkipList.js b/webapp/src/main/webapp/src/collections/SkipList.js
index 0dcceaf1d..516a4956a 100644
--- a/webapp/src/main/webapp/src/collections/SkipList.js
+++ b/webapp/src/main/webapp/src/collections/SkipList.js
@@ -99,7 +99,7 @@ dojo.collections.SkipList = function(){
 			}
 		}
 	};
-	
+
 	this.contains = function(val){
 		var current = this.head;
 		var i;
@@ -129,7 +129,7 @@ dojo.collections.SkipList = function(){
 			}
 			updates[i] = current;
 		}
-		
+
 		current = current.nodes[0];
 		if (current != null && current.compare(val) == 0){
 			this.count--;
@@ -140,7 +140,7 @@ dojo.collections.SkipList = function(){
 			if (this.head.nodes[this.head.height - 1] == null) this.head.decrementHeight();
 		}
 	};
-	this.resetComparisons = function(){ 
-		comparisons = 0; 
+	this.resetComparisons = function(){
+		comparisons = 0;
 	};
 }
diff --git a/webapp/src/main/webapp/src/collections/SortedList.js b/webapp/src/main/webapp/src/collections/SortedList.js
index 0ba84da63..5c8dfdd2e 100644
--- a/webapp/src/main/webapp/src/collections/SortedList.js
+++ b/webapp/src/main/webapp/src/collections/SortedList.js
@@ -69,7 +69,7 @@ dojo.collections.SortedList=function(/* object? */ dictionary){
 		var e=this.getIterator();
 		while (!e.atEnd()){
 			var item=e.get();
-			if(item.value==o){ 
+			if(item.value==o){
 				return true;	//	bool
 			}
 		}
diff --git a/webapp/src/main/webapp/src/collections/__package__.js b/webapp/src/main/webapp/src/collections/__package__.js
index 91b0f2d1e..c9be15c18 100644
--- a/webapp/src/main/webapp/src/collections/__package__.js
+++ b/webapp/src/main/webapp/src/collections/__package__.js
@@ -11,10 +11,10 @@
 dojo.kwCompoundRequire({
 	common: [
 		"dojo.collections.Collections",
-		"dojo.collections.SortedList", 
-		"dojo.collections.Dictionary", 
-		"dojo.collections.Queue", 
-		"dojo.collections.ArrayList", 
+		"dojo.collections.SortedList",
+		"dojo.collections.Dictionary",
+		"dojo.collections.Queue",
+		"dojo.collections.ArrayList",
 		"dojo.collections.Stack",
 		"dojo.collections.Set"
 	]
diff --git a/webapp/src/main/webapp/src/data/Attribute.js b/webapp/src/main/webapp/src/data/Attribute.js
index acabb010d..e6e523150 100644
--- a/webapp/src/main/webapp/src/data/Attribute.js
+++ b/webapp/src/main/webapp/src/data/Attribute.js
@@ -18,7 +18,7 @@ dojo.require("dojo.lang.assert");
 dojo.data.Attribute = function(/* dojo.data.provider.Base */ dataProvider, /* string */ attributeId) {
 	/**
 	 * summary:
-	 * An Attribute object represents something like a column in 
+	 * An Attribute object represents something like a column in
 	 * a relational database.
 	 */
 	dojo.lang.assertType(dataProvider, [dojo.data.provider.Base, "optional"]);
@@ -37,26 +37,26 @@ dojo.data.Attribute.prototype.toString = function() {
 
 dojo.data.Attribute.prototype.getAttributeId = function() {
 	/**
-	 * summary: 
+	 * summary:
 	 * Returns the string token that uniquely identifies this
 	 * attribute within the context of a data provider.
 	 * For a data provider that accesses relational databases,
-	 * typical attributeIds might be tokens like "name", "age", 
+	 * typical attributeIds might be tokens like "name", "age",
 	 * "ssn", or "dept_key".
-	 */ 
+	 */
 	return this._attributeId; // string
 };
 
 dojo.data.Attribute.prototype.getType = function() {
 	/**
 	 * summary: Returns the data type of the values of this attribute.
-	 */ 
+	 */
 	return this.get('type'); // dojo.data.Type or null
 };
 
 dojo.data.Attribute.prototype.setType = function(/* dojo.data.Type or null */ type) {
 	/**
 	 * summary: Sets the data type for this attribute.
-	 */ 
+	 */
 	this.set('type', type);
 };
diff --git a/webapp/src/main/webapp/src/data/Item.js b/webapp/src/main/webapp/src/data/Item.js
index cbcf8e650..7cd421766 100644
--- a/webapp/src/main/webapp/src/data/Item.js
+++ b/webapp/src/main/webapp/src/data/Item.js
@@ -20,7 +20,7 @@ dojo.require("dojo.lang.assert");
 dojo.data.Item = function(/* dojo.data.provider.Base */ dataProvider) {
 	/**
 	 * summary:
-	 * An Item has attributes and attribute values, sort of like 
+	 * An Item has attributes and attribute values, sort of like
 	 * a record in a database, or a 'struct' in C.  Instances of
 	 * the Item class know how to store and retrieve their
 	 * attribute values.
@@ -41,7 +41,7 @@ dojo.data.Item.compare = function(/* dojo.data.Item */ itemOne, /* dojo.data.Ite
 	 * Given two Items to compare, this method returns 0, 1, or -1.
 	 * This method is designed to be used by sorting routines, like
 	 * the JavaScript built-in Array sort() method.
-	 * 
+	 *
 	 * Example:
 	 * <pre>
 	 *   var a = dataProvider.newItem("kermit");
@@ -62,7 +62,7 @@ dojo.data.Item.compare = function(/* dojo.data.Item */ itemOne, /* dojo.data.Ite
 		var attributeArrayTwo = itemTwo.getAttributes();
 		if (attributeArrayOne.length != attributeArrayTwo.length) {
 			if (attributeArrayOne.length > attributeArrayTwo.length) {
-				return 1; 
+				return 1;
 			} else {
 				return -1;
 			}
@@ -77,7 +77,7 @@ dojo.data.Item.compare = function(/* dojo.data.Item */ itemOne, /* dojo.data.Ite
 			}
 			if (arrayOfValuesOne.length != arrayOfValuesTwo.length) {
 				if (arrayOfValuesOne.length > arrayOfValuesTwo.length) {
-					return 1; 
+					return 1;
 				} else {
 					return -1;
 				}
@@ -92,7 +92,7 @@ dojo.data.Item.compare = function(/* dojo.data.Item */ itemOne, /* dojo.data.Ite
 		}
 	} else {
 		if (nameOne > nameTwo) {
-			return 1; 
+			return 1;
 		} else {
 			return -1;  // 0, 1, or -1
 		}
@@ -130,7 +130,7 @@ dojo.data.Item.prototype.toString = function() {
 dojo.data.Item.prototype.compare = function(/* dojo.data.Item */ otherItem) {
 	/**
 	 * summary: Compares this Item to another Item, and returns 0, 1, or -1.
-	 */ 
+	 */
 	return dojo.data.Item.compare(this, otherItem); // 0, 1, or -1
 };
 
@@ -148,7 +148,7 @@ dojo.data.Item.prototype.getName = function() {
 dojo.data.Item.prototype.get = function(/* string or dojo.data.Attribute */ attributeId) {
 	/**
 	 * summary: Returns a single literal value, like "foo" or 33.
-	 */ 
+	 */
 	// dojo.lang.assertType(attributeId, [String, dojo.data.Attribute]);
 	var literalOrValueOrArray = this._dictionaryOfAttributeValues[attributeId];
 	if (dojo.lang.isUndefined(literalOrValueOrArray)) {
@@ -167,7 +167,7 @@ dojo.data.Item.prototype.get = function(/* string or dojo.data.Attribute */ attr
 dojo.data.Item.prototype.getValue = function(/* string or dojo.data.Attribute */ attributeId) {
 	/**
 	 * summary: Returns a single instance of dojo.data.Value.
-	 */ 
+	 */
 	// dojo.lang.assertType(attributeId, [String, dojo.data.Attribute]);
 	var literalOrValueOrArray = this._dictionaryOfAttributeValues[attributeId];
 	if (dojo.lang.isUndefined(literalOrValueOrArray)) {
@@ -189,7 +189,7 @@ dojo.data.Item.prototype.getValue = function(/* string or dojo.data.Attribute */
 dojo.data.Item.prototype.getValues = function(/* string or dojo.data.Attribute */ attributeId) {
 	/**
 	 * summary: Returns an array of dojo.data.Value objects.
-	 */ 
+	 */
 	// dojo.lang.assertType(attributeId, [String, dojo.data.Attribute]);
 	var literalOrValueOrArray = this._dictionaryOfAttributeValues[attributeId];
 	if (dojo.lang.isUndefined(literalOrValueOrArray)) {
@@ -212,11 +212,11 @@ dojo.data.Item.prototype.getValues = function(/* string or dojo.data.Attribute *
 
 dojo.data.Item.prototype.load = function(/* string or dojo.data.Attribute */ attributeId, /* anything */ value) {
 	/**
-	 * summary: 
+	 * summary:
 	 * Used for loading an attribute value into an item when
 	 * the item is first being loaded into memory from some
 	 * data store (such as a file).
-	 */ 
+	 */
 	// dojo.lang.assertType(attributeId, [String, dojo.data.Attribute]);
 	this._dataProvider.registerAttribute(attributeId);
 	var literalOrValueOrArray = this._dictionaryOfAttributeValues[attributeId];
@@ -244,10 +244,10 @@ dojo.data.Item.prototype.load = function(/* string or dojo.data.Attribute */ att
 
 dojo.data.Item.prototype.set = function(/* string or dojo.data.Attribute */ attributeId, /* anything */ value) {
 	/**
-	 * summary: 
+	 * summary:
 	 * Used for setting an attribute value as a result of a
 	 * user action.
-	 */ 
+	 */
 	// dojo.lang.assertType(attributeId, [String, dojo.data.Attribute]);
 	this._dataProvider.registerAttribute(attributeId);
 	this._dictionaryOfAttributeValues[attributeId] = value;
@@ -260,17 +260,17 @@ dojo.data.Item.prototype.setValue = function(/* string or dojo.data.Attribute */
 
 dojo.data.Item.prototype.addValue = function(/* string or dojo.data.Attribute */ attributeId, /* anything */ value) {
 	/**
-	 * summary: 
+	 * summary:
 	 * Used for adding an attribute value as a result of a
 	 * user action.
-	 */ 
+	 */
 	this.load(attributeId, value);
 	this._dataProvider.noteChange(this, attributeId, value);
 };
 
 dojo.data.Item.prototype.setValues = function(/* string or dojo.data.Attribute */ attributeId, /* Array */ arrayOfValues) {
 	/**
-	 * summary: 
+	 * summary:
 	 * Used for setting an array of attribute values as a result of a
 	 * user action.
 	 */
@@ -291,10 +291,10 @@ dojo.data.Item.prototype.setValues = function(/* string or dojo.data.Attribute *
 
 dojo.data.Item.prototype.getAttributes = function() {
 	/**
-	 * summary: 
+	 * summary:
 	 * Returns an array containing all of the attributes for which
 	 * this item has attribute values.
-	 */ 
+	 */
 	var arrayOfAttributes = [];
 	for (var key in this._dictionaryOfAttributeValues) {
 		arrayOfAttributes.push(this._dataProvider.getAttribute(key));
@@ -305,7 +305,7 @@ dojo.data.Item.prototype.getAttributes = function() {
 dojo.data.Item.prototype.hasAttribute = function(/* string or dojo.data.Attribute */ attributeId) {
 	/**
 	 * summary: Returns true if the given attribute of the item has been assigned any value.
-	 */ 
+	 */
 	// dojo.lang.assertType(attributeId, [String, dojo.data.Attribute]);
 	for (var key in this._dictionaryOfAttributeValues) {
 		if (key == attributeId) {
@@ -318,7 +318,7 @@ dojo.data.Item.prototype.hasAttribute = function(/* string or dojo.data.Attribut
 dojo.data.Item.prototype.hasAttributeValue = function(/* string or dojo.data.Attribute */ attributeId, /* anything */ value) {
 	/**
 	 * summary: Returns true if the given attribute of the item has been assigned the given value.
-	 */ 
+	 */
 	var arrayOfValues = this.getValues(attributeId);
 	for (var i in arrayOfValues) {
 		var candidateValue = arrayOfValues[i];
diff --git a/webapp/src/main/webapp/src/data/Kind.js b/webapp/src/main/webapp/src/data/Kind.js
index 2b6663112..d96fbd538 100644
--- a/webapp/src/main/webapp/src/data/Kind.js
+++ b/webapp/src/main/webapp/src/data/Kind.js
@@ -20,7 +20,7 @@ dojo.data.Kind = function(/* dojo.data.provider.Base */ dataProvider) {
 	 * A Kind represents a kind of item.  In the dojo data model
 	 * the item Snoopy might belong to the 'kind' Dog, where in
 	 * a Java program the object Snoopy would belong to the 'class'
-	 * Dog, and in MySQL the record for Snoopy would be in the 
+	 * Dog, and in MySQL the record for Snoopy would be in the
 	 * table Dog.
 	 */
 	dojo.data.Item.call(this, dataProvider);
diff --git a/webapp/src/main/webapp/src/data/Observable.js b/webapp/src/main/webapp/src/data/Observable.js
index 720baee43..56ee5c234 100644
--- a/webapp/src/main/webapp/src/data/Observable.js
+++ b/webapp/src/main/webapp/src/data/Observable.js
@@ -25,7 +25,7 @@ dojo.data.Observable.prototype.addObserver = function(/* object */ observer) {
 	/**
 	 * summary: Registers an object as an observer of this item,
 	 * so that the object will be notified when the item changes.
-	 */ 
+	 */
 	dojo.lang.assertType(observer, Object);
 	dojo.lang.assertType(observer.observedObjectHasChanged, Function);
 	if (!this._arrayOfObservers) {
@@ -40,7 +40,7 @@ dojo.data.Observable.prototype.removeObserver = function(/* object */ observer)
 	/**
 	 * summary: Removes the observer registration for a previously
 	 * registered object.
-	 */ 
+	 */
 	if (!this._arrayOfObservers) {
 		return;
 	}
@@ -53,7 +53,7 @@ dojo.data.Observable.prototype.removeObserver = function(/* object */ observer)
 dojo.data.Observable.prototype.getObservers = function() {
 	/**
 	 * summary: Returns an array with all the observers of this item.
-	 */ 
+	 */
 	return this._arrayOfObservers; // Array or undefined
 };
 
diff --git a/webapp/src/main/webapp/src/data/ResultSet.js b/webapp/src/main/webapp/src/data/ResultSet.js
index 28b339d91..5b8003e06 100644
--- a/webapp/src/main/webapp/src/data/ResultSet.js
+++ b/webapp/src/main/webapp/src/data/ResultSet.js
@@ -67,4 +67,4 @@ dojo.data.ResultSet.prototype.contains = function(/* dojo.data.Item */ item) {
 
 dojo.data.ResultSet.prototype.getDataProvider = function() {
 	return this._dataProvider; // dojo.data.provider.Base
-};
\ No newline at end of file
+};
diff --git a/webapp/src/main/webapp/src/data/Value.js b/webapp/src/main/webapp/src/data/Value.js
index 98b8483bb..be063342a 100644
--- a/webapp/src/main/webapp/src/data/Value.js
+++ b/webapp/src/main/webapp/src/data/Value.js
@@ -34,14 +34,14 @@ dojo.data.Value.prototype.toString = function() {
 dojo.data.Value.prototype.getValue = function() {
 	/**
 	 * summary: Returns the value itself.
-	 */ 
+	 */
 	return this._value; // anything
 };
 
 dojo.data.Value.prototype.getType = function() {
 	/**
 	 * summary: Returns the data type of the value.
-	 */ 
+	 */
 	dojo.unimplemented('dojo.data.Value.prototype.getType');
 	return this._type; // dojo.data.Type
 };
diff --git a/webapp/src/main/webapp/src/data/format/Csv.js b/webapp/src/main/webapp/src/data/format/Csv.js
index a5d0f4eb3..4cca1e683 100644
--- a/webapp/src/main/webapp/src/data/format/Csv.js
+++ b/webapp/src/main/webapp/src/data/format/Csv.js
@@ -22,11 +22,11 @@ dojo.data.format.Csv = new function() {
 		 * Given a string containing CSV records, this method parses
 		 * the string and returns a data structure containing the parsed
 		 * content.  The data structure we return is an array of length
-		 * R, where R is the number of rows (lines) in the CSV data.  The 
-		 * return array contains one sub-array for each CSV line, and each 
-		 * sub-array contains C string values, where C is the number of 
+		 * R, where R is the number of rows (lines) in the CSV data.  The
+		 * return array contains one sub-array for each CSV line, and each
+		 * sub-array contains C string values, where C is the number of
 		 * columns in the CSV data.
-		 * 
+		 *
 		 * For example, given this CSV string as input:
 		 * <pre>
 		 *   "Title, Year, Producer \n Alien, 1979, Ridley Scott \n Blade Runner, 1982, Ridley Scott"
@@ -34,18 +34,18 @@ dojo.data.format.Csv = new function() {
 		 * We will return this data structure:
 		 * <pre>
 		 *   [["Title", "Year", "Producer"]
-		 *    ["Alien", "1979", "Ridley Scott"],  
+		 *    ["Alien", "1979", "Ridley Scott"],
 		 *    ["Blade Runner", "1982", "Ridley Scott"]]
 		 * </pre>
 		 */
 		dojo.lang.assertType(csvFileContents, String);
-		
+
 		var lineEndingCharacters = new RegExp("\r\n|\n|\r");
 		var leadingWhiteSpaceCharacters = new RegExp("^\\s+",'g');
 		var trailingWhiteSpaceCharacters = new RegExp("\\s+$",'g');
 		var doubleQuotes = new RegExp('""','g');
 		var arrayOfOutputRecords = [];
-		
+
 		var arrayOfInputLines = csvFileContents.split(lineEndingCharacters);
 		for (var i in arrayOfInputLines) {
 			var singleLine = arrayOfInputLines[i];
@@ -60,8 +60,8 @@ dojo.data.format.Csv = new function() {
 					var lastChar = field.charAt(field.length - 1);
 					var secondToLastChar = field.charAt(field.length - 2);
 					var thirdToLastChar = field.charAt(field.length - 3);
-					if ((firstChar == '"') && 
-							((lastChar != '"') || 
+					if ((firstChar == '"') &&
+							((lastChar != '"') ||
 							 ((lastChar == '"') && (secondToLastChar == '"') && (thirdToLastChar != '"')) )) {
 						if (j+1 === listOfFields.length) {
 							// alert("The last field in record " + i + " is corrupted:\n" + field);
@@ -102,11 +102,11 @@ dojo.data.format.Csv = new function() {
 			}
 		}
 	};
-	
+
 	this.getCsvStringFromResultSet = function(/* dojo.data.ResultSet */ resultSet) {
 		dojo.unimplemented('dojo.data.format.Csv.getCsvStringFromResultSet');
 		var csvString = null;
 		return csvString; // String
 	};
-	
+
 }();
diff --git a/webapp/src/main/webapp/src/data/format/Json.js b/webapp/src/main/webapp/src/data/format/Json.js
index e277460b9..0b80106e1 100644
--- a/webapp/src/main/webapp/src/data/format/Json.js
+++ b/webapp/src/main/webapp/src/data/format/Json.js
@@ -22,7 +22,7 @@ dojo.data.format.Json = new function() {
 		var arrayOfJsonData = eval("(" + jsonFileContents + ")");
 		this.loadDataProviderFromArrayOfJsonData(dataProvider, arrayOfJsonData);
 	};
-	
+
 	this.loadDataProviderFromArrayOfJsonData = function(/* dojo.data.provider.Base */ dataProvider, /* Array */ arrayOfJsonData) {
 		dojo.lang.assertType(arrayOfJsonData, [Array, "optional"]);
 		if (arrayOfJsonData && (arrayOfJsonData.length > 0)) {
@@ -47,8 +47,8 @@ dojo.data.format.Json = new function() {
 	// Private functions
 	// -------------------------------------------------------------------
 	function _loadDataProviderFromArrayOfArrays(/* dojo.data.provider.Base */ dataProvider, /* Array */ arrayOfJsonData) {
-		/** 
-		 * Example: 
+		/**
+		 * Example:
 		 * var arrayOfJsonStates = [
 		 * 	 [ "abbr",  "population",  "name" ]
 		 * 	 [  "WA",     5894121,      "Washington"    ],
@@ -70,8 +70,8 @@ dojo.data.format.Json = new function() {
 	}
 
 	function _loadDataProviderFromArrayOfObjects(/* dojo.data.provider.Base */ dataProvider, /* Array */ arrayOfJsonData) {
-		/** 
-		 * Example: 
+		/**
+		 * Example:
 		 * var arrayOfJsonStates = [
 		 * 	 { abbr: "WA", name: "Washington" },
 		 * 	 { abbr: "WV", name: "West Virginia" },
@@ -90,7 +90,7 @@ dojo.data.format.Json = new function() {
 					for (var j in arrayOfValues) {
 						value = arrayOfValues[j];
 						item.load(key, value);
-						// dojo.debug("loaded: " + key + " = " + value); 
+						// dojo.debug("loaded: " + key + " = " + value);
 					}
 				} else {
 					item.load(key, value);
@@ -98,6 +98,6 @@ dojo.data.format.Json = new function() {
 			}
 		}
 	}
-	
+
 }();
 
diff --git a/webapp/src/main/webapp/src/data/provider/Base.js b/webapp/src/main/webapp/src/data/provider/Base.js
index 752ec3304..bc9d313ce 100644
--- a/webapp/src/main/webapp/src/data/provider/Base.js
+++ b/webapp/src/main/webapp/src/data/provider/Base.js
@@ -33,7 +33,7 @@ dojo.data.provider.Base.prototype.beginTransaction = function() {
 	/**
 	 * Marks the beginning of a transaction.
 	 *
-	 * Each time you call beginTransaction() you open a new transaction, 
+	 * Each time you call beginTransaction() you open a new transaction,
 	 * which you need to close later using endTransaction().  Transactions
 	 * may be nested, but the beginTransaction and endTransaction calls
 	 * always need to come in pairs.
@@ -132,7 +132,7 @@ dojo.data.provider.Base.prototype.removeItemObserver = function(/* dojo.data.Ite
 	/**
 	 * summary: Removes the observer registration for a previously
 	 * registered object.
-	 */ 
+	 */
 	dojo.lang.assertType(item, dojo.data.Item);
 	item.removeObserver(observer);
 };
diff --git a/webapp/src/main/webapp/src/data/provider/Delicious.js b/webapp/src/main/webapp/src/data/provider/Delicious.js
index 6bb358520..0d8bff04c 100644
--- a/webapp/src/main/webapp/src/data/provider/Delicious.js
+++ b/webapp/src/main/webapp/src/data/provider/Delicious.js
@@ -20,7 +20,7 @@ dojo.data.provider.Delicious = function() {
 	 * summary:
 	 * The Delicious Data Provider can be used to take data from
 	 * del.icio.us and make it available as dojo.data.Items
-	 * In order to use the Delicious Data Provider, you need 
+	 * In order to use the Delicious Data Provider, you need
 	 * to have loaded a script tag that looks like this:
 	 * <script type="text/javascript" src="http://del.icio.us/feeds/json/gumption?count=8"></script>
 	 */
@@ -29,11 +29,11 @@ dojo.data.provider.Delicious = function() {
 	if (Delicious && Delicious.posts) {
 		dojo.data.format.Json.loadDataProviderFromArrayOfJsonData(this, Delicious.posts);
 	} else {
-		// document.write("<script type='text/javascript'>dojo.data.provider.Delicious._fetchComplete()</script>");		
+		// document.write("<script type='text/javascript'>dojo.data.provider.Delicious._fetchComplete()</script>");
 		/*
-		document.write("<script type='text/javascript'>alert('boo!');</script>");		
-		document.write("<script type='text/javascript'>var foo = 'not dojo'; alert('dojo == ' + foo);</script>");		
-		document.write("<script type='text/javascript'>var foo = fetchComplete; alert('dojo == ' + foo);</script>");		
+		document.write("<script type='text/javascript'>alert('boo!');</script>");
+		document.write("<script type='text/javascript'>var foo = 'not dojo'; alert('dojo == ' + foo);</script>");
+		document.write("<script type='text/javascript'>var foo = fetchComplete; alert('dojo == ' + foo);</script>");
 		fetchComplete();
 		*/
 		// dojo.debug("Delicious line 29: constructor");
@@ -41,11 +41,11 @@ dojo.data.provider.Delicious = function() {
 	var u = this.registerAttribute('u');
 	var d = this.registerAttribute('d');
 	var t = this.registerAttribute('t');
-	
+
 	u.load('name', 'Bookmark');
 	d.load('name', 'Description');
 	t.load('name', 'Tags');
-	
+
 	u.load('type', 'String');
 	d.load('type', 'String');
 	t.load('type', 'String');
@@ -55,7 +55,7 @@ dojo.inherits(dojo.data.provider.Delicious, dojo.data.provider.FlatFile);
 /********************************************************************
  * FIXME: the rest of this is work in progress
  *
- 
+
 dojo.data.provider.Delicious.prototype.getNewItemToLoad = function() {
 	var newItem = this._newItem();
 	this._currentArray.push(newItem);
@@ -63,7 +63,7 @@ dojo.data.provider.Delicious.prototype.getNewItemToLoad = function() {
 };
 
 dojo.data.provider.Delicious.prototype.fetchArray = function(query) {
-	if (!query) {	
+	if (!query) {
 		query = "gumption";
 	}
 	this._currentArray = [];
@@ -71,8 +71,8 @@ dojo.data.provider.Delicious.prototype.fetchArray = function(query) {
 	alert("Delicious line 61: " + dojo);
 		var sourceUrl = "http://del.icio.us/feeds/json/" + query + "?count=8";
 		document.write("<script type='text/javascript' src='" + sourceUrl + "'></script>");
-		document.write("<script type='text/javascript'>alert('line 63: ' + Delicious.posts[0].u);</script>");		
-		document.write("<script type='text/javascript'>callMe();</script>");		
+		document.write("<script type='text/javascript'>alert('line 63: ' + Delicious.posts[0].u);</script>");
+		document.write("<script type='text/javascript'>callMe();</script>");
 	alert("line 66");
 	dojo.data.format.Json.loadDataProviderFromArrayOfJsonData(this, Delicious.posts);
 	return this._currentArray; // Array
diff --git a/webapp/src/main/webapp/src/data/provider/FlatFile.js b/webapp/src/main/webapp/src/data/provider/FlatFile.js
index a4b98b556..7b2ec0207 100644
--- a/webapp/src/main/webapp/src/data/provider/FlatFile.js
+++ b/webapp/src/main/webapp/src/data/provider/FlatFile.js
@@ -116,14 +116,14 @@ dojo.data.provider.FlatFile.prototype.getAttributes = function() {
 dojo.data.provider.FlatFile.prototype.fetchArray = function(query) {
 	/**
 	 * summary: Returns an Array containing all of the Items.
-	 */ 
+	 */
 	return this._arrayOfItems; // Array
 };
 
 dojo.data.provider.FlatFile.prototype.fetchResultSet = function(query) {
 	/**
 	 * summary: Returns a ResultSet containing all of the Items.
-	 */ 
+	 */
 	if (!this._resultSet) {
 		this._resultSet = new dojo.data.ResultSet(this, this.fetchArray(query));
 	}
diff --git a/webapp/src/main/webapp/src/data/provider/JotSpot.js b/webapp/src/main/webapp/src/data/provider/JotSpot.js
index fa9991ca4..4f45a2de5 100644
--- a/webapp/src/main/webapp/src/data/provider/JotSpot.js
+++ b/webapp/src/main/webapp/src/data/provider/JotSpot.js
@@ -17,7 +17,7 @@ dojo.require("dojo.data.provider.Base");
 dojo.data.provider.JotSpot = function() {
 	/**
 	 * summary:
-	 * A JotSpot Data Provider knows how to read data from a JotSpot data 
+	 * A JotSpot Data Provider knows how to read data from a JotSpot data
 	 * store and make the contents accessable as dojo.data.Items.
 	 */
 	dojo.unimplemented('dojo.data.provider.JotSpot');
diff --git a/webapp/src/main/webapp/src/data/provider/MySql.js b/webapp/src/main/webapp/src/data/provider/MySql.js
index f50843485..a0080c94c 100644
--- a/webapp/src/main/webapp/src/data/provider/MySql.js
+++ b/webapp/src/main/webapp/src/data/provider/MySql.js
@@ -18,7 +18,7 @@ dojo.data.provider.MySql = function() {
 	/**
 	 * summary:
 	 * A MySql Data Provider knows how to connect to a MySQL database
-	 * on a server and and make the content records available as 
+	 * on a server and and make the content records available as
 	 * dojo.data.Items.
 	 */
 	dojo.unimplemented('dojo.data.provider.MySql');
diff --git a/webapp/src/main/webapp/src/data/to_do.txt b/webapp/src/main/webapp/src/data/to_do.txt
index 6e705fc6c..6aaedea24 100644
--- a/webapp/src/main/webapp/src/data/to_do.txt
+++ b/webapp/src/main/webapp/src/data/to_do.txt
@@ -8,17 +8,17 @@ Existing Features
  * notifications: widgets are notified when data changes
  * notification available per-item or per-resultSet
  * can create ad-hoc attributes
- * attributes can be loosely-typed 
+ * attributes can be loosely-typed
  * attributes can have meta-data like type and display name
  * half-implemented support for sorting
  * half-implemented support for export to .json
- * API for getting data in simple arrays 
+ * API for getting data in simple arrays
  * API for getting ResultSets with iterators (precursor to support for something like the openrico.org live grid)
- 
+
 ~~~~~~~~~~~~~~~~~~~~~~~~
 To-Do List
  * be able to import data from an html <table></table>
- * think about being able to import data from some type of XML 
+ * think about being able to import data from some type of XML
  * think about integration with dojo.undo.Manager
  * think more about how to represent the notion of different data types
  * think about what problems we'll run into when we have a MySQL data provider
diff --git a/webapp/src/main/webapp/src/date.js b/webapp/src/main/webapp/src/date.js
index 03341d5af..4c4767a46 100644
--- a/webapp/src/main/webapp/src/date.js
+++ b/webapp/src/main/webapp/src/date.js
@@ -96,7 +96,7 @@ dojo.date.setIso8601Date = function (dateObject, string) {
 	var dayofweek = (d[12]) ? d[12] : 1;
 
 	dateObject.setYear(year);
-	
+
 	if (dayofyear) { dojo.date.setDayOfYear(dateObject, Number(dayofyear)); }
 	else if (week) {
 		dateObject.setMonth(0);
@@ -104,17 +104,17 @@ dojo.date.setIso8601Date = function (dateObject, string) {
 		var gd = dateObject.getDay();
 		var day =  (gd) ? gd : 7;
 		var offset = Number(dayofweek) + (7 * Number(week));
-		
+
 		if (day <= 4) { dateObject.setDate(offset + 1 - day); }
 		else { dateObject.setDate(offset + 8 - day); }
 	} else {
-		if (month) { 
+		if (month) {
 			dateObject.setDate(1);
-			dateObject.setMonth(month - 1); 
+			dateObject.setMonth(month - 1);
 		}
 		if (date) { dateObject.setDate(date); }
 	}
-	
+
 	return dateObject;
 }
 
@@ -156,7 +156,7 @@ dojo.date.setIso8601Time = function (dateObject, string) {
 	dateObject.setMinutes(mins);
 	dateObject.setSeconds(secs);
 	dateObject.setMilliseconds(ms);
-	
+
 	return dateObject;
 }
 
@@ -247,16 +247,16 @@ dojo.date.getMonthShortName = function (dateObject) {
 
 
 dojo.date.getTimezoneName = function (dateObject) {
-	// need to negate timezones to get it right 
+	// need to negate timezones to get it right
 	// i.e UTC+1 is CET winter, but getTimezoneOffset returns -60
 	var timezoneOffset = -(dateObject.getTimezoneOffset());
-	
+
 	for (var i = 0; i < dojo.date.timezoneOffsets.length; i++) {
 		if (dojo.date.timezoneOffsets[i] == timezoneOffset) {
 			return dojo.date.shortTimezones[i];
 		}
 	}
-	
+
 	// we don't know so return it formatted as "+HH:MM"
 	function $ (s) { s = String(s); while (s.length < 2) { s = "0" + s; } return s; }
 	return (timezoneOffset < 0 ? "-" : "+") + $(Math.floor(Math.abs(
@@ -292,7 +292,7 @@ dojo.date.format = dojo.date.strftime = function (dateObject, format) {
 		while (n-- > 0) { s = (padChar == null ? "0" : padChar) + s; }
 		return s;
 	}
-	
+
 	function $ (property) {
 		switch (property) {
 			case "a": // abbreviated weekday name according to the current locale
@@ -304,10 +304,10 @@ dojo.date.format = dojo.date.strftime = function (dateObject, format) {
 			case "b":
 			case "h": // abbreviated month name according to the current locale
 				return dojo.date.getMonthShortName(dateObject); break;
-				
+
 			case "B": // full month name according to the current locale
 				return dojo.date.getMonthName(dateObject); break;
-				
+
 			case "c": // preferred date and time representation for the current
 				      // locale
 				return dateObject.toLocaleString(); break;
@@ -315,60 +315,60 @@ dojo.date.format = dojo.date.strftime = function (dateObject, format) {
 			case "C": // century number (the year divided by 100 and truncated
 				      // to an integer, range 00 to 99)
 				return _(Math.floor(dateObject.getFullYear()/100)); break;
-				
+
 			case "d": // day of the month as a decimal number (range 01 to 31)
 				return _(dateObject.getDate()); break;
-				
+
 			case "D": // same as %m/%d/%y
 				return $("m") + "/" + $("d") + "/" + $("y"); break;
-					
+
 			case "e": // day of the month as a decimal number, a single digit is
 				      // preceded by a space (range ' 1' to '31')
 				if (padChar == null) { padChar = " "; }
 				return _(dateObject.getDate(), 2); break;
-			
+
 			case "g": // like %G, but without the century.
 				break;
-			
+
 			case "G": // The 4-digit year corresponding to the ISO week number
 				      // (see %V).  This has the same format and value as %Y,
 				      // except that if the ISO week number belongs to the
 				      // previous or next year, that year is used instead.
 				break;
-			
+
 			case "F": // same as %Y-%m-%d
 				return $("Y") + "-" + $("m") + "-" + $("d"); break;
-				
+
 			case "H": // hour as a decimal number using a 24-hour clock (range
 				      // 00 to 23)
 				return _(dateObject.getHours()); break;
-				
+
 			case "I": // hour as a decimal number using a 12-hour clock (range
 				      // 01 to 12)
 				return _(dateObject.getHours() % 12 || 12); break;
-				
+
 			case "j": // day of the year as a decimal number (range 001 to 366)
 				return _(dojo.date.getDayOfYear(dateObject), 3); break;
-				
+
 			case "m": // month as a decimal number (range 01 to 12)
 				return _(dateObject.getMonth() + 1); break;
-				
+
 			case "M": // minute as a decimal numbe
 				return _(dateObject.getMinutes()); break;
-			
+
 			case "n":
 				return "\n"; break;
 
 			case "p": // either `am' or `pm' according to the given time value,
 				      // or the corresponding strings for the current locale
 				return dateObject.getHours() < 12 ? "am" : "pm"; break;
-				
+
 			case "r": // time in a.m. and p.m. notation
 				return $("I") + ":" + $("M") + ":" + $("S") + " " + $("p"); break;
-				
+
 			case "R": // time in 24 hour notation
 				return $("H") + ":" + $("M"); break;
-				
+
 			case "S": // second as a decimal number
 				return _(dateObject.getSeconds()); break;
 
@@ -377,11 +377,11 @@ dojo.date.format = dojo.date.strftime = function (dateObject, format) {
 
 			case "T": // current time, equal to %H:%M:%S
 				return $("H") + ":" + $("M") + ":" + $("S"); break;
-				
+
 			case "u": // weekday as a decimal number [1,7], with 1 representing
 				      // Monday
 				return String(dateObject.getDay() || 7); break;
-				
+
 			case "U": // week number of the current year as a decimal number,
 				      // starting with the first Sunday as the first day of the
 				      // first week
@@ -389,16 +389,16 @@ dojo.date.format = dojo.date.strftime = function (dateObject, format) {
 
 			case "V": // week number of the year (Monday as the first day of the
 				      // week) as a decimal number [01,53]. If the week containing
-				      // 1 January has four or more days in the new year, then it 
-				      // is considered week 1. Otherwise, it is the last week of 
+				      // 1 January has four or more days in the new year, then it
+				      // is considered week 1. Otherwise, it is the last week of
 				      // the previous year, and the next week is week 1.
 				return _(dojo.date.getIsoWeekOfYear(dateObject)); break;
-				
+
 			case "W": // week number of the current year as a decimal number,
 				      // starting with the first Monday as the first day of the
 				      // first week
 				return _(dojo.date.getWeekOfYear(dateObject, 1)); break;
-				
+
 			case "w": // day of the week as a decimal, Sunday being 0
 				return String(dateObject.getDay()); break;
 
@@ -413,19 +413,19 @@ dojo.date.format = dojo.date.strftime = function (dateObject, format) {
 			case "y": // year as a decimal number without a century (range 00 to
 				      // 99)
 				return _(dateObject.getFullYear()%100); break;
-				
+
 			case "Y": // year as a decimal number including the century
 				return String(dateObject.getFullYear()); break;
-			
+
 			case "z": // time zone or name or abbreviation
 				var timezoneOffset = dateObject.getTimezoneOffset();
-				return (timezoneOffset < 0 ? "-" : "+") + 
+				return (timezoneOffset < 0 ? "-" : "+") +
 					_(Math.floor(Math.abs(timezoneOffset)/60)) + ":" +
 					_(Math.abs(timezoneOffset)%60); break;
-				
+
 			case "Z": // time zone or name or abbreviation
 				return dojo.date.getTimezoneName(dateObject); break;
-			
+
 			case "%":
 				return "%"; break;
 		}
@@ -436,7 +436,7 @@ dojo.date.format = dojo.date.strftime = function (dateObject, format) {
 	var i = 0, index = 0, switchCase;
 	while ((index = format.indexOf("%", i)) != -1) {
 		string += format.substring(i, index++);
-		
+
 		// inspect modifier flag
 		switch (format.charAt(index++)) {
 			case "_": // Pad a numeric result string with spaces.
@@ -462,12 +462,12 @@ dojo.date.format = dojo.date.strftime = function (dateObject, format) {
 			property = property.toLowerCase();
 		}
 		var swicthCase = null;
-		
+
 		string += property;
 		i = index;
 	}
 	string += format.substring(i);
-	
+
 	return string;
 }
 
@@ -476,7 +476,7 @@ dojo.date.format = dojo.date.strftime = function (dateObject, format) {
 dojo.date.compareTypes={
 	// 	summary
 	//	bitmask for comparison operations.
-	DATE:1, TIME:2 
+	DATE:1, TIME:2
 };
 dojo.date.compare=function(/* Date */ dateA, /* Date */ dateB, /* int */ options){
 	//	summary
@@ -486,19 +486,19 @@ dojo.date.compare=function(/* Date */ dateA, /* Date */ dateB, /* int */ options
 	var now=new Date();
 	var opt=options||(dojo.date.compareTypes.DATE|dojo.date.compareTypes.TIME);
 	var d1=new Date(
-		((opt&dojo.date.compareTypes.DATE)?(dA.getFullYear()):now.getFullYear()), 
-		((opt&dojo.date.compareTypes.DATE)?(dA.getMonth()):now.getMonth()), 
-		((opt&dojo.date.compareTypes.DATE)?(dA.getDate()):now.getDate()), 
-		((opt&dojo.date.compareTypes.TIME)?(dA.getHours()):0), 
-		((opt&dojo.date.compareTypes.TIME)?(dA.getMinutes()):0), 
+		((opt&dojo.date.compareTypes.DATE)?(dA.getFullYear()):now.getFullYear()),
+		((opt&dojo.date.compareTypes.DATE)?(dA.getMonth()):now.getMonth()),
+		((opt&dojo.date.compareTypes.DATE)?(dA.getDate()):now.getDate()),
+		((opt&dojo.date.compareTypes.TIME)?(dA.getHours()):0),
+		((opt&dojo.date.compareTypes.TIME)?(dA.getMinutes()):0),
 		((opt&dojo.date.compareTypes.TIME)?(dA.getSeconds()):0)
 	);
 	var d2=new Date(
-		((opt&dojo.date.compareTypes.DATE)?(dB.getFullYear()):now.getFullYear()), 
-		((opt&dojo.date.compareTypes.DATE)?(dB.getMonth()):now.getMonth()), 
-		((opt&dojo.date.compareTypes.DATE)?(dB.getDate()):now.getDate()), 
-		((opt&dojo.date.compareTypes.TIME)?(dB.getHours()):0), 
-		((opt&dojo.date.compareTypes.TIME)?(dB.getMinutes()):0), 
+		((opt&dojo.date.compareTypes.DATE)?(dB.getFullYear()):now.getFullYear()),
+		((opt&dojo.date.compareTypes.DATE)?(dB.getMonth()):now.getMonth()),
+		((opt&dojo.date.compareTypes.DATE)?(dB.getDate()):now.getDate()),
+		((opt&dojo.date.compareTypes.TIME)?(dB.getHours()):0),
+		((opt&dojo.date.compareTypes.TIME)?(dB.getMinutes()):0),
 		((opt&dojo.date.compareTypes.TIME)?(dB.getSeconds()):0)
 	);
 	if(d1.valueOf()>d2.valueOf()){
@@ -510,10 +510,10 @@ dojo.date.compare=function(/* Date */ dateA, /* Date */ dateB, /* int */ options
 	return 0;	//	int
 }
 
-dojo.date.dateParts={ 
+dojo.date.dateParts={
 	//	summary
 	//	constants for use in dojo.date.add
-	YEAR:0, MONTH:1, DAY:2, HOUR:3, MINUTE:4, SECOND:5, MILLISECOND:6 
+	YEAR:0, MONTH:1, DAY:2, HOUR:3, MINUTE:4, SECOND:5, MILLISECOND:6
 };
 dojo.date.add=function(/* Date */ d, /* dojo.date.dateParts */ unit, /* int */ amount){
 	var n=(amount)?amount:1;
@@ -583,19 +583,19 @@ dojo.date.toString = function(date, format){
 	if (format.indexOf("#") == -1) {
 		return format;
 	}
-	
+
 	if (format.indexOf("#h") > -1) {
 		var hours = date.getHours();
 		hours = (hours > 12 ? hours - 12 : (hours == 0) ? 12 : hours);
 		format = format.replace(/#hh/g, (hours.toString().length==1?"0":"")+hours);
 		format = format.replace(/#h/g, hours);
 	}
-	
+
 	if (format.indexOf("#H") > -1) {
 		format = format.replace(/#HH/g, (date.getHours().toString().length==1?"0":"")+date.getHours());
 		format = format.replace(/#H/g, date.getHours());
 	}
-	
+
 	if (format.indexOf("#m") > -1) {
 		format = format.replace(/#mm/g, (date.getMinutes().toString().length==1?"0":"")+date.getMinutes());
 		format = format.replace(/#m/g, date.getMinutes());
@@ -605,7 +605,7 @@ dojo.date.toString = function(date, format){
 		format = format.replace(/#ss/g, (date.getSeconds().toString().length==1?"0":"")+date.getSeconds());
 		format = format.replace(/#s/g, date.getSeconds());
 	}
-	
+
 	if (format.indexOf("#T") > -1) {
 		format = format.replace(/#TT/g, date.getHours() >= 12 ? "PM" : "AM");
 		format = format.replace(/#T/g, date.getHours() >= 12 ? "P" : "A");
@@ -615,9 +615,9 @@ dojo.date.toString = function(date, format){
 		format = format.replace(/#tt/g, date.getHours() >= 12 ? "pm" : "am");
 		format = format.replace(/#t/g, date.getHours() >= 12 ? "p" : "a");
 	}
-					
+
 	return format;
-	
+
 }
 
 
diff --git a/webapp/src/main/webapp/src/debug.js b/webapp/src/main/webapp/src/debug.js
index 5cec3aa99..2c3c16560 100644
--- a/webapp/src/main/webapp/src/debug.js
+++ b/webapp/src/main/webapp/src/debug.js
@@ -9,7 +9,7 @@
 */
 
 /**
- * Produce a line of debug output. 
+ * Produce a line of debug output.
  * Does nothing unless djConfig.isDebug is true.
  * varargs, joined with ''.
  * Caller should not supply a trailing "\n".
@@ -48,7 +48,7 @@ dojo.debug = function(){
 }
 
 /**
- * this is really hacky for now - just 
+ * this is really hacky for now - just
  * display the properties of the object
 **/
 
diff --git a/webapp/src/main/webapp/src/debug/deep.html b/webapp/src/main/webapp/src/debug/deep.html
index 0db51575a..374624956 100644
--- a/webapp/src/main/webapp/src/debug/deep.html
+++ b/webapp/src/main/webapp/src/debug/deep.html
@@ -14,7 +14,7 @@ var tableHides = {};
 var frame = null;
 
 window.onload = function(){
-	// if IE loads this page too quickly (instantly) then 
+	// if IE loads this page too quickly (instantly) then
 	// window.debugVar might not have been set
 	window.setTimeout(startMeUp, 100);
 }
@@ -99,7 +99,7 @@ function buildTableRow(path, tb, name, value) {
 	var td2 = tr1.insertCell(1);
 	var td3 = tr1.insertCell(2);
 	var td4 = tr1.insertCell(3);
-	
+
 	tr1.style.verticalAlign = 'top';
 	td1.style.verticalAlign = 'middle';
 
@@ -157,7 +157,7 @@ function buildTableRow(path, tb, name, value) {
 		var tr2 = tb.insertRow(row++);
 		var td5 = tr2.insertCell(0);
 		var td6 = tr2.insertCell(1);
-		
+
 		//var tr2 = document.createElement('tr');
 		//var td5 = document.createElement('td');
 		//var td6 = document.createElement('td');
@@ -356,4 +356,4 @@ td.propVal {
 <div id="frame"></div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/webapp/src/main/webapp/src/dnd/DragAndDrop.js b/webapp/src/main/webapp/src/dnd/DragAndDrop.js
index b640369ad..2db890c73 100644
--- a/webapp/src/main/webapp/src/dnd/DragAndDrop.js
+++ b/webapp/src/main/webapp/src/dnd/DragAndDrop.js
@@ -31,7 +31,7 @@ dojo.lang.extend(dojo.dnd.DragSource, {
 	},
 
 	/*
-	 * This function gets called when the DOM element was 
+	 * This function gets called when the DOM element was
 	 * selected for dragging by the HtmlDragAndDropManager.
 	 */
 	onSelected: function(){
diff --git a/webapp/src/main/webapp/src/dnd/HtmlDragAndDrop.js b/webapp/src/main/webapp/src/dnd/HtmlDragAndDrop.js
index f8ff683ad..c01fc37f3 100644
--- a/webapp/src/main/webapp/src/dnd/HtmlDragAndDrop.js
+++ b/webapp/src/main/webapp/src/dnd/HtmlDragAndDrop.js
@@ -69,7 +69,7 @@ dojo.lang.extend(dojo.dnd.HtmlDragSource, {
 			this.constrainingContainer = container;
 		}
 	},
-	
+
 	/*
 	*
 	* see dojo.dnd.DragSource.onSelected
@@ -166,7 +166,7 @@ dojo.lang.extend(dojo.dnd.HtmlDragObject, {
 
 		this.dragClone = this.createDragNode();
 
-		this.containingBlockPosition = this.domNode.offsetParent ? 
+		this.containingBlockPosition = this.domNode.offsetParent ?
 			dojo.style.getAbsolutePosition(this.domNode.offsetParent) : {x:0, y:0};
 
 		if (this.constrainToContainer) {
diff --git a/webapp/src/main/webapp/src/dnd/HtmlDragManager.js b/webapp/src/main/webapp/src/dnd/HtmlDragManager.js
index b4a1037dc..f8ce81cbd 100644
--- a/webapp/src/main/webapp/src/dnd/HtmlDragManager.js
+++ b/webapp/src/main/webapp/src/dnd/HtmlDragManager.js
@@ -134,7 +134,7 @@ dojo.lang.extend(dojo.dnd.HtmlDragManager, {
 	/**
 	* Get the DOM element that is meant to drag.
 	* Loop through the parent nodes of the event target until
-	* the element is found that was created as a DragSource and 
+	* the element is found that was created as a DragSource and
 	* return it.
 	*
 	* @param event object The event for which to get the drag source.
@@ -175,7 +175,7 @@ dojo.lang.extend(dojo.dnd.HtmlDragManager, {
 
 		// find a selection object, if one is a parent of the source node
 		var ds = this.getDragSource(e);
-		
+
 		// this line is important.  if we aren't selecting anything then
 		// we need to return now, so preventDefault() isn't called, and thus
 		// the event is propogated to other handling code
@@ -247,12 +247,12 @@ dojo.lang.extend(dojo.dnd.HtmlDragManager, {
 				// while the mouse doesnt "hold" the dragged object anymore ... and so on
 				dojo.lang.delayThese([
 					function() {
-						// in FF1.5 this throws an exception, see 
+						// in FF1.5 this throws an exception, see
 						// http://dojotoolkit.org/pipermail/dojo-interest/2006-April/006751.html
 						try{
 							tempDragObj.dragSource.onDragEnd(e)
 						} catch(err) {
-							// since the problem seems passing e, we just copy all 
+							// since the problem seems passing e, we just copy all
 							// properties and try the copy ...
 							var ecopy = {};
 							for (var i in e) {
@@ -348,7 +348,7 @@ dojo.lang.extend(dojo.dnd.HtmlDragManager, {
 			// selectedSources (elements that move along) then the first one is the master
 			// and for it the events will be fired etc.
 			this.dragSource = this.selectedSources[0];
-			
+
 			dojo.lang.forEach(this.selectedSources, function(tempSource){
 				if(!tempSource){ return; }
 				var tdo = tempSource.onDragStart(e);
diff --git a/webapp/src/main/webapp/src/dnd/HtmlDragMove.js b/webapp/src/main/webapp/src/dnd/HtmlDragMove.js
index 583d9915d..ae1ae0f7a 100644
--- a/webapp/src/main/webapp/src/dnd/HtmlDragMove.js
+++ b/webapp/src/main/webapp/src/dnd/HtmlDragMove.js
@@ -52,11 +52,11 @@ dojo.lang.extend(dojo.dnd.HtmlDragMoveObject, {
 
 		this.scrollOffset = dojo.html.getScrollOffset();
 		this.dragStartPosition = dojo.style.getAbsolutePosition(this.domNode, true);
-		
+
 		this.dragOffset = {y: this.dragStartPosition.y - e.pageY,
 			x: this.dragStartPosition.x - e.pageX};
 
-		this.containingBlockPosition = this.domNode.offsetParent ? 
+		this.containingBlockPosition = this.domNode.offsetParent ?
 			dojo.style.getAbsolutePosition(this.domNode.offsetParent, true) : {x:0, y:0};
 
 		this.dragClone.style.position = "absolute";
diff --git a/webapp/src/main/webapp/src/doc.js b/webapp/src/main/webapp/src/doc.js
index 2f65ae7f5..a29efc5a9 100644
--- a/webapp/src/main/webapp/src/doc.js
+++ b/webapp/src/main/webapp/src/doc.js
@@ -103,7 +103,7 @@ dojo.lang.mixin(dojo.doc, {
 		dojo.debug("getSrc()");
 		if(!selectKey){
 			selectKey = ++dojo.doc._count;
-		}	
+		}
 		dojo.doc._buildCache({
 			type: "src",
 			callbacks: [callback],
@@ -115,7 +115,7 @@ dojo.lang.mixin(dojo.doc, {
 
 	_getSrc: function(/*String*/ type, /*Object*/ data, /*Object*/ evt){
 		dojo.debug("_getSrc()");
-		if(evt.pkg){	
+		if(evt.pkg){
 			evt.type = "src";
 			dojo.doc._buildCache(evt);
 		}else{
@@ -144,7 +144,7 @@ dojo.lang.mixin(dojo.doc, {
 
 	_getDoc: function(/*String*/ type, /*Object*/ data, /*Object*/ evt){
 		dojo.debug("_getDoc(" + evt.pkg + "/" + evt.name + ")");
-	
+
 		dojo.doc._keys[evt.selectKey] = {count: 0};
 
 		var search = {};
@@ -157,9 +157,9 @@ dojo.lang.mixin(dojo.doc, {
 			search.filter = "it/DocFnForm/require = '" + evt.pkg + "' and it/DocFnForm/name = '" + evt.name + "' and it/DocFnForm/id = '" + evt.id + "'";
 		}
 		dojo.debug(dojo.json.serialize(search));
-	
+
 		dojo.doc._rpc.callRemote("search", search).addCallbacks(function(data){ evt.type = "fn"; dojo.doc._gotDoc("load", data.list[0], evt); }, function(data){ evt.type = "fn"; dojo.doc._gotDoc("error", {}, evt); });
-	
+
 		search.forFormName = "DocParamForm";
 
 		if(!evt.id){
@@ -186,7 +186,7 @@ dojo.lang.mixin(dojo.doc, {
 				description = dojo.dom.createDocumentFromText(keys.fn["main/text"]).childNodes[0].innerHTML;
 				if(!description){
 					description = keys.fn["main/text"];
-				}			
+				}
 			}
 			data = {
 				description: description,
@@ -202,7 +202,7 @@ dojo.lang.mixin(dojo.doc, {
 			}
 
 			delete dojo.doc._keys[evt.selectKey];
-		
+
 			if(evt.callbacks && evt.callbacks.length){
 				var callback = evt.callbacks.shift();
 				callback.call(null, "load", data, evt);
@@ -308,7 +308,7 @@ dojo.lang.mixin(dojo.doc, {
 			dojo.doc._printResults(results);
 		}
 	},
-	
+
 	_printResults: function(results){
 		dojo.debug("_printResults(): called");
 		// summary: Call this function to send the /doc/results topic
@@ -349,7 +349,7 @@ dojo.lang.mixin(dojo.doc, {
 			delete dojo.doc._myKeys[evt.selectKey];
 		}
 	},
-	
+
 	_printFunctionDetail: function(results) {
 		// summary: Call this function to send the /doc/functionDetail topic event
 	},
@@ -363,7 +363,7 @@ dojo.lang.mixin(dojo.doc, {
 			id = "_";
 		}
 		var name = input.name;
-	
+
 		dojo.debug("_buildCache() type: " + type);
 		if(type == "function_names"){
 			if(!dojo.doc._cache["function_names"]){
@@ -525,11 +525,11 @@ dojo.lang.mixin(dojo.doc, {
 					if(!cache[pkg]){
 						dojo.doc._cache[pkg] = {};
 					}
-				
+
 					if(!cache[pkg]["meta"]){
 						dojo.doc._cache[pkg]["meta"] = {};
 					}
-				
+
 					var methods = data.methods;
 					if(methods){
 						for(var method in methods){
@@ -619,4 +619,4 @@ dojo.event.topic.subscribe("/doc/search", dojo.doc, "_onDocSearch");
 dojo.event.topic.subscribe("/doc/selectFunction", dojo.doc, "_onDocSelectFunction");
 
 dojo.event.topic.registerPublisher("/doc/results", dojo.doc, "_printResults");
-dojo.event.topic.registerPublisher("/doc/functionDetail", dojo.doc, "_printFunctionDetail");
\ No newline at end of file
+dojo.event.topic.registerPublisher("/doc/functionDetail", dojo.doc, "_printFunctionDetail");
diff --git a/webapp/src/main/webapp/src/dom.js b/webapp/src/main/webapp/src/dom.js
index 5697ee8e8..f64939036 100644
--- a/webapp/src/main/webapp/src/dom.js
+++ b/webapp/src/main/webapp/src/dom.js
@@ -23,7 +23,7 @@ dojo.dom.DOCUMENT_NODE                 = 9;
 dojo.dom.DOCUMENT_TYPE_NODE            = 10;
 dojo.dom.DOCUMENT_FRAGMENT_NODE        = 11;
 dojo.dom.NOTATION_NODE                 = 12;
-	
+
 dojo.dom.dojoml = "http://www.dojotoolkit.org/2004/dojoml";
 
 /**
@@ -73,7 +73,7 @@ dojo.dom.getTagName = function(node){
 
 	var tagName = node.tagName;
 	if(tagName.substr(0,5).toLowerCase()!="dojo:"){
-		
+
 		if(tagName.substr(0,4).toLowerCase()=="dojo"){
 			// FIXME: this assuumes tag names are always lower case
 			return "dojo:" + tagName.substring(4).toLowerCase();
@@ -84,7 +84,7 @@ dojo.dom.getTagName = function(node){
 		if(djt){
 			return "dojo:"+djt.toLowerCase();
 		}
-		
+
 		if((node.getAttributeNS)&&(node.getAttributeNS(this.dojoml,"type"))){
 			return "dojo:" + node.getAttributeNS(this.dojoml,"type").toLowerCase();
 		}
@@ -231,7 +231,7 @@ dojo.dom.getAncestors = function(node, filterFunction, returnFirstHit) {
 			ancestors.push(node);
 		}
 		if (returnFirstHit && ancestors.length > 0) { return ancestors[0]; }
-		
+
 		node = node.parentNode;
 	}
 	if (returnFirstHit) { return null; }
@@ -285,7 +285,7 @@ dojo.dom.createDocument = function(){
 		(document.implementation.createDocument)){
 		doc = document.implementation.createDocument("", "", null);
 	}
-	
+
 	return doc;
 }
 
@@ -422,10 +422,10 @@ dojo.dom.insertAtIndex = function(node, containingNode, insertionIndex){
 		return dojo.dom.insertBefore(node, siblingNodes.item(0));
 	}
 }
-	
+
 /**
  * implementation of the DOM Level 3 attribute.
- * 
+ *
  * @param node The node to scan for text
  * @param text Optional, set the text to this value.
  */
diff --git a/webapp/src/main/webapp/src/event.js b/webapp/src/main/webapp/src/event.js
index c31b14b3b..b78f204e0 100644
--- a/webapp/src/main/webapp/src/event.js
+++ b/webapp/src/main/webapp/src/event.js
@@ -302,7 +302,7 @@ dojo.event.MethodInvocation.prototype.proceed = function() {
 		var meth = ti[1];
 		return mobj[meth].call(mobj, this);
 	}
-} 
+}
 
 
 dojo.event.MethodJoinPoint = function(obj, methname){
@@ -345,7 +345,7 @@ dojo.event.MethodJoinPoint.getForMethod = function(obj, methname) {
 		obj[jpfuncname] = obj[methname];
 		// joinpoint = obj[jpname] = new dojo.event.MethodJoinPoint(obj, methname);
 		joinpoint = obj[jpname] = new dojo.event.MethodJoinPoint(obj, jpfuncname);
-		obj[methname] = function(){ 
+		obj[methname] = function(){
 			var args = [];
 
 			if((isNode)&&(!arguments.length)){
@@ -374,8 +374,8 @@ dojo.event.MethodJoinPoint.getForMethod = function(obj, methname) {
 					}
 				}
 			}
-			// return joinpoint.run.apply(joinpoint, arguments); 
-			return joinpoint.run.apply(joinpoint, args); 
+			// return joinpoint.run.apply(joinpoint, arguments);
+			return joinpoint.run.apply(joinpoint, args);
 		}
 		obj[methname].__preJoinArity = origArity;
 	}
@@ -403,19 +403,19 @@ dojo.lang.extend(dojo.event.MethodJoinPoint, {
 			aargs[x] = args[x];
 		}
 
-		var unrollAdvice  = function(marr){ 
+		var unrollAdvice  = function(marr){
 			if(!marr){
 				dojo.debug("Null argument to unrollAdvice()");
 				return;
 			}
-		  
+
 			var callObj = marr[0]||dj_global;
 			var callFunc = marr[1];
-			
+
 			if(!callObj[callFunc]){
 				dojo.raise("function \"" + callFunc + "\" does not exist on \"" + callObj + "\"");
 			}
-			
+
 			var aroundObj = marr[2]||dj_global;
 			var aroundFunc = marr[3];
 			var msg = marr[6];
@@ -469,16 +469,16 @@ dojo.lang.extend(dojo.event.MethodJoinPoint, {
 				if((hasDelay)&&((dojo.render.html)||(dojo.render.svg))){  // FIXME: the render checks are grotty!
 					dj_global["setTimeout"](function(){
 						if(msg){
-							callObj[callFunc].call(callObj, to); 
+							callObj[callFunc].call(callObj, to);
 						}else{
-							callObj[callFunc].apply(callObj, args); 
+							callObj[callFunc].apply(callObj, args);
 						}
 					}, delay);
 				}else{ // many environments can't support delay!
 					if(msg){
-						callObj[callFunc].call(callObj, to); 
+						callObj[callFunc].call(callObj, to);
 					}else{
-						callObj[callFunc].apply(callObj, args); 
+						callObj[callFunc].apply(callObj, args);
 					}
 				}
 			}
@@ -515,16 +515,16 @@ dojo.lang.extend(dojo.event.MethodJoinPoint, {
 	},
 
 	kwAddAdvice: function(args){
-		this.addAdvice(	args["adviceObj"], args["adviceFunc"], 
-						args["aroundObj"], args["aroundFunc"], 
-						args["adviceType"], args["precedence"], 
-						args["once"], args["delay"], args["rate"], 
+		this.addAdvice(	args["adviceObj"], args["adviceFunc"],
+						args["aroundObj"], args["aroundFunc"],
+						args["adviceType"], args["precedence"],
+						args["once"], args["delay"], args["rate"],
 						args["adviceMsg"]);
 	},
 
-	addAdvice: function(	thisAdviceObj, thisAdvice, 
-							thisAroundObj, thisAround, 
-							advice_kind, precedence, 
+	addAdvice: function(	thisAdviceObj, thisAdvice,
+							thisAroundObj, thisAround,
+							advice_kind, precedence,
 							once, delay, rate, asMessage){
 		var arr = this.getArr(advice_kind);
 		if(!arr){
@@ -532,7 +532,7 @@ dojo.lang.extend(dojo.event.MethodJoinPoint, {
 		}
 
 		var ao = [thisAdviceObj, thisAdvice, thisAroundObj, thisAround, delay, rate, asMessage];
-		
+
 		if(once){
 			if(this.hasAdvice(thisAdviceObj, thisAdvice, advice_kind, arr) >= 0){
 				return;
diff --git a/webapp/src/main/webapp/src/event/browser.js b/webapp/src/main/webapp/src/event/browser.js
index 607013db3..2552ed1a7 100644
--- a/webapp/src/main/webapp/src/event/browser.js
+++ b/webapp/src/main/webapp/src/event/browser.js
@@ -76,7 +76,7 @@ dojo.event.browser = new function(){
 	var clobberIdx = 0;
 
 	this.clean = function(node){
-		if(dojo.render.html.ie){ 
+		if(dojo.render.html.ie){
 			dojo._ie_clobber.clobber(node);
 		}
 	}
@@ -132,7 +132,7 @@ dojo.event.browser = new function(){
 			newfp = fp;
 		}
 
-		if(node.addEventListener){ 
+		if(node.addEventListener){
 			node.addEventListener(evtName.substr(2), newfp, capture);
 			return newfp;
 		}else{
@@ -161,7 +161,7 @@ dojo.event.browser = new function(){
 	}
 
 	this.currentEvent = null;
-	
+
 	this.callListener = function(listener, curTarget){
 		if(typeof listener != 'function'){
 			dojo.raise("listener not a function: " + listener);
@@ -228,7 +228,7 @@ dojo.event.browser = new function(){
 		if((!evt)&&(window["event"])){
 			var evt = window.event;
 		}
-		
+
 		if((evt["type"])&&(evt["type"].indexOf("key") == 0)){ // key events
 			evt.keys = this.revKeys;
 			// FIXME: how can we eliminate this iteration?
@@ -239,7 +239,7 @@ dojo.event.browser = new function(){
 				evt.charCode = evt.keyCode;
 			}
 		}
-	
+
 		if(dojo.render.html.ie){
 			if(!evt.target){ evt.target = evt.srcElement; }
 			if(!evt.currentTarget){ evt.currentTarget = (sender ? sender : evt.srcElement); }
diff --git a/webapp/src/main/webapp/src/event/topic.js b/webapp/src/main/webapp/src/event/topic.js
index 3fd0752e5..0b12eccf8 100644
--- a/webapp/src/main/webapp/src/event/topic.js
+++ b/webapp/src/main/webapp/src/event/topic.js
@@ -66,8 +66,8 @@ dojo.event.topic.TopicImpl = function(topicName){
 		var tf = listenerMethod||listenerObject;
 		var to = (!listenerMethod) ? dj_global : listenerObject;
 		dojo.event.kwConnect({
-			srcObj:		this, 
-			srcFunc:	"sendMessage", 
+			srcObj:		this,
+			srcFunc:	"sendMessage",
 			adviceObj:	to,
 			adviceFunc: tf
 		});
@@ -77,8 +77,8 @@ dojo.event.topic.TopicImpl = function(topicName){
 		var tf = (!listenerMethod) ? listenerObject : listenerMethod;
 		var to = (!listenerMethod) ? null : listenerObject;
 		dojo.event.kwDisconnect({
-			srcObj:		this, 
-			srcFunc:	"sendMessage", 
+			srcObj:		this,
+			srcFunc:	"sendMessage",
 			adviceObj:	to,
 			adviceFunc: tf
 		});
diff --git a/webapp/src/main/webapp/src/flash.js b/webapp/src/main/webapp/src/flash.js
index 4e85e5f09..43c45e66e 100644
--- a/webapp/src/main/webapp/src/flash.js
+++ b/webapp/src/main/webapp/src/flash.js
@@ -14,101 +14,101 @@ dojo.require("dojo.string.*");
 dojo.require("dojo.uri.*");
 
 
-/** 
+/**
 		The goal of dojo.flash is to make it easy to extend Flash's capabilities
-		into an AJAX/DHTML environment. Robust, performant, reliable 
+		into an AJAX/DHTML environment. Robust, performant, reliable
 		JavaScript/Flash communication is harder than most realize when they
 		delve into the topic, especially if you want it
 		to work on Internet Explorer, Firefox, and Safari, and to be able to
 		push around hundreds of K of information quickly. Dojo.flash makes it
 		possible to support these platforms; you have to jump through a few
-		hoops to get its capabilites, but if you are a library writer 
+		hoops to get its capabilites, but if you are a library writer
 		who wants to bring Flash's storage or streaming sockets ability into
 		DHTML, for example, then dojo.flash is perfect for you.
-  
-		Dojo.flash provides an easy object for interacting with the Flash plugin. 
+
+		Dojo.flash provides an easy object for interacting with the Flash plugin.
 		This object provides methods to determine the current version of the Flash
-		plugin (dojo.flash.info); execute Flash instance methods 
+		plugin (dojo.flash.info); execute Flash instance methods
 		independent of the Flash version
-		being used (dojo.flash.comm); write out the necessary markup to 
-		dynamically insert a Flash object into the page (dojo.flash.Embed; and 
-		do dynamic installation and upgrading of the current Flash plugin in 
+		being used (dojo.flash.comm); write out the necessary markup to
+		dynamically insert a Flash object into the page (dojo.flash.Embed; and
+		do dynamic installation and upgrading of the current Flash plugin in
 		use (dojo.flash.Install).
-		
-		To use dojo.flash, you must first wait until Flash is finished loading 
-		and initializing before you attempt communication or interaction. 
+
+		To use dojo.flash, you must first wait until Flash is finished loading
+		and initializing before you attempt communication or interaction.
 		To know when Flash is finished use dojo.event.connect:
-		
+
 		dojo.event.connect(dojo.flash, "loaded", myInstance, "myCallback");
-		
+
 		Then, while the page is still loading provide the file name
 		and the major version of Flash that will be used for Flash/JavaScript
-		communication (see "Flash Communication" below for information on the 
-		different kinds of Flash/JavaScript communication supported and how they 
+		communication (see "Flash Communication" below for information on the
+		different kinds of Flash/JavaScript communication supported and how they
 		depend on the version of Flash installed):
-		
+
 		dojo.flash.setSwf({flash6: "src/storage/storage_flash6.swf",
 											 flash8: "src/storage/storage_flash8.swf"});
-		
+
 		This will cause dojo.flash to pick the best way of communicating
 		between Flash and JavaScript based on the platform.
-		
+
 		If no SWF files are specified, then Flash is not initialized.
-		
+
 		Your Flash must use DojoExternalInterface to expose Flash methods and
 		to call JavaScript; see "Flash Communication" below for details.
-		
+
 		setSwf can take an optional 'visible' attribute to control whether
 		the Flash object is visible or not on the page; the default is visible:
-		
+
 		dojo.flash.setSwf({flash6: "src/storage/storage_flash6.swf",
 											 flash8: "src/storage/storage_flash8.swf",
 											 visible: false});
-		
+
 		Once finished, you can query Flash version information:
-		
+
 		dojo.flash.info.version
-		
+
 		Or can communicate with Flash methods that were exposed:
-		
+
 		var results = dojo.flash.comm.sayHello("Some Message");
-		
+
 		Only string values are currently supported for both arguments and
 		for return results. Everything will be cast to a string on both
 		the JavaScript and Flash sides.
-		
+
 		-------------------
 		Flash Communication
 		-------------------
-		
-		dojo.flash allows Flash/JavaScript communication in 
+
+		dojo.flash allows Flash/JavaScript communication in
 		a way that can pass large amounts of data back and forth reliably and
 		very fast. The dojo.flash
 		framework encapsulates the specific way in which this communication occurs,
 		presenting a common interface to JavaScript irrespective of the underlying
 		Flash version.
-		
+
 		There are currently three major ways to do Flash/JavaScript communication
 		in the Flash community:
-		
+
 		1) Flash 6+ - Uses Flash methods, such as SetVariable and TCallLabel,
 		and the fscommand handler to do communication. Strengths: Very fast,
 		mature, and can send extremely large amounts of data; can do
-		synchronous method calls. Problems: Does not work on Safari; works on 
+		synchronous method calls. Problems: Does not work on Safari; works on
 		Firefox/Mac OS X only if Flash 8 plugin is installed; cryptic to work with.
-		
+
 		2) Flash 8+ - Uses ExternalInterface, which provides a way for Flash
 		methods to register themselves for callbacks from JavaScript, and a way
 		for Flash to call JavaScript. Strengths: Works on Safari; elegant to
-		work with; can do synchronous method calls. Problems: Extremely buggy 
+		work with; can do synchronous method calls. Problems: Extremely buggy
 		(fails if there are new lines in the data, for example); performance
 		degrades drastically in O(n^2) time as data grows; locks up the browser while
 		it is communicating; does not work in Internet Explorer if Flash
 		object is dynamically added to page with document.writeln, DOM methods,
 		or innerHTML.
-		
-		3) Flash 6+ - Uses two seperate Flash applets, one that we 
-		create over and over, passing input data into it using the PARAM tag, 
+
+		3) Flash 6+ - Uses two seperate Flash applets, one that we
+		create over and over, passing input data into it using the PARAM tag,
 		which then uses a Flash LocalConnection to pass the data to the main Flash
 		applet; communication back to Flash is accomplished using a getURL
 		call with a javascript protocol handler, such as "javascript:myMethod()".
@@ -116,7 +116,7 @@ dojo.require("dojo.uri.*");
 		of Flash communication known; works on Safari. Problems: Timing issues;
 		clunky and complicated; slow; can only send very small amounts of
 		data (several K); all method calls are asynchronous.
-		
+
 		dojo.flash.comm uses only the first two methods. This framework
 		was created primarily for dojo.storage, which needs to pass very large
 		amounts of data synchronously and reliably across the Flash/JavaScript
@@ -124,42 +124,42 @@ dojo.require("dojo.uri.*");
 		that support it, while using the Flash 8 ExternalInterface method
 		only on Safari with some special code to help correct ExternalInterface's
 		bugs.
-		
+
 		Since dojo.flash needs to have two versions of the Flash
 		file it wants to generate, a Flash 6 and a Flash 8 version to gain
 		true cross-browser compatibility, several tools are provided to ease
 		development on the Flash side.
-		
+
 		In your Flash file, if you want to expose Flash methods that can be
 		called, use the DojoExternalInterface class to register methods. This
 		class is an exact API clone of the standard ExternalInterface class, but
 		can work in Flash 6+ browsers. Under the covers it uses the best
 		mechanism to do communication:
-		
+
 		class HelloWorld{
 			function HelloWorld(){
 				// Initialize the DojoExternalInterface class
 				DojoExternalInterface.initialize();
-				
+
 				// Expose your methods
 				DojoExternalInterface.addCallback("sayHello", this, this.sayHello);
-				
+
 				// Tell JavaScript that you are ready to have method calls
 				DojoExternalInterface.loaded();
-				
+
 				// Call some JavaScript
 				var resultsReady = function(results){
 					trace("Received the following results from JavaScript: " + results);
 				}
-				DojoExternalInterface.call("someJavaScriptMethod", resultsReady, 
+				DojoExternalInterface.call("someJavaScriptMethod", resultsReady,
 																	 someParameter);
 			}
-			
+
 			function sayHello(){ ... }
-			
+
 			static main(){ ... }
 		}
-		
+
 		DojoExternalInterface adds two new functions to the ExternalInterface
 		API: initialize() and loaded(). initialize() must be called before
 		any addCallback() or call() methods are run, and loaded() must be
@@ -167,71 +167,71 @@ dojo.require("dojo.uri.*");
 		will fire the dojo.flash.loaded() event, so that JavaScript can know that
 		Flash has finished loading and adding its callbacks, and can begin to
 		interact with the Flash file.
-		
+
 		To generate your SWF files, use the ant task
-		"buildFlash". You must have the open source Motion Twin ActionScript 
+		"buildFlash". You must have the open source Motion Twin ActionScript
 		compiler (mtasc) installed and in your path to use the "buildFlash"
 		ant task; download and install mtasc from http://www.mtasc.org/.
-		
-		
-		
+
+
+
 		buildFlash usage:
-		
+
 		ant buildFlash -Ddojo.flash.file=../tests/flash/HelloWorld.as
-		
-		where "dojo.flash.file" is the relative path to your Flash 
+
+		where "dojo.flash.file" is the relative path to your Flash
 		ActionScript file.
-		
+
 		This will generate two SWF files, one ending in _flash6.swf and the other
 		ending in _flash8.swf in the same directory as your ActionScript method:
-		
+
 		HelloWorld_flash6.swf
 		HelloWorld_flash8.swf
-		
+
 		Initialize dojo.flash with the filename and Flash communication version to
 		use during page load; see the documentation for dojo.flash for details:
-		
+
 		dojo.flash.setSwf({flash6: "tests/flash/HelloWorld_flash6.swf",
 											 flash8: "tests/flash/HelloWorld_flash8.swf"});
-		
+
 		Now, your Flash methods can be called from JavaScript as if they are native
 		Flash methods, mirrored exactly on the JavaScript side:
-		
+
 		dojo.flash.comm.sayHello();
-		
+
 		Only Strings are supported being passed back and forth currently.
-		
+
 		JavaScript to Flash communication is synchronous; i.e., results are returned
 		directly from the method call:
-		
+
 		var results = dojo.flash.comm.sayHello();
-		
+
 		Flash to JavaScript communication is asynchronous due to limitations in
 		the underlying technologies; you must use a results callback to handle
 		results returned by JavaScript in your Flash AS files:
-		
+
 		var resultsReady = function(results){
 			trace("Received the following results from JavaScript: " + results);
 		}
 		DojoExternalInterface.call("someJavaScriptMethod", resultsReady);
-		
-		
-		
+
+
+
 		-------------------
 		Notes
 		-------------------
-		
+
 		If you have both Flash 6 and Flash 8 versions of your file:
-		
+
 		dojo.flash.setSwf({flash6: "tests/flash/HelloWorld_flash6.swf",
 											 flash8: "tests/flash/HelloWorld_flash8.swf"});
-											 
+
 		but want to force the browser to use a certain version of Flash for
 		all platforms (for testing, for example), use the djConfig
 		variable 'forceFlashComm' with the version number to force:
-		
+
 		var djConfig = { forceFlashComm: 6 };
-		
+
 		Two values are currently supported, 6 and 8, for the two styles of
 		communication described above. Just because you force dojo.flash
 		to use a particular communication style is no guarantee that it will
@@ -240,40 +240,40 @@ dojo.require("dojo.uri.*");
 		in Safari. It is best to let dojo.flash determine the best communication
 		mechanism, and to use the value above only for debugging the dojo.flash
 		framework itself.
-		
+
 		Also note that dojo.flash can currently only work with one Flash object
 		on the page; it and the API do not yet support multiple Flash objects on
 		the same page.
-		
+
 		We use some special tricks to get decent, linear performance
 		out of Flash 8's ExternalInterface on Safari; see the blog
-		post 
+		post
 		http://codinginparadise.org/weblog/2006/02/how-to-speed-up-flash-8s.html
 		for details.
-		
+
 		Your code can detect whether the Flash player is installing or having
 		its version revved in two ways. First, if dojo.flash detects that
 		Flash installation needs to occur, it sets dojo.flash.info.installing
 		to true. Second, you can detect if installation is necessary with the
 		following callback:
-		
+
 		dojo.event.connect(dojo.flash, "installing", myInstance, "myCallback");
-		
+
 		You can use this callback to delay further actions that might need Flash;
 		when installation is finished the full page will be refreshed and the
 		user will be placed back on your page with Flash installed.
-		
+
 		Two utility methods exist if you want to add loading and installing
 		listeners without creating dependencies on dojo.event; these are
 		'addLoadingListener' and 'addInstallingListener'.
-		
+
 		-------------------
 		Todo/Known Issues
 		-------------------
 
 		There are several tasks I was not able to do, or did not need to fix
-		to get dojo.storage out:		
-		
+		to get dojo.storage out:
+
 		* When using Flash 8 communication, Flash method calls to JavaScript
 		are not working properly; serialization might also be broken for certain
 		invalid characters when it is Flash invoking JavaScript methods.
@@ -282,14 +282,14 @@ dojo.require("dojo.uri.*");
 		test_flash2.html unit tests should also be updated to have much more
 		sophisticated Flash to JavaScript unit tests, including large
 		amounts of data.
-		
+
 		* On Internet Explorer, after doing a basic install, the page is
 		not refreshed or does not detect that Flash is now available. The way
 		to fix this is to create a custom small Flash file that is pointed to
 		during installation; when it is finished loading, it does a callback
 		that says that Flash installation is complete on IE, and we can proceed
 		to initialize the dojo.flash subsystem.
-		
+
 		@author Brad Neuberg, bkn3@columbia.edu
 */
 
@@ -300,43 +300,43 @@ dojo.flash = {
 	_visible: true,
 	_loadedListeners: new Array(),
 	_installingListeners: new Array(),
-	
+
 	/** Sets the SWF files and versions we are using. */
 	setSwf: function(fileInfo){
 		//dojo.debug("setSwf");
 		if(fileInfo == null || dojo.lang.isUndefined(fileInfo)){
 			return;
 		}
-		
+
 		if(fileInfo.flash6 != null && !dojo.lang.isUndefined(fileInfo.flash6)){
 			this.flash6_version = fileInfo.flash6;
 		}
-		
+
 		if(fileInfo.flash8 != null && !dojo.lang.isUndefined(fileInfo.flash8)){
 			this.flash8_version = fileInfo.flash8;
 		}
-		
+
 		if(!dojo.lang.isUndefined(fileInfo.visible)){
 			this._visible = fileInfo.visible;
 		}
-		
-		// initialize ourselves		
+
+		// initialize ourselves
 		this._initialize();
 	},
-	
+
 	/** Returns whether we are using Flash 6 for communication on this platform. */
 	useFlash6: function(){
 		if(this.flash6_version == null){
 			return false;
 		}else if (this.flash6_version != null && dojo.flash.info.commVersion == 6){
-			// if we have a flash 6 version of this SWF, and this browser supports 
+			// if we have a flash 6 version of this SWF, and this browser supports
 			// communicating using Flash 6 features...
 			return true;
 		}else{
 			return false;
 		}
 	},
-	
+
 	/** Returns whether we are using Flash 8 for communication on this platform. */
 	useFlash8: function(){
 		if(this.flash8_version == null){
@@ -349,24 +349,24 @@ dojo.flash = {
 			return false;
 		}
 	},
-	
-	/** Adds a listener to know when Flash is finished loading. 
+
+	/** Adds a listener to know when Flash is finished loading.
 			Useful if you don't want a dependency on dojo.event. */
 	addLoadedListener: function(listener){
 		this._loadedListeners.push(listener);
 	},
 
-	/** Adds a listener to know if Flash is being installed. 
+	/** Adds a listener to know if Flash is being installed.
 			Useful if you don't want a dependency on dojo.event. */
 	addInstallingListener: function(listener){
 		this._installingListeners.push(listener);
-	},	
-	
-	/** 
+	},
+
+	/**
 			A callback when the Flash subsystem is finished loading and can be
 			worked with. To be notified when Flash is finished loading, connect
 			your callback to this method using the following:
-			
+
 			dojo.event.connect(dojo.flash, "loaded", myInstance, "myCallback");
 	*/
 	loaded: function(){
@@ -378,12 +378,12 @@ dojo.flash = {
 			}
 		}
 	},
-	
-	/** 
+
+	/**
 			A callback to know if Flash is currently being installed or
 			having its version revved. To be notified if Flash is installing, connect
 			your callback to this method using the following:
-			
+
 			dojo.event.connect(dojo.flash, "installing", myInstance, "myCallback");
 	*/
 	installing: function(){
@@ -394,7 +394,7 @@ dojo.flash = {
 			}
 		}
 	},
-	
+
 	/** Initializes dojo.flash. */
 	_initialize: function(){
 		//dojo.debug("dojo.flash._initialize");
@@ -402,14 +402,14 @@ dojo.flash = {
 		var installer = new dojo.flash.Install();
 		dojo.flash.installer = installer;
 
-		if(installer.needed() == true){		
+		if(installer.needed() == true){
 			installer.install();
 		}else{
 			//dojo.debug("Writing object out");
 			// write the flash object into the page
 			dojo.flash.obj = new dojo.flash.Embed(this._visible);
 			dojo.flash.obj.write(dojo.flash.info.commVersion);
-			
+
 			// initialize the way we do Flash/JavaScript communication
 			dojo.flash.comm = new dojo.flash.Communicator();
 		}
@@ -417,20 +417,20 @@ dojo.flash = {
 };
 
 
-/** 
+/**
 		A class that helps us determine whether Flash is available,
 		it's major and minor versions, and what Flash version features should
 		be used for Flash/JavaScript communication. Parts of this code
-		are adapted from the automatic Flash plugin detection code autogenerated 
-		by the Macromedia Flash 8 authoring environment. 
-		
+		are adapted from the automatic Flash plugin detection code autogenerated
+		by the Macromedia Flash 8 authoring environment.
+
 		An instance of this class can be accessed on dojo.flash.info after
 		the page is finished loading.
-		
-		This constructor must be called before the page is finished loading. 
+
+		This constructor must be called before the page is finished loading.
 */
 dojo.flash.Info = function(){
-	// Visual basic helper required to detect Flash Player ActiveX control 
+	// Visual basic helper required to detect Flash Player ActiveX control
 	// version information on Internet Explorer
 	if(dojo.render.html.ie){
 		document.writeln('<script language="VBScript" type="text/vbscript"\>');
@@ -446,7 +446,7 @@ dojo.flash.Info = function(){
 		document.writeln('End Function');
 		document.writeln('</script\>');
 	}
-	
+
 	this._detectVersion();
 	this._detectCommunicationVersion();
 }
@@ -454,47 +454,47 @@ dojo.flash.Info = function(){
 dojo.flash.Info.prototype = {
 	/** The full version string, such as "8r22". */
 	version: -1,
-	
-	/** 
+
+	/**
 			The major, minor, and revisions of the plugin. For example, if the
 			plugin is 8r22, then the major version is 8, the minor version is 0,
-			and the revision is 22. 
+			and the revision is 22.
 	*/
 	versionMajor: -1,
 	versionMinor: -1,
 	versionRevision: -1,
-	
+
 	/** Whether this platform has Flash already installed. */
 	capable: false,
-	
-	/** 
+
+	/**
 			The major version number for how our Flash and JavaScript communicate.
 			This can currently be the following values:
 			6 - We use a combination of the Flash plugin methods, such as SetVariable
 			and TCallLabel, along with fscommands, to do communication.
-			8 - We use the ExternalInterface API. 
+			8 - We use the ExternalInterface API.
 			-1 - For some reason neither method is supported, and no communication
-			is possible. 
+			is possible.
 	*/
 	commVersion: 6,
-	
+
 	/** Set if we are in the middle of a Flash installation session. */
 	installing: false,
-	
-	/** 
+
+	/**
 			Asserts that this environment has the given major, minor, and revision
 			numbers for the Flash player. Returns true if the player is equal
 			or above the given version, false otherwise.
-			
+
 			Example: To test for Flash Player 7r14:
-			
+
 			dojo.flash.info.isVersionOrAbove(7, 0, 14)
 	*/
 	isVersionOrAbove: function(reqMajorVer, reqMinorVer, reqVer){
 		// make the revision a decimal (i.e. transform revision 14 into
 		// 0.14
 		reqVer = parseFloat("." + reqVer);
-		
+
 		if(this.versionMajor >= reqMajorVer && this.versionMinor >= reqMinorVer
 			 && this.versionRevision >= reqVer){
 			return true;
@@ -502,20 +502,20 @@ dojo.flash.Info.prototype = {
 			return false;
 		}
 	},
-	
+
 	_detectVersion: function(){
 		var versionStr;
-		
-		// loop backwards through the versions until we find the newest version	
+
+		// loop backwards through the versions until we find the newest version
 		for(var testVersion = 25; testVersion > 0; testVersion--){
 			if(dojo.render.html.ie){
 				versionStr = VBGetSwfVer(testVersion);
 			}else{
-				versionStr = this._JSFlashInfo(testVersion);		
+				versionStr = this._JSFlashInfo(testVersion);
 			}
-				
+
 			if(versionStr == -1 ){
-				this.capable = false; 
+				this.capable = false;
 				return;
 			}else if(versionStr != 0){
 				var versionArray;
@@ -526,31 +526,31 @@ dojo.flash.Info.prototype = {
 				}else{
 					versionArray = versionStr.split(".");
 				}
-					
+
 				this.versionMajor = versionArray[0];
 				this.versionMinor = versionArray[1];
 				this.versionRevision = versionArray[2];
-				
+
 				// 7.0r24 == 7.24
 				var versionString = this.versionMajor + "." + this.versionRevision;
 				this.version = parseFloat(versionString);
-				
+
 				this.capable = true;
-				
+
 				break;
 			}
 		}
 	},
-	
-	/** 
-			JavaScript helper required to detect Flash Player PlugIn version 
+
+	/**
+			JavaScript helper required to detect Flash Player PlugIn version
 			information. Internet Explorer uses a corresponding Visual Basic
-			version to interact with the Flash ActiveX control. 
+			version to interact with the Flash ActiveX control.
 	*/
 	_JSFlashInfo: function(testVersion){
 		// NS/Opera version >= 3 check for Flash plugin in plugin array
 		if(navigator.plugins != null && navigator.plugins.length > 0){
-			if(navigator.plugins["Shockwave Flash 2.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;
@@ -564,39 +564,39 @@ dojo.flash.Info.prototype = {
 					var tempArrayMinor = descArray[4].split("r");
 				}
 				var versionRevision = tempArrayMinor[1] > 0 ? tempArrayMinor[1] : 0;
-				var version = versionMajor + "." + versionMinor + "." 
+				var version = versionMajor + "." + versionMinor + "."
 											+ versionRevision;
-											
+
 				return version;
 			}
 		}
-		
+
 		return -1;
 	},
-	
-	/** 
-			Detects the mechanisms that should be used for Flash/JavaScript 
+
+	/**
+			Detects the mechanisms that should be used for Flash/JavaScript
 			communication, setting 'commVersion' to either 6 or 8. If the value is
 			6, we use Flash Plugin 6+ features, such as GetVariable, TCallLabel,
 			and fscommand, to do Flash/JavaScript communication; if the value is
-			8, we use the ExternalInterface API for communication. 
+			8, we use the ExternalInterface API for communication.
 	*/
 	_detectCommunicationVersion: function(){
 		if(this.capable == false){
 			this.commVersion = null;
 			return;
 		}
-		
+
 		// detect if the user has over-ridden the default flash version
 		if (typeof djConfig["forceFlashComm"] != "undefined" &&
 				typeof djConfig["forceFlashComm"] != null){
 			this.commVersion = djConfig["forceFlashComm"];
 			return;
 		}
-		
+
 		// we prefer Flash 6 features over Flash 8, because they are much faster
 		// and much less buggy
-		
+
 		// at this point, we don't have a flash file to detect features on,
 		// so we need to instead look at the browser environment we are in
 		if(dojo.render.html.safari == true || dojo.render.html.opera == true){
@@ -613,27 +613,27 @@ dojo.flash.Embed = function(visible){
 }
 
 dojo.flash.Embed.prototype = {
-	/** 
+	/**
 			The width of this Flash applet. The default is the minimal width
-			necessary to show the Flash settings dialog. 
+			necessary to show the Flash settings dialog.
 	*/
 	width: 215,
-	
-	/** 
+
+	/**
 			The height of this Flash applet. The default is the minimal height
-			necessary to show the Flash settings dialog. 
+			necessary to show the Flash settings dialog.
 	*/
 	height: 138,
-	
+
 	/** The id of the Flash object. */
 	id: "flashObject",
-	
+
 	/** Controls whether this is a visible Flash applet or not. */
 	_visible: true,
-			
-	/** 
+
+	/**
 			Writes the Flash into the page. This must be called before the page
-			is finished loading. 
+			is finished loading.
 			@param flashVer The Flash version to write.
 			@param doExpressInstall Whether to write out Express Install
 			information. Optional value; defaults to false.
@@ -643,7 +643,7 @@ dojo.flash.Embed.prototype = {
 		if(dojo.lang.isUndefined(doExpressInstall)){
 			doExpressInstall = false;
 		}
-		
+
 		// determine our container div's styling
 		var containerStyle = new dojo.string.Builder();
 		containerStyle.append("width: " + this.width + "px; ");
@@ -665,8 +665,8 @@ dojo.flash.Embed.prototype = {
 			swfloc = dojo.flash.flash6_version;
 			var dojoPath = djConfig.baseRelativePath;
 			swfloc = swfloc + "?baseRelativePath=" + escape(dojoPath);
-			
-			objectHTML = 
+
+			objectHTML =
 						  '<embed id="' + this.id + '" src="' + swfloc + '" '
 						+ '    quality="high" bgcolor="#ffffff" '
 						+ '    width="' + this.width + '" height="' + this.height + '" '
@@ -688,11 +688,11 @@ dojo.flash.Embed.prototype = {
 				                + "&MMplayerType=ActiveX"
 				                + "&MMdoctitle=" + docTitle
 								+ "&baseRelativePath=" + escape(dojoPath);
-				swflocEmbed += "?MMredirectURL=" + redirectURL 
+				swflocEmbed += "?MMredirectURL=" + redirectURL
 								+ "&MMplayerType=PlugIn"
 								+ "&baseRelativePath=" + escape(dojoPath);
 			}
-			
+
 			objectHTML =
 				'<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" '
 				  + 'codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" '
@@ -724,17 +724,17 @@ dojo.flash.Embed.prototype = {
 						+ objectHTML
 					 + '</div>';
 		document.writeln(objectHTML);
-	},  
-	
+	},
+
 	/** Gets the Flash object DOM node. */
 	get: function(){
 		//return (dojo.render.html.ie) ? window[this.id] : document[this.id];
-		
+
 		// more robust way to get Flash object; version above can break
 		// communication on IE sometimes
 		return document.getElementById(this.id);
 	},
-	
+
 	/** Sets the visibility of this Flash object. */
 	setVisible: function(visible){
 		var container = dojo.byId(this.id + "Container");
@@ -747,20 +747,20 @@ dojo.flash.Embed.prototype = {
 			container.style.visibility = "hidden";
 		}
 	},
-	
+
 	/** Centers the flash applet on the page. */
 	center: function(){
 		// FIXME: replace this with Dojo's centering code rather than our own
 		// We want to center the Flash applet vertically and horizontally
 		var elementWidth = this.width;
 		var elementHeight = this.height;
-    
+
 		// get the browser width and height; the code below
 		// works in IE and Firefox in compatibility, non-strict
 		// mode
 		var browserWidth = document.body.clientWidth;
 		var browserHeight = document.body.clientHeight;
-    
+
 		// in Firefox if we are in standards compliant mode
 		// (with a strict doctype), then the browser width
 		// and height have to be computed from the root level
@@ -776,7 +776,7 @@ dojo.flash.Embed.prototype = {
 		}else if(dojo.render.html.safari){ // Safari works different
 			browserHeight = self.innerHeight;
 		}
-    
+
 		// get where we are scrolled to in the document
 		// the code below works in FireFox
 		var scrolledByWidth = window.scrollX;
@@ -794,9 +794,9 @@ dojo.flash.Embed.prototype = {
 			}
 		}
 
-		// compute the centered position    
+		// compute the centered position
 		var x = scrolledByWidth + (browserWidth - elementWidth) / 2;
-		var y = scrolledByHeight + (browserHeight - elementHeight) / 2; 
+		var y = scrolledByHeight + (browserHeight - elementHeight) / 2;
 
 		// set the centered position
 		var container = dojo.byId(this.id + "Container");
@@ -806,10 +806,10 @@ dojo.flash.Embed.prototype = {
 };
 
 
-/** 
-		A class that is used to communicate between Flash and JavaScript in 
+/**
+		A class that is used to communicate between Flash and JavaScript in
 		a way that can pass large amounts of data back and forth reliably,
-		very fast, and with synchronous method calls. This class encapsulates the 
+		very fast, and with synchronous method calls. This class encapsulates the
 		specific way in which this communication occurs,
 		presenting a common interface to JavaScript irrespective of the underlying
 		Flash version.
@@ -825,7 +825,7 @@ dojo.flash.Communicator = function(){
 dojo.flash.Communicator.prototype = {
 	_writeFlash6: function(){
 		var id = dojo.flash.obj.id;
-		
+
 		// global function needed for Flash 6 callback;
 		// we write it out as a script tag because the VBScript hook for IE
 		// callbacks does not work properly if this function is evalled() from
@@ -835,7 +835,7 @@ dojo.flash.Communicator.prototype = {
 		document.writeln('    dojo.flash.comm._handleFSCommand(command, args); ');
 		document.writeln('}');
 		document.writeln('</script>');
-		
+
 		// hook for Internet Explorer to receive FSCommands from Flash
 		if(dojo.render.html.ie){
 			document.writeln('<SCRIPT LANGUAGE=VBScript\> ');
@@ -846,14 +846,14 @@ dojo.flash.Communicator.prototype = {
 			document.writeln('</SCRIPT\> ');
 		}
 	},
-	
+
 	_writeFlash8: function(){
-		// nothing needs to be written out for Flash 8 communication; 
+		// nothing needs to be written out for Flash 8 communication;
 		// happens automatically
 	},
-	
+
 	/** Flash 6 communication. */
-	
+
 	/** Handles fscommand's from Flash to JavaScript. Flash 6 communication. */
 	_handleFSCommand: function(command, args){
 		//dojo.debug("fscommand, command="+command+", args="+args);
@@ -863,7 +863,7 @@ dojo.flash.Communicator.prototype = {
 			&& /^FSCommand:(.*)/.test(command) == true){
 			command = command.match(/^FSCommand:(.*)/)[1];
 		}
-		 
+
 		if(command == "addCallback"){ // add Flash method for JavaScript callback
 			this._fscommandAddCallback(command, args);
 		}else if(command == "call"){ // Flash to JavaScript method call
@@ -872,27 +872,27 @@ dojo.flash.Communicator.prototype = {
 			this._fscommandReady();
 		}
 	},
-	
+
 	/** Handles registering a callable Flash function. Flash 6 communication. */
 	_fscommandAddCallback: function(command, args){
 		var functionName = args;
-			
+
 		// do a trick, where we link this function name to our wrapper
 		// function, _call, that does the actual JavaScript to Flash call
 		var callFunc = function(){
 			return dojo.flash.comm._call(functionName, arguments);
-		};			
+		};
 		dojo.flash.comm[functionName] = callFunc;
-		
+
 		// indicate that the call was successful
 		dojo.flash.obj.get().SetVariable("_succeeded", true);
 	},
-	
+
 	/** Handles Flash calling a JavaScript function. Flash 6 communication. */
 	_fscommandCall: function(command, args){
 		var plugin = dojo.flash.obj.get();
 		var functionName = args;
-		
+
 		// get the number of arguments to this method call and build them up
 		var numArgs = parseInt(plugin.GetVariable("_numArgs"));
 		var flashArgs = new Array();
@@ -900,7 +900,7 @@ dojo.flash.Communicator.prototype = {
 			var currentArg = plugin.GetVariable("_" + i);
 			flashArgs.push(currentArg);
 		}
-		
+
 		// get the function instance; we technically support more capabilities
 		// than ExternalInterface, which can only call global functions; if
 		// the method name has a dot in it, such as "dojo.flash.loaded", we
@@ -912,26 +912,26 @@ dojo.flash.Communicator.prototype = {
 			// instance function
 			runMe = eval(functionName);
 		}
-		
+
 		// make the call and get the results
 		var results = null;
 		if(!dojo.lang.isUndefined(runMe) && runMe != null){
 			results = runMe.apply(null, flashArgs);
 		}
-		
+
 		// return the results to flash
 		plugin.SetVariable("_returnResult", results);
 	},
-	
+
 	/** Reports that fscommands are ready to run if executed from Flash. */
 	_fscommandReady: function(){
 		var plugin = dojo.flash.obj.get();
 		plugin.SetVariable("fscommandReady", "true");
 	},
-	
-	/** 
+
+	/**
 			The actual function that will execute a JavaScript to Flash call; used
-			by the Flash 6 communication method. 
+			by the Flash 6 communication method.
 	*/
 	_call: function(functionName, args){
 		// we do JavaScript to Flash method calls by setting a Flash variable
@@ -945,32 +945,32 @@ dojo.flash.Communicator.prototype = {
 		for(var i = 0; i < args.length; i++){
 			// unlike Flash 8's ExternalInterface, Flash 6 has no problem with
 			// any special characters _except_ for the null character \0; double
-			// encode this so the Flash side never sees it, but we can get it 
+			// encode this so the Flash side never sees it, but we can get it
 			// back if the value comes back to JavaScript
 			var value = args[i];
 			value = value.replace(/\0/g, "\\0");
-			
+
 			plugin.SetVariable("_" + i, value);
 		}
-		
+
 		// now tell Flash to execute this method using the Flash Runner
 		plugin.TCallLabel("/_flashRunner", "execute");
-		
+
 		// get the results
 		var results = plugin.GetVariable("_returnResult");
-		
+
 		// we double encoded all null characters as //0 because Flash breaks
 		// if they are present; turn the //0 back into /0
 		results = results.replace(/\\0/g, "\0");
-		
+
 		return results;
 	},
-	
+
 	/** Flash 8 communication. */
-	
-	/** 
+
+	/**
 			Registers the existence of a Flash method that we can call with
-			JavaScript, using Flash 8's ExternalInterface. 
+			JavaScript, using Flash 8's ExternalInterface.
 	*/
 	_addExternalInterfaceCallback: function(methodName){
 		var wrapperCall = function(){
@@ -982,11 +982,11 @@ dojo.flash.Communicator.prototype = {
 			}
 			return dojo.flash.comm._execFlash(methodName, methodArgs);
 		};
-		
+
 		dojo.flash.comm[methodName] = wrapperCall;
 	},
-	
-	/** 
+
+	/**
 			Encodes our data to get around ExternalInterface bugs.
 			Flash 8 communication.
 	*/
@@ -995,26 +995,26 @@ dojo.flash.Communicator.prototype = {
 		// by Flash when returned
 		var entityRE = /\&([^;]*)\;/g;
 		data = data.replace(entityRE, "&amp;$1;");
-		
+
 		// entity encode XML-ish characters, or Flash's broken XML serializer
 		// breaks
 		data = data.replace(/</g, "&lt;");
 		data = data.replace(/>/g, "&gt;");
-		
+
 		// transforming \ into \\ doesn't work; just use a custom encoding
 		data = data.replace("\\", "&custom_backslash;&custom_backslash;");
-		
+
 		data = data.replace(/\n/g, "\\n");
 		data = data.replace(/\r/g, "\\r");
 		data = data.replace(/\f/g, "\\f");
 		data = data.replace(/\0/g, "\\0"); // null character
 		data = data.replace(/\'/g, "\\\'");
 		data = data.replace(/\"/g, '\\\"');
-		
+
 		return data;
 	},
-	
-	/** 
+
+	/**
 			Decodes our data to get around ExternalInterface bugs.
 			Flash 8 communication.
 	*/
@@ -1022,34 +1022,34 @@ dojo.flash.Communicator.prototype = {
 		if(data == null || typeof data == "undefined"){
 			return data;
 		}
-		
+
 		// certain XMLish characters break Flash's wire serialization for
-		// ExternalInterface; these are encoded on the 
+		// ExternalInterface; these are encoded on the
 		// DojoExternalInterface side into a custom encoding, rather than
 		// the standard entity encoding, because otherwise we won't be able to
 		// differentiate between our own encoding and any entity characters
 		// that are being used in the string itself
 		data = data.replace(/\&custom_lt\;/g, "<");
 		data = data.replace(/\&custom_gt\;/g, ">");
-		
+
 		// Unfortunately, Flash returns us our String with special characters
 		// like newlines broken into seperate characters. So if \n represents
 		// a new line, Flash returns it as "\" and "n". This means the character
 		// is _not_ a newline. This forces us to eval() the string to cause
 		// escaped characters to turn into their real special character values.
 		data = eval('"' + data + '"');
-		
+
 		return data;
 	},
-	
-	/** 
+
+	/**
 			Sends our method arguments over to Flash in chunks in order to
 			have ExternalInterface's performance not be O(n^2).
 			Flash 8 communication.
 	*/
 	_chunkArgumentData: function(value, argIndex){
 		var plugin = dojo.flash.obj.get();
-		
+
 		// cut up the string into pieces, and push over each piece one
 		// at a time
 		var numSegments = Math.ceil(value.length / 1024);
@@ -1059,17 +1059,17 @@ dojo.flash.Communicator.prototype = {
 			if(i == (numSegments - 1)){
 				endCut = i * 1024 + value.length;
 			}
-			
+
 			var piece = value.substring(startCut, endCut);
-			
+
 			// encode each piece seperately, rather than the entire
-			// argument data, because ocassionally a special 
+			// argument data, because ocassionally a special
 			// character, such as an entity like &foobar;, will fall between
 			// piece boundaries, and we _don't_ want to encode that value if
 			// it falls between boundaries, or else we will end up with incorrect
 			// data when we patch the pieces back together on the other side
 			piece = this._encodeData(piece);
-			
+
 			// directly use the underlying CallFunction method used by
 			// ExternalInterface, which is vastly faster for large strings
 			// and lets us bypass some Flash serialization bugs
@@ -1082,27 +1082,27 @@ dojo.flash.Communicator.prototype = {
 														+ '</invoke>');
 		}
 	},
-	
-	/** 
+
+	/**
 			Gets our method return data in chunks for better performance.
 			Flash 8 communication.
 	*/
 	_chunkReturnData: function(){
 		var plugin = dojo.flash.obj.get();
-		
+
 		var numSegments = plugin.getReturnLength();
 		var resultsArray = new Array();
 		for(var i = 0; i < numSegments; i++){
 			// directly use the underlying CallFunction method used by
 			// ExternalInterface, which is vastly faster for large strings
-			var piece = 
+			var piece =
 					plugin.CallFunction('<invoke name="chunkReturnData" '
 															+ 'returntype="javascript">'
 															+ '<arguments>'
 															+ '<number>' + i + '</number>'
 															+ '</arguments>'
 															+ '</invoke>');
-															
+
 			// remove any leading or trailing JavaScript delimiters, which surround
 			// our String when it comes back from Flash since we bypass Flash's
 			// deserialization routines by directly calling CallFunction on the
@@ -1112,51 +1112,51 @@ dojo.flash.Communicator.prototype = {
 			}else{
 				piece = piece.substring(1, piece.length-1);
 			}
-		
+
 			resultsArray.push(piece);
 		}
 		var results = resultsArray.join("");
-		
+
 		return results;
 	},
-	
-	/** 
+
+	/**
 			Executes a Flash method; called from the JavaScript wrapper proxy we
 			create on dojo.flash.comm.
 			Flash 8 communication.
 	*/
 	_execFlash: function(methodName, methodArgs){
 		var plugin = dojo.flash.obj.get();
-				
+
 		// begin Flash method execution
 		plugin.startExec();
-		
+
 		// set the number of arguments
 		plugin.setNumberArguments(methodArgs.length);
-		
+
 		// chunk and send over each argument
 		for(var i = 0; i < methodArgs.length; i++){
 			this._chunkArgumentData(methodArgs[i], i);
 		}
-		
+
 		// execute the method
 		plugin.exec(methodName);
-														
+
 		// get the return result
 		var results = this._chunkReturnData();
-		
+
 		// decode the results
 		results = this._decodeData(results);
-		
+
 		// reset everything
 		plugin.endExec();
-		
+
 		return results;
 
 	}
 }
 
-/** 
+/**
 		Figures out the best way to automatically install the Flash plugin
 		for this browser and platform. Also determines if installation or
 		revving of the current plugin is needed on this platform.
@@ -1165,9 +1165,9 @@ dojo.flash.Install = function(){
 }
 
 dojo.flash.Install.prototype = {
-	/** 
-			Determines if installation or revving of the current plugin is 
-			needed. 
+	/**
+			Determines if installation or revving of the current plugin is
+			needed.
 	*/
 	needed: function(){
 		// do we even have flash?
@@ -1197,7 +1197,7 @@ dojo.flash.Install.prototype = {
 		// indicate that we are installing
 		dojo.flash.info.installing = true;
 		dojo.flash.installing();
-		
+
 		if(dojo.flash.info.capable == false){ // we have no Flash at all
 			//dojo.debug("Completely new install");
 			// write out a simple Flash object to force the browser to prompt
@@ -1216,8 +1216,8 @@ dojo.flash.Install.prototype = {
 			window.location.href = "http://www.macromedia.com/go/getflashplayer";
 		}
 	},
-	
-	/** 
+
+	/**
 			Called when the Express Install is either finished, failed, or was
 			rejected by the user.
 	*/
@@ -1234,7 +1234,7 @@ dojo.flash.Install.prototype = {
 			alert("There was an error downloading the Flash Player update. "
 						+ "Please try again later, or visit macromedia.com to download "
 						+ "the latest version of the Flash plugin.");
-		}	
+		}
 	}
 }
 
diff --git a/webapp/src/main/webapp/src/fx/html.js b/webapp/src/main/webapp/src/fx/html.js
index b36114a6a..c235b7990 100644
--- a/webapp/src/main/webapp/src/fx/html.js
+++ b/webapp/src/main/webapp/src/fx/html.js
@@ -522,7 +522,7 @@ dojo.fx.html.Exploder = function(triggerNode, boxNode) {
 	return this;
 };
 
-/**** 
+/****
 	Strategies for displaying/hiding objects
 	This presents a standard interface for each of the effects
 *****/
diff --git a/webapp/src/main/webapp/src/fx/svg.js b/webapp/src/main/webapp/src/fx/svg.js
index 11097ed27..99942cdb3 100644
--- a/webapp/src/main/webapp/src/fx/svg.js
+++ b/webapp/src/main/webapp/src/fx/svg.js
@@ -55,7 +55,7 @@ dojo.fx.svg.fade = function(node, duration, startOpac, endOpac, callback){
 //	SLIDES
 dojo.fx.svg.slideTo = function(node, endCoords, duration, callback) { };
 dojo.fx.svg.slideBy = function(node, coords, duration, callback) { };
-dojo.fx.svg.slide = function(node, startCoords, endCoords, duration, callback) { 
+dojo.fx.svg.slide = function(node, startCoords, endCoords, duration, callback) {
 	var anim = new dojo.animation.Animation(
 		new dojo.math.curves.Line([startCoords],[endCoords]),
 		duration,
diff --git a/webapp/src/main/webapp/src/graphics/Colorspace.js b/webapp/src/main/webapp/src/graphics/Colorspace.js
index 9abd696bd..e70224cd6 100644
--- a/webapp/src/main/webapp/src/graphics/Colorspace.js
+++ b/webapp/src/main/webapp/src/graphics/Colorspace.js
@@ -781,7 +781,7 @@ dojo.graphics.Colorspace.prototype.RGB_to_HSV = function(){
 	var src = this.munge('RGB', arguments);
 
 	// Based on C Code in "Computer Graphics -- Principles and Practice,"
-	// Foley et al, 1996, p. 592. 
+	// Foley et al, 1996, p. 592.
 
 	var min = Math.min(src.R, src.G, src.B);
 	var V = Math.max(src.R, src.G, src.B);
@@ -817,7 +817,7 @@ dojo.graphics.Colorspace.prototype.RGB_to_HSV = function(){
 }
 
 dojo.graphics.Colorspace.prototype.HSV_to_RGB = function(){
- 
+
 	var src = this.munge('HSV', arguments);
 
 	if (src.H == 360){ src.H = 0;}
@@ -898,7 +898,7 @@ dojo.graphics.Colorspace.prototype.RGB_to_HSL = function(){
 }
 
 dojo.graphics.Colorspace.prototype.HSL_to_RGB = function(){
- 
+
 	var src = this.munge('HSL', arguments);
 
 	//
diff --git a/webapp/src/main/webapp/src/graphics/color/hsl.js b/webapp/src/main/webapp/src/graphics/color/hsl.js
index 3761c9bb6..08f597320 100644
--- a/webapp/src/main/webapp/src/graphics/color/hsl.js
+++ b/webapp/src/main/webapp/src/graphics/color/hsl.js
@@ -74,7 +74,7 @@ dojo.graphics.color.rgb2hsl = function(r, g, b){
 }
 
 dojo.graphics.color.hsl2rgb = function(h, s, l){
- 
+
 	if (dojo.lang.isArray(h)) {
 		l = h[2] || 0;
 		s = h[1] || 0;
diff --git a/webapp/src/main/webapp/src/graphics/color/hsv.js b/webapp/src/main/webapp/src/graphics/color/hsv.js
index 230d1bf3c..66660371d 100644
--- a/webapp/src/main/webapp/src/graphics/color/hsv.js
+++ b/webapp/src/main/webapp/src/graphics/color/hsv.js
@@ -33,9 +33,9 @@ dojo.graphics.color.rgb2hsv = function(r, g, b){
 	// v = 0.0 (black) to 1.0 {white)
 	//
 	// Based on C Code in "Computer Graphics -- Principles and Practice,"
-	// Foley et al, 1996, p. 592. 
+	// Foley et al, 1996, p. 592.
 	//
-	// our calculatuions are based on 'regular' values (0-360, 0-1, 0-1) 
+	// our calculatuions are based on 'regular' values (0-360, 0-1, 0-1)
 	// but we return bytes values (0-255, 0-255, 0-255)
 
 	var h = null;
@@ -83,7 +83,7 @@ dojo.graphics.color.rgb2hsv = function(r, g, b){
 }
 
 dojo.graphics.color.hsv2rgb = function(h, s, v){
- 
+
 	if (dojo.lang.isArray(h)) {
 		v = h[2] || 0;
 		s = h[1] || 0;
diff --git a/webapp/src/main/webapp/src/hostenv_adobesvg.js b/webapp/src/main/webapp/src/hostenv_adobesvg.js
index fde7dc4a6..6956c4415 100644
--- a/webapp/src/main/webapp/src/hostenv_adobesvg.js
+++ b/webapp/src/main/webapp/src/hostenv_adobesvg.js
@@ -41,7 +41,7 @@ with(dojo.render){
 
 dojo.hostenv.println = function(s){
 	try{
-    // FIXME: this may not work with adobe's viewer, as we may first need a 
+    // FIXME: this may not work with adobe's viewer, as we may first need a
 		// reference to the svgDocument
 		// FIXME: need a way to determine where to position the text for this
     var ti = document.createElement("text");
@@ -99,7 +99,7 @@ dojo.hostenv.loadedUris = [];
 dojo.hostenv.modulesLoaded = function(){
 	if(this.modulesLoadedFired){ return; }
 	if((this.loadUriStack.length==0)&&(this.getTextStack.length==0)){
-		if(this.inFlightCount > 0){ 
+		if(this.inFlightCount > 0){
 			dojo.debug("couldn't initialize, there are files still in flight");
 			return;
 		}
@@ -140,7 +140,7 @@ dojo.hostenv.unwindUriStack = function(){
 		}
 	}
 	var next = stack.pop();
-	if((!next)&&(stack.length==0)){ 
+	if((!next)&&(stack.length==0)){
 		return;
 	}
 	for(var x=0; x<stack.length; x++){
@@ -198,7 +198,7 @@ dojo.hostenv.loadUri = function(uri, cb){
 
 		// stack management
 		var next = stack.pop();
-		if((!next)&&(stack.length==0)){ 
+		if((!next)&&(stack.length==0)){
 			dojo.hostenv.modulesLoaded();
 			return;
 		}
@@ -211,7 +211,7 @@ dojo.hostenv.loadUri = function(uri, cb){
 			}
 			next = stack.pop();
 		}
-		if(dojo.hostenv.loadedUris[next[0]]){ 
+		if(dojo.hostenv.loadedUris[next[0]]){
 			// dojo.debug("WE ALREADY HAD: "+next[0]);
 			dojo.hostenv.unwindUriStack();
 			return;
@@ -225,7 +225,7 @@ dojo.hostenv.loadUri = function(uri, cb){
 			}
 
 		}else{
-			if(!contents){ 
+			if(!contents){
 				next[1](false);
 			}else{
 				var deps = dojo.hostenv.getDepsForEval(next[2]);
@@ -259,7 +259,7 @@ dojo.hostenv.loadUri = function(uri, cb){
 
 		// stack management
 		var next = stack.pop();
-		if((!next)&&(stack.length==0)){ 
+		if((!next)&&(stack.length==0)){
 			dojo.hostenv.modulesLoaded();
 			return;
 		}
@@ -272,7 +272,7 @@ dojo.hostenv.loadUri = function(uri, cb){
 			}
 			next = stack.pop();
 		}
-		if(dojo.hostenv.loadedUris[next[0]]){ 
+		if(dojo.hostenv.loadedUris[next[0]]){
 			// dojo.debug("WE ALREADY HAD: "+next[0]);
 			dojo.hostenv.unwindUriStack();
 			return;
@@ -286,7 +286,7 @@ dojo.hostenv.loadUri = function(uri, cb){
 			}
 
 		}else{
-			if(!contents){ 
+			if(!contents){
 				next[1](false);
 			}else{
 				var deps = dojo.hostenv.getDepsForEval(next[2]);
@@ -302,7 +302,7 @@ dojo.hostenv.loadUri = function(uri, cb){
 }
 
 /**
-* loadModule("A.B") first checks to see if symbol A.B is defined. 
+* loadModule("A.B") first checks to see if symbol A.B is defined.
 * If it is, it is simply returned (nothing to do).
 * If it is not defined, it will look for "A/B.js" in the script root directory, followed
 * by "A.js".
@@ -353,7 +353,7 @@ dojo.hostenv.loadModule = function(modulename, exact_only, omit_module_check){
 	var syms = modulename.split(".");
 	var nsyms = modulename.split(".");
 	if(syms[0]=="dojo"){ // FIXME: need a smarter way to do this!
-		syms[0] = "src"; 
+		syms[0] = "src";
 	}
 	var last = syms.pop();
 	syms.push(last);
@@ -372,10 +372,10 @@ dojo.hostenv.loadModule = function(modulename, exact_only, omit_module_check){
 		}
 
 		var nextTry = function(lastStatus){
-			if(lastStatus){ 
+			if(lastStatus){
 				module = _this.findModule(modulename, false); // pass in false so we can give better error
 				if((!module)&&(syms[syms.length-1]!=pfn)){
-					dojo.raise("Module symbol '" + modulename + "' is not defined after loading '" + relpath + "'"); 
+					dojo.raise("Module symbol '" + modulename + "' is not defined after loading '" + relpath + "'");
 				}
 				if(module){
 					_this.removedFromLoadingCount.push(modulename);
@@ -401,12 +401,12 @@ dojo.hostenv.loadModule = function(modulename, exact_only, omit_module_check){
 
 		var nextTry = function(lastStatus){
 			// dojo.debug("lastStatus: "+lastStatus);
-			if(lastStatus){ 
+			if(lastStatus){
 				// dojo.debug("inital relpath: "+relpath);
 				module = _this.findModule(modulename, false); // pass in false so we can give better error
 				// if(!module){
 				if((!module)&&(syms[syms.length-1]!=pfn)){
-					dojo.raise("Module symbol '" + modulename + "' is not defined after loading '" + relpath + "'"); 
+					dojo.raise("Module symbol '" + modulename + "' is not defined after loading '" + relpath + "'");
 				}
 				if(module){
 					_this.removedFromLoadingCount.push(modulename);
@@ -440,7 +440,7 @@ dojo.hostenv.loadModule = function(modulename, exact_only, omit_module_check){
  * @param async_cb If not specified, returns false as synchronous is not
  * supported. If specified, load asynchronously, and use async_cb as the handler which receives the result of the request.
  * @param fail_ok Default false. If fail_ok and !async_cb and loading fails, return null instead of throwing.
- */ 
+ */
 dojo.hostenv.async_cb = null;
 
 dojo.hostenv.unWindGetTextStack = function(){
@@ -452,14 +452,14 @@ dojo.hostenv.unWindGetTextStack = function(){
 	// to know how to do anything else
 	dojo.hostenv.inFlightCount++;
 	var next = dojo.hostenv.getTextStack.pop();
-	if((!next)&&(dojo.hostenv.getTextStack.length==0)){ 
+	if((!next)&&(dojo.hostenv.getTextStack.length==0)){
 		dojo.hostenv.inFlightCount--;
 		dojo.hostenv.async_cb = function(){};
 		return;
 	}
 	dojo.hostenv.async_cb = next[1];
 	// http = window.getURL(uri, dojo.hostenv.anon[cbn]);
-	window.getURL(next[0], function(result){ 
+	window.getURL(next[0], function(result){
 		dojo.hostenv.inFlightCount--;
 		dojo.hostenv.async_cb(result.content);
 		dojo.hostenv.unWindGetTextStack();
@@ -485,7 +485,7 @@ dojo.hostenv.getText = function(uri, async_cb, fail_ok){
  * Makes an async post to the specified uri.
  *
  * FIXME: Not sure that we need this, but adding for completeness.
- * More details about the implementation of this are available at 
+ * More details about the implementation of this are available at
  * http://wiki.svg.org/index.php/PostUrl
  * @param uri A relative or absolute uri. If absolute, it still must be in the same "domain" as we are.
  * @param async_cb If not specified, returns false as synchronous is not
@@ -494,15 +494,15 @@ dojo.hostenv.getText = function(uri, async_cb, fail_ok){
  * @param fail_ok Default false. If fail_ok and !async_cb and loading fails, return null instead of throwing.
  * @param mime_type optional MIME type of the posted data (such as "text/plain")
  * @param encoding optional encoding for data. null, 'gzip' and 'deflate' are possible values. If browser does not support binary post this parameter is ignored.
- */ 
+ */
 dojo.hostenv.postText = function(uri, async_cb, text, fail_ok, mime_type, encoding){
 	var http = null;
-	
+
 	var async_callback = function(httpResponse){
 		if (!httpResponse.success) {
 			dojo.raise("Request for uri '" + uri + "' resulted in " + httpResponse.status);
 		}
-		
+
 		if(!httpResponse.content) {
 			if (!fail_ok) dojo.raise("Request for uri '" + uri + "' resulted in no content");
 			return null;
@@ -510,7 +510,7 @@ dojo.hostenv.postText = function(uri, async_cb, text, fail_ok, mime_type, encodi
 		// FIXME: wtf, I'm losing a reference to async_cb
 		async_cb(httpResponse.content);
 	}
-	
+
 	try {
 		if(async_cb) {
 			http = window.postURL(uri, text, async_callback, mimeType, encoding);
@@ -530,8 +530,8 @@ dojo.hostenv.postText = function(uri, async_cb, text, fail_ok, mime_type, encodi
  */
 function dj_last_script_src() {
 	var scripts = window.document.getElementsByTagName('script');
-	if(scripts.length < 1){ 
-		dojo.raise("No script elements in window.document, so can't figure out my script src"); 
+	if(scripts.length < 1){
+		dojo.raise("No script elements in window.document, so can't figure out my script src");
 	}
 	var li = scripts.length-1;
 	var xlinkNS = "http://www.w3.org/1999/xlink";
diff --git a/webapp/src/main/webapp/src/hostenv_dashboard.js b/webapp/src/main/webapp/src/hostenv_dashboard.js
index 0492de522..64d7304df 100644
--- a/webapp/src/main/webapp/src/hostenv_dashboard.js
+++ b/webapp/src/main/webapp/src/hostenv_dashboard.js
@@ -25,7 +25,7 @@ dojo.hostenv.getXmlhttpObject = function(/*Object*/ kwArgs){
 		}else if(kwArgs.method && kwArgs.method.toUpperCase() == "HEAD"){
 			return new dojo.hostenv.CurlRequest;
 		}else if(kwArgs.headers && kwArgs.header.referer){
-			return new dojo.hostenv.CurlRequest; 
+			return new dojo.hostenv.CurlRequest;
 		}
 	}
 	return new XMLHttpRequest; // XMLHttpRequest
diff --git a/webapp/src/main/webapp/src/hostenv_jsc.js b/webapp/src/main/webapp/src/hostenv_jsc.js
index a049ef50a..936cc9bc9 100644
--- a/webapp/src/main/webapp/src/hostenv_jsc.js
+++ b/webapp/src/main/webapp/src/hostenv_jsc.js
@@ -19,7 +19,7 @@ dojo.hostenv.name_ = 'jsc';
 // See the Rotor source code jscript/engine/globalobject.cs for what globals
 // are available.
 if((typeof ScriptEngineMajorVersion != 'function')||(ScriptEngineMajorVersion() < 7)){
-	dojo.raise("attempt to use JScript .NET host environment with inappropriate ScriptEngine"); 
+	dojo.raise("attempt to use JScript .NET host environment with inappropriate ScriptEngine");
 }
 
 // for more than you wanted to know about why this import is required even if
diff --git a/webapp/src/main/webapp/src/hostenv_rhino.js b/webapp/src/main/webapp/src/hostenv_rhino.js
index 3e0331051..9e966facd 100644
--- a/webapp/src/main/webapp/src/hostenv_rhino.js
+++ b/webapp/src/main/webapp/src/hostenv_rhino.js
@@ -12,7 +12,7 @@
 * Rhino host environment
 */
 
-// make jsc shut up (so we can use jsc for sanity checking) 
+// make jsc shut up (so we can use jsc for sanity checking)
 /*@cc_on
 @if (@_jscript_version >= 7)
 var loadClass; var print; var load; var quit; var version; var Packages; var java;
@@ -57,7 +57,7 @@ dojo.hostenv.loadUri = function(uri, cb){
 }
 
 dojo.hostenv.println = print;
-dojo.hostenv.exit = function(exitcode){ 
+dojo.hostenv.exit = function(exitcode){
 	quit(exitcode);
 }
 
@@ -67,7 +67,7 @@ dojo.hostenv.exit = function(exitcode){
 //   1. get an EcmaError and look at e.getSourceName(): try {eval ("static in return")} catch(e) { ...
 //   Won't work because NativeGlobal.java only does a put of "name" and "message", not a wrapped reflecting object.
 //   Even if the EcmaError object had the sourceName set.
-//  
+//
 //   2. var e = Packages.org.mozilla.javascript.Context.getCurrentContext().reportError('');
 //   Won't work because it goes directly to the errorReporter, not the return value.
 //   We want context.interpreterSourceFile and context.interpreterLine, which are used in static Context.getSourcePositionFromStack
@@ -98,7 +98,7 @@ dojo.hostenv.exit = function(exitcode){
 // Note may get different answers based on:
 //    Context.setOptimizationLevel(-1)
 //    Context.setGeneratingDebug(true)
-//    Context.setGeneratingSource(true) 
+//    Context.setGeneratingSource(true)
 //
 // Some somewhat helpful posts:
 //    http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&oe=UTF-8&safe=off&selm=9v9n0g%246gr1%40ripley.netscape.com
@@ -110,7 +110,7 @@ dojo.hostenv.exit = function(exitcode){
 
 // do it by using java java.lang.Exception
 function dj_rhino_current_script_via_java(depth) {
-    var optLevel = Packages.org.mozilla.javascript.Context.getCurrentContext().getOptimizationLevel();  
+    var optLevel = Packages.org.mozilla.javascript.Context.getCurrentContext().getOptimizationLevel();
     if (optLevel == -1) dojo.unimplemented("getCurrentScriptURI (determine current script path for rhino when interpreter mode)", '');
     var caw = new java.io.CharArrayWriter();
     var pw = new java.io.PrintWriter(caw);
@@ -130,7 +130,7 @@ function dj_rhino_current_script_via_java(depth) {
 	if(!fname){ fname = matches[1]; }
     // print("got fname '" + fname + "' from stack string '" + s + "'");
     if (!fname) throw Error("could not find js file in printStackTrace output: " + s);
-    //print("Rhino getCurrentScriptURI returning '" + fname + "' from: " + s); 
+    //print("Rhino getCurrentScriptURI returning '" + fname + "' from: " + s);
     return fname;
 }
 
@@ -149,7 +149,7 @@ function dj_rhino_current_script_via_eval_exception() {
     var sn = exc.getSourceName();
     print("SourceName=" + sn);
     return sn;
-} 
+}
 */
 
 // reading a file from disk in Java is a humiliating experience by any measure.
diff --git a/webapp/src/main/webapp/src/hostenv_spidermonkey.js b/webapp/src/main/webapp/src/hostenv_spidermonkey.js
index b3a1236a9..806a3893d 100644
--- a/webapp/src/main/webapp/src/hostenv_spidermonkey.js
+++ b/webapp/src/main/webapp/src/hostenv_spidermonkey.js
@@ -15,14 +15,14 @@
 dojo.hostenv.name_ = 'spidermonkey';
 
 dojo.hostenv.println = print;
-dojo.hostenv.exit = function(exitcode){ 
-	quit(exitcode); 
+dojo.hostenv.exit = function(exitcode){
+	quit(exitcode);
 }
 
 // version() returns 0, sigh. and build() returns nothing but just prints.
 dojo.hostenv.getVersion = function(){ return version(); }
 
-// make jsc shut up (so we can use jsc for sanity checking) 
+// make jsc shut up (so we can use jsc for sanity checking)
 /*@cc_on
 @if (@_jscript_version >= 7)
 var line2pc; var print; var load; var quit;
@@ -50,11 +50,11 @@ function dj_spidermonkey_current_file(depth){
 	}
     // lines are like: bu_getCurrentScriptURI_spidermonkey("ScriptLoader.js")@burst/Runtime.js:101
     var matches = s.match(/[^@]*\.js/gi);
-    if(!matches){ 
+    if(!matches){
 		dojo.raise("could not parse stack string: '" + s + "'");
 	}
     var fname = (typeof depth != 'undefined' && depth) ? matches[depth + 1] : matches[matches.length - 1];
-    if(!fname){ 
+    if(!fname){
 		dojo.raise("could not find file name in stack string '" + s + "'");
 	}
     //print("SpiderMonkeyRuntime got fname '" + fname + "' from stack string '" + s + "'");
@@ -62,14 +62,14 @@ function dj_spidermonkey_current_file(depth){
 }
 
 // call this now because later we may not be on the top of the stack
-if(!dojo.hostenv.library_script_uri_){ 
-	dojo.hostenv.library_script_uri_ = dj_spidermonkey_current_file(0); 
+if(!dojo.hostenv.library_script_uri_){
+	dojo.hostenv.library_script_uri_ = dj_spidermonkey_current_file(0);
 }
 
 dojo.hostenv.loadUri = function(uri){
 	// spidermonkey load() evaluates the contents into the global scope (which
 	// is what we want).
-	// TODO: sigh, load() does not return a useful value. 
+	// TODO: sigh, load() does not return a useful value.
 	// Perhaps it is returning the value of the last thing evaluated?
 	var ok = load(uri);
 	// dojo.debug("spidermonkey load(", uri, ") returned ", ok);
diff --git a/webapp/src/main/webapp/src/hostenv_svg.js b/webapp/src/main/webapp/src/hostenv_svg.js
index 460747ee5..31ccf1dcf 100644
--- a/webapp/src/main/webapp/src/hostenv_svg.js
+++ b/webapp/src/main/webapp/src/hostenv_svg.js
@@ -12,7 +12,7 @@
 if(typeof window == 'undefined'){
 	dojo.raise("attempt to use adobe svg hostenv when no window object");
 }
-dojo.debug = function(){ 
+dojo.debug = function(){
 	if (!djConfig.isDebug) { return; }
 	var args = arguments;
 	var isJUM = dj_global["jum"];
@@ -20,7 +20,7 @@ dojo.debug = function(){
 	for (var i = 0; i < args.length; ++i){ s += args[i]; }
 	if (isJUM){ // this seems to be the only way to get JUM to "play nice"
 		jum.debug(s);
-	} else{ 
+	} else{
 		dojo.hostenv.println(s);
 	}
 };
@@ -52,7 +52,7 @@ dojo.render.svg.adobe = (window.parseXML != null);
 
 //	from old hostenv_adobesvg.
 dojo.hostenv.startPackage("dojo.hostenv");
-dojo.hostenv.println = function(s){ 
+dojo.hostenv.println = function(s){
 	try {
 		var ti = document.createElement("text");
 		ti.setAttribute("x","50");
@@ -72,7 +72,7 @@ dojo.hostenv.loadedUris = [];
 dojo.hostenv.modules_ = {};
 dojo.hostenv.modulesLoadedFired = false;
 dojo.hostenv.modulesLoadedListeners = [];
-dojo.hostenv.getText = function(uri, cb, data){ 
+dojo.hostenv.getText = function(uri, cb, data){
 	if (!cb) var cb = function(result){ window.alert(result); };
 	if (!data) {
 		window.getUrl(uri, cb);
@@ -99,7 +99,7 @@ dojo.hostenv.loadModule = function(moduleName){
 			dojo.raise("dojo.require('" + moduleName + "'): module does not exist.");
 		} else currentObj = currentObj[a[i]];
 	}
-	return; 
+	return;
 };
 dojo.hostenv.startPackage = function(moduleName){
 	var a = moduleName.split(".");
@@ -111,7 +111,7 @@ dojo.hostenv.startPackage = function(moduleName){
 		if (!currentObj[a[i]]) currentObj[a[i]] = {};
 		currentObj = currentObj[a[i]];
 	}
-	return; 
+	return;
 };
 
 //	wrapper objects for ASVG
@@ -182,7 +182,7 @@ if (window.parseXML){
 		//	we ignore the setting and getting of content-type.
 		var uri = null;
 		var method = "POST";
-		var isAsync = true;	
+		var isAsync = true;
 		var cb = function(d){
 			this.responseText = d.content;
 			try {
@@ -210,7 +210,7 @@ if (window.parseXML){
 		this.getAllResponseHeaders = function(){ return []; };
 		this.getResponseHeader = function(n){ return null; };
 		this.setRequestHeader = function(nm, val){ };
-		this.open = function(meth, url, async){ 
+		this.open = function(meth, url, async){
 			method = meth;
 			uri = url;
 		};
diff --git a/webapp/src/main/webapp/src/html.js b/webapp/src/main/webapp/src/html.js
index 99224ebbf..8bbb326ac 100644
--- a/webapp/src/main/webapp/src/html.js
+++ b/webapp/src/main/webapp/src/html.js
@@ -24,7 +24,7 @@ dojo.lang.mixin(dojo.html, dojo.style);
 
 dojo.html.clearSelection = function(){
 	try{
-		if(window["getSelection"]){ 
+		if(window["getSelection"]){
 			if(dojo.render.html.safari){
 				// pulled from WebCore/ecma/kjs_window.cpp, line 2536
 				window.getSelection().collapse();
@@ -48,11 +48,11 @@ dojo.html.clearSelection = function(){
 dojo.html.disableSelection = function(element){
 	element = dojo.byId(element)||document.body;
 	var h = dojo.render.html;
-	
+
 	if(h.mozilla){
 		element.style.MozUserSelect = "none";
 	}else if(h.safari){
-		element.style.KhtmlUserSelect = "none"; 
+		element.style.KhtmlUserSelect = "none";
 	}else if(h.ie){
 		element.unselectable = "on";
 	}else{
@@ -63,10 +63,10 @@ dojo.html.disableSelection = function(element){
 
 dojo.html.enableSelection = function(element){
 	element = dojo.byId(element)||document.body;
-	
+
 	var h = dojo.render.html;
-	if(h.mozilla){ 
-		element.style.MozUserSelect = ""; 
+	if(h.mozilla){
+		element.style.MozUserSelect = "";
 	}else if(h.safari){
 		element.style.KhtmlUserSelect = "";
 	}else if(h.ie){
@@ -232,7 +232,7 @@ dojo.html.getAttribute = function(node, attr){
 	// FIXME: need to add support for attr-specific accessors
 	if((!node)||(!node.getAttribute)){
 		// if(attr !== 'nwType'){
-		//	alert("getAttr of '" + attr + "' with bad node"); 
+		//	alert("getAttr of '" + attr + "' with bad node");
 		// }
 		return null;
 	}
@@ -255,7 +255,7 @@ dojo.html.getAttribute = function(node, attr){
 	}
 	return null;
 }
-	
+
 /**
  *	Determines whether or not the specified node carries a value for the
  *	attribute in question.
@@ -264,7 +264,7 @@ dojo.html.hasAttribute = function(node, attr){
 	node = dojo.byId(node);
 	return dojo.html.getAttribute(node, attr) ? true : false;
 }
-	
+
 /**
  * Returns the string value of the list of CSS classes currently assigned
  * directly to the node in question. Returns an empty string if no class attribute
@@ -350,7 +350,7 @@ dojo.html.setClass = function(node, classStr){
 /**
  * Removes the className from the node;. Returns
  * true or false indicating success or failure.
- */ 
+ */
 dojo.html.removeClass = function(node, classStr, allowPartialMatches){
 	var classStr = dojo.string.trim(new String(classStr));
 
@@ -359,13 +359,13 @@ dojo.html.removeClass = function(node, classStr, allowPartialMatches){
 		var nca	= [];
 		if(allowPartialMatches){
 			for(var i = 0; i<cs.length; i++){
-				if(cs[i].indexOf(classStr) == -1){ 
+				if(cs[i].indexOf(classStr) == -1){
 					nca.push(cs[i]);
 				}
 			}
 		}else{
 			for(var i=0; i<cs.length; i++){
-				if(cs[i] != classStr){ 
+				if(cs[i] != classStr){
 					nca.push(cs[i]);
 				}
 			}
@@ -405,7 +405,7 @@ dojo.html.getElementsByClass = function(classStr, parent, nodeType, classMatchTy
 	if( classMatchType != 1 && classMatchType != 2 ) classMatchType = 0; // make it enum
 	var reClass = new RegExp("(\\s|^)((" + classes.join(")|(") + "))(\\s|$)");
 	var candidateNodes = [];
-	
+
 	if(!useNonXpath && document.evaluate) { // supports dom 3 xpath
 		var xpath = "//" + (nodeType || "*") + "[contains(";
 		if(classMatchType != dojo.html.classMatchType.ContainsAny){
@@ -438,7 +438,7 @@ dojo.html.getElementsByClass = function(classStr, parent, nodeType, classMatchTy
 			var nodeClasses = dojo.html.getClasses(node);
 			if(nodeClasses.length == 0){ continue outer; }
 			var matches = 0;
-	
+
 			for(var j = 0; j < nodeClasses.length; j++){
 				if(reClass.test(nodeClasses[j])){
 					if(classMatchType == dojo.html.classMatchType.ContainsAny){
@@ -453,7 +453,7 @@ dojo.html.getElementsByClass = function(classStr, parent, nodeType, classMatchTy
 					}
 				}
 			}
-	
+
 			if(matches == classes.length){
 				if(	(classMatchType == dojo.html.classMatchType.IsOnly)&&
 					(matches == nodeClasses.length)){
@@ -501,7 +501,7 @@ dojo.html.overElement = function(element, e){
 		var left = getAbsoluteX(element, true);
 		var right = left + getInnerWidth(element);
 	}
-	
+
 	return (mouse.x >= left && mouse.x <= right &&
 		mouse.y >= top && mouse.y <= bottom);
 }
@@ -554,11 +554,11 @@ dojo.html.isTag = function(node /* ... */) {
 }
 
 dojo.html.copyStyle = function(target, source){
-	// work around for opera which doesn't have cssText, and for IE which fails on setAttribute 
-	if(dojo.lang.isUndefined(source.style.cssText)){ 
-		target.setAttribute("style", source.getAttribute("style")); 
+	// work around for opera which doesn't have cssText, and for IE which fails on setAttribute
+	if(dojo.lang.isUndefined(source.style.cssText)){
+		target.setAttribute("style", source.getAttribute("style"));
 	}else{
-		target.style.cssText = source.style.cssText; 
+		target.style.cssText = source.style.cssText;
 	}
 	dojo.html.addClass(target, dojo.html.getClass(source));
 }
diff --git a/webapp/src/main/webapp/src/html/extras.js b/webapp/src/main/webapp/src/html/extras.js
index 182c63aff..70708437d 100644
--- a/webapp/src/main/webapp/src/html/extras.js
+++ b/webapp/src/main/webapp/src/html/extras.js
@@ -10,7 +10,7 @@
 
 dojo.require("dojo.html");
 dojo.provide("dojo.html.extras");
-dojo.require("dojo.string.extras"); 
+dojo.require("dojo.string.extras");
 
 /**
  * Calculates the mouse's direction of gravity relative to the centre
@@ -36,7 +36,7 @@ dojo.html.gravity = function(node, e){
 		var nodecenterx = getAbsoluteX(node, true) + (getInnerWidth(node) / 2);
 		var nodecentery = getAbsoluteY(node, true) + (getInnerHeight(node) / 2);
 	}
-	
+
 	with (dojo.html.gravity) {
 		return ((mouse.x < nodecenterx ? WEST : EAST) |
 			(mouse.y < nodecentery ? NORTH : SOUTH));
@@ -75,9 +75,9 @@ dojo.html.renderedTextContent = function(node){
 						result += dojo.html.renderedTextContent(node.childNodes[i]);
 						result += "\n";
 						break;
-					
+
 					case "none": break;
-					
+
 					default:
 						if(node.childNodes[i].tagName && node.childNodes[i].tagName.toLowerCase() == "br") {
 							result += "\n";
@@ -162,7 +162,7 @@ dojo.html.createNodesFromText = function(txt, trim){
 	}
 
 	/* this doesn't make much sense, I'm assuming it just meant trim() so wrap was replaced with trim
-	if(wrap){ 
+	if(wrap){
 		var ret = [];
 		// start hack
 		var fc = tn.firstChild;
diff --git a/webapp/src/main/webapp/src/html/layout.js b/webapp/src/main/webapp/src/html/layout.js
index 181e50074..35d9f978e 100644
--- a/webapp/src/main/webapp/src/html/layout.js
+++ b/webapp/src/main/webapp/src/html/layout.js
@@ -100,7 +100,7 @@ dojo.html.layout = function(container, children, layoutPriority) {
 			dojo.style.setOuterWidth(elm, f.width);
 			dojo.style.setOuterHeight(elm, f.height);
 		}
-		
+
 		// TODO: for widgets I want to call resizeTo(), but for top/bottom
 		// alignment I only want to set the width, and have the size determined
 		// dynamically.  (The thinner you make a div, the more height it consumes.)
diff --git a/webapp/src/main/webapp/src/iCalendar.js b/webapp/src/main/webapp/src/iCalendar.js
index b2ffe61f7..0ec6df0df 100644
--- a/webapp/src/main/webapp/src/iCalendar.js
+++ b/webapp/src/main/webapp/src/iCalendar.js
@@ -42,7 +42,7 @@ dojo.iCalendar.fromText =  function (/* string */text) {
 
 dojo.iCalendar.Component = function (/* string */ body ) {
 	// summary
-	// A component is the basic container of all this stuff. 
+	// A component is the basic container of all this stuff.
 
 	if (!this.name) {
 		this.name = "COMPONENT"
@@ -111,8 +111,8 @@ dojo.lang.extend(dojo.iCalendar.Component, {
 		for (var x=0; x<this._ValidProperties.length; x++) {
 			var evtProperty = this._ValidProperties[x];
 			var found = false;
-	
-			for (var y=0; y<this.properties.length; y++) {	
+
+			for (var y=0; y<this.properties.length; y++) {
 				var prop = this.properties[y];
 				var propName = prop.name.toLowerCase();
 				if (dojo.lang.isArray(evtProperty)) {
@@ -122,7 +122,7 @@ dojo.lang.extend(dojo.iCalendar.Component, {
 						var evtPropertyName = evtProperty[z].name.toLowerCase();
 						if((this[evtPropertyName])  && (evtPropertyName != propName )) {
 							alreadySet=true;
-						} 
+						}
 					}
 					if (!alreadySet) {
 						this[propName] = prop;
@@ -143,19 +143,19 @@ dojo.lang.extend(dojo.iCalendar.Component, {
 				}
 			}
 
-			if (evtProperty.required && !found) {	
+			if (evtProperty.required && !found) {
 				dojo.debug("iCalendar - " + this.name + ": Required Property not found: " + evtProperty.name);
 			}
 		}
 
-		// parse any rrules		
+		// parse any rrules
 		if (dojo.lang.isArray(this.rrule)) {
 			for(var x=0; x<this.rrule.length; x++) {
 				var rule = this.rrule[x].value;
 
 				//add a place to cache dates we have checked for recurrance
 				this.rrule[x].cache = function() {};
-				
+
 				var temp = rule.split(";");
 				for (var y=0; y<temp.length; y++) {
 					var pair = temp[y].split("=");
@@ -166,14 +166,14 @@ dojo.lang.extend(dojo.iCalendar.Component, {
 						this.rrule[x][key]= val;
 					} else {
 						var valArray = val.split(",");
-						this.rrule[x][key] = valArray; 
+						this.rrule[x][key] = valArray;
 					}
-				}	
+				}
 			}
 			this.recurring = true;
 		}
 
-	}, 
+	},
 
 	toString: function () {
 		// summary
@@ -196,7 +196,7 @@ dojo.iCalendar.Property = function (prop) {
 }
 
 dojo.lang.extend(dojo.iCalendar.Property, {
-	toString: function () {	
+	toString: function () {
 		// summary
 		// output a string reprensentation of this component.
 		return "[iCalenday.Property; " + this.name + ": " + this.value + "]";
@@ -258,13 +258,13 @@ dojo.lang.extend(dojo.iCalendar.VCalendar, {
 					calculatedEvents[dateStr] = [];
 				}
 
-				if (!dojo.lang.inArray(calculatedEvents[dateStr], this.recurring[x])) { 
+				if (!dojo.lang.inArray(calculatedEvents[dateStr], this.recurring[x])) {
 					calculatedEvents[dateStr].push(this.recurring[x]);
-				} 
+				}
 			}
 		}
 		this.recurringEvents = calculatedEvents;
-	
+
 	},
 
 	getEvents: function(/* Date */ date) {
@@ -278,20 +278,20 @@ dojo.lang.extend(dojo.iCalendar.VCalendar, {
 		if (dojo.lang.isArray(this.nonRecurringEvents[dateStr])) {
 			nonRecur= this.nonRecurringEvents[dateStr];
 			dojo.debug("Number of nonRecurring Events: " + nonRecur.length);
-		} 
-		
+		}
+
 
 		if (dojo.lang.isArray(this.recurringEvents[dateStr])) {
 			recur= this.recurringEvents[dateStr];
-		} 
+		}
 
 		events = recur.concat(nonRecur);
 
 		if (events.length > 0) {
 			return events;
-		} 
+		}
 
-		return null;			
+		return null;
 	}
 });
 
@@ -354,7 +354,7 @@ var VEventProperties = [
 ];
 
 dojo.iCalendar.VEvent = function (/* string */ body) {
-	// summary 
+	// summary
 	// VEVENT Component
 	this._ValidProperties = VEventProperties;
 	this.name = "VEVENT";
@@ -371,11 +371,11 @@ dojo.lang.extend(dojo.iCalendar.VEvent, {
 
 			var recurranceSet = [];
 			var weekdays=["su","mo","tu","we","th","fr","sa"];
-			var order = { 
+			var order = {
 				"daily": 1, "weekly": 2, "monthly": 3, "yearly": 4,
 				"byday": 1, "bymonthday": 1, "byweekno": 2, "bymonth": 3, "byyearday": 4};
 
-			// expand rrules into the recurrance 
+			// expand rrules into the recurrance
 			for (var x=0; x<this.rrule.length; x++) {
 				var rrule = this.rrule[x];
 				var freq = rrule.freq.toLowerCase();
@@ -439,7 +439,7 @@ dojo.lang.extend(dojo.iCalendar.VEvent, {
 									set.push(tmpDate);
 								}
 							}
-							break;	
+							break;
 						case "daily":
 							nextDate = new Date(dtstart);
 							set.push(nextDate);
@@ -451,7 +451,7 @@ dojo.lang.extend(dojo.iCalendar.VEvent, {
 								}
 							}
 							break;
-	
+
 					}
 
 					if ((rrule["bymonth"]) && (order["bymonth"]<freqInt))	{
@@ -473,17 +473,17 @@ dojo.lang.extend(dojo.iCalendar.VEvent, {
 						}
 					}
 
-					
+
 					// while the spec doesn't prohibit it, it makes no sense to have a bymonth and a byweekno at the same time
 					// and if i'm wrong then i don't know how to apply that rule.  This is also documented elsewhere on the web
-					if (rrule["byweekno"] && !rrule["bymonth"]) {	
+					if (rrule["byweekno"] && !rrule["bymonth"]) {
 						dojo.debug("TODO: no support for byweekno yet");
 					}
 
 
 					// while the spec doesn't prohibit it, it makes no sense to have a bymonth and a byweekno at the same time
 					// and if i'm wrong then i don't know how to apply that rule.  This is also documented elsewhere on the web
-					if (rrule["byyearday"] && !rrule["bymonth"] && !rrule["byweekno"] ) {	
+					if (rrule["byyearday"] && !rrule["bymonth"] && !rrule["byweekno"] ) {
 						if (rrule["byyearday"].length > 1) {
 							var regex = "([+-]?)([0-9]{1,3})";
 							for (var z=1; x<rrule["byyearday"].length; z++) {
@@ -514,7 +514,7 @@ dojo.lang.extend(dojo.iCalendar.VEvent, {
 						}
 					}
 
-					if (rrule["bymonthday"]  && (order["bymonthday"]<freqInt)) {	
+					if (rrule["bymonthday"]  && (order["bymonthday"]<freqInt)) {
 						if (rrule["bymonthday"].length > 0) {
 							var regex = "([+-]?)([0-9]{1,3})";
 							for (var z=0; z<rrule["bymonthday"].length; z++) {
@@ -553,7 +553,7 @@ dojo.lang.extend(dojo.iCalendar.VEvent, {
 						}
 					}
 
-					if (rrule["byday"]  && (order["byday"]<freqInt)) {	
+					if (rrule["byday"]  && (order["byday"]<freqInt)) {
 						if (rrule["bymonth"]) {
 							if (rrule["byday"].length > 0) {
 								var regex = "([+-]?)([0-9]{0,1}?)([A-Za-z]{1,2})";
@@ -566,21 +566,21 @@ dojo.lang.extend(dojo.iCalendar.VEvent, {
 									if (z==0) {
 										for (var zz=0; zz < set.length; zz++) {
 											if (regexResult[1] == "-") {
-												//find the nth to last occurance of date 
+												//find the nth to last occurance of date
 												var numDaysFound = 0;
 												var lastDayOfMonth = dojo.date.getDaysInMonth(set[zz]);
 												var daysToSubtract = 1;
-												set[zz].setDate(lastDayOfMonth); 
+												set[zz].setDate(lastDayOfMonth);
 												if (weekdays[set[zz].getDay()] == day) {
 													numDaysFound++;
 													daysToSubtract=7;
 												}
 												daysToSubtract = 1;
 												while (numDaysFound < occurance) {
-													set[zz].setDate(set[zz].getDate()-daysToSubtract);	
+													set[zz].setDate(set[zz].getDate()-daysToSubtract);
 													if (weekdays[set[zz].getDay()] == day) {
 														numDaysFound++;
-														daysToSubtract=7;	
+														daysToSubtract=7;
 													}
 												}
 											} else {
@@ -611,7 +611,7 @@ dojo.lang.extend(dojo.iCalendar.VEvent, {
 													lastDayOfMonth.setDate(daysInMonth);
 
 													set[zz].setDate(1);
-												
+
 													if (weekdays[set[zz].getDay()] == day) {
 														numDaysFound++;
 													}
@@ -625,7 +625,7 @@ dojo.lang.extend(dojo.iCalendar.VEvent, {
 															} else {
 																subset.push(tmpDate);
 																tmpDate = new Date(tmpDate);
-																daysToAdd=7;	
+																daysToAdd=7;
 																tmpDate.setDate(tmpDate.getDate() + daysToAdd);
 															}
 														} else {
@@ -633,7 +633,7 @@ dojo.lang.extend(dojo.iCalendar.VEvent, {
 														}
 													}
 													var t = set.concat(subset);
-													set = t; 
+													set = t;
 												}
 											}
 										}
@@ -663,8 +663,8 @@ dojo.lang.extend(dojo.iCalendar.VEvent, {
 					}
 
 					dojo.debug("TODO: Process BYrules for units larger than frequency");
-			
-					//add this set of events to the complete recurranceSet	
+
+					//add this set of events to the complete recurranceSet
 					var tmp = recurranceSet.concat(set);
 					recurranceSet = tmp;
 				}
diff --git a/webapp/src/main/webapp/src/io.js b/webapp/src/main/webapp/src/io.js
index f4f1d6fa7..dd99cfe4f 100644
--- a/webapp/src/main/webapp/src/io.js
+++ b/webapp/src/main/webapp/src/io.js
@@ -14,7 +14,7 @@ dojo.require("dojo.lang.extras");
 
 /******************************************************************************
  *	Notes about dojo.io design:
- *	
+ *
  *	The dojo.io.* package has the unenviable task of making a lot of different
  *	types of I/O feel natural, despite a universal lack of good (or even
  *	reasonable!) I/O capability in the host environment. So lets pin this down
@@ -58,7 +58,7 @@ dojo.require("dojo.lang.extras");
  *	A discussion between Dylan, Mark, Tom, and Alex helped to lay down a lot
  *	the IO API interface. A transcript of it can be found at:
  *		http://dojotoolkit.org/viewcvs/viewcvs.py/documents/irc/irc_io_api_log.txt?rev=307&view=auto
- *	
+ *
  *	Also referenced in the design of the API was the DOM 3 L&S spec:
  *		http://www.w3.org/TR/2004/REC-DOM-Level-3-LS-20040407/load-save.html
  ******************************************************************************/
@@ -83,28 +83,28 @@ dojo.lang.extend(dojo.io.Request, {
 
 	/** The URL to hit */
 	url: "",
-	
+
 	/** The mime type used to interrpret the response body */
 	mimetype: "text/plain",
-	
+
 	/** The HTTP method to use */
 	method: "GET",
-	
+
 	/** An Object containing key-value pairs to be included with the request */
 	content: undefined, // Object
-	
+
 	/** The transport medium to use */
 	transport: undefined, // String
-	
+
 	/** If defined the URL of the page is physically changed */
 	changeUrl: undefined, // String
-	
+
 	/** A form node to use in the request */
 	formNode: undefined, // HTMLFormElement
-	
+
 	/** Whether the request should be made synchronously */
 	sync: false,
-	
+
 	bindSuccess: false,
 
 	/** Cache/look for the request in the cache before attempting to request?
@@ -114,7 +114,7 @@ dojo.lang.extend(dojo.io.Request, {
 
 	/** Prevent the browser from caching this by adding a query string argument to the URL */
 	preventCache: false,
-	
+
 	// events stuff
 	load: function(type, data, evt){ },
 	error: function(type, error){ },
@@ -125,11 +125,11 @@ dojo.lang.extend(dojo.io.Request, {
 	// The number of seconds to wait until firing a timeout callback.
 	// If it is zero, that means, don't do a timeout check.
 	timeoutSeconds: 0,
-	
+
 	// the abort method needs to be filled in by the transport that accepts the
 	// bind() request
 	abort: function(){ },
-	
+
 	// backButton: function(){ },
 	// forwardButton: function(){ },
 
@@ -140,7 +140,7 @@ dojo.lang.extend(dojo.io.Request, {
 		if(!kwArgs["method"] && kwArgs["formNode"] && kwArgs["formNode"].method) {
 			kwArgs.method = kwArgs["formNode"].method;
 		}
-		
+
 		// backwards compatibility
 		if(!kwArgs["handle"] && kwArgs["handler"]){ kwArgs.handle = kwArgs.handler; }
 		if(!kwArgs["load"] && kwArgs["loaded"]){ kwArgs.load = kwArgs.loaded; }
@@ -201,7 +201,7 @@ dojo.io.bind = function(request){
 		if(!this[tsName]){ return request; }
 	}else{
 		// otherwise we do our best to auto-detect what available transports
-		// will handle 
+		// will handle
 		for(var x=0; x<dojo.io.transports.length; x++){
 			var tmp = dojo.io.transports[x];
 			if((this[tmp])&&(this[tmp].canHandle(request))){
@@ -311,9 +311,9 @@ dojo.io.setIFrameSrc = function(iframe, src, replace){
 				idoc.location.replace(src);
 			}
 		}
-	}catch(e){ 
-		dojo.debug(e); 
-		dojo.debug("setIFrameSrc: "+e); 
+	}catch(e){
+		dojo.debug(e);
+		dojo.debug("setIFrameSrc: "+e);
 	}
 }
 
@@ -322,7 +322,7 @@ dojo.io.sampleTranport = new function(){
 	this.canHandle = function(kwArgs){
 		// canHandle just tells dojo.io.bind() if this is a good transport to
 		// use for the particular type of request.
-		if(	
+		if(
 			(
 				(kwArgs["mimetype"] == "text/plain") ||
 				(kwArgs["mimetype"] == "text/html") ||
diff --git a/webapp/src/main/webapp/src/io/BrowserIO.js b/webapp/src/main/webapp/src/io/BrowserIO.js
index 18dd6696c..3c4b64ca0 100644
--- a/webapp/src/main/webapp/src/io/BrowserIO.js
+++ b/webapp/src/main/webapp/src/io/BrowserIO.js
@@ -389,7 +389,7 @@ dojo.io.XMLHTTPTransport = new function(){
 			kwArgs.method = "get";
 		}
 
-		// guess the multipart value		
+		// guess the multipart value
 		if(kwArgs.method.toLowerCase() == "get"){
 			// GET cannot use multipart
 			kwArgs.multipart = false;
@@ -398,7 +398,7 @@ dojo.io.XMLHTTPTransport = new function(){
 				// enforce multipart when sending files
 				kwArgs.multipart = true;
 			}else if(!kwArgs["multipart"]){
-				// default 
+				// default
 				kwArgs.multipart = false;
 			}
 		}
@@ -422,7 +422,7 @@ dojo.io.XMLHTTPTransport = new function(){
 			if(content) {
 				query += dojo.io.argsFromMap(content, kwArgs.encoding);
 			}
-			
+
 			if(kwArgs.method.toLowerCase() == "get" || !kwArgs.multipart){
 				break;
 			}
@@ -434,7 +434,7 @@ dojo.io.XMLHTTPTransport = new function(){
 					if(q[i].length){
 						var p = q[i].split("=");
 						t.push(	"--" + this.multipartBoundary,
-								"Content-Disposition: form-data; name=\"" + p[0] + "\"", 
+								"Content-Disposition: form-data; name=\"" + p[0] + "\"",
 								"",
 								p[1]);
 					}
@@ -490,12 +490,12 @@ dojo.io.XMLHTTPTransport = new function(){
 
 		// much of this is from getText, but reproduced here because we need
 		// more flexibility
-		var http = dojo.hostenv.getXmlhttpObject(kwArgs);	
+		var http = dojo.hostenv.getXmlhttpObject(kwArgs);
 		var received = false;
 
 		// build a handler function that calls back to the handler obj
 		if(async){
-			var startTime = 
+			var startTime =
 			// FIXME: setting up this callback handler leaks on IE!!!
 			this.inFlight.push({
 				"req":		kwArgs,
@@ -512,7 +512,7 @@ dojo.io.XMLHTTPTransport = new function(){
 			// FIXME: need to hack in more flexible Content-Type setting here!
 			http.open("POST", url, async);
 			setHeaders(http, kwArgs);
-			http.setRequestHeader("Content-Type", kwArgs.multipart ? ("multipart/form-data; boundary=" + this.multipartBoundary) : 
+			http.setRequestHeader("Content-Type", kwArgs.multipart ? ("multipart/form-data; boundary=" + this.multipartBoundary) :
 				(kwArgs.contentType || "application/x-www-form-urlencoded"));
 			try{
 				http.send(query);
diff --git a/webapp/src/main/webapp/src/io/IframeIO.js b/webapp/src/main/webapp/src/io/IframeIO.js
index 4fc594d74..5f23faa32 100644
--- a/webapp/src/main/webapp/src/io/IframeIO.js
+++ b/webapp/src/main/webapp/src/io/IframeIO.js
@@ -57,7 +57,7 @@ dojo.io.iframeContentWindow = function(iframe_el) {
 	var win = iframe_el.contentWindow || // IE
 		dojo.io.iframeContentDocument(iframe_el).defaultView || // Moz, opera
 		// Moz. TODO: is this available when defaultView isn't?
-		dojo.io.iframeContentDocument(iframe_el).__parent__ || 
+		dojo.io.iframeContentDocument(iframe_el).__parent__ ||
 		(iframe_el.name && document.frames[iframe_el.name]) || null;
 	return win;
 }
@@ -138,11 +138,11 @@ dojo.io.IframeTransport = new function(){
 			(
 				// FIXME: can we really handle text/plain and
 				// text/javascript requests?
-				dojo.lang.inArray(kwArgs["mimetype"], 
-				[	"text/plain", "text/html", 
+				dojo.lang.inArray(kwArgs["mimetype"],
+				[	"text/plain", "text/html",
 					"text/javascript", "text/json"])
 			)&&(
-				// make sur we really only get used in file upload cases	
+				// make sur we really only get used in file upload cases
 				(kwArgs["formNode"])&&(dojo.io.checkChildrenForFile(kwArgs["formNode"]))
 			)&&(
 				dojo.lang.inArray(kwArgs["method"].toLowerCase(), ["post", "get"])
@@ -216,7 +216,7 @@ dojo.io.IframeTransport = new function(){
 			var cmt = req.mimetype;
 			if((cmt == "text/javascript")||(cmt == "text/json")){
 				// FIXME: not sure what to do here? try to pull some evalulable
-				// text from a textarea or cdata section? 
+				// text from a textarea or cdata section?
 				// how should we set up the contract for that?
 				var js = ifd.getElementsByTagName("textarea")[0].value;
 				if(cmt == "text/json") { js = "(" + js + ")"; }
@@ -227,7 +227,7 @@ dojo.io.IframeTransport = new function(){
 				value = ifd.getElementsByTagName("textarea")[0].value;
 			}
 			success = true;
-		}catch(e){ 
+		}catch(e){
 			// looks like we didn't get what we wanted!
 			var errObj = new dojo.io.Error("IframeTransport Error");
 			if(dojo.lang.isFunction(req["error"])){
diff --git a/webapp/src/main/webapp/src/io/RepubsubIO.js b/webapp/src/main/webapp/src/io/RepubsubIO.js
index 31947d3d2..f11b55f9b 100644
--- a/webapp/src/main/webapp/src/io/RepubsubIO.js
+++ b/webapp/src/main/webapp/src/io/RepubsubIO.js
@@ -1,5 +1,5 @@
 //	Copyright (c) 2004 Friendster Inc., Licensed under the Academic Free
-//	License version 2.0 or later 
+//	License version 2.0 or later
 
 dojo.require("dojo.event.Event");
 dojo.require("dojo.event.BrowserEvent");
@@ -125,7 +125,7 @@ dojo.io.repubsub = new function(){
 	}
 
 	if(!this["tunnelURI"]){
-		this.tunnelURI = [	"/who/", escape(this.userid), "/s/", 
+		this.tunnelURI = [	"/who/", escape(this.userid), "/s/",
 							this.getRandStr(), "/kn_journal"].join("");
 		// this.tunnelURI = this.absoluteTopicURI(this.tunnelURI);
 	}
@@ -253,7 +253,7 @@ dojo.io.repubsub = new function(){
 			this.setCookie( [
 					[this.tunnelFrameKey,"closed"],
 					["path","/"]
-				], false 
+				], false
 			);
 		}
 	}
@@ -286,15 +286,15 @@ dojo.io.repubsub = new function(){
 	this.rcvNodeReady = function(){
 		// FIXME: why is this sequence number needed? Why isn't the UID gen
 		// 		  function enough?
-        var statusURI = [this.tunnelURI, '/kn_status/', this.getRandStr(), '_', 
-						 String(this.tunnelInitCount++)].join(""); 
+        var statusURI = [this.tunnelURI, '/kn_status/', this.getRandStr(), '_',
+						 String(this.tunnelInitCount++)].join("");
             // (kn._seqNum++); // FIXME: !!!!
 		// this.canRcv = true;
 		this.log("rcvNodeReady");
 		// FIXME: initialize receiver and request the base topic
 		// dojo.io.setIFrameSrc(this.rcvNode, this.serverBaseURL+"/kn?do_method=blank");
 		var initURIArr = [	this.serverBaseURL, "/kn?kn_from=", escape(this.tunnelURI),
-							"&kn_id=", escape(this.tunnelID), "&kn_status_from=", 
+							"&kn_id=", escape(this.tunnelID), "&kn_status_from=",
 							escape(statusURI)];
 		// FIXME: does the above really need a kn_response_flush? won't the
 		// 		  server already know? If not, what good is it anyway?
@@ -346,7 +346,7 @@ dojo.io.repubsub = new function(){
 		}
 	}
 
-	this.subscribe = function(	topic /* kn_from in the old terminilogy */, 
+	this.subscribe = function(	topic /* kn_from in the old terminilogy */,
 								toObj, toFunc, dontTellServer){
 		if(!this.isInitialized){
 			this.subscriptionBacklog.push([topic, toObj, toFunc, dontTellServer]);
@@ -361,9 +361,9 @@ dojo.io.repubsub = new function(){
 		var rstr = [this.serverBaseURL+"/kn", revt.toGetString()].join("");
 		dojo.event.kwConnect({
 			once: true,
-			srcObj: this.attachPathList, 
-			srcFunc: topic, 
-			adviceObj: toObj, 
+			srcObj: this.attachPathList,
+			srcFunc: topic,
+			adviceObj: toObj,
 			adviceFunc: toFunc
 		});
 		// NOTE: the above is a local mapping, if we're not the leader, we
@@ -394,12 +394,12 @@ dojo.io.repubsub = new function(){
 	this.unSubscribe = function(topic, toObj, toFunc){
 		// first, locally disconnect
 		dojo.event.kwDisconnect({
-			srcObj: this.attachPathList, 
-			srcFunc: topic, 
-			adviceObj: toObj, 
+			srcObj: this.attachPathList,
+			srcFunc: topic,
+			adviceObj: toObj,
 			adviceFunc: toFunc
 		});
-		
+
 		// FIXME: figure out if there are any remaining listeners to the topic,
 		// 		  and if not, inform the server of our desire not to be
 		// 		  notified of updates to the topic
@@ -456,7 +456,7 @@ dojo.io.repubsubEvent = function(to, from, method, id, routeURI, payload, dispna
 	this.flushChars = 4096;
 
 	this.initFromProperties = function(evt){
-		if(evt.constructor = dojo.io.repubsubEvent){ 
+		if(evt.constructor = dojo.io.repubsubEvent){
 			for(var x in evt){
 				this[x] = evt[x];
 			}
@@ -488,11 +488,11 @@ dojo.io.repubsubEvent = function(to, from, method, id, routeURI, payload, dispna
 
 }
 
-dojo.io.repubsubEvent.prototype.properties = [["from", "kn_from"], ["to", "kn_to"], 
-									["method", "do_method"], ["id", "kn_id"], 
-									["uri", "kn_uri"], 
-									["displayname", "kn_displayname"], 
-									["userid", "kn_userid"], 
+dojo.io.repubsubEvent.prototype.properties = [["from", "kn_from"], ["to", "kn_to"],
+									["method", "do_method"], ["id", "kn_id"],
+									["uri", "kn_uri"],
+									["displayname", "kn_displayname"],
+									["userid", "kn_userid"],
 									["payload", "kn_payload"],
 									["flushChars", "kn_response_flush"],
 									["responseFormat", "kn_response_format"] ];
diff --git a/webapp/src/main/webapp/src/io/ScriptSrcIO.js b/webapp/src/main/webapp/src/io/ScriptSrcIO.js
index 916d29845..e27baccc2 100644
--- a/webapp/src/main/webapp/src/io/ScriptSrcIO.js
+++ b/webapp/src/main/webapp/src/io/ScriptSrcIO.js
@@ -72,7 +72,7 @@ dojo.io.ScriptSrcTransport = new function(){
 				}
 			}
 		}
-	
+
 		if(doneCount == totalCount){
 			clearInterval(this.inFlightTimer);
 			this.inFlightTimer = null;
@@ -93,8 +93,8 @@ dojo.io.ScriptSrcTransport = new function(){
 	 * Be careful though, by removing them from the script, you may invalidate some
 	 * script objects that were defined by the js file that was pulled in as the
 	 * src of the script tag. Test carefully if you decide to call this method.
-	 * 
-	 * In MSIE 6 (and probably 5.x), if you removed the script element while 
+	 *
+	 * In MSIE 6 (and probably 5.x), if you removed the script element while
 	 * part of the script is still executing, the browser will crash.
 	 */
 	this.removeScripts = function(){
@@ -113,7 +113,7 @@ dojo.io.ScriptSrcTransport = new function(){
 		//START duplication from BrowserIO.js (some changes made)
 		var url = kwArgs.url;
 		var query = "";
-		
+
 		if(kwArgs["formNode"]){
 			var ta = kwArgs.formNode.getAttribute("action");
 			if((ta)&&(!kwArgs["url"])){ url = ta; }
@@ -218,7 +218,7 @@ dojo.io.ScriptSrcTransport = new function(){
 		//Constant params are parameters that should always be sent with each
 		//part of a multipart URL.
 		state.constantParams = (kwArgs["constantParams"] == null ? "" : kwArgs["constantParams"]);
-	
+
 		if(kwArgs["preventCache"] ||
 			(this.preventCache == true && kwArgs["preventCache"] != false)){
 			state.nocacheParam = "dojo.preventCache=" + new Date().valueOf();
@@ -228,14 +228,14 @@ dojo.io.ScriptSrcTransport = new function(){
 
 		//Get total length URL, if we were to do it as one URL.
 		//Add some padding, extra & separators.
-		var urlLength = state.url.length + state.query.length + state.constantParams.length 
+		var urlLength = state.url.length + state.query.length + state.constantParams.length
 				+ state.nocacheParam.length + this._extraPaddingLength;
 
 		if(kwArgs["useRequestId"]){
 			urlLength += state.idParam.length;
 		}
-		
-		if(!kwArgs["checkString"] && kwArgs["useRequestId"] 
+
+		if(!kwArgs["checkString"] && kwArgs["useRequestId"]
 			&& !state["jsonp"] && !kwArgs["forceSingleRequest"]
 			&& urlLength > this.maxUrlLength){
 			if(url > this.maxUrlLength){
@@ -258,14 +258,14 @@ dojo.io.ScriptSrcTransport = new function(){
 			//Track the final URL in case we need to use that instead of api ID when receiving
 			//the load callback.
 			state.finalUrl = finalUrl;
-			
+
 			this._attach(state.id, finalUrl);
 		}
 		//END DSR
 
 		this.startWatchingInFlight();
 	}
-	
+
 	//Private properties/methods
 	this._counter = 1;
 	this._state = {};
@@ -314,10 +314,10 @@ dojo.io.ScriptSrcTransport = new function(){
 		var queryMax = this.maxUrlLength - state.idParam.length
 					 - state.constantParams.length - state.url.length
 					 - state.nocacheParam.length - this._extraPaddingLength;
-		
+
 		//Figure out if this is the last part.
 		var isDone = state.query.length < queryMax;
-	
+
 		//Break up the query string if necessary.
 		var currentQuery;
 		if(isDone){
@@ -335,16 +335,16 @@ dojo.io.ScriptSrcTransport = new function(){
 				currentQuery = state.query.substring(0, ampEnd);
 				state.query = state.query.substring(ampEnd + 1, state.query.length) //strip off amperstand with the + 1.
 			}else{
-				//= is nearer the end. Take the max amount possible. 
+				//= is nearer the end. Take the max amount possible.
 				currentQuery = state.query.substring(0, queryMax);
-			 
+
 				//Find the last query name in the currentQuery so we can prepend it to
 				//ampEnd. Could be -1 (not there), so account for that.
 				var queryName = currentQuery.substring((ampEnd == -1 ? 0 : ampEnd + 1), eqEnd);
 				state.query = queryName + "=" + state.query.substring(queryMax, state.query.length);
 			}
 		}
-		
+
 		//Now send a part of the script
 		var queryParams = [currentQuery, state.idParam, state.constantParams, state.nocacheParam];
 		if(!isDone){
@@ -400,7 +400,7 @@ dojo.io.ScriptSrcTransport = new function(){
 window.onscriptload = function(event){
 	var state = null;
 	var transport = dojo.io.ScriptSrcTransport;
-	
+
 	//Find the matching state object for event ID.
 	if(transport._state[event.id]){
 		state = transport._state[event.id];
@@ -429,7 +429,7 @@ window.onscriptload = function(event){
 				}
 			}
 		}
-		
+
 		//If state is still null, then throw an error.
 		if(state == null){
 			throw "No matching state for onscriptload event.id: " + event.id;
diff --git a/webapp/src/main/webapp/src/io/ShortBusIO.js b/webapp/src/main/webapp/src/io/ShortBusIO.js
index 769342c06..71896227c 100644
--- a/webapp/src/main/webapp/src/io/ShortBusIO.js
+++ b/webapp/src/main/webapp/src/io/ShortBusIO.js
@@ -32,7 +32,7 @@ dojo.require("dojo.event.*");
  * 			// ...
  *		}
  * 	}
- * 
+ *
  * Packets bound for the event router (not one of it's clients) or generated
  * from it are prefixed with the special "/meta" topic. Meta-topic events
  * either inform the client to take an action or inform the server of a system
@@ -53,7 +53,7 @@ dojo.require("dojo.event.*");
  * 	}
  *
  * The client may then respond with a confirmation:
- * 
+ *
  *	// client --> server
  *	{
  *	 	topic: "/meta",
diff --git a/webapp/src/main/webapp/src/io/ShortBusInit.html b/webapp/src/main/webapp/src/io/ShortBusInit.html
index edfb3096e..ee57d5441 100644
--- a/webapp/src/main/webapp/src/io/ShortBusInit.html
+++ b/webapp/src/main/webapp/src/io/ShortBusInit.html
@@ -33,12 +33,12 @@
 		function widenDomain(domainStr){
 			// the purpose of this is to set the most liberal domain policy
 			var cd = domainStr||document.domain;
-			if(cd.indexOf(".")==-1){ 
+			if(cd.indexOf(".")==-1){
 				document.domain = cd;
 				return;
 			}
 			var dps = cd.split(".");
-			if(dps.length>2){ 
+			if(dps.length>2){
 				dps = dps.slice(dps.length-2);
 			}
 			document.domain = dps.join(".");
diff --git a/webapp/src/main/webapp/src/json.js b/webapp/src/main/webapp/src/json.js
index 3c619162b..94b8683bc 100644
--- a/webapp/src/main/webapp/src/json.js
+++ b/webapp/src/main/webapp/src/json.js
@@ -19,7 +19,7 @@ dojo.json = {
 	register: function(name, check, wrap, /*optional*/ override){
 		/***
 
-			Register a JSON serialization function.	 JSON serialization 
+			Register a JSON serialization function.	 JSON serialization
 			functions should take one argument and return an object
 			suitable for JSON serialization:
 
@@ -32,7 +32,7 @@ dojo.json = {
 				- Array-like (length property that is a number)
 				- Objects with a "json" method will have this method called
 				- Any other object will be used as {key:value, ...} pairs
-			
+
 			If override is given, it is used as the highest priority
 			JSON serialization, otherwise it will be used as the lowest.
 		***/
diff --git a/webapp/src/main/webapp/src/lang/array.js b/webapp/src/main/webapp/src/lang/array.js
index b16bbe899..a5ab41cee 100644
--- a/webapp/src/main/webapp/src/lang/array.js
+++ b/webapp/src/main/webapp/src/lang/array.js
@@ -28,7 +28,7 @@ dojo.lang.isEmpty = function(obj) {
 			if(obj[x] && (!tmp[x])){
 				count++;
 				break;
-			} 
+			}
 		}
 		return (count == 0);
 	} else if(dojo.lang.isArrayLike(obj) || dojo.lang.isString(obj)) {
@@ -67,8 +67,8 @@ dojo.lang.map = function(arr, obj, unary_func){
 
 // http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Global_Objects:Array:forEach
 dojo.lang.forEach = function(anArray /* Array */, callback /* Function */, thisObject /* Object */){
-	if(dojo.lang.isString(anArray)){ 
-		anArray = anArray.split(""); 
+	if(dojo.lang.isString(anArray)){
+		anArray = anArray.split("");
 	}
 	if(Array.forEach){
 		Array.forEach(anArray, callback, thisObject);
@@ -77,15 +77,15 @@ dojo.lang.forEach = function(anArray /* Array */, callback /* Function */, thisO
 		if(!thisObject){
 			thisObject=dj_global;
 		}
-		for(var i=0,l=anArray.length; i<l; i++){ 
+		for(var i=0,l=anArray.length; i<l; i++){
 			callback.call(thisObject, anArray[i], i, anArray);
 		}
 	}
 }
 
 dojo.lang._everyOrSome = function(every, arr, callback, thisObject){
-	if(dojo.lang.isString(arr)){ 
-		arr = arr.split(""); 
+	if(dojo.lang.isString(arr)){
+		arr = arr.split("");
 	}
 	if(Array.every){
 		return Array[ (every) ? "every" : "some" ](arr, callback, thisObject);
diff --git a/webapp/src/main/webapp/src/lang/assert.js b/webapp/src/main/webapp/src/lang/assert.js
index f72a47cb8..cff13eaa4 100644
--- a/webapp/src/main/webapp/src/lang/assert.js
+++ b/webapp/src/main/webapp/src/lang/assert.js
@@ -22,7 +22,7 @@ dojo.require("dojo.lang.type");
  * Throws an exception if the assertion fails.
  *
  * If the asserted condition is true, this method does nothing. If the
- * condition is false, we throw an error with a error message.  
+ * condition is false, we throw an error with a error message.
  *
  * @param	booleanValue	A boolean value, which needs to be true for the assertion to succeed.
  * @param	message	Optional. A string describing the assertion.
diff --git a/webapp/src/main/webapp/src/lang/common.js b/webapp/src/main/webapp/src/lang/common.js
index c237317ef..290e56021 100644
--- a/webapp/src/main/webapp/src/lang/common.js
+++ b/webapp/src/main/webapp/src/lang/common.js
@@ -57,7 +57,7 @@ dojo.lang.extend = function(ctor /*function*/, props /*, props, ..., props */){
  *  find(array, value, identity) // recommended
  *  find(value, array, identity)
 **/
-dojo.lang.find = function(	/*Array*/	arr, 
+dojo.lang.find = function(	/*Array*/	arr,
 							/*Object*/	val,
 							/*boolean*/	identity,
 							/*boolean*/	findLast){
diff --git a/webapp/src/main/webapp/src/lang/declare.js b/webapp/src/main/webapp/src/lang/declare.js
index cb024ded2..7d7a745a7 100644
--- a/webapp/src/main/webapp/src/lang/declare.js
+++ b/webapp/src/main/webapp/src/lang/declare.js
@@ -16,35 +16,35 @@ dojo.require("dojo.lang.extras");
 /*
  * Creates a constructor: inherit and extend
  *
- * - inherits from "superclass(es)" 
+ * - inherits from "superclass(es)"
  *
- *   "superclass" argument may be a Function, or an array of 
- *   Functions. 
+ *   "superclass" argument may be a Function, or an array of
+ *   Functions.
+ *
+ *   If "superclass" is an array, the first element is used
+ *   as the prototypical ancestor and any following Functions
+ *   become mixin ancestors.
  *
- *   If "superclass" is an array, the first element is used 
- *   as the prototypical ancestor and any following Functions 
- *   become mixin ancestors. 
- * 
  *   All "superclass(es)" must be Functions (not mere Objects).
  *
  *   Using mixin ancestors provides a type of multiple
- *   inheritance. Mixin ancestors prototypical 
- *   properties are copied to the subclass, and any 
- *   inializater/constructor is invoked. 
+ *   inheritance. Mixin ancestors prototypical
+ *   properties are copied to the subclass, and any
+ *   inializater/constructor is invoked.
  *
  * - "props" are copied to the constructor prototype
  *
- * - name of the class ("className" argument) is stored in 
+ * - name of the class ("className" argument) is stored in
  *   "declaredClass" property
- * 
- * - An initializer function can be specified in the "init" 
- *   argument, or by including a function called "initializer" 
+ *
+ * - An initializer function can be specified in the "init"
+ *   argument, or by including a function called "initializer"
  *   in "props".
- * 
+ *
  * - Superclass methods (inherited methods) can be invoked using "inherited" method:
  *
  * this.inherited(<method name>[, <argument array>]);
- * 
+ *
  * - inherited will continue up the prototype chain until it finds an implementation of method
  * - nested calls to inherited are supported (i.e. inherited method "A" can succesfully call inherited("A"), and so on)
  *
@@ -54,7 +54,7 @@ dojo.require("dojo.lang.extras");
  *
  * dojo.declare("my.classes.bar", my.classes.foo, {
  *	initializer: function() {
- *		this.myComplicatedObject = new ReallyComplicatedObject(); 
+ *		this.myComplicatedObject = new ReallyComplicatedObject();
  *	},
  *	someValue: 2,
  *	aMethod: function() { doStuff(); }
@@ -65,11 +65,11 @@ dojo.lang.declare = function(className /*string*/, superclass /*function || arra
 	// FIXME: parameter juggling for backward compat ... deprecate and remove after 0.3.*
 	// new sig: (className (string)[, superclass (function || array)[, init (function)][, props (object)]])
 	// old sig: (className (string)[, superclass (function || array), props (object), init (function)])
-	if ((dojo.lang.isFunction(props))||((!props)&&(!dojo.lang.isFunction(init)))){ 
+	if ((dojo.lang.isFunction(props))||((!props)&&(!dojo.lang.isFunction(init)))){
 		var temp = props;
 		props = init;
 		init = temp;
-	}	
+	}
 	var mixins = [ ];
 	if (dojo.lang.isArray(superclass)) {
 		mixins = superclass;
@@ -84,7 +84,7 @@ dojo.lang.declare = function(className /*string*/, superclass /*function || arra
 	if(scp){
 		scp.prototyping = true;
 		ctor.prototype = new superclass();
-		scp.prototyping = false; 
+		scp.prototyping = false;
 	}
 	ctor.superclass = scp;
 	ctor.mixins = mixins;
@@ -105,7 +105,7 @@ dojo.lang.declare = function(className /*string*/, superclass /*function || arra
 }
 
 dojo.lang.declare._makeConstructor = function() {
-	return function(){ 
+	return function(){
 		// get the generational context (which object [or prototype] should be constructed)
 		var self = this._getPropContext();
 		var s = self.constructor.superclass;
@@ -137,7 +137,7 @@ dojo.lang.declare.base = {
 		this.___proto = stack;
 		return result;
 	},
-	// invokes ctor.prototype.method, with args, in our context 
+	// invokes ctor.prototype.method, with args, in our context
 	inheritedFrom: function(ctor, prop, args){
 		var p = ((ctor)&&(ctor.prototype)&&(ctor.prototype[prop]));
 		return (dojo.lang.isFunction(p) ? p.apply(this, (args||[])) : p);
@@ -153,4 +153,4 @@ dojo.lang.declare.base = {
 	}
 }
 
-dojo.declare = dojo.lang.declare;
\ No newline at end of file
+dojo.declare = dojo.lang.declare;
diff --git a/webapp/src/main/webapp/src/lang/extras.js b/webapp/src/main/webapp/src/lang/extras.js
index b0fffc910..a9b59cef1 100644
--- a/webapp/src/main/webapp/src/lang/extras.js
+++ b/webapp/src/main/webapp/src/lang/extras.js
@@ -31,7 +31,7 @@ dojo.lang.setTimeout = function(func, delay){
 	if(dojo.lang.isString(func)){
 		func = context[func];
 	}
-	
+
 	var args = [];
 	for (var i = argsStart; i < arguments.length; i++) {
 		args.push(arguments[i]);
@@ -75,7 +75,7 @@ dojo.lang.firstValued = function(/* ... */) {
 /**
  * Get a value from a reference specified as a string descriptor,
  * (e.g. "A.B") in the given context.
- * 
+ *
  * getObjPathValue(String objpath [, Object context, Boolean create])
  *
  * If context is not specified, dj_global is used
@@ -88,9 +88,9 @@ dojo.lang.getObjPathValue = function(objpath, context, create){
 }
 
 /**
- * Set a value on a reference specified as a string descriptor. 
+ * Set a value on a reference specified as a string descriptor.
  * (e.g. "A.B") in the given context.
- * 
+ *
  * setObjPathValue(String objpath, value [, Object context, Boolean create])
  *
  * If context is not specified, dj_global is used
diff --git a/webapp/src/main/webapp/src/lang/func.js b/webapp/src/main/webapp/src/lang/func.js
index 21dd5c4f2..72592ece2 100644
--- a/webapp/src/main/webapp/src/lang/func.js
+++ b/webapp/src/main/webapp/src/lang/func.js
@@ -129,7 +129,7 @@ dojo.lang.delayThese = function(farr, cb, delay, onend){
 	 * alternate: (array funcArray, function callback)
 	 * alternate: (array funcArray)
 	 */
-	if(!farr.length){ 
+	if(!farr.length){
 		if(typeof onend == "function"){
 			onend();
 		}
diff --git a/webapp/src/main/webapp/src/lang/repr.js b/webapp/src/main/webapp/src/lang/repr.js
index 56aa763aa..ab92b584d 100644
--- a/webapp/src/main/webapp/src/lang/repr.js
+++ b/webapp/src/main/webapp/src/lang/repr.js
@@ -70,7 +70,7 @@ dojo.lang.reprArrayLike = function(arr){
 	}catch(e){ }
 };
 
-dojo.lang.reprString = function(str){ 
+dojo.lang.reprString = function(str){
 	dojo.deprecated("dojo.lang.reprNumber", "use `String(num)` instead", "0.4");
 	return dojo.string.escapeString(str);
 };
diff --git a/webapp/src/main/webapp/src/lang/type.js b/webapp/src/main/webapp/src/lang/type.js
index 3c799d9e3..7254c47e5 100644
--- a/webapp/src/main/webapp/src/lang/type.js
+++ b/webapp/src/main/webapp/src/lang/type.js
@@ -60,30 +60,30 @@ dojo.lang.isNumeric = function(wh){
 }
 
 /**
- * Returns true for any literal, and for any object that is an 
- * instance of a built-in type like String, Number, Boolean, 
+ * Returns true for any literal, and for any object that is an
+ * instance of a built-in type like String, Number, Boolean,
  * Array, Function, or Error.
  */
 dojo.lang.isBuiltIn = function(wh){
-	return (dojo.lang.isArray(wh)		|| 
-			dojo.lang.isFunction(wh)	|| 
-			dojo.lang.isString(wh)		|| 
-			dojo.lang.isNumber(wh)		|| 
-			dojo.lang.isBoolean(wh)		|| 
-			(wh == null)				|| 
-			(wh instanceof Error)		|| 
+	return (dojo.lang.isArray(wh)		||
+			dojo.lang.isFunction(wh)	||
+			dojo.lang.isString(wh)		||
+			dojo.lang.isNumber(wh)		||
+			dojo.lang.isBoolean(wh)		||
+			(wh == null)				||
+			(wh instanceof Error)		||
 			(typeof wh == "error") );
 }
 
 /**
- * Returns true for any object where the value of the 
- * property 'constructor' is 'Object'.  
- * 
+ * Returns true for any object where the value of the
+ * property 'constructor' is 'Object'.
+ *
  * Examples:
  * <pre>
  *   dojo.lang.isPureObject(new Object()); // returns true
  *   dojo.lang.isPureObject({a: 1, b: 2}); // returns true
- * 
+ *
  *   dojo.lang.isPureObject(new Date());   // returns false
  *   dojo.lang.isPureObject([11, 2, 3]);   // returns false
  * </pre>
@@ -208,19 +208,19 @@ dojo.lang.isOfType = function(value, type) {
 dojo.lang.getObject=function(/* String */ str){
 	//	summary
 	//	Will return an object, if it exists, based on the name in the passed string.
-	var parts=str.split("."), i=0, obj=dj_global; 
-	do{ 
-		obj=obj[parts[i++]]; 
-	}while(i<parts.length&&obj); 
+	var parts=str.split("."), i=0, obj=dj_global;
+	do{
+		obj=obj[parts[i++]];
+	}while(i<parts.length&&obj);
 	return (obj!=dj_global)?obj:null;	//	Object
 }
 
 dojo.lang.doesObjectExist=function(/* String */ str){
 	//	summary
 	//	Check to see if object [str] exists, based on the passed string.
-	var parts=str.split("."), i=0, obj=dj_global; 
-	do{ 
-		obj=obj[parts[i++]]; 
-	}while(i<parts.length&&obj); 
+	var parts=str.split("."), i=0, obj=dj_global;
+	do{
+		obj=obj[parts[i++]];
+	}while(i<parts.length&&obj);
 	return (obj&&obj!=dj_global);	//	boolean
 }
diff --git a/webapp/src/main/webapp/src/lfx/Animation.js b/webapp/src/main/webapp/src/lfx/Animation.js
index a4805cefc..9db96297b 100644
--- a/webapp/src/main/webapp/src/lfx/Animation.js
+++ b/webapp/src/main/webapp/src/lfx/Animation.js
@@ -24,7 +24,7 @@ dojo.lfx.Line = function(start, end){
 		dojo.lang.forEach(this.start, function(s,i){
 			diff[i] = this.end[i] - s;
 		}, this);
-		
+
 		this.getValue = function(/*float*/ n){
 			var res = [];
 			dojo.lang.forEach(this.start, function(s, i){
@@ -34,7 +34,7 @@ dojo.lfx.Line = function(start, end){
 		}
 	}else{
 		var diff = end - start;
-			
+
 		this.getValue = function(/*float*/ n){
 			//	summary: returns the point on the line
 			//	n: a floating point number greater than 0 and less than 1
@@ -69,7 +69,7 @@ dojo.lang.extend(dojo.lfx.IAnimation, {
 	easing: null,
 	repeatCount: 0,
 	rate: 25,
-	
+
 	// events
 	handler: null,
 	beforeBegin: null,
@@ -79,18 +79,18 @@ dojo.lang.extend(dojo.lfx.IAnimation, {
 	onPlay: null,
 	onPause: null,
 	onStop: null,
-	
+
 	// public methods
 	play: null,
 	pause: null,
 	stop: null,
-	
+
 	fire: function(evt, args){
 		if(this[evt]){
 			this[evt].apply(this, (args||[]));
 		}
 	},
-	
+
 	// private properties
 	_active: false,
 	_paused: false
@@ -101,10 +101,10 @@ dojo.lfx.Animation = function(/*Object*/ handlers, /*int*/ duration, /*Array*/ c
 	//		a generic animation object that fires callbacks into it's handlers
 	//		object at various states
 	//	handlers
-	//		object { 
-	//			handler: function(){}, 
-	//			onstart: function(){}, 
-	//			onstop: function(){}, 
+	//		object {
+	//			handler: function(){},
+	//			onstart: function(){},
+	//			onstop: function(){},
 	//			onanimate: function(){}
 	//		}
 	dojo.lfx.IAnimation.call(this);
@@ -166,7 +166,7 @@ dojo.lang.extend(dojo.lfx.Animation, {
 		}else if(this._active && !this._paused){
 			return this;
 		}
-		
+
 		this.fire("handler", ["beforeBegin"]);
 		this.fire("beforeBegin");
 
@@ -174,7 +174,7 @@ dojo.lang.extend(dojo.lfx.Animation, {
 			setTimeout(dojo.lang.hitch(this, function(){ this.play(null, gotoStart); }), delay);
 			return this;
 		}
-		
+
 		this._startTime = new Date().valueOf();
 		if(this._paused){
 			this._startTime -= (this.duration * this._percent / 100);
@@ -183,7 +183,7 @@ dojo.lang.extend(dojo.lfx.Animation, {
 
 		this._active = true;
 		this._paused = false;
-		
+
 		var step = this._percent / 100;
 		var value = this.curve.getValue(step);
 		if( this._percent == 0 ) {
@@ -254,7 +254,7 @@ dojo.lang.extend(dojo.lfx.Animation, {
 			}else{
 				this._percent = step * 100;
 			}
-			
+
 			// Perform easing
 			if((this.easing)&&(dojo.lang.isFunction(this.easing))){
 				step = this.easing(step);
@@ -292,12 +292,12 @@ dojo.lfx.Combine = function(){
 	dojo.lfx.IAnimation.call(this);
 	this._anims = [];
 	this._animsEnded = 0;
-	
+
 	var anims = arguments;
 	if(anims.length == 1 && (dojo.lang.isArray(anims[0]) || dojo.lang.isArrayLike(anims[0]))){
 		anims = anims[0];
 	}
-	
+
 	var _this = this;
 	dojo.lang.forEach(anims, function(anim){
 		_this._anims.push(anim);
@@ -309,7 +309,7 @@ dojo.inherits(dojo.lfx.Combine, dojo.lfx.IAnimation);
 dojo.lang.extend(dojo.lfx.Combine, {
 	// private members
 	_animsEnded: 0,
-	
+
 	// public methods
 	play: function(delay, gotoStart){
 		if( !this._anims.length ){ return this; }
@@ -320,7 +320,7 @@ dojo.lang.extend(dojo.lfx.Combine, {
 			setTimeout(dojo.lang.hitch(this, function(){ this.play(null, gotoStart); }), delay);
 			return this;
 		}
-		
+
 		if(gotoStart || this._anims[0].percent == 0){
 			this.fire("onBegin");
 		}
@@ -328,19 +328,19 @@ dojo.lang.extend(dojo.lfx.Combine, {
 		this._animsCall("play", null, gotoStart);
 		return this;
 	},
-	
+
 	pause: function(){
 		this.fire("onPause");
-		this._animsCall("pause"); 
+		this._animsCall("pause");
 		return this;
 	},
-	
+
 	stop: function(gotoEnd){
 		this.fire("onStop");
 		this._animsCall("stop", gotoEnd);
 		return this;
 	},
-	
+
 	// private methods
 	_onAnimsEnded: function(){
 		this._animsEnded++;
@@ -349,7 +349,7 @@ dojo.lang.extend(dojo.lfx.Combine, {
 		}
 		return this;
 	},
-	
+
 	_animsCall: function(funcName){
 		var args = [];
 		if(arguments.length > 1){
@@ -369,12 +369,12 @@ dojo.lfx.Chain = function() {
 	dojo.lfx.IAnimation.call(this);
 	this._anims = [];
 	this._currAnim = -1;
-	
+
 	var anims = arguments;
 	if(anims.length == 1 && (dojo.lang.isArray(anims[0]) || dojo.lang.isArrayLike(anims[0]))){
 		anims = anims[0];
 	}
-	
+
 	var _this = this;
 	dojo.lang.forEach(anims, function(anim, i, anims_arr){
 		_this._anims.push(anim);
@@ -390,7 +390,7 @@ dojo.inherits(dojo.lfx.Chain, dojo.lfx.IAnimation);
 dojo.lang.extend(dojo.lfx.Chain, {
 	// private members
 	_currAnim: -1,
-	
+
 	// public methods
 	play: function(delay, gotoStart){
 		if( !this._anims.length ) { return this; }
@@ -405,7 +405,7 @@ dojo.lang.extend(dojo.lfx.Chain, {
 			setTimeout(dojo.lang.hitch(this, function(){ this.play(null, gotoStart); }), delay);
 			return this;
 		}
-		
+
 		if(currentAnimation){
 			if(this._currAnim == 0){
 				this.fire("handler", ["begin", this._currAnim]);
@@ -416,7 +416,7 @@ dojo.lang.extend(dojo.lfx.Chain, {
 		}
 		return this;
 	},
-	
+
 	pause: function(){
 		if( this._anims[this._currAnim] ) {
 			this._anims[this._currAnim].pause();
@@ -424,7 +424,7 @@ dojo.lang.extend(dojo.lfx.Chain, {
 		}
 		return this;
 	},
-	
+
 	playPause: function(){
 		if(this._anims.length == 0){ return this; }
 		if(this._currAnim == -1){ this._currAnim = 0; }
@@ -438,7 +438,7 @@ dojo.lang.extend(dojo.lfx.Chain, {
 		}
 		return this;
 	},
-	
+
 	stop: function(){
 		var currAnim = this._anims[this._currAnim];
 		if(currAnim){
@@ -447,7 +447,7 @@ dojo.lang.extend(dojo.lfx.Chain, {
 		}
 		return currAnim;
 	},
-	
+
 	// private methods
 	_playNext: function(){
 		if( this._currAnim == -1 || this._anims.length == 0 ) { return this; }
diff --git a/webapp/src/main/webapp/src/lfx/__package__.js b/webapp/src/main/webapp/src/lfx/__package__.js
index 7e12e1c9d..5c1225298 100644
--- a/webapp/src/main/webapp/src/lfx/__package__.js
+++ b/webapp/src/main/webapp/src/lfx/__package__.js
@@ -12,4 +12,4 @@ dojo.kwCompoundRequire({
 	browser: ["dojo.lfx.html"],
 	dashboard: ["dojo.lfx.html"]
 });
-dojo.provide("dojo.lfx.*");
\ No newline at end of file
+dojo.provide("dojo.lfx.*");
diff --git a/webapp/src/main/webapp/src/lfx/extras.js b/webapp/src/main/webapp/src/lfx/extras.js
index 2597212da..eee6ffb6d 100644
--- a/webapp/src/main/webapp/src/lfx/extras.js
+++ b/webapp/src/main/webapp/src/lfx/extras.js
@@ -18,13 +18,13 @@ dojo.lfx.html.fadeWipeIn = function(nodes, duration, easing, callback){
 	var anim = dojo.lfx.combine(
 		dojo.lfx.wipeIn(nodes, duration, easing),
 		dojo.lfx.fadeIn(nodes, duration, easing));
-	
+
 	if(callback){
 		dojo.event.connect(anim, "onEnd", function(){
 			callback(nodes, anim);
 		});
 	}
-	
+
 	return anim;
 }
 
@@ -33,7 +33,7 @@ dojo.lfx.html.fadeWipeOut = function(nodes, duration, easing, callback){
 	var anim = dojo.lfx.combine(
 		dojo.lfx.wipeOut(nodes, duration, easing),
 		dojo.lfx.fadeOut(nodes, duration, easing));
-	
+
 	if(callback){
 		dojo.event.connect(anim, "onEnd", function(){
 			callback(nodes, anim);
@@ -61,7 +61,7 @@ dojo.lfx.html.scale = function(nodes, percentage, scaleContent, fromCenter, dura
 				start: origHeight,
 				end: origHeight * actualPct
 			}];
-		
+
 		if(scaleContent){
 			var fontSize = dojo.style.getStyle(node, 'font-size');
 			var fontSizeType = null;
@@ -83,7 +83,7 @@ dojo.lfx.html.scale = function(nodes, percentage, scaleContent, fromCenter, dura
 				end: fontSize * actualPct,
 				units: fontSizeType });
 		}
-		
+
 		if(fromCenter){
 			var positioning = dojo.style.getStyle(node, "position");
 			var originalTop = node.offsetTop;
@@ -101,7 +101,7 @@ dojo.lfx.html.scale = function(nodes, percentage, scaleContent, fromCenter, dura
 				end: (positioning == "absolute" ? originalLeft - endLeft : (-1*endLeft))
 			});
 		}
-		
+
 		var anim = dojo.lfx.propertyAnimation(node, props, duration, easing);
 		if(callback){
 			dojo.event.connect(anim, "onEnd", function(){
@@ -111,7 +111,7 @@ dojo.lfx.html.scale = function(nodes, percentage, scaleContent, fromCenter, dura
 
 		anims.push(anim);
 	});
-	
+
 	if(nodes.length > 1){ return dojo.lfx.combine(anims); }
 	else{ return anims[0]; }
 }
diff --git a/webapp/src/main/webapp/src/lfx/html.js b/webapp/src/main/webapp/src/lfx/html.js
index b6936c658..8c7096640 100644
--- a/webapp/src/main/webapp/src/lfx/html.js
+++ b/webapp/src/main/webapp/src/lfx/html.js
@@ -34,16 +34,16 @@ dojo.lfx.html._byId = function(nodes){
 	}
 }
 
-dojo.lfx.html.propertyAnimation = function(	/*DOMNode*/ nodes, 
-											/*Array*/ propertyMap, 
+dojo.lfx.html.propertyAnimation = function(	/*DOMNode*/ nodes,
+											/*Array*/ propertyMap,
 											/*int*/ duration,
 											/*function*/ easing){
 	nodes = dojo.lfx.html._byId(nodes);
-	
+
 	if(nodes.length==1){
 		// FIXME: we're only supporting start-value filling when one node is
 		// passed
-		
+
 		dojo.lang.forEach(propertyMap, function(prop){
 			if(typeof prop["start"] == "undefined"){
 				if(prop.property != "opacity"){
@@ -109,14 +109,14 @@ dojo.lfx.html.propertyAnimation = function(	/*DOMNode*/ nodes,
 			return ret;
 		}
 	}
-	
+
 	var anim = new dojo.lfx.Animation({
 		onAnimate: function(propValues){
 			dojo.lang.forEach(nodes, function(node){
 				setStyle(node, propValues);
 			});
 		} }, duration, new propLine(propertyMap), easing);
-	
+
 	return anim;
 }
 
@@ -181,7 +181,7 @@ dojo.lfx.html.fadeOut = function(nodes, duration, easing, callback){
 dojo.lfx.html.fadeShow = function(nodes, duration, easing, callback){
 	var anim = dojo.lfx.html.fadeIn(nodes, duration, easing, callback);
 	var oldBb = (anim["beforeBegin"]) ? dojo.lang.hitch(anim, "beforeBegin") : function(){};
-	anim.beforeBegin = function(){ 
+	anim.beforeBegin = function(){
 		oldBb();
 		if(dojo.lang.isArrayLike(nodes)){
 			dojo.lang.forEach(nodes, dojo.style.show);
@@ -189,7 +189,7 @@ dojo.lfx.html.fadeShow = function(nodes, duration, easing, callback){
 			dojo.style.show(nodes);
 		}
 	};
-	
+
 	return anim;
 }
 
@@ -202,7 +202,7 @@ dojo.lfx.html.fadeHide = function(nodes, duration, easing, callback){
 		}
 		if(callback){ callback(nodes, anim); }
 	});
-	
+
 	return anim;
 }
 
@@ -217,22 +217,22 @@ dojo.lfx.html.wipeIn = function(nodes, duration, easing, callback){
 		}
 		node.style.height = "0px";
 		dojo.style.show(node);
-		
+
 		var anim = dojo.lfx.propertyAnimation(node,
 			[{	property: "height",
 				start: 0,
 				end: node.scrollHeight }], duration, easing);
-		
+
 		var oldOnEnd = (anim["onEnd"]) ? dojo.lang.hitch(anim, "onEnd") : function(){};
-		anim.onEnd = function(){ 
-			oldOnEnd(); 
+		anim.onEnd = function(){
+			oldOnEnd();
 			node.style.overflow = overflow;
 			node.style.height = "auto";
 			if(callback){ callback(node, anim); }
 		};
 		anims.push(anim);
 	});
-	
+
 	if(nodes.length > 1){ return dojo.lfx.combine(anims); }
 	else{ return anims[0]; }
 }
@@ -240,7 +240,7 @@ dojo.lfx.html.wipeIn = function(nodes, duration, easing, callback){
 dojo.lfx.html.wipeOut = function(nodes, duration, easing, callback){
 	nodes = dojo.lfx.html._byId(nodes);
 	var anims = [];
-	
+
 	dojo.lang.forEach(nodes, function(node){
 		var overflow = dojo.style.getStyle(node, "overflow");
 		if(overflow == "visible") {
@@ -252,10 +252,10 @@ dojo.lfx.html.wipeOut = function(nodes, duration, easing, callback){
 			[{	property: "height",
 				start: dojo.style.getContentBoxHeight(node),
 				end: 0 } ], duration, easing);
-		
+
 		var oldOnEnd = (anim["onEnd"]) ? dojo.lang.hitch(anim, "onEnd") : function(){};
-		anim.onEnd = function(){ 
-			oldOnEnd(); 
+		anim.onEnd = function(){
+			oldOnEnd();
 			dojo.style.hide(node);
 			node.style.overflow = overflow;
 			if(callback){ callback(node, anim); }
@@ -274,7 +274,7 @@ dojo.lfx.html.slideTo = function(nodes, coords, duration, easing, callback){
 	dojo.lang.forEach(nodes, function(node){
 		var top = null;
 		var left = null;
-		
+
 		var init = (function(){
 			var innerNode = node;
 			return function(){
@@ -290,7 +290,7 @@ dojo.lfx.html.slideTo = function(nodes, coords, duration, easing, callback){
 			}
 		})();
 		init();
-		
+
 		var anim = dojo.lfx.propertyAnimation(node,
 			[{	property: "top",
 				start: top,
@@ -298,7 +298,7 @@ dojo.lfx.html.slideTo = function(nodes, coords, duration, easing, callback){
 			{	property: "left",
 				start: left,
 				end: coords[1] }], duration, easing);
-		
+
 		var oldBb = (anim["beforeBegin"]) ? dojo.lang.hitch(anim, "beforeBegin") : function(){};
 		anim.beforeBegin = function(){ oldBb(); init(); };
 
@@ -309,7 +309,7 @@ dojo.lfx.html.slideTo = function(nodes, coords, duration, easing, callback){
 
 		anims.push(anim);
 	});
-	
+
 	if(nodes.length > 1){ return dojo.lfx.combine(anims); }
 	else{ return anims[0]; }
 }
@@ -321,7 +321,7 @@ dojo.lfx.html.slideBy = function(nodes, coords, duration, easing, callback){
 	dojo.lang.forEach(nodes, function(node){
 		var top = null;
 		var left = null;
-		
+
 		var init = (function(){
 			var innerNode = node;
 			return function(){
@@ -337,7 +337,7 @@ dojo.lfx.html.slideBy = function(nodes, coords, duration, easing, callback){
 			}
 		})();
 		init();
-		
+
 		var anim = dojo.lfx.propertyAnimation(node,
 			[{	property: "top",
 				start: top,
@@ -390,7 +390,7 @@ dojo.lfx.html.explode = function(start, endNode, duration, easing, callback){
 		{ property: "left", start: startCoords[0], end: endCoords[0] },
 		{ property: "opacity", start: 0.3, end: 1.0 }
 	], duration, easing);
-	
+
 	anim.beforeBegin = function(){
 		dojo.style.setDisplay(outline, "block");
 	};
@@ -427,7 +427,7 @@ dojo.lfx.html.implode = function(startNode, end, duration, easing, callback){
 		{ property: "left", start: startCoords[0], end: endCoords[0] },
 		{ property: "opacity", start: 1.0, end: 0.3 }
 	], duration, easing);
-	
+
 	anim.beforeBegin = function(){
 		dojo.style.hide(startNode);
 		dojo.style.show(outline);
@@ -463,7 +463,7 @@ dojo.lfx.html.highlight = function(nodes, startColor, duration, easing, callback
 		}], duration, easing);
 
 		var oldbb = (anim["beforeBegin"]) ? dojo.lang.hitch(anim, "beforeBegin") : function(){};
-		anim.beforeBegin = function(){ 
+		anim.beforeBegin = function(){
 			oldbb();
 			if(bgImage){
 				node.style.backgroundImage = "none";
@@ -472,7 +472,7 @@ dojo.lfx.html.highlight = function(nodes, startColor, duration, easing, callback
 		};
 
 		var oldOnEnd = (anim["onEnd"]) ? dojo.lang.hitch(anim, "onEnd") : function(){};
-		anim.onEnd = function(){ 
+		anim.onEnd = function(){
 			oldOnEnd();
 			if(bgImage){
 				node.style.backgroundImage = bgImage;
@@ -501,7 +501,7 @@ dojo.lfx.html.unhighlight = function(nodes, endColor, duration, easing, callback
 		var rgb = new dojo.graphics.color.Color(endColor);
 
 		var bgImage = dojo.style.getStyle(node, "background-image");
-		
+
 		var anim = dojo.lfx.propertyAnimation(node, [{
 			property: "background-color",
 			start: color,
@@ -509,7 +509,7 @@ dojo.lfx.html.unhighlight = function(nodes, endColor, duration, easing, callback
 		}], duration, easing);
 
 		var oldbb = (anim["beforeBegin"]) ? dojo.lang.hitch(anim, "beforeBegin") : function(){};
-		anim.beforeBegin = function(){ 
+		anim.beforeBegin = function(){
 			oldbb();
 			if(bgImage){
 				node.style.backgroundImage = "none";
@@ -518,7 +518,7 @@ dojo.lfx.html.unhighlight = function(nodes, endColor, duration, easing, callback
 		};
 
 		var oldOnEnd = (anim["onEnd"]) ? dojo.lang.hitch(anim, "onEnd") : function(){};
-		anim.onEnd = function(){ 
+		anim.onEnd = function(){
 			oldOnEnd();
 			if(callback){
 				callback(node, anim);
diff --git a/webapp/src/main/webapp/src/lfx/toggle.js b/webapp/src/main/webapp/src/lfx/toggle.js
index c6b3022fa..43836e001 100644
--- a/webapp/src/main/webapp/src/lfx/toggle.js
+++ b/webapp/src/main/webapp/src/lfx/toggle.js
@@ -16,7 +16,7 @@ dojo.lfx.toggle.plain = {
 		dojo.style.show(node);
 		if(dojo.lang.isFunction(callback)){ callback(); }
 	},
-	
+
 	hide: function(node, duration, easing, callback){
 		dojo.style.hide(node);
 		if(dojo.lang.isFunction(callback)){ callback(); }
diff --git a/webapp/src/main/webapp/src/loader.js b/webapp/src/main/webapp/src/loader.js
index a222e9430..34379fb45 100644
--- a/webapp/src/main/webapp/src/loader.js
+++ b/webapp/src/main/webapp/src/loader.js
@@ -21,25 +21,25 @@
 	//Additional properties for dojo.hostenv
 	var _addHostEnv = {
 		pkgFileName: "__package__",
-	
+
 		// for recursion protection
 		loading_modules_: {},
 		loaded_modules_: {},
 		addedToLoadingCount: [],
 		removedFromLoadingCount: [],
-	
+
 		inFlightCount: 0,
-	
+
 		// FIXME: it should be possible to pull module prefixes in from djConfig
 		modulePrefixes_: {
 			dojo: {name: "dojo", value: "src"}
 		},
-	
-	
+
+
 		setModulePrefix: function(module, prefix){
 			this.modulePrefixes_[module] = {name: module, value: prefix};
 		},
-	
+
 		getModulePrefix: function(module){
 			var mp = this.modulePrefixes_;
 			if((mp[module])&&(mp[module]["name"])){
@@ -51,16 +51,16 @@
 		getTextStack: [],
 		loadUriStack: [],
 		loadedUris: [],
-	
+
 		//WARNING: This variable is referenced by packages outside of bootstrap: FloatingPane.js and undo/browser.js
 		post_load_: false,
-		
+
 		//Egad! Lots of test files push on this directly instead of using dojo.addOnLoad.
 		modulesLoadedListeners: [],
 		unloadListeners: [],
 		loadNotifying: false
 	};
-	
+
 	//Add all of these properties to dojo.hostenv
 	for(var param in _addHostEnv){
 		dojo.hostenv[param] = _addHostEnv[param];
@@ -201,7 +201,7 @@ dojo.addOnUnload = function(obj, fcnName){
 dojo.hostenv.modulesLoaded = function(){
 	if(this.post_load_){ return; }
 	if((this.loadUriStack.length==0)&&(this.getTextStack.length==0)){
-		if(this.inFlightCount > 0){ 
+		if(this.inFlightCount > 0){
 			dojo.debug("files still in flight!");
 			return;
 		}
@@ -231,7 +231,7 @@ dojo.hostenv.getModuleSymbols = function(modulename) {
 }
 
 /**
-* loadModule("A.B") first checks to see if symbol A.B is defined. 
+* loadModule("A.B") first checks to see if symbol A.B is defined.
 * If it is, it is simply returned (nothing to do).
 *
 * If it is not defined, it will look for "A/B.js" in the script root directory,
@@ -326,7 +326,7 @@ dojo.hostenv.loadModule = function(modulename, exact_only, omit_module_check){
 		// pass in false so we can give better error
 		module = this.findModule(modulename, false);
 		if(!module){
-			dojo.raise("symbol '" + modulename + "' is not defined after loading '" + relpath + "'"); 
+			dojo.raise("symbol '" + modulename + "' is not defined after loading '" + relpath + "'");
 		}
 	}
 
diff --git a/webapp/src/main/webapp/src/loader_xd.js b/webapp/src/main/webapp/src/loader_xd.js
index ead984ad5..67a3d7f47 100644
--- a/webapp/src/main/webapp/src/loader_xd.js
+++ b/webapp/src/main/webapp/src/loader_xd.js
@@ -63,7 +63,7 @@ dojo.hostenv.createXdPackage = function(contents){
 	output.push("\ndefinePackage: function(dojo){");
 	output.push(contents);
 	output.push("\n}});");
-	
+
 	return output.join("");
 }
 
@@ -127,7 +127,7 @@ dojo.hostenv.loadUri = function(uri, cb, currentIsXDomain, module){
 		//Increment inFlightCount
 		//This will stop the modulesLoaded from firing all the way.
 		this.inFlightCount++;
-				
+
 		//Start timer
 		if(!this.xdTimer){
 			this.xdTimer = setInterval("dojo.hostenv.watchInFlightXDomain();", 100);
@@ -158,7 +158,7 @@ dojo.hostenv.loadUri = function(uri, cb, currentIsXDomain, module){
 	}else{
 		var contents = this.getText(uri, null, true);
 		if(contents == null){ return 0; }
-		
+
 		if(this.isXDomain){
 			var pkg = this.createXdPackage(contents);
 			dj_eval(pkg);
@@ -229,7 +229,7 @@ dojo.hostenv.packageLoaded = function(pkg){
 		}
 
 		//Now update the inflight status for any provided packages in this loaded package.
-		//Do this at the very end (in a *separate* for loop) to avoid shutting down the 
+		//Do this at the very end (in a *separate* for loop) to avoid shutting down the
 		//inflight timer check too soon.
 		for(var i = 0; i < provideList.length; i++){
 			this.xdInFlight[provideList[i]] = false;
@@ -265,7 +265,7 @@ dojo.hostenv.unpackXdDependency = function(dep){
 		case "hostenv.conditionalLoadModule":
 			var modMap = dep[1];
 			var common = modMap["common"]||[];
-			var newDeps = (modMap[dojo.hostenv.name_]) ? common.concat(modMap[dojo.hostenv.name_]||[]) : common.concat(modMap["default"]||[]);	
+			var newDeps = (modMap[dojo.hostenv.name_]) ? common.concat(modMap[dojo.hostenv.name_]||[]) : common.concat(modMap["default"]||[]);
 			dojo.hostenv.flattenRequireArray(newDeps);
 			break;
 		case "require":
@@ -366,7 +366,7 @@ dojo.hostenv.watchInFlightXDomain = function(){
 	}
 
 	//If any are true, then still waiting.
-	//Come back later.	
+	//Come back later.
 	for(var param in this.xdInFlight){
 		if(this.xdInFlight[param]){
 			return;
@@ -395,7 +395,7 @@ dojo.hostenv.watchInFlightXDomain = function(){
 	this.resetXd();
 
 	//Clear inflight count so we will finally do finish work.
-	this.inFlightCount = 0; 
+	this.inFlightCount = 0;
 	this.callLoaded();
 }
 
diff --git a/webapp/src/main/webapp/src/logging/Logger.js b/webapp/src/main/webapp/src/logging/Logger.js
index 21a37dc6e..1a17bc1de 100644
--- a/webapp/src/main/webapp/src/logging/Logger.js
+++ b/webapp/src/main/webapp/src/logging/Logger.js
@@ -368,13 +368,13 @@ dojo.logging.MemoryLogHandler = function(level, recordsToKeep, postType, postInt
 	this.postType = (typeof djConfig['loggingPostType'] != 'undefined') ? djConfig['loggingPostType'] : ( postType || -1);
 	// milliseconds for time, interger for number of records, -1 for non-posting,
 	this.postInterval = (typeof djConfig['loggingPostInterval'] != 'undefined') ? djConfig['loggingPostInterval'] : ( postType || -1);
-	
+
 }
 // prototype inheritance
 dojo.logging.MemoryLogHandler.prototype = new dojo.logging.LogHandler();
 
 // FIXME
-// dojo.inherits(dojo.logging.MemoryLogHandler, 
+// dojo.inherits(dojo.logging.MemoryLogHandler,
 
 // over-ride base-class
 dojo.logging.MemoryLogHandler.prototype.emit = function(record){
diff --git a/webapp/src/main/webapp/src/reflect/reflection.js b/webapp/src/main/webapp/src/reflect/reflection.js
index caed8244e..e32bc838d 100644
--- a/webapp/src/main/webapp/src/reflect/reflection.js
+++ b/webapp/src/main/webapp/src/reflect/reflection.js
@@ -27,17 +27,17 @@ if(!dj_global){ var dj_global = this; }
 
 dojo.reflect = {} ;
 dojo.reflect.$unknownType = function(){ } ;
-dojo.reflect.ParameterInfo = function(name, type){ 
+dojo.reflect.ParameterInfo = function(name, type){
 	this.name = name ;
 	this.type = (type) ? type : dojo.reflect.$unknownType ;
 } ;
-dojo.reflect.PropertyInfo = function(name, type) { 
+dojo.reflect.PropertyInfo = function(name, type) {
 	this.name = name ;
 	this.type = (type) ? type : dojo.reflect.$unknownType ;
 } ;
 dojo.reflect.MethodInfo = function(name, fn){
 	var parse = function(f) {
-		var o = {} ; 
+		var o = {} ;
 		var s = f.toString() ;
 		var param = ((s.substring(s.indexOf('(')+1, s.indexOf(')'))).replace(/\s+/g, "")).split(",") ;
 		o.parameters = [] ;
@@ -51,7 +51,7 @@ dojo.reflect.MethodInfo = function(name, fn){
 	var tmp = parse(fn) ;
 	var p = tmp.parameters ;
 	var body = tmp.body ;
-	
+
 	this.name = (name) ? name : "anonymous" ;
 	this.getParameters = function(){ return p ; } ;
 	this.getNullArgumentsObject = function() {
@@ -70,7 +70,7 @@ dojo.reflect.MethodInfo = function(name, fn){
 dojo.reflect.Activator = new (function(){
 	this.createInstance = function(type, args) {
 		switch (typeof(type)) {
-			case "function" : { 
+			case "function" : {
 				var o = {} ;
 				type.apply(o, args) ;
 				return o ;
@@ -87,18 +87,18 @@ dojo.reflect.Activator = new (function(){
 
 dojo.reflect.Reflector = new (function(){
 	this.getTypeFromString = function(s) {
-		var parts = s.split("."), i = 0, obj = dj_global ; 
-		do { obj = obj[parts[i++]] ; } while (i < parts.length && obj) ; 
+		var parts = s.split("."), i = 0, obj = dj_global ;
+		do { obj = obj[parts[i++]] ; } while (i < parts.length && obj) ;
 		return (obj != dj_global) ? obj : null ;
-	}; 
+	};
 
 	this.typeExists = function(s) {
-		var parts = s.split("."), i = 0, obj = dj_global ; 
-		do { obj = obj[parts[i++]] ; } while (i < parts.length && obj) ; 
+		var parts = s.split("."), i = 0, obj = dj_global ;
+		do { obj = obj[parts[i++]] ; } while (i < parts.length && obj) ;
 		return (obj && obj != dj_global) ;
-	}; 
+	};
 
-	this.getFieldsFromType = function(s) { 
+	this.getFieldsFromType = function(s) {
 		var type = s ;
 		if (typeof(s) == "string") {
 			type = this.getTypeFromString(s) ;
@@ -107,7 +107,7 @@ dojo.reflect.Reflector = new (function(){
 		return this.getFields(dojo.reflect.Activator.createInstance(s, nullArgs)) ;
 	};
 
-	this.getPropertiesFromType = function(s) { 
+	this.getPropertiesFromType = function(s) {
 		var type = s ;
 		if (typeof(s) == "string") {
 			type = this.getTypeFromString(s);
@@ -116,7 +116,7 @@ dojo.reflect.Reflector = new (function(){
 		return this.getProperties(dojo.reflect.Activator.createInstance(s, nullArgs)) ;
 	};
 
-	this.getMethodsFromType = function(s) { 
+	this.getMethodsFromType = function(s) {
 		var type = s ;
 		if (typeof(s) == "string") {
 			type = this.getTypeFromString(s) ;
@@ -129,7 +129,7 @@ dojo.reflect.Reflector = new (function(){
 
 	this.getFields = function(obj) {
 		var arr = [] ;
-		for (var p in obj) { 
+		for (var p in obj) {
 			if(this.getType(obj[p]) != Function){
 				arr.push(new dojo.reflect.PropertyInfo(p, this.getType(obj[p]))) ;
 			}else{
@@ -181,16 +181,16 @@ dojo.reflect.Reflector = new (function(){
 		return Object ;
 	} ;
 
-	this.isInstanceOf = function(o, type) { 
-		return (this.getType(o) == type) ; 
+	this.isInstanceOf = function(o, type) {
+		return (this.getType(o) == type) ;
 	};
 
-	this.isSubTypeOf = function(o, type) { 
-		return (o instanceof type) ; 
+	this.isSubTypeOf = function(o, type) {
+		return (o instanceof type) ;
 	};
 
-	this.isBaseTypeOf = function(o, type) { 
-		return (type instanceof o); 
+	this.isBaseTypeOf = function(o, type) {
+		return (type instanceof o);
 	};
 })();
 
diff --git a/webapp/src/main/webapp/src/regexp.js b/webapp/src/main/webapp/src/regexp.js
index f07ceb4e1..4ba5ae89f 100644
--- a/webapp/src/main/webapp/src/regexp.js
+++ b/webapp/src/main/webapp/src/regexp.js
@@ -34,11 +34,11 @@ dojo.regexp.tld = function(flags) {
 	var infraRE = "arpa";
 
 	// Generic top-level domains RE.
-	var genericRE = 
+	var genericRE =
 		"aero|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|xxx|jobs|mobi|post";
-	
+
 	// Country Code top-level domains RE
-	var ccRE = 
+	var ccRE =
 		"ac|ad|ae|af|ag|ai|al|am|an|ao|aq|ar|as|at|au|aw|az|ba|bb|bd|be|bf|bg|bh|bi|bj|bm|bn|bo|br|" +
 		"bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|cr|cu|cv|cx|cy|cz|de|dj|dk|dm|do|dz|" +
 		"ec|ee|eg|er|es|et|fi|fj|fk|fm|fo|fr|ga|gd|ge|gf|gg|gh|gi|gl|gm|gn|gp|gq|gr|gs|gt|gu|gw|gy|" +
@@ -92,34 +92,34 @@ dojo.regexp.ipAddress = function(flags) {
 	if (typeof flags.allowHybrid != "boolean") { flags.allowHybrid = true; }
 
 	// decimal-dotted IP address RE.
-	var dottedDecimalRE = 
+	var dottedDecimalRE =
 		// Each number is between 0-255.  Zero padding is not allowed.
 		"((\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])\\.){3}(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])";
 
 	// dotted hex IP address RE.  Each number is between 0x0-0xff.  Zero padding is allowed, e.g. 0x00.
 	var dottedHexRE = "(0[xX]0*[\\da-fA-F]?[\\da-fA-F]\\.){3}0[xX]0*[\\da-fA-F]?[\\da-fA-F]";
 
-	// dotted octal IP address RE.  Each number is between 0000-0377.  
+	// dotted octal IP address RE.  Each number is between 0000-0377.
 	// Zero padding is allowed, but each number must have at least 4 characters.
 	var dottedOctalRE = "(0+[0-3][0-7][0-7]\\.){3}0+[0-3][0-7][0-7]";
 
-	// decimal IP address RE.  A decimal number between 0-4294967295.  
+	// decimal IP address RE.  A decimal number between 0-4294967295.
 	var decimalRE =  "(0|[1-9]\\d{0,8}|[1-3]\\d{9}|4[01]\\d{8}|42[0-8]\\d{7}|429[0-3]\\d{6}|" +
 		"4294[0-8]\\d{5}|42949[0-5]\\d{4}|429496[0-6]\\d{3}|4294967[01]\\d{2}|42949672[0-8]\\d|429496729[0-5])";
 
-	// hexadecimal IP address RE. 
+	// hexadecimal IP address RE.
 	// A hexadecimal number between 0x0-0xFFFFFFFF. Case insensitive.  Zero padding is allowed.
 	var hexRE = "0[xX]0*[\\da-fA-F]{1,8}";
 
-	// IPv6 address RE. 
+	// IPv6 address RE.
 	// The format is written as eight groups of four hexadecimal digits, x:x:x:x:x:x:x:x,
-	// where x is between 0000-ffff. Zero padding is optional. Case insensitive. 
+	// where x is between 0000-ffff. Zero padding is optional. Case insensitive.
 	var ipv6RE = "([\\da-fA-F]{1,4}\\:){7}[\\da-fA-F]{1,4}";
 
-	// IPv6/IPv4 Hybrid address RE. 
-	// The format is written as six groups of four hexadecimal digits, 
+	// IPv6/IPv4 Hybrid address RE.
+	// The format is written as six groups of four hexadecimal digits,
 	// followed by the 4 dotted decimal IPv4 format. x:x:x:x:x:x:d.d.d.d
-	var hybridRE = "([\\da-fA-F]{1,4}\\:){6}" + 
+	var hybridRE = "([\\da-fA-F]{1,4}\\:){6}" +
 		"((\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])\\.){3}(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])";
 
 	// Build IP Address RE
@@ -178,7 +178,7 @@ dojo.regexp.host = function(flags) {
   Builds a regular expression that matches a URL.
 
   @param flags  An object.
-    flags.scheme  Can be true, false, or [true, false]. 
+    flags.scheme  Can be true, false, or [true, false].
       This means: required, not allowed, or match either one.
     flags in regexp.host can be applied.
     flags in regexp.ipAddress can be applied.
@@ -252,7 +252,7 @@ dojo.regexp.emailAddressList = function(flags) {
 
 	// build a RE for an Email Address List
 	var emailAddressRE = dojo.regexp.emailAddress(flags);
-	var emailAddressListRE = "(" + emailAddressRE + "\\s*[" + flags.listSeparator + "]\\s*)*" + 
+	var emailAddressListRE = "(" + emailAddressRE + "\\s*[" + flags.listSeparator + "]\\s*)*" +
 		emailAddressRE + "\\s*[" + flags.listSeparator + "]?\\s*";
 
 	return emailAddressListRE;
@@ -282,11 +282,11 @@ dojo.regexp.integer = function(flags) {
 
 	// number RE
 	var numberRE = dojo.regexp.buildGroupRE(flags.separator,
-		function(sep) { 
-			if ( sep == "" ) { 
-				return "(0|[1-9]\\d*)"; 
+		function(sep) {
+			if ( sep == "" ) {
+				return "(0|[1-9]\\d*)";
 			}
-			return "(0|[1-9]\\d{0,2}([" + sep + "]\\d{3})*)"; 
+			return "(0|[1-9]\\d{0,2}([" + sep + "]\\d{3})*)";
 		}
 	);
 	var numberRE;
@@ -304,7 +304,7 @@ dojo.regexp.integer = function(flags) {
     flags.decimal  A string for the character used as the decimal point.  Default is ".".
     flags.exponent  Express in exponential notation.  Can be true, false, or [true, false].
       Default is [true, false], (i.e. will match if the exponential part is present are not).
-    flags.eSigned  The leading plus-or-minus sign on the exponent.  Can be true, false, 
+    flags.eSigned  The leading plus-or-minus sign on the exponent.  Can be true, false,
       or [true, false].  Default is [true, false], (i.e. will match if it is signed or unsigned).
     flags in regexp.integer can be applied.
 
@@ -323,18 +323,18 @@ dojo.regexp.realNumber = function(flags) {
 
 	// decimal RE
 	var decimalRE = "";
-	if ( flags.places == Infinity) { 
-		decimalRE = "(\\" + flags.decimal + "\\d+)?"; 
+	if ( flags.places == Infinity) {
+		decimalRE = "(\\" + flags.decimal + "\\d+)?";
 	}
-	else if ( flags.places > 0) { 
-		decimalRE = "\\" + flags.decimal + "\\d{" + flags.places + "}"; 
+	else if ( flags.places > 0) {
+		decimalRE = "\\" + flags.decimal + "\\d{" + flags.places + "}";
 	}
 
 	// exponent RE
 	var exponentRE = dojo.regexp.buildGroupRE(flags.exponent,
-		function(q) { 
+		function(q) {
 			if (q) { return "([eE]" + dojo.regexp.integer({signed: flags.eSigned}) + ")"; }
-			return ""; 
+			return "";
 		}
 	);
 
@@ -348,7 +348,7 @@ dojo.regexp.realNumber = function(flags) {
   @param flags  An object.
     flags.signed  The leading plus-or-minus sign.  Can be true, false, or [true, false].
       Default is [true, false], (i.e. will match if it is signed or unsigned).
-    flags.symbol  A currency symbol such as Yen "�", Pound "�", or the Euro sign "�".  
+    flags.symbol  A currency symbol such as Yen "�", Pound "�", or the Euro sign "�".
       Default is "$".  For more than one symbol use an array, e.g. ["$", ""], makes $ optional.
     flags.placement  The symbol can come "before" the number or "after".  Default is "before".
     flags.separator  The character used as the thousands separator. The default is ",".
@@ -375,7 +375,7 @@ dojo.regexp.currency = function(flags) {
 
 	// build symbol RE
 	var symbolRE = dojo.regexp.buildGroupRE(flags.symbol,
-		function(symbol) { 
+		function(symbol) {
 			// escape all special characters
 			return "\\s?" + symbol.replace( /([.$?*!=:|\\\/^])/g, "\\$1") + "\\s?";
 		}
@@ -417,8 +417,8 @@ dojo.regexp.us.state = function(flags) {
 	if (typeof flags.allowMilitary != "boolean") { flags.allowMilitary = true; }
 
 	// state RE
-	var statesRE = 
-		"AL|AK|AZ|AR|CA|CO|CT|DE|DC|FL|GA|HI|ID|IL|IN|IA|KS|KY|LA|ME|MD|MA|MI|MN|MS|MO|MT|" + 
+	var statesRE =
+		"AL|AK|AZ|AR|CA|CO|CT|DE|DC|FL|GA|HI|ID|IL|IN|IA|KS|KY|LA|ME|MD|MA|MI|MN|MS|MO|MT|" +
 		"NE|NV|NH|NJ|NM|NY|NC|ND|OH|OK|OR|PA|RI|SC|SD|TN|TX|UT|VT|VA|WA|WV|WI|WY";
 
 	// territories RE
@@ -503,7 +503,7 @@ dojo.regexp.time = function(flags) {
     ?        Stands for an optional digit, 0-9 or nothing.
     All other characters must appear literally in the expression.
 
-  Example   
+  Example
     "(###) ###-####"       ->   (510) 542-9742
     "(###) ###-#### x#???" ->   (510) 542-9742 x153
     "###-##-####"          ->   506-82-1089       i.e. social security number
@@ -544,13 +544,13 @@ dojo.regexp.numberFormat = function(flags) {
   re builds one subexpression for each elem in the array a, in the first parameter.
 
   @param a  A single value or an array of values.
-  @param re  A function.  Takes one parameter and converts it to a regular expression. 
+  @param re  A function.  Takes one parameter and converts it to a regular expression.
   @return  A string for a regular expression that groups all the subexpressions.
 */
 dojo.regexp.buildGroupRE = function(a, re) {
 
 	// case 1: a is a single value.
-	if ( !( a instanceof Array ) ) { 
+	if ( !( a instanceof Array ) ) {
 		return re(a);
 	}
 
diff --git a/webapp/src/main/webapp/src/rpc/JsonService.js b/webapp/src/main/webapp/src/rpc/JsonService.js
index 036d1b9a1..9315710bd 100644
--- a/webapp/src/main/webapp/src/rpc/JsonService.js
+++ b/webapp/src/main/webapp/src/rpc/JsonService.js
@@ -60,7 +60,7 @@ dojo.inherits(dojo.rpc.JsonService, dojo.rpc.RpcService);
 dojo.lang.extend(dojo.rpc.JsonService, {
 
 	bustCache: false,
-	
+
 	contentType: "application/json-rpc",
 
 	lastSubmissionId: 0,
@@ -79,7 +79,7 @@ dojo.lang.extend(dojo.rpc.JsonService, {
 			contentType: this.contentType,
 			mimetype: "text/json",
 			load: this.resultCallback(deferredRequestHandler),
-			preventCache:this.bustCache 
+			preventCache:this.bustCache
 		});
 	},
 
diff --git a/webapp/src/main/webapp/src/rpc/RpcService.js b/webapp/src/main/webapp/src/rpc/RpcService.js
index 8a1d43c10..d4a76dd47 100644
--- a/webapp/src/main/webapp/src/rpc/RpcService.js
+++ b/webapp/src/main/webapp/src/rpc/RpcService.js
@@ -29,7 +29,7 @@ dojo.lang.extend(dojo.rpc.RpcService, {
 
 	parseResults: function(obj){
 		// summary
-		// parse the results coming back from an rpc request.  
+		// parse the results coming back from an rpc request.
    		// this base implementation, just returns the full object
 		// subclasses should parse and only return the actual results
 		return obj;
@@ -46,10 +46,10 @@ dojo.lang.extend(dojo.rpc.RpcService, {
 	resultCallback: function(/* dojo.rpc.Deferred */ deferredRequestHandler){
 		// summary
 		// create callback that calls the Deferred's callback method
-		var tf = dojo.lang.hitch(this, 
+		var tf = dojo.lang.hitch(this,
 			function(type, obj, e){
 				var results = this.parseResults(obj||e);
-				deferredRequestHandler.callback(results); 
+				deferredRequestHandler.callback(results);
 			}
 		);
 		return tf;
@@ -87,7 +87,7 @@ dojo.lang.extend(dojo.rpc.RpcService, {
 				if(m && m["name"]){
 					dojo.debug("RpcService: Creating Method: this.", m.name, "()");
 					this[m.name] = this.generateMethod(	m.name,
-														m.parameters, 
+														m.parameters,
 														m["url"]||m["serviceUrl"]||m["serviceURL"]);
 					if(dojo.lang.isFunction(this[m.name])){
 						dojo.debug("RpcService: Successfully created", m.name, "()");
@@ -111,6 +111,6 @@ dojo.lang.extend(dojo.rpc.RpcService, {
 			mimetype: "text/json",
 			load: dojo.lang.hitch(this, function(type, object, e){ return this.processSmd(object); }),
 			sync: true
-		});		
+		});
 	}
 });
diff --git a/webapp/src/main/webapp/src/storage.js b/webapp/src/main/webapp/src/storage.js
index 342fe9e12..308a8abca 100644
--- a/webapp/src/main/webapp/src/storage.js
+++ b/webapp/src/main/webapp/src/storage.js
@@ -8,11 +8,11 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-/** 
+/**
 		FIXME: Write better docs.
 
 		@author Alex Russel, alex@dojotoolkit.org
-		@author Brad Neuberg, bkn3@columbia.edu 
+		@author Brad Neuberg, bkn3@columbia.edu
 */
 dojo.provide("dojo.storage");
 dojo.provide("dojo.storage.StorageProvider");
@@ -23,10 +23,10 @@ dojo.require("dojo.event.*");
 
 /** The base class for all storage providers. */
 
-/** 
+/**
 	 The constructor for a storage provider. You should avoid initialization
 	 in the constructor; instead, define initialization in your initialize()
-	 method. 
+	 method.
 */
 dojo.storage = function(){
 }
@@ -34,91 +34,91 @@ dojo.storage = function(){
 dojo.lang.extend(dojo.storage, {
 	/** A put() call to a storage provider was succesful. */
 	SUCCESS: "success",
-	
+
 	/** A put() call to a storage provider failed. */
 	FAILED: "failed",
-	
+
 	/** A put() call to a storage provider is pending user approval. */
 	PENDING: "pending",
-	
-	/** 
+
+	/**
 	  Returned by getMaximumSize() if this storage provider can not determine
-	  the maximum amount of data it can support. 
+	  the maximum amount of data it can support.
 	*/
 	SIZE_NOT_AVAILABLE: "Size not available",
-	
+
 	/**
 	  Returned by getMaximumSize() if this storage provider has no theoretical
-	  limit on the amount of data it can store. 
+	  limit on the amount of data it can store.
 	*/
 	SIZE_NO_LIMIT: "No size limit",
-	
-	/** 
+
+	/**
 	  The namespace for all storage operations. This is useful if
 	  several applications want access to the storage system from the same
-	  domain but want different storage silos. 
+	  domain but want different storage silos.
 	*/
 	namespace: "dojoStorage",
-	
-	/**  
-	  If a function is assigned to this property, then 
+
+	/**
+	  If a function is assigned to this property, then
 	  when the settings provider's UI is closed this
 	  function is called. Useful, for example, if the
 	  user has just cleared out all storage for this
-	  provider using the settings UI, and you want to 
+	  provider using the settings UI, and you want to
 	  update your UI.
 	*/
 	onHideSettingsUI: null,
 
-	/** 
+	/**
 	  Allows this storage provider to initialize itself. This is called
-	  after the page has finished loading, so you can not do document.writes(). 
+	  after the page has finished loading, so you can not do document.writes().
 	*/
 	initialize: function(){
 	 dojo.unimplemented("dojo.storage.initialize");
 	},
-	
-	/** 
-	  Returns whether this storage provider is 
-	  available on this platform. 
-	
-	  @returns True or false if this storage 
+
+	/**
+	  Returns whether this storage provider is
+	  available on this platform.
+
+	  @returns True or false if this storage
 	  provider is supported.
 	*/
 	isAvailable: function(){
 		dojo.unimplemented("dojo.storage.isAvailable");
 	},
-	
+
 	/**
 	  Puts a key and value into this storage system.
 
-	  @param key A string key to use when retrieving 
+	  @param key A string key to use when retrieving
 	         this value in the future.
-	  @param value A value to store; this can be 
+	  @param value A value to store; this can be
 	         any JavaScript type.
-	  @param resultsHandler A callback function 
+	  @param resultsHandler A callback function
 	         that will receive three arguments.
-	         The first argument is one of three 
+	         The first argument is one of three
 	         values: dojo.storage.SUCCESS,
-	         dojo.storage.FAILED, or 
-	         dojo.storage.PENDING; these values 
-	         determine how the put request went. 
+	         dojo.storage.FAILED, or
+	         dojo.storage.PENDING; these values
+	         determine how the put request went.
 	         In some storage systems users can deny
-	         a storage request, resulting in a 
-	         dojo.storage.FAILED, while in 
-	         other storage systems a storage 
+	         a storage request, resulting in a
+	         dojo.storage.FAILED, while in
+	         other storage systems a storage
 	         request must wait for user approval,
-	         resulting in a dojo.storage.PENDING 
+	         resulting in a dojo.storage.PENDING
 	         status until the request
-	         is either approved or denied, 
+	         is either approved or denied,
 	         resulting in another call back
-	         with dojo.storage.SUCCESS. 
-  
+	         with dojo.storage.SUCCESS.
+
 	  The second argument in the call back is the key name
 	  that was being stored.
-	  
-	  The third argument in the call back is an 
-	  optional message that details possible error 
+
+	  The third argument in the call back is an
+	  optional message that details possible error
 	  messages that might have occurred during
 	  the storage process.
 
@@ -126,32 +126,32 @@ dojo.lang.extend(dojo.storage, {
 	    var resultsHandler = function(status, key, message){
 	      alert("status="+status+", key="+key+", message="+message);
 	    };
-	    dojo.storage.put("test", "hello world", 
-	                     resultsHandler);	
+	    dojo.storage.put("test", "hello world",
+	                     resultsHandler);
 	*/
-	put: function(key, value, resultsHandler){ 
+	put: function(key, value, resultsHandler){
     dojo.unimplemented("dojo.storage.put");
   },
 
 	/**
 	  Gets the value with the given key. Returns null
 	  if this key is not in the storage system.
-	
+
 	  @param key A string key to get the value of.
-	  @returns Returns any JavaScript object type; 
+	  @returns Returns any JavaScript object type;
 	  null if the key is not
-	  present. 
+	  present.
 	*/
 	get: function(key){
     dojo.unimplemented("dojo.storage.get");
   },
 
 	/**
-	  Determines whether the storage has the given 
-	  key. 
-	
-	    @returns Whether this key is 
-	             present or not. 
+	  Determines whether the storage has the given
+	  key.
+
+	    @returns Whether this key is
+	             present or not.
 	*/
 	hasKey: function(key){
 		if (this.get(key) != null)
@@ -161,10 +161,10 @@ dojo.lang.extend(dojo.storage, {
 	},
 
 	/**
-	  Enumerates all of the available keys in 
+	  Enumerates all of the available keys in
 	  this storage system.
-	
-	  @returns Array of string keys in this 
+
+	  @returns Array of string keys in this
 	           storage system.
 	*/
 	getKeys: function(){
@@ -172,25 +172,25 @@ dojo.lang.extend(dojo.storage, {
   },
 
 	/**
-	  Completely clears this storage system of all 
-	  of it's values and keys. 
+	  Completely clears this storage system of all
+	  of it's values and keys.
 	*/
 	clear: function(){
     dojo.unimplemented("dojo.storage.clear");
   },
-  
+
   /** Removes the given key from the storage system. */
   remove: function(key){
   	dojo.unimplemented("dojo.storage.remove");
   },
 
 	/**
-	  Returns whether this storage provider's 
-	  values are persisted when this platform 
-	  is shutdown. 
-	
-	  @returns True or false whether this 
-	  storage is permanent. 
+	  Returns whether this storage provider's
+	  values are persisted when this platform
+	  is shutdown.
+
+	  @returns True or false whether this
+	  storage is permanent.
 	*/
 	isPermanent: function(){
 		dojo.unimplemented("dojo.storage.isPermanent");
@@ -198,20 +198,20 @@ dojo.lang.extend(dojo.storage, {
 
 	/**
 	  The maximum storage allowed by this provider.
-	
-	  @returns Returns the maximum storage size 
-	           supported by this provider, in 
-	           thousands of bytes (i.e., if it 
-	           returns 60 then this means that 60K 
+
+	  @returns Returns the maximum storage size
+	           supported by this provider, in
+	           thousands of bytes (i.e., if it
+	           returns 60 then this means that 60K
 	           of storage is supported).
-	    
-	           If this provider can not determine 
-	           it's maximum size, then 
-	           dojo.storage.SIZE_NOT_AVAILABLE is 
+
+	           If this provider can not determine
+	           it's maximum size, then
+	           dojo.storage.SIZE_NOT_AVAILABLE is
 	           returned; if there is no theoretical
-	           limit on the amount of storage 
+	           limit on the amount of storage
 	           this provider can return, then
-	           dojo.storage.SIZE_NO_LIMIT is 
+	           dojo.storage.SIZE_NO_LIMIT is
 	           returned
 	*/
 	getMaximumSize: function(){
@@ -219,22 +219,22 @@ dojo.lang.extend(dojo.storage, {
   },
 
 	/**
-	  Determines whether this provider has a 
+	  Determines whether this provider has a
 	  settings UI.
-	
-	  @returns True or false if this provider has 
+
+	  @returns True or false if this provider has
 	           the ability to show a
-	           a settings UI to change it's 
+	           a settings UI to change it's
 	           values, change the amount of storage
-	           available, etc. 
+	           available, etc.
 	*/
 	hasSettingsUI: function(){
 		return false;
 	},
 
 	/**
-	  If this provider has a settings UI, it is 
-	  shown. 
+	  If this provider has a settings UI, it is
+	  shown.
 	*/
 	showSettingsUI: function(){
 	 dojo.unimplemented("dojo.storage.showSettingsUI");
@@ -247,25 +247,25 @@ dojo.lang.extend(dojo.storage, {
 	hideSettingsUI: function(){
 	 dojo.unimplemented("dojo.storage.hideSettingsUI");
 	},
-	
-	/** 
-	  The provider name as a string, such as 
-	  "dojo.storage.FlashStorageProvider". 
+
+	/**
+	  The provider name as a string, such as
+	  "dojo.storage.FlashStorageProvider".
 	*/
 	getType: function(){
 		dojo.unimplemented("dojo.storage.getType");
 	},
-	
+
 	/**
 	  Subclasses can call this to ensure that the key given is valid in a
 	  consistent way across different storage providers. We use the lowest
 	  common denominator for key values allowed: only letters, numbers, and
-	  underscores are allowed. No spaces. 
+	  underscores are allowed. No spaces.
 	*/
 	isValidKey: function(keyName){
 		if (keyName == null || typeof keyName == "undefined")
 			return false;
-			
+
 		return /^[0-9A-Za-z_]*$/.test(keyName);
   }
 });
@@ -274,7 +274,7 @@ dojo.lang.extend(dojo.storage, {
 
 
 /**
-	Initializes the storage systems and figures out the best available 
+	Initializes the storage systems and figures out the best available
 	storage options on this platform.
 */
 dojo.storage.manager = new function(){
@@ -282,51 +282,51 @@ dojo.storage.manager = new function(){
 	this.available = false;
 	this.initialized = false;
 	this.providers = new Array();
-	
+
 	// TODO: Provide a way for applications to override the default namespace
 	this.namespace = "dojo.storage";
-	
+
 	/** Initializes the storage system. */
 	this.initialize = function(){
 		// autodetect the best storage provider we can provide on this platform
 		this.autodetect();
 	}
-	
+
 	/**
 	  Registers the existence of a new storage provider; used by subclasses
-	  to inform the manager of their existence. 
-	
-	  @param name The full class name of this provider, such as 
+	  to inform the manager of their existence.
+
+	  @param name The full class name of this provider, such as
 	  "dojo.storage.browser.Flash6StorageProvider".
 	  @param instance An instance of this provider, which we will use to
-	  call isAvailable() on. 
+	  call isAvailable() on.
 	*/
 	this.register = function(name, instance) {
 		this.providers[this.providers.length] = instance;
 		this.providers[name] = instance;
 	}
-	
+
 	/**
-	  Instructs the storageManager to use 
+	  Instructs the storageManager to use
 	  the given storage class for all storage requests.
-	    
+
 	  Example:
-	    
+
 	  dojo.storage.setProvider(
 	         dojo.storage.browser.IEStorageProvider)
 	*/
 	this.setProvider = function(storageClass){
-	
+
 	}
-	
-	/** 
+
+	/**
 	  Autodetects the best possible persistent
-	  storage provider available on this platform. 
+	  storage provider available on this platform.
 	*/
 	this.autodetect = function(){
 		if(this.initialized == true) // already finished
 			return;
-			
+
 		// go through each provider, seeing if it can be used
 		var providerToUse = null;
 		for(var i = 0; i < this.providers.length; i++) {
@@ -334,37 +334,37 @@ dojo.storage.manager = new function(){
 			if(providerToUse.isAvailable()){
 				break;
 			}
-		}	
-		
+		}
+
 		if(providerToUse == null){ // no provider available
 			this.initialized = true;
 			this.available = false;
 			this.currentProvider = null;
 			dojo.raise("No storage provider found for this platform");
 		}
-			
+
 		// create this provider and copy over it's properties
 		this.currentProvider = providerToUse;
 	  	for(var i in providerToUse){
 	  		dojo.storage[i] = providerToUse[i];
 		}
 		dojo.storage.manager = this;
-		
+
 		// have the provider initialize itself
 		dojo.storage.initialize();
-		
+
 		this.initialized = true;
 		this.available = true;
 	}
-	
+
 	/** Returns whether any storage options are available. */
 	this.isAvailable = function(){
 		return this.available;
 	}
-	
-	/** 
+
+	/**
 	 	Returns whether the storage system is initialized and
-	 	ready to be used. 
+	 	ready to be used.
 	*/
 	this.isInitialized = function(){
 		// FIXME: This should _really_ not be in here, but it fixes a bug
@@ -378,9 +378,9 @@ dojo.storage.manager = new function(){
 	/**
 	  Determines if this platform supports
 	  the given storage provider.
-	
+
 	  Example:
-			
+
 	  dojo.storage.manager.supportsProvider(
 	    "dojo.storage.browser.InternetExplorerStorageProvider");
 	*/
@@ -404,13 +404,13 @@ dojo.storage.manager = new function(){
 	this.getProvider = function(){
 		return this.currentProvider;
 	}
-	
-	/** 
+
+	/**
 	  The storage provider should call this method when it is loaded and
 	  ready to be used. Clients who will use the provider will connect
 	  to this method to know when they can use the storage system:
-	
-	  dojo.connect(dojo.storage.manager, "loaded", someInstance, 
+
+	  dojo.connect(dojo.storage.manager, "loaded", someInstance,
 	               someInstance.someMethod);
 	*/
 	this.loaded = function(){
diff --git a/webapp/src/main/webapp/src/storage/browser.js b/webapp/src/main/webapp/src/storage/browser.js
index d1d645bc3..6f955a36a 100644
--- a/webapp/src/main/webapp/src/storage/browser.js
+++ b/webapp/src/main/webapp/src/storage/browser.js
@@ -16,11 +16,11 @@ dojo.require("dojo.flash");
 dojo.require("dojo.json");
 dojo.require("dojo.uri.*");
 
-/** 
+/**
 		Storage provider that uses features in Flash to achieve permanent storage.
-		
+
 		@author Alex Russel, alex@dojotoolkit.org
-		@author Brad Neuberg, bkn3@columbia.edu 
+		@author Brad Neuberg, bkn3@columbia.edu
 */
 dojo.storage.browser.FlashStorageProvider = function(){
 }
@@ -33,12 +33,12 @@ dojo.lang.extend(dojo.storage.browser.FlashStorageProvider, {
 	initialized: false,
 	_available: null,
 	_statusHandler: null,
-	
+
 	initialize: function(){
 		if(djConfig["disableFlashStorage"] == true){
 			return;
 		}
-		
+
 		// initialize our Flash
 		var loadedListener = function(){
 			dojo.storage._flashLoaded();
@@ -48,15 +48,15 @@ dojo.lang.extend(dojo.storage.browser.FlashStorageProvider, {
 		var swfloc8 = dojo.uri.dojoUri("Storage_version8.swf").toString();
 		dojo.flash.setSwf({flash6: swfloc6, flash8: swfloc8, visible: false});
 	},
-	
+
 	isAvailable: function(){
 		if(djConfig["disableFlashStorage"] == true){
 			this._available = false;
 		}
-		
+
 		return this._available;
 	},
-	
+
 	setNamespace: function(namespace){
 		this.namespace = namespace;
 	},
@@ -65,9 +65,9 @@ dojo.lang.extend(dojo.storage.browser.FlashStorageProvider, {
 		if(this.isValidKey(key) == false){
 			dojo.raise("Invalid key given: " + key);
 		}
-			
+
 		this._statusHandler = resultsHandler;
-		
+
 		// serialize the value
 		// Handle strings differently so they have better performance
 		if(dojo.lang.isString(value)){
@@ -75,7 +75,7 @@ dojo.lang.extend(dojo.storage.browser.FlashStorageProvider, {
 		}else{
 			value = dojo.json.serialize(value);
 		}
-		
+
 		dojo.flash.comm.put(key, value, this.namespace);
 	},
 
@@ -83,46 +83,46 @@ dojo.lang.extend(dojo.storage.browser.FlashStorageProvider, {
 		if(this.isValidKey(key) == false){
 			dojo.raise("Invalid key given: " + key);
 		}
-		
+
 		var results = dojo.flash.comm.get(key, this.namespace);
 
 		if(results == ""){
 			return null;
 		}
-    
-		// destringify the content back into a 
+
+		// destringify the content back into a
 		// real JavaScript object
 		// Handle strings differently so they have better performance
-		if(!dojo.lang.isUndefined(results) && results != null 
+		if(!dojo.lang.isUndefined(results) && results != null
 			 && /^string:/.test(results)){
 			results = results.substring("string:".length);
 		}else{
 			results = dojo.json.evalJson(results);
 		}
-    
+
 		return results;
 	},
 
 	getKeys: function(){
 		var results = dojo.flash.comm.getKeys(this.namespace);
-		
+
 		if(results == ""){
 			return new Array();
 		}
 
 		// the results are returned comma seperated; split them
 		results = results.split(",");
-		
+
 		return results;
 	},
 
 	clear: function(){
 		dojo.flash.comm.clear(this.namespace);
 	},
-	
+
 	remove: function(key){
 	},
-	
+
 	isPermanent: function(){
 		return true;
 	},
@@ -144,23 +144,23 @@ dojo.lang.extend(dojo.storage.browser.FlashStorageProvider, {
 	hideSettingsUI: function(){
 		// hide the dialog
 		dojo.flash.obj.setVisible(false);
-		
+
 		// call anyone who wants to know the dialog is
 		// now hidden
 		if(dojo.storage.onHideSettingsUI != null &&
 			!dojo.lang.isUndefined(dojo.storage.onHideSettingsUI)){
-			dojo.storage.onHideSettingsUI.call(null);	
+			dojo.storage.onHideSettingsUI.call(null);
 		}
 	},
-	
-	/** 
-			The provider name as a string, such as 
-			"dojo.storage.FlashStorageProvider". 
+
+	/**
+			The provider name as a string, such as
+			"dojo.storage.FlashStorageProvider".
 	*/
 	getType: function(){
 		return "dojo.storage.FlashStorageProvider";
 	},
-	
+
 	/** Called when the Flash is finished loading. */
 	_flashLoaded: function(){
 		this.initialized = true;
@@ -168,10 +168,10 @@ dojo.lang.extend(dojo.storage.browser.FlashStorageProvider, {
 		// indicate that this storage provider is now loaded
 		dojo.storage.manager.loaded();
 	},
-	
-	/** 
+
+	/**
 			Called if the storage system needs to tell us about the status
-			of a put() request. 
+			of a put() request.
 	*/
 	_onStatus: function(statusResult, key){
 		//dojo.debug("_onStatus, statusResult="+statusResult+", key="+key);
@@ -181,10 +181,10 @@ dojo.lang.extend(dojo.storage.browser.FlashStorageProvider, {
 		}else{
 			dojo.flash.obj.setVisible(false);
 		}
-		
-		if(!dojo.lang.isUndefined(dojo.storage._statusHandler) 
+
+		if(!dojo.lang.isUndefined(dojo.storage._statusHandler)
 				&& dojo.storage._statusHandler != null){
-			dojo.storage._statusHandler.call(null, statusResult, key);		
+			dojo.storage._statusHandler.call(null, statusResult, key);
 		}
 	}
 });
@@ -196,4 +196,4 @@ dojo.storage.manager.register("dojo.storage.browser.FlashStorageProvider",
 // now that we are loaded and registered tell the storage manager to initialize
 // itself
 dojo.storage.manager.initialize();
-															
+
diff --git a/webapp/src/main/webapp/src/string/Builder.js b/webapp/src/main/webapp/src/string/Builder.js
index a0ef97213..e4f79fe6c 100644
--- a/webapp/src/main/webapp/src/string/Builder.js
+++ b/webapp/src/main/webapp/src/string/Builder.js
@@ -29,7 +29,7 @@ dojo.string.Builder = function(str){
 		b = "";
 	}
 
-	this.toString = this.valueOf = function(){ 
+	this.toString = this.valueOf = function(){
 		return (this.arrConcat) ? a.join("") : b;
 	};
 
@@ -52,16 +52,16 @@ dojo.string.Builder = function(str){
 	};
 
 	this.remove = function(f,l){
-		var s = ""; 
+		var s = "";
 		if(this.arrConcat){
-			b = a.join(""); 
+			b = a.join("");
 		}
 		a=[];
 		if(f>0){
 			s = b.substring(0, (f-1));
 		}
-		b = s + b.substring(f + l); 
-		length = this.length = b.length; 
+		b = s + b.substring(f + l);
+		length = this.length = b.length;
 		if(this.arrConcat){
 			a.push(b);
 			b="";
@@ -71,11 +71,11 @@ dojo.string.Builder = function(str){
 
 	this.replace = function(o,n){
 		if(this.arrConcat){
-			b = a.join(""); 
+			b = a.join("");
 		}
-		a = []; 
-		b = b.replace(o,n); 
-		length = this.length = b.length; 
+		a = [];
+		b = b.replace(o,n);
+		length = this.length = b.length;
 		if(this.arrConcat){
 			a.push(b);
 			b="";
@@ -85,7 +85,7 @@ dojo.string.Builder = function(str){
 
 	this.insert = function(idx,s){
 		if(this.arrConcat){
-			b = a.join(""); 
+			b = a.join("");
 		}
 		a=[];
 		if(idx == 0){
@@ -95,9 +95,9 @@ dojo.string.Builder = function(str){
 			t.splice(idx,0,s);
 			b = t.join("")
 		}
-		length = this.length = b.length; 
+		length = this.length = b.length;
 		if(this.arrConcat){
-			a.push(b); 
+			a.push(b);
 			b="";
 		}
 		return this;
diff --git a/webapp/src/main/webapp/src/string/extras.js b/webapp/src/main/webapp/src/string/extras.js
index 6d822a9e6..6759f8639 100644
--- a/webapp/src/main/webapp/src/string/extras.js
+++ b/webapp/src/main/webapp/src/string/extras.js
@@ -18,7 +18,7 @@ dojo.require("dojo.lang");
  *   dojo.string.substituteParams("File '%{0}' is not found in directory '%{1}'.","foo.html","/temp");
  * returns
  *   "File 'foo.html' is not found in directory '/temp'."
- * 
+ *
  * @param template the original string template with %{values} to be replaced
  * @param hash name/value pairs (type object) to provide substitutions.  Alternatively, substitutions may be
  *  included as arguments 1..n to this function, corresponding to template parameters 0..n-1
@@ -130,7 +130,7 @@ dojo.string.escapeJavaScript = function(str) {
 	return str.replace(/(["'\f\b\n\t\r])/gm, "\\$1");
 }
 
-dojo.string.escapeString = function(str){ 
+dojo.string.escapeString = function(str){
 	return ('"' + str.replace(/(["\\])/g, '\\$1') + '"'
 		).replace(/[\f]/g, "\\f"
 		).replace(/[\b]/g, "\\b"
diff --git a/webapp/src/main/webapp/src/style.js b/webapp/src/main/webapp/src/style.js
index 6b041d400..6c2f92101 100644
--- a/webapp/src/main/webapp/src/style.js
+++ b/webapp/src/main/webapp/src/style.js
@@ -25,14 +25,14 @@ dojo.require("dojo.lang.common");
 		CONTENT_BOX: "content-box"
 	};
 	var bs = ds.boxSizing;
-	
+
 	ds.getBoxSizing = function(node){
-		if((h.ie)||(h.opera)){ 
+		if((h.ie)||(h.opera)){
 			var cm = document["compatMode"];
-			if((cm == "BackCompat")||(cm == "QuirksMode")){ 
-				return bs.BORDER_BOX; 
+			if((cm == "BackCompat")||(cm == "QuirksMode")){
+				return bs.BORDER_BOX;
 			}else{
-				return bs.CONTENT_BOX; 
+				return bs.CONTENT_BOX;
 			}
 		}else{
 			if(arguments.length == 0){ node = document.documentElement; }
@@ -86,7 +86,7 @@ dojo.require("dojo.lang.common");
 			- Uncomputable values are returned as NaN.
 			- setOuterWidth/Height return *false* if the outer size could not
 			  be computed, otherwise *true*.
-			- (sjmiles) knows no way to find the calculated values for auto-margins. 
+			- (sjmiles) knows no way to find the calculated values for auto-margins.
 			- All returned values are floating point in 'px' units. If a
 			  non-zero computed style value is not specified in 'px', NaN is
 			  returned.
@@ -118,36 +118,36 @@ dojo.require("dojo.lang.common");
 		var s = ds.getComputedStyle(node, cssSelector);
 		if((!s)||((s == 'auto')&&(autoIsZero))){ return { value: 0, units: 'px' }; }
 		if(dojo.lang.isUndefined(s)){return ds.getUnitValue.bad;}
-		// FIXME: is regex inefficient vs. parseInt or some manual test? 
+		// FIXME: is regex inefficient vs. parseInt or some manual test?
 		var match = s.match(/(\-?[\d.]+)([a-z%]*)/i);
 		if (!match){return ds.getUnitValue.bad;}
 		return { value: Number(match[1]), units: match[2].toLowerCase() };
 	}
 	// FIXME: 'bad' value should be 0?
 	ds.getUnitValue.bad = { value: NaN, units: '' };
-	
+
 	ds.getPixelValue = function(node, cssSelector, autoIsZero){
 		var result = ds.getUnitValue(node, cssSelector, autoIsZero);
 		// FIXME: there is serious debate as to whether or not this is the right solution
 		if(isNaN(result.value)){ return 0; }
-		// FIXME: code exists for converting other units to px (see Dean Edward's IE7) 
+		// FIXME: code exists for converting other units to px (see Dean Edward's IE7)
 		// but there are cross-browser complexities
 		if((result.value)&&(result.units != 'px')){ return NaN; }
 		return result.value;
 	}
-	
+
 	// FIXME: deprecated
 	ds.getNumericStyle = function() {
 		dojo.deprecated('dojo.(style|html).getNumericStyle', 'in favor of dojo.(style|html).getPixelValue', '0.4');
-		return ds.getPixelValue.apply(this, arguments); 
+		return ds.getPixelValue.apply(this, arguments);
 	}
 
 	ds.setPositivePixelValue = function(node, selector, value){
 		if(isNaN(value)){return false;}
-		node.style[selector] = Math.max(0, value) + 'px'; 
+		node.style[selector] = Math.max(0, value) + 'px';
 		return true;
 	}
-	
+
 	ds._sumPixelValues = function(node, selectors, autoIsZero){
 		var total = 0;
 		for(var x=0; x<selectors.length; x++){
@@ -179,7 +179,7 @@ dojo.require("dojo.lang.common");
 	ds.getPadBorderWidth = function(node) {
 		return ds.getPaddingWidth(node) + ds.getBorderWidth(node);
 	}
-	
+
 	ds.getContentBoxWidth = function(node){
 		node = dojo.byId(node);
 		return node.offsetWidth - ds.getPadBorderWidth(node);
@@ -233,7 +233,7 @@ dojo.require("dojo.lang.common");
 	ds.getPadBorderHeight = function(node) {
 		return ds.getPaddingHeight(node) + ds.getBorderHeight(node);
 	}
-	
+
 	ds.getContentBoxHeight = function(node){
 		node = dojo.byId(node);
 		return node.offsetHeight - ds.getPadBorderHeight(node);
@@ -301,7 +301,7 @@ dojo.require("dojo.lang.common");
 			ret.y = bo.y - ds.sumAncestorProperties(node, "scrollTop");
 		}else{
 			if(node["offsetParent"]){
-				var endNode;		
+				var endNode;
 				// in Safari, if the node is an absolutely positioned child of
 				// the body and the body has a margin the offset of the child
 				// and the body contain the body's margins, so we need to end
@@ -347,7 +347,7 @@ dojo.require("dojo.lang.common");
 	ds.sumAncestorProperties = function(node, prop){
 		node = dojo.byId(node);
 		if(!node){ return 0; } // FIXME: throw an error?
-		
+
 		var retVal = 0;
 		while(node){
 			var val = node[prop];
@@ -375,8 +375,8 @@ dojo.require("dojo.lang.common");
 	ds.styleSheet = null;
 
 	// FIXME: this is a really basic stub for adding and removing cssRules, but
-	// it assumes that you know the index of the cssRule that you want to add 
-	// or remove, making it less than useful.  So we need something that can 
+	// it assumes that you know the index of the cssRule that you want to add
+	// or remove, making it less than useful.  So we need something that can
 	// search for the selector that you you want to remove.
 	ds.insertCssRule = function(selector, declaration, index) {
 		if (!ds.styleSheet) {
@@ -460,7 +460,7 @@ dojo.require("dojo.lang.common");
 		// IE is b0rken enough to require that we add the element to the doc
 		// before changing it's properties
 		var head = doc.getElementsByTagName("head")[0];
-		if(!head){ // must have a head tag 
+		if(!head){ // must have a head tag
 			dojo.debug("No head tag in document, aborting styles");
 			return;
 		}else{
@@ -477,7 +477,7 @@ dojo.require("dojo.lang.common");
 
 	// String cssText = fixPathsInCssText(String cssStr, dojo.uri.Uri URI)
 	// usage: cssText comes from dojoroot/src/widget/templates/HtmlFoobar.css
-	// 	it has .dojoFoo { background-image: url(images/bar.png);} 
+	// 	it has .dojoFoo { background-image: url(images/bar.png);}
 	//	then uri should point to dojoroot/src/widget/templates/
 	ds.fixPathsInCssText = function(cssStr, URI){
 		if(!cssStr || !URI){ return; }
@@ -525,11 +525,11 @@ dojo.require("dojo.lang.common");
 		if(!node || !node.style){
 			return inValue;
 		}else if(document.defaultView){ // W3, gecko, KHTML
-			try{			
+			try{
 				var cs = document.defaultView.getComputedStyle(node, "");
-				if (cs){ 
+				if (cs){
 					return cs.getPropertyValue(cssSelector);
-				} 
+				}
 			}catch(e){ // reports are that Safari can throw an exception above
 				if (node.style.getPropertyValue){ // W3
 					return node.style.getPropertyValue(cssSelector);
@@ -544,7 +544,7 @@ dojo.require("dojo.lang.common");
 		}
 	}
 
-	/** 
+	/**
 	 * Retrieve a property value from a node's style object.
 	 */
 	ds.getStyleProperty = function(node, cssSelector){
@@ -555,7 +555,7 @@ dojo.require("dojo.lang.common");
 		return (node && node.style ? node.style[ds.toCamelCase(cssSelector)] : undefined);
 	}
 
-	/** 
+	/**
 	 * Retrieve a property value from a node's style object.
 	 */
 	ds.getStyle = function(node, cssSelector){
@@ -576,7 +576,7 @@ dojo.require("dojo.lang.common");
 		for(var i = 1; i < arr.length; i++) {
 			cc += arr[i].charAt(0).toUpperCase() + arr[i].substring(1);
 		}
-		return cc;		
+		return cc;
 	}
 
 	ds.toSelectorCase = function(selector) {
@@ -615,7 +615,7 @@ dojo.require("dojo.lang.common");
 			node.style.opacity = opacity;
 		}
 	}
-		
+
 	ds.getOpacity = function getOpacity (node){
 		node = dojo.byId(node);
 		if(h.ie){
@@ -654,44 +654,44 @@ dojo.require("dojo.lang.common");
 		}
 	}
 
-	/** 
-	* Set the given style attributes for the node. 
+	/**
+	* Set the given style attributes for the node.
 	* Patch submitted by Wolfram Kriesing, 22/03/2006.
 	*
-	* Ie. dojo.style.setStyleAttributes(myNode, "position:absolute; left:10px; top:10px;") 
-	* This just makes it easier to set a style directly without the need to  
-	* override it completely (as node.setAttribute() would). 
-	* If there is a dojo-method for an attribute, like for "opacity" there 
-	* is setOpacity, the dojo method is called instead. 
-	* For example: dojo.style.setStyleAttributes(myNode, "opacity: .4"); 
-	*  
-	* Additionally all the dojo.style.set* methods can also be used. 
-	* Ie. when attributes contains "outer-height: 10;" it will call dojo.style.setOuterHeight("10"); 
-	* 
-	* @param object The node to set the style attributes for. 
-	* @param string Ie. "position:absolute; left:10px; top:10px;" 
-	*/ 
-	ds.setStyleAttributes = function(node, attributes) { 
-		var methodMap={ 
+	* Ie. dojo.style.setStyleAttributes(myNode, "position:absolute; left:10px; top:10px;")
+	* This just makes it easier to set a style directly without the need to
+	* override it completely (as node.setAttribute() would).
+	* If there is a dojo-method for an attribute, like for "opacity" there
+	* is setOpacity, the dojo method is called instead.
+	* For example: dojo.style.setStyleAttributes(myNode, "opacity: .4");
+	*
+	* Additionally all the dojo.style.set* methods can also be used.
+	* Ie. when attributes contains "outer-height: 10;" it will call dojo.style.setOuterHeight("10");
+	*
+	* @param object The node to set the style attributes for.
+	* @param string Ie. "position:absolute; left:10px; top:10px;"
+	*/
+	ds.setStyleAttributes = function(node, attributes) {
+		var methodMap={
 			"opacity":dojo.style.setOpacity,
 			"content-height":dojo.style.setContentHeight,
 			"content-width":dojo.style.setContentWidth,
 			"outer-height":dojo.style.setOuterHeight,
-			"outer-width":dojo.style.setOuterWidth 
-		} 
+			"outer-width":dojo.style.setOuterWidth
+		}
 
-		var splittedAttribs=attributes.replace(/(;)?\s*$/, "").split(";"); 
-		for(var i=0; i<splittedAttribs.length; i++){ 
-			var nameValue=splittedAttribs[i].split(":"); 
+		var splittedAttribs=attributes.replace(/(;)?\s*$/, "").split(";");
+		for(var i=0; i<splittedAttribs.length; i++){
+			var nameValue=splittedAttribs[i].split(":");
 			var name=nameValue[0].replace(/\s*$/, "").replace(/^\s*/, "").toLowerCase();
 			var value=nameValue[1].replace(/\s*$/, "").replace(/^\s*/, "");
-			if(dojo.lang.has(methodMap,name)) { 
-				methodMap[name](node,value); 
-			} else { 
-				node.style[dojo.style.toCamelCase(name)]=value; 
-			} 
-		} 
-	} 
+			if(dojo.lang.has(methodMap,name)) {
+				methodMap[name](node,value);
+			} else {
+				node.style[dojo.style.toCamelCase(name)]=value;
+			}
+		}
+	}
 
 	ds._toggle = function(node, tester, setter){
 		node = dojo.byId(node);
@@ -701,8 +701,8 @@ dojo.require("dojo.lang.common");
 
 	// show/hide are library constructs
 
-	// show() 
-	// if the node.style.display == 'none' then 
+	// show()
+	// if the node.style.display == 'none' then
 	// set style.display to '' or the value cached by hide()
 	ds.show = function(node){
 		node = dojo.byId(node);
@@ -712,7 +712,7 @@ dojo.require("dojo.lang.common");
 		}
 	}
 
-	// if the node.style.display == 'none' then 
+	// if the node.style.display == 'none' then
 	// set style.display to '' or the value cached by hide()
 	ds.hide = function(node){
 		node = dojo.byId(node);
@@ -744,7 +744,7 @@ dojo.require("dojo.lang.common");
 	// display is a CSS concept
 
 	// Simple mapping of tag names to display values
-	// FIXME: simplistic 
+	// FIXME: simplistic
 	ds.displayMap = { tr: '', td: '', th: '', img: 'inline', span: 'inline', input: 'inline', button: 'inline' };
 
 	// Suggest a value for the display property that will show 'node' based on it's tag
diff --git a/webapp/src/main/webapp/src/svg.js b/webapp/src/main/webapp/src/svg.js
index bd5b51e9b..a73f73afb 100644
--- a/webapp/src/main/webapp/src/svg.js
+++ b/webapp/src/main/webapp/src/svg.js
@@ -267,7 +267,7 @@ dojo.svg.createNodesFromText=function(/* string */ txt, /* bool? */ wrap){
 	//	summary
 	//	Create a list of nodes from text
 	var docFrag=(new DOMParser()).parseFromString(txt, "text/xml").normalize();
-	if(wrap){ 
+	if(wrap){
 		return [docFrag.firstChild.cloneNode(true)];	//	array
 	}
 	var nodes=[];
diff --git a/webapp/src/main/webapp/src/text/textDirectory.js b/webapp/src/main/webapp/src/text/textDirectory.js
index c8c88281f..94c538f5c 100644
--- a/webapp/src/main/webapp/src/text/textDirectory.js
+++ b/webapp/src/main/webapp/src/text/textDirectory.js
@@ -29,7 +29,7 @@ dojo.textDirectoryTokeniser.Property = function (line) {
 	var left = dojo.string.trim(line.substring(0, line.indexOf(':')));
 	var right = dojo.string.trim(line.substr(line.indexOf(':') + 1));
 
-	// seperate name and paramters	
+	// seperate name and paramters
 	var parameters = dojo.string.splitEscaped(left,';');
 	this.name = parameters[0]
 	parameters.splice(0, 1);
@@ -39,9 +39,9 @@ dojo.textDirectoryTokeniser.Property = function (line) {
 	for (var i = 0; i < parameters.length; i++) {
 		var arr = parameters[i].split("=");
 		var key = dojo.string.trim(arr[0].toUpperCase());
-		
+
 		if (arr.length == 1) { this.params.push([key]); continue; }
-		
+
 		var values = dojo.string.splitEscaped(arr[1],',');
 		for (var j = 0; j < values.length; j++) {
 			if (dojo.string.trim(values[j]) != '') {
@@ -56,7 +56,7 @@ dojo.textDirectoryTokeniser.Property = function (line) {
 		this.group = arr[0];
 		this.name = arr[1];
 	}
-	
+
 	// don't do any parsing, leave to implementation
 	this.value = right;
 }
@@ -68,7 +68,7 @@ dojo.textDirectoryTokeniser.tokenise = function (text) {
 	var nText = dojo.string.normalizeNewlines(text,"\n");
 	nText = nText.replace(/\n[ \t]/g, '');
 	nText = nText.replace(/\x00/g, '');
-		
+
 	var lines = nText.split("\n");
 	var properties = []
 
diff --git a/webapp/src/main/webapp/src/undo/browser.js b/webapp/src/main/webapp/src/undo/browser.js
index 1b3689559..546e27ebb 100644
--- a/webapp/src/main/webapp/src/undo/browser.js
+++ b/webapp/src/main/webapp/src/undo/browser.js
@@ -22,7 +22,7 @@ if(dojo.render.html.opera){
 }
 
 /* NOTES:
- *  Safari 1.2: 
+ *  Safari 1.2:
  *	back button "works" fine, however it's not possible to actually
  *	DETECT that you've moved backwards by inspecting window.location.
  *	Unless there is some other means of locating.
@@ -36,10 +36,10 @@ if(dojo.render.html.opera){
  *	previous hash value, but to the last full page load. This suggests
  *	that the iframe is the correct way to capture the back button in
  *	these cases.
- *	Don't test this page using local disk for MSIE. MSIE will not create 
- *	a history list for iframe_history.html if served from a file: URL. 
- *	The XML served back from the XHR tests will also not be properly 
- *	created if served from local disk. Serve the test pages from a web 
+ *	Don't test this page using local disk for MSIE. MSIE will not create
+ *	a history list for iframe_history.html if served from a file: URL.
+ *	The XML served back from the XHR tests will also not be properly
+ *	created if served from local disk. Serve the test pages from a web
  *	server to test in that browser.
  *  IE 6.0:
  *	same behavior as IE 5.5 SP2
@@ -84,9 +84,9 @@ dojo.undo.browser = {
 	 *   identifier (http://some.domain.com/path#uniquenumber). If it is any other value that does
 	 *   not evaluate to false, that value will be used as the fragment identifier. For example,
 	 *   if changeUrl: 'page1', then the URL will look like: http://some.domain.com/path#page1
-	 *   
+	 *
 	 * Full example:
-	 * 
+	 *
 	 * dojo.undo.browser.addToHistory({
 	 *   back: function() { alert('back pressed'); },
 	 *   forward: function() { alert('forward pressed'); },
@@ -113,7 +113,7 @@ dojo.undo.browser = {
 			hash = "#"+ ((args["changeUrl"]!==true) ? args["changeUrl"] : (new Date()).getTime());
 			setTimeout("window.location.href = '"+hash+"'; dojo.undo.browser.changingUrl = false;", 1);
 			this.bookmarkAnchor.href = hash;
-			
+
 			if(dojo.render.html.ie){
 				var oldCB = args["back"]||args["backButton"]||args["handle"];
 
@@ -127,7 +127,7 @@ dojo.undo.browser = {
 					//Use apply to set "this" to args, and to try to avoid memory leaks.
 					oldCB.apply(this, [handleName]);
 				}
-		
+
 				//Set interceptor function in the right place.
 				if(args["back"]){
 					args.back = tcb;
@@ -136,13 +136,13 @@ dojo.undo.browser = {
 				}else if(args["handle"]){
 					args.handle = tcb;
 				}
-		
+
 				//If addToHistory is called, then that means we prune the
 				//forward stack -- the user went back, then wanted to
 				//start a new forward path.
-				this.forwardStack = []; 
+				this.forwardStack = [];
 				var oldFW = args["forward"]||args["forwardButton"]||args["handle"];
-		
+
 				//The function takes handleName as a parameter, in case the
 				//callback we are overriding was "handle". In that case,
 				//we will need to pass the handle name to handle.
@@ -195,7 +195,7 @@ dojo.undo.browser = {
 					return;
 				}
 			}
-	
+
 			// ok, that didn't work, try someplace back in the history stack
 			if((hsl >= 2)&&(this.historyStack[hsl-2])){
 				if(this.historyStack[hsl-2].urlHash==window.location.hash){
@@ -209,7 +209,7 @@ dojo.undo.browser = {
 	iframeLoaded: function(evt, ifrLoc){
 		if(!dojo.render.html.opera){
 			var query = this._getUrlQuery(ifrLoc.href);
-			if(query == null){ 
+			if(query == null){
 				// alert("iframeLoaded");
 				// we hit the end of the history, so we should go back
 				if(this.historyStack.length == 1){
@@ -222,7 +222,7 @@ dojo.undo.browser = {
 				this.moveForward = false;
 				return;
 			}
-	
+
 			//Check the back stack first, since it is more likely.
 			//Note that only one step back or forward is supported.
 			if(this.historyStack.length >= 2 && query == this._getUrlQuery(this.historyStack[this.historyStack.length-2].url)){
diff --git a/webapp/src/main/webapp/src/uri/Uri.js b/webapp/src/main/webapp/src/uri/Uri.js
index a8329de25..712011664 100644
--- a/webapp/src/main/webapp/src/uri/Uri.js
+++ b/webapp/src/main/webapp/src/uri/Uri.js
@@ -17,12 +17,12 @@ dojo.uri = new function() {
 		for(var i = 0; i < arguments.length; i++) { arr.push(arguments[i]); }
 		return arr.join("/").replace(/\/{2,}/g, "/").replace(/((https*|ftps*):)/i, "$1/");
 	}
-	
+
 	this.dojoUri = function (uri) {
 		// returns a Uri object resolved relative to the dojo root
 		return new dojo.uri.Uri(dojo.hostenv.getBaseScriptUri(), uri);
 	}
-		
+
 	this.Uri = function (/*uri1, uri2, [...]*/) {
 		// An object representing a Uri.
 		// Each argument is evaluated in order relative to the next until
@@ -47,10 +47,10 @@ dojo.uri = new function() {
 				relobj = uriobj;
 			} else if (relobj.scheme == null) {
 				relobj.scheme = uriobj.scheme;
-			
+
 				if (relobj.authority == null) {
 					relobj.authority = uriobj.authority;
-					
+
 					if (relobj.path.charAt(0) != "/") {
 						var path = uriobj.path.substring(0,
 							uriobj.path.lastIndexOf("/") + 1) + relobj.path;
@@ -91,18 +91,18 @@ dojo.uri = new function() {
 		this.path = r[5]; // can never be undefined
 		this.query = r[7] || (r[6] ? "" : null);
 		this.fragment  = r[9] || (r[8] ? "" : null);
-		
+
 		if (this.authority != null) {
 			// server based naming authority
 			regexp = "^((([^:]+:)?([^@]+))@)?([^:]*)(:([0-9]+))?$";
 			r = this.authority.match(new RegExp(regexp));
-			
+
 			this.user = r[3] || null;
 			this.password = r[4] || null;
 			this.host = r[5];
 			this.port = r[7] || null;
 		}
-	
+
 		this.toString = function(){ return this.uri; }
 	}
 };
diff --git a/webapp/src/main/webapp/src/uuid/LightweightGenerator.js b/webapp/src/main/webapp/src/uuid/LightweightGenerator.js
index 3d4589a43..bbdbf51de 100644
--- a/webapp/src/main/webapp/src/uuid/LightweightGenerator.js
+++ b/webapp/src/main/webapp/src/uuid/LightweightGenerator.js
@@ -13,17 +13,17 @@ dojo.provide("dojo.uuid.LightweightGenerator");
 /**
  * The LightweightGenerator is intended to be small and fast,
  * but not necessarily good.
- * 
- * Small: The LightweightGenerator has a small footprint. 
- * Once comments are stripped, it's only about 25 lines of 
+ *
+ * Small: The LightweightGenerator has a small footprint.
+ * Once comments are stripped, it's only about 25 lines of
  * code, and it doesn't dojo.require() any other packages.
  *
- * Fast: The LightweightGenerator can generate lots of new 
- * UUIDs fairly quickly (at least, more quickly than the other 
+ * Fast: The LightweightGenerator can generate lots of new
+ * UUIDs fairly quickly (at least, more quickly than the other
  * dojo UUID generators).
  *
  * Not necessarily good: We use Math.random() as our source
- * of randomness, which may or may not provide much randomness. 
+ * of randomness, which may or may not provide much randomness.
  */
 dojo.uuid.LightweightGenerator = new function() {
 
diff --git a/webapp/src/main/webapp/src/uuid/NameBasedGenerator.js b/webapp/src/main/webapp/src/uuid/NameBasedGenerator.js
index d1faa095a..db78f35e8 100644
--- a/webapp/src/main/webapp/src/uuid/NameBasedGenerator.js
+++ b/webapp/src/main/webapp/src/uuid/NameBasedGenerator.js
@@ -13,7 +13,7 @@ dojo.provide("dojo.uuid.NameBasedGenerator");
 dojo.uuid.NameBasedGenerator = new function() {
 
 /**
- * This function generates name-based UUIDs, meaning "version 3" 
+ * This function generates name-based UUIDs, meaning "version 3"
  * and "version 5" UUIDs.
  *
  * Examples:
@@ -28,16 +28,16 @@ dojo.uuid.NameBasedGenerator = new function() {
  */
 	this.generate = function(returnType) {
 		dojo.unimplemented('dojo.uuid.NameBasedGenerator.generate');
-		
+
 		// FIXME:
-		// For an algorithm to generate name-based UUIDs, 
+		// For an algorithm to generate name-based UUIDs,
 		// see sections 4.3 of RFC 4122:
 		//  http://www.ietf.org/rfc/rfc4122.txt
-		
+
 		var returnValue = "00000000-0000-0000-0000-000000000000"; // FIXME
 		if (returnType && (returnType != String)) {
 			returnValue = new returnType(returnValue);
 		}
 		return returnValue;
 	};
-}();
\ No newline at end of file
+}();
diff --git a/webapp/src/main/webapp/src/uuid/NilGenerator.js b/webapp/src/main/webapp/src/uuid/NilGenerator.js
index 56cf4491a..c7dc19b7f 100644
--- a/webapp/src/main/webapp/src/uuid/NilGenerator.js
+++ b/webapp/src/main/webapp/src/uuid/NilGenerator.js
@@ -13,7 +13,7 @@ dojo.provide("dojo.uuid.NilGenerator");
 dojo.uuid.NilGenerator = new function() {
 
 /**
- * This function returns the Nil UUID: 
+ * This function returns the Nil UUID:
  * "00000000-0000-0000-0000-000000000000".
  * The Nil UUID is described in section 4.1.7 of
  * RFC 4122: http://www.ietf.org/rfc/rfc4122.txt
@@ -35,4 +35,4 @@ dojo.uuid.NilGenerator = new function() {
 		}
 		return returnValue;
 	};
-}();
\ No newline at end of file
+}();
diff --git a/webapp/src/main/webapp/src/uuid/RandomGenerator.js b/webapp/src/main/webapp/src/uuid/RandomGenerator.js
index c361328c6..6d53dd8f7 100644
--- a/webapp/src/main/webapp/src/uuid/RandomGenerator.js
+++ b/webapp/src/main/webapp/src/uuid/RandomGenerator.js
@@ -29,12 +29,12 @@ dojo.uuid.RandomGenerator = new function() {
  */
 	this.generate = function(returnType) {
 		dojo.unimplemented('dojo.uuid.RandomGenerator.generate');
-		
+
 		// FIXME:
 		// For an algorithm to generate a random UUID, see
 		// sections 4.4 and 4.5 of RFC 4122:
 		//  http://www.ietf.org/rfc/rfc4122.txt
-		
+
 		var returnValue = "00000000-0000-0000-0000-000000000000"; // FIXME
 		if (returnType && (returnType != String)) {
 			returnValue = new returnType(returnValue);
diff --git a/webapp/src/main/webapp/src/uuid/TimeBasedGenerator.js b/webapp/src/main/webapp/src/uuid/TimeBasedGenerator.js
index ab2fb123c..d563c8a44 100644
--- a/webapp/src/main/webapp/src/uuid/TimeBasedGenerator.js
+++ b/webapp/src/main/webapp/src/uuid/TimeBasedGenerator.js
@@ -18,10 +18,10 @@ dojo.uuid.TimeBasedGenerator = new function() {
 // --------------------------------------------------
 	// Number of hours between October 15, 1582 and January 1, 1970:
 	this.GREGORIAN_CHANGE_OFFSET_IN_HOURS = 3394248;
-	
+
 	// Number of seconds between October 15, 1582 and January 1, 1970:
-	//   this.GREGORIAN_CHANGE_OFFSET_IN_SECONDS = 12219292800;	
-	
+	//   this.GREGORIAN_CHANGE_OFFSET_IN_SECONDS = 12219292800;
+
 // --------------------------------------------------
 // Private variables
 // --------------------------------------------------
@@ -91,7 +91,7 @@ dojo.uuid.TimeBasedGenerator = new function() {
 		dojo.lang.assertType(arrayB, Array);
 		dojo.lang.assert(arrayA.length == 4);
 		dojo.lang.assert(arrayB.length == 4);
-	
+
 		var result = new Array(0, 0, 0, 0);
 		result[3] = arrayA[3] + arrayB[3];
 		result[2] = arrayA[2] + arrayB[2];
@@ -115,7 +115,7 @@ dojo.uuid.TimeBasedGenerator = new function() {
 		dojo.lang.assertType(arrayB, Array);
 		dojo.lang.assert(arrayA.length == 4);
 		dojo.lang.assert(arrayB.length == 4);
-	
+
 		var overflow = false;
 		if (arrayA[0] * arrayB[0] !== 0) { overflow = true; }
 		if (arrayA[0] * arrayB[1] !== 0) { overflow = true; }
@@ -124,7 +124,7 @@ dojo.uuid.TimeBasedGenerator = new function() {
 		if (arrayA[1] * arrayB[1] !== 0) { overflow = true; }
 		if (arrayA[2] * arrayB[0] !== 0) { overflow = true; }
 		dojo.lang.assert(!overflow);
-	
+
 		var result = new Array(0, 0, 0, 0);
 		result[0] += arrayA[0] * arrayB[3];
 		_carry(result);
@@ -175,11 +175,11 @@ dojo.uuid.TimeBasedGenerator = new function() {
  */
 	function _generateRandomEightCharacterHexString() {
 		// FIXME: This probably isn't a very high quality random number.
-	
+
 		// Make random32bitNumber be a randomly generated floating point number
 		// between 0 and (4,294,967,296 - 1), inclusive.
 		var random32bitNumber = Math.floor( (Math.random() % 1) * Math.pow(2, 32) );
-	
+
 		var eightCharacterString = random32bitNumber.toString(HEX_RADIX);
 		while (eightCharacterString.length < 8) {
 			eightCharacterString = "0" + eightCharacterString;
@@ -190,7 +190,7 @@ dojo.uuid.TimeBasedGenerator = new function() {
 /**
  * Generates a time-based UUID, meaning a version 1 UUID.  JavaScript
  * code running in a browser doesn't have access to the IEEE 802.3 address
- * of the computer, so if a node value isn't supplied, we generate a random 
+ * of the computer, so if a node value isn't supplied, we generate a random
  * pseudonode value instead.
  *
  * @param	node	Optional. A 12-character string to use as the node in the new UUID.
@@ -218,7 +218,7 @@ dojo.uuid.TimeBasedGenerator = new function() {
 			var random14bitNumber = Math.floor( (Math.random() % 1) * Math.pow(2, 14) );
 			_uuidClockSeqString = (variantCodeForDCEUuids | random14bitNumber).toString(HEX_RADIX);
 		}
-	
+
 		// Maybe we should think about trying to make the code more readable to
 		// newcomers by creating a class called "WholeNumber" that encapsulates
 		// the methods and data structures for working with these arrays that
@@ -238,7 +238,7 @@ dojo.uuid.TimeBasedGenerator = new function() {
 		var arrayMillisecondsSince1970 = nowArray;
 		var arrayMillisecondsSince1582 = _addTwo64bitArrays(_cachedMillisecondsBetween1582and1970, arrayMillisecondsSince1970);
 		var arrayHundredNanosecondIntervalsSince1582 = _multiplyTwo64bitArrays(arrayMillisecondsSince1582, _cachedHundredNanosecondIntervalsPerMillisecond);
-	
+
 		if (now.valueOf() == _dateValueOfPreviousUuid) {
 			arrayHundredNanosecondIntervalsSince1582[3] += _nextIntraMillisecondIncrement;
 			_carry(arrayHundredNanosecondIntervalsSince1582);
@@ -258,7 +258,7 @@ dojo.uuid.TimeBasedGenerator = new function() {
 			_dateValueOfPreviousUuid = now.valueOf();
 			_nextIntraMillisecondIncrement = 1;
 		}
-	
+
 		var hexTimeLowLeftHalf  = arrayHundredNanosecondIntervalsSince1582[2].toString(HEX_RADIX);
 		var hexTimeLowRightHalf = arrayHundredNanosecondIntervalsSince1582[3].toString(HEX_RADIX);
 		var hexTimeLow = _padWithLeadingZeros(hexTimeLowLeftHalf, 4) + _padWithLeadingZeros(hexTimeLowRightHalf, 4);
@@ -339,7 +339,7 @@ dojo.uuid.TimeBasedGenerator = new function() {
 	this.generate = function(input) {
 		var nodeString = null;
 		var returnType = null;
-		
+
 		if (input) {
 			if (dojo.lang.isObject(input) && !dojo.lang.isBuiltIn(input)) {
 				var namedParameters = input;
@@ -378,7 +378,7 @@ dojo.uuid.TimeBasedGenerator = new function() {
 			}
 			dojo.lang.assertType(returnType, [Function, "optional"]);
 		}
-		
+
 		var uuidString = _generateUuidString(nodeString);
 		var returnValue;
 		if (returnType && (returnType != String)) {
diff --git a/webapp/src/main/webapp/src/uuid/Uuid.js b/webapp/src/main/webapp/src/uuid/Uuid.js
index 004cdddba..01797daf7 100644
--- a/webapp/src/main/webapp/src/uuid/Uuid.js
+++ b/webapp/src/main/webapp/src/uuid/Uuid.js
@@ -84,10 +84,10 @@ dojo.uuid.Uuid.HEX_RADIX = 16;
  * Given two UUIDs to compare, this method returns 0, 1, or -1.
  * This method is designed to be used by sorting routines, like
  * the JavaScript built-in Array sort() method.
- * This implementation is intended to match the sample 
- * implementation in IETF RFC 4122: 
+ * This implementation is intended to match the sample
+ * implementation in IETF RFC 4122:
  * http://www.ietf.org/rfc/rfc4122.txt
- * 
+ *
  * Example:
  * <pre>
  *   var generator = dojo.uuid.TimeBasedGenerator;
@@ -111,7 +111,7 @@ dojo.uuid.Uuid.compare = function(uuidOne, uuidTwo) {
 };
 
 /**
- * Sets the default generator, which will be used by the 
+ * Sets the default generator, which will be used by the
  * "new dojo.uuid.Uuid()" constructor if no parameters
  * are passed in.
  *
@@ -136,9 +136,9 @@ dojo.uuid.Uuid.getGenerator = function(generator) {
 // Public instance methods
 // -------------------------------------------------------------------
 /**
- * Returns a 36-character string representing the UUID, such 
+ * Returns a 36-character string representing the UUID, such
  * as "3b12f1df-5232-4804-897e-917bf397618a".
- * 
+ *
  * Examples:
  * <pre>
  *   var uuid = new dojo.uuid.Uuid(dojo.uuid.TimeBasedGenerator);
@@ -153,7 +153,7 @@ dojo.uuid.Uuid.getGenerator = function(generator) {
  * </pre>
  *
  * @param	uuidOne	A dojo.uuid.Uuid instance, or a string representing a UUID.
- * @return   Returns a standard 36-character UUID string, or something similar. 
+ * @return   Returns a standard 36-character UUID string, or something similar.
  */
 dojo.uuid.Uuid.prototype.toString = function(format) {
 	if (format) {
@@ -187,8 +187,8 @@ dojo.uuid.Uuid.prototype.toString = function(format) {
 
 /**
  * Compares this UUID to another UUID, and returns 0, 1, or -1.
- * This implementation is intended to match the sample 
- * implementation in IETF RFC 4122: 
+ * This implementation is intended to match the sample
+ * implementation in IETF RFC 4122:
  * http://www.ietf.org/rfc/rfc4122.txt
  *
  * @param	otherUuid	A dojo.uuid.Uuid instance, or a string representing a UUID.
@@ -280,7 +280,7 @@ dojo.uuid.Uuid.prototype.getVariant = function() {
 		lookupTable[0xD] = Variant.MICROSOFT; // 1101
 		lookupTable[0xE] = Variant.UNKNOWN;   // 1110
 		lookupTable[0xF] = Variant.UNKNOWN;   // 1111
-		
+
 		dojo.uuid.Uuid._ourVariantLookupTable = lookupTable;
 	}
 
@@ -303,7 +303,7 @@ dojo.uuid.Uuid.prototype.getVersion = function() {
 	if (!this._versionNumber) {
 		var errorMessage = "Called getVersion() on a dojo.uuid.Uuid that was not a DCE Variant UUID.";
 		dojo.lang.assert(this.getVariant() == dojo.uuid.Uuid.Variant.DCE, errorMessage);
-	
+
 		// "b4308fb0-86cd-11da-a72b-0800200c9a66"
 		//                ^
 		//                |
@@ -315,9 +315,9 @@ dojo.uuid.Uuid.prototype.getVersion = function() {
 };
 
 /**
- * If this is a version 1 UUID (a time-based UUID), this method returns a 
- * 12-character string with the "node" or "pseudonode" portion of the UUID, 
- * which is the rightmost 12 characters.  
+ * If this is a version 1 UUID (a time-based UUID), this method returns a
+ * 12-character string with the "node" or "pseudonode" portion of the UUID,
+ * which is the rightmost 12 characters.
  * Throws an Error if this is not a version 1 UUID.
  *
  * @return   Returns a 12-character string, which will look something like "917bf397618a".
@@ -335,9 +335,9 @@ dojo.uuid.Uuid.prototype.getNode = function() {
 };
 
 /**
- * If this is a version 1 UUID (a time-based UUID), this method returns 
+ * If this is a version 1 UUID (a time-based UUID), this method returns
  * the timestamp value encoded in the UUID.  The caller can ask for the
- * timestamp to be returned either as a JavaScript Date object or as a 
+ * timestamp to be returned either as a JavaScript Date object or as a
  * 15-character string of hex digits.
  * Throws an Error if this is not a version 1 UUID.
  *
@@ -346,7 +346,7 @@ dojo.uuid.Uuid.prototype.getNode = function() {
  *   var uuid = new dojo.uuid.Uuid("b4308fb0-86cd-11da-a72b-0800200c9a66");
  *   var date, string, hexString;
  *   date   = uuid.getTimestamp();         // returns a JavaScript Date
- *   date   = uuid.getTimestamp(Date);     // 
+ *   date   = uuid.getTimestamp(Date);     //
  *   string = uuid.getTimestamp(String);   // "Mon, 16 Jan 2006 20:21:41 GMT"
  *   hexString = uuid.getTimestamp("hex"); // "1da86cdb4308fb0"
  * </pre>
@@ -357,7 +357,7 @@ dojo.uuid.Uuid.prototype.getNode = function() {
 dojo.uuid.Uuid.prototype.getTimestamp = function(returnType) {
 	var errorMessage = "Called getTimestamp() on a dojo.uuid.Uuid that was not a TIME_BASED UUID.";
 	dojo.lang.assert(this.getVersion() == dojo.uuid.Uuid.Version.TIME_BASED, errorMessage);
-	
+
 	if (!returnType) {returnType = null};
 	switch (returnType) {
 		case "string":
@@ -365,18 +365,18 @@ dojo.uuid.Uuid.prototype.getTimestamp = function(returnType) {
 			return this.getTimestamp(Date).toUTCString();
 			break;
 		case "hex":
-			// Return a 15-character string of hex digits containing the 
+			// Return a 15-character string of hex digits containing the
 			// timestamp for this UUID, with the high-order bits first.
 			if (!this._timestampAsHexString) {
 				var arrayOfStrings = this._uuidString.split('-');
 				var hexTimeLow = arrayOfStrings[0];
 				var hexTimeMid = arrayOfStrings[1];
 				var hexTimeHigh = arrayOfStrings[2];
-			
-				// Chop off the leading "1" character, which is the UUID 
+
+				// Chop off the leading "1" character, which is the UUID
 				// version number for time-based UUIDs.
 				hexTimeHigh = hexTimeHigh.slice(1);
-			
+
 				this._timestampAsHexString = hexTimeHigh + hexTimeMid + hexTimeLow;
 				dojo.lang.assert(this._timestampAsHexString.length == 15);
 			}
@@ -385,10 +385,10 @@ dojo.uuid.Uuid.prototype.getTimestamp = function(returnType) {
 		case null: // no returnType was specified, so default to Date
 		case "date":
 		case Date:
-			// Return a JavaScript Date object. 
+			// Return a JavaScript Date object.
 			if (!this._timestampAsDate) {
 				var GREGORIAN_CHANGE_OFFSET_IN_HOURS = 3394248;
-			
+
 				var arrayOfParts = this._uuidString.split('-');
 				var timeLow = parseInt(arrayOfParts[0], dojo.uuid.Uuid.HEX_RADIX);
 				var timeMid = parseInt(arrayOfParts[1], dojo.uuid.Uuid.HEX_RADIX);
@@ -396,13 +396,13 @@ dojo.uuid.Uuid.prototype.getTimestamp = function(returnType) {
 				var hundredNanosecondIntervalsSince1582 = timeHigh & 0x0FFF;
 				hundredNanosecondIntervalsSince1582 <<= 16;
 				hundredNanosecondIntervalsSince1582 += timeMid;
-				// What we really want to do next is shift left 32 bits, but the 
+				// What we really want to do next is shift left 32 bits, but the
 				// result will be too big to fit in an int, so we'll multiply by 2^32,
 				// and the result will be a floating point approximation.
 				hundredNanosecondIntervalsSince1582 *= 0x100000000;
 				hundredNanosecondIntervalsSince1582 += timeLow;
 				var millisecondsSince1582 = hundredNanosecondIntervalsSince1582 / 10000;
-			
+
 				// Again, this will be a floating point approximation.
 				// We can make things exact later if we need to.
 				var secondsPerHour = 60 * 60;
@@ -410,7 +410,7 @@ dojo.uuid.Uuid.prototype.getTimestamp = function(returnType) {
 				var secondsBetween1582and1970 = hoursBetween1582and1970 * secondsPerHour;
 				var millisecondsBetween1582and1970 = secondsBetween1582and1970 * 1000;
 				var millisecondsSince1970 = millisecondsSince1582 - millisecondsBetween1582and1970;
-			
+
 				this._timestampAsDate = new Date(millisecondsSince1970);
 			}
 			return this._timestampAsDate;
diff --git a/webapp/src/main/webapp/src/validate/__package__.js b/webapp/src/main/webapp/src/validate/__package__.js
index 608ee3082..4d859136f 100644
--- a/webapp/src/main/webapp/src/validate/__package__.js
+++ b/webapp/src/main/webapp/src/validate/__package__.js
@@ -10,12 +10,12 @@
 
 dojo.require("dojo.validate");
 dojo.kwCompoundRequire({
-	common:		["dojo.validate.check", 
-						"dojo.validate.datetime", 
-						"dojo.validate.de", 
-						"dojo.validate.jp", 
-						"dojo.validate.us", 
-						"dojo.validate.web" 
+	common:		["dojo.validate.check",
+						"dojo.validate.datetime",
+						"dojo.validate.de",
+						"dojo.validate.jp",
+						"dojo.validate.us",
+						"dojo.validate.web"
 	],
 });
 dojo.provide("dojo.validate.*");
diff --git a/webapp/src/main/webapp/src/validate/check.js b/webapp/src/main/webapp/src/validate/check.js
index 5b28dad40..82a054772 100644
--- a/webapp/src/main/webapp/src/validate/check.js
+++ b/webapp/src/main/webapp/src/validate/check.js
@@ -89,11 +89,11 @@ dojo.validate.check = function(form, profile) {
 
 	// See if required input fields have values missing.
 	if ( profile.required instanceof Array ) {
-		for (var i = 0; i < profile.required.length; i++) { 
+		for (var i = 0; i < profile.required.length; i++) {
 			if(!dojo.lang.isString(profile.required[i])){ continue; }
 			var elem = form[profile.required[i]];
 			// Are textbox, textarea, or password fields blank.
-			if ( (elem.type == "text" || elem.type == "textarea" || elem.type == "password") && /^\s*$/.test(elem.value) ) {	
+			if ( (elem.type == "text" || elem.type == "textarea" || elem.type == "password") && /^\s*$/.test(elem.value) ) {
 				missing[missing.length] = elem.name;
 			}
 			// Does drop-down box have option selected.
@@ -106,7 +106,7 @@ dojo.validate.check = function(form, profile) {
 				for (var j = 0; j < elem.length; j++) {
 					if (elem[j].checked) { checked = true; }
 				}
-				if ( !checked ) {	
+				if ( !checked ) {
 					missing[missing.length] = elem[0].name;
 				}
 			}
@@ -115,11 +115,11 @@ dojo.validate.check = function(form, profile) {
 
 	// See if checkbox groups and select boxes have x number of required values.
 	if ( profile.required instanceof Array ) {
-		for (var i = 0; i < profile.required.length; i++) { 
+		for (var i = 0; i < profile.required.length; i++) {
 			if(!dojo.lang.isObject(profile.required[i])){ continue; }
 			var elem, numRequired;
-			for (var name in profile.required[i]) { 
-				elem = form[name]; 
+			for (var name in profile.required[i]) {
+				elem = form[name];
 				numRequired = profile.required[i][name];
 			}
 			// case 1: elem is a check box group
@@ -128,7 +128,7 @@ dojo.validate.check = function(form, profile) {
 				for (var j = 0; j < elem.length; j++) {
 					if (elem[j].checked) { checked++; }
 				}
-				if ( checked < numRequired ) {	
+				if ( checked < numRequired ) {
 					missing[missing.length] = elem[0].name;
 				}
 			}
@@ -138,7 +138,7 @@ dojo.validate.check = function(form, profile) {
 				for (var j = 0; j < elem.options.length; j++) {
 					if (elem.options[j].selected) { selected++; }
 				}
-				if ( selected < numRequired ) {	
+				if ( selected < numRequired ) {
 					missing[missing.length] = elem.name;
 				}
 			}
@@ -190,11 +190,11 @@ dojo.validate.check = function(form, profile) {
 				if(typeof isValidSomething != "undefined"){
 					isValid = isValidSomething.apply(null, params);
 				}else{
-					isValid = false; 
+					isValid = false;
 				}
 			}
 
-			if(!isValid){	
+			if(!isValid){
 				invalid[invalid.length] = elem.name;
 			}
 		}
@@ -205,14 +205,14 @@ dojo.validate.check = function(form, profile) {
 		for(name in profile.confirm){
 			var elem = form[name];	// the confirm element
 			var target = form[profile.confirm[name]];
-			if ( (elem.type != "text" && elem.type != "textarea" && elem.type != "password") 
+			if ( (elem.type != "text" && elem.type != "textarea" && elem.type != "password")
 				||(target.type != elem.type)
 				||(target.value == elem.value)	// it's valid
 				||(results.isInvalid(elem.name))// already listed as invalid
 				||(/^\s*$/.test(target.value))	)	// skip if blank - only confirm if target has a value
 			{
-				continue; 
-			}	
+				continue;
+			}
 			invalid[invalid.length] = elem.name;
 		}
 	}
diff --git a/webapp/src/main/webapp/src/validate/common.js b/webapp/src/main/webapp/src/validate/common.js
index 598b8d504..33da5c994 100644
--- a/webapp/src/main/webapp/src/validate/common.js
+++ b/webapp/src/main/webapp/src/validate/common.js
@@ -15,7 +15,7 @@ dojo.require("dojo.regexp");
 // *** Validation Functions ****
 
 /**
-  Checks if a string has non whitespace characters. 
+  Checks if a string has non whitespace characters.
   Parameters allow you to constrain the length.
 
   @param value  A string.
@@ -40,7 +40,7 @@ dojo.validate.isText = function(value, flags) {
 }
 
 /**
-  Validates whether a string is in an integer format. 
+  Validates whether a string is in an integer format.
 
   @param value  A string.
   @param flags  An object.
@@ -56,7 +56,7 @@ dojo.validate.isInteger = function(value, flags) {
 }
 
 /**
-  Validates whether a string is a real valued number. 
+  Validates whether a string is a real valued number.
   Format is the usual exponential notation.
 
   @param value  A string.
@@ -66,7 +66,7 @@ dojo.validate.isInteger = function(value, flags) {
     flags.decimal  The character used for the decimal point.  Default is ".".
     flags.exponent  Express in exponential notation.  Can be true, false, or [true, false].
       Default is [true, false], (i.e. the exponential part is optional).
-    flags.eSigned  The leading plus-or-minus sign on the exponent.  Can be true, false, 
+    flags.eSigned  The leading plus-or-minus sign on the exponent.  Can be true, false,
       or [true, false].  Default is [true, false], (i.e. sign is optional).
     flags in regexp.integer can be applied.
   @return  true or false.
@@ -77,13 +77,13 @@ dojo.validate.isRealNumber = function(value, flags) {
 }
 
 /**
-  Validates whether a string denotes a monetary value. 
+  Validates whether a string denotes a monetary value.
 
   @param value  A string.
   @param flags  An object.
     flags.signed  The leading plus-or-minus sign.  Can be true, false, or [true, false].
       Default is [true, false], (i.e. sign is optional).
-    flags.symbol  A currency symbol such as Yen "�", Pound "�", or the Euro sign "�".  
+    flags.symbol  A currency symbol such as Yen "�", Pound "�", or the Euro sign "�".
       Default is "$".  For more than one symbol use an array, e.g. ["$", ""], makes $ optional.
     flags.placement  The symbol can come "before" the number or "after".  Default is "before".
     flags.separator  The character used as the thousands separator. The default is ",".
@@ -98,8 +98,8 @@ dojo.validate.isCurrency = function(value, flags) {
 }
 
 /**
-  Validates whether a string denoting an integer, 
-  real number, or monetary value is between a max and min. 
+  Validates whether a string denoting an integer,
+  real number, or monetary value is between a max and min.
 
   @param value  A string.
   @param flags  An object.
@@ -114,7 +114,7 @@ dojo.validate.isInRange = function(value, flags) {
 	var max = (typeof flags.max == "number") ? flags.max : Infinity;
 	var min = (typeof flags.min == "number") ? flags.min : -Infinity;
 	var dec = (typeof flags.decimal == "string") ? flags.decimal : ".";
-	
+
 	// splice out anything not part of a number
 	var pattern = "[^" + dec + "\\deE+-]";
 	value = value.replace(RegExp(pattern, "g"), "");
@@ -144,7 +144,7 @@ dojo.validate.isInRange = function(value, flags) {
     ?        Stands for an optional digit, 0-9 or nothing.
     All other characters must appear literally in the expression.
 
-  Example   
+  Example
     "(###) ###-####"       ->   (510) 542-9742
     "(###) ###-#### x#???" ->   (510) 542-9742 x153
     "###-##-####"          ->   506-82-1089       i.e. social security number
@@ -190,11 +190,11 @@ dojo.validate.isNumberFormat = function(value, flags) {
 			// dependant/conditional fields are required if the target field is present and not blank.
 			// At present only textbox, password, and textarea fields are supported.
 			dependancies:	{
-				cc_exp: "cc_no",	
-				cc_type: "cc_no",	
+				cc_exp: "cc_no",
+				cc_type: "cc_no",
 			},
 
-			// Fields can be validated using any boolean valued function.  
+			// Fields can be validated using any boolean valued function.
 			// Use arrays to specify parameters in addition to the field value.
 			constraints: {
 				field_name1: myValidationFunction,
@@ -208,8 +208,8 @@ dojo.validate.isNumberFormat = function(value, flags) {
 			// It associates each field in its property list with another field whose value should be equal.
 			// If the values are not equal, the field in the property list is reported as Invalid. Unless the target field is blank.
 			confirm: {
-				email_confirm: "email",	
-				pw2: "pw1",	
+				email_confirm: "email",
+				pw2: "pw1",
 			}
 		};
 
diff --git a/webapp/src/main/webapp/src/validate/datetime.js b/webapp/src/main/webapp/src/validate/datetime.js
index f16f4374f..c5f3ef43d 100644
--- a/webapp/src/main/webapp/src/validate/datetime.js
+++ b/webapp/src/main/webapp/src/validate/datetime.js
@@ -117,7 +117,7 @@ dojo.validate.isValidDate = function(dateValue, format) {
 
 	// Dynamic RE that parses the original format given
 	var re = new RegExp(reLiteral);
-	
+
 	// Test if date is in a valid format
 	if (!re.test(dateValue))  return false;
 
@@ -155,13 +155,13 @@ dojo.validate.isValidDate = function(dateValue, format) {
 	var leapyear = (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0));
 
 	// 31st of a month with 30 days
-	if (date == 31 && (month == 4 || month == 6 || month == 9 || month == 11)) return false; 
+	if (date == 31 && (month == 4 || month == 6 || month == 9 || month == 11)) return false;
 
 	// February 30th or 31st
-	if (date >= 30 && month == 2) return false; 
+	if (date >= 30 && month == 2) return false;
 
 	// February 29th outside a leap year
-	if (date == 29 && month == 2 && !leapyear) return false; 
+	if (date == 29 && month == 2 && !leapyear) return false;
 	if (dayofyear == 366 && !leapyear)  return false;
 
 	return true;
diff --git a/webapp/src/main/webapp/src/validate/web.js b/webapp/src/main/webapp/src/validate/web.js
index 472c98347..428ecef09 100644
--- a/webapp/src/main/webapp/src/validate/web.js
+++ b/webapp/src/main/webapp/src/validate/web.js
@@ -39,7 +39,7 @@ dojo.validate.isIpAddress = function(value, flags) {
 
   @param value  A string.
   @param flags  An object.
-    flags.scheme  Can be true, false, or [true, false]. 
+    flags.scheme  Can be true, false, or [true, false].
       This means: required, not allowed, or either.
     flags in regexp.host can be applied.
     flags in regexp.ipAddress can be applied.
diff --git a/webapp/src/main/webapp/src/widget/AccordionContainer.js b/webapp/src/main/webapp/src/widget/AccordionContainer.js
index 4431427b4..5944ec1ec 100644
--- a/webapp/src/main/webapp/src/widget/AccordionContainer.js
+++ b/webapp/src/main/webapp/src/widget/AccordionContainer.js
@@ -35,26 +35,26 @@ dojo.widget.defineWidget(
 				dojo.html.addClass(widget.containerNode, this.containerNodeClass);
 				dojo.html.addClass(widget.labelNode, this.labelNodeClass);
 				this.addWidgetAsDirectChild(widget);
-				this.registerChild(widget);	
+				this.registerChild(widget);
 				widget.setSizes();
 				return widget;
 			}
 	        },
-	
+
 		postCreate: function() {
 			var tmpChildren = this.children;
 			this.children=[];
 			dojo.html.removeChildren(this.domNode);
 			dojo.lang.forEach(tmpChildren, dojo.lang.hitch(this,"addChild"));
 		},
-	
+
 		removeChild: function(widget) {
 			dojo.widget.AccordionContainer.superclass.removeChild.call(this, widget);
 			if(this.children[0]){
 				this.children[0].setSizes();
 			}
 		},
-		
+
 		onResized: function(){
 			this.children[0].setSizes();
 		}
diff --git a/webapp/src/main/webapp/src/widget/Button.js b/webapp/src/main/webapp/src/widget/Button.js
index 4233da03b..3a53bfed3 100644
--- a/webapp/src/main/webapp/src/widget/Button.js
+++ b/webapp/src/main/webapp/src/widget/Button.js
@@ -23,27 +23,27 @@ dojo.widget.defineWidget(
 	{
 		widgetType: "Button",
 		isContainer: true,
-	
+
 		// Constructor arguments
 		caption: "",
 		disabled: false,
-	
+
 		templatePath: dojo.uri.dojoUri("src/widget/templates/HtmlButtonTemplate.html"),
 		templateCssPath: dojo.uri.dojoUri("src/widget/templates/HtmlButtonTemplate.css"),
-		
+
 		// button images
 		inactiveImg: "src/widget/templates/images/soriaButton-",
 		activeImg: "src/widget/templates/images/soriaActive-",
 		pressedImg: "src/widget/templates/images/soriaPressed-",
 		disabledImg: "src/widget/templates/images/soriaDisabled-",
 		width2height: 1.0/3.0,
-	
+
 		// attach points
 		containerNode: null,
 		leftImage: null,
 		centerImage: null,
 		rightImage: null,
-	
+
 		fillInTemplate: function(args, frag){
 			if(this.caption != ""){
 				this.containerNode.appendChild(document.createTextNode(this.caption));
@@ -54,7 +54,7 @@ dojo.widget.defineWidget(
 		postCreate: function(args, frag){
 			this.sizeMyself();
 		},
-	
+
 		sizeMyself: function(){
 			// we cannot size correctly if any of our ancestors are hidden (display:none),
 			// so temporarily attach to document.body
@@ -63,9 +63,9 @@ dojo.widget.defineWidget(
 				dojo.dom.insertBefore(placeHolder, this.domNode);
 			}
 			dojo.html.body().appendChild(this.domNode);
-			
+
 			this.sizeMyselfHelper();
-			
+
 			// Put this.domNode back where it was originally
 			if(placeHolder){
 				dojo.dom.insertBefore(this.domNode, placeHolder);
@@ -77,9 +77,9 @@ dojo.widget.defineWidget(
 			this.height = dojo.style.getOuterHeight(this.containerNode);
 			this.containerWidth = dojo.style.getOuterWidth(this.containerNode);
 			var endWidth= this.height * this.width2height;
-	
+
 			this.containerNode.style.left=endWidth+"px";
-	
+
 			this.leftImage.height = this.rightImage.height = this.centerImage.height = this.height;
 			this.leftImage.width = this.rightImage.width = endWidth+1;
 			this.centerImage.width = this.containerWidth;
@@ -91,17 +91,17 @@ dojo.widget.defineWidget(
 			} else {
 				dojo.html.removeClass(this.domNode, "dojoButtonDisabled");
 			}
-				
+
 			this.domNode.style.height=this.height + "px";
 			this.domNode.style.width= (this.containerWidth+2*endWidth) + "px";
 		},
-	
+
 		onMouseOver: function(e){
 			if( this.disabled ){ return; }
 			dojo.html.prependClass(this.domNode, "dojoButtonHover");
 			this._setImage(this.activeImg);
 		},
-	
+
 		onMouseDown: function(e){
 			if( this.disabled ){ return; }
 			dojo.html.prependClass(this.domNode, "dojoButtonDepressed");
@@ -114,13 +114,13 @@ dojo.widget.defineWidget(
 			dojo.html.removeClass(this.domNode, "dojoButtonDepressed");
 			this._setImage(this.activeImg);
 		},
-	
+
 		onMouseOut: function(e){
 			if( this.disabled ){ return; }
 			dojo.html.removeClass(this.domNode, "dojoButtonHover");
 			this._setImage(this.inactiveImg);
 		},
-	
+
 		buttonClick: function(e){
 			if( !this.disabled ) { this.onClick(e); }
 		},
@@ -132,11 +132,11 @@ dojo.widget.defineWidget(
 			this.centerImage.src=dojo.uri.dojoUri(prefix + "c.gif");
 			this.rightImage.src=dojo.uri.dojoUri(prefix + "r.gif");
 		},
-		
+
 		_toggleMenu: function(menuId){
 			var menu = dojo.widget.getWidgetById(menuId);
 			if ( !menu ) { return; }
-	
+
 			if ( menu.open && !menu.isShowingNow) {
 				var pos = dojo.style.getAbsolutePosition(this.domNode, false);
 				menu.open(pos.x, pos.y+this.height, this);
@@ -146,13 +146,13 @@ dojo.widget.defineWidget(
 				menu.toggle();
 			}
 		},
-		
+
 		setCaption: function(content){
 			this.caption=content;
 			this.containerNode.innerHTML=content;
 			this.sizeMyself();
 		},
-		
+
 		setDisabled: function(disabled){
 			this.disabled=disabled;
 			this.sizeMyself();
@@ -165,17 +165,17 @@ dojo.widget.defineWidget(
 	dojo.widget.html.Button,
 	{
 		widgetType: "DropDownButton",
-	
+
 		menuId: "",
 
 		arrow: null,
-	
+
 		downArrow: "src/widget/templates/images/whiteDownArrow.gif",
 		disabledDownArrow: "src/widget/templates/images/whiteDownArrow.gif",
-	
+
 		fillInTemplate: function(args, frag){
 			dojo.widget.html.DropDownButton.superclass.fillInTemplate.call(this, args, frag);
-	
+
 			this.arrow = document.createElement("img");
 			dojo.html.setClass(this.arrow, "downArrow");
 		},
@@ -199,54 +199,54 @@ dojo.widget.defineWidget(
 	dojo.widget.html.Button,
 	{
 		widgetType: "ComboButton",
-	
+
 		menuId: "",
-	
+
 		templatePath: dojo.uri.dojoUri("src/widget/templates/HtmlComboButtonTemplate.html"),
-	
+
 		// attach points
 		leftPart: null,
 		rightPart: null,
 		arrowBackgroundImage: null,
-	
+
 		// constants
 		splitWidth: 2,		// pixels between left&right part of button
 		arrowWidth: 5,		// width of segment holding down arrow
-	
+
 		sizeMyselfHelper: function(e){
 			this.height = dojo.style.getOuterHeight(this.containerNode);
 			this.containerWidth = dojo.style.getOuterWidth(this.containerNode);
 			var endWidth= this.height/3;
-	
+
 			// left part
-			this.leftImage.height = this.rightImage.height = this.centerImage.height = 
+			this.leftImage.height = this.rightImage.height = this.centerImage.height =
 				this.arrowBackgroundImage.height = this.height;
 			this.leftImage.width = endWidth+1;
 			this.centerImage.width = this.containerWidth;
 			this.leftPart.style.height = this.height + "px";
 			this.leftPart.style.width = endWidth + this.containerWidth + "px";
 			this._setImageL(this.disabled ? this.disabledImg : this.inactiveImg);
-	
+
 			// right part
 			this.arrowBackgroundImage.width=this.arrowWidth;
 			this.rightImage.width = endWidth+1;
 			this.rightPart.style.height = this.height + "px";
 			this.rightPart.style.width = this.arrowWidth + endWidth + "px";
 			this._setImageR(this.disabled ? this.disabledImg : this.inactiveImg);
-	
+
 			// outer container
 			this.domNode.style.height=this.height + "px";
 			var totalWidth = this.containerWidth+this.splitWidth+this.arrowWidth+2*endWidth;
 			this.domNode.style.width= totalWidth + "px";
 		},
-	
+
 		/** functions on left part of button**/
 		leftOver: function(e){
 			if( this.disabled ){ return; }
 			dojo.html.prependClass(this.leftPart, "dojoButtonHover");
 			this._setImageL(this.activeImg);
 		},
-	
+
 		leftDown: function(e){
 			if( this.disabled ){ return; }
 			dojo.html.prependClass(this.leftPart, "dojoButtonDepressed");
@@ -259,31 +259,31 @@ dojo.widget.defineWidget(
 			dojo.html.removeClass(this.leftPart, "dojoButtonDepressed");
 			this._setImageL(this.activeImg);
 		},
-	
+
 		leftOut: function(e){
 			if( this.disabled ){ return; }
 			dojo.html.removeClass(this.leftPart, "dojoButtonHover");
 			this._setImageL(this.inactiveImg);
 		},
-	
+
 		leftClick: function(e){
 			if ( !this.disabled ) {
 				this.onClick(e);
 			}
 		},
-	
+
 		_setImageL: function(prefix){
 			this.leftImage.src=dojo.uri.dojoUri(prefix + "l.gif");
 			this.centerImage.src=dojo.uri.dojoUri(prefix + "c.gif");
 		},
-	
+
 		/*** functions on right part of button ***/
 		rightOver: function(e){
 			if( this.disabled ){ return; }
 			dojo.html.prependClass(this.rightPart, "dojoButtonHover");
 			this._setImageR(this.activeImg);
 		},
-	
+
 		rightDown: function(e){
 			if( this.disabled ){ return; }
 			dojo.html.prependClass(this.rightPart, "dojoButtonDepressed");
@@ -296,20 +296,20 @@ dojo.widget.defineWidget(
 			dojo.html.removeClass(this.rightPart, "dojoButtonDepressed");
 			this._setImageR(this.activeImg);
 		},
-	
+
 		rightOut: function(e){
 			if( this.disabled ){ return; }
 			dojo.html.removeClass(this.rightPart, "dojoButtonHover");
 			this._setImageR(this.inactiveImg);
 		},
-	
+
 		rightClick: function(e){
 			if( this.disabled ){ return; }
 			this._toggleMenu(this.menuId);
 		},
-	
+
 		_setImageR: function(prefix){
 			this.arrowBackgroundImage.src=dojo.uri.dojoUri(prefix + "c.gif");
 			this.rightImage.src=dojo.uri.dojoUri(prefix + "r.gif");
 		}
-	});
\ No newline at end of file
+	});
diff --git a/webapp/src/main/webapp/src/widget/Chart.js b/webapp/src/main/webapp/src/widget/Chart.js
index bfaed7c8b..4654737a9 100644
--- a/webapp/src/main/webapp/src/widget/Chart.js
+++ b/webapp/src/main/webapp/src/widget/Chart.js
@@ -165,7 +165,7 @@ dojo.lang.extend(dojo.widget.Chart.DataSeries, {
 			if (!isNaN(n)){
 				var b=false;
 				for(var j=0; j<a.length&&!b; j++){
-					if (n==a[j]) b=true; 
+					if (n==a[j]) b=true;
 				}
 				if(!b){ a.push(n); }
 			}
diff --git a/webapp/src/main/webapp/src/widget/CiviCrmDatePicker.js b/webapp/src/main/webapp/src/widget/CiviCrmDatePicker.js
index 0ed9da7a9..2b9332bb6 100644
--- a/webapp/src/main/webapp/src/widget/CiviCrmDatePicker.js
+++ b/webapp/src/main/webapp/src/widget/CiviCrmDatePicker.js
@@ -80,7 +80,7 @@ dojo.widget.HtmlCiviCrmDatePicker = function(){
 
 		if(this.mode.indexOf("date") != -1){
 			this.datePicker = dojo.widget.createWidget("DatePicker", {}, this.dateHolderTd);
-			dojo.event.connect(	this.datePicker, "onSetDate", 
+			dojo.event.connect(	this.datePicker, "onSetDate",
 								this, "setDateSelects");
 
 			var mfd = this.modeFormats.date;
@@ -90,7 +90,7 @@ dojo.widget.HtmlCiviCrmDatePicker = function(){
 		}
 		if(this.mode.indexOf("time") != -1){
 			this.timePicker = dojo.widget.createWidget("TimePicker", {}, this.timeHolderTd);
-			dojo.event.connect(	this.timePicker, "onSetTime", 
+			dojo.event.connect(	this.timePicker, "onSetTime",
 								this, "setTimeSelects");
 			var mfd = this.modeFormats.time;
 			for(var x=0; x<mfd.length; x++){
@@ -105,9 +105,9 @@ dojo.widget.HtmlCiviCrmDatePicker = function(){
 
 	this.postCreate = function(){
 		dojo.event.kwConnect({
-			type: "before", 
+			type: "before",
 			srcObj: dojo.html.getParentByType(this.domNode, "form"),
-			srcFunc: "onsubmit", 
+			srcFunc: "onsubmit",
 			targetObj: this,
 			targetFunc: "unhide"
 		});
diff --git a/webapp/src/main/webapp/src/widget/ColorPalette.js b/webapp/src/main/webapp/src/widget/ColorPalette.js
index c963b63cf..283b98865 100644
--- a/webapp/src/main/webapp/src/widget/ColorPalette.js
+++ b/webapp/src/main/webapp/src/widget/ColorPalette.js
@@ -18,7 +18,7 @@ dojo.widget.tags.addParseTreeHandler("dojo:ToolbarColorDialog");
 
 dojo.widget.html.ToolbarColorDialog = function(){
 	dojo.widget.html.ToolbarDialog.call(this);
-	
+
 	/*
 	FIXME: 	why the fuck did anyone ever think this kind of expensive iteration
 			was a good idea?
@@ -49,14 +49,14 @@ dojo.lang.extend(dojo.widget.html.ToolbarColorDialog, {
 		this._value = color;
 		this._fireEvent("onSetValue", color);
 	},
-	
+
 	showDialog: function (e) {
 		dojo.widget.html.ToolbarColorDialog.superclass.showDialog.call(this, e);
 		var x = dojo.html.getAbsoluteX(this.domNode);
 		var y = dojo.html.getAbsoluteY(this.domNode) + dojo.html.getInnerHeight(this.domNode);
 		this.dialog.showAt(x, y);
 	},
-	
+
 	hideDialog: function (e) {
 		dojo.widget.html.ToolbarColorDialog.superclass.hideDialog.call(this, e);
 		this.dialog.hide();
@@ -76,11 +76,11 @@ dojo.inherits(dojo.widget.html.ColorPalette, dojo.widget.HtmlWidget);
 dojo.lang.extend(dojo.widget.html.ColorPalette, {
 
 	widgetType: "colorpalette",
-	
+
 	palette: "7x10",
 
 	bgIframe: null,
-	
+
 	palettes: {
 		"7x10": [["fff", "fcc", "fc9", "ff9", "ffc", "9f9", "9ff", "cff", "ccf", "fcf"],
 			["ccc", "f66", "f96", "ff6", "ff3", "6f9", "3ff", "6ff", "99f", "f9f"],
@@ -89,7 +89,7 @@ dojo.lang.extend(dojo.widget.html.ColorPalette, {
 			["666", "900", "c60", "c93", "990", "090", "399", "33f", "60c", "939"],
 			["333", "600", "930", "963", "660", "060", "366", "009", "339", "636"],
 			["000", "300", "630", "633", "330", "030", "033", "006", "309", "303"]],
-	
+
 		"3x4": [["ffffff"/*white*/, "00ff00"/*lime*/, "008000"/*green*/, "0000ff"/*blue*/],
 			["c0c0c0"/*silver*/, "ffff00"/*yellow*/, "ff00ff"/*fuchsia*/, "000080"/*navy*/],
 			["808080"/*gray*/, "ff0000"/*red*/, "800080"/*purple*/, "000000"/*black*/]]
@@ -97,7 +97,7 @@ dojo.lang.extend(dojo.widget.html.ColorPalette, {
 	},
 
 	buildRendering: function () {
-		
+
 		this.domNode = document.createElement("table");
 		dojo.html.disableSelection(this.domNode);
 		dojo.event.connect(this.domNode, "onmousedown", function (e) {
@@ -116,7 +116,7 @@ dojo.lang.extend(dojo.widget.html.ColorPalette, {
 				if (colors[i][j].length == 3) {
 					colors[i][j] = colors[i][j].replace(/(.)(.)(.)/, "$1$1$2$2$3$3");
 				}
-	
+
 				var td = document.createElement("td");
 				with (td.style) {
 					backgroundColor = "#" + colors[i][j];
@@ -124,13 +124,13 @@ dojo.lang.extend(dojo.widget.html.ColorPalette, {
 					width = height = "15px";
 					fontSize = "1px";
 				}
-	
+
 				td.color = "#" + colors[i][j];
-	
+
 				td.onmouseover = function (e) { this.style.borderColor = "white"; }
 				td.onmouseout = function (e) { this.style.borderColor = "gray"; }
 				dojo.event.connect(td, "onmousedown", this, "click");
-	
+
 				td.innerHTML = "&nbsp;";
 				tr.appendChild(td);
 			}
@@ -162,7 +162,7 @@ dojo.lang.extend(dojo.widget.html.ColorPalette, {
 			this.bgIframe.style.display = "none";
 		}
 	},
-	
+
 	showAt: function (x, y) {
 		with(this.domNode.style){
 			top = y + "px";
diff --git a/webapp/src/main/webapp/src/widget/ComboBox.js b/webapp/src/main/webapp/src/widget/ComboBox.js
index e776c5ec7..d191d1539 100644
--- a/webapp/src/main/webapp/src/widget/ComboBox.js
+++ b/webapp/src/main/webapp/src/widget/ComboBox.js
@@ -88,7 +88,7 @@ dojo.widget.ComboBoxDataProvider = function(dataPairs, limit, timeout){
 				for(var x=0; x<ol; x++){
 					var keyValArr = [new String(opts[x].innerHTML), new String(opts[x].value)];
 					data.push(keyValArr);
-					if(opts[x].selected){ 
+					if(opts[x].selected){
 						cbox.setAllValues(keyValArr[0], keyValArr[1]);
 					}
 				}
@@ -100,7 +100,7 @@ dojo.widget.ComboBoxDataProvider = function(dataPairs, limit, timeout){
 	this.getData = function(url){
 		dojo.io.bind({
 			url: url,
-			load: dojo.lang.hitch(this, function(type, data, evt){ 
+			load: dojo.lang.hitch(this, function(type, data, evt){
 				if(!dojo.lang.isArray(data)){
 					var arrData = [];
 					for(var key in data){
@@ -204,7 +204,7 @@ dojo.widget.ComboBoxDataProvider = function(dataPairs, limit, timeout){
 		// populate this.data and initialize lookup structures
 		this.data = pdata;
 	}
-	
+
 	if(dataPairs){
 		this.setData(dataPairs);
 	}
@@ -216,11 +216,11 @@ dojo.declare(
 	{
 		widgetType: "ComboBox",
 		isContainer: false,
-	
+
 		forceValidOption: false,
 		searchType: "stringstart",
 		dataProvider: null,
-	
+
 		startSearch: function(searchString){},
 		openResultList: function(results){},
 		clearResultList: function(){},
diff --git a/webapp/src/main/webapp/src/widget/ContextMenu.js b/webapp/src/main/webapp/src/widget/ContextMenu.js
index b47f4a754..78221b6a1 100644
--- a/webapp/src/main/webapp/src/widget/ContextMenu.js
+++ b/webapp/src/main/webapp/src/widget/ContextMenu.js
@@ -20,7 +20,7 @@ dojo.widget.ContextMenu = function(){
 	this.widgetType = "ContextMenu";
 	this.isContainer = true;
 	this.isOpened = false;
-	
+
 	// copy children widgets output directly to parent (this node), to avoid
 	// errors trying to insert an <li> under a <div>
 	this.snarfChildDomOutput = true;
diff --git a/webapp/src/main/webapp/src/widget/DatePicker.js b/webapp/src/main/webapp/src/widget/DatePicker.js
index 4f4e6b123..bff90c8f6 100644
--- a/webapp/src/main/webapp/src/widget/DatePicker.js
+++ b/webapp/src/main/webapp/src/widget/DatePicker.js
@@ -28,7 +28,7 @@ dojo.requireAfterIf("html", "dojo.widget.html.DatePicker");
 dojo.widget.DatePicker.util = new function() {
 	this.months = dojo.date.months;
 	this.weekdays = dojo.date.days;
-	
+
 	this.toRfcDate = function(jsDate) {
 		if(!jsDate) {
 			var jsDate = new Date();
@@ -36,9 +36,9 @@ dojo.widget.DatePicker.util = new function() {
 		// because this is a date picker and not a time picker, we don't return a time
 		return dojo.date.format(jsDate, "%Y-%m-%d");
 	}
-	
+
 	this.fromRfcDate = function(rfcDate) {
-		// backwards compatible support for use of "any" instead of just not 
+		// backwards compatible support for use of "any" instead of just not
 		// including the time
 		if(rfcDate.indexOf("Tany")!=-1) {
 			rfcDate = rfcDate.replace("Tany","");
@@ -47,7 +47,7 @@ dojo.widget.DatePicker.util = new function() {
 		dojo.date.setIso8601(jsDate, rfcDate);
 		return jsDate;
 	}
-	
+
 	this.initFirstSaturday = function(month, year) {
 		if(!month) {
 			month = this.date.getMonth();
diff --git a/webapp/src/main/webapp/src/widget/Dialog.js b/webapp/src/main/webapp/src/widget/Dialog.js
index 002cd856d..a2d162f1b 100644
--- a/webapp/src/main/webapp/src/widget/Dialog.js
+++ b/webapp/src/main/webapp/src/widget/Dialog.js
@@ -24,7 +24,7 @@ dojo.widget.defineWidget(
 		templatePath: dojo.uri.dojoUri("src/widget/templates/HtmlDialog.html"),
 		isContainer: true,
 		_scrollConnected: false,
-		
+
 		// provide a focusable element or element id if you need to
 		// work around FF's tendency to send focus into outer space on hide
 		focusElement: "",
@@ -96,7 +96,7 @@ dojo.widget.defineWidget(
 			this.bg.style.backgroundColor = color.toString();
 			return this.bgColor = color;
 		},
-		
+
 		setBackgroundOpacity: function(op) {
 			if(arguments.length == 0) { op = this.bgOpacity; }
 			dojo.style.setOpacity(this.bg, op);
@@ -158,7 +158,7 @@ dojo.widget.defineWidget(
 				this._scrollConnected = true;
 				dojo.event.connect(window, "onscroll", this, "onScroll");
 			}
-			
+
 			if(this.lifetime){
 				this.timeRemaining = this.lifetime;
 				if(!this.blockDuration){
@@ -187,18 +187,18 @@ dojo.widget.defineWidget(
 			// the dialog after the data is loaded
 			this.placeDialog();
 		},
-		
+
 		fillInTemplate: function(){
 			// dojo.event.connect(this.domNode, "onclick", this, "killEvent");
 		},
 
 		hide: function(){
 			// workaround for FF focus going into outer space
-			if (this.focusElement) { 
-				dojo.byId(this.focusElement).focus(); 
+			if (this.focusElement) {
+				dojo.byId(this.focusElement).focus();
 				dojo.byId(this.focusElement).blur();
 			}
-			
+
 			if(this.timer){
 				clearInterval(this.timer);
 			}
@@ -213,7 +213,7 @@ dojo.widget.defineWidget(
 				dojo.event.disconnect(window, "onscroll", this, "onScroll");
 			}
 		},
-		
+
 		setTimerNode: function(node){
 			this.timerNode = node;
 		},
@@ -226,7 +226,7 @@ dojo.widget.defineWidget(
 		setShowControl: function(node) {
 			dojo.event.connect(node, "onclick", this, "show");
 		},
-		
+
 		onTick: function(){
 			if(this.timer){
 				this.timeRemaining -= 100;
@@ -259,7 +259,7 @@ dojo.widget.defineWidget(
 				this.onResized();
 			}
 		},
-		
+
 		killEvent: function(evt){
 			evt.preventDefault();
 			evt.stopPropagation();
diff --git a/webapp/src/main/webapp/src/widget/DomWidget.js b/webapp/src/main/webapp/src/widget/DomWidget.js
index 9a64c6a26..fe81d5c97 100644
--- a/webapp/src/main/webapp/src/widget/DomWidget.js
+++ b/webapp/src/main/webapp/src/widget/DomWidget.js
@@ -46,7 +46,7 @@ dojo.widget.fillFromTemplateCache = function(obj, templatePath, templateCssPath,
 		cpath = dojo.uri.dojoUri(cpath);
 		dojo.deprecated("templateCssPath should be of type dojo.uri.Uri", null, "0.4");
 	}
-	
+
 	var tmplts = dojo.widget._templateCache;
 	if(!obj["widgetType"]) { // don't have a real template here
 		do {
@@ -115,14 +115,14 @@ dojo.widget.eventAttachProperty = "dojoAttachEvent";
 dojo.widget.onBuildProperty = "dojoOnBuild";
 dojo.widget.waiNames  = ["waiRole", "waiState"];
 dojo.widget.wai = {
-	waiRole: { 	name: "waiRole", 
-				namespace: "http://www.w3.org/TR/xhtml2", 
+	waiRole: { 	name: "waiRole",
+				namespace: "http://www.w3.org/TR/xhtml2",
 				alias: "x2",
 				prefix: "wairole:",
 				nsName: "role"
 	},
-	waiState: { name: "waiState", 
-				namespace: "http://www.w3.org/2005/07/aaa" , 
+	waiState: { name: "waiState",
+				namespace: "http://www.w3.org/2005/07/aaa" ,
 				alias: "aaa",
 				prefix: "",
 				nsName: "state"
@@ -148,7 +148,7 @@ dojo.widget.attachTemplateNodes = function(rootNode, targetObj, events){
 		return str.replace(/^\s+|\s+$/g, "");
 	}
 
-	if(!rootNode){ 
+	if(!rootNode){
 		rootNode = targetObj.domNode;
 	}
 
@@ -213,7 +213,7 @@ dojo.widget.attachTemplateNodes = function(rootNode, targetObj, events){
 					thisFunc = tevt;
 				}
 
-				var tf = function(){ 
+				var tf = function(){
 					var ntf = new String(thisFunc);
 					return function(evt){
 						if(_this[ntf]){
@@ -239,7 +239,7 @@ dojo.widget.attachTemplateNodes = function(rootNode, targetObj, events){
 				}
 				for(var z=0; z<funcs.length; z++){
 					if(!funcs[z].length){ continue; }
-					var tf = function(){ 
+					var tf = function(){
 						var ntf = new String(funcs[z]);
 						return function(evt){
 							if(_this[ntf]){
@@ -294,7 +294,7 @@ dojo.declare("dojo.widget.DomWidget", dojo.widget.Widget, {
 			this.create(arguments[0]);
 		}
 	},
-								 
+
 	templateNode: null,
 	templateString: null,
 	templateCssString: null,
@@ -315,17 +315,17 @@ dojo.declare("dojo.widget.DomWidget", dojo.widget.Widget, {
 		}
 		return widget;
 	},
-	
+
 	addWidgetAsDirectChild: function(widget, overrideContainerNode, pos, ref, insertIndex){
 		if((!this.containerNode)&&(!overrideContainerNode)){
 			this.containerNode = this.domNode;
 		}
 		var cn = (overrideContainerNode) ? overrideContainerNode : this.containerNode;
 		if(!pos){ pos = "after"; }
-		if(!ref){ 
+		if(!ref){
 			// if(!cn){ cn = document.body; }
 			if(!cn){ cn = document.body; }
-			ref = cn.lastChild; 
+			ref = cn.lastChild;
 		}
 		if(!insertIndex) { insertIndex = 0; }
 		widget.domNode.setAttribute("dojoinsertionindex", insertIndex);
@@ -356,7 +356,7 @@ dojo.declare("dojo.widget.DomWidget", dojo.widget.Widget, {
 	// Record that given widget descends from me
 	registerChild: function(widget, insertionIndex){
 
-		// we need to insert the child at the right point in the parent's 
+		// we need to insert the child at the right point in the parent's
 		// 'children' array, based on the insertionIndex
 
 		widget.dojoInsertionIndex = insertionIndex;
@@ -372,7 +372,7 @@ dojo.declare("dojo.widget.DomWidget", dojo.widget.Widget, {
 
 		widget.parent = this;
 		widget.addedTo(this);
-		
+
 		// If this widget was created programatically, then it was erroneously added
 		// to dojo.widget.manager.topWidgets.  Fix that here.
 		delete dojo.widget.manager.topWidgets[widget.widgetId];
@@ -393,7 +393,7 @@ dojo.declare("dojo.widget.DomWidget", dojo.widget.Widget, {
 		}
 		return (frag ? frag["dojo:"+this.widgetType.toLowerCase()]["nodeRef"] : null);
 	},
-	
+
 	// Replace source domNode with generated dom structure, and register
 	// widget with parent.
 	postInitialize: function(args, frag, parentComp){
@@ -435,12 +435,12 @@ dojo.declare("dojo.widget.DomWidget", dojo.widget.Widget, {
 	buildRendering: function(args, frag){
 		// DOM widgets construct themselves from a template
 		var ts = dojo.widget._templateCache[this.widgetType];
-		if(	
+		if(
 			(!this.preventClobber)&&(
 				(this.templatePath)||
 				(this.templateNode)||
 				(
-					(this["templateString"])&&(this.templateString.length) 
+					(this["templateString"])&&(this.templateString.length)
 				)||
 				(
 					(typeof ts != "undefined")&&( (ts["string"])||(ts["node"]) )
@@ -472,8 +472,8 @@ dojo.declare("dojo.widget.DomWidget", dojo.widget.Widget, {
 			avoidCache = true;
 			args["templatePath"] = args["templatepath"];
 		}
-		dojo.widget.fillFromTemplateCache(	this, 
-											args["templatePath"], 
+		dojo.widget.fillFromTemplateCache(	this,
+											args["templatePath"],
 											args["templateCssPath"],
 											null,
 											avoidCache);
@@ -488,8 +488,8 @@ dojo.declare("dojo.widget.DomWidget", dojo.widget.Widget, {
 		}
 		var matches = false;
 		var node = null;
-		// var tstr = new String(this.templateString); 
-		var tstr = this.templateString; 
+		// var tstr = new String(this.templateString);
+		var tstr = this.templateString;
 		// attempt to clone a template node, if there is one
 		if((!this.templateNode)&&(this.templateString)){
 			matches = this.templateString.match(/\$\{([^\}]+)\}/g);
@@ -518,10 +518,10 @@ dojo.declare("dojo.widget.DomWidget", dojo.widget.Widget, {
 			}else{
 				// otherwise, we are required to instantiate a copy of the template
 				// string if one is provided.
-				
+
 				// FIXME: need to be able to distinguish here what should be done
 				// or provide a generic interface across all DOM implementations
-				// FIMXE: this breaks if the template has whitespace as its first 
+				// FIMXE: this breaks if the template has whitespace as its first
 				// characters
 				// node = this.createNodesFromText(this.templateString, true);
 				// this.templateNode = node[0].cloneNode(true); // we're optimistic here
@@ -531,7 +531,7 @@ dojo.declare("dojo.widget.DomWidget", dojo.widget.Widget, {
 				}
 			}
 		}
-		if((!this.templateNode)&&(!matches)){ 
+		if((!this.templateNode)&&(!matches)){
 			dojo.debug("weren't able to create template!");
 			return false;
 		}else if(!matches){
@@ -548,7 +548,7 @@ dojo.declare("dojo.widget.DomWidget", dojo.widget.Widget, {
 		// dojo.profile.start("attachTemplateNodes");
 		this.attachTemplateNodes(this.domNode, this);
 		// dojo.profile.end("attachTemplateNodes");
-		
+
 		// relocate source contents to templated container node
 		// this.containerNode must be able to receive children, or exceptions will be thrown
 		if (this.isContainer && this.containerNode){
@@ -561,14 +561,14 @@ dojo.declare("dojo.widget.DomWidget", dojo.widget.Widget, {
 
 	attachTemplateNodes: function(baseNode, targetObj){
 		if(!targetObj){ targetObj = this; }
-		return dojo.widget.attachTemplateNodes(baseNode, targetObj, 
+		return dojo.widget.attachTemplateNodes(baseNode, targetObj,
 					dojo.widget.getDojoEventsFromStr(this.templateString));
 	},
 
 	fillInTemplate: function(){
 		// dojo.unimplemented("dojo.widget.DomWidget.fillInTemplate");
 	},
-	
+
 	// method over-ride
 	destroyRendering: function(){
 		try{
@@ -578,7 +578,7 @@ dojo.declare("dojo.widget.DomWidget", dojo.widget.Widget, {
 
 	// FIXME: method over-ride
 	cleanUp: function(){},
-	
+
 	getContainerHeight: function(){
 		dojo.unimplemented("dojo.widget.DomWidget.getContainerHeight");
 	},
diff --git a/webapp/src/main/webapp/src/widget/DropdownContainer.js b/webapp/src/main/webapp/src/widget/DropdownContainer.js
index 42cfd8fb9..e4441f443 100644
--- a/webapp/src/main/webapp/src/widget/DropdownContainer.js
+++ b/webapp/src/main/webapp/src/widget/DropdownContainer.js
@@ -41,7 +41,7 @@ dojo.widget.defineWidget(
 
 		fillInTemplate: function(args, frag){
 			var source = this.getFragNodeRef(frag);
-			
+
 			this.containerNode.style.left = "";
 			this.containerNode.style.top = "";
 
@@ -50,7 +50,7 @@ dojo.widget.defineWidget(
 			this.inputNode.style.width = this.inputWidth;
 
 			dojo.event.connect(this.inputNode, "onchange", this, "onInputChange");
-			
+
 			this.containerIframe = new dojo.html.BackgroundIframe(this.containerNode);
 			this.containerIframe.size([0,0,0,0]);
 		},
@@ -74,7 +74,7 @@ dojo.widget.defineWidget(
 				this.showContainer();
 			}
 		},
-		
+
 		showContainer: function(){
 			this.containerAnimInProgress=true;
 			this.containerToggleObj.show(this.containerNode, this.containerToggleDuration, null,
@@ -96,7 +96,7 @@ dojo.widget.defineWidget(
 		onContainerHide: function(){
 			this.containerAnimInProgress=false;
 		},
-		
+
 		sizeBackgroundIframe: function(){
 			var w = dojo.style.getOuterWidth(this.containerNode);
 			var h = dojo.style.getOuterHeight(this.containerNode);
diff --git a/webapp/src/main/webapp/src/widget/DropdownDatePicker.js b/webapp/src/main/webapp/src/widget/DropdownDatePicker.js
index 4cbc1b004..df775fe96 100644
--- a/webapp/src/main/webapp/src/widget/DropdownDatePicker.js
+++ b/webapp/src/main/webapp/src/widget/DropdownDatePicker.js
@@ -23,19 +23,19 @@ dojo.widget.defineWidget(
 		iconAlt: "Select a Date",
 		zIndex: "10",
 		datePicker: null,
-		
+
 		dateFormat: "%m/%d/%Y",
 		date: null,
-		
+
 		fillInTemplate: function(args, frag){
 			dojo.widget.DropdownDatePicker.superclass.fillInTemplate.call(this, args, frag);
 			var source = this.getFragNodeRef(frag);
-			
+
 			if(args.date){ this.date = new Date(args.date); }
-			
+
 			var dpNode = document.createElement("div");
 			this.containerNode.appendChild(dpNode);
-			
+
 			var dateProps = { widgetContainerId: this.widgetId };
 			if(this.date){
 				dateProps["date"] = this.date;
@@ -47,12 +47,12 @@ dojo.widget.defineWidget(
 			this.containerNode.style.zIndex = this.zIndex;
 			this.containerNode.style.backgroundColor = "transparent";
 		},
-		
+
 		onSetDate: function(){
 			this.inputNode.value = dojo.date.format(this.datePicker.date, this.dateFormat);
 			this.hideContainer();
 		},
-		
+
 		onInputChange: function(){
 			var tmp = new Date(this.inputNode.value);
 			this.datePicker.date = tmp;
diff --git a/webapp/src/main/webapp/src/widget/Editor2.js b/webapp/src/main/webapp/src/widget/Editor2.js
index d42fe2e13..077449b5b 100644
--- a/webapp/src/main/webapp/src/widget/Editor2.js
+++ b/webapp/src/main/webapp/src/widget/Editor2.js
@@ -38,14 +38,14 @@ dojo.widget.defineWidget(
 		commandList: dojo.widget.html.Editor2Toolbar.prototype.commandList,
 		toolbarWidget: null,
 		scrollInterval: null,
-		
+
 
 		editorOnLoad: function(){
 			var toolbars = dojo.widget.byType("Editor2Toolbar");
 			if((!toolbars.length)||(!this.shareToolbar)){
 				var tbOpts = {};
 				tbOpts.templatePath = dojo.uri.dojoUri("src/widget/templates/HtmlEditorToolbarOneline.html");
-				this.toolbarWidget = dojo.widget.createWidget("Editor2Toolbar", 
+				this.toolbarWidget = dojo.widget.createWidget("Editor2Toolbar",
 										tbOpts, this.domNode, "before");
 				dojo.event.connect(this, "destroy", this.toolbarWidget, "destroy");
 				this.toolbarWidget.hideUnusableButtons(this);
@@ -74,7 +74,7 @@ dojo.widget.defineWidget(
 			// dojo.event.topic.registerPublisher("Editor2.clobberFocus", this.editNode, "onclick");
 			dojo.event.topic.subscribe("Editor2.clobberFocus", this, "setBlur");
 			dojo.event.connect(this.editNode, "onfocus", this, "setFocus");
-			dojo.event.connect(this.toolbarWidget.linkButton, "onclick", 
+			dojo.event.connect(this.toolbarWidget.linkButton, "onclick",
 				dojo.lang.hitch(this, function(){
 					var range;
 					if(this.document.selection){
@@ -83,7 +83,7 @@ dojo.widget.defineWidget(
 						range = this.window.getSelection().toString();
 					}
 					if(range.length){
-						this.toolbarWidget.exec("createlink", 
+						this.toolbarWidget.exec("createlink",
 							prompt("Please enter the URL of the link:", "http://"));
 					}else{
 						alert("Please select text to link");
@@ -91,11 +91,11 @@ dojo.widget.defineWidget(
 				})
 			);
 
-			var focusFunc = dojo.lang.hitch(this, function(){ 
+			var focusFunc = dojo.lang.hitch(this, function(){
 				if(dojo.render.html.ie){
 					this.editNode.focus();
 				}else{
-					this.window.focus(); 
+					this.window.focus();
 				}
 			});
 
@@ -158,7 +158,7 @@ dojo.widget.defineWidget(
 			var totalHeight = ds.getOuterHeight(tdn);
 			if(!this._scrollSetUp){
 				this._scrollSetUp = true;
-				var editorWidth =  ds.getOuterWidth(this.domNode); 
+				var editorWidth =  ds.getOuterWidth(this.domNode);
 				this._scrollThreshold = ds.abs(tdn, false).y;
 				// dojo.debug("threshold:", this._scrollThreshold);
 				if((isIE)&&(db)&&(ds.getStyle(db, "background-image")=="none")){
@@ -185,7 +185,7 @@ dojo.widget.defineWidget(
 						if(this.object){
 							dojo.html.addClass(this.tbBgIframe, "IEFixedToolbar");
 						}
-						
+
 					}else{
 						with(tdn.style){
 							position = "fixed";
@@ -281,7 +281,7 @@ dojo.widget.defineWidget(
 				}, this);
 
 			var h = dojo.render.html;
-			
+
 			// safari f's us for selection primitives
 			if(h.safari){ return; }
 
@@ -354,7 +354,7 @@ dojo.widget.defineWidget(
 				/*
 				dojo.event.kwConnect({
 					srcObj:		this.document,
-					srcFunc:	"click", 
+					srcFunc:	"click",
 					targetObj:	this.toolbarWidget,
 					targetFunc:	"hideAllDropDowns",
 					once:		true
@@ -374,7 +374,7 @@ dojo.widget.defineWidget(
 					this.editorOnLoad();
 				};
 			})(cp.fillInTemplate);
-		
+
 			cp.onDisplayChanged = (function(odc){
 				return function(){
 					try{
diff --git a/webapp/src/main/webapp/src/widget/Editor2Toolbar.js b/webapp/src/main/webapp/src/widget/Editor2Toolbar.js
index d21ccd162..6a7693669 100644
--- a/webapp/src/main/webapp/src/widget/Editor2Toolbar.js
+++ b/webapp/src/main/webapp/src/widget/Editor2Toolbar.js
@@ -26,7 +26,7 @@ dojo.widget.defineWidget(
 			"justifyfull", "justifyleft", "justifyright", "cut", "copy", "paste",
 			"delete", "undo", "redo", "createlink", "unlink", "removeformat",
 			"inserthorizontalrule", "insertimage", "insertorderedlist",
-			"insertunorderedlist", "indent", "outdent", "formatblock", "strikethrough", 
+			"insertunorderedlist", "indent", "outdent", "formatblock", "strikethrough",
 			"inserthtml", "blockdirltr", "blockdirrtl", "dirltr", "dirrtl",
 			"inlinedirltr", "inlinedirrtl", "inserttable", "insertcell",
 			"insertcol", "insertrow", "deletecells", "deletecols", "deleterows",
@@ -98,9 +98,9 @@ dojo.widget.defineWidget(
 		pasteClick: function(){ this.exec("paste"); },
 		undoClick: function(){ this.exec("undo"); },
 		redoClick: function(){ this.exec("redo"); },
-		linkClick: function(){ 
+		linkClick: function(){
 			// FIXME: we need to alert the user if they haven't selected any text
-			// this.exec(	"createlink", 
+			// this.exec(	"createlink",
 			// 			prompt("Please enter the URL of the link:", "http://"));
 		},
 		insertunorderedlistClick: function(){ this.exec("insertunorderedlist"); },
@@ -108,7 +108,7 @@ dojo.widget.defineWidget(
 		inserthorizontalruleClick: function(){ this.exec("inserthorizontalrule"); },
 		strikethroughClick: function(){ this.exec("strikethrough"); },
 
-		formatSelectClick: function(){ 
+		formatSelectClick: function(){
 			var sv = this.formatSelectBox.value.toLowerCase();
 			this.exec("formatblock", sv);
 		},
@@ -210,8 +210,8 @@ dojo.widget.defineWidget(
 				dojo.event.connect(pal, "onColorSelect", function(){ cid.style.display = "none"; });
 
 				dojo.event.kwConnect({
-					srcObj:		document.body, 
-					srcFunc:	"onclick", 
+					srcObj:		document.body,
+					srcFunc:	"onclick",
 					targetObj:	this,
 					targetFunc:	"hideAllDropDowns",
 					once:		true
@@ -236,8 +236,8 @@ dojo.widget.defineWidget(
 			if(!dojo.render.html.ie){
 				// apparently this causes leakage on IE!
 				dojo.event.kwDisconnect({
-					srcObj:		document.body, 
-					srcFunc:	"onclick", 
+					srcObj:		document.body,
+					srcFunc:	"onclick",
 					targetObj:	this,
 					targetFunc:	"hideAllDropDowns",
 					once:		true
diff --git a/webapp/src/main/webapp/src/widget/FisheyeList.js b/webapp/src/main/webapp/src/widget/FisheyeList.js
index ea073867f..8a26ed72e 100644
--- a/webapp/src/main/webapp/src/widget/FisheyeList.js
+++ b/webapp/src/main/webapp/src/widget/FisheyeList.js
@@ -49,9 +49,9 @@ dojo.lang.extend(dojo.widget.html.FisheyeList, {
 
 	isContainer: true,
 	snarfChildDomOutput: true,
-	
+
 	pos: {x: -1, y: -1},		// current cursor position, relative to the grid
-	
+
 	// for conservative trigger mode, when triggered, timerScale is gradually increased from 0 to 1
 	timerScale: 1.0,
 
@@ -67,7 +67,7 @@ dojo.lang.extend(dojo.widget.html.FisheyeList, {
 	itemMaxHeight: 150,
 
 	orientation: 'horizontal',
-	
+
 	conservativeTrigger: false,		// don't active menu until mouse is over an image (macintosh style)
 
 	effectUnits: 2,
@@ -145,7 +145,7 @@ dojo.lang.extend(dojo.widget.html.FisheyeList, {
 			this.proximityBottom /= 2;
 		}
 	},
-	
+
 	postCreate: function(args, frag) {
 		this.initializePositioning();
 
@@ -155,7 +155,7 @@ dojo.lang.extend(dojo.widget.html.FisheyeList, {
 		if( !this.conservativeTrigger ){
 			dojo.event.connect(document.documentElement, "onmousemove", this, "mouseHandler");
 		}
-		
+
 		// Deactivate the menu if mouse is moved off screen (doesn't work for FF?)
 		dojo.event.connect(document.documentElement, "onmouseout", this, "onBodyOut");
 		dojo.event.connect(this, "addChild", this, "initializePositioning");
@@ -220,7 +220,7 @@ dojo.lang.extend(dojo.widget.html.FisheyeList, {
 			elm.style.top    = itm.posY + 'px';
 			elm.style.width  = this.itemWidth + 'px';
 			elm.style.height = this.itemHeight + 'px';
-			
+
 			if ( itm.svgNode ) {
 				itm.svgNode.style.position = 'absolute';
 				itm.svgNode.style.left = this.itemPadding+'%';
@@ -228,7 +228,7 @@ dojo.lang.extend(dojo.widget.html.FisheyeList, {
 				itm.svgNode.style.width = (100 - 2 * this.itemPadding) + '%';
 				itm.svgNode.style.height = (100 - 2 * this.itemPadding) + '%';
 				itm.svgNode.style.zIndex = 1;
-	
+
 				itm.svgNode.setSize(this.itemWidth, this.itemHeight);
 			} else {
 				itm.imgNode.style.left = this.itemPadding+'%';
@@ -309,7 +309,7 @@ dojo.lang.extend(dojo.widget.html.FisheyeList, {
 		this.pos = {x:x, y:y};
 		this.paint();
 	},
-	
+
 	paint: function(){
 		var x=this.pos.x;
 		var y=this.pos.y;
@@ -323,7 +323,7 @@ dojo.lang.extend(dojo.widget.html.FisheyeList, {
 		var pos = this.isHorizontal ? x : y;
 		var prx = this.isHorizontal ? this.proximityLeft : this.proximityTop;
 		var siz = this.isHorizontal ? this.itemWidth : this.itemHeight;
-		var sim = this.isHorizontal ? 
+		var sim = this.isHorizontal ?
 			(1.0-this.timerScale)*this.itemWidth + this.timerScale*this.itemMaxWidth :
 			(1.0-this.timerScale)*this.itemHeight + this.timerScale*this.itemMaxHeight ;
 
@@ -465,7 +465,7 @@ dojo.lang.extend(dojo.widget.html.FisheyeList, {
 			}
 
 			this.children[p].usualX = Math.round(this.children[p].cenX - (w / 2));
-			
+
 			this.children[p].domNode.style.top  = y + 'px';
 
 			this.children[p].domNode.style.left  = this.children[p].usualX + 'px';
@@ -562,7 +562,7 @@ dojo.lang.extend(dojo.widget.html.FisheyeList, {
 
 		var x = 0;
 		var y = 0;
-		
+
 		var labelW = dojo.style.getOuterWidth(itm.lblNode);
 		var labelH = dojo.style.getOuterHeight(itm.lblNode);
 
@@ -605,7 +605,7 @@ dojo.lang.extend(dojo.widget.html.FisheyeList, {
 	toEdge: function(inp, def){
 		return this.EDGE[inp.toUpperCase()] || def;
 	},
-	
+
 	// slowly expand the image to user specified max size
 	expandSlowly: function(){
 		if( !this.isOver ){ return; }
@@ -631,7 +631,7 @@ dojo.inherits(dojo.widget.html.FisheyeListItem, dojo.widget.HtmlWidget);
 
 dojo.lang.extend(dojo.widget.html.FisheyeListItem, {
 	widgetType: "FisheyeListItem",
-	
+
 	// Constructor arguments
 	iconSrc: "",
 	svgSrc: "",
@@ -644,7 +644,7 @@ dojo.lang.extend(dojo.widget.html.FisheyeListItem, {
 		'  <img class="dojoHtmlFisheyeListItemImage" dojoAttachPoint="imgNode" dojoAttachEvent="onMouseOver;onMouseOut;onClick">' +
 		'  <div class="dojoHtmlFisheyeListItemLabel" dojoAttachPoint="lblNode"></div>' +
 		'</div>',
-	
+
 	imgNode: null,
 
 	fillInTemplate: function() {
@@ -672,7 +672,7 @@ dojo.lang.extend(dojo.widget.html.FisheyeListItem, {
 		}
 		dojo.html.disableSelection(this.domNode);
 	},
-	
+
 	createSvgNode: function(src){
 
 		var elm = document.createElement('embed');
@@ -732,7 +732,7 @@ dojo.lang.extend(dojo.widget.html.FisheyeListItem, {
 			this.parent.positionLabel(this);
 		}
 	},
-	
+
 	onMouseOut: function() {
 		dojo.html.removeClass(this.lblNode, "selected");
 	},
diff --git a/webapp/src/main/webapp/src/widget/FloatingPane.js b/webapp/src/main/webapp/src/widget/FloatingPane.js
index c207aa52c..f7053f523 100644
--- a/webapp/src/main/webapp/src/widget/FloatingPane.js
+++ b/webapp/src/main/webapp/src/widget/FloatingPane.js
@@ -79,20 +79,20 @@ dojo.lang.extend(dojo.widget.html.FloatingPane, {
 			this.titleBarIcon.src = this.iconSrc.toString();// dojo.uri.Uri obj req. toString()
 		}
 
-		if(this.titleBarDisplay!="none"){	
+		if(this.titleBarDisplay!="none"){
 			this.titleBar.style.display="";
 			dojo.html.disableSelection(this.titleBar);
 
 			this.titleBarIcon.style.display = (this.iconSrc=="" ? "none" : "");
 
 			this.minimizeAction.style.display = (this.displayMinimizeAction ? "" : "none");
-			this.maximizeAction.style.display= 
+			this.maximizeAction.style.display=
 				(this.displayMaximizeAction && this.windowState!="maximized" ? "" : "none");
-			this.restoreAction.style.display= 
+			this.restoreAction.style.display=
 				(this.displayMaximizeAction && this.windowState=="maximized" ? "" : "none");
 			this.closeAction.style.display= (this.displayCloseAction ? "" : "none");
 
-			this.drag = new dojo.dnd.HtmlDragMoveSource(this.domNode);	
+			this.drag = new dojo.dnd.HtmlDragMoveSource(this.domNode);
 			if (this.constrainToContainer) {
 				this.drag.constrainTo();
 			}
@@ -184,7 +184,7 @@ dojo.lang.extend(dojo.widget.html.FloatingPane, {
 
 	restoreWindow: function(evt) {
 		if (this.windowState=="minimized") {
-			this.show() 
+			this.show()
 		} else {
 			for(var attr in this.previous){
 				this.domNode.style[attr] = this.previous[attr];
@@ -220,7 +220,7 @@ dojo.lang.extend(dojo.widget.html.FloatingPane, {
 		windows.sort(function(a,b) {
 			return a.domNode.style.zIndex - b.domNode.style.zIndex;
 		});
-		
+
 		windows.push(this);
 
 		var floatingPaneStartingZ = 100;
@@ -288,7 +288,7 @@ dojo.lang.extend(dojo.widget.html.FloatingPane, {
 
 		// If any of the children have layoutAlign specified, obey it
 		dojo.html.layout(this.containerNode, this.children, "top-bottom");
-		
+
 		this.bgIframe.onResized();
 		if(this.shadow){ this.shadow.size(w, h); }
 		this.onResized();
diff --git a/webapp/src/main/webapp/src/widget/HtmlWidget.js b/webapp/src/main/webapp/src/widget/HtmlWidget.js
index beac4de45..0e269c88d 100644
--- a/webapp/src/main/webapp/src/widget/HtmlWidget.js
+++ b/webapp/src/main/webapp/src/widget/HtmlWidget.js
@@ -16,7 +16,7 @@ dojo.require("dojo.lang.extras");
 dojo.require("dojo.lang.func");
 dojo.require("dojo.lfx.toggle");
 
-dojo.declare("dojo.widget.HtmlWidget", dojo.widget.DomWidget, {								 
+dojo.declare("dojo.widget.HtmlWidget", dojo.widget.DomWidget, {
 	widgetType: "HtmlWidget",
 
 	templateCssPath: null,
diff --git a/webapp/src/main/webapp/src/widget/InlineEditBox.js b/webapp/src/main/webapp/src/widget/InlineEditBox.js
index 56cc4251f..e07da2cc3 100644
--- a/webapp/src/main/webapp/src/widget/InlineEditBox.js
+++ b/webapp/src/main/webapp/src/widget/InlineEditBox.js
@@ -49,7 +49,7 @@ dojo.lang.extend(dojo.widget.html.InlineEditBox, {
 	textValue: "",
 	defaultText: "",
 	doFade: false,
-	
+
 	onSave: function(newValue, oldValue){},
 	onUndo: function(value){},
 
@@ -65,7 +65,7 @@ dojo.lang.extend(dojo.widget.html.InlineEditBox, {
 		this.textValue = dojo.string.trim(this.editable.innerHTML);
 		if(dojo.string.trim(this.textValue).length == 0){
 			this.editable.innerHTML = this.defaultText;
-		}		
+		}
 	},
 
 	mouseover: function(e){
diff --git a/webapp/src/main/webapp/src/widget/Manager.js b/webapp/src/main/webapp/src/widget/Manager.js
index f62d28dd9..22eda154b 100644
--- a/webapp/src/main/webapp/src/widget/Manager.js
+++ b/webapp/src/main/webapp/src/widget/Manager.js
@@ -17,7 +17,7 @@ dojo.require("dojo.event.*");
 dojo.widget.manager = new function(){
 	this.widgets = [];
 	this.widgetIds = [];
-	
+
 	// map of widgetId-->widget for widgets without parents (top level widgets)
 	this.topWidgets = {};
 
@@ -72,7 +72,7 @@ dojo.widget.manager = new function(){
 		delete this.widgetIds[tw];
 		this.widgets.splice(widgetIndex, 1);
 	}
-	
+
 	// FIXME: suboptimal performance
 	this.removeById = function(id) {
 		for (var i=0; i<this.widgets.length; i++){
@@ -152,15 +152,15 @@ dojo.widget.manager = new function(){
 			widgetPackages.push(pname);
 		}
 	}
-	
+
 	this.getWidgetPackageList = function() {
 		return dojo.lang.map(widgetPackages, function(elt) { return(elt!==true ? elt : undefined); });
 	}
-	
+
 	this.getImplementation = function(widgetName, ctorObject, mixins){
 		// try and find a name for the widget
 		var impl = this.getImplementationName(widgetName);
-		if(impl){ 
+		if(impl){
 			// var tic = new Date();
 			var ret = new impl(ctorObject);
 			// dojo.debug(new Date() - tic);
@@ -221,14 +221,14 @@ dojo.widget.manager = new function(){
 				for (var widgetClass in widgetPackage) {
 					if (widgetClass.toLowerCase() !=
 						(renderPrefixCache[j] + lowerCaseWidgetName)) { continue; }
-	
+
 					knownWidgetImplementations[lowerCaseWidgetName] =
 						widgetPackage[widgetClass];
 					return knownWidgetImplementations[lowerCaseWidgetName];
 				}
 			}
 		}
-		
+
 		throw new Error('Could not locate "' + widgetName + '" class');
 	}
 
diff --git a/webapp/src/main/webapp/src/widget/Menu.js b/webapp/src/main/webapp/src/widget/Menu.js
index bb15a7cda..0ea95e855 100644
--- a/webapp/src/main/webapp/src/widget/Menu.js
+++ b/webapp/src/main/webapp/src/widget/Menu.js
@@ -28,7 +28,7 @@ dojo.inherits(dojo.widget.Menu, dojo.widget.Widget);
 dojo.lang.extend(dojo.widget.Menu, {
 	widgetType: "Menu",
 	isContainer: true,
-	
+
 	items: [],
 	push: function(item){
 		dojo.connect.event(item, "onSelect", this, "onSelect");
diff --git a/webapp/src/main/webapp/src/widget/MenuItem.js b/webapp/src/main/webapp/src/widget/MenuItem.js
index 3c26ab7ac..ef610d816 100644
--- a/webapp/src/main/webapp/src/widget/MenuItem.js
+++ b/webapp/src/main/webapp/src/widget/MenuItem.js
@@ -20,7 +20,7 @@ dojo.widget.tags.addParseTreeHandler("dojo:MenuItem");
 
 /* MenuItem
  ***********/
- 
+
 dojo.widget.MenuItem = function(){
 	dojo.widget.MenuItem.superclass.constructor.call(this);
 }
diff --git a/webapp/src/main/webapp/src/widget/MonthlyCalendar.js b/webapp/src/main/webapp/src/widget/MonthlyCalendar.js
index 4f2bb0ef0..79640033b 100644
--- a/webapp/src/main/webapp/src/widget/MonthlyCalendar.js
+++ b/webapp/src/main/webapp/src/widget/MonthlyCalendar.js
@@ -33,7 +33,7 @@ dojo.requireAfterIf("html", "dojo.widget.html.MonthlyCalendar");
 dojo.widget.MonthlyCalendar.util= new function() {
 	this.months = dojo.date.months;
 	this.weekdays = dojo.date.days;
-	
+
 	this.toRfcDate = function(jsDate) {
 		if(!jsDate) {
 			jsDate = this.today;
@@ -47,11 +47,11 @@ dojo.widget.MonthlyCalendar.util= new function() {
 		if (date < 10) {
 			date = "0" + date.toString();
 		}
-		// because this is a date picker and not a time picker, we treat time 
+		// because this is a date picker and not a time picker, we treat time
 		// as zero
 		return year + "-" + month + "-" + date + "T00:00:00+00:00";
 	}
-	
+
 	this.fromRfcDate = function(rfcDate) {
 		var tempDate = rfcDate.split("-");
 		if(tempDate.length < 3) {
@@ -60,7 +60,7 @@ dojo.widget.MonthlyCalendar.util= new function() {
 		// fullYear, month, date
 		return new Date(parseInt(tempDate[0]), (parseInt(tempDate[1], 10) - 1), parseInt(tempDate[2].substr(0,2), 10));
 	}
-	
+
 	this.initFirstSaturday = function(month, year) {
 		if(!month) {
 			month = this.date.getMonth();
diff --git a/webapp/src/main/webapp/src/widget/Parse.js b/webapp/src/main/webapp/src/widget/Parse.js
index 1292023f1..3688e5243 100644
--- a/webapp/src/main/webapp/src/widget/Parse.js
+++ b/webapp/src/main/webapp/src/widget/Parse.js
@@ -16,7 +16,7 @@ dojo.require("dojo.dom");
 dojo.widget.Parse = function(fragment) {
 	this.propertySetsList = [];
 	this.fragment = fragment;
-	
+
 	this.createComponents = function(frag, parentComp){
 		var comps = [ ];
 		var built = false;
@@ -68,7 +68,7 @@ dojo.widget.Parse = function(fragment) {
 	}
 
 	/*  parsePropertySets checks the top level of a raw JavaScript object
-			structure for any propertySets.  It stores an array of references to 
+			structure for any propertySets.  It stores an array of references to
 			propertySets that it finds.
 	*/
 	this.parsePropertySets = function(fragment) {
@@ -83,7 +83,7 @@ dojo.widget.Parse = function(fragment) {
 		this.propertySetsList.push(propertySets);
 		return propertySets;
 	}
-	
+
 	/*  parseProperties checks a raw JavaScript object structure for
 			properties, and returns an array of properties that it finds.
 	*/
@@ -98,7 +98,7 @@ dojo.widget.Parse = function(fragment) {
 			}else{
 				if((fragment[item]["tagName"])&&
 					(dojo.widget.tags[fragment[item].tagName.toLowerCase()])){
-					// TODO: it isn't a property or property set, it's a fragment, 
+					// TODO: it isn't a property or property set, it's a fragment,
 					// so do something else
 					// FIXME: needs to be a better/stricter check
 					// TODO: handle xlink:href for external property sets
@@ -125,10 +125,10 @@ dojo.widget.Parse = function(fragment) {
 
 	/* getPropertySetById returns the propertySet that matches the provided id
 	*/
-	
+
 	this.getDataProvider = function(objRef, dataUrl) {
-		// FIXME: this is currently sync.  To make this async, we made need to move 
-		//this step into the widget ctor, so that it is loaded when it is needed 
+		// FIXME: this is currently sync.  To make this async, we made need to move
+		//this step into the widget ctor, so that it is loaded when it is needed
 		// to populate the widget
 		dojo.io.bind({
 			url: dataUrl,
@@ -142,7 +142,7 @@ dojo.widget.Parse = function(fragment) {
 		});
 	}
 
-	
+
 	this.getPropertySetById = function(propertySetId){
 		for(var x = 0; x < this.propertySetsList.length; x++){
 			if(propertySetId == this.propertySetsList[x]["id"][0].value){
@@ -151,7 +151,7 @@ dojo.widget.Parse = function(fragment) {
 		}
 		return "";
 	}
-	
+
 	/* getPropertySetsByType returns the propertySet(s) that match(es) the
 	 * provided componentClass
 	 */
@@ -167,14 +167,14 @@ dojo.widget.Parse = function(fragment) {
 		}
 		return propertySets;
 	}
-	
+
 	/* getPropertySets returns the propertySet for a given component fragment
 	*/
 	this.getPropertySets = function(fragment){
 		var ppl = "dojo:propertyproviderlist";
 		var propertySets = [];
 		var tagname = fragment["tagName"];
-		if(fragment[ppl]){ 
+		if(fragment[ppl]){
 			var propertyProviderIds = fragment[ppl].value.split(" ");
 			// FIXME: should the propertyProviderList attribute contain #
 			// 		  syntax for reference to ids or not?
@@ -199,9 +199,9 @@ dojo.widget.Parse = function(fragment) {
 		// iteration happens.
 		return (this.getPropertySetsByType(tagname)).concat(propertySets);
 	}
-	
-	/* 
-		nodeRef is the node to be replaced... in the future, we might want to add 
+
+	/*
+		nodeRef is the node to be replaced... in the future, we might want to add
 		an alternative way to specify an insertion point
 
 		componentName is the expected dojo widget name, i.e. Button of ContextMenu
@@ -243,7 +243,7 @@ dojo.widget.getParser = function(name){
  *                 refNode argument
  * @return The new Widget object
  */
- 
+
 dojo.widget.createWidget = function(name, props, refNode, position){
 	var lowerCaseName = name.toLowerCase();
 	var namespacedName = "dojo:" + lowerCaseName;
@@ -259,7 +259,7 @@ dojo.widget.createWidget = function(name, props, refNode, position){
 	}
 
 	function fromScript (placeKeeperNode, name, props) {
-		props[namespacedName] = { 
+		props[namespacedName] = {
 			dojotype: [{value: lowerCaseName}],
 			nodeRef: placeKeeperNode,
 			fastMixIn: true
@@ -269,12 +269,12 @@ dojo.widget.createWidget = function(name, props, refNode, position){
 	}
 
 	if (typeof name != "string" && typeof props == "string") {
-		dojo.deprecated("dojo.widget.createWidget", 
+		dojo.deprecated("dojo.widget.createWidget",
 			"argument order is now of the form " +
 			"dojo.widget.createWidget(NAME, [PROPERTIES, [REFERENCENODE, [POSITION]]])", "0.4");
 		return fromScript(name, props, refNode);
 	}
-	
+
 	props = props||{};
 	var notRef = false;
 	var tn = null;
@@ -304,7 +304,7 @@ dojo.widget.createWidget = function(name, props, refNode, position){
 	}
 	return widgetArray[0]; // just return the widget
 }
- 
+
 dojo.widget.fromScript = function(name, props, refNode, position){
 	dojo.deprecated("dojo.widget.fromScript", " use " +
 		"dojo.widget.createWidget instead", "0.4");
diff --git a/webapp/src/main/webapp/src/widget/PopUpButton.js b/webapp/src/main/webapp/src/widget/PopUpButton.js
index fddbad81a..fe6568fd9 100644
--- a/webapp/src/main/webapp/src/widget/PopUpButton.js
+++ b/webapp/src/main/webapp/src/widget/PopUpButton.js
@@ -26,7 +26,7 @@ dojo.widget.tags.addParseTreeHandler("dojo:PopUpButton");
 
 /* PopUpButton
  **************/
- 
+
 dojo.widget.PopUpButton = function () {
 	dojo.widget.PopUpButton.superclass.constructor.call(this);
 }
@@ -34,7 +34,7 @@ dojo.inherits(dojo.widget.PopUpButton, dojo.widget.Widget);
 
 dojo.lang.extend(dojo.widget.PopUpButton, {
 	widgetType: "PopUpButton",
-	
+
 	label: ""
 });
 
@@ -63,14 +63,14 @@ dojo.lang.extend(dojo.widget.HtmlPopUpButton, {
 	widgetType: dojo.widget.PopUpButton.prototype.widgetType,
 	templateString: null,
 	templateCssPath: dojo.uri.dojoUri("src/widget/templates/PopUpButton.css"),
-	
+
 	buildRendering: function (args, frag) {
 		dojo.style.insertCssFile(this.templateCssPath, null, true);
-	
+
 		this.domNode = document.createElement("a");
 		this.domNode.className = "PopUpButton";
 		dojo.event.connect(this.domNode, "onmousedown", this, "onMouseDown");
-		
+
 		// draw the arrow
 		var arrow = document.createElement("img");
 		arrow.src = dojo.uri.dojoUri("src/widget/templates/images/dropdownButtonsArrow.gif");
@@ -80,7 +80,7 @@ dojo.lang.extend(dojo.widget.HtmlPopUpButton, {
 		this.menu = dojo.widget.fromScript("Menu");
 		dojo.html.addClass(this.menu.domNode, "PopUpButtonMenu");
 		dojo.event.connect(this.menu, "onSelect", this, "onSelect");
-		
+
 		if (frag["dojo:" + this.widgetType.toLowerCase()].nodeRef) {
 			var node = frag["dojo:" + this.widgetType.toLowerCase()].nodeRef;
 			var options = node.getElementsByTagName("option");
@@ -104,15 +104,15 @@ dojo.lang.extend(dojo.widget.HtmlPopUpButton, {
 			this.menu.push(menuItem);
 		}
 	},
-	
-	
+
+
 /* Enabled utility methods
  **************************/
-	
+
 	_enabled: true,
-	
+
 	isEnabled: function() { return this._enabled; },
-	
+
 	setEnabled: function(enabled, force, preventEvent) {
 		enabled = Boolean(enabled);
 		if (force || this._enabled != enabled) {
@@ -122,21 +122,21 @@ dojo.lang.extend(dojo.widget.HtmlPopUpButton, {
 				this._fireEvent("onChangeEnabled");
 			}
 		}
-		
+
 		dojo.html[(this._enabled ? "add" : "remove")
 			+ "Class"](this.domNode, "disabled");
-		
+
 		return this._enabled;
 	},
-	
+
 	enable: function(force, preventEvent) {
 		return this.setEnabled(true, force, preventEvent);
 	},
-	
+
 	disable: function(force, preventEvent) {
 		return this.setEnabled(false, force, preventEvent);
 	},
-	
+
 	toggleEnabled: function(force, preventEvent) {
 		return this.setEnabled(!this._enabled, force, preventEvent);
 	},
@@ -148,15 +148,15 @@ dojo.lang.extend(dojo.widget.HtmlPopUpButton, {
 	onSelect: function (item, e) {
 		this.domNode.firstChild.nodeValue = item.title;
 	},
-	
+
 	onMouseDown: function (e) {
 		if (!this._menuVisible) {
 			this._showMenu(e);
 			dojo.lang.setTimeout(dojo.event.connect, 1, document, "onmousedown", this, "_hideMenu");
 		}
 	},
-	
-	
+
+
 	_fireEvent: function(evt) {
 		if(typeof this[evt] == "function") {
 			var args = [this];
@@ -167,7 +167,7 @@ dojo.lang.extend(dojo.widget.HtmlPopUpButton, {
 		}
 	},
 
-	
+
 	_showMenu: function (e) {
 		if (!this._enabled) { return; }
 		this._menuVisible = true;
@@ -175,14 +175,14 @@ dojo.lang.extend(dojo.widget.HtmlPopUpButton, {
 			var y = getAbsoluteY(this.domNode) + getInnerHeight(this.domNode);
 			var x = getAbsoluteX(this.domNode);
 		}
-	
+
 		document.body.appendChild(this.menu.domNode);
 		with (this.menu.domNode.style) {
 			top = y + "px";
 			left = x + "px";
 		}
 	},
-	
+
 	_hideMenu: function (e) {
 		this.menu.domNode.parentNode.removeChild(this.menu.domNode);
 		dojo.event.disconnect(document, "onmousedown", this, "_hideMenu");
diff --git a/webapp/src/main/webapp/src/widget/ResizableTextarea.js b/webapp/src/main/webapp/src/widget/ResizableTextarea.js
index 64faf81c2..7870e202b 100644
--- a/webapp/src/main/webapp/src/widget/ResizableTextarea.js
+++ b/webapp/src/main/webapp/src/widget/ResizableTextarea.js
@@ -70,8 +70,8 @@ dojo.lang.extend(dojo.widget.ResizableTextarea, {
 
 		this.statusBar = dojo.widget.createWidget(
 			"LayoutContainer",
-			{ 
-				layoutAlign: "bottom", 
+			{
+				layoutAlign: "bottom",
 				minHeight: 28
 			},
 			this.statusBarContainerNode
@@ -80,8 +80,8 @@ dojo.lang.extend(dojo.widget.ResizableTextarea, {
 
 		this.statusLabel = dojo.widget.createWidget(
 			"LayoutContainer",
-			{ 
-				layoutAlign: "client", 
+			{
+				layoutAlign: "client",
 				minWidth: 50
 			},
 			this.statusLabelNode
@@ -89,7 +89,7 @@ dojo.lang.extend(dojo.widget.ResizableTextarea, {
 		this.statusBar.addChild(this.statusLabel);
 
 		this.resizeHandle = dojo.widget.createWidget(
-			"ResizeHandle", 
+			"ResizeHandle",
 			{ targetElmId: this.rootLayout.widgetId },
 			this.resizeHandleNode
 		);
diff --git a/webapp/src/main/webapp/src/widget/ResizeHandle.js b/webapp/src/main/webapp/src/widget/ResizeHandle.js
index ac4ce4f03..8dc578279 100644
--- a/webapp/src/main/webapp/src/widget/ResizeHandle.js
+++ b/webapp/src/main/webapp/src/widget/ResizeHandle.js
@@ -53,7 +53,7 @@ dojo.lang.extend(dojo.widget.html.ResizeHandle, {
 		this.startSize  = {'w':dojo.style.getOuterWidth(this.targetDomNode), 'h':dojo.style.getOuterHeight(this.targetDomNode)};
 
 		dojo.event.kwConnect({
-			srcObj: document.body, 
+			srcObj: document.body,
 			srcFunc: "onmousemove",
 			targetObj: this,
 			targetFunc: "changeSizing",
@@ -75,7 +75,7 @@ dojo.lang.extend(dojo.widget.html.ResizeHandle, {
 		}
 		var dx = this.startPoint.x - e.clientX;
 		var dy = this.startPoint.y - e.clientY;
-		
+
 		var newW = this.startSize.w - dx;
 		var newH = this.startSize.h - dy;
 
@@ -88,14 +88,14 @@ dojo.lang.extend(dojo.widget.html.ResizeHandle, {
 				newH = dojo.style.getOuterHeight(this.targetDomNode);
 			}
 		}
-		
+
 		if(this.targetWidget){
 			this.targetWidget.resizeTo(newW, newH);
 		}else{
 			dojo.style.setOuterWidth(this.targetDomNode, newW);
 			dojo.style.setOuterHeight(this.targetDomNode, newH);
 		}
-		
+
 		e.preventDefault();
 	},
 
diff --git a/webapp/src/main/webapp/src/widget/RichText.js b/webapp/src/main/webapp/src/widget/RichText.js
index a0ff50437..c8fc7a095 100644
--- a/webapp/src/main/webapp/src/widget/RichText.js
+++ b/webapp/src/main/webapp/src/widget/RichText.js
@@ -32,23 +32,23 @@ dojo.widget.defineWidget(
 		/** whether to inherit the parent's width or simply use 100% */
 		inheritWidth: false,
 		focusOnLoad: true,
-		
+
 		/**
 		 * If a save name is specified the content is saved and restored if the
 		 * editor is not properly closed after editing has started.
 		 */
 		saveName: "",
 		_content: "",
-		
+
 		/* set height to fix the editor at a specific height, with scrolling */
 		height: null,
 
 		/** The minimum height that the editor should have */
 		minHeight: "1em",
-		
+
 		isClosed: true,
 		isLoaded: false,
-		
+
 		/** whether to use the active-x object in IE */
 		useActiveX: false,
 
@@ -57,7 +57,7 @@ dojo.widget.defineWidget(
        	will be changed to use relative URLs (to the current page) on save
 		*/
 		relativeImageUrls: false,
-		
+
 		_SEPARATOR: "@@**%%__RICHTEXTBOUNDRY__%%**@@",
 
 		// contentFilters: [],
@@ -86,20 +86,20 @@ dojo.widget.defineWidget(
 			for(var i = 0; i < funcs.length; i++){
 				dojo.event.connect("around", this, funcs[i], this, "_normalizeCommand");
 			}
-			
+
 			// backwards compatibility, needs to be removed
 			dojo.event.connect(this, "onKeyPressed", this, "afterKeyPress");
 			dojo.event.connect(this, "onKeyPress", this, "keyPress");
 			dojo.event.connect(this, "onKeyDown", this, "keyDown");
 			dojo.event.connect(this, "onKeyUp", this, "keyUp");
 
-			// add default some key handlers		
+			// add default some key handlers
 			var ctrl = this.KEY_CTRL;
 			var exec = function (cmd, arg) {
 				return arguments.length == 1 ? function () { this.execCommand(cmd); } :
 					function () { this.execCommand(cmd, arg); }
 			}
-				
+
 			this.addKeyHandler("b", ctrl, exec("bold"));
 			this.addKeyHandler("i", ctrl, exec("italic"));
 			this.addKeyHandler("u", ctrl, exec("underline"));
@@ -107,12 +107,12 @@ dojo.widget.defineWidget(
 			//this.addKeyHandler("k", ctrl, exec("createlink", ""));
 			//this.addKeyHandler("K", ctrl, exec("unlink"));
 			this.addKeyHandler("s", ctrl, function () { this.save(true); });
-			
+
 			this.addKeyHandler("1", ctrl, exec("formatblock", "h1"));
 			this.addKeyHandler("2", ctrl, exec("formatblock", "h2"));
 			this.addKeyHandler("3", ctrl, exec("formatblock", "h3"));
 			this.addKeyHandler("4", ctrl, exec("formatblock", "h4"));
-					
+
 			this.addKeyHandler("\\", ctrl, exec("insertunorderedlist"));
 			if(!dojo.render.html.ie){
 				this.addKeyHandler("Z", ctrl, exec("redo"));
@@ -154,16 +154,16 @@ dojo.widget.defineWidget(
 				}
 				dojo.dom.insertBefore(this.domNode, this.textarea);
 				this.domNode.innerHTML = html;
-				
+
 				if(this.textarea.form){
-					dojo.event.connect(this.textarea.form, "onsubmit", 
+					dojo.event.connect(this.textarea.form, "onsubmit",
 						// FIXME: should we be calling close() here instead?
 						dojo.lang.hitch(this, function(){
 							this.textarea.value = this.getEditorContent();
 						})
 					);
 				}
-				
+
 				// dojo plucks our original domNode from the document so we need
 				// to go back and put ourselves back in
 				var editor = this;
@@ -174,7 +174,7 @@ dojo.widget.defineWidget(
 				var html = dojo.string.trim(this.domNode.innerHTML);
 				if(html == ""){ html = "&nbsp;"; }
 			}
-					
+
 			this._oldHeight = dojo.style.getContentHeight(this.domNode);
 			this._oldWidth = dojo.style.getContentWidth(this.domNode);
 
@@ -185,14 +185,14 @@ dojo.widget.defineWidget(
 			while (this.domNode.hasChildNodes()) {
 				this.savedContent.appendChild(this.domNode.firstChild);
 			}
-			
+
 			// If we're a list item we have to put in a blank line to force the
 			// bullet to nicely align at the top of text
 			if(	(this.domNode["nodeName"])&&
 				(this.domNode.nodeName == "LI")){
 				this.domNode.innerHTML = " <br>";
 			}
-					
+
 			if(this.saveName != ""){
 				var saveTextarea = document.getElementById("dojo.widget.RichText.savedContent");
 				if (saveTextarea.value != "") {
@@ -204,7 +204,7 @@ dojo.widget.defineWidget(
 							datas.splice(i, 1);
 							break;
 						}
-					}				
+					}
 				}
 				dojo.event.connect("before", window, "onunload", this, "_saveContent");
 				// dojo.event.connect(window, "onunload", this, "_saveContent");
@@ -230,7 +230,7 @@ dojo.widget.defineWidget(
 				// behavior. It's particularly bad if the element you're editing
 				// contains childnodes that don't have margin: defined in local
 				// css rules. It would be nice if it was possible to hack around
-				// this. Sadly _firstChildContributingMargin and 
+				// this. Sadly _firstChildContributingMargin and
 				// _lastChildContributingMargin don't work on IE unless all
 				// elements have margins set in CSS :-(
 
@@ -239,10 +239,10 @@ dojo.widget.defineWidget(
 				dojo.lang.forEach(this.events, function(e){
 					dojo.event.connect(this.editNode, e.toLowerCase(), this, e);
 				}, this);
-			
+
 				this.window = window;
 				this.document = document;
-				
+
 				this.onLoad();
 			} else { // designMode in iframe
 				this._drawIframe(html);
@@ -251,18 +251,18 @@ dojo.widget.defineWidget(
 			// TODO: this is a guess at the default line-height, kinda works
 			if (this.domNode.nodeName == "LI") { this.domNode.lastChild.style.marginTop = "-1.2em"; }
 			dojo.html.addClass(this.domNode, "RichTextEditable");
-			
+
 			this.isClosed = false;
 		},
 
 		_hasCollapseableMargin: function(element, side) {
 			// check if an element has padding or borders on the given side
 			// which would prevent it from collapsing margins
-			if (dojo.style.getPixelValue(element, 
-										 'border-'+side+'-width', 
+			if (dojo.style.getPixelValue(element,
+										 'border-'+side+'-width',
 										 false)) {
 				return false;
-			} else if (dojo.style.getPixelValue(element, 
+			} else if (dojo.style.getPixelValue(element,
 												'padding-'+side,
 												false)) {
 				return false;
@@ -296,8 +296,8 @@ dojo.widget.defineWidget(
 			function isSignificantNode(element) {
 				// see if an node is significant in the current context
 				// for calulating margins
-				return !(element.nodeType==3 && dojo.string.isBlank(element.data)) 
-					&& dojo.style.getStyle(element, "display") != "none" 
+				return !(element.nodeType==3 && dojo.string.isBlank(element.data))
+					&& dojo.style.getStyle(element, "display") != "none"
 					&& !dojo.style.isPositionAbsolute(element);
 			}
 
@@ -309,11 +309,11 @@ dojo.widget.defineWidget(
 				while ((!isSignificantNode(child)) && child[childSiblingAttr]) {
 					child = child[childSiblingAttr];
 				}
-						  
+
 				childMargin = Math.max(childMargin, dojo.style.getPixelValue(child, marginProp, false));
 				// stop if we hit a bordered/padded element
 				if (!this._hasCollapseableMargin(child, topOrBottom)) break;
-				child = child[childAttr];								   
+				child = child[childAttr];
 			}
 
 			// if this element has a border, return full child margin immediately
@@ -325,15 +325,15 @@ dojo.widget.defineWidget(
 			var sibling = element[siblingAttr];
 			while (sibling) {
 				if (isSignificantNode(sibling)) {
-					contextMargin = dojo.style.getPixelValue(sibling, 
-															 siblingMarginProp, 
+					contextMargin = dojo.style.getPixelValue(sibling,
+															 siblingMarginProp,
 															 false);
 					break;
 				}
 				sibling = sibling[siblingAttr];
 			}
 			if (!sibling) { // no sibling, look at parent's margin instead
-				contextMargin = dojo.style.getPixelValue(element.parentNode, 
+				contextMargin = dojo.style.getPixelValue(element.parentNode,
 												marginProp, false);
 			}
 
@@ -342,10 +342,10 @@ dojo.widget.defineWidget(
 			} else {
 				return 0;
 			}
-			
+
 		},
-		
-		/** Draws an iFrame using the existing one if one exists. 
+
+		/** Draws an iFrame using the existing one if one exists.
 			Used by Mozilla, Safari, and Opera */
 		_drawIframe: function (html) {
 
@@ -435,7 +435,7 @@ dojo.widget.defineWidget(
 						getStyle('font-weight') + " " +
 						getStyle('font-size') + " " +
 						getStyle('font-family');
-					
+
 					// line height is tricky - applying a units value will mess things up.
 					// if we can't get a non-units value, bail out.
 					var lineHeight = "1.0";
@@ -449,8 +449,8 @@ dojo.widget.defineWidget(
 						// TODO: left positioning will case contents to disappear out of view
 						//       if it gets too wide for the visible area
 						'    body { top: 0; left: 0; right: 0;' +
-						(this.height ? '' : ' position: fixed; ') + 
-						'        font: ' + font + ';\n' + 
+						(this.height ? '' : ' position: fixed; ') +
+						'        font: ' + font + ';\n' +
 						'        min-height: ' + this.minHeight + '; \n' +
 						'        line-height: ' + lineHeight + '} \n' +
 						'    p { margin: 1em 0 !important; }\n' +
@@ -458,7 +458,7 @@ dojo.widget.defineWidget(
 						'    body > *:last-child { padding-bottom: 0 !important; margin-bottom: ' + this._lastChildContributingMargin + 'px !important; }\n' +
 						'    li > ul:-moz-first-node, li > ol:-moz-first-node { padding-top: 1.2em; }\n' +
 						'    li { min-height: 1.2em; }\n' +
-						//'    p,ul,li { padding-top: 0; padding-bottom: 0; margin-top:0; margin-bottom: 0; }\n' + 
+						//'    p,ul,li { padding-top: 0; padding-bottom: 0; margin-top:0; margin-bottom: 0; }\n' +
 						'', this.document);
 
 					tmpContent.parentNode.removeChild(tmpContent);
@@ -486,7 +486,7 @@ dojo.widget.defineWidget(
 				this.iframe.onload = ifrFunc;
 			}
 		},
-		
+
 		/** Draws an active x object, used by IE */
 		_drawObject: function (html) {
 			this.object = document.createElement("object");
@@ -535,13 +535,13 @@ dojo.widget.defineWidget(
 			}else if (this.iframe){
 				this.editNode = this.document.body;
 				this.connect(this, "onDisplayChanged", "_updateHeight");
-		
+
 				try { // sanity check for Mozilla
 					this.document.execCommand("useCSS", false, true); // old moz call
 					this.document.execCommand("styleWithCSS", false, false); // new moz call
 					//this.document.execCommand("insertBrOnReturn", false, false); // new moz call
 				}catch(e2){ }
-				
+
 				if (dojo.render.html.safari) {
 					/*
 					this.iframe.style.visiblity = "visible";
@@ -552,7 +552,7 @@ dojo.widget.defineWidget(
 					// this.onDisplayChanged();
 					this.connect(this.editNode, "onblur", "onBlur");
 					this.connect(this.editNode, "onfocus", "onFocus");
-				
+
 					this.interval = setInterval(dojo.lang.hitch(this, "onDisplayChanged"), 750);
 					// dojo.raise("onload");
 					// dojo.debug(this.editNode.parentNode.parentNode.parentNode.nodeName);
@@ -568,7 +568,7 @@ dojo.widget.defineWidget(
 					} };
 					dojo.event.connect("before", this, "close", unBlur, "unBlur");
 					dojo.event.browser.addListener(this.document, "focus", dojo.lang.hitch(this, "onFocus"));
-				
+
 					// safari can't handle key listeners, it kills the speed
 					var addListener = dojo.event.browser.addListener;
 					addListener(this.document, "keypress", dojo.lang.hitch(this, "onKeyPress"));
@@ -577,12 +577,12 @@ dojo.widget.defineWidget(
 					addListener(this.document, "click", dojo.lang.hitch(this, "onClick"));
 				}
 
-				// FIXME: when scrollbars appear/disappear this needs to be fired						
+				// FIXME: when scrollbars appear/disappear this needs to be fired
 			}else if(dojo.render.html.ie){
 				// IE contentEditable
 				this.editNode.style.zoom = 1.0;
 			}
-			
+
 			if(this.focusOnLoad){
 				this.focus();
 			}
@@ -603,7 +603,7 @@ dojo.widget.defineWidget(
 				e.stopPropagation();
 				// FIXME: this is a poor-man's indent/outdent. It would be
 				// better if it added 4 "&nbsp;" chars in an undoable way.
-				// Unfortuantly pasteHTML does not prove to be undoable 
+				// Unfortuantly pasteHTML does not prove to be undoable
 				this.execCommand((e.shiftKey ? "outdent" : "indent"));
 			}else if(dojo.render.html.ie){
 				if((65 <= e.keyCode)&&(e.keyCode <= 90)){
@@ -616,14 +616,14 @@ dojo.widget.defineWidget(
 				// this.onKeyPress(e);
 			}
 		},
-		
+
 		/** Fired on keyup */
 		onKeyUp: function(e){
 			return;
 		},
-		
+
 		KEY_CTRL: 1,
-		
+
 		/** Fired on keypress. */
 		onKeyPress: function(e){
 			if((!e)&&(this.object)){
@@ -647,7 +647,7 @@ dojo.widget.defineWidget(
 					}
 				}
 			}
-			
+
 			/*
 			// define some key combos
 			if (e.ctrlKey || e.metaKey) { // modifier pressed
@@ -660,14 +660,14 @@ dojo.widget.defineWidget(
 					//case "K": this.execCommand("unlink"); break;
 					case "Z": this.execCommand("redo"); break;
 					case "s": this.close(true); break; // saves
-					
+
 					case "1": this.execCommand("formatblock", "h1"); break;
 					case "2": this.execCommand("formatblock", "h2"); break;
 					case "3": this.execCommand("formatblock", "h3"); break;
 					case "4": this.execCommand("formatblock", "h4"); break;
-					
+
 					case "\\": this.execCommand("insertunorderedlist"); break;
-					
+
 					default: switch (code) {
 						case e.KEY_LEFT_ARROW:
 						case e.KEY_RIGHT_ARROW:
@@ -687,14 +687,14 @@ dojo.widget.defineWidget(
 						preventDefault = false; break; // didn't handle here
 				}
 			}
-			
+
 			if (preventDefault) { e.preventDefault(); }
 			*/
 
 			// function call after the character has been inserted
 			dojo.lang.setTimeout(this, this.onKeyPressed, 1, e);
 		},
-		
+
 		addKeyHandler: function (key, modifiers, handler) {
 			if (!(this._keyHandlers[key] instanceof Array)) { this._keyHandlers[key] = []; }
 			this._keyHandlers[key].push({
@@ -702,9 +702,9 @@ dojo.widget.defineWidget(
 				handler: handler
 			});
 		},
-		
-		
-		
+
+
+
 		/**
 		 * Fired after a keypress event has occured and it's action taken. This
 		 * is useful if action needs to be taken after text operations have
@@ -721,7 +721,7 @@ dojo.widget.defineWidget(
 			// and so we need to remove the <p>s to ensure the position of the cursor
 			// changes from the users perspective when they hit enter, as the second two
 			// html snippets render the same when margins are set to 0.
-			
+
 			// TODO: doesn't really work; is this really needed?
 			//if (dojo.render.html.moz) {
 			//	for (var i = 0; i < this.document.getElementsByTagName("p").length; i++) {
@@ -734,11 +734,11 @@ dojo.widget.defineWidget(
 			//}
 			this.onDisplayChanged(/*e*/); // can't pass in e
 		},
-		
+
 		onClick: function(e){ this.onDisplayChanged(e); },
 		onBlur: function(e){ },
 		_initialFocus: true,
-		onFocus: function(e){ 
+		onFocus: function(e){
 			if( (dojo.render.html.mozilla)&&(this._initialFocus) ){
 				this._initialFocus = false;
 				if(dojo.string.trim(this.editNode.innerHTML) == "&nbsp;"){
@@ -752,7 +752,7 @@ dojo.widget.defineWidget(
 			if (this.iframe) { this.window.blur(); }
 			else if (this.editNode) { this.editNode.blur(); }
 		},
-		
+
 		focus: function () {
 			if(this.iframe){
 				this.window.focus();
@@ -760,15 +760,15 @@ dojo.widget.defineWidget(
 				this.editNode.focus();
 			}
 		},
-		
+
 		/** this event will be fired everytime the display context changes and the
 		 result needs to be reflected in the UI */
 		onDisplayChanged: function (e){ },
-		
+
 
 	/* Formatting commands
 	 **********************/
-		
+
 		/** IE's Active X codes */
 		_activeX: {
 			command: {
@@ -808,7 +808,7 @@ dojo.widget.defineWidget(
 				deleterows: 5007,
 				mergecells: 5029,
 				splitcell: 5047,
-				
+
 				// the command need mapping, they don't translate directly
 				// to the contentEditable commands
 				setblockformat: 5043,
@@ -822,12 +822,12 @@ dojo.widget.defineWidget(
 				getbackcolor: 5010,
 				setforecolor: 5046,
 				getforecolor: 5015,
-				
+
 				findtext: 5008,
 				font: 5009,
 				hyperlink: 5016,
 				image: 5017,
-				
+
 				lockelement: 5027,
 				makeabsolute: 5028,
 				sendbackward: 5036,
@@ -836,16 +836,16 @@ dojo.widget.defineWidget(
 				bringabovetext: 5039,
 				sendtoback: 5040,
 				bringtofront: 5041,
-				
+
 				properties: 5052
 			},
-			
+
 			ui: {
 				"default": 0,
 				prompt: 1,
 				noprompt: 2
 			},
-			
+
 			status: {
 				notsupported: 0,
 				disabled: 1,
@@ -853,19 +853,19 @@ dojo.widget.defineWidget(
 				latched: 7,
 				ninched: 11
 			},
-			
+
 			appearance: {
 				flat: 0,
 				inset: 1
 			},
-			
+
 			state: {
 				unchecked: 0,
 				checked: 1,
 				gray: 2
 			}
 		},
-		
+
 		/**
 		 * Used as the advice function by dojo.event.connect to map our
 		 * normalized set of commands to those supported by the target
@@ -877,7 +877,7 @@ dojo.widget.defineWidget(
 		 */
 		_normalizeCommand: function (joinObject){
 			var drh = dojo.render.html;
-			
+
 			var command = joinObject.args[0].toLowerCase();
 			if(command == "formatblock"){
 				if(drh.safari){ command = "heading"; }
@@ -885,16 +885,16 @@ dojo.widget.defineWidget(
 			}
 			if (command == "hilitecolor" && !drh.mozilla) { command = "backcolor"; }
 			joinObject.args[0] = command;
-			
+
 			if (joinObject.args.length > 1) { // a command was specified
 				var argument = joinObject.args[1];
 				if (command == "heading") { throw new Error("unimplemented"); }
 				joinObject.args[1] = argument;
 			}
-			
+
 			return joinObject.proceed();
 		},
-		
+
 		/**
 		 * Tests whether a command is supported by the host. Clients SHOULD check
 		 * whether a command is supported before attempting to use it, behaviour
@@ -918,49 +918,49 @@ dojo.widget.defineWidget(
 			}
 
 			var supportedBy = null;
-			
+
 			switch (command.toLowerCase()) {
 				case "bold": case "italic": case "underline":
 				case "subscript": case "superscript":
 				case "fontname": case "fontsize":
 				case "forecolor": case "hilitecolor":
-				case "justifycenter": case "justifyfull": case "justifyleft": 
+				case "justifycenter": case "justifyfull": case "justifyleft":
 				case "justifyright": case "delete": case "undo": case "redo":
 					supportedBy = isSupportedBy(mozilla | ie | safari | opera);
 					break;
-					
+
 				case "createlink": case "unlink": case "removeformat":
 				case "inserthorizontalrule": case "insertimage":
 				case "insertorderedlist": case "insertunorderedlist":
-				case "indent": case "outdent": case "formatblock": 
+				case "indent": case "outdent": case "formatblock":
 				case "inserthtml":
 					supportedBy = isSupportedBy(mozilla | ie | opera);
 					break;
-					
-				case "strikethrough": 
+
+				case "strikethrough":
 					supportedBy = isSupportedBy(mozilla |  opera | (this.object ? 0 : ie));
 					break;
 
 				case "blockdirltr": case "blockdirrtl":
 				case "dirltr": case "dirrtl":
 				case "inlinedirltr": case "inlinedirrtl":
-				case "cut": case "copy": case "paste": 
+				case "cut": case "copy": case "paste":
 					supportedBy = isSupportedBy(ie);
 					break;
-				
+
 				case "inserttable":
 					supportedBy = isSupportedBy(mozilla | (this.object ? ie : 0));
 					break;
-				
+
 				case "insertcell": case "insertcol": case "insertrow":
 				case "deletecells": case "deletecols": case "deleterows":
 				case "mergecells": case "splitcell":
 					supportedBy = isSupportedBy(this.object ? ie : 0);
 					break;
-				
+
 				default: return false;
 			}
-			
+
 			return (dojo.render.html.ie && supportedBy.ie) ||
 				(dojo.render.html.mozilla && supportedBy.mozilla) ||
 				(dojo.render.html.safari && supportedBy.safari) ||
@@ -981,9 +981,9 @@ dojo.widget.defineWidget(
 				}else if(command == "backcolor"){
 					command = "setbackcolor";
 				}
-			
+
 				//if (typeof this._activeX.command[command] == "undefined") { return null; }
-			
+
 				if(command == "inserttable"){
 					var tableInfo = this.constructor._tableInfo;
 					if(!tableInfo){
@@ -992,14 +992,14 @@ dojo.widget.defineWidget(
 						document.body.appendChild(tableInfo);
 						this.constructor._table = tableInfo;
 					}
-					
+
 					tableInfo.NumRows = argument["rows"];
 					tableInfo.NumCols = argument["cols"];
 					tableInfo.TableAttrs = argument["TableAttrs"];
 					tableInfo.CellAttrs = argument["CellAttrs"];
 					tableInfo.Caption = argument["Caption"];
 				}
-			
+
 				if(command == "inserthtml"){
 					var insertRange = this.document.selection.createRange();
 					insertRange.select();
@@ -1013,7 +1013,7 @@ dojo.widget.defineWidget(
 					return this.object.ExecCommand(this._activeX.command[command],
 						this._activeX.ui.noprompt, argument);
 				}
-		
+
 			/* */
 			}else if(command == "inserthtml"){
 				// on IE, we can use the pasteHTML method of the textRange object
@@ -1026,7 +1026,7 @@ dojo.widget.defineWidget(
 					insertRange.collapse(true);
 					return true;
 				}else{
-					return this.document.execCommand(command, false, argument);			
+					return this.document.execCommand(command, false, argument);
 				}
 			/* */
 			// fix up unlink in Mozilla to unlink the link and not just the selection
@@ -1042,7 +1042,7 @@ dojo.widget.defineWidget(
 				var selectionStartOffset = selectionRange.startOffset;
 				var selectionEndContainer = selectionRange.endContainer;
 				var selectionEndOffset = selectionRange.endOffset;
-				
+
 				// select our link and unlink
 				var range = document.createRange();
 				var a = this.getSelectedNode();
@@ -1050,23 +1050,23 @@ dojo.widget.defineWidget(
 				range.selectNode(a);
 				selection.removeAllRanges();
 				selection.addRange(range);
-				
+
 				returnValue = this.document.execCommand("unlink", false, null);
-				
+
 				// restore original selection
 				var selectionRange = document.createRange();
 				selectionRange.setStart(selectionStartContainer, selectionStartOffset);
 				selectionRange.setEnd(selectionEndContainer, selectionEndOffset);
 				selection.removeAllRanges();
 				selection.addRange(selectionRange);
-				
+
 				return returnValue;
 			}else if((command == "inserttable")&&(dojo.render.html.mozilla)){
 
 				var cols = "<tr>";
 				for (var i = 0; i < argument.cols; i++) { cols += "<td></td>"; }
 				cols += "</tr>";
-			
+
 				var table = "<table><tbody>";
 				for (var i = 0; i < argument.rows; i++) { table += cols; }
 				table += "</tbody></table>";
@@ -1075,13 +1075,13 @@ dojo.widget.defineWidget(
 			}else if((command == "hilitecolor")&&(dojo.render.html.mozilla)){
 				// mozilla doesn't support hilitecolor properly when useCSS is
 				// set to false (bugzilla #279330)
-				
+
 				this.document.execCommand("useCSS", false, false);
-				returnValue = this.document.execCommand(command, false, argument);			
+				returnValue = this.document.execCommand(command, false, argument);
 				this.document.execCommand("useCSS", false, true);
-			
+
 			}else if((dojo.render.html.ie)&&( (command == "backcolor")||(command == "forecolor") )){
-				// IE weirdly collapses ranges when we exec these commands, so prevent it	
+				// IE weirdly collapses ranges when we exec these commands, so prevent it
 				var tr = this.document.selection.createRange();
 				argument = arguments.length > 1 ? argument : null;
 				returnValue = this.document.execCommand(command, false, argument);
@@ -1103,7 +1103,7 @@ dojo.widget.defineWidget(
 				// 	dojo.debug(e);
 				// }
 			}
-			
+
 			this.onDisplayChanged();
 			return returnValue;
 		},
@@ -1118,7 +1118,7 @@ dojo.widget.defineWidget(
 
 				if(typeof this._activeX.command[command] == "undefined"){ return false; }
 				var status = this.object.QueryStatus(this._activeX.command[command]);
-				return ((status != this.activeX.status.notsupported)&& 
+				return ((status != this.activeX.status.notsupported)&&
 					(status != this.activeX.status.diabled));
 			}else{
 				// mozilla returns true always
@@ -1165,15 +1165,15 @@ dojo.widget.defineWidget(
 						return this.object.execCommand(
 							this._activeX.command[command],
 							this._activeX.ui.noprompt);
-				}			
-			
+				}
+
 				//var status = this.object.QueryStatus(this._activeX.command[command]);
 			} else {
 				return this.document.queryCommandValue(command);
 			}
 		},
-		
-		
+
+
 	/* Misc.
 	 ********/
 
@@ -1186,7 +1186,7 @@ dojo.widget.defineWidget(
 			}
 			return this.editNode;
 		},
-		
+
 		placeCursorAtStart: function(){
 			if(!this.isLoaded){
 				dojo.event.connect(this, "onLoad", this, "placeCursorAtEnd");
@@ -1216,8 +1216,8 @@ dojo.widget.defineWidget(
 		replaceEditorContent: function(html){
 			if(this.window.getSelection){
 				var selection = this.window.getSelection;
-				// if(selection.removeAllRanges){ // Mozilla			
-				if(dojo.render.html.moz){ // Mozilla			
+				// if(selection.removeAllRanges){ // Mozilla
+				if(dojo.render.html.moz){ // Mozilla
 					var range = this.document.createRange();
 					range.selectNodeContents(this.editNode);
 					var selection = this.window.getSelection();
@@ -1235,7 +1235,7 @@ dojo.widget.defineWidget(
 				this.execCommand("inserthtml", html);
 			}
 		},
-		
+
 		placeCursorAtEnd: function(){
 			if(!this.isLoaded){
 				dojo.event.connect(this, "onLoad", this, "placeCursorAtEnd");
@@ -1297,7 +1297,7 @@ dojo.widget.defineWidget(
 				this.object.style.height = dojo.style.getInnerHeight(this.editNode)+"px";
 			}
 		},
-		
+
 		/**
 		 * Saves the content in an onunload event if the editor has not been closed
 		 */
@@ -1318,7 +1318,7 @@ dojo.widget.defineWidget(
 			});
 
 			if (this.relativeImageUrls) {
-				// why use a regexp instead of dom? because IE is stupid 
+				// why use a regexp instead of dom? because IE is stupid
 				// and won't let us set img.src to a relative URL
 				// this comes after contentFilters because once content
 				// gets innerHTML'd img urls will be fully qualified
@@ -1335,15 +1335,15 @@ dojo.widget.defineWidget(
 					pathBase = pathParts.join("/") + "/";
 
 				}
-				
+
 				var sameSite = new RegExp("(<img[^>]*\ src=[\"'])("+siteBase+"("+pathBase+")?)", "ig");
 				ec = ec.replace(sameSite, "$1");
 			}
 			return ec;
 		},
-		
+
 		/**
-		 * Kills the editor and optionally writes back the modified contents to the 
+		 * Kills the editor and optionally writes back the modified contents to the
 		 * element from which it originated.
 		 *
 		 * @param save Whether or not to save the changes. If false, the changes are
@@ -1356,16 +1356,16 @@ dojo.widget.defineWidget(
 			if (arguments.length == 0) { save = true; }
 			this._content = this.editNode.innerHTML;
 			var changed = (this.savedContent.innerHTML != this._content);
-			
+
 			// line height is squashed for iframes
 			// FIXME: why was this here? if (this.iframe){ this.domNode.style.lineHeight = null; }
 
 			if(this.interval){ clearInterval(this.interval); }
-			
+
 			if(dojo.render.html.ie && !this.object){
 				dojo.event.browser.clean(this.editNode);
 			}
-			
+
 			if (this.iframe) {
 				// FIXME: should keep iframe around for later re-use
 				delete this.iframe;
@@ -1388,7 +1388,7 @@ dojo.widget.defineWidget(
 				}
 			}
 			delete this.savedContent;
-			
+
 			dojo.html.removeClass(this.domNode, "RichTextEditable");
 			this.isClosed = true;
 			this.isLoaded = false;
@@ -1399,11 +1399,11 @@ dojo.widget.defineWidget(
 		},
 
 		destroyRendering: function(){}, // stub!
-		
+
 		destroy: function (){
 			this.destroyRendering();
 			if(!this.isClosed){ this.close(false); }
-		
+
 			// disconnect those listeners.
 			while(this._connected.length){
 				this.disconnect(this._connected[0],
@@ -1414,9 +1414,9 @@ dojo.widget.defineWidget(
 		_connected: [],
 		connect: function (targetObj, targetFunc, thisFunc) {
 			dojo.event.connect(targetObj, targetFunc, this, thisFunc);
-			// this._connected.push([targetObj, targetFunc, thisFunc]);	
+			// this._connected.push([targetObj, targetFunc, thisFunc]);
 		},
-		
+
 		// FIXME: below two functions do not work with the above line commented out
 		disconnect: function (targetObj, targetFunc, thisFunc) {
 			for (var i = 0; i < this._connected.length; i++) {
@@ -1429,7 +1429,7 @@ dojo.widget.defineWidget(
 				}
 			}
 		},
-		
+
 		disconnectAllWithRoot: function (targetObj) {
 			for (var i = 0; i < this._connected.length; i++) {
 				if (this._connected[0] == targetObj) {
@@ -1437,15 +1437,15 @@ dojo.widget.defineWidget(
 						this._connected[1], this, this._connected[2]);
 					this._connected.splice(i, 1);
 				}
-			}	
+			}
 		}
-		
+
 	},
 	"html",
 	function(){
 		this.contentFilters = [];
 		// this.contentFilters.push(this.defaultContentCleaner);
-		
+
 		this._keyHandlers = {};
 	}
 );
diff --git a/webapp/src/main/webapp/src/widget/Rounded.js b/webapp/src/main/webapp/src/widget/Rounded.js
index 8b169b8d7..3b59c8e3a 100644
--- a/webapp/src/main/webapp/src/widget/Rounded.js
+++ b/webapp/src/main/webapp/src/widget/Rounded.js
@@ -77,7 +77,7 @@ dojo.lang.extend(dojo.widget.Rounded, {
 
 	// ------------- curvyCorners OBJECT
 
-	curvyCorners: function(settings){	
+	curvyCorners: function(settings){
 
 		// Setup Globals
 		this.box             = this.domNode;
@@ -110,7 +110,7 @@ dojo.lang.extend(dojo.widget.Rounded, {
 
 		//dojo.debug(this.rgb2Hex(boxColour));
 		var test  = new dojo.graphics.color.Color(boxColour);
-		//dojo.debug(test.toHex()); 
+		//dojo.debug(test.toHex());
 
 		this.boxColour       = ((boxColour != "" && boxColour != "transparent")? ((boxColour.substr(0, 3) == "rgb")? this.rgb2Hex(boxColour) : boxColour) : "#ffffff");
 		this.borderColour    = ((borderColour != "" && borderColour != "transparent" && this.borderWidth > 0)? ((borderColour.substr(0, 3) == "rgb")? this.rgb2Hex(borderColour)  : borderColour) : this.boxColour);
@@ -133,7 +133,7 @@ dojo.lang.extend(dojo.widget.Rounded, {
 						// Only build top bar if a top corner is to be draw
 						if(this.settings.tl.enabled || this.settings.tr.enabled ) {
 							var newMainContainer = document.createElement("DIV");
-			
+
 							with(newMainContainer.style){
 								width    = "100%";
 								fontSize = "1px";
@@ -147,13 +147,13 @@ dojo.lang.extend(dojo.widget.Rounded, {
 								top    = 0 - topMaxRadius + "px";
 								left   = 0 - this.borderWidth + "px";
 							}
-							
+
 							this.topContainer = this.box.appendChild(newMainContainer);
 						}
 			            break;
-	
+
 			        // Bottom
-			        case 1:      
+			        case 1:
 			            // Only build bottom bar if a top corner is to be draw
 			            if(this.settings.bl.enabled || this.settings.br.enabled) {
 							var newMainContainer = document.createElement("DIV");
@@ -175,16 +175,16 @@ dojo.lang.extend(dojo.widget.Rounded, {
 		            break;
 			    }
 			}
-	
+
 			// Turn off current borders
 			if(this.topContainer) this.box.style.borderTopWidth = "0px";
 			if(this.bottomContainer) this.box.style.borderBottomWidth = "0px";
-	
+
 			// Create array of available corners
 			var corners = ["tr", "tl", "br", "bl"];
-		
+
 			//Loop for each corner
-	
+
 			for(var i in corners) {
 			    // Get current corner type from array
 			    var cc = corners[i];
@@ -195,12 +195,12 @@ dojo.lang.extend(dojo.widget.Rounded, {
 			        if(((cc == "tr" || cc == "tl") && this.topContainer != null) || ((cc == "br" || cc == "bl") && this.bottomContainer != null)) {
 						// We need to create a filler div to fill the space upto the next horzontal corner.
 						var newCorner = document.createElement("DIV");
-		
+
 						// Setup corners properties
 						newCorner.style.position = "relative";
 						newCorner.style.fontSize = "1px";
 						newCorner.style.overflow = "hidden";
-		
+
 						// Add background image?
 						if(this.backgroundImage == "") {
 							newCorner.style.backgroundColor = this.boxColour;
@@ -218,7 +218,7 @@ dojo.lang.extend(dojo.widget.Rounded, {
 									left         = -this.borderWidth + "px";
 								}
 							break;
-			
+
 							case "tr":
 								with(newCorner.style){
 									height      = topMaxRadius - this.borderWidth + "px";
@@ -229,7 +229,7 @@ dojo.lang.extend(dojo.widget.Rounded, {
 									left         = this.borderWidth + "px";
 								}
 							break;
-	
+
 							case "bl":
 								with(newCorner.style){
 									height       = botMaxRadius - this.borderWidth + "px";
@@ -239,7 +239,7 @@ dojo.lang.extend(dojo.widget.Rounded, {
 									left         = -this.borderWidth + "px";
 								}
 							break;
-			
+
 							case "br":
 								with(newCorner.style){
 									height       = botMaxRadius - this.borderWidth + "px";
@@ -275,10 +275,10 @@ dojo.lang.extend(dojo.widget.Rounded, {
 						}
 						// THE FOLLOWING BLOCK OF CODE CREATES A ROUNDED CORNER
 						// ---------------------------------------------------- TOP
-			
+
 						// Get border radius
 						var borderRadius = parseInt(this.settings[cc].radius - this.borderWidth);
-			
+
 						// Cycle the x-axis
 						for(var intx = 0, j = this.settings[cc].radius; intx < j; intx++) {
 							// Calculate the value of y1 which identifies the pixels inside the border
@@ -287,7 +287,7 @@ dojo.lang.extend(dojo.widget.Rounded, {
 							} else {
 								var y1 = (Math.floor(Math.sqrt(Math.pow(borderRadius, 2) - Math.pow((intx+1), 2))) - 1);
 							}
-			
+
 							// Only calculate y2 and y3 if there is a border defined
 							if(borderRadius != j) {
 								if((intx) >= borderRadius) {
@@ -295,7 +295,7 @@ dojo.lang.extend(dojo.widget.Rounded, {
 								} else {
 									var y2 = Math.ceil(Math.sqrt(Math.pow(borderRadius,2) - Math.pow(intx, 2)));
 								}
-			
+
 								if((intx+1) >= j) {
 									var y3 = -1;
 								} else {
@@ -312,7 +312,7 @@ dojo.lang.extend(dojo.widget.Rounded, {
 
 							// Draw bar on inside of the border with foreground colour
 							if(y1 > -1) this.drawPixel(intx, 0, this.boxColour, 100, (y1+1), newCorner, -1, this.settings[cc].radius);
-	
+
 							// Only draw border/foreground antialiased pixels and border if there is a border defined
 							if(borderRadius != j) {
 								// Draw aa pixels?
@@ -320,9 +320,9 @@ dojo.lang.extend(dojo.widget.Rounded, {
 									// Cycle the y-axis
 									for(var inty = (y1 + 1); inty < y2; inty++) {
 										// For each of the pixels that need anti aliasing between the foreground and border colour draw single pixel divs
-										if(this.backgroundImage != "") {					
+										if(this.backgroundImage != "") {
 											var borderFract = (this.pixelFraction(intx, inty, borderRadius) * 100);
-					
+
 											if (borderFract < 30) {
 												this.drawPixel(intx, inty, this.borderColour, 100, 1, newCorner, 0, this.settings[cc].radius);
 											} else {
@@ -341,7 +341,7 @@ dojo.lang.extend(dojo.widget.Rounded, {
 										y1 = 0;
 									}
 									this.drawPixel(intx, y2, this.borderColour, 100, (y3 - y2 + 1), newCorner, 0, this.settings[cc].radius);
-								}	
+								}
 								// Set the colour for the outside curve
 								var outsideColour = this.borderColour;
 							} else {
@@ -349,13 +349,13 @@ dojo.lang.extend(dojo.widget.Rounded, {
 								var outsideColour = this.boxColour;
 								var y3 = y1;
 							}
-			
+
 							// Draw aa pixels?
-							if(this.antiAlias) {		
+							if(this.antiAlias) {
 								// Cycle the y-axis and draw the anti aliased pixels on the
 								// outside of the curve
 								for(var inty = (y3 + 1); inty < y4; inty++) {
-									// For each of the pixels that need anti aliasing between 
+									// For each of the pixels that need anti aliasing between
 									//the foreground/border colour & background draw single pixel divs
 									this.drawPixel(intx, inty, outsideColour, (this.pixelFraction(intx, inty , j) * 100), 1, newCorner, ((this.borderWidth > 0)? 0 : -1), this.settings[cc].radius);
 								}
@@ -368,20 +368,20 @@ dojo.lang.extend(dojo.widget.Rounded, {
 			            // We now need to store the current corner in the masterConers array
 			            this.masterCorners[this.settings[cc].radius] = newCorner.cloneNode(true);
 			        }
-			
+
 					//Now we have a new corner we need to reposition all the pixels unless
 					//the current corner is the bottom right.
-			        if(cc != "br") {	
+			        if(cc != "br") {
 						// Loop through all children (pixel bars)
 						for(var t = 0, k = newCorner.childNodes.length; t < k; t++) {
 							// Get current pixel bar
 							var pixelBar = newCorner.childNodes[t];
-	
+
 							// Get current top and left properties
 							var pixelBarTop    = parseInt(pixelBar.style.top.substring(0, pixelBar.style.top.indexOf("px")));
 							var pixelBarLeft   = parseInt(pixelBar.style.left.substring(0, pixelBar.style.left.indexOf("px")));
 							var pixelBarHeight = parseInt(pixelBar.style.height.substring(0, pixelBar.style.height.indexOf("px")));
-							
+
 							// Reposition pixels
 							if(cc == "tl" || cc == "bl") {
 								pixelBar.style.left = this.settings[cc].radius -pixelBarLeft -1 + "px"; // Left
@@ -390,20 +390,20 @@ dojo.lang.extend(dojo.widget.Rounded, {
 								pixelBar.style.top =  this.settings[cc].radius -pixelBarHeight -pixelBarTop + "px"; // Top
 							}
 							var value;
-					
+
 							switch(cc) {
 								case "tr":
 									value = (-1 *( Math.abs((this.boxWidth - this.settings[cc].radius + this.borderWidth) + pixelBarLeft) - (Math.abs(this.settings[cc].radius -pixelBarHeight -pixelBarTop - this.borderWidth))));
 									pixelBar.style.backgroundPosition  = value + "px";
-									
+
 								break;
-				
+
 								case "tl":
 									value = (-1 *( Math.abs((this.settings[cc].radius -pixelBarLeft -1)  - this.borderWidth) - (Math.abs(this.settings[cc].radius -pixelBarHeight -pixelBarTop - this.borderWidth))));
 									pixelBar.style.backgroundPosition  = value + "px";
 
 								break;
-				
+
 								case "bl":
 									value = (-1 *( Math.abs((this.settings[cc].radius -pixelBarLeft -1) - this.borderWidth) - (Math.abs((this.boxHeight + this.settings[cc].radius + pixelBarTop) -this.borderWidth))));
 									pixelBar.style.backgroundPosition  = value + "px";
@@ -427,13 +427,13 @@ dojo.lang.extend(dojo.widget.Rounded, {
 							if(newCorner.style.position == "absolute") newCorner.style.right = "0px";
 							if(this.topContainer) this.topContainer.appendChild(newCorner);
 						break;
-		
+
 						case "bl":
 							if(newCorner.style.position == "absolute") newCorner.style.bottom  = "0px";
 							if(newCorner.style.position == "absolute") newCorner.style.left = "0px";
 							if(this.bottomContainer) this.bottomContainer.appendChild(newCorner);
 						break;
-						
+
 						case "br":
 							if(newCorner.style.position == "absolute") newCorner.style.bottom = "0px";
 							if(newCorner.style.position == "absolute") newCorner.style.right = "0px";
@@ -445,7 +445,7 @@ dojo.lang.extend(dojo.widget.Rounded, {
 			//The last thing to do is draw the rest of the filler DIVs.
 			//We only need to create a filler DIVs when two corners have
 			//diffrent radiuses in either the top or bottom container.
-	
+
 			// Find out which corner has the biiger radius and get the difference amount
 			var radiusDiff = [];
 			radiusDiff["t"] = this.settings.tl.enabled && this.settings.tr.enabled ? Math.abs(this.settings.tl.radius - this.settings.tr.radius) : 0;
@@ -477,7 +477,7 @@ dojo.lang.extend(dojo.widget.Rounded, {
 							}
 							this.topContainer.appendChild(newFiller);
 						break;
-	
+
 						case "tr":
 							with(newFiller.style) {
 								bottom = "0px";
@@ -551,14 +551,14 @@ dojo.lang.extend(dojo.widget.Rounded, {
 			// Create pixel
 			var pixel = document.createElement("DIV");
 
-			
+
 			// Section doesn't like with (pixel.style) { DEBUG?
 			pixel.style.height   = height + "px";
 			pixel.style.width    = "1px";
 			pixel.style.position = "absolute";
 			pixel.style.fontSize = "1px";
 			pixel.style.overflow = "hidden";
-			
+
 			// Dont apply background image to border pixels
 			if(image == -1 && this.backgroundImage != "") {
 				pixel.style.backgroundImage = this.backgroundImage;
@@ -566,7 +566,7 @@ dojo.lang.extend(dojo.widget.Rounded, {
 			} else {
 				pixel.style.backgroundColor = colour;
 			}
-			
+
 			// Set opacity if the transparency is anything other than 100
 			if (transAmount != 100) {
 				dojo.style.setOpacity(pixel, transAmount);
@@ -574,7 +574,7 @@ dojo.lang.extend(dojo.widget.Rounded, {
 			// Set the pixels position
 			pixel.style.top = inty + "px";
 			pixel.style.left = intx + "px";
-		
+
 			newCorner.appendChild(pixel);
 		}
 	},
@@ -583,10 +583,10 @@ dojo.lang.extend(dojo.widget.Rounded, {
 	//line.  Returns a number between 0 and 1
 	pixelFraction: function(x, y, r) {
 		var pixelfraction = 0;
-		
+
 		//determine the co-ordinates of the two points on the perimeter of the pixel that the
 		//circle crosses
-		
+
 		var xvalues = [];
 		var yvalues = [];
 		var point = 0;
@@ -604,7 +604,7 @@ dojo.lang.extend(dojo.widget.Rounded, {
 
 		// y + 1 = Top
 		var intersect = Math.sqrt((Math.pow(r,2) - Math.pow(y+1,2)));
-		
+
 		if ((intersect >= x) && (intersect < (x+1))) {
 			whatsides = whatsides + "Top";
 			xvalues[point] = intersect - x;
@@ -636,19 +636,19 @@ dojo.lang.extend(dojo.widget.Rounded, {
 			case "LeftRight":
 				pixelfraction = Math.min(yvalues[0],yvalues[1]) + ((Math.max(yvalues[0],yvalues[1]) - Math.min(yvalues[0],yvalues[1]))/2);
 			break;
-			
+
 			case "TopRight":
 				pixelfraction = 1-(((1-xvalues[0])*(1-yvalues[1]))/2);
 			break;
-			
+
 			case "TopBottom":
 				pixelfraction = Math.min(xvalues[0],xvalues[1]) + ((Math.max(xvalues[0],xvalues[1]) - Math.min(xvalues[0],xvalues[1]))/2);
 			break;
-			
+
 			case "LeftBottom":
 				pixelfraction = (yvalues[0]*xvalues[1])/2;
 			break;
-			
+
 			default:
 				pixelfraction = 1;
 	    }
@@ -657,15 +657,15 @@ dojo.lang.extend(dojo.widget.Rounded, {
 
 	// This function converts CSS rgb(x, x, x) to hexadecimal
 	rgb2Hex: function (rgbColour) {
-		try{	
+		try{
 			// Get array of RGB values
 			var rgbArray = this.rgb2Array(rgbColour);
-			
+
 			// Get RGB values
 			var red   = parseInt(rgbArray[0]);
 			var green = parseInt(rgbArray[1]);
 			var blue  = parseInt(rgbArray[2]);
-			
+
 			// Build hex colour code
 			var hexColour = "#" + this.intToHex(red) + this.intToHex(green) + this.intToHex(blue);
 		}
@@ -705,7 +705,7 @@ dojo.lang.extend(dojo.widget.Rounded, {
 	rgb2Array: function(rgbColour) {
 		// Remove rgb()
 		var rgbValues = rgbColour.substring(4, rgbColour.indexOf(")"));
-	
+
 		// Split RGB into array
 		var rgbArray = rgbValues.split(", ");
 		return rgbArray;
diff --git a/webapp/src/main/webapp/src/widget/Select.js b/webapp/src/main/webapp/src/widget/Select.js
index 6fc19687b..8f21930ed 100644
--- a/webapp/src/main/webapp/src/widget/Select.js
+++ b/webapp/src/main/webapp/src/widget/Select.js
@@ -47,7 +47,7 @@ dojo.widget.defineWidget(
 			if (this.textInputNode.value != value) { // prevent mucking up of selection
 				this.textInputNode.value = value;
 			}
-		},	  
+		},
 
 		getLabel: function(){
 			return this.comboBoxSelectionValue.value;
diff --git a/webapp/src/main/webapp/src/widget/Show.js b/webapp/src/main/webapp/src/widget/Show.js
index 292823f29..d44b34ab1 100644
--- a/webapp/src/main/webapp/src/widget/Show.js
+++ b/webapp/src/main/webapp/src/widget/Show.js
@@ -42,4 +42,4 @@ dojo.lang.extend(dojo.widget.Show, {
 	}
 });
 
-dojo.requireAfterIf("html", "dojo.widget.html.Show");
\ No newline at end of file
+dojo.requireAfterIf("html", "dojo.widget.html.Show");
diff --git a/webapp/src/main/webapp/src/widget/ShowAction.js b/webapp/src/main/webapp/src/widget/ShowAction.js
index 5127ed283..f81827c77 100644
--- a/webapp/src/main/webapp/src/widget/ShowAction.js
+++ b/webapp/src/main/webapp/src/widget/ShowAction.js
@@ -23,4 +23,4 @@ dojo.lang.extend(dojo.widget.ShowAction, {
 	auto: "false"
 });
 
-dojo.requireAfterIf("html", "dojo.widget.html.ShowAction");
\ No newline at end of file
+dojo.requireAfterIf("html", "dojo.widget.html.ShowAction");
diff --git a/webapp/src/main/webapp/src/widget/ShowSlide.js b/webapp/src/main/webapp/src/widget/ShowSlide.js
index ab4a57ba8..4311c8703 100644
--- a/webapp/src/main/webapp/src/widget/ShowSlide.js
+++ b/webapp/src/main/webapp/src/widget/ShowSlide.js
@@ -40,4 +40,4 @@ dojo.lang.extend(dojo.widget.ShowSlide, {
 	}
 });
 
-dojo.requireAfterIf("html", "dojo.widget.html.ShowSlide");
\ No newline at end of file
+dojo.requireAfterIf("html", "dojo.widget.html.ShowSlide");
diff --git a/webapp/src/main/webapp/src/widget/SlideShow.js b/webapp/src/main/webapp/src/widget/SlideShow.js
index 26af58bb5..5e33950a3 100644
--- a/webapp/src/main/webapp/src/widget/SlideShow.js
+++ b/webapp/src/main/webapp/src/widget/SlideShow.js
@@ -91,14 +91,14 @@ dojo.widget.defineWidget(
 			if(this.fadeAnim) {
 				this.fadeAnim.stop();
 			}
-			this.fadeAnim = dojo.lfx.fadeOut(this[this.foreground], 
+			this.fadeAnim = dojo.lfx.fadeOut(this[this.foreground],
 				this.transitionInterval, null);
 			dojo.event.connect(this.fadeAnim,"onEnd",this,"endTransition");
 			this.fadeAnim.play();
 		},
 
 		endTransition: function(){
-			// move the foreground image to the background 
+			// move the foreground image to the background
 			with(this[this.background].style){ zIndex = parseInt(zIndex)+1; }
 			with(this[this.foreground].style){ zIndex = parseInt(zIndex)-1; }
 
diff --git a/webapp/src/main/webapp/src/widget/SplitContainer.js b/webapp/src/main/webapp/src/widget/SplitContainer.js
index 5041fb52a..1b0edc846 100644
--- a/webapp/src/main/webapp/src/widget/SplitContainer.js
+++ b/webapp/src/main/webapp/src/widget/SplitContainer.js
@@ -395,7 +395,7 @@ dojo.lang.extend(dojo.widget.html.SplitContainer, {
 
 		dojo.event.disconnect(document.documentElement, "onmousemove", this, "changeSizing");
 		dojo.event.disconnect(document.documentElement, "onmouseup", this, "endSizing");
-		
+
 		if(this.persist){
 			this.saveState(this);
 		}
@@ -533,7 +533,7 @@ dojo.lang.extend(dojo.widget.html.SplitContainer, {
 		this.virtualSizer.style.left = origin.x + 'px';
 		this.virtualSizer.style.top = origin.y + 'px';
 	},
-	
+
 	_getCookieName: function(i) {
 		return this.widgetId + "_" + i;
 	},
diff --git a/webapp/src/main/webapp/src/widget/SvgButton.js b/webapp/src/main/webapp/src/widget/SvgButton.js
index fd63fe534..33c810910 100644
--- a/webapp/src/main/webapp/src/widget/SvgButton.js
+++ b/webapp/src/main/webapp/src/widget/SvgButton.js
@@ -60,11 +60,11 @@ dojo.widget.SvgButton = function(){
 	this.fillInTemplate = function(x, y, textSize, label, shape){
 		// the idea is to set the text to the appropriate place given its length
 		// and the template shape
-		
+
 		// FIXME: For now, assuming text sizes are integers in SVG units
 		this.textSize = textSize || 12;
 		this.label = label;
-		// FIXEME: for now, I'm going to fake this... need to come up with a real way to 
+		// FIXEME: for now, I'm going to fake this... need to come up with a real way to
 		// determine the actual width of the text, such as computedStyle
 		var textWidth = this.label.length*this.textSize ;
 		//this.setLabel();
diff --git a/webapp/src/main/webapp/src/widget/TabContainer.js b/webapp/src/main/webapp/src/widget/TabContainer.js
index fedba7013..62bf27aa8 100644
--- a/webapp/src/main/webapp/src/widget/TabContainer.js
+++ b/webapp/src/main/webapp/src/widget/TabContainer.js
@@ -38,7 +38,7 @@ dojo.lang.extend(dojo.widget.html.TabContainer, {
 	closeButton: "none",
 
 	useVisibility: false,		// true-->use visibility:hidden instead of display:none
-	
+
 	// if false, TabContainers size changes according to size of currently selected tab
 	doLayout: true,
 
@@ -114,7 +114,7 @@ dojo.lang.extend(dojo.widget.html.TabContainer, {
 		}
 		tab.div.appendChild(span);
 		this.dojoTabLabels.appendChild(tab.div);
-		
+
 		var self = this;
 		dojo.event.connect(tab.div, "onclick", function(){ self.selectTab(tab); });
 
@@ -143,8 +143,8 @@ dojo.lang.extend(dojo.widget.html.TabContainer, {
 
 		if (this.doLayout) {
 			dojo.html.layout(this.domNode, children);
-		} 
-			
+		}
+
 		// size the current tab
 		// TODO: should have ptr to current tab rather than searching
 		var cw=dojo.style.getContentWidth(this.containerNode);
@@ -153,12 +153,12 @@ dojo.lang.extend(dojo.widget.html.TabContainer, {
 			//if (this.doLayout) {
 				if(child.selected){
 					child.resizeTo(cw, ch);
-				} 
+				}
 			//} else {
 			//	child.onResized();
 			//}
 		});
-		
+
 	},
 
     removeChild: function(tab) {
diff --git a/webapp/src/main/webapp/src/widget/Toggler.js b/webapp/src/main/webapp/src/widget/Toggler.js
index 845225efc..380942a11 100644
--- a/webapp/src/main/webapp/src/widget/Toggler.js
+++ b/webapp/src/main/webapp/src/widget/Toggler.js
@@ -22,14 +22,14 @@ dojo.inherits(dojo.widget.Toggler, dojo.widget.DomWidget);
 
 dojo.lang.extend(dojo.widget.Toggler, {
 	widgetType: "Toggler",
-	
-	// Associated widget 
+
+	// Associated widget
 	targetId: '',
-	
+
 	fillInTemplate: function() {
 		dojo.event.connect(this.domNode, "onclick", this, "onClick");
 	},
-	
+
 	onClick: function() {
 		var pane = dojo.widget.byId(this.targetId);
 		if(!pane){ return; }
diff --git a/webapp/src/main/webapp/src/widget/Toolbar.js b/webapp/src/main/webapp/src/widget/Toolbar.js
index 803b3de5a..57a51ff17 100644
--- a/webapp/src/main/webapp/src/widget/Toolbar.js
+++ b/webapp/src/main/webapp/src/widget/Toolbar.js
@@ -176,7 +176,7 @@ dojo.lang.extend(dojo.widget.html.Toolbar, {
 
 	_onclick: function(e) {
 		var widget = this._getItem(e.target);
-		if(widget && widget._onclick){ 
+		if(widget && widget._onclick){
 			widget._onclick(e);
 		}
 	},
@@ -714,17 +714,17 @@ dojo.widget.html.ToolbarDialog = function() {
 dojo.inherits(dojo.widget.html.ToolbarDialog, dojo.widget.html.ToolbarButton);
 dojo.lang.extend(dojo.widget.html.ToolbarDialog, {
 	widgetType: "ToolbarDialog",
-	
+
 	fillInTemplate: function (args, frag) {
 		dojo.widget.html.ToolbarDialog.superclass.fillInTemplate.call(this, args, frag);
 		dojo.event.connect(this, "onSelect", this, "showDialog");
 		dojo.event.connect(this, "onDeselect", this, "hideDialog");
 	},
-	
+
 	showDialog: function (e) {
 		dojo.lang.setTimeout(dojo.event.connect, 1, document, "onmousedown", this, "deselect");
 	},
-	
+
 	hideDialog: function (e) {
 		dojo.event.disconnect(document, "onmousedown", this, "deselect");
 	}
@@ -771,11 +771,11 @@ dojo.lang.extend(dojo.widget.html.ToolbarSeparator, {
 	},
 
 	// don't want events!
-	_onmouseover: null, 
-    _onmouseout: null, 
-    _onclick: null, 
-    _onmousedown: null, 
-    _onmouseup: null 
+	_onmouseover: null,
+    _onmouseout: null,
+    _onclick: null,
+    _onmousedown: null,
+    _onmouseup: null
 });
 
 /* ToolbarSpace
@@ -797,7 +797,7 @@ dojo.lang.extend(dojo.widget.html.ToolbarSpace, {
 });
 
 /* ToolbarSelect
- ******************/ 
+ ******************/
 
 dojo.widget.tags.addParseTreeHandler("dojo:toolbarSelect");
 dojo.widget.html.ToolbarSelect = function() {
diff --git a/webapp/src/main/webapp/src/widget/TreeRPCController.js b/webapp/src/main/webapp/src/widget/TreeRPCController.js
index 67233d794..305847276 100644
--- a/webapp/src/main/webapp/src/widget/TreeRPCController.js
+++ b/webapp/src/main/webapp/src/widget/TreeRPCController.js
@@ -54,7 +54,7 @@ dojo.lang.extend(dojo.widget.TreeRPCController, {
 
 		var success;
 
-		this.runRPC({		
+		this.runRPC({
 			url: this.getRPCUrl('move'),
 			/* I hitch to get this.loadOkHandler */
 			load: function(response){
@@ -93,7 +93,7 @@ dojo.lang.extend(dojo.widget.TreeRPCController, {
 				url: this.getRPCUrl('removeNode'),
 				/* I hitch to get this.loadOkHandler */
 				load: function(response){
-					this.doRemoveNodeProcessResponse(response, node, callObj, callFunc) 
+					this.doRemoveNodeProcessResponse(response, node, callObj, callFunc)
 				},
 				params: params,
 				lock: [node]
@@ -145,7 +145,7 @@ dojo.lang.extend(dojo.widget.TreeRPCController, {
 				url: this.getRPCUrl('createChild'),
 				load: function(response) {
 					// suggested data is dead, fresh data from server is used
-					this.doCreateChildProcessResponse( response, parent, index, callObj, callFunc) 
+					this.doCreateChildProcessResponse( response, parent, index, callObj, callFunc)
 				},
 				params: params,
 				lock: [parent]
@@ -165,7 +165,7 @@ dojo.lang.extend(dojo.widget.TreeRPCController, {
 		}
 
 		var args = [parent, index, response, callObj, callFunc];
-		
+
 		dojo.widget.TreeLoadingController.prototype.doCreateChild.apply(this, args);
 	}
 });
diff --git a/webapp/src/main/webapp/src/widget/Widget.js b/webapp/src/main/webapp/src/widget/Widget.js
index b387510c6..8f558a7b1 100644
--- a/webapp/src/main/webapp/src/widget/Widget.js
+++ b/webapp/src/main/webapp/src/widget/Widget.js
@@ -19,7 +19,7 @@ dojo.require("dojo.widget.Manager");
 dojo.require("dojo.event.*");
 
 dojo.declare("dojo.widget.Widget", null, {
-	initializer: function() {								 
+	initializer: function() {
 		// these properties aren't primitives and need to be created on a per-item
 		// basis.
 		this.children = [];
@@ -78,7 +78,7 @@ dojo.declare("dojo.widget.Widget", null, {
 		// then call this.notifyChildrenOfResize() to notify children of resize
 		this.notifyChildrenOfResize();
 	},
-	
+
 	notifyChildrenOfResize: function(){
 		for(var i=0; i<this.children.length; i++){
 			var child = this.children[i];
@@ -179,7 +179,7 @@ dojo.declare("dojo.widget.Widget", null, {
 		}
 		*/
 		// dojo.profile.end("satisfyPropertySets");
-		
+
 		return args;
 	},
 
@@ -222,10 +222,10 @@ dojo.declare("dojo.widget.Widget", null, {
 		// problematic assignments and bugs in the future and will need to be
 		// documented with big bright neon lights.
 
-		// FIXME: fails miserably if a mixin property has a default value of null in 
+		// FIXME: fails miserably if a mixin property has a default value of null in
 		// a widget
 
-		// NOTE: caching lower-cased args in the prototype is only 
+		// NOTE: caching lower-cased args in the prototype is only
 		// acceptable if the properties are invariant.
 		// if we have a name-cache, get it
 		var lcArgs = dojo.widget.lcArgsCache[this.widgetType];
@@ -243,7 +243,7 @@ dojo.declare("dojo.widget.Widget", null, {
 				var y = lcArgs[(new String(x)).toLowerCase()];
 				if(y){
 					args[y] = args[x];
-					x = y; 
+					x = y;
 				}
 			}
 			if(visited[x]){ continue; }
@@ -263,13 +263,13 @@ dojo.declare("dojo.widget.Widget", null, {
 						// FIXME: need to determine if always over-writing instead
 						// of attaching here is appropriate. I suspect that we
 						// might want to only allow attaching w/ action items.
-						
+
 						// RAR, 1/19/05: I'm going to attach instead of
 						// over-write here. Perhaps function objects could have
 						// some sort of flag set on them? Or mixed-into objects
 						// could have some list of non-mutable properties
 						// (although I'm not sure how that would alleviate this
-						// particular problem)? 
+						// particular problem)?
 
 						// this[x] = new Function(args[x]);
 
@@ -277,8 +277,8 @@ dojo.declare("dojo.widget.Widget", null, {
 						// that these event handlers should execute in the
 						// context of the widget, so that the "this" pointer
 						// takes correctly.
-						
-						// argument that contains no punctuation other than . is 
+
+						// argument that contains no punctuation other than . is
 						// considered a function spec, not code
 						if(args[x].search(/[^\w\.]+/i) == -1){
 							this[x] = dojo.evalObjPath(args[x], false);
@@ -290,7 +290,7 @@ dojo.declare("dojo.widget.Widget", null, {
 						this[x] = args[x].split(";");
 					} else if (this[x] instanceof Date) {
 						this[x] = new Date(Number(args[x])); // assume timestamp
-					}else if(typeof this[x] == "object"){ 
+					}else if(typeof this[x] == "object"){
 						// FIXME: should we be allowing extension here to handle
 						// other object types intelligently?
 
@@ -324,7 +324,7 @@ dojo.declare("dojo.widget.Widget", null, {
 		}
 		// dojo.profile.end("mixInProperties");
 	},
-	
+
 	postMixInProperties: function(){
 	},
 
@@ -432,30 +432,30 @@ dojo.declare("dojo.widget.Widget", null, {
 
 	getPreviousSibling: function() {
 		var idx = this.getParentIndex();
- 
+
 		 // first node is idx=0 not found is idx<0
 		if (idx<=0) return null;
- 
+
 		return this.getSiblings()[idx-1];
 	},
- 
+
 	getSiblings: function() {
 		return this.parent.children;
 	},
- 
+
 	getParentIndex: function() {
 		return dojo.lang.indexOf( this.getSiblings(), this, true);
 	},
- 
+
 	getNextSibling: function() {
- 
+
 		var idx = this.getParentIndex();
- 
+
 		if (idx == this.getSiblings().length-1) return null; // last node
 		if (idx < 0) return null; // not found
- 
+
 		return this.getSiblings()[idx+1];
- 
+
 	}
 });
 
@@ -473,7 +473,7 @@ dojo.widget.lcArgsCache = {};
 dojo.widget.tags = {};
 dojo.widget.tags.addParseTreeHandler = function(type){
 	var ltype = type.toLowerCase();
-	this[ltype] = function(fragment, widgetParser, parentComp, insertionIndex, localProps){ 
+	this[ltype] = function(fragment, widgetParser, parentComp, insertionIndex, localProps){
 		return dojo.widget.buildWidgetFromParseTree(ltype, fragment, widgetParser, parentComp, insertionIndex, localProps);
 	}
 }
@@ -498,8 +498,8 @@ dojo.widget.tags["dojo:connect"] = function(fragment, widgetParser, parentComp){
 //	- remove the clone from the render tree
 //	- place the clone
 // this is quite dumb
-dojo.widget.buildWidgetFromParseTree = function(type, frag, 
-												parser, parentComp, 
+dojo.widget.buildWidgetFromParseTree = function(type, frag,
+												parser, parentComp,
 												insertionIndex, localProps){
 	var stype = type.split(":");
 	stype = (stype.length == 2) ? stype[1] : type;
@@ -541,10 +541,10 @@ dojo.widget.defineWidget = function(widgetClass /*string*/, renderer /*string*/,
 			p = 2;
 		}
 		if(dojo.lang.isFunction(arguments[p])){
-			// init (function), props (object) 
+			// init (function), props (object)
 			args.push(arguments[p], arguments[p+1]);
 		}else{
-			// props (object) 
+			// props (object)
 			args.push(null, arguments[p]);
 		}
 		dojo.widget._defineWidget.apply(this, args);
@@ -573,4 +573,4 @@ dojo.widget._defineWidget = function(widgetClass /*string*/, renderer /*string*/
 		delete props.classConstructor;
 	}
 	dojo.declare(widgetClass, superclasses, init, props);
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/src/widget/__package__.js b/webapp/src/main/webapp/src/widget/__package__.js
index 8d87ef181..0256b41da 100644
--- a/webapp/src/main/webapp/src/widget/__package__.js
+++ b/webapp/src/main/webapp/src/widget/__package__.js
@@ -9,9 +9,9 @@
 */
 
 dojo.kwCompoundRequire({
-	common: ["dojo.xml.Parse", 
-			 "dojo.widget.Widget", 
-			 "dojo.widget.Parse", 
+	common: ["dojo.xml.Parse",
+			 "dojo.widget.Widget",
+			 "dojo.widget.Parse",
 			 "dojo.widget.Manager"],
 	browser: ["dojo.widget.DomWidget",
 			  "dojo.widget.HtmlWidget"],
diff --git a/webapp/src/main/webapp/src/widget/demoEngine/DemoContainer.js b/webapp/src/main/webapp/src/widget/demoEngine/DemoContainer.js
index 954a3505b..ead1fb014 100644
--- a/webapp/src/main/webapp/src/widget/demoEngine/DemoContainer.js
+++ b/webapp/src/main/webapp/src/widget/demoEngine/DemoContainer.js
@@ -15,8 +15,8 @@ dojo.require("dojo.widget.demoEngine.DemoPane");
 dojo.require("dojo.widget.demoEngine.SourcePane");
 dojo.require("dojo.widget.TabContainer");
 
-dojo.widget.defineWidget("my.widget.demoEngine.DemoContainer", 
-	dojo.widget.HtmlWidget, 
+dojo.widget.defineWidget("my.widget.demoEngine.DemoContainer",
+	dojo.widget.HtmlWidget,
 	{
 		templatePath: dojo.uri.dojoUri("src/widget/demoEngine/templates/DemoContainer.html"),
 		templateCssPath: dojo.uri.dojoUri("src/widget/demoEngine/templates/DemoContainer.css"),
@@ -57,7 +57,7 @@ dojo.widget.defineWidget("my.widget.demoEngine.DemoContainer",
 		showSource: function() {
 			dojo.html.removeClass(this.demoButtonNode,this.selectedButtonClass);
 			dojo.html.addClass(this.sourceButtonNode,this.selectedButtonClass);
-			this.tabContainer.selectTab(this.sourceTab);	
+			this.tabContainer.selectTab(this.sourceTab);
 		},
 
 		showDemo: function() {
@@ -87,11 +87,11 @@ dojo.widget.defineWidget("my.widget.demoEngine.DemoContainer",
 
 		this.headerNode="";
 		this.returnNode="";
-	
+
 		this.returnImageNode="";
 		this.returnImage="images/dojoDemos.gif";
 		this.returnClass="return";
-		
+
 		this.summaryNode="";
 		this.demoNameNode="";
 		this.tabControlNode="";
diff --git a/webapp/src/main/webapp/src/widget/demoEngine/DemoItem.js b/webapp/src/main/webapp/src/widget/demoEngine/DemoItem.js
index 15b6bb810..8bb778da0 100644
--- a/webapp/src/main/webapp/src/widget/demoEngine/DemoItem.js
+++ b/webapp/src/main/webapp/src/widget/demoEngine/DemoItem.js
@@ -12,8 +12,8 @@ dojo.provide("dojo.widget.demoEngine.DemoItem");
 dojo.require("dojo.widget.*");
 dojo.require("dojo.widget.HtmlWidget");
 
-dojo.widget.defineWidget("my.widget.demoEngine.DemoItem", 
-	dojo.widget.HtmlWidget, 
+dojo.widget.defineWidget("my.widget.demoEngine.DemoItem",
+	dojo.widget.HtmlWidget,
 	{
 		templatePath: dojo.uri.dojoUri("src/widget/demoEngine/templates/DemoItem.html"),
 		templateCssPath: dojo.uri.dojoUri("src/widget/demoEngine/templates/DemoItem.css"),
diff --git a/webapp/src/main/webapp/src/widget/demoEngine/DemoNavigator.js b/webapp/src/main/webapp/src/widget/demoEngine/DemoNavigator.js
index fa4a4d8af..2876db4ea 100644
--- a/webapp/src/main/webapp/src/widget/demoEngine/DemoNavigator.js
+++ b/webapp/src/main/webapp/src/widget/demoEngine/DemoNavigator.js
@@ -17,8 +17,8 @@ dojo.require("dojo.io.*");
 dojo.require("dojo.lfx.*");
 dojo.require("dojo.lang.Common");
 
-dojo.widget.defineWidget("my.widget.demoEngine.DemoNavigator", 
-	dojo.widget.HtmlWidget, 
+dojo.widget.defineWidget("my.widget.demoEngine.DemoNavigator",
+	dojo.widget.HtmlWidget,
 	{
 		templatePath: dojo.uri.dojoUri("src/widget/demoEngine/templates/DemoNavigator.html"),
 		templateCssPath: dojo.uri.dojoUri("src/widget/demoEngine/templates/DemoNavigator.css"),
@@ -29,10 +29,10 @@ dojo.widget.defineWidget("my.widget.demoEngine.DemoNavigator",
 
 			if (dojo.render.html.ie) {
 				dojo.debug("render ie");
-				dojo.html.hide(this.demoListWrapperNode); 
+				dojo.html.hide(this.demoListWrapperNode);
 			} else {
 				dojo.debug("render non-ie");
-				dojo.lfx.html.fadeHide(this.demoListWrapperNode, 0).play();	
+				dojo.lfx.html.fadeHide(this.demoListWrapperNode, 0).play();
 			}
 
 			this.getRegistry(this.demoRegistryUrl);
@@ -47,7 +47,7 @@ dojo.widget.defineWidget("my.widget.demoEngine.DemoNavigator",
 			if (dojo.render.html.ie) {
 				dojo.debug("render ie");
 				dojo.html.show(this.navigationContainer) ;
-			} else {	
+			} else {
 				dojo.debug("render non-ie");
 				dojo.lfx.html.fadeShow(this.navigationContainer,250).play();
 			}
@@ -69,7 +69,7 @@ dojo.widget.defineWidget("my.widget.demoEngine.DemoNavigator",
 			//dojo.widget.demoEngine.DemoNavigator.superclass.show.call(this);
 			dojo.html.show(this.domNode);
 			dojo.html.setOpacity(this.domNode,1);
-			//dojo.html.setOpacity(this.navigationContainer);	
+			//dojo.html.setOpacity(this.navigationContainer);
 			//dojo.html.show(this.navigationContainer);
 			dojo.html.setOpacity(this.navigationContainer,1);
 
@@ -92,7 +92,7 @@ dojo.widget.defineWidget("my.widget.demoEngine.DemoNavigator",
 		processRegistry: function(type,registry,e) {
 			dojo.debug("Processing Registry");
 			this.registry = registry;
-			dojo.lang.forEach(this.registry.navigation, dojo.lang.hitch(this,this.addCategory)); 
+			dojo.lang.forEach(this.registry.navigation, dojo.lang.hitch(this,this.addCategory));
 		},
 
 		addCategory: function(category) {
@@ -104,7 +104,7 @@ dojo.widget.defineWidget("my.widget.demoEngine.DemoNavigator",
 
 				this.registry.categories[category.name] = category;
 				this.categoriesChildren.push(newCat);
-				this.categoriesButtonsNode.appendChild(newCat.domNode);	
+				this.categoriesButtonsNode.appendChild(newCat.domNode);
 				newCat.domNode.categoryName = category.name;
 				dojo.event.connect(newCat,"onClick", this, "onSelectCategory");
 		},
@@ -113,19 +113,19 @@ dojo.widget.defineWidget("my.widget.demoEngine.DemoNavigator",
 			var demo = this.registry.definitions[demoName];
 
 			if (dojo.render.html.ie) {
-				dojo.html.show(this.demoListWrapperNode) 
+				dojo.html.show(this.demoListWrapperNode)
 			} else {
 				dojo.lfx.html.fadeShow(this.demoListWrapperNode, 250).play();
 			}
 
 			var newDemo = dojo.widget.createWidget("DemoItem",{viewDemoImage: this.viewDemoImage, name: demoName, description: demo.description, thumbnail: demo.thumbnail});
 			this.demoListChildren.push(newDemo);
-			this.demoListContainerNode.appendChild(newDemo.domNode);	
+			this.demoListContainerNode.appendChild(newDemo.domNode);
 			dojo.event.connect(newDemo,"onSelectDemo",this,"onSelectDemo");
 		},
 
 		onSelectCategory: function(e) {
-			catName = e.currentTarget.categoryName;	
+			catName = e.currentTarget.categoryName;
 			dojo.debug("Selected Category: " + catName);
 			//Remove current list of demos
 			dojo.lang.forEach(this.demoListChildren, function(child) {
@@ -151,7 +151,7 @@ dojo.widget.defineWidget("my.widget.demoEngine.DemoNavigator",
 			} else {
 				dojo.debug("render non-ie");
 				dojo.lfx.html.fadeHide(this.navigationContainer,250,null,dojo.lang.hitch(this, function() {
-					this.demoContainer.show();	
+					this.demoContainer.show();
 					this.demoContainer.showDemo();
 				})).play();
 			}
@@ -160,7 +160,7 @@ dojo.widget.defineWidget("my.widget.demoEngine.DemoNavigator",
 			this.demoContainer.setName(e.target.name);
 			this.demoContainer.setSummary(this.registry.definitions[e.target.name].description);
 		}
-		
+
 	},
 	"",
 	function() {
diff --git a/webapp/src/main/webapp/src/widget/demoEngine/DemoPane.js b/webapp/src/main/webapp/src/widget/demoEngine/DemoPane.js
index c78e5348a..be80df9a7 100644
--- a/webapp/src/main/webapp/src/widget/demoEngine/DemoPane.js
+++ b/webapp/src/main/webapp/src/widget/demoEngine/DemoPane.js
@@ -12,8 +12,8 @@ dojo.provide("dojo.widget.demoEngine.DemoPane");
 dojo.require("dojo.widget.*");
 dojo.require("dojo.widget.HtmlWidget");
 
-dojo.widget.defineWidget("my.widget.demoEngine.DemoPane", 
-	dojo.widget.HtmlWidget, 
+dojo.widget.defineWidget("my.widget.demoEngine.DemoPane",
+	dojo.widget.HtmlWidget,
 	{
 		templatePath: dojo.uri.dojoUri("src/widget/demoEngine/templates/DemoPane.html"),
 		templateCssPath: dojo.uri.dojoUri("src/widget/demoEngine/templates/DemoPane.css"),
@@ -22,7 +22,7 @@ dojo.widget.defineWidget("my.widget.demoEngine.DemoPane",
 			dojo.debug("PostCreate");
 			this._launchDemo();
 		},
-		
+
 		_launchDemo: function() {
 			dojo.debug("Launching Demo");
 			dojo.debug(this.demoNode);
diff --git a/webapp/src/main/webapp/src/widget/demoEngine/SourcePane.js b/webapp/src/main/webapp/src/widget/demoEngine/SourcePane.js
index 8a3a0f7d0..3ffca267a 100644
--- a/webapp/src/main/webapp/src/widget/demoEngine/SourcePane.js
+++ b/webapp/src/main/webapp/src/widget/demoEngine/SourcePane.js
@@ -13,8 +13,8 @@ dojo.require("dojo.widget.*");
 dojo.require("dojo.widget.HtmlWidget");
 dojo.require("dojo.io.*");
 
-dojo.widget.defineWidget("my.widget.demoEngine.SourcePane", 
-	dojo.widget.HtmlWidget, 
+dojo.widget.defineWidget("my.widget.demoEngine.SourcePane",
+	dojo.widget.HtmlWidget,
 	{
 		templatePath: dojo.uri.dojoUri("src/widget/demoEngine/templates/SourcePane.html"),
 		templateCssPath: dojo.uri.dojoUri("src/widget/demoEngine/templates/SourcePane.css"),
@@ -22,7 +22,7 @@ dojo.widget.defineWidget("my.widget.demoEngine.SourcePane",
 			dojo.html.addClass(this.domNode,this.domNodeClass);
 			dojo.debug("PostCreate");
 		},
-	
+
 		getSource: function() {
 			if (this.href) {
 				dojo.io.bind({
@@ -31,7 +31,7 @@ dojo.widget.defineWidget("my.widget.demoEngine.SourcePane",
 					mimetype: "text/plain"
 				});
 			}
-		},	
+		},
 
 		fillInSource: function(type, source, e) {
 			this.sourceNode.value=source;
diff --git a/webapp/src/main/webapp/src/widget/html/AccordionPane.js b/webapp/src/main/webapp/src/widget/html/AccordionPane.js
index 72987c9f7..225199928 100644
--- a/webapp/src/main/webapp/src/widget/html/AccordionPane.js
+++ b/webapp/src/main/webapp/src/widget/html/AccordionPane.js
@@ -60,7 +60,7 @@ dojo.lang.extend(dojo.widget.html.AccordionPane, {
 		var height=dojo.style.getInnerHeight(this.domNode.parentNode)-this.getCollapsedHeight();
 
 		this.siblingWidgets = [];
-	
+
 		for (var x=0; x<siblings.length; x++) {
 			if (siblings[x].widgetType==this.widgetType) {
 				if (this.domNode != siblings[x]) {
@@ -70,7 +70,7 @@ dojo.lang.extend(dojo.widget.html.AccordionPane, {
 				}
 			}
 		}
-	
+
 		for (var x=0; x<this.siblingWidgets.length; x++) {
 			dojo.style.setOuterHeight(this.siblingWidgets[x].containerNode,height);
 		}
@@ -80,7 +80,7 @@ dojo.lang.extend(dojo.widget.html.AccordionPane, {
 
 	onLabelClick: function() {
 		this.setSizes();
-		if (!this.open) { 
+		if (!this.open) {
 			for (var x=0; x<this.siblingWidgets.length;x++) {
 				if (this.siblingWidgets[x].open) {
 					this.siblingWidgets[x].collapse();
diff --git a/webapp/src/main/webapp/src/widget/html/Button2.js b/webapp/src/main/webapp/src/widget/html/Button2.js
index 9ed59a695..38c06e1cf 100644
--- a/webapp/src/main/webapp/src/widget/html/Button2.js
+++ b/webapp/src/main/webapp/src/widget/html/Button2.js
@@ -22,4 +22,4 @@ dojo.lang.extend(dojo.widget.html.DropDownButton2, { widgetType: "DropDownButton
 
 dojo.widget.html.ComboButton2 = function(){}
 dojo.inherits(dojo.widget.html.ComboButton2, dojo.widget.html.ComboButton);
-dojo.lang.extend(dojo.widget.html.ComboButton2, { widgetType: "ComboButton2" });
\ No newline at end of file
+dojo.lang.extend(dojo.widget.html.ComboButton2, { widgetType: "ComboButton2" });
diff --git a/webapp/src/main/webapp/src/widget/html/Checkbox.js b/webapp/src/main/webapp/src/widget/html/Checkbox.js
index 6cf35fcb3..9009e701e 100644
--- a/webapp/src/main/webapp/src/widget/html/Checkbox.js
+++ b/webapp/src/main/webapp/src/widget/html/Checkbox.js
@@ -19,7 +19,7 @@ dojo.widget.defineWidget(
 	dojo.widget.HtmlWidget,
 	{
 		widgetType: "Checkbox",
-	
+
 		templatePath: dojo.uri.dojoUri('src/widget/templates/HtmlCheckBox.html'),
 
 		srcOn: dojo.uri.dojoUri('src/widget/templates/check_on.gif'),
diff --git a/webapp/src/main/webapp/src/widget/html/ComboBox.js b/webapp/src/main/webapp/src/widget/html/ComboBox.js
index d493b4aaf..7b56eef90 100644
--- a/webapp/src/main/webapp/src/widget/html/ComboBox.js
+++ b/webapp/src/main/webapp/src/widget/html/ComboBox.js
@@ -36,11 +36,11 @@ dojo.widget.defineWidget(
 		searchDelay: 100,
 		dataUrl: "",
 		fadeTime: 200,
-		// maxListLength limits list to X visible rows, scroll on rest 
-		maxListLength: 8, 
+		// maxListLength limits list to X visible rows, scroll on rest
+		maxListLength: 8,
 		// mode can also be "remote" for JSON-returning live search or "html" for
 		// dumber live search
-		mode: "local", 
+		mode: "local",
 		selectedResult: null,
 		_highlighted_option: null,
 		_prev_key_backspace: false,
@@ -52,7 +52,7 @@ dojo.widget.defineWidget(
 
 		templatePath: dojo.uri.dojoUri("src/widget/templates/HtmlComboBox.html"),
 		templateCssPath: dojo.uri.dojoUri("src/widget/templates/HtmlComboBox.css"),
-	
+
 		setValue: function(value) {
 			this.comboBoxValue.value = value;
 			if (this.textInputNode.value != value) { // prevent mucking up of selection
@@ -60,19 +60,19 @@ dojo.widget.defineWidget(
 			}
 			dojo.widget.html.stabile.setState(this.widgetId, this.getState(), true);
 		},
-	
+
 		getValue: function() {
 			return this.comboBoxValue.value;
 		},
-	
+
 		getState: function() {
 			return {value: this.getValue()};
 		},
-	
+
 		setState: function(state) {
 			this.setValue(state.value);
 		},
-	
+
 		getCaretPos: function(element){
 			// khtml 3.5.2 has selection* methods as does webkit nightlies from 2005-06-22
 			if(dojo.lang.isNumber(element.selectionStart)){
@@ -96,15 +96,15 @@ dojo.widget.defineWidget(
 				} catch (e) {
 					return 0; // If focus has shifted, 0 is fine for caret pos.
 				}
-				
+
 			}
 		},
-	
+
 		setCaretPos: function(element, location){
 			location = parseInt(location);
 			this.setSelectedRange(element, location, location);
 		},
-	
+
 		setSelectedRange: function(element, start, end){
 			if(!end){ end = element.value.length; }  // NOTE: Strange - should be able to put caret at start of text?
 			// Mozilla
@@ -136,19 +136,19 @@ dojo.widget.defineWidget(
 				}
 			}
 		},
-	
+
 		// does the keyboard related stuff
 		_handleKeyEvents: function(evt){
 			if(evt.ctrlKey || evt.altKey){ return; }
-	
+
 			// reset these
 			this._prev_key_backspace = false;
 			this._prev_key_esc = false;
-	
+
 			var k = dojo.event.browser.keys;
 			var doSearch = true;
-	
-			// mozilla quirk 
+
+			// mozilla quirk
 			// space has no keyCode in mozilla
 			var keyCode = evt.keyCode;
 			if(keyCode==0 && evt.charCode==k.KEY_SPACE){
@@ -177,7 +177,7 @@ dojo.widget.defineWidget(
 					if(!this.autoComplete && this._result_list_open && this._highlighted_option){
 						dojo.event.browser.stopEvent(evt);
 						this.selectOption({ 'target': this._highlighted_option, 'noHide': true });
-	
+
 						// put caret last
 						this.setSelectedRange(this.textInputNode, this.textInputNode.value.length, null);
 					}else{
@@ -215,19 +215,19 @@ dojo.widget.defineWidget(
 						doSearch = false;
 					}
 			}
-	
+
 			if(this.searchTimer){
 				clearTimeout(this.searchTimer);
 			}
 			if(doSearch){
 				// if we have gotten this far we dont want to keep our highlight
 				this.blurOptionNode();
-	
+
 				// need to wait a tad before start search so that the event bubbles through DOM and we have value visible
 				this.searchTimer = setTimeout(dojo.lang.hitch(this, this.startSearchFromInput), this.searchDelay);
 			}
 		},
-	
+
 		onKeyDown: function(evt){
 			// IE needs to stop keyDown others need to stop keyPress
 			if(!document.createEvent){ // only IE
@@ -235,17 +235,17 @@ dojo.widget.defineWidget(
 			}
 			// FIXME: What about ESC ??
 		},
-	
+
 		onKeyPress: function(evt){
 			if(document.createEvent){ // never IE
 				this._handleKeyEvents(evt);
 			}
 		},
-	
+
 		onKeyUp: function(evt){
 			this.setValue(this.textInputNode.value);
 		},
-	
+
 		setSelectedValue: function(value){
 			// FIXME, not sure what to do here!
 			this.comboBoxSelectionValue.value = value;
@@ -255,7 +255,7 @@ dojo.widget.defineWidget(
 			this.setValue(value1);
 			this.setSelectedValue(value2);
 		},
-	
+
 		// opera, khtml, safari doesnt support node.scrollIntoView(), workaround
 		scrollIntoView: function(){
 			var node = this._highlighted_option;
@@ -266,7 +266,7 @@ dojo.widget.defineWidget(
 			// dont like browser sniffs implementations but sometimes you have to use it
 			if(dojo.render.html.ie || dojo.render.html.mozilla){
 				// IE, mozilla
-				node.scrollIntoView(false);	
+				node.scrollIntoView(false);
 			}else{
 				var parentBottom = parent.scrollTop + dojo.style.getInnerHeight(parent);
 				var nodeBottom = node.offsetTop + dojo.style.getOuterHeight(node);
@@ -277,7 +277,7 @@ dojo.widget.defineWidget(
 				}
 			}
 		},
-	
+
 		// does the actual highlight
 		focusOptionNode: function(node){
 			if(this._highlighted_option != node){
@@ -286,7 +286,7 @@ dojo.widget.defineWidget(
 				dojo.html.addClass(this._highlighted_option, "dojoComboBoxItemHighlight");
 			}
 		},
-	
+
 		// removes highlight on highlighted
 		blurOptionNode: function(){
 			if(this._highlighted_option){
@@ -294,7 +294,7 @@ dojo.widget.defineWidget(
 				this._highlighted_option = null;
 			}
 		},
-	
+
 		highlightNextOption: function(){
 			if((!this._highlighted_option) || !this._highlighted_option.parentNode){
 				this.focusOptionNode(this.optionsListNode.firstChild);
@@ -303,7 +303,7 @@ dojo.widget.defineWidget(
 			}
 			this.scrollIntoView();
 		},
-	
+
 		highlightPrevOption: function(){
 			if(this._highlighted_option && this._highlighted_option.previousSibling){
 				this.focusOptionNode(this._highlighted_option.previousSibling);
@@ -314,24 +314,24 @@ dojo.widget.defineWidget(
 			}
 			this.scrollIntoView();
 		},
-	
+
 		itemMouseOver: function(evt){
 			this.focusOptionNode(evt.target);
 			dojo.html.addClass(this._highlighted_option, "dojoComboBoxItemHighlight");
 		},
-	
+
 		itemMouseOut: function(evt){
 			this.blurOptionNode();
 		},
-	
+
 		fillInTemplate: function(args, frag){
 			// FIXME: need to get/assign DOM node names for form participation here.
 			this.comboBoxValue.name = this.name;
 			this.comboBoxSelectionValue.name = this.name+"_selected";
-	
+
 			var source = this.getFragNodeRef(frag);
 			dojo.html.copyStyle(this.domNode, source);
-	
+
 			var dpClass;
 			if(this.mode == "remote"){
 				dpClass = dojo.widget.incrementalComboBoxDataProvider;
@@ -342,25 +342,25 @@ dojo.widget.defineWidget(
 			}
 			this.dataProvider = new dpClass();
 			this.dataProvider.init(this, this.getFragNodeRef(frag));
-	
+
 			// Prevent IE bleed-through problem
 			this.optionsIframe = new dojo.html.BackgroundIframe(this.optionsListWrapper);
 			this.optionsIframe.size([0,0,0,0]);
 		},
-	
-	
+
+
 		focus: function(){
 			// summary
 			//	set focus to input node from code
 			this.tryFocus();
 		},
-	
+
 		openResultList: function(results){
 			this.clearResultList();
 			if(!results.length){
 				this.hideResultList();
 			}
-	
+
 			if(	(this.autoComplete)&&
 				(results.length)&&
 				(!this._prev_key_backspace)&&
@@ -375,7 +375,7 @@ dojo.widget.defineWidget(
 					this.setSelectedRange(this.textInputNode, cpos, this.textInputNode.value.length);
 				}
 			}
-	
+
 			var even = true;
 			while(results.length){
 				var tr = results.shift();
@@ -391,20 +391,20 @@ dojo.widget.defineWidget(
 					dojo.event.connect(td, "onmouseout", this, "itemMouseOut");
 				}
 			}
-	
+
 			// show our list (only if we have content, else nothing)
 			this.showResultList();
 		},
-	
+
 		onFocusInput: function(){
 			this._hasFocus = true;
 		},
-	
+
 		onBlurInput: function(){
 			this._hasFocus = false;
 			this._handleBlurTimer(true, 500);
 		},
-	
+
 		// collect all blur timers issues here
 		_handleBlurTimer: function(/*Boolean*/clear, /*Number*/ millisec){
 			if(this.blurTimer && (clear || millisec)){
@@ -414,7 +414,7 @@ dojo.widget.defineWidget(
 				this.blurTimer = dojo.lang.setTimeout(this, "checkBlurred", millisec);
 			}
 		},
-	
+
 		// these 2 are needed in IE and Safari as inputTextNode loses focus when scrolling optionslist
 		_onMouseOver: function(evt){
 			if(!this._mouseover_list){
@@ -422,7 +422,7 @@ dojo.widget.defineWidget(
 				this._mouseover_list = true;
 			}
 		},
-	
+
 		_onMouseOut:function(evt){
 			var relTarget = evt.relatedTarget;
 			if(!relTarget || relTarget.parentNode!=this.optionsListNode){
@@ -431,7 +431,7 @@ dojo.widget.defineWidget(
 				this.tryFocus();
 			}
 		},
-	
+
 		_isInputEqualToResult: function(result){
 			input = this.textInputNode.value;
 			if(!this.dataProvider.caseSensitive){
@@ -462,7 +462,7 @@ dojo.widget.defineWidget(
 					this.setAllValues("", "");
 					return;
 				}
-				
+
 				isValidOption = this._isValidOption();
 				// enforce selection from option list
 				if(this.forceValidOption && !isValidOption){
@@ -474,7 +474,7 @@ dojo.widget.defineWidget(
 				}
 			}
 		},
-	
+
 		sizeBackgroundIframe: function(){
 			var w = dojo.style.getOuterWidth(this.optionsListNode);
 			var h = dojo.style.getOuterHeight(this.optionsListNode);
@@ -487,38 +487,38 @@ dojo.widget.defineWidget(
 				this.optionsIframe.size([0,0,w,h]);
 			}
 		},
-	
+
 		selectOption: function(evt){
 			var tgt = null;
 			if(!evt){
 				evt = { target: this._highlighted_option };
 			}
-	
+
 			if(!dojo.dom.isDescendantOf(evt.target, this.optionsListNode)){
 				// handle autocompletion where the the user has hit ENTER or TAB
-	
+
 				// if the input is empty do nothing
 				if(!this.textInputNode.value.length){
 					return;
 				}
 				tgt = dojo.dom.firstElement(this.optionsListNode);
-	
+
 				// user has input value not in option list
 				if(!tgt || !this._isInputEqualToResult(tgt.getAttribute("resultName"))){
 					return;
 				}
 				// otherwise the user has accepted the autocompleted value
 			}else{
-				tgt = evt.target; 
+				tgt = evt.target;
 			}
-	
+
 			while((tgt.nodeType!=1)||(!tgt.getAttribute("resultName"))){
 				tgt = tgt.parentNode;
 				if(tgt === document.body){
 					return false;
 				}
 			}
-	
+
 			this.textInputNode.value = tgt.getAttribute("resultName");
 			this.selectedResult = [tgt.getAttribute("resultName"), tgt.getAttribute("resultValue")];
 			this.setAllValues(tgt.getAttribute("resultName"), tgt.getAttribute("resultValue"));
@@ -528,7 +528,7 @@ dojo.widget.defineWidget(
 			}
 			this.tryFocus();
 		},
-	
+
 		clearResultList: function(){
 			var oln = this.optionsListNode;
 			while(oln.firstChild){
@@ -537,7 +537,7 @@ dojo.widget.defineWidget(
 				oln.removeChild(oln.firstChild);
 			}
 		},
-	
+
 		hideResultList: function(){
 			if(this._result_list_open){
 				this._result_list_open = false;
@@ -545,7 +545,7 @@ dojo.widget.defineWidget(
 				dojo.lfx.fadeHide(this.optionsListNode, this.fadeTime).play();
 			}
 		},
-	
+
 		showResultList: function(){
 			// Our dear friend IE doesnt take max-height so we need to calculate that on our own every time
 			var childs = this.optionsListNode.childNodes;
@@ -554,7 +554,7 @@ dojo.widget.defineWidget(
 				if(childs.length < visibleCount){
 					visibleCount = childs.length;
 				}
-	
+
 				with(this.optionsListNode.style){
 					display = "";
 					height = ((visibleCount) ? (dojo.style.getOuterHeight(childs[0]) * visibleCount) : 0)+"px";
@@ -565,7 +565,7 @@ dojo.widget.defineWidget(
 					dojo.html.setOpacity(this.optionsListNode, 0);
 					dojo.lfx.fadeIn(this.optionsListNode, this.fadeTime).play();
 				}
-				
+
 				// prevent IE bleed through
 				this._iframeTimer = dojo.lang.setTimeout(this, "sizeBackgroundIframe", 200);
 				this._result_list_open = true;
@@ -573,7 +573,7 @@ dojo.widget.defineWidget(
 				this.hideResultList();
 			}
 		},
-	
+
 		handleArrowClick: function(){
 			this._handleBlurTimer(true, 0);
 			this.tryFocus();
@@ -583,7 +583,7 @@ dojo.widget.defineWidget(
 				this.startSearchFromInput();
 			}
 		},
-	
+
 		tryFocus: function(){
 			try {
 				this.textInputNode.focus();
@@ -591,17 +591,17 @@ dojo.widget.defineWidget(
 				// element isn't focusable if disabled, or not visible etc - not easy to test for.
 	 		};
 		},
-		
+
 		startSearchFromInput: function(){
 			this.startSearch(this.textInputNode.value);
 		},
-	
+
 		postCreate: function(){
 			dojo.event.connect(this, "startSearch", this.dataProvider, "startSearch");
 			dojo.event.connect(this.dataProvider, "provideSearchResults", this, "openResultList");
 			dojo.event.connect(this.textInputNode, "onblur", this, "onBlurInput");
 			dojo.event.connect(this.textInputNode, "onfocus", this, "onFocusInput");
-	
+
 			var s = dojo.widget.html.stabile.getState(this.widgetId);
 			if (s) {
 				this.setState(s);
diff --git a/webapp/src/main/webapp/src/widget/html/ContentPane.js b/webapp/src/main/webapp/src/widget/html/ContentPane.js
index 8c045da3e..6b27cf2d8 100644
--- a/webapp/src/main/webapp/src/widget/html/ContentPane.js
+++ b/webapp/src/main/webapp/src/widget/html/ContentPane.js
@@ -99,7 +99,7 @@ dojo.lang.extend(dojo.widget.html.ContentPane, {
 		}
 	},
 
-	
+
 	setUrl: function(/*String*/ url) {
 		// summary:
 		// 	Reset the (external defined) content of this pane and replace with new url
@@ -122,7 +122,7 @@ dojo.lang.extend(dojo.widget.html.ContentPane, {
 				if(type == "load") {
 					self.onDownloadEnd.call(self, url, data);
 				} else {
-					// works best when from a live server instead of from file system 
+					// works best when from a live server instead of from file system
 					self._handleDefaults.call(self, "Error loading '" + url + "' (" + e.status + " "+  e.statusText + ")", "onDownloadError");
 					self.onLoad();
 				}
@@ -146,7 +146,7 @@ dojo.lang.extend(dojo.widget.html.ContentPane, {
 		for(var i = 0;i < st.length; i++){
 			try{
 				st[i].call(this.scriptScope);
-			}catch(e){ 
+			}catch(e){
 				err += "\n"+st[i]+" failed: "+e.description;
 			}
 		}
@@ -212,7 +212,7 @@ dojo.lang.extend(dojo.widget.html.ContentPane, {
 			}
 		}
 		if(typeof e.returnValue != "boolean"){
-			e.returnValue = true; 
+			e.returnValue = true;
 		}
 		if(typeof e.preventDefault != "function"){
 			e.preventDefault = function(){
@@ -235,7 +235,7 @@ dojo.lang.extend(dojo.widget.html.ContentPane, {
 		}
 	},
 
-	
+
 	splitAndFixPaths: function(/*String*/s, /*dojo.uri.Uri?*/url){
 		// summary:
 		// 	fixes all remote paths in (hopefully) all cases for example images, remote scripts, links etc.
@@ -253,7 +253,7 @@ dojo.lang.extend(dojo.widget.html.ContentPane, {
 		// cut out title tags
 		var match = [];
 		while(match){
-			match = s.match(/<title[^>]*>([\s\S]*?)<\/title>/i); // can't match with dot as that 
+			match = s.match(/<title[^>]*>([\s\S]*?)<\/title>/i); // can't match with dot as that
 			if(!match){ break;}					//doesnt match newline in js
 			titles.push(match[1]);
 			s = s.replace(/<title[^>]*>[\s\S]*?<\/title>/i, "");
@@ -273,7 +273,7 @@ dojo.lang.extend(dojo.widget.html.ContentPane, {
 		// strip out the tag and run fix on that.
 		// this guarantees that we won't run replace another tag's attribute + it was easier do
 		var pos = 0; var pos2 = 0; var stop = 0 ;var str = ""; var fixedPath = "";
-		var attr = []; var fix = ""; var tagFix = ""; var tag = ""; var regex = ""; 
+		var attr = []; var fix = ""; var tagFix = ""; var tag = ""; var regex = "";
 		while(pos>-1){
 			pos = s.search(/<[a-z][a-z0-9]*[^>]*\s(?:(?:src|href|style)=[^>])+[^>]*>/i);
 			if(pos==-1){ break; }
@@ -348,7 +348,7 @@ dojo.lang.extend(dojo.widget.html.ContentPane, {
 				var sc = match[2].replace(/(?:var )?\bdjConfig\b(?:[\s]*=[\s]*\{[^}]+\}|\.[\w]*[\s]*=[\s]*[^;\n]*)?;?|dojo\.hostenv\.writeIncludes\(\s*\);?/g, "");
 				if(!sc){ continue; }
 
-				// cut out all dojo.require (...) calls, if we have execute 
+				// cut out all dojo.require (...) calls, if we have execute
 				// scripts false widgets dont get there require calls
 				// does suck out possible widgetpackage registration as well
 				tmp = [];
@@ -400,9 +400,9 @@ dojo.lang.extend(dojo.widget.html.ContentPane, {
 			"url": url};
 	},
 
-	
+
 	_setContent: function(/*String*/ xml){
-		// summary: 
+		// summary:
 		//		private internal function without path regExpCheck and no onLoad calls aftervards
 
 		// remove old children from current content
@@ -457,15 +457,15 @@ dojo.lang.extend(dojo.widget.html.ContentPane, {
 			}
 			// insert styleNodes, from <style>....
 			for(var i = 0; i < data.styles.length; i++){
-				if(i==0){ 
-					this._remoteStyles = []; 
+				if(i==0){
+					this._remoteStyles = [];
 				}
 				this._remoteStyles.push(dojo.style.insertCssText(data.styles[i]));
 			}
 			// insert styleNodes, from <link href="...">
 			for(var i = 0; i < data.linkStyles.length; i++){
-				if(i==0){ 
-					this._remoteStyles = []; 
+				if(i==0){
+					this._remoteStyles = [];
 				}
 				this._remoteStyles.push(dojo.style.insertCssFile(data.linkStyles[i]));
 			}
@@ -473,7 +473,7 @@ dojo.lang.extend(dojo.widget.html.ContentPane, {
 
 			if(this.parseContent){
 				for(var i = 0; i < data.requires.length; i++){
-					try{ 
+					try{
 						eval(data.requires[i]);
 					} catch(e){
 						this._handleDefaults(e, "onContentError", true);
diff --git a/webapp/src/main/webapp/src/widget/html/ContextMenu.js b/webapp/src/main/webapp/src/widget/html/ContextMenu.js
index e4fb6687c..fe5c54e3e 100644
--- a/webapp/src/main/webapp/src/widget/html/ContextMenu.js
+++ b/webapp/src/main/webapp/src/widget/html/ContextMenu.js
@@ -24,12 +24,12 @@ dojo.widget.html.ContextMenu = function(){
 
 	this.targetNodeIds = []; // fill this with nodeIds upon widget creation and it only responds to those nodes
 
-	// default event detection method 
-	var eventType = "oncontextmenu"; 
+	// default event detection method
+	var eventType = "oncontextmenu";
 
-	var doc = document.documentElement  || document.body; 
+	var doc = document.documentElement  || document.body;
 
-	var _blockHide = false; 
+	var _blockHide = false;
 
 	this.fillInTemplate = function(args, frag){
 
@@ -71,7 +71,7 @@ dojo.widget.html.ContextMenu = function(){
 
 		// if I do this, I cant preventDefault in khtml
 		//evt = dojo.event.browser.fixEvent(evt);
- 
+
 		// stop default contextmenu, needed in khtml
 		if (evt.preventDefault){ evt.preventDefault(); }
 
@@ -141,7 +141,7 @@ dojo.widget.html.ContextMenu = function(){
 
 		this.onHide(evt);
 	}
-	
+
 	this.onHide = function(evt){
 		// FIXME: use whatever we use to do more general style setting?
 		this.domNode.style.display = "none";
@@ -149,11 +149,11 @@ dojo.widget.html.ContextMenu = function(){
 		this.isShowing = 0;
 	}
 
-	// callback for rightclicks, needed for browsers that doesnt implement oncontextmenu, konqueror and more? 
-	this._checkRightClick = function(evt){ 
+	// callback for rightclicks, needed for browsers that doesnt implement oncontextmenu, konqueror and more?
+	this._checkRightClick = function(evt){
 
-		// for some reason konq comes here even when we are not clicking on the attached nodes 
-		// added check for targetnode 
+		// for some reason konq comes here even when we are not clicking on the attached nodes
+		// added check for targetnode
 		if (evt.button==2 && (this.targetNodeIds.length==0 || (evt.currentTarget.id!="" && dojo.lang.inArray(this.targetNodeIds, evt.currentTarget.id)))){
 
 			return this.onOpen(evt);
diff --git a/webapp/src/main/webapp/src/widget/html/DatePicker.js b/webapp/src/main/webapp/src/widget/html/DatePicker.js
index a7908edaf..ae7e6dee1 100644
--- a/webapp/src/main/webapp/src/widget/html/DatePicker.js
+++ b/webapp/src/main/webapp/src/widget/html/DatePicker.js
@@ -20,9 +20,9 @@ dojo.require("dojo.date");
 	Some assumptions:
 	- I'm planning on always showing 42 days at a time, and we can scroll by week,
 	not just by month or year
-	- To get a sense of what month to highlight, I basically initialize on the 
-	first Saturday of each month, since that will be either the first of two or 
-	the second of three months being partially displayed, and then I work forwards 
+	- To get a sense of what month to highlight, I basically initialize on the
+	first Saturday of each month, since that will be either the first of two or
+	the second of three months being partially displayed, and then I work forwards
 	and backwards from that point.
 	Currently, I assume that dates are stored in the RFC 3339 format,
 	because I find it to be most human readable and easy to parse
@@ -78,11 +78,11 @@ dojo.widget.defineWidget(
 			this.firstSaturday.month = tempSaturday.month;
 			this.firstSaturday.date = tempSaturday.date;
 		},
-		
+
 		setDate: function(rfcDate) {
 			this.storedDate = rfcDate;
 		},
-		
+
 		initUI: function() {
 			this.selectedIsUsed = false;
 			this.currentIsUsed = false;
@@ -90,11 +90,11 @@ dojo.widget.defineWidget(
 			var previousDate = new Date();
 			var calendarNodes = this.calendarDatesContainerNode.getElementsByTagName("td");
 			var currentCalendarNode;
-			// set hours of date such that there is no chance of rounding error due to 
+			// set hours of date such that there is no chance of rounding error due to
 			// time change in local time zones
 			previousDate.setHours(8);
 			var nextDate = new Date(this.firstSaturday.year, this.firstSaturday.month, this.firstSaturday.date, 8);
-			
+
 			if(this.firstSaturday.date < 7) {
 				// this means there are days to show from the previous month
 				var dayInWeek = 6;
@@ -111,7 +111,7 @@ dojo.widget.defineWidget(
 					currentCalendarNode.innerHTML = nextDate.getDate();
 					dojo.html.setClass(currentCalendarNode, this.getDateClassName(nextDate, "previous"));
 					previousDate = nextDate;
-					nextDate = this.incrementDate(nextDate, false);				
+					nextDate = this.incrementDate(nextDate, false);
 				}
 			} else {
 				nextDate.setDate(this.firstSaturday.date-6);
@@ -120,7 +120,7 @@ dojo.widget.defineWidget(
 					currentCalendarNode.innerHTML = nextDate.getDate();
 					dojo.html.setClass(currentCalendarNode, this.getDateClassName(nextDate, "current"));
 					previousDate = nextDate;
-					nextDate = this.incrementDate(nextDate, true);				
+					nextDate = this.incrementDate(nextDate, true);
 				}
 			}
 			previousDate.setDate(this.firstSaturday.date);
@@ -136,7 +136,7 @@ dojo.widget.defineWidget(
 				previousDate = nextDate;
 				nextDate = this.incrementDate(nextDate, true);
 			}
-			
+
 			while(count < 42) {
 				currentCalendarNode.innerHTML = nextDate.getDate();
 				dojo.html.setClass(currentCalendarNode, this.getDateClassName(nextDate, "next"));
@@ -147,7 +147,7 @@ dojo.widget.defineWidget(
 			this.setMonthLabel(this.firstSaturday.month);
 			this.setYearLabels(this.firstSaturday.year);
 		},
-		
+
 		incrementDate: function(date, bool) {
 			// bool: true to increase, false to decrease
 			var time = date.getTime();
@@ -157,19 +157,19 @@ dojo.widget.defineWidget(
 			returnDate.setTime(time);
 			return returnDate;
 		},
-		
+
 		incrementWeek: function(evt) {
 			var date = this.firstSaturday.date;
 			var month = this.firstSaturday.month;
 			var year = this.firstSaturday.year;
 			switch(evt.target) {
-				case this.increaseWeekNode.getElementsByTagName("img").item(0): 
+				case this.increaseWeekNode.getElementsByTagName("img").item(0):
 				case this.increaseWeekNode:
 					date = date + 7;
 					if (date>this._daysIn(month,year)) {
 						date = date - this._daysIn(month,year);
 						if (month < 11) {
-							month++;	
+							month++;
 						} else {
 							month=0;
 							year++;
@@ -192,15 +192,15 @@ dojo.widget.defineWidget(
 						}
 					}
 					break;
-	
+
 			}
-	
+
 			this.firstSaturday.date=date;
 			this.firstSaturday.month=month;
 			this.firstSaturday.year=year;
 			this.initUI();
 		},
-	
+
 		incrementMonth: function(evt) {
 			var month = this.firstSaturday.month;
 			var year = this.firstSaturday.year;
@@ -211,7 +211,7 @@ dojo.widget.defineWidget(
 					} else {
 						month = 0;
 						year++;
-						
+
 						this.setYearLabels(year);
 					}
 					break;
@@ -249,7 +249,7 @@ dojo.widget.defineWidget(
 			this.firstSaturday.date = tempSaturday.date;
 			this.initUI();
 		},
-	
+
 		incrementYear: function(evt) {
 			var year = this.firstSaturday.year;
 			switch(evt.target) {
@@ -266,46 +266,46 @@ dojo.widget.defineWidget(
 			this.firstSaturday.date = tempSaturday.date;
 			this.initUI();
 		},
-	
+
 		_daysIn: function(month,year) {
-			var daysIn = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]; 
-			
+			var daysIn = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+
 			if (month==1) {
 				return (year%400 == 0) ? 29: (year%100 == 0) ? 28: (year%4 == 0) ? 29: 28;
 			} else {
 				return daysIn[month];
 			}
 		},
-	
+
 		onIncrementDate: function(evt) {
 			dojo.unimplemented('dojo.widget.html.DatePicker.onIncrementDate');
 		},
-	
+
 		onIncrementWeek: function(evt) {
 			evt.stopPropagation();
 			this.incrementWeek(evt);
 		},
-	
+
 		onIncrementMonth: function(evt) {
 			evt.stopPropagation();
 			this.incrementMonth(evt);
 		},
-		
+
 		onIncrementYear: function(evt) {
 			evt.stopPropagation();
 			this.incrementYear(evt);
 		},
-	
+
 		setMonthLabel: function(monthIndex) {
 			this.monthLabelNode.innerHTML = dojo.date.months[monthIndex];
 		},
-		
+
 		setYearLabels: function(year) {
 			this.previousYearLabelNode.innerHTML = year - 1;
 			this.currentYearLabelNode.innerHTML = year;
 			this.nextYearLabelNode.innerHTML = year + 1;
 		},
-		
+
 		getDateClassName: function(date, monthState) {
 			var currentClassName = this.classNames[monthState];
 			if ((!this.selectedIsUsed) && (date.getDate() == this.date.getDate()) && (date.getMonth() == this.date.getMonth()) && (date.getFullYear() == this.date.getFullYear())) {
@@ -318,11 +318,11 @@ dojo.widget.defineWidget(
 			}
 			return currentClassName;
 		},
-	
+
 		onClick: function(evt) {
 			dojo.event.browser.stopEvent(evt)
 		},
-		
+
 		onSetDate: function(evt) {
 			dojo.event.browser.stopEvent(evt);
 			this.selectedIsUsed = 0;
diff --git a/webapp/src/main/webapp/src/widget/html/DocPane.js b/webapp/src/main/webapp/src/widget/html/DocPane.js
index 361eae8cc..7eda73937 100644
--- a/webapp/src/main/webapp/src/widget/html/DocPane.js
+++ b/webapp/src/main/webapp/src/widget/html/DocPane.js
@@ -106,16 +106,16 @@ dojo.lang.extend(dojo.widget.html.DocPane, {
 				appends.push(this.vParent.appendChild(this.vSave.cloneNode(true)));
 			}
 		}
-		
+
 		this.sParams.innerHTML = "";
 		for(var param in parameters){
 			var paramType = parameters[param][0];
 			var paramName = parameters[param][1];
-			this.parameters.style.display = "block";		
+			this.parameters.style.display = "block";
 			this.pLink.innerHTML = paramName;
 			this.pOpt.style.display = "none";
 			if(parameters[param].opt){
-				this.pOpt.style.display = "inline";				
+				this.pOpt.style.display = "inline";
 			}
 			this.pType.parentNode.style.display = "none";
 			if(parameters[param][0]){
@@ -128,7 +128,7 @@ dojo.lang.extend(dojo.widget.html.DocPane, {
 				this.pDesc.innerHTML = doc.parameters[paramName].description;
 			}
 			appends.push(this.pParent.appendChild(this.pSave.cloneNode(true)));
-			
+
 			if(param > 0) {
 				this.sParams.appendChild(document.createTextNode(", "));
 			}
@@ -148,14 +148,14 @@ dojo.lang.extend(dojo.widget.html.DocPane, {
 		}else{
 			this.sType.innerHTML = "void";
 		}
-		
+
 		this.sName.innerHTML = message.name;
-		
+
 		dojo.dom.removeChildren(this.source);
                 this.source.appendChild(document.createTextNode("\n\r"));
 		this.source.appendChild(document.createTextNode(message.src.replace(/\n/g, "\r\n\t")));
                 this.source.appendChild(document.createTextNode("\n\r"));
-		
+
 		this.domNode.appendChild(this.selectSave.cloneNode(true));
 
 		for(var i = 0, append; append = appends[i]; i++){
@@ -165,7 +165,7 @@ dojo.lang.extend(dojo.widget.html.DocPane, {
 
 	onDocResults: function(message){
 		var results = message.docResults;
-		
+
 		if(results.length == 1){
 			dojo.event.topic.publish("/doc/selectFunction", results[0]);
 			return;
@@ -179,16 +179,16 @@ dojo.lang.extend(dojo.widget.html.DocPane, {
 			this.fnLink.innerHTML = row.name;
 			this.fnLink.href = "#" + row.name;
 			if(row.id){
-				this.fnLink.href = this.fnLink.href + "," + row.id;	
+				this.fnLink.href = this.fnLink.href + "," + row.id;
 			}
 			this.summary.parentNode.style.display = "none";
 			if(row.summary){
-				this.summary.parentNode.style.display = "inline";				
+				this.summary.parentNode.style.display = "inline";
 				this.summary.innerHTML = row.summary;
 			}
 			appends.push(this.rowParent.appendChild(this.rowSave.cloneNode(true)));
 		}
-		
+
 		function makeSelect(x){
 			return function(e) {
 				dojo.event.topic.publish("/doc/selectFunction", x);
@@ -200,7 +200,7 @@ dojo.lang.extend(dojo.widget.html.DocPane, {
 		for(var i = 0, a; a = as[i]; i++){
 			dojo.event.connect(a, "onclick", makeSelect(results[i]));
 		}
-		
+
 		for(var i = 0, append; append = appends[i]; i++){
 			this.rowParent.removeChild(append);
 		}
diff --git a/webapp/src/main/webapp/src/widget/html/DropdownButton.js b/webapp/src/main/webapp/src/widget/html/DropdownButton.js
index 4afef155b..f32eb8811 100644
--- a/webapp/src/main/webapp/src/widget/html/DropdownButton.js
+++ b/webapp/src/main/webapp/src/widget/html/DropdownButton.js
@@ -31,7 +31,7 @@ dojo.widget.html.DropdownButton = function() {
 dojo.inherits(dojo.widget.html.DropdownButton, dojo.widget.HtmlWidget);
 
 dojo.lang.extend(dojo.widget.html.DropdownButton, {
-	
+
 	// In IE, event handlers on objects inside buttons don't work correctly, so
 	// we just set onClick on the button itself.
 	templatePath: dojo.uri.dojoUri("src/widget/templates/HtmlDropDownButtonTemplate.html"),
@@ -57,7 +57,7 @@ dojo.lang.extend(dojo.widget.html.DropdownButton, {
 
 		this.a = dojo.dom.getFirstChildElement(input);	// the button contents
 		this.menu = dojo.dom.getNextSiblingElement(this.a);	// the menu under the button
-		
+
 		this.disabled = dojo.html.hasClass(this.a, "disabled");
 		if( this.disabled ) {
 			dojo.html.addClass(this.button, "dojoDisabled");
@@ -117,7 +117,7 @@ dojo.lang.extend(dojo.widget.html.DropdownButton, {
 		dojo.html.addClass(this.button, "dojoButtonHover");
 		dojo.html.removeClass(this.button, "dojoButtonNoHover");
 	},
-	
+
 	onMouseOut: function(e) {
 		dojo.html.removeClass(this.button, "dojoButtonHover");
 		dojo.html.addClass(this.button, "dojoButtonNoHover");
@@ -150,7 +150,7 @@ dojo.lang.extend(dojo.widget.html.DropdownButton, {
 			this.hideMenu();
 		}
 	},
-	
+
 	showMenu: function() {
 		if ( this.disabled )
 			return;
@@ -171,7 +171,7 @@ dojo.lang.extend(dojo.widget.html.DropdownButton, {
 
 		// If someone clicks somewhere else on the screen then close the menu
 		dojo.event.connect(document.documentElement, "onmousedown", this, "onCanvasMouseDown");
-		
+
 		// When someone clicks the menu, after the menu handles the event,
 		// close the menu (be careful not to close the menu too early or else
 		// the menu will never receive the event.)
diff --git a/webapp/src/main/webapp/src/widget/html/GoogleMap.js b/webapp/src/main/webapp/src/widget/html/GoogleMap.js
index d575d8ace..75af8a164 100644
--- a/webapp/src/main/webapp/src/widget/html/GoogleMap.js
+++ b/webapp/src/main/webapp/src/widget/html/GoogleMap.js
@@ -97,7 +97,7 @@ dojo.lang.extend(dojo.widget.html.GoogleMap, {
 			}
 		}
 	},
-	
+
 	findCenter:function(bounds){
 		var clat=(bounds.getNorthEast().lat()+bounds.getSouthWest().lat())/2;
 		var clng=(bounds.getNorthEast().lng()+bounds.getSouthWest().lng())/2;
@@ -133,7 +133,7 @@ dojo.lang.extend(dojo.widget.html.GoogleMap, {
 			if(c=="long") c="lng";
 			a.push(c);
 		}
-		
+
 		//	parse the data
 		var b=table.getElementsByTagName("tbody")[0];
 		if(!b){
@@ -148,7 +148,7 @@ dojo.lang.extend(dojo.widget.html.GoogleMap, {
 			for(var j=0; j<a.length; j++){
 				var col=a[j];
 				if(col=="lat"||col=="lng"){
-					o[col]=parseFloat(cells[j].innerHTML);					
+					o[col]=parseFloat(cells[j].innerHTML);
 				}else{
 					o[col]=cells[j].innerHTML;
 				}
@@ -173,7 +173,7 @@ dojo.lang.extend(dojo.widget.html.GoogleMap, {
 			this.map.addOverlay(m);
 		}
 	},
-	
+
 
 	initialize:function(args, frag){
 		if(!GMap2){
diff --git a/webapp/src/main/webapp/src/widget/html/Menu.js b/webapp/src/main/webapp/src/widget/html/Menu.js
index b348e4583..bb9d94fdd 100644
--- a/webapp/src/main/webapp/src/widget/html/Menu.js
+++ b/webapp/src/main/webapp/src/widget/html/Menu.js
@@ -13,7 +13,7 @@ dojo.provide("dojo.widget.html.Menu");
 
 /* HtmlMenu
  ***********/
- 
+
 dojo.widget.html.Menu = function(){
 	dojo.widget.html.Menu.superclass.constructor.call(this);
 	this.items = [];
@@ -30,13 +30,13 @@ dojo.lang.extend(dojo.widget.html.Menu, {
 
 	templateString: '<ul></ul>',
 	templateCssPath: dojo.uri.dojoUri("src/widget/templates/Menu.css"),
-	
+
 	fillInTemplate: function (args, frag){
 		//dojo.widget.HtmlMenu.superclass.fillInTemplate.apply(this, arguments);
 		this.domNode.className = "dojoMenu";
 	},
-	
- 
+
+
 	_register: function (item ) {
 		dojo.event.connect(item, "onSelect", this, "onSelect");
 		this.items.push(item);
diff --git a/webapp/src/main/webapp/src/widget/html/MenuItem.js b/webapp/src/main/webapp/src/widget/html/MenuItem.js
index 3cbaec6d9..f233099e6 100644
--- a/webapp/src/main/webapp/src/widget/html/MenuItem.js
+++ b/webapp/src/main/webapp/src/widget/html/MenuItem.js
@@ -32,19 +32,19 @@ dojo.lang.extend(dojo.widget.html.MenuItem, {
 			this.domNode.appendChild(frag["dojo:"+this.widgetType.toLowerCase()]["nodeRef"]);
 		}
 	},
-	
+
 	onMouseOver: function(e){
 		dojo.html.addClass(this.domNode, "dojoMenuItemHover");
 	},
-	
+
 	onMouseOut: function(e){
 		dojo.html.removeClass(this.domNode, "dojoMenuItemHover");
 	},
-	
+
 	onClick: function(e){ this.onSelect(this, e); },
 	onMouseDown: function(e){},
 	onMouseUp: function(e){},
-	
+
 	// By default, when I am clicked, click the item inside of me
 	onSelect: function (item, e) {
 		var child = dojo.dom.getFirstChildElement(this.domNode);
diff --git a/webapp/src/main/webapp/src/widget/html/MonthlyCalendar.js b/webapp/src/main/webapp/src/widget/html/MonthlyCalendar.js
index 08c577bdc..99b35ae2f 100644
--- a/webapp/src/main/webapp/src/widget/html/MonthlyCalendar.js
+++ b/webapp/src/main/webapp/src/widget/html/MonthlyCalendar.js
@@ -42,13 +42,13 @@ dojo.lang.extend(dojo.widget.html.MonthlyCalendar, {
 
 	createDayContents: function(node,mydate) {
 		dojo.dom.removeChildren(node);
-		node.appendChild(document.createTextNode(mydate.getDate()));	
+		node.appendChild(document.createTextNode(mydate.getDate()));
 			for(var x=0; x<this.iCalendars.length; x++) {
 				var evts = this.iCalendars[x].getEvents(mydate);
 				if ((dojo.lang.isArray(evts)) && (evts.length>0)) {
 				for(var y=0;y<evts.length;y++) {
 					var el = document.createElement("div");
-					dojo.html.addClass(el, "dojoMonthlyCalendarEvent");          
+					dojo.html.addClass(el, "dojoMonthlyCalendarEvent");
 					el.appendChild(document.createTextNode(evts[y].summary.value));
 					el.width = dojo.style.getContentWidth(node);
 					node.appendChild(el);
@@ -64,12 +64,12 @@ dojo.lang.extend(dojo.widget.html.MonthlyCalendar, {
 		var previousDate = new Date();
 		var calendarNodes = this.calendarDatesContainerNode.getElementsByTagName("td");
 		var currentCalendarNode;
-		// set hours of date such that there is no chance of rounding error due to 
+		// set hours of date such that there is no chance of rounding error due to
 		// time change in local time zones
 		previousDate.setHours(8);
 		var nextDate = new Date(this.firstSaturday.year, this.firstSaturday.month, this.firstSaturday.date, 8);
 		var lastDay = new Date(this.firstSaturday.year, this.firstSaturday.month, this.firstSaturday.date + 42, 8);
-		
+
 		if (this.iCalendars.length > 0) {
 			for (var x=0; x<this.iCalendars.length;x++) {
 				this.iCalendars[x].preComputeRecurringEvents(lastDay);
@@ -82,7 +82,7 @@ dojo.lang.extend(dojo.widget.html.MonthlyCalendar, {
 			for (var i=this.firstSaturday.date; i>0; i--) {
 				currentCalendarNode = calendarNodes.item(dayInWeek);
 				this.createDayContents(currentCalendarNode, nextDate);
-				
+
 				dojo.html.setClass(currentCalendarNode, this.getDateClassName(nextDate, "current"));
 				dayInWeek--;
 				previousDate = nextDate;
@@ -95,7 +95,7 @@ dojo.lang.extend(dojo.widget.html.MonthlyCalendar, {
 
 				dojo.html.setClass(currentCalendarNode, this.getDateClassName(nextDate, "previous"));
 				previousDate = nextDate;
-				nextDate = this.incrementDate(nextDate, false);				
+				nextDate = this.incrementDate(nextDate, false);
 			}
 		} else {
 			nextDate.setDate(1);
@@ -104,7 +104,7 @@ dojo.lang.extend(dojo.widget.html.MonthlyCalendar, {
 				this.createDayContents(currentCalendarNode, nextDate);
 				dojo.html.setClass(currentCalendarNode, this.getDateClassName(nextDate, "current"));
 				previousDate = nextDate;
-				nextDate = this.incrementDate(nextDate, true);				
+				nextDate = this.incrementDate(nextDate, true);
 			}
 		}
 		previousDate.setDate(this.firstSaturday.date);
@@ -120,7 +120,7 @@ dojo.lang.extend(dojo.widget.html.MonthlyCalendar, {
 			previousDate = nextDate;
 			nextDate = this.incrementDate(nextDate, true);
 		}
-		
+
 		while(count < 42) {
 			this.createDayContents(currentCalendarNode, nextDate);
 			dojo.html.setClass(currentCalendarNode, this.getDateClassName(nextDate, "next"));
@@ -130,5 +130,5 @@ dojo.lang.extend(dojo.widget.html.MonthlyCalendar, {
 		}
 		this.setMonthLabel(this.firstSaturday.month);
 		this.setYearLabels(this.firstSaturday.year);
-	}	
+	}
 });
diff --git a/webapp/src/main/webapp/src/widget/html/Show.js b/webapp/src/main/webapp/src/widget/html/Show.js
index aff89303a..c0bb76e40 100644
--- a/webapp/src/main/webapp/src/widget/html/Show.js
+++ b/webapp/src/main/webapp/src/widget/html/Show.js
@@ -51,13 +51,13 @@ dojo.lang.extend(dojo.widget.html.Show, {
 		}
 		this.sourceNode.className = "dojoShowPrint";
 		this.sourceNode.style.display = "none";
-		
+
 		dojo.event.connect(document, "onclick", this, "gotoSlideByEvent");
 		dojo.event.connect(document, "onkeypress", this, "gotoSlideByEvent");
 		dojo.event.connect(window, "onresize", this, "resizeWindow");
 		dojo.event.connect(this.nav, "onmousemove", this, "popUpNav");
 	},
-	postCreate: function(){		
+	postCreate: function(){
 		this._slides = [];
 		for(var i = 0, child; child = this.children[i]; i++){
 			if(child.widgetType == "ShowSlide"){
@@ -86,15 +86,15 @@ dojo.lang.extend(dojo.widget.html.Show, {
 				}
 			}
 		}
-		
+
 		if(!this._slides[slide]){
 			return;
 		}
-		
+
 		if(this._slide != -1){
 			while(this._slides[this._slide].previousAction()){}
 		}
-		
+
 		this._slide = slide;
 		this.select.selectedIndex = slide;
 		while(this.contentNode.hasChildNodes()){ this.contentNode.removeChild(this.contentNode.firstChild); }
@@ -174,4 +174,4 @@ dojo.lang.extend(dojo.widget.html.Show, {
 			dojo.html.getViewportHeight());
 		document.body.style.height = h + "px";
 	}
-});
\ No newline at end of file
+});
diff --git a/webapp/src/main/webapp/src/widget/html/ShowAction.js b/webapp/src/main/webapp/src/widget/html/ShowAction.js
index ddfbe9800..c310e3c80 100644
--- a/webapp/src/main/webapp/src/widget/html/ShowAction.js
+++ b/webapp/src/main/webapp/src/widget/html/ShowAction.js
@@ -25,4 +25,4 @@ dojo.widget.defineWidget(
 );
 dojo.lang.extend(dojo.widget.html.ShowAction, dojo.widget.ShowAction.prototype);
 dojo.lang.extend(dojo.widget.html.ShowAction, {
-});
\ No newline at end of file
+});
diff --git a/webapp/src/main/webapp/src/widget/html/ShowSlide.js b/webapp/src/main/webapp/src/widget/html/ShowSlide.js
index 9f5ee6f32..1bb55f27e 100644
--- a/webapp/src/main/webapp/src/widget/html/ShowSlide.js
+++ b/webapp/src/main/webapp/src/widget/html/ShowSlide.js
@@ -88,7 +88,7 @@ dojo.lang.extend(dojo.widget.html.ShowSlide, {
 
 			if(exits){
 				return true;
-			}	
+			}
 
 			if(action.auto == "true"){
 				on = this._actions[this._action].on;
@@ -121,7 +121,7 @@ dojo.lang.extend(dojo.widget.html.ShowSlide, {
 		if(!action){
 			return false;
 		}
-		
+
 		var components = this._components[action.on];
 		for(var i = 0, component; component = components[i]; i++){
 			if(action.action){
@@ -155,7 +155,7 @@ dojo.lang.extend(dojo.widget.html.ShowSlide, {
 				component.style.visibility = "visible";
 			}
 		}
-		
+
 		action = this._actions[this._action + 1];
 		if(action && action.auto == "true"){
 			this.nextAction();
diff --git a/webapp/src/main/webapp/src/widget/html/Slider.js b/webapp/src/main/webapp/src/widget/html/Slider.js
index a31afb8e0..db6b229ae 100644
--- a/webapp/src/main/webapp/src/widget/html/Slider.js
+++ b/webapp/src/main/webapp/src/widget/html/Slider.js
@@ -10,7 +10,7 @@
 
 /**
  * Slider Widget.
- * 
+ *
  * The slider widget comes in three forms:
  *  1. Base Slider widget which supports movement in x and y dimensions
  *  2. Vertical Slider (SliderVertical) widget which supports movement
@@ -22,10 +22,10 @@
  *  - a container div which displays a bar in the background (Slider object)
  *  - a handle inside the container div, which represents the value
  *    (sliderHandle DOM node)
- *  - the object which moves the handle (handleMove is of type 
+ *  - the object which moves the handle (handleMove is of type
  *    SliderDragMoveSource)
  *
- * The values for the slider are calculated by grouping pixels together, 
+ * The values for the slider are calculated by grouping pixels together,
  * based on the number of values to be represented by the slider.
  * The number of pixels in a group is called the valueSize
  *  e.g. if slider is 150 pixels long, and is representing the values
@@ -47,12 +47,12 @@
  *    are required to set the valueSize is not set before fillInTemplate
  *    is called.
  *  - Issues with dragging handle when page has been scrolled
- *  - 
+ *  -
  *
  * References (aka sources of inspiration):
  *  - http://dojotoolkit.org/docs/fast_widget_authoring.html
  *  - http://dojotoolkit.org/docs/dojo_event_system.html
- * 
+ *
  * @author Marcel Linnenfelser (m.linnen@synflag.de)
  * @author Mathew Pole (mathew.pole@ebor.com)
  *
@@ -123,7 +123,7 @@ dojo.widget.defineWidget (
 
 
 		// This function is called when the template is loaded
-		fillInTemplate: function () 
+		fillInTemplate: function ()
 		{
 			// dojo.debug ("fillInTemplate - className = " + this.domNode.className);
 
@@ -136,10 +136,10 @@ dojo.widget.defineWidget (
 
 			// keep the slider handle inside it's parent container
 			this.handleMove.constrainToContainer = true;
-		
+
 			if (this.clickSelect) {
 				dojo.event.connect (this.domNode, "onclick", this, "setPosition");
-			} 
+			}
 
 			if (this.isEnableX && this.initialValueX > 0) {
 				alert("setting x to " + this.initialValueX);
@@ -211,7 +211,7 @@ dojo.widget.defineWidget (
 
 			var offset = dojo.html.getScrollOffset();
 			var parent = dojo.style.getAbsolutePosition(this.domNode, true);
-			
+
 			if (this.isEnableX) {
 				var x = offset.x + e.clientX - parent.x;
 				if (x > this.domNode.offsetWidth) {
@@ -243,11 +243,11 @@ dojo.widget.defineWidget (
 		onDragMove: function(){
 			this.onValueChanged(this.getValueX(), this.getValueY());
 		},
-	
+
 		onClick: function(){
 			this.onValueChanged(this.getValueX(), this.getValueY());
 		},
-		
+
 		onValueChanged: function(x, y){
 		}
 	}
@@ -291,17 +291,17 @@ dojo.widget.defineWidget (
 				this.onValueChanged(this.getValue());
 			}
 		},
-	
+
 		onDragEnd: function(){
 			if(!this.activeDrag){
 				this.onValueChanged(this.getValue());
 			}
 		},
-	
+
 		onClick: function(){
 			this.onValueChanged(this.getValue());
 		},
-		
+
 		onValueChanged: function(value){
 			this.value=value;
 		}
@@ -345,17 +345,17 @@ dojo.widget.defineWidget (
 				this.onValueChanged(this.getValue());
 			}
 		},
-	
+
 		onDragEnd: function(){
 			if(!this.activeDrag){
 				this.onValueChanged(this.getValue());
 			}
 		},
-	
+
 		onClick: function(){
 			this.onValueChanged(this.getValue());
 		},
-		
+
 		onValueChanged: function(value){
 			this.value=value;
 		}
@@ -405,8 +405,8 @@ dojo.declare (
 		dragObj.slider = this.slider;
 
 		// this code copied from dojo.dnd.HtmlDragSource#onDragStart
-		if (this.dragClass) { 
-			dragObj.dragClass = this.dragClass; 
+		if (this.dragClass) {
+			dragObj.dragClass = this.dragClass;
 		}
 		if (this.constrainToContainer) {
 			dragObj.constrainTo(this.constrainingContainer || this.domNode.parentNode);
@@ -419,20 +419,20 @@ dojo.declare (
 		this.slider = slider;
 	},
 
-	
+
 	calcValueSizeX: function () {
 		var dragObj = this.createDragMoveObject ();
-		dragObj.containingBlockPosition = dragObj.domNode.offsetParent ? 
+		dragObj.containingBlockPosition = dragObj.domNode.offsetParent ?
 		dojo.style.getAbsolutePosition(dragObj.domNode.offsetParent) : {x:0, y:0};
-		
+
 		var constraints = dragObj.getConstraints ();
 		return (constraints.maxX - constraints.minX) / this.slider.valuesX;
 	},
 
-	
+
 	calcValueSizeY: function () {
 		var dragObj = this.createDragMoveObject ();
-		dragObj.containingBlockPosition = dragObj.domNode.offsetParent ? 
+		dragObj.containingBlockPosition = dragObj.domNode.offsetParent ?
 		dojo.style.getAbsolutePosition(dragObj.domNode.offsetParent) : {x:0, y:0};
 		var constraints = dragObj.getConstraints ();
 		return (constraints.maxY - constraints.minY) / this.slider.valuesY;
@@ -482,7 +482,7 @@ dojo.declare (
 			if (x > 0) {
 				selectedValue = Math.round (x / this.slider.valueSizeX);
 			}
-			// dojo.debug ("x = " + x + ", valueSize = " + valueSize 
+			// dojo.debug ("x = " + x + ", valueSize = " + valueSize
 			//             + ", selectedValue = " + selectedValue);
 			x = (selectedValue * this.slider.valueSizeX);
 		}
diff --git a/webapp/src/main/webapp/src/widget/html/SortableTable.js b/webapp/src/main/webapp/src/widget/html/SortableTable.js
index de1b98c4d..c7f36b88e 100644
--- a/webapp/src/main/webapp/src/widget/html/SortableTable.js
+++ b/webapp/src/main/webapp/src/widget/html/SortableTable.js
@@ -41,8 +41,8 @@ dojo.lang.extend(dojo.widget.html.SortableTable, {
 	getTypeFromString:function(/* string */ s){
 		//	summary
 		//	Find the constructor that matches param s by searching through the entire object tree.
-		var parts=s.split("."),i=0,obj=dj_global; 
-		do{obj=obj[parts[i++]];}while(i<parts.length&&obj); 
+		var parts=s.split("."),i=0,obj=dj_global;
+		do{obj=obj[parts[i++]];}while(i<parts.length&&obj);
 		return(obj!=dj_global)?obj:null;	//	function
 	},
 	compare:function(/* object */ o1, /* object */ o2){
@@ -191,7 +191,7 @@ dojo.lang.extend(dojo.widget.html.SortableTable, {
 			if(dojo.html.hasAttribute(cells[i], "sortusing")){
 				var trans=dojo.html.getAttribute(cells[i],"sortusing");
 				var f=this.getTypeFromString(trans);
-				if (f!=null && f!=window && typeof(f)=="function") 
+				if (f!=null && f!=window && typeof(f)=="function")
 					o.sortFunction=f;
 			}
 
@@ -259,7 +259,7 @@ dojo.lang.extend(dojo.widget.html.SortableTable, {
 			}
 			this.data.push(o);
 		}
-	}, 
+	},
 
 	parseDataFromTable:function(/* HTMLTableBodyElement */ tbody){
 		//	summary
@@ -291,14 +291,14 @@ dojo.lang.extend(dojo.widget.html.SortableTable, {
 			}
 			//	FIXME: add code to preserve row attributes in __metadata__ field?
 			this.data.push(o);
-			
+
 			//	add it to the selections if selected="true" is present.
 			if(dojo.html.getAttribute(rows[i],"selected")=="true"){
 				this.selected.push(o);
 			}
 		}
 	},
-	
+
 	showSelections:function(){
 		var body=this.domNode.getElementsByTagName("tbody")[0];
 		var rows=body.getElementsByTagName("tr");
@@ -333,7 +333,7 @@ dojo.lang.extend(dojo.widget.html.SortableTable, {
 		for(var i=0; i<this.data.length; i++){
 			data.push(this.data[i]);
 		}
-		
+
 		var col=this.columns[this.sortIndex];
 		if(!col.noSort){
 			var field=col.getField();
@@ -396,7 +396,7 @@ dojo.lang.extend(dojo.widget.html.SortableTable, {
 			body.appendChild(row);
 			dojo.event.connect(row, "onclick", this, "onUISelect");
 		}
-		
+
 		//	if minRows exist.
 		var minRows=parseInt(this.minRows);
 		if (!isNaN(minRows) && minRows>0 && data.length<minRows){
@@ -420,7 +420,7 @@ dojo.lang.extend(dojo.widget.html.SortableTable, {
 	},
 
 	//	the following the user can override.
-	onSelect:function(/* DomEvent */ e){ 
+	onSelect:function(/* DomEvent */ e){
 		//	summary
 		//	empty function for the user to attach code to, fired by onUISelect
 	},
@@ -440,11 +440,11 @@ dojo.lang.extend(dojo.widget.html.SortableTable, {
 					row.setAttribute("selected","true");
 				}
 			}else if(e.shiftKey){
-				//	the tricky one.  We need to figure out the *last* selected row above, 
+				//	the tricky one.  We need to figure out the *last* selected row above,
 				//	and select all the rows in between.
 				var startRow;
 				var rows=body.getElementsByTagName("tr");
-				//	if there's a selection above, we go with that first. 
+				//	if there's a selection above, we go with that first.
 				for(var i=0;i<rows.length;i++){
 					if(rows[i].parentNode==body){
 						if(rows[i]==row) break;
@@ -515,7 +515,7 @@ dojo.lang.extend(dojo.widget.html.SortableTable, {
 
 		var headers=row.getElementsByTagName(cellTag);
 		var header=dojo.html.getParentByType(source,cellTag);
-		
+
 		for(var i=0; i<headers.length; i++){
 			if(headers[i]==header){
 				if(i!=oldIndex){
@@ -539,7 +539,7 @@ dojo.lang.extend(dojo.widget.html.SortableTable, {
 		this.render();
 	},
 
-	postCreate:function(){ 
+	postCreate:function(){
 		// 	summary
 		//	overridden from HtmlWidget, initializes and renders the widget.
 		var thead=this.domNode.getElementsByTagName("thead")[0];
diff --git a/webapp/src/main/webapp/src/widget/html/Spinner.js b/webapp/src/main/webapp/src/widget/html/Spinner.js
index 42f01a8a4..eceb95eb9 100644
--- a/webapp/src/main/webapp/src/widget/html/Spinner.js
+++ b/webapp/src/main/webapp/src/widget/html/Spinner.js
@@ -313,7 +313,7 @@ dojo.lang.extend(dojo.widget.html.Spinner, {
 		}
 
 		if(typeof this.inputWidget != 'object'){
-			dojo.lang.setTimeout(this, "postCreate", 100); 
+			dojo.lang.setTimeout(this, "postCreate", 100);
 			return;
 		}
 		var widgetNode = this.inputWidget.domNode;
diff --git a/webapp/src/main/webapp/src/widget/html/TaskBar.js b/webapp/src/main/webapp/src/widget/html/TaskBar.js
index 777a105e7..f8c6a1def 100644
--- a/webapp/src/main/webapp/src/widget/html/TaskBar.js
+++ b/webapp/src/main/webapp/src/widget/html/TaskBar.js
@@ -68,7 +68,7 @@ dojo.lang.extend(dojo.widget.html.TaskBar, {
 	titleBarDisplay: "none",
 
 	addChild: function(child) {
-		if(!this.containerNode){ 
+		if(!this.containerNode){
 			this._addChildStack.push(child);
 		}else if(this._addChildStack.length > 0){
 			var oarr = this._addChildStack;
@@ -76,8 +76,8 @@ dojo.lang.extend(dojo.widget.html.TaskBar, {
 			dojo.lang.forEach(oarr, this.addChild, this);
 		}
 		var tbi = dojo.widget.createWidget("TaskBarItem",
-			{	windowId: child.widgetId, 
-				caption: child.title, 
+			{	windowId: child.widgetId,
+				caption: child.title,
 				iconSrc: child.iconSrc
 			});
 		dojo.widget.html.TaskBar.superclass.addChild.call(this,tbi);
diff --git a/webapp/src/main/webapp/src/widget/html/TimePicker.js b/webapp/src/main/webapp/src/widget/html/TimePicker.js
index 59ac23fbd..5b2e7a1c6 100644
--- a/webapp/src/main/webapp/src/widget/html/TimePicker.js
+++ b/webapp/src/main/webapp/src/widget/html/TimePicker.js
@@ -59,9 +59,9 @@ dojo.widget.html.TimePicker = function(){
 
 	this.initData = function() {
 		// FIXME: doesn't currently validate the time before trying to set it
-		// Determine the date/time from stored info, or by default don't 
+		// Determine the date/time from stored info, or by default don't
 		//  have a set time
-		// FIXME: should normalize against whitespace on storedTime... for now 
+		// FIXME: should normalize against whitespace on storedTime... for now
 		// just a lame hack
 		if(this.storedTime.indexOf("T")!=-1 && this.storedTime.split("T")[1] && this.storedTime!=" " && this.storedTime.split("T")[1]!="any") {
 			this.time = dojo.widget.TimePicker.util.fromRfcDateTime(this.storedTime, this.useDefaultMinutes, this.selectedTime.anyTime);
@@ -92,7 +92,7 @@ dojo.widget.html.TimePicker = function(){
 	this.setDateTime = function(rfcDate) {
 		this.storedTime = rfcDate;
 	}
-	
+
 	this.onClearSelectedHour = function(evt) {
 		this.clearSelectedHour();
 	}
diff --git a/webapp/src/main/webapp/src/widget/html/TitlePane.js b/webapp/src/main/webapp/src/widget/html/TitlePane.js
index 2137eb4f2..a24d5e41a 100644
--- a/webapp/src/main/webapp/src/widget/html/TitlePane.js
+++ b/webapp/src/main/webapp/src/widget/html/TitlePane.js
@@ -37,11 +37,11 @@ dojo.lang.extend(dojo.widget.html.TitlePane, {
 
 		if (this.labelNodeClass) {
 			dojo.html.addClass(this.labelNode, this.labelNodeClass);
-		}	
+		}
 
 		if (this.containerNodeClass) {
 			dojo.html.addClass(this.containerNode, this.containerNodeClass);
-		}	
+		}
 
 		if (!this.open) {
 			dojo.lfx.wipeOut(this.containerNode,0).play();
diff --git a/webapp/src/main/webapp/src/widget/html/Tooltip.js b/webapp/src/main/webapp/src/widget/html/Tooltip.js
index a875543c5..bed9de0a1 100644
--- a/webapp/src/main/webapp/src/widget/html/Tooltip.js
+++ b/webapp/src/main/webapp/src/widget/html/Tooltip.js
@@ -23,54 +23,54 @@ dojo.widget.defineWidget(
 	{
 		widgetType: "Tooltip",
 		isContainer: true,
-	
+
 		// Constructor arguments
 		caption: "",
 		showDelay: 500,
 		hideDelay: 100,
 		connectId: "",
-	
+
 		templatePath: dojo.uri.dojoUri("src/widget/templates/HtmlTooltipTemplate.html"),
 		templateCssPath: dojo.uri.dojoUri("src/widget/templates/HtmlTooltipTemplate.css"),
-	
+
 		connectNode: null,
-	
+
 		// Tooltip has the following possible states:
 		//   erased - nothing on screen
 		//   displaying - currently being faded in (partially displayed)
 		//   displayed - fully displayed
 		//   erasing - currently being faded out (partially erased)
 		state: "erased",
-	
+
 		fillInTemplate: function(args, frag){
 			if(this.caption != ""){
 				this.domNode.appendChild(document.createTextNode(this.caption));
 			}
-			this.connectNode = dojo.byId(this.connectId);		
+			this.connectNode = dojo.byId(this.connectId);
 			dojo.widget.html.Tooltip.superclass.fillInTemplate.call(this, args, frag);
 		},
-		
+
 		postCreate: function(args, frag){
 			// The domnode was appended to my parent widget's domnode, but the positioning
 			// only works if the domnode is a child of document.body
 			document.body.appendChild(this.domNode);
-	
+
 			dojo.event.connect(this.connectNode, "onmouseover", this, "onMouseOver");
 			dojo.widget.html.Tooltip.superclass.postCreate.call(this, args, frag);
 		},
-		
+
 		onMouseOver: function(e) {
 			this.mouse = {x: e.pageX, y: e.pageY};
-	
+
 			if(!this.showTimer){
 				this.showTimer = setTimeout(dojo.lang.hitch(this, "show"), this.showDelay);
 				dojo.event.connect(document.documentElement, "onmousemove", this, "onMouseMove");
 			}
 		},
-	
+
 		onMouseMove: function(e) {
 			this.mouse = {x: e.pageX, y: e.pageY};
-	
+
 			if(dojo.html.overElement(this.connectNode, e) || dojo.html.overElement(this.domNode, e)) {
 				// If the tooltip has been scheduled to be erased, cancel that timer
 				// since we are hovering over element/tooltip again
@@ -91,7 +91,7 @@ dojo.widget.defineWidget(
 				}
 			}
 		},
-	
+
 		show: function() {
 			if(this.state=="erasing"){
 				// we are in the process of erasing; when that is finished, display it.
@@ -99,28 +99,28 @@ dojo.widget.defineWidget(
 				return;
 			}
 			if ( this.state=="displaying" || this.state=="displayed" ) { return; }
-	
+
 			// prevent IE bleed through (iframe creation is deferred until first show()
 			// call because apparently it takes a long time)
 			if(!this.bgIframe){
 				this.bgIframe = new dojo.html.BackgroundIframe(this.domNode);
 			}
-	
+
 			this.position();
-	
+
 			// if rendering using explosion effect, need to set explosion source
 			this.explodeSrc = [this.mouse.x, this.mouse.y];
-	
+
 			this.state="displaying";
-	
+
 			dojo.widget.html.Tooltip.superclass.show.call(this);
 		},
-	
+
 		onShow: function() {
 			dojo.widget.html.Tooltip.superclass.onShow.call(this);
-			
+
 			this.state="displayed";
-			
+
 			// in the corner case where the user has moved his mouse away
 			// while the tip was fading in
 			if(this.eraseScheduled){
@@ -128,7 +128,7 @@ dojo.widget.defineWidget(
 				this.eraseScheduled=false;
 			}
 		},
-	
+
 		hide: function() {
 			if(this.state=="displaying"){
 				// in the process of fading in.  wait until that is finished and then fade out
@@ -149,10 +149,10 @@ dojo.widget.defineWidget(
 				dojo.widget.html.Tooltip.superclass.hide.call(this);
 			}
 		},
-	
+
 		onHide: function(){
 			this.state="erased";
-	
+
 			// in the corner case where the user has moved his mouse back
 			// while the tip was fading out
 			if(this.displayScheduled){
@@ -160,12 +160,12 @@ dojo.widget.defineWidget(
 				this.displayScheduled=false;
 			}
 		},
-	
+
 		position: function(){
 			dojo.html.placeOnScreenPoint(this.domNode, this.mouse.x, this.mouse.y, [10,15], true);
 			this.bgIframe.onResized();
 		},
-	
+
 		onLoad: function(){
 			if(this.isShowing()){
 				// the tooltip has changed size due to downloaded contents, so reposition it
@@ -173,7 +173,7 @@ dojo.widget.defineWidget(
 				dojo.widget.html.Tooltip.superclass.onLoad.apply(this, arguments);
 			}
 		},
-	
+
 		checkSize: function() {
 			// checkSize() is called when the user has resized the browser window,
 			// but that doesn't affect this widget (or this widget's children)
diff --git a/webapp/src/main/webapp/src/widget/html/YahooMap.js b/webapp/src/main/webapp/src/widget/html/YahooMap.js
index 3fc996c4a..e0289ea5c 100644
--- a/webapp/src/main/webapp/src/widget/html/YahooMap.js
+++ b/webapp/src/main/webapp/src/widget/html/YahooMap.js
@@ -88,7 +88,7 @@ dojo.lang.extend(dojo.widget.html.YahooMap, {
 			}
 		}
 	},
-	
+
 	parse:function(table){
 		this.data=[];
 
@@ -108,7 +108,7 @@ dojo.lang.extend(dojo.widget.html.YahooMap, {
 			if(c=="long") c="lng";
 			a.push(c);
 		}
-		
+
 		//	parse the data
 		var b=table.getElementsByTagName("tbody")[0];
 		if(!b){
@@ -123,7 +123,7 @@ dojo.lang.extend(dojo.widget.html.YahooMap, {
 			for(var j=0; j<a.length; j++){
 				var col=a[j];
 				if(col=="lat"||col=="lng"){
-					o[col]=parseFloat(cells[j].innerHTML);					
+					o[col]=parseFloat(cells[j].innerHTML);
 				}else{
 					o[col]=cells[j].innerHTML;
 				}
@@ -151,7 +151,7 @@ dojo.lang.extend(dojo.widget.html.YahooMap, {
 		var z=this.map.getZoomLevel(pts);
 		this.map.drawZoomAndCenter(c,z);
 	},
-	
+
 	initialize:function(args, frag){
 		if(!YMap || !YGeoPoint){
 			dojo.raise("dojo.widget.YahooMap: The Yahoo Map script must be included in order to use this widget.");
diff --git a/webapp/src/main/webapp/src/widget/html/stabile.js b/webapp/src/main/webapp/src/widget/html/stabile.js
index 7ae466687..b3578c9aa 100644
--- a/webapp/src/main/webapp/src/widget/html/stabile.js
+++ b/webapp/src/main/webapp/src/widget/html/stabile.js
@@ -36,7 +36,7 @@ dojo.widget.html.stabile = {
 
 // Get the state stored for the widget with the given ID, or undefined
 // if none.
-// 
+//
 dojo.widget.html.stabile.getState = function(id){
 	dojo.widget.html.stabile.setup();
 	return dojo.widget.html.stabile.widgetState[id];
@@ -45,7 +45,7 @@ dojo.widget.html.stabile.getState = function(id){
 
 // Set the state stored for the widget with the given ID.  If isCommit
 // is true, commits all widget state to more stable storage.
-// 
+//
 dojo.widget.html.stabile.setState = function(id, state, isCommit){
 	dojo.widget.html.stabile.setup();
 	dojo.widget.html.stabile.widgetState[id] = state;
@@ -58,7 +58,7 @@ dojo.widget.html.stabile.setState = function(id, state, isCommit){
 // Sets up widgetState: a hash keyed by widgetId, maps to an object
 // or array writable with "describe".  If there is data in the widget
 // storage area, use it, otherwise initialize an empty object.
-// 
+//
 dojo.widget.html.stabile.setup = function(){
 	if(!dojo.widget.html.stabile.widgetState){
 		var text = dojo.widget.html.stabile.getStorage().value;
@@ -69,7 +69,7 @@ dojo.widget.html.stabile.setup = function(){
 
 // Commits all widget state to more stable storage, so if the user
 // navigates away and returns, it can be restored.
-// 
+//
 dojo.widget.html.stabile.commit = function(state){
 	dojo.widget.html.stabile.getStorage().value = dojo.widget.html.stabile.description(state);
 }
@@ -86,8 +86,8 @@ dojo.widget.html.stabile.description = function(v, showAll){
 
 	var describeThis = function() {
 		 return this.description(this, true);
-	} 
-	
+	}
+
 	try {
 
 		if(v===void(0)){
@@ -104,7 +104,7 @@ dojo.widget.html.stabile.description = function(v, showAll){
 		if(typeof(v)=="string" || v instanceof String){
 			// Quote strings and their contents as required.
 			// Replacing by $& fails in IE 5.0
-			var v1 = v.replace(dojo.widget.html.stabile._sqQuotables, "\\$1"); 
+			var v1 = v.replace(dojo.widget.html.stabile._sqQuotables, "\\$1");
 			v1 = v1.replace(/\n/g, "\\n");
 			v1 = v1.replace(/\r/g, "\\r");
 			// Any other important special cases?
@@ -202,7 +202,7 @@ dojo.widget.html.stabile.description = function(v, showAll){
 //// PRIVATE TO MODULE
 
 // Gets an object (form field) with a read/write "value" property.
-// 
+//
 dojo.widget.html.stabile.getStorage = function(){
 	if (dojo.widget.html.stabile.dataField) {
 		return dojo.widget.html.stabile.dataField;
diff --git a/webapp/src/main/webapp/src/widget/svg/Chart.js b/webapp/src/main/webapp/src/widget/svg/Chart.js
index a73535972..35ec10422 100644
--- a/webapp/src/main/webapp/src/widget/svg/Chart.js
+++ b/webapp/src/main/webapp/src/widget/svg/Chart.js
@@ -72,7 +72,7 @@ dojo.lang.extend(dojo.widget.svg.Chart, {
 			}
 		}
 	},
-	
+
 	fillInTemplate:function(args,frag){
 		this.initialize();
 		this.render();
@@ -81,21 +81,21 @@ dojo.lang.extend(dojo.widget.svg.Chart, {
 	},
 	initialize:function(){
 		this.parseData();
-	
+
 		//	begin by grabbing the table, and reading it in.
 		var table=this.domNode.getElementsByTagName("table")[0];
 		if (!table) return;
-		
+
 		var bRangeX=false;
 		var bRangeY=false;
-		
+
 		//	properties off the table
 		if (table.getAttribute("width")) this.properties.width=table.getAttribute("width");
 		if (table.getAttribute("height")) this.properties.height=table.getAttribute("height");
 		if (table.getAttribute("plotType")) this.properties.plotType=table.getAttribute("plotType");
 		if (table.getAttribute("padding")){
 			if (table.getAttribute("padding").indexOf(",") > -1)
-				var p=table.getAttribute("padding").split(","); 
+				var p=table.getAttribute("padding").split(",");
 			else var p=table.getAttribute("padding").split(" ");
 			if (p.length==1){
 				var pad=parseFloat(p[0]);
@@ -140,7 +140,7 @@ dojo.lang.extend(dojo.widget.svg.Chart, {
 
 		//	set up the series.
 		var columns=thead.getElementsByTagName("tr")[0].getElementsByTagName("th");	//	should be <tr><..>
-		
+
 		//	assume column 0 == X
 		for (var i=1; i<columns.length; i++){
 			var key="column"+i;
@@ -207,7 +207,7 @@ dojo.lang.extend(dojo.widget.svg.Chart, {
 			var p=table.getAttribute("axisAt");
 			if (p.indexOf(",")>-1) p=p.split(",");
 			else p=p.split(" ");
-			
+
 			//	x axis
 			if (!isNaN(parseFloat(p[0]))){
 				this.properties.axes.x.plotAt=parseFloat(p[0]);
@@ -238,7 +238,7 @@ dojo.lang.extend(dojo.widget.svg.Chart, {
 //		this.properties.height=dojo.html.getInnerHeight(this.domNode);
 
 		// ok, lets create the chart itself.
-		dojo.svg.g.suspend();		
+		dojo.svg.g.suspend();
 		if(this.vectorNode) this.destroy();
 		this.vectorNode=document.createElementNS(dojo.svg.xmlns.svg, "svg");
 		this.vectorNode.setAttribute("width", this.properties.width);
@@ -248,7 +248,7 @@ dojo.lang.extend(dojo.widget.svg.Chart, {
 		var defs = document.createElementNS(dojo.svg.xmlns.svg, "defs");
 		var clip = document.createElementNS(dojo.svg.xmlns.svg, "clipPath");
 		clip.setAttribute("id","plotClip"+this.widgetId);
-		var rect = document.createElementNS(dojo.svg.xmlns.svg, "rect");		
+		var rect = document.createElementNS(dojo.svg.xmlns.svg, "rect");
 		rect.setAttribute("x", this.properties.padding.left);
 		rect.setAttribute("y", this.properties.padding.top);
 		rect.setAttribute("width", this.properties.width-this.properties.padding.left-this.properties.padding.right);
@@ -260,7 +260,7 @@ dojo.lang.extend(dojo.widget.svg.Chart, {
 		//	the plot background.
 		this.plotArea = document.createElementNS(dojo.svg.xmlns.svg, "g");
 		this.vectorNode.appendChild(this.plotArea);
-		var rect = document.createElementNS(dojo.svg.xmlns.svg, "rect");		
+		var rect = document.createElementNS(dojo.svg.xmlns.svg, "rect");
 		rect.setAttribute("x", this.properties.padding.left);
 		rect.setAttribute("y", this.properties.padding.top);
 		rect.setAttribute("width", this.properties.width-this.properties.padding.left-this.properties.padding.right);
@@ -287,7 +287,7 @@ dojo.lang.extend(dojo.widget.svg.Chart, {
 		line.setAttribute("x2",this.properties.width-this.properties.padding.right);
 		line.setAttribute("style","stroke:#000;stroke-width:"+stroke+";");
 		this.axisGroup.appendChild(line);
-		
+
 		//	x axis units.
 		//	(min and max)
 		var textSize=10;
@@ -297,14 +297,14 @@ dojo.lang.extend(dojo.widget.svg.Chart, {
 		text.setAttribute("style", "text-anchor:middle;font-size:"+textSize+"px;fill:#000;");
 		text.appendChild(document.createTextNode(dojo.math.round(parseFloat(this.properties.axes.x.range.min),2)));
 		this.axisGroup.appendChild(text);
-		
+
 		var text = document.createElementNS(dojo.svg.xmlns.svg, "text");
 		text.setAttribute("x", this.properties.width-this.properties.padding.right-(textSize/2));
 		text.setAttribute("y", this.properties.height-this.properties.padding.bottom+textSize+2);
 		text.setAttribute("style", "text-anchor:middle;font-size:"+textSize+"px;fill:#000;");
 		text.appendChild(document.createTextNode(dojo.math.round(parseFloat(this.properties.axes.x.range.max),2)));
-		this.axisGroup.appendChild(text);	
-		
+		this.axisGroup.appendChild(text);
+
 		//	y axis
 		var line=document.createElementNS(dojo.svg.xmlns.svg, "line");
 		var x=dojo.widget.svg.Chart.Plotter.getX(this.properties.axes.y.plotAt, this);
@@ -322,13 +322,13 @@ dojo.lang.extend(dojo.widget.svg.Chart, {
 		text.setAttribute("style", "text-anchor:end;font-size:"+textSize+"px;fill:#000;");
 		text.appendChild(document.createTextNode(dojo.math.round(parseFloat(this.properties.axes.y.range.min),2)));
 		this.axisGroup.appendChild(text);
-		
+
 		var text = document.createElementNS(dojo.svg.xmlns.svg, "text");
 		text.setAttribute("x", this.properties.padding.left-4);
 		text.setAttribute("y", this.properties.padding.top+(textSize/2));
 		text.setAttribute("style", "text-anchor:end;font-size:"+textSize+"px;fill:#000;");
 		text.appendChild(document.createTextNode(dojo.math.round(parseFloat(this.properties.axes.y.range.max),2)));
-		this.axisGroup.appendChild(text);	
+		this.axisGroup.appendChild(text);
 
 		this.domNode.appendChild(this.vectorNode);
 		dojo.svg.g.resume();
@@ -345,7 +345,7 @@ dojo.lang.extend(dojo.widget.svg.Chart, {
 	},
 	render:function(){
 		dojo.svg.g.suspend();
-		
+
 		if (this.dataGroup){
 			while(this.dataGroup.childNodes.length>0){
 				this.dataGroup.removeChild(this.dataGroup.childNodes.item(0));
@@ -361,7 +361,7 @@ dojo.lang.extend(dojo.widget.svg.Chart, {
 			dojo.widget.svg.Chart.Plotter.plot(this.series[i], this);
 		}
 //		p.appendChild(this.dataGroup);
-		
+
 		dojo.svg.g.resume();
 	}
 });
@@ -370,7 +370,7 @@ dojo.widget.svg.Chart.Plotter=new function(){
 	var _this=this;
 	var plotters = {};
 	var types=dojo.widget.Chart.PlotTypes;
-	
+
 	this.getX=function(value, chart){
 		var v=parseFloat(value);
 		var min=chart.properties.axes.x.range.min;
@@ -390,7 +390,7 @@ dojo.widget.svg.Chart.Plotter=new function(){
 		var ofst=0;
 		if(min<0)ofst+=Math.abs(min);
 		min+=ofst; max+=ofst; v+=ofst;
-		
+
 		var ymin=chart.properties.height-chart.properties.padding.bottom;
 		var ymax=chart.properties.padding.top;
 		var y=(((ymin-ymax)/(max-min))*(max-v))+ymax;
@@ -467,7 +467,7 @@ dojo.widget.svg.Chart.Plotter=new function(){
 				dx=x-_this.getX(series.values[i-1].x, chart);
 				dy=_this.getY(series.values[i-1].value, chart);
 			}
-			
+
 			if (i==0) path.push("M");
 			else {
 				path.push("C");
@@ -503,7 +503,7 @@ dojo.widget.svg.Chart.Plotter=new function(){
 	plotters[types.Bubble]=function(series, chart){
 		//	added param for series[n].value: size
 		var minR=1;
-		
+
 		//	do this off the x axis?
 		var min=chart.properties.axes.x.range.min;
 		var max=chart.properties.axes.x.range.max;
@@ -513,7 +513,7 @@ dojo.widget.svg.Chart.Plotter=new function(){
 		var xmin=chart.properties.padding.left;
 		var xmax=chart.properties.width-chart.properties.padding.right;
 		var factor=(max-min)/(xmax-xmin)*25;
-		
+
 		for (var i=0; i<series.values.length; i++){
 			var size = series.values[i].size;
 			if (isNaN(parseFloat(size))) size=minR;
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlButtonTemplate.css b/webapp/src/main/webapp/src/widget/templates/HtmlButtonTemplate.css
index 0ea433eb3..1eddc2355 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlButtonTemplate.css
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlButtonTemplate.css
@@ -56,4 +56,4 @@
 
 .dojoButton.disabled .downArrow {
 	cursor : default;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlCheckBox.html b/webapp/src/main/webapp/src/widget/templates/HtmlCheckBox.html
index b34be39fb..537b84900 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlCheckBox.html
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlCheckBox.html
@@ -3,4 +3,4 @@
 		dojoAttachPoint="inputNode">
 	<img src='${this.imgSrc}' class='dojoHtmlCheckbox'
 		dojoAttachPoint="imgNode" dojoAttachEvent="onMouseUp;onMouseOver;onMouseOut">
-</span>
\ No newline at end of file
+</span>
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlComboBox.css b/webapp/src/main/webapp/src/widget/templates/HtmlComboBox.css
index efdbfc454..1d3db6b6e 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlComboBox.css
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlComboBox.css
@@ -1,7 +1,7 @@
 input.dojoComboBoxInput {
 	/* font-size: 0.8em; */
 	border: 0px;
-	
+
 }
 
 .dojoComboBoxOptions {
@@ -10,7 +10,7 @@ input.dojoComboBoxInput {
 	background-color: white;
 	border: 1px solid #afafaf;
 	position: absolute;
-	z-index: 1000; 
+	z-index: 1000;
 	overflow: auto;
 	-moz-opacity: 0;
 	cursor: default;
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlComboBox.html b/webapp/src/main/webapp/src/widget/templates/HtmlComboBox.html
index c79a97b25..d211233ee 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlComboBox.html
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlComboBox.html
@@ -1,7 +1,7 @@
 <div style="position: relative; z-index: 100;">
-	<input type="hidden" name="" value="" 
+	<input type="hidden" name="" value=""
 		dojoAttachPoint="comboBoxValue">
-	<input type="hidden" name="" value="" 
+	<input type="hidden" name="" value=""
 		dojoAttachPoint="comboBoxSelectionValue">
 	<table class="dojoComboBox"
 		cellpadding="0"
@@ -16,7 +16,7 @@
 					style="width: 100%;">
 			</td>
 			<td>
-				<img border="0" 
+				<img border="0"
 					hspace="0"
 					vspace="0"
 					dojoAttachPoint="downArrowNode"
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlContextMenuTemplate.html b/webapp/src/main/webapp/src/widget/templates/HtmlContextMenuTemplate.html
index 8c85c54ab..491600f27 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlContextMenuTemplate.html
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlContextMenuTemplate.html
@@ -1,3 +1,3 @@
-<ul class="dojoContextMenu" 
+<ul class="dojoContextMenu"
 	dojoAttachPoint="containerNode">
 </ul>
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlDatePicker.html b/webapp/src/main/webapp/src/widget/templates/HtmlDatePicker.html
index 8a8940fa4..688635586 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlDatePicker.html
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlDatePicker.html
@@ -7,28 +7,28 @@
 						<tr>
 							<td class="monthCurve monthCurveTL" valign="top"></td>
 							<td class="monthLabelContainer" valign="top">
-								<span dojoAttachPoint="increaseWeekNode" 
-									dojoAttachEvent="onClick: onIncrementWeek;" 
+								<span dojoAttachPoint="increaseWeekNode"
+									dojoAttachEvent="onClick: onIncrementWeek;"
 									class="incrementControl increase">
-									<img src="${dojoRoot}src/widget/templates/images/incrementMonth.png" 
+									<img src="${dojoRoot}src/widget/templates/images/incrementMonth.png"
 									alt="&darr;" style="width:7px;height:5px;" />
 								</span>
-								<span 
-									dojoAttachPoint="increaseMonthNode" 
+								<span
+									dojoAttachPoint="increaseMonthNode"
 									dojoAttachEvent="onClick: onIncrementMonth;" class="incrementControl increase">
-									<img src="${dojoRoot}src/widget/templates/images/incrementMonth.png" 
+									<img src="${dojoRoot}src/widget/templates/images/incrementMonth.png"
 										alt="&darr;"  dojoAttachPoint="incrementMonthImageNode">
 								</span>
-								<span 
-									dojoAttachPoint="decreaseWeekNode" 
-									dojoAttachEvent="onClick: onIncrementWeek;" 
+								<span
+									dojoAttachPoint="decreaseWeekNode"
+									dojoAttachEvent="onClick: onIncrementWeek;"
 									class="incrementControl decrease">
 									<img src="${dojoRoot}src/widget/templates/images/decrementMonth.png" alt="&uarr;" style="width:7px;height:5px;" />
 								</span>
-								<span 
-									dojoAttachPoint="decreaseMonthNode" 
+								<span
+									dojoAttachPoint="decreaseMonthNode"
 									dojoAttachEvent="onClick: onIncrementMonth;" class="incrementControl decrease">
-									<img src="${dojoRoot}src/widget/templates/images/decrementMonth.png" 
+									<img src="${dojoRoot}src/widget/templates/images/decrementMonth.png"
 										alt="&uarr;" dojoAttachPoint="decrementMonthImageNode">
 								</span>
 								<span dojoAttachPoint="monthLabelNode" class="month">July</span>
@@ -54,7 +54,7 @@
 								<td>S</td>
 							</tr>
 						</thead>
-						<tbody dojoAttachPoint="calendarDatesContainerNode" 
+						<tbody dojoAttachPoint="calendarDatesContainerNode"
 							dojoAttachEvent="onClick: onSetDate;">
 							<tr dojoAttachPoint="calendarRow0">
 								<td></td>
@@ -126,7 +126,7 @@
 									<span dojoAttachPoint="previousYearLabelNode"
 										dojoAttachEvent="onClick: onIncrementYear;" class="previousYear"></span>
 									<span class="selectedYear" dojoAttachPoint="currentYearLabelNode"></span>
-									<span dojoAttachPoint="nextYearLabelNode" 
+									<span dojoAttachPoint="nextYearLabelNode"
 										dojoAttachEvent="onClick: onIncrementYear;" class="nextYear"></span>
 								</h3>
 							</td>
@@ -137,5 +137,5 @@
 			</tr>
 		</tfoot>
 	</table>
-	
+
 </div>
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlDialog.html b/webapp/src/main/webapp/src/widget/templates/HtmlDialog.html
index e7b805018..e4efda134 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlDialog.html
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlDialog.html
@@ -1,13 +1,13 @@
 <div id="${this.widgetId}" class="dojoDialog" dojoAttachPoint="wrapper">
 
-	<span dojoAttachPoint="tabStart" 
-		dojoOnFocus="trapTabs" 
+	<span dojoAttachPoint="tabStart"
+		dojoOnFocus="trapTabs"
 		dojoOnBlur="clearTrap" tabindex="0"></span>
 
 	<div dojoAttachPoint="containerNode" style=" position: relative; z-index: 2;"></div>
 
-	<span dojoAttachPoint="tabEnd" 
-		dojoOnFocus="trapTabs" 
+	<span dojoAttachPoint="tabEnd"
+		dojoOnFocus="trapTabs"
 		dojoOnBlur="clearTrap" tabindex="0"></span>
 
 </div>
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlDocPane.css b/webapp/src/main/webapp/src/widget/templates/HtmlDocPane.css
index 253982aa1..b2a61cd9c 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlDocPane.css
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlDocPane.css
@@ -16,4 +16,4 @@
 }
 .dojoDocParamName {
 	color: #D14040;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlDropDownButtonTemplate.html b/webapp/src/main/webapp/src/widget/templates/HtmlDropDownButtonTemplate.html
index a14822e34..1db02c857 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlDropDownButtonTemplate.html
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlDropDownButtonTemplate.html
@@ -6,4 +6,4 @@
       <img dojoAttachPoint="arrow">
     </td>
   </tr></table>
-</button>
\ No newline at end of file
+</button>
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlEditorToolbar.css b/webapp/src/main/webapp/src/widget/templates/HtmlEditorToolbar.css
index abdf7df19..0b5391959 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlEditorToolbar.css
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlEditorToolbar.css
@@ -45,7 +45,7 @@ body {
 
 div.bigIcon {
 	width: 40px;
-	height: 40px; 
+	height: 40px;
 	/* background-color: white; */
 	/* border: 1px solid #a6a7a3; */
 	font-family: Verdana, Trebuchet, Tahoma, Arial;
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlEditorToolbar.html b/webapp/src/main/webapp/src/widget/templates/HtmlEditorToolbar.html
index 4e32fba8c..bfd0e246d 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlEditorToolbar.html
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlEditorToolbar.html
@@ -67,19 +67,19 @@
 								<!--
 								<td>
 									<span class="iconContainer" dojoOnClick="buttonClick;">
-										<span class="icon justifyleft" 
+										<span class="icon justifyleft"
 											style="float: left;">&nbsp;</span>
 									</span>
 									<span class="iconContainer" dojoOnClick="buttonClick;">
-										<span class="icon justifycenter" 
+										<span class="icon justifycenter"
 											style="float: left;">&nbsp;</span>
 									</span>
 									<span class="iconContainer" dojoOnClick="buttonClick;">
-										<span class="icon justifyright" 
+										<span class="icon justifyright"
 											style="float: left;">&nbsp;</span>
 									</span>
 									<span class="iconContainer" dojoOnClick="buttonClick;">
-										<span class="icon justifyfull" 
+										<span class="icon justifyfull"
 											style="float: left;">&nbsp;</span>
 									</span>
 								</td>
@@ -98,7 +98,7 @@
 					<span class="iconContainer" dojoAttachPoint="copyButton"
 						unselectable="on"
 						dojoOnClick="copyClick; buttonClick;">
-						<span class="icon copy" 
+						<span class="icon copy"
 							unselectable="on"
 							style="float: left;">&nbsp;</span> copy
 					</span>
@@ -146,7 +146,7 @@
 						dojoOnClick="redoClick; buttonClick;" unselectable="on">
 						<span class="icon redo" style="float: left;" unselectable="on">&nbsp;</span> redo
 					</span>
-				</td>	
+				</td>
 			</tr>
 		</tbody>
 	</table>
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlEditorToolbarOneline.html b/webapp/src/main/webapp/src/widget/templates/HtmlEditorToolbarOneline.html
index d2087f59b..e8f54addf 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlEditorToolbarOneline.html
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlEditorToolbarOneline.html
@@ -1,4 +1,4 @@
-<div class="EditorToolbarDomNode EditorToolbarSmallBg" 
+<div class="EditorToolbarDomNode EditorToolbarSmallBg"
 	unselectable="on" dojoOnMouseDown="preventSelect">
 	<table cellpadding="1" cellspacing="0" border="0">
 		<!--
@@ -31,8 +31,8 @@
 					<!-- htmltoggle -->
 					<span class="iconContainer" dojoAttachPoint="htmltoggleButton"
 						dojoOnClick="htmltoggleClick; buttonClick;" style="display: none;">
-						<span title="Toggle Rich Text and HTML Markup Editing Modes" class="icon" 
-						style="background-image: none; width: 30px;" 
+						<span title="Toggle Rich Text and HTML Markup Editing Modes" class="icon"
+						style="background-image: none; width: 30px;"
 						unselectable="on">&lt;h&gt;</span>
 					</span>
 				</td>
@@ -40,7 +40,7 @@
 					<!-- wikiword -->
 					<span class="iconContainer" dojoAttachPoint="wikiwordButton"
 						dojoOnClick="wikiwordClick; buttonClick;" style="display: none;">
-						<span title="Toggle Wiki Word" class="icon wikiword" 
+						<span title="Toggle Wiki Word" class="icon wikiword"
 						unselectable="on">&nbsp;</span>
 					</span>
 				</td>
@@ -76,7 +76,7 @@
 				<td isSpacer="true">
 					<!-- spacer -->
 					<span class="iconContainer">
-						<span class="icon sep" unselectable="on" 
+						<span class="icon sep" unselectable="on"
 							style="width: 5px; min-width: 5px;"></span>
 					</span>
 				</td>
@@ -89,7 +89,7 @@
 				</td>
 				<td>
 					<!-- insertimage -->
-					<span class="iconContainer" 
+					<span class="iconContainer"
 						style="display: none;"
 						dojoAttachPoint="insertimageButton"
 						unselectable="on" dojoOnClick="insertimageClick; buttonClick;">
@@ -128,23 +128,23 @@
 					<!-- strikethrough -->
 					<span class="iconContainer" dojoAttachPoint="strikethroughButton"
 						dojoOnClick="strikethroughClick; buttonClick;">
-						<span title="Toggle Strike-Through" 
+						<span title="Toggle Strike-Through"
 							class="icon strikethrough" unselectable="on">&nbsp;</span>
 					</span>
 				</td>
 				<td isSpacer="true">
 					<!-- spacer -->
 					<span class="iconContainer">
-						<span class="icon sep" unselectable="on" 
+						<span class="icon sep" unselectable="on"
 							style="width: 5px; min-width: 5px;"></span>
 					</span>
 				</td>
 				<td>
 					<!-- insertunorderedlist -->
 					<span class="iconContainer" dojoAttachPoint="insertunorderedlistButton"
-						unselectable="on" 
+						unselectable="on"
 						dojoOnClick="insertunorderedlistClick; buttonClick;">
-						<span title="Insert Bullet List" 
+						<span title="Insert Bullet List"
 							class="icon insertunorderedlist" unselectable="on">&nbsp;</span>
 					</span>
 				</td>
@@ -152,14 +152,14 @@
 					<!-- insertorderedlist -->
 					<span class="iconContainer" dojoAttachPoint="insertorderedlistButton"
 						unselectable="on" dojoOnClick="insertorderedlistClick; buttonClick;">
-						<span title="Insert Numbered List" 
+						<span title="Insert Numbered List"
 							class="icon insertorderedlist" unselectable="on">&nbsp;</span>
 					</span>
 				</td>
 				<td isSpacer="true">
 					<!-- spacer -->
 					<span class="iconContainer">
-						<span class="icon sep" unselectable="on" 
+						<span class="icon sep" unselectable="on"
 							style="width: 5px; min-width: 5px;"></span>
 					</span>
 				</td>
@@ -167,7 +167,7 @@
 					<!-- indent -->
 					<span class="iconContainer" dojoAttachPoint="indentButton"
 						unselectable="on" dojoOnClick="indentClick; buttonClick;">
-						<span title="Indent Selection" class="icon indent" 
+						<span title="Indent Selection" class="icon indent"
 							unselectable="on">&nbsp;</span>
 					</span>
 				</td>
@@ -175,14 +175,14 @@
 					<!-- outdent -->
 					<span class="iconContainer" dojoAttachPoint="outdentButton"
 						unselectable="on" dojoOnClick="outdentClick; buttonClick;">
-						<span title="Outdent Selection" class="icon outdent" 
+						<span title="Outdent Selection" class="icon outdent"
 							unselectable="on">&nbsp;</span>
 					</span>
 				</td>
 				<td isSpacer="true">
 					<!-- spacer -->
 					<span class="iconContainer">
-						<span class="icon sep" unselectable="on" 
+						<span class="icon sep" unselectable="on"
 							style="width: 5px; min-width: 5px;"></span>
 					</span>
 				</td>
@@ -190,10 +190,10 @@
 					<!-- forecolor -->
 					<span class="iconContainer" dojoAttachPoint="forecolorButton"
 						unselectable="on" dojoOnClick="forecolorClick; buttonClick;">
-						<span title="Change Text Color" class="icon forecolor" 
+						<span title="Change Text Color" class="icon forecolor"
 							unselectable="on">&nbsp;</span>
 					</span>
-					<div class="ColorDropdownContainer" 
+					<div class="ColorDropdownContainer"
 						style="display: none; margin-top: 22px;"
 						dojoAttachPoint="forecolorDropDown">
 					</div>
@@ -202,10 +202,10 @@
 					<!-- hilitecolor -->
 					<span class="iconContainer" dojoAttachPoint="hilitecolorButton"
 						unselectable="on" dojoOnClick="hilitecolorClick; buttonClick;">
-						<span title="Change Background Color" class="icon hilitecolor" 
+						<span title="Change Background Color" class="icon hilitecolor"
 							unselectable="on">&nbsp;</span>
 					</span>
-					<div class="ColorDropdownContainer" 
+					<div class="ColorDropdownContainer"
 						style="display: none; margin-top: 22px;"
 						dojoAttachPoint="hilitecolorDropDown">
 					</div>
@@ -213,7 +213,7 @@
 				<td isSpacer="true">
 					<!-- spacer -->
 					<span class="iconContainer">
-						<span class="icon sep" unselectable="on" 
+						<span class="icon sep" unselectable="on"
 							style="width: 5px; min-width: 5px;"></span>
 					</span>
 				</td>
@@ -244,7 +244,7 @@
 						dojoOnClick="justifyfullClick; buttonClick;">
 						<span title="Justify Both" class="icon justifyfull" unselectable="on">&nbsp;</span>
 					</span>
-				</td>	
+				</td>
 				<td>
 					<!-- font select -->
 					<select dojoOnChange="formatSelectClick; buttonClick;"
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlFloatingPane.html b/webapp/src/main/webapp/src/widget/templates/HtmlFloatingPane.html
index 20d62a347..d66093d22 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlFloatingPane.html
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlFloatingPane.html
@@ -15,4 +15,4 @@
 	<div id="${this.widgetId}_container" dojoAttachPoint="containerNode" class="dojoFloatingPaneClient"></div>
 
 	<div dojoAttachPoint="resizeBar" class="dojoFloatingPaneResizebar" style="display:none"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlMonthlyCalendar.html b/webapp/src/main/webapp/src/widget/templates/HtmlMonthlyCalendar.html
index 98ab4a619..f9946f8a7 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlMonthlyCalendar.html
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlMonthlyCalendar.html
@@ -1,31 +1,31 @@
 <div class="datePickerContainer" dojoAttachPoint="datePickerContainerNode">
 	<h3 class="monthLabel">
 	<!--
-	<span 
-		dojoAttachPoint="decreaseWeekNode" 
-		dojoAttachEvent="onClick: onIncrementWeek;" 
+	<span
+		dojoAttachPoint="decreaseWeekNode"
+		dojoAttachEvent="onClick: onIncrementWeek;"
 		class="incrementControl">
 		<img src="${dojoRoot}src/widget/templates/decrementWeek.gif" alt="&uarr;" />
 	</span>
 	-->
-	<span 
-		dojoAttachPoint="decreaseMonthNode" 
+	<span
+		dojoAttachPoint="decreaseMonthNode"
 		dojoAttachEvent="onClick: onIncrementMonth;" class="incrementControl">
-		<img src="${dojoRoot}src/widget/templates/decrementMonth.gif" 
+		<img src="${dojoRoot}src/widget/templates/decrementMonth.gif"
 			alt="&uarr;" dojoAttachPoint="decrementMonthImageNode">
 	</span>
 	<span dojoAttachPoint="monthLabelNode" class="month">July</span>
-	<span 
-		dojoAttachPoint="increaseMonthNode" 
+	<span
+		dojoAttachPoint="increaseMonthNode"
 		dojoAttachEvent="onClick: onIncrementMonth;" class="incrementControl">
-		<img src="${dojoRoot}src/widget/templates/incrementMonth.gif" 
+		<img src="${dojoRoot}src/widget/templates/incrementMonth.gif"
 			alt="&darr;"  dojoAttachPoint="incrementMonthImageNode">
 	</span>
 	<!--
-		<span dojoAttachPoint="increaseWeekNode" 
-			dojoAttachEvent="onClick: onIncrementWeek;" 
+		<span dojoAttachPoint="increaseWeekNode"
+			dojoAttachEvent="onClick: onIncrementWeek;"
 			class="incrementControl">
-			<img src="${dojoRoot}src/widget/templates/incrementWeek.gif" 
+			<img src="${dojoRoot}src/widget/templates/incrementWeek.gif"
 			alt="&darr;" />
 		</span>
 	-->
@@ -42,7 +42,7 @@
 				<td>Saturday</td>
 			</tr>
 		</thead>
-		<tbody dojoAttachPoint="calendarDatesContainerNode" 
+		<tbody dojoAttachPoint="calendarDatesContainerNode"
 			dojoAttachEvent="onClick: onSetDate;">
 			<tr dojoAttachPoint="calendarRow0">
 				<td></td>
@@ -104,7 +104,7 @@
 		<span dojoAttachPoint="previousYearLabelNode"
 			dojoAttachEvent="onClick: onIncrementYear;" class="previousYear"></span>
 		<span class="selectedYear" dojoAttachPoint="currentYearLabelNode"></span>
-		<span dojoAttachPoint="nextYearLabelNode" 
+		<span dojoAttachPoint="nextYearLabelNode"
 			dojoAttachEvent="onClick: onIncrementYear;" class="nextYear"></span>
 	</h3>
 </div>
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlResizableTextarea.html b/webapp/src/main/webapp/src/widget/templates/HtmlResizableTextarea.html
index 88827f717..be43b2ec7 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlResizableTextarea.html
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlResizableTextarea.html
@@ -1,11 +1,11 @@
 <div>
 	<div style="border: 2px solid black; width: 90%; height: 200px;"
 		dojoAttachPoint="rootLayoutNode">
-		<div dojoAttachPoint="textAreaContainerNode" 
+		<div dojoAttachPoint="textAreaContainerNode"
 			style="border: 0px; margin: 0px; overflow: hidden;">
 		</div>
 		<div dojoAttachPoint="statusBarContainerNode" class="statusBar">
-			<div dojoAttachPoint="statusLabelNode" 
+			<div dojoAttachPoint="statusLabelNode"
 				class="statusPanel"
 				style="padding-right: 0px; z-index: 1;">drag to resize</div>
 			<div dojoAttachPoint="resizeHandleNode"></div>
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlResizeHandle.css b/webapp/src/main/webapp/src/widget/templates/HtmlResizeHandle.css
index 661a86ac2..4a238d3a7 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlResizeHandle.css
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlResizeHandle.css
@@ -9,4 +9,4 @@
 	cursor: nw-resize;
 	background-image: url(grabCorner.gif);
 	line-height: 0px;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlShow.css b/webapp/src/main/webapp/src/widget/templates/HtmlShow.css
index 6378bf161..13e44627c 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlShow.css
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlShow.css
@@ -56,4 +56,4 @@
 		margin-top: 0;
 		page-break-after: avoid;
 	}
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlShow.html b/webapp/src/main/webapp/src/widget/templates/HtmlShow.html
index c7610fe3c..c64546deb 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlShow.html
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlShow.html
@@ -8,4 +8,4 @@
 		</select>
 		<span dojoAttachEvent="onClick:nextSlide">&gt;</span>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlShowSlide.css b/webapp/src/main/webapp/src/widget/templates/HtmlShowSlide.css
index 6e55c823e..d4d374825 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlShowSlide.css
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlShowSlide.css
@@ -9,4 +9,4 @@
 }
 .dojoShowSlideBody {
 	margin: 15px;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlShowSlide.html b/webapp/src/main/webapp/src/widget/templates/HtmlShowSlide.html
index 5a4958690..e7bc0a396 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlShowSlide.html
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlShowSlide.html
@@ -3,4 +3,4 @@
 		<h1 dojoAttachPoint="htmlTitle">Title</h1>
 	</div>
 	<div class="dojoShowSlideBody" dojoAttachPoint="containerNode"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlSlideShow.css b/webapp/src/main/webapp/src/widget/templates/HtmlSlideShow.css
index 02e97cd0f..1da66b4a7 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlSlideShow.css
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlSlideShow.css
@@ -1,7 +1,7 @@
 .slideShowImg {
 	position: absolute;
 	left: 0px;
-	top: 0px; 
+	top: 0px;
 	border: 2px solid #4d4d4d;
 	padding: 0px;
 	margin: 0px;
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlSlideShow.html b/webapp/src/main/webapp/src/widget/templates/HtmlSlideShow.html
index 93b836bff..ce9451673 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlSlideShow.html
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlSlideShow.html
@@ -1,15 +1,15 @@
 <div style="position: relative; padding: 3px;">
 		<div dojoAttachPoint="controlsContainer">
-			<input type="button" value="pause" 
+			<input type="button" value="pause"
 				dojoAttachPoint="startStopButton"
 				dojoAttachEvent="onClick: togglePaused;">
 		</div>
 		<div style="position: relative; width: 800px; height: 600px;"
 			dojoAttachPoint="imagesContainer"
 			dojoAttachEvent="onClick: togglePaused;">
-			<img dojoAttachPoint="img1" class="slideShowImg" 
+			<img dojoAttachPoint="img1" class="slideShowImg"
 				style="z-index: 1;"  />
-			<img dojoAttachPoint="img2" class="slideShowImg" 
+			<img dojoAttachPoint="img2" class="slideShowImg"
 				style="z-index: 0;" />
-		</div>	
-</div>
\ No newline at end of file
+		</div>
+</div>
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlSlider.css b/webapp/src/main/webapp/src/widget/templates/HtmlSlider.css
index 209ea271f..da952aa90 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlSlider.css
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlSlider.css
@@ -1,47 +1,47 @@
-.sliderMain { 
-  position: relative; 
+.sliderMain {
+  position: relative;
   /*top: 80px; left: 0px;*/
-  padding: 0px; 
+  padding: 0px;
   border: 1px solid black;
-  width: 300px; height: 300px; 
+  width: 300px; height: 300px;
 }
 
-.sliderHandle { 
+.sliderHandle {
   color: #FF0000;
-  position: relative; 
+  position: relative;
   background-image: url(images/slider-button.png);
-  width: 25px; 
+  width: 25px;
   height: 25px;
 }
 
-.sliderMainHorizontal { 
-  position: relative; 
+.sliderMainHorizontal {
+  position: relative;
   /*top: 80px; left: 0px;*/
-  padding: 0px; 
-  width: 300px; height: 35px; 
+  padding: 0px;
+  width: 300px; height: 35px;
   background: url(images/slider-bg.gif) no-repeat 0px 4px;
 }
 
-.sliderHandleHorizontal { 
+.sliderHandleHorizontal {
   color: #FF0000;
-  position: relative; 
+  position: relative;
   background-image: url(images/slider-button-horz.png);
-  width: 25px; 
+  width: 25px;
   height: 35px;
 }
 
-.sliderMainVertical { 
-  position: relative; 
+.sliderMainVertical {
+  position: relative;
   /*top: 80px; left: 0px;*/
-  padding: 0px; 
-  width: 35px; height: 300px; 
+  padding: 0px;
+  width: 35px; height: 300px;
   background: url(images/slider-bg-vert.gif) no-repeat 4px 0px;
 }
 
-.sliderHandleVertical { 
+.sliderHandleVertical {
   color: #FF0000;
-  position: relative; 
+  position: relative;
   background-image: url(images/slider-button-vert.png);
-  width: 35px; 
+  width: 35px;
   height: 25px;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlSpinner.css b/webapp/src/main/webapp/src/widget/templates/HtmlSpinner.css
index 0dc0c9a6e..90b906fbb 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlSpinner.css
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlSpinner.css
@@ -9,7 +9,7 @@ input.dojoSpinnerInput {
 	background-color: white;
 	border: 1px solid #afafaf;
 	position: absolute;
-	z-index: 1000; 
+	z-index: 1000;
 	overflow: auto;
 	-moz-opacity: 0;
 	cursor: default;
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlTaskBar.css b/webapp/src/main/webapp/src/widget/templates/HtmlTaskBar.css
index 5f55a7c93..b759548e8 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlTaskBar.css
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlTaskBar.css
@@ -16,7 +16,7 @@
 .dojoTaskBarItem img {
 	vertical-align: middle;
 	margin-right: 5px;
-	margin-left: 5px;	
+	margin-left: 5px;
 	height: 32px;
 	width: 32px;
 }
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlTaskBarItemTemplate.html b/webapp/src/main/webapp/src/widget/templates/HtmlTaskBarItemTemplate.html
index aeb19d627..dd645d0cb 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlTaskBarItemTemplate.html
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlTaskBarItemTemplate.html
@@ -1,2 +1,2 @@
 <div class="dojoTaskBarItem" dojoAttachEvent="onClick">
-</div>
\ No newline at end of file
+</div>
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlTimePicker.css b/webapp/src/main/webapp/src/widget/templates/HtmlTimePicker.css
index 428db07d6..88ca229fa 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlTimePicker.css
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlTimePicker.css
@@ -23,7 +23,7 @@
 
 .timeContainer td.minutesHeading {
 	border-left:1px solid #e6e6e6;
-	border-right:1px solid #e6e6e6;	
+	border-right:1px solid #e6e6e6;
 }
 
 .timeContainer .minutes {
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlTimePicker.html b/webapp/src/main/webapp/src/widget/templates/HtmlTimePicker.html
index 282b2ff20..be4d4af25 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlTimePicker.html
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlTimePicker.html
@@ -11,7 +11,7 @@
 			<tr>
 				<td valign="top">
 					<table>
-						<tbody dojoAttachPoint="hourContainerNode"  
+						<tbody dojoAttachPoint="hourContainerNode"
 							dojoAttachEvent="onClick: onSetSelectedHour;">
 							<tr>
 								<td>12</td>
@@ -42,7 +42,7 @@
 				</td>
 				<td valign="top" class="minutes">
 					<table>
-						<tbody dojoAttachPoint="minuteContainerNode" 
+						<tbody dojoAttachPoint="minuteContainerNode"
 							dojoAttachEvent="onClick: onSetSelectedMinute;">
 							<tr>
 								<td>00</td>
@@ -73,7 +73,7 @@
 				</td>
 				<td valign="top">
 					<table>
-						<tbody dojoAttachPoint="amPmContainerNode" 
+						<tbody dojoAttachPoint="amPmContainerNode"
 							dojoAttachEvent="onClick: onSetSelectedAmPm;">
 							<tr>
 								<td>AM</td>
@@ -88,8 +88,8 @@
 			<tr>
 				<td></td>
 				<td>
-					<div dojoAttachPoint="anyTimeContainerNode" 
-						dojoAttachEvent="onClick: onSetSelectedAnyTime;" 
+					<div dojoAttachPoint="anyTimeContainerNode"
+						dojoAttachEvent="onClick: onSetSelectedAnyTime;"
 						class="anyTimeContainer">any</div>
 				</td>
 				<td></td>
diff --git a/webapp/src/main/webapp/src/widget/templates/HtmlTooltipTemplate.html b/webapp/src/main/webapp/src/widget/templates/HtmlTooltipTemplate.html
index 5ed6a6785..78793103d 100644
--- a/webapp/src/main/webapp/src/widget/templates/HtmlTooltipTemplate.html
+++ b/webapp/src/main/webapp/src/widget/templates/HtmlTooltipTemplate.html
@@ -1,2 +1,2 @@
 <div class='dojoTooltip' style="display:none" dojoAttachPoint="containerNode">
-</div>
\ No newline at end of file
+</div>
diff --git a/webapp/src/main/webapp/src/widget/templates/Menu.css b/webapp/src/main/webapp/src/widget/templates/Menu.css
index 1419f6d09..68d973b71 100644
--- a/webapp/src/main/webapp/src/widget/templates/Menu.css
+++ b/webapp/src/main/webapp/src/widget/templates/Menu.css
@@ -57,4 +57,4 @@ li:hover.dojoMenuSeparator {
 	_cursor: hand;
 	background-color: Highlight;
 	color: HighlightText;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/src/widget/validate.js b/webapp/src/main/webapp/src/widget/validate.js
index 1ec109edb..2a77ad6b1 100644
--- a/webapp/src/main/webapp/src/widget/validate.js
+++ b/webapp/src/main/webapp/src/widget/validate.js
@@ -63,8 +63,8 @@ dojo.inherits(dojo.widget.validate.Textbox, dojo.widget.HtmlWidget);
 
 dojo.lang.extend(dojo.widget.validate.Textbox, {
 	// default values for new subclass properties
-	widgetId: "", 
-	widgetType: "Textbox", 
+	widgetId: "",
+	widgetType: "Textbox",
 	id: "",
 	className: "",
 	name: "",
@@ -75,7 +75,7 @@ dojo.lang.extend(dojo.widget.validate.Textbox, {
 	ucFirst: false,
 	digit: false,
 	htmlfloat: "none",
-	
+
 	templateString: "<span style='float:${this.htmlfloat};'><input dojoAttachPoint='textbox' dojoAttachEvent='onblur;onfocus'"
 					+ " id='${this.widgetId}' name='${this.name}' "
 					+ " value='${this.value}' class='${this.className}'></input></span>",
@@ -84,23 +84,23 @@ dojo.lang.extend(dojo.widget.validate.Textbox, {
 	textbox: null,
 
 	// Apply various filters to textbox value
-	filter: function() { 
+	filter: function() {
 		if (this.trim) {
 			this.textbox.value = this.textbox.value.replace(/(^\s*|\s*$)/g, "");
-		} 
+		}
 		if (this.uppercase) {
 			this.textbox.value = this.textbox.value.toUpperCase();
-		} 
+		}
 		if (this.lowercase) {
 			this.textbox.value = this.textbox.value.toLowerCase();
-		} 
+		}
 		if (this.ucFirst) {
-			this.textbox.value = this.textbox.value.replace(/\b\w+\b/g, 
+			this.textbox.value = this.textbox.value.replace(/\b\w+\b/g,
 				function(word) { return word.substring(0,1).toUpperCase() + word.substring(1).toLowerCase(); });
-		} 
+		}
 		if (this.digit) {
 			this.textbox.value = this.textbox.value.replace(/\D/g, "");
-		} 
+		}
 	},
 
 	// event handlers, you can over-ride these in your own subclasses
@@ -110,7 +110,7 @@ dojo.lang.extend(dojo.widget.validate.Textbox, {
 	// All functions below are called by create from dojo.widget.Widget
 	mixInProperties: function(localProperties, frag) {
 		dojo.widget.validate.Textbox.superclass.mixInProperties.apply(this, arguments);
-		if ( localProperties["class"] ) { 
+		if ( localProperties["class"] ) {
 			this.className = localProperties["class"];
 		}
 	},
@@ -134,7 +134,7 @@ dojo.widget.tags.addParseTreeHandler("dojo:Textbox");
 
 	@attr type          		Basic input tag type declaration.
 	@attr size          		Basic input tag size declaration.
-	@attr type          		Basic input tag maxlength declaration.	
+	@attr type          		Basic input tag maxlength declaration.
   @attr required          Can be true or false, default is false.
   @attr validColor        The color textbox is highlighted for valid input. Default is #cfc.
   @attr invalidColor      The color textbox is highlighted for invalid input. Default is #fcc.
@@ -151,7 +151,7 @@ dojo.inherits(dojo.widget.validate.ValidationTextbox, dojo.widget.validate.Textb
 
 dojo.lang.extend(dojo.widget.validate.ValidationTextbox, {
 	// default values for new subclass properties
-	widgetType: "ValidationTextbox", 
+	widgetType: "ValidationTextbox",
 	type: "",
 	required: false,
 	validColor: "#cfc",
@@ -199,12 +199,12 @@ dojo.lang.extend(dojo.widget.validate.ValidationTextbox, {
 	isInRange: function() { return true; },
 
 	// Returns true if value is all whitespace
-	isEmpty: function() { 
+	isEmpty: function() {
 		return ( /^\s*$/.test(this.textbox.value) );
 	},
 
 	// Returns true if value is required and it is all whitespace.
-	isMissing: function() { 
+	isMissing: function() {
 		return ( this.required && this.isEmpty() );
 	},
 
@@ -218,8 +218,8 @@ dojo.lang.extend(dojo.widget.validate.ValidationTextbox, {
 
 		var empty = this.isEmpty();
 		var valid = true;
-		if(this.promptMessage != this.textbox.value){ 
-			valid = this.isValid(); 
+		if(this.promptMessage != this.textbox.value){
+			valid = this.isValid();
 		}
 		var missing = this.isMissing();
 
@@ -236,12 +236,12 @@ dojo.lang.extend(dojo.widget.validate.ValidationTextbox, {
 
 	// Called oninit, and onblur.
 	highlight: function() {
-		// highlight textbox background 
+		// highlight textbox background
 		if ( this.isEmpty() ) {
 			this.textbox.style.backgroundColor = "";
 		}else if ( this.isValid() && this.isInRange() ){
 			this.textbox.style.backgroundColor = this.validColor;
-		}else if( this.textbox.value != this.promptMessage){ 
+		}else if( this.textbox.value != this.promptMessage){
 			this.textbox.style.backgroundColor = this.invalidColor;
 		}
 	},
@@ -252,15 +252,15 @@ dojo.lang.extend(dojo.widget.validate.ValidationTextbox, {
 		}
 	},
 
-	onblur: function() { 
+	onblur: function() {
 		this.filter();
-		this.update(); 
+		this.update();
 	},
 
-	onkeyup: function(){ 
-		if(this.listenOnKeyPress){ 
+	onkeyup: function(){
+		if(this.listenOnKeyPress){
 			//this.filter();  trim is problem if you have to type two words
-			this.update(); 
+			this.update();
 		}else if (this.textbox.value != this.lastCheckedValue){
 		    this.textbox.style.backgroundColor = "";
 		}
@@ -275,7 +275,7 @@ dojo.lang.extend(dojo.widget.validate.ValidationTextbox, {
 		this.textbox.isMissing = function() { this.isMissing.call(this); };
 		this.textbox.isInRange = function() { this.isInRange.call(this); };
 		this.filter();
-		this.update(); 
+		this.update();
 	}
 });
 
@@ -303,7 +303,7 @@ dojo.inherits(dojo.widget.validate.IntegerTextbox, dojo.widget.validate.Validati
 
 dojo.lang.extend(dojo.widget.validate.IntegerTextbox, {
 	// new subclass properties
-	widgetType: "IntegerTextbox", 
+	widgetType: "IntegerTextbox",
 
 	mixInProperties: function(localProperties, frag) {
 		// First initialize properties in super-class.
@@ -320,22 +320,22 @@ dojo.lang.extend(dojo.widget.validate.IntegerTextbox, {
 		}else{
 			this.flags.signed = [ true, false ]; // optional
 		}
-		if(localProperties.separator){ 
+		if(localProperties.separator){
 			this.flags.separator = localProperties.separator;
 		}
-		if(localProperties.min){ 
+		if(localProperties.min){
 			this.flags.min = parseInt(localProperties.min);
 		}
-		if(localProperties.max){ 
+		if(localProperties.max){
 			this.flags.max = parseInt(localProperties.max);
 		}
 	},
 
 	// Over-ride for integer validation
-	isValid: function() { 
+	isValid: function() {
 		return dojo.validate.isInteger(this.textbox.value, this.flags);
 	},
-	isInRange: function() { 
+	isInRange: function() {
 		return dojo.validate.isInRange(this.textbox.value, this.flags);
 	}
 
@@ -365,14 +365,14 @@ dojo.inherits(dojo.widget.validate.RealNumberTextbox, dojo.widget.validate.Integ
 
 dojo.lang.extend(dojo.widget.validate.RealNumberTextbox, {
 	// new subclass properties
-	widgetType: "RealNumberTextbox", 
+	widgetType: "RealNumberTextbox",
 
 	mixInProperties: function(localProperties, frag) {
 		// First initialize properties in super-class.
 		dojo.widget.validate.RealNumberTextbox.superclass.mixInProperties.apply(this, arguments);
 
 		// Get properties from markup attibutes, and assign to flags object.
-		if ( localProperties.places ) { 
+		if ( localProperties.places ) {
 			this.flags.places = Number( localProperties.places );
 		}
 		if((localProperties.exponent == "true")||
@@ -390,19 +390,19 @@ dojo.lang.extend(dojo.widget.validate.RealNumberTextbox, {
 		}else{
 			this.flags.eSigned = [ true, false ]; // optional
 		}
-		if(localProperties.min){ 
+		if(localProperties.min){
 			this.flags.min = parseFloat(localProperties.min);
 		}
-		if(localProperties.max){ 
+		if(localProperties.max){
 			this.flags.max = parseFloat(localProperties.max);
 		}
 	},
 
 	// Over-ride for real number validation
-	isValid: function() { 
+	isValid: function() {
 		return dojo.validate.isRealNumber(this.textbox.value, this.flags);
 	},
-	isInRange: function() { 
+	isInRange: function() {
 		return dojo.validate.isInRange(this.textbox.value, this.flags);
 	}
 
@@ -432,32 +432,32 @@ dojo.inherits(dojo.widget.validate.CurrencyTextbox, dojo.widget.validate.Integer
 
 dojo.lang.extend(dojo.widget.validate.CurrencyTextbox, {
 	// new subclass properties
-	widgetType: "CurrencyTextbox", 
+	widgetType: "CurrencyTextbox",
 
 	mixInProperties: function(localProperties, frag) {
 		// First initialize properties in super-class.
 		dojo.widget.validate.CurrencyTextbox.superclass.mixInProperties.apply(this, arguments);
 
 		// Get properties from markup attibutes, and assign to flags object.
-		if ( localProperties.cents ) { 
+		if ( localProperties.cents ) {
 			this.flags.cents = ( localProperties.cents == "true" );
 		}
-		if ( localProperties.symbol ) { 
+		if ( localProperties.symbol ) {
 			this.flags.symbol = localProperties.symbol;
 		}
-		if(localProperties.min){ 
+		if(localProperties.min){
 			this.flags.min = parseFloat(localProperties.min);
 		}
-		if(localProperties.max){ 
+		if(localProperties.max){
 			this.flags.max = parseFloat(localProperties.max);
 		}
 	},
 
 	// Over-ride for currency validation
-	isValid: function() { 
+	isValid: function() {
 		return dojo.validate.isCurrency(this.textbox.value, this.flags);
 	},
-	isInRange: function() { 
+	isInRange: function() {
 		return dojo.validate.isInRange(this.textbox.value, this.flags);
 	}
 
@@ -489,38 +489,38 @@ dojo.inherits(dojo.widget.validate.IpAddressTextbox, dojo.widget.validate.Valida
 
 dojo.lang.extend(dojo.widget.validate.IpAddressTextbox, {
 	// new subclass properties
-	widgetType: "IpAddressTextbox", 
+	widgetType: "IpAddressTextbox",
 
 	mixInProperties: function(localProperties, frag) {
 		// First initialize properties in super-class.
 		dojo.widget.validate.IpAddressTextbox.superclass.mixInProperties.apply(this, arguments);
 
 		// Get properties from markup attibutes, and assign to flags object.
-		if ( localProperties.allowdotteddecimal ) { 
+		if ( localProperties.allowdotteddecimal ) {
 			this.flags.allowDottedDecimal = ( localProperties.allowdotteddecimal == "true" );
 		}
-		if ( localProperties.allowdottedhex ) { 
+		if ( localProperties.allowdottedhex ) {
 			this.flags.allowDottedHex = ( localProperties.allowdottedhex == "true" );
 		}
-		if ( localProperties.allowdottedoctal ) { 
+		if ( localProperties.allowdottedoctal ) {
 			this.flags.allowDottedOctal = ( localProperties.allowdottedoctal == "true" );
 		}
-		if ( localProperties.allowdecimal ) { 
+		if ( localProperties.allowdecimal ) {
 			this.flags.allowDecimal = ( localProperties.allowdecimal == "true" );
 		}
-		if ( localProperties.allowhex ) { 
+		if ( localProperties.allowhex ) {
 			this.flags.allowHex = ( localProperties.allowhex == "true" );
 		}
-		if ( localProperties.allowipv6 ) { 
+		if ( localProperties.allowipv6 ) {
 			this.flags.allowIPv6 = ( localProperties.allowipv6 == "true" );
 		}
-		if ( localProperties.allowhybrid ) { 
+		if ( localProperties.allowhybrid ) {
 			this.flags.allowHybrid = ( localProperties.allowhybrid == "true" );
 		}
 	},
 
 	// Over-ride for IP address validation
-	isValid: function() { 
+	isValid: function() {
 		return dojo.validate.isIpAddress(this.textbox.value, this.flags);
 	}
 });
@@ -549,32 +549,32 @@ dojo.inherits(dojo.widget.validate.UrlTextbox, dojo.widget.validate.IpAddressTex
 
 dojo.lang.extend(dojo.widget.validate.UrlTextbox, {
 	// new subclass properties
-	widgetType: "UrlTextbox", 
+	widgetType: "UrlTextbox",
 
 	mixInProperties: function(localProperties, frag) {
 		// First initialize properties in super-class.
 		dojo.widget.validate.UrlTextbox.superclass.mixInProperties.apply(this, arguments);
 
 		// Get properties from markup attibutes, and assign to flags object.
-		if ( localProperties.scheme ) { 
+		if ( localProperties.scheme ) {
 			this.flags.scheme = ( localProperties.scheme == "true" );
 		}
-		if ( localProperties.allowip ) { 
+		if ( localProperties.allowip ) {
 			this.flags.allowIP = ( localProperties.allowip == "true" );
 		}
-		if ( localProperties.allowlocal ) { 
+		if ( localProperties.allowlocal ) {
 			this.flags.allowLocal = ( localProperties.allowlocal == "true" );
 		}
-		if ( localProperties.allowcc ) { 
+		if ( localProperties.allowcc ) {
 			this.flags.allowCC = ( localProperties.allowcc == "true" );
 		}
-		if ( localProperties.allowgeneric ) { 
+		if ( localProperties.allowgeneric ) {
 			this.flags.allowGeneric = ( localProperties.allowgeneric == "true" );
 		}
 	},
 
 	// Over-ride for URL validation
-	isValid: function() { 
+	isValid: function() {
 		return dojo.validate.isUrl(this.textbox.value, this.flags);
 	}
 
@@ -601,20 +601,20 @@ dojo.inherits(dojo.widget.validate.EmailTextbox, dojo.widget.validate.UrlTextbox
 
 dojo.lang.extend(dojo.widget.validate.EmailTextbox, {
 	// new subclass properties
-	widgetType: "EmailTextbox", 
+	widgetType: "EmailTextbox",
 
 	mixInProperties: function(localProperties, frag) {
 		// First initialize properties in super-class.
 		dojo.widget.validate.EmailTextbox.superclass.mixInProperties.apply(this, arguments);
 
 		// Get properties from markup attibutes, and assign to flags object.
-		if ( localProperties.allowcruft ) { 
+		if ( localProperties.allowcruft ) {
 			this.flags.allowCruft = ( localProperties.allowcruft == "true" );
 		}
 	},
 
 	// Over-ride for email address validation
-	isValid: function() { 
+	isValid: function() {
 		return dojo.validate.isEmailAddress(this.textbox.value, this.flags);
 	}
 
@@ -630,7 +630,7 @@ dojo.widget.tags.addParseTreeHandler("dojo:EmailTextbox");
   Over-rides isValid to test for a list of email addresses.
   Can use all markup attributes/properties of EmailTextbox and ...
 
-  @attr listSeparator  The character used to separate email addresses.  
+  @attr listSeparator  The character used to separate email addresses.
     Default is ";", ",", "\n" or " ".
 */
 dojo.widget.validate.EmailListTextbox = function(node) {
@@ -641,20 +641,20 @@ dojo.inherits(dojo.widget.validate.EmailListTextbox, dojo.widget.validate.EmailT
 
 dojo.lang.extend(dojo.widget.validate.EmailListTextbox, {
 	// new subclass properties
-	widgetType: "EmailListTextbox", 
+	widgetType: "EmailListTextbox",
 
 	mixInProperties: function(localProperties, frag) {
 		// First initialize properties in super-class.
 		dojo.widget.validate.EmailListTextbox.superclass.mixInProperties.apply(this, arguments);
 
 		// Get properties from markup attibutes, and assign to flags object.
-		if ( localProperties.listseparator ) { 
+		if ( localProperties.listseparator ) {
 			this.flags.listSeparator = localProperties.listseparator;
 		}
 	},
 
 	// Over-ride for email address list validation
-	isValid: function() { 
+	isValid: function() {
 		return dojo.validate.isEmailAddressList(this.textbox.value, this.flags);
 	}
 
@@ -679,20 +679,20 @@ dojo.inherits(dojo.widget.validate.DateTextbox, dojo.widget.validate.ValidationT
 
 dojo.lang.extend(dojo.widget.validate.DateTextbox, {
 	// new subclass properties
-	widgetType: "DateTextbox", 
+	widgetType: "DateTextbox",
 
 	mixInProperties: function(localProperties, frag) {
 		// First initialize properties in super-class.
 		dojo.widget.validate.DateTextbox.superclass.mixInProperties.apply(this, arguments);
 
 		// Get properties from markup attibutes, and assign to flags object.
-		if ( localProperties.format ) { 
+		if ( localProperties.format ) {
 			this.flags.format = localProperties.format;
 		}
 	},
 
 	// Over-ride for date validation
-	isValid: function() { 
+	isValid: function() {
 		return dojo.validate.isValidDate(this.textbox.value, this.flags.format);
 	}
 
@@ -719,26 +719,26 @@ dojo.inherits(dojo.widget.validate.TimeTextbox, dojo.widget.validate.ValidationT
 
 dojo.lang.extend(dojo.widget.validate.TimeTextbox, {
 	// new subclass properties
-	widgetType: "TimeTextbox", 
+	widgetType: "TimeTextbox",
 
 	mixInProperties: function(localProperties, frag) {
 		// First initialize properties in super-class.
 		dojo.widget.validate.TimeTextbox.superclass.mixInProperties.apply(this, arguments);
 
 		// Get properties from markup attibutes, and assign to flags object.
-		if ( localProperties.format ) { 
+		if ( localProperties.format ) {
 			this.flags.format = localProperties.format;
 		}
-		if ( localProperties.amsymbol ) { 
+		if ( localProperties.amsymbol ) {
 			this.flags.amSymbol = localProperties.amsymbol;
 		}
-		if ( localProperties.pmsymbol ) { 
+		if ( localProperties.pmsymbol ) {
 			this.flags.pmSymbol = localProperties.pmsymbol;
 		}
 	},
 
 	// Over-ride for time validation
-	isValid: function() { 
+	isValid: function() {
 		return dojo.validate.isValidTime(this.textbox.value, this.flags);
 	}
 
@@ -764,22 +764,22 @@ dojo.inherits(dojo.widget.validate.UsStateTextbox, dojo.widget.validate.Validati
 
 dojo.lang.extend(dojo.widget.validate.UsStateTextbox, {
 	// new subclass properties
-	widgetType: "UsStateTextbox", 
+	widgetType: "UsStateTextbox",
 
 	mixInProperties: function(localProperties, frag) {
 		// Initialize properties in super-class.
 		dojo.widget.validate.UsStateTextbox.superclass.mixInProperties.apply(this, arguments);
 
 		// Get properties from markup attibutes, and assign to flags object.
-		if ( localProperties.allowterritories ) { 
+		if ( localProperties.allowterritories ) {
 			this.flags.allowTerritories = ( localProperties.allowterritories == "true" );
 		}
-		if ( localProperties.allowmilitary ) { 
+		if ( localProperties.allowmilitary ) {
 			this.flags.allowMilitary = ( localProperties.allowmilitary == "true" );
 		}
 	},
 
-	isValid: function() { 
+	isValid: function() {
 		return dojo.validate.us.isState(this.textbox.value, this.flags);
 	}
 
@@ -801,9 +801,9 @@ dojo.inherits(dojo.widget.validate.UsZipTextbox, dojo.widget.validate.Validation
 
 dojo.lang.extend(dojo.widget.validate.UsZipTextbox, {
 	// new subclass properties
-	widgetType: "UsZipTextbox", 
+	widgetType: "UsZipTextbox",
 
-	isValid: function() { 
+	isValid: function() {
 		return dojo.validate.us.isZipCode(this.textbox.value);
 	}
 
@@ -824,9 +824,9 @@ dojo.inherits(dojo.widget.validate.UsSocialSecurityNumberTextbox, dojo.widget.va
 
 dojo.lang.extend(dojo.widget.validate.UsSocialSecurityNumberTextbox, {
 	// new subclass properties
-	widgetType: "UsSocialSecurityNumberTextbox", 
+	widgetType: "UsSocialSecurityNumberTextbox",
 
-	isValid: function() { 
+	isValid: function() {
 		return dojo.validate.us.isSocialSecurityNumber(this.textbox.value);
 	}
 
@@ -847,9 +847,9 @@ dojo.inherits(dojo.widget.validate.UsPhoneNumberTextbox, dojo.widget.validate.Va
 
 dojo.lang.extend(dojo.widget.validate.UsPhoneNumberTextbox, {
 	// new subclass properties
-	widgetType: "UsPhoneNumberTextbox", 
+	widgetType: "UsPhoneNumberTextbox",
 
-	isValid: function() { 
+	isValid: function() {
 		return dojo.validate.us.isPhoneNumber(this.textbox.value);
 	}
 
diff --git a/webapp/src/main/webapp/src/widget/vml/Chart.js b/webapp/src/main/webapp/src/widget/vml/Chart.js
index 33b01f4fa..463322a45 100644
--- a/webapp/src/main/webapp/src/widget/vml/Chart.js
+++ b/webapp/src/main/webapp/src/widget/vml/Chart.js
@@ -72,7 +72,7 @@ dojo.lang.extend(dojo.widget.vml.Chart, {
 			}
 		}
 	},
-	
+
 	fillInTemplate:function(args,frag){
 		this.initialize();
 		this.render();
@@ -82,7 +82,7 @@ dojo.lang.extend(dojo.widget.vml.Chart, {
 	initialize:function(){
 		//	parse the data first.
 		this.parseData();
-	
+
 		// render the body of the chart, not the chart data.
 		if(this.vectorNode){ this.destroy(); }
 		this.vectorNode=document.createElement("div");
@@ -102,7 +102,7 @@ dojo.lang.extend(dojo.widget.vml.Chart, {
 		this.plotArea.style.width=plotWidth+"px";
 		this.plotArea.style.height=plotHeight+"px";
 		this.vectorNode.appendChild(this.plotArea);
-		
+
 		this.dataGroup=document.createElement("div");
 		this.dataGroup.style.position="relative";
 		this.plotArea.appendChild(this.dataGroup);
@@ -138,7 +138,7 @@ dojo.lang.extend(dojo.widget.vml.Chart, {
 		r.style.width=(this.properties.padding.left-1)+"px";
 		r.style.height=plotHeight+"px";
 		this.vectorNode.appendChild(r);
-		
+
 		r=document.createElement("v:rect");
 		r.setAttribute("fillcolor", bg);
 		r.setAttribute("stroked", "false");
@@ -177,7 +177,7 @@ dojo.lang.extend(dojo.widget.vml.Chart, {
 		line.setAttribute("strokecolor", "#666");
 		line.setAttribute("strokeweight", stroke*2+"px");
 		this.axisGroup.appendChild(line);
-		
+
 		//	labels
 		var size=10;
 
@@ -209,7 +209,7 @@ dojo.lang.extend(dojo.widget.vml.Chart, {
 		t.style.fontSize=size+"px";
 		t.innerHTML=dojo.math.round(parseFloat(this.properties.axes.y.range.max),2);
 		this.axisGroup.appendChild(t);
-		
+
 		t=document.createElement("div");
 		t.style.position="absolute";
 		t.style.top=(this.properties.height-this.properties.padding.bottom)+"px";
@@ -218,7 +218,7 @@ dojo.lang.extend(dojo.widget.vml.Chart, {
 		t.style.fontSize=size+"px";
 		t.innerHTML=dojo.math.round(parseFloat(this.properties.axes.y.range.min),2);
 		this.axisGroup.appendChild(t);
-		
+
 		//	this is last.
 		this.assignColors();
 		this._isInitialized=true;
@@ -247,7 +247,7 @@ dojo.widget.vml.Chart.Plotter=new function(){
 	var _this=this;
 	var plotters = {};
 	var types=dojo.widget.Chart.PlotTypes;
-	
+
 	this.getX=function(value, chart){
 		var v=parseFloat(value);
 		var min=chart.properties.axes.x.range.min;
@@ -267,7 +267,7 @@ dojo.widget.vml.Chart.Plotter=new function(){
 		var ofst=0;
 		if(min<0)ofst+=Math.abs(min);
 		min+=ofst; max+=ofst; v+=ofst;
-		
+
 		var ymin=chart.properties.height-chart.properties.padding.bottom;
 		var ymax=chart.properties.padding.top;
 		var y=(((ymin-ymax)/(max-min))*(max-v))+ymax;
@@ -325,7 +325,7 @@ dojo.widget.vml.Chart.Plotter=new function(){
 			bar.appendChild(fill);
 			chart.dataGroup.appendChild(bar);
 		}
-	};	
+	};
 	plotters[types.Line]=function(series, chart){
 		var tension=3;
 
@@ -357,7 +357,7 @@ dojo.widget.vml.Chart.Plotter=new function(){
 				var lastx=_this.getX(series.values[i-1].x, chart);
 				var lasty=_this.getY(series.values[i-1].value, chart);
 				var dx=x-lastx;
-				
+
 				path.push("v");
 				var cx=x-(tension-1)*(dx/tension);
 				path.push(cx+",0");
@@ -391,11 +391,11 @@ dojo.widget.vml.Chart.Plotter=new function(){
 			point.appendChild(fill);
 			chart.dataGroup.appendChild(point);
 		}
-	};	
+	};
 	plotters[types.Bubble]=function(series, chart){
 		//	added param for series[n].value: size
 		var minR=1;
-		
+
 		//	do this off the x axis?
 		var min=chart.properties.axes.x.range.min;
 		var max=chart.properties.axes.x.range.max;
@@ -405,7 +405,7 @@ dojo.widget.vml.Chart.Plotter=new function(){
 		var xmin=chart.properties.padding.left;
 		var xmax=chart.properties.width-chart.properties.padding.right;
 		var factor=(max-min)/(xmax-xmin)*25;
-		
+
 		for (var i=0; i<series.values.length; i++){
 			var size = series.values[i].size;
 			if (isNaN(parseFloat(size))) size=minR;
diff --git a/webapp/src/main/webapp/src/xml/Parse.js b/webapp/src/main/webapp/src/xml/Parse.js
index 3bcad55aa..1ee9c2e0a 100644
--- a/webapp/src/main/webapp/src/xml/Parse.js
+++ b/webapp/src/main/webapp/src/xml/Parse.js
@@ -41,16 +41,16 @@ dojo.xml.Parse = function(){
 	function getDojoTagName (node) {
 		var tagName = node.tagName;
 		if (tagName.substr(0,5).toLowerCase() != "dojo:") {
-			
+
 			if (tagName.substr(0,4).toLowerCase() == "dojo") {
 				// FIXME: this assuumes tag names are always lower case
 				return "dojo:" + tagName.substring(4).toLowerCase();
 			}
-		
+
 			// allow lower-casing
 			var djt = node.getAttribute("dojoType") || node.getAttribute("dojotype");
 			if (djt) { return "dojo:" + djt.toLowerCase(); }
-			
+
 			if (node.getAttributeNS && node.getAttributeNS(dojo.dom.dojoml,"type")) {
 				return "dojo:" + node.getAttributeNS(dojo.dom.dojoml,"type").toLowerCase();
 			}
@@ -61,7 +61,7 @@ dojo.xml.Parse = function(){
 			} catch (e) { /* FIXME: log? */ }
 
 			if (djt) { return "dojo:"+djt.toLowerCase(); }
-		
+
 			if (!dj_global["djConfig"] || !djConfig["ignoreClassNames"]) {
 				// FIXME: should we make this optionally enabled via djConfig?
 				var classes = node.className||node.getAttribute("class");
@@ -76,7 +76,7 @@ dojo.xml.Parse = function(){
 					}
 				}
 			}
-		
+
 		}
 		return tagName.toLowerCase();
 	}
@@ -101,7 +101,7 @@ dojo.xml.Parse = function(){
 				}
 				parsedNodeSet[tagName][attr].push(attributeSet[attr]);
 			}
-	
+
 			// FIXME: we might want to make this optional or provide cloning instead of
 			// referencing, but for now, we include a node reference to allow
 			// instantiated components to figure out their "roots"
@@ -109,7 +109,7 @@ dojo.xml.Parse = function(){
 			parsedNodeSet.tagName = tagName;
 			parsedNodeSet.index = thisIdx||0;
 		}
-	
+
 		var count = 0;
 		var tcn, i = 0, nodes = node.childNodes;
 		while(tcn = nodes[i++]){
@@ -143,7 +143,7 @@ dojo.xml.Parse = function(){
 					break;
 				case  dojo.dom.PROCESSING_INSTRUCTION_NODE: // processing instruction node... not meaningful here
 					break;
-				case  dojo.dom.COMMENT_NODE: // comment node... not not sure if this would ever be meaningful 
+				case  dojo.dom.COMMENT_NODE: // comment node... not not sure if this would ever be meaningful
 					break;
 				case  dojo.dom.DOCUMENT_NODE: // document node... not sure if this would ever be meaningful
 					break;
@@ -174,13 +174,13 @@ dojo.xml.Parse = function(){
 				if(	(typeof attnode == "object")&&
 					(typeof attnode.nodeValue == 'undefined')||
 					(attnode.nodeValue == null)||
-					(attnode.nodeValue == '')){ 
-					continue; 
+					(attnode.nodeValue == '')){
+					continue;
 				}
 			}
 			var nn = (attnode.nodeName.indexOf("dojo:") == -1) ? attnode.nodeName : attnode.nodeName.split("dojo:")[1];
-			parsedAttributeSet[nn] = { 
-				value: attnode.nodeValue 
+			parsedAttributeSet[nn] = {
+				value: attnode.nodeValue
 			};
 		}
 		return parsedAttributeSet;
diff --git a/webapp/src/main/webapp/src/xml/domUtil.js b/webapp/src/main/webapp/src/xml/domUtil.js
index 80c0eceac..1afa8d788 100644
--- a/webapp/src/main/webapp/src/xml/domUtil.js
+++ b/webapp/src/main/webapp/src/xml/domUtil.js
@@ -31,10 +31,10 @@ dojo.xml.domUtil = new function(){
 		DOCUMENT_FRAGMENT_NODE        : 11,
 		NOTATION_NODE                 : 12
 	}
-	
+
 	this.dojoml = "http://www.dojotoolkit.org/2004/dojoml";
 	this.idIncrement = 0;
-	
+
 	this.getTagName = function(){return dojo.dom.getTagName.apply(dojo.dom, arguments);}
 	this.getUniqueId = function(){return dojo.dom.getUniqueId.apply(dojo.dom, arguments);}
 	this.getFirstChildTag = function() {return dojo.dom.getFirstChildElement.apply(dojo.dom, arguments);}
diff --git a/webapp/src/main/webapp/src/xml/htmlUtil.js b/webapp/src/main/webapp/src/xml/htmlUtil.js
index 13a953dd4..6b98a8e27 100644
--- a/webapp/src/main/webapp/src/xml/htmlUtil.js
+++ b/webapp/src/main/webapp/src/xml/htmlUtil.js
@@ -17,13 +17,13 @@ dojo.deprecated("dojo.xml.htmlUtil", "use dojo.html instead", "0.4");
 
 dojo.xml.htmlUtil = new function(){
 	this.styleSheet = dojo.style.styleSheet;
-	
+
 	this._clobberSelection = function(){return dojo.html.clearSelection.apply(dojo.html, arguments);}
 	this.disableSelect = function(){return dojo.html.disableSelection.apply(dojo.html, arguments);}
 	this.enableSelect = function(){return dojo.html.enableSelection.apply(dojo.html, arguments);}
-	
+
 	this.getInnerWidth = function(){return dojo.style.getInnerWidth.apply(dojo.style, arguments);}
-	
+
 	this.getOuterWidth = function(node){
 		dojo.unimplemented("dojo.xml.htmlUtil.getOuterWidth");
 	}
@@ -40,7 +40,7 @@ dojo.xml.htmlUtil = new function(){
 	this.getAbsoluteX = this.totalOffsetLeft;
 
 	this.totalOffsetTop = function(){return dojo.style.totalOffsetTop.apply(dojo.style, arguments);}
-	
+
 	this.getAbsoluteY = this.totalOffsetTop;
 
 	this.getEventTarget = function(){return dojo.html.getEventTarget.apply(dojo.html, arguments);}
@@ -61,7 +61,7 @@ dojo.xml.htmlUtil = new function(){
 		dojo.deprecated("dojo.xml.htmlUtil.hasAttr", "use dojo.xml.htmlUtil.hasAttribute instead", "0.4");
 		return dojo.xml.htmlUtil.hasAttribute(node, attr);
 	}
-	
+
 	this.getClass = function(){return dojo.html.getClass.apply(dojo.html, arguments)}
 	this.hasClass = function(){return dojo.html.hasClass.apply(dojo.html, arguments)}
 	this.prependClass = function(){return dojo.html.prependClass.apply(dojo.html, arguments)}
@@ -78,27 +78,27 @@ dojo.xml.htmlUtil = new function(){
 
 	this.getElementsByClass = function() {return dojo.html.getElementsByClass.apply(dojo.html, arguments)}
 	this.getElementsByClassName = this.getElementsByClass;
-	
+
 	this.setOpacity = function() {return dojo.style.setOpacity.apply(dojo.style, arguments)}
 	this.getOpacity = function() {return dojo.style.getOpacity.apply(dojo.style, arguments)}
 	this.clearOpacity = function() {return dojo.style.clearOpacity.apply(dojo.style, arguments)}
-	
+
 	this.gravity = function(){return dojo.html.gravity.apply(dojo.html, arguments)}
-	
+
 	this.gravity.NORTH = 1;
 	this.gravity.SOUTH = 1 << 1;
 	this.gravity.EAST = 1 << 2;
 	this.gravity.WEST = 1 << 3;
-	
+
 	this.overElement = function(){return dojo.html.overElement.apply(dojo.html, arguments)}
 
 	this.insertCssRule = function(){return dojo.style.insertCssRule.apply(dojo.style, arguments)}
-	
+
 	this.insertCSSRule = function(selector, declaration, index){
 		dojo.deprecated("dojo.xml.htmlUtil.insertCSSRule", "use dojo.style.insertCssRule instead", "0.4");
 		return dojo.xml.htmlUtil.insertCssRule(selector, declaration, index);
 	}
-	
+
 	this.removeCssRule = function(){return dojo.style.removeCssRule.apply(dojo.style, arguments)}
 
 	this.removeCSSRule = function(index){
diff --git a/webapp/src/main/webapp/src/xml/svgUtil.js b/webapp/src/main/webapp/src/xml/svgUtil.js
index e6c9f052f..028fc5b01 100644
--- a/webapp/src/main/webapp/src/xml/svgUtil.js
+++ b/webapp/src/main/webapp/src/xml/svgUtil.js
@@ -14,19 +14,19 @@ dojo.provide("dojo.xml.svgUtil");
 dojo.xml.svgUtil = new function(){
 
 	this.getInnerWidth = function(node){
-		// FIXME: need to find out from dylan how to 
+		// FIXME: need to find out from dylan how to
 	}
 
 	this.getOuterWidth = function(node){
-		
+
 	}
 
 	this.getInnerHeight = function(node){
-		
+
 	}
 
 	this.getOuterHeight = function(node){
-		
+
 	}
 
 }
diff --git a/webapp/src/main/webapp/templates/README.txt b/webapp/src/main/webapp/templates/README.txt
index 298eacb6e..6685a497b 100755
--- a/webapp/src/main/webapp/templates/README.txt
+++ b/webapp/src/main/webapp/templates/README.txt
@@ -1,4 +1,4 @@
 templates directory is for jsp files that are used
 to format data.  They are views, templates and such.
 
-bdc34.
\ No newline at end of file
+bdc34.
diff --git a/webapp/src/main/webapp/templates/alpha/alphaIndex.jsp b/webapp/src/main/webapp/templates/alpha/alphaIndex.jsp
index f0e4e5785..f26459564 100644
--- a/webapp/src/main/webapp/templates/alpha/alphaIndex.jsp
+++ b/webapp/src/main/webapp/templates/alpha/alphaIndex.jsp
@@ -6,39 +6,39 @@
 <%@ page errorPage="/error.jsp"%>
 <%  /***********************************************
         alphaIndex.jsp will just display the just the index, no entites.
-         
+
         request attributres:
         'alpha' - set to currently displaying alpha, 'none' or 'all'
         'controllerParam' - parameter for controller
         'count' - count of entites in the index
         'letters' - List of STrings, letters for index.
         'servlet' - name of servlet to put in links.
-        
+
         put something like this in for debuggin: < % =  MiscWebUtils.getReqInfo(request) % >
          bdc34 2006-02-06
         **********************************************/
-       
+
 %>
 
 <c:if test="${ requestScope.showAlpha == 1 }">
 <div class='alphaIndex'>
     <c:forEach items='${requestScope.letters}' var='letter'>
         <c:if test="${letter == requestScope.alpha}"> ${requestScope.alpha }&nbsp;</c:if>
-        <c:if test="${letter != requestScope.alpha}"> 
+        <c:if test="${letter != requestScope.alpha}">
             <c:url var="url" value=".${requestScope.servlet}">
                 <c:param name="alpha">${letter}</c:param>
             </c:url>
             <a href='<c:url value="${url}&amp;${requestScope.controllerParam}"/>'>${letter} </a>
-         </c:if> 
-    </c:forEach> 
-    
-    <%  if( request.getAttribute("alpha") != null && ! "all".equalsIgnoreCase((String)request.getAttribute("alpha"))) {  %>         
+         </c:if>
+    </c:forEach>
+
+    <%  if( request.getAttribute("alpha") != null && ! "all".equalsIgnoreCase((String)request.getAttribute("alpha"))) {  %>
         <a href='<c:url value=".${requestScope.servlet}?&amp;alpha=all&amp;${requestScope.controllerParam}"/>'>all </a>
         <c:if test='${not empty requestScope.count }'>
             (${requestScope.count} that start with ${requestScope.alpha })
-        </c:if>    
+        </c:if>
      <% }else{ %>
-        (${requestScope.count})      
-     <% } %>             
+        (${requestScope.count})
+     <% } %>
 </div>
-</c:if>
\ No newline at end of file
+</c:if>
diff --git a/webapp/src/main/webapp/templates/edit/formBasic.js b/webapp/src/main/webapp/templates/edit/formBasic.js
index 151db2655..f8d5bf4ae 100644
--- a/webapp/src/main/webapp/templates/edit/formBasic.js
+++ b/webapp/src/main/webapp/templates/edit/formBasic.js
@@ -4,4 +4,4 @@ function confirmDelete() {
     var msg="Are you SURE you want to delete this record? If in doubt, CANCEL."
     return confirm(msg);
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/webapp/src/main/webapp/templates/edit/formBasic.jsp b/webapp/src/main/webapp/templates/edit/formBasic.jsp
index e6fd9cc33..1888adb0d 100644
--- a/webapp/src/main/webapp/templates/edit/formBasic.jsp
+++ b/webapp/src/main/webapp/templates/edit/formBasic.jsp
@@ -34,32 +34,32 @@
 	 <span class="note">(<sup>*</sup> Required Fields)</span></h3>
 	</div><!--entryFormHead-->
 	</th></tr>
-	
+
 	<c:if test="${!empty globalErrorMsg}">
 	    <tr><td><span class="notice">${globalErrorMsg}</span></td></tr>
 	</c:if>
-	
+
 	<jsp:include page="${formJsp}"/>
-	
+
 	<tr class="editformcell">
 		<td colspan="${colspan}">
 			<c:choose>
 				<c:when test='${_action == "insert"}'>
 					<input id="primaryAction" type="submit" class="submit" name="_insert" value="Create New Record"/>
 				</c:when>
-				<c:otherwise>		
+				<c:otherwise>
     				<input id="primaryAction" type="submit" class="submit" name="_update" value="Submit Changes"/>
-                    <c:if test="${ ! (_cancelButtonDisabled == 'disabled') }">	
+                    <c:if test="${ ! (_cancelButtonDisabled == 'disabled') }">
 				        <input type="submit" class="delete" name="_delete" onclick="return confirmDelete();" value="Delete"/>
                     </c:if>
 				</c:otherwise>
 			</c:choose>
-			
+
 			<input type="reset"  class="delete" value="Reset"/>
-			
+
             <c:choose>
                 <c:when test="${!empty formOnCancel}">
-                    <input type="submit" class="delete" name="_cancel" onclick="${formOnCancel}" value="Cancel"/> 
+                    <input type="submit" class="delete" name="_cancel" onclick="${formOnCancel}" value="Cancel"/>
                 </c:when>
                 <c:otherwise>
 		            <input type="submit" class="delete" name="_cancel" value="Cancel"/>
diff --git a/webapp/src/main/webapp/templates/edit/formContact.jsp b/webapp/src/main/webapp/templates/edit/formContact.jsp
index 92e0ff098..797a2f921 100644
--- a/webapp/src/main/webapp/templates/edit/formContact.jsp
+++ b/webapp/src/main/webapp/templates/edit/formContact.jsp
@@ -31,9 +31,9 @@
 		<!--<span class="entryFormHeadInstructions">(<sup>*</sup> Required Fields)</span>-->
 
 
-	
+
 <span class="warning">${globalErrorMsg}</span>
-	
+
 	<jsp:include page="${formJsp}"/>
 	<br />
 
@@ -41,19 +41,19 @@
 				<c:when test='${_action == "insert"}'>
 					<input id="primaryAction" type="submit" class="submit" name="_insert" value="Create new record"/>
 				</c:when>
-				<c:otherwise>		
+				<c:otherwise>
     				<input id="primaryAction" type="submit" class="submit" name="_update" value="Save changes"/>
-                    <c:if test="${ ! (_cancelButtonDisabled == 'disabled') }">	
+                    <c:if test="${ ! (_cancelButtonDisabled == 'disabled') }">
 				        <!--<input type="submit" class="delete" name="_delete" onclick="return confirmDelete();" value="Delete"/>-->
                     </c:if>
 				</c:otherwise>
 			</c:choose>
-			
+
 			<!--<input type="reset" class="delete" value="Reset"/>-->
-			
+
             <c:choose>
                 <c:when test="${!empty formOnCancel}">
-                    <input type="submit" class="delete" name="_cancel" onclick="${formOnCancel}" value="Cancel"/> 
+                    <input type="submit" class="delete" name="_cancel" onclick="${formOnCancel}" value="Cancel"/>
                 </c:when>
                 <c:otherwise>
 		            <input type="submit" class="delete" name="_cancel" value="Cancel"/>
diff --git a/webapp/src/main/webapp/templates/edit/specific/applicationBean_retry.jsp b/webapp/src/main/webapp/templates/edit/specific/applicationBean_retry.jsp
index 725996746..bcf003adf 100644
--- a/webapp/src/main/webapp/templates/edit/specific/applicationBean_retry.jsp
+++ b/webapp/src/main/webapp/templates/edit/specific/applicationBean_retry.jsp
@@ -10,7 +10,7 @@
 <% request.setAttribute("requestedActions", SimplePermission.EDIT_SITE_INFORMATION.ACTION); %>
 <vitro:confirmAuthorization />
 
-<c:set var="appNameLabel" value="Site name"/> 
+<c:set var="appNameLabel" value="Site name"/>
 <label for="site-name">${appNameLabel}<span class="note"> (max 50 characters)</span></label>
 <input type="text" name="ApplicationName" value="<form:value name="ApplicationName"/>" ${longField} maxlength="50" />
 <c:set var="ApplicationNameError"><form:error name="ApplicationName"/></c:set>
@@ -18,7 +18,7 @@
     <span class="notice"><c:out value="${ApplicationNameError}"/></span>
 </c:if>
 
-<!-- With introduction of new logo that includes tagline as part of the image, hiding this field for now to reduce user confusion -->        
+<!-- With introduction of new logo that includes tagline as part of the image, hiding this field for now to reduce user confusion -->
 <!-- <tr class="editformcell">
     <td valign="top" colspan="2">
         <b>Tagline </b> <i>appears in header, just to the right of the logo (leave blank to have no tagline)</i><br />
@@ -74,7 +74,7 @@
         <label>Banner image</label>
         <input type="text" name="BannerImage" value="<form:value name="BannerImage"/>" style="width:90%" maxlength="255" />
         <font color="red"><form:error name="BannerImage"/></font>
-  
+
         <label>Banner image width</label>
         <input type="text" name="BannerWidth" value="<form:value name="BannerWidth"/>" ${smallCell} maxlength="11" />
         <font color="red"><form:error name="BannerWidth"/></font>
@@ -94,5 +94,5 @@
         <label>Logotype image height</label>
         <input type="text" name="LogotypeHeight" value="<form:value name="LogotypeHeight"/>" ${smallCell} maxlength="11" />
         <font color="red"><form:error name="LogotypeHeight"/></font>
- 
--->
\ No newline at end of file
+
+-->
diff --git a/webapp/src/main/webapp/templates/edit/specific/cardinalityRestriction_retry.jsp b/webapp/src/main/webapp/templates/edit/specific/cardinalityRestriction_retry.jsp
index 498b02962..5d4efd105 100644
--- a/webapp/src/main/webapp/templates/edit/specific/cardinalityRestriction_retry.jsp
+++ b/webapp/src/main/webapp/templates/edit/specific/cardinalityRestriction_retry.jsp
@@ -33,5 +33,5 @@ ${requestScope.restrictionType}
         <input name="cardinality"/>
 
     </td>
-  
+
 </tr>
diff --git a/webapp/src/main/webapp/templates/edit/specific/classes_edit.jsp b/webapp/src/main/webapp/templates/edit/specific/classes_edit.jsp
index 9a0f9fef4..9e8eef2fd 100644
--- a/webapp/src/main/webapp/templates/edit/specific/classes_edit.jsp
+++ b/webapp/src/main/webapp/templates/edit/specific/classes_edit.jsp
@@ -2,8 +2,8 @@
 
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" 
-          xmlns:c="http://java.sun.com/jsp/jstl/core" 
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+          xmlns:c="http://java.sun.com/jsp/jstl/core"
           xmlns:form="http://vitro.mannlib.cornell.edu/edit/tags"
           version="2.0">
 <jsp:directive.page import="edu.cornell.mannlib.vitro.webapp.beans.VClass"/>
@@ -123,7 +123,7 @@
 		</form>
 	</td>
 </tr>
-<tr><td colspan="3"><hr/></td></tr>			
+<tr><td colspan="3"><hr/></td></tr>
 <!-- _______________________________________________ subclasses _____________________________________________ -->
 <tr valign="bottom" align="center">
 	<td colspan="2" valign="bottom" align="left">
@@ -143,8 +143,8 @@
 						${subclass.pickListName}
 					    </c:otherwise>
 				        </c:choose>
-				</li>						
-			</c:forEach>	
+				</li>
+			</c:forEach>
 			</ul>
 			<input type="hidden" name="SuperclassURI" value="${VClass.URI}"/>
 			<input type="submit" class="form-button" value="Remove Checked Subclass Links"/>
@@ -188,7 +188,7 @@
 					    </c:otherwise>
                     </c:choose>
 				</li>
-			</c:forEach>	
+			</c:forEach>
 			</ul>
 			<input type="hidden" name="SuperclassURI" value="${VClass.URI}"/>
 			<input type="submit" class="form-button" value="Remove Checked Equivalent Classes"/>
@@ -230,7 +230,7 @@
 					</c:otherwise>
 				    </c:choose>
 				</li>
-			</c:forEach>	
+			</c:forEach>
 			</ul>
 			<input type="hidden" name="SuperclassURI" value="${VClass.URI}"/>
 			<input type="submit" class="form-button" value="Remove Checked Disjoint Classes"/>
@@ -287,11 +287,11 @@
                     </select>
                     <input type="submit" class="form-button" value="Apply Restriction"/>
                     <input type="hidden" name="VClassURI" value="${VClass.URI}"/>
-                    <p>Restrict: 
+                    <p>Restrict:
                         <input type="radio" name="propertyType" value="object" checked="checked"/> object property
                         <input type="radio" name="propertyType" value="data"/> data property
                     </p>
-                </form>       
+                </form>
         </td>
 </tr>
 </table>
diff --git a/webapp/src/main/webapp/templates/edit/specific/dataprops_edit.jsp b/webapp/src/main/webapp/templates/edit/specific/dataprops_edit.jsp
index 3b1d7ce89..e6dce12d7 100644
--- a/webapp/src/main/webapp/templates/edit/specific/dataprops_edit.jsp
+++ b/webapp/src/main/webapp/templates/edit/specific/dataprops_edit.jsp
@@ -10,7 +10,7 @@
 
 <jsp:include page="/templates/edit/fetch/vertical.jsp"/>
 
-<!--    
+<!--
 /**
  *
  * @version 0.8
@@ -35,7 +35,7 @@
 			<input type="hidden" name="propertyName" value="${datatypeProperty.publicName}"/>
 			<input type="hidden" name="propertyType" value="data"/>
 			<input type="submit" class="form-button" value="Show Classes With a Restriction on This Property"/>
-		</form>		
+		</form>
         <form action="listDataPropertyStatements" method="get">
         	<input type="hidden" name="propertyURI" value="${datatypeProperty.URI}"/>
         	from <input type="text" name="startAt" value="1" size="2"/>
@@ -89,7 +89,7 @@
             </ul>
             <input type="hidden" name="SubpropertyURI" value="${datatypeProperty.URI}"/>
             <input type="hidden" name="operation" value="remove"/>
-            <input type="hidden" name="_epoKey" value="${epoKey}"/> 
+            <input type="hidden" name="_epoKey" value="${epoKey}"/>
             <input type="submit" class="form-button" value="Remove Checked Superproperty Links"/>
         </form>
         </c:if>
@@ -104,7 +104,7 @@
         </form>
     </td>
 </tr>
-<tr><td colspan="3"><hr/></td></tr>         
+<tr><td colspan="3"><hr/></td></tr>
 <!-- _______________________________________________ subproperties _____________________________________________ -->
 <tr valign="bottom" align="center">
     <td colspan="2" valign="bottom" align="left">
@@ -117,8 +117,8 @@
                 </c:url>
                 <li><input type="checkbox" name="SubpropertyURI" value="${subproperty.URI}" class="form-item"/>
                      <a href="${subpropertyURL}"> ${subproperty.pickListName} </a>
-                </li>                       
-            </c:forEach>    
+                </li>
+            </c:forEach>
             </ul>
             <input type="hidden" name="SuperpropertyURI" value="${datatypeProperty.URI}"/>
             <input type="submit" class="form-button" value="Remove Checked Subproperty Links"/>
@@ -150,8 +150,8 @@
                 </c:url>
                 <li><input type="checkbox" name="SubpropertyURI" value="${eqproperty.URI}" class="form-item"/>
                      <a href="${eqpropertyURL}"> ${eqproperty.pickListName} </a>
-                </li>                       
-            </c:forEach>    
+                </li>
+            </c:forEach>
             </ul>
             <input type="hidden" name="SuperpropertyURI" value="${datatypeProperty.URI}"/>
             <input type="submit" class="form-button" value="Remove Checked Equivalent Property Links"/>
diff --git a/webapp/src/main/webapp/templates/edit/specific/entity_retry.jsp b/webapp/src/main/webapp/templates/edit/specific/entity_retry.jsp
index 2e8fac997..96d06f7df 100644
--- a/webapp/src/main/webapp/templates/edit/specific/entity_retry.jsp
+++ b/webapp/src/main/webapp/templates/edit/specific/entity_retry.jsp
@@ -15,7 +15,7 @@
     </tr>
 
     <!-- begin datatype properties section -->
-    
+
     <tr class="editformcell" style="border-collapse:collapse;">
         <td colspan="2">
             <ul style="margin-left:0;padding-left:0;list-style-type:none">
@@ -24,7 +24,7 @@
 	</td>
     </tr>
 
-    <!-- end datatype properties section -->    
+    <!-- end datatype properties section -->
 
 
 
diff --git a/webapp/src/main/webapp/templates/edit/specific/entity_retry_init.jsp b/webapp/src/main/webapp/templates/edit/specific/entity_retry_init.jsp
index b4bcba33e..670cdd286 100644
--- a/webapp/src/main/webapp/templates/edit/specific/entity_retry_init.jsp
+++ b/webapp/src/main/webapp/templates/edit/specific/entity_retry_init.jsp
@@ -28,5 +28,5 @@
 			</select>
         </td>
     </tr>
-    
+
 
diff --git a/webapp/src/main/webapp/templates/edit/specific/ents_edit.jsp b/webapp/src/main/webapp/templates/edit/specific/ents_edit.jsp
index 12b9e8d95..6c039ff5e 100644
--- a/webapp/src/main/webapp/templates/edit/specific/ents_edit.jsp
+++ b/webapp/src/main/webapp/templates/edit/specific/ents_edit.jsp
@@ -2,10 +2,10 @@
 
 <% /* For now, not using XML syntax because the output XHTML is not indented */ %>
 <% /* <?xml version="1.0" encoding="UTF-8"?> */ %>
-<% /* <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" 
+<% /* <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
           xmlns:c="http://java.sun.com/jsp/jstl/core"
           xmlns:form="http://vitro.mannlib.cornell.edu/edit/tags"
-          version="2.0"> */ %> 
+          version="2.0"> */ %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
 <%@ page import="edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper" %>
@@ -30,14 +30,14 @@
             	<input type="submit" class="form-button" value="Display This Individual (public)"/>
             	<input type="hidden" name="uri" value="${individual.URI}"/>
         	</form>
-        	
-        	<c:set var="query" 
+
+        	<c:set var="query"
                  value="PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
                         PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
                         SELECT   ?pred ?obj ?graph
-                        WHERE 
+                        WHERE
                         {
-                          GRAPH ?graph { <${entity.URI}> ?pred ?obj} 
+                          GRAPH ?graph { <${entity.URI}> ?pred ?obj}
                         } ORDER BY ?graph ?pred
                         limit 10000"/>
           <form action="admin/sparqlquery" method="get">
@@ -46,11 +46,11 @@
             <input type="submit" class="form-button" value="Raw Statements with This Resource as Subject"/>
           </form>
 
-          <c:set var="query" 
+          <c:set var="query"
                  value="PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
                         PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
                         SELECT ?sub ?pred ?graph
-                        WHERE 
+                        WHERE
                         {
                           GRAPH ?graph { ?sub ?pred <${entity.URI}> }
                         } ORDER BY ?graph ?pred
@@ -60,7 +60,7 @@
             <input type="hidden" name="resultFormat" value="text/plain"/>
             <input type="submit" class="form-button" value="Raw Statements with This Resource as Object"/>
           </form>
-        	
+
     	</td>
     	<td valign="bottom" align="center">
         	<form action="editForm" method="get">
@@ -68,8 +68,8 @@
             	<input name="controller" type = "hidden" value="Entity" />
             	<input type="submit" class="form-button" value="Edit This Individual"/>
         	</form><br/>
-	
-        	<c:if test="${!empty individual.externalIds}"> 
+
+        	<c:if test="${!empty individual.externalIds}">
 	        	<form action="editForm" method="get">
 	            	<select name="multiplexedParam" class="form-item">
 	            		<form:option name="externalIds"/>
@@ -97,9 +97,9 @@
     	</td>
     </tr>
     <tr><td colspan="3"><hr/></td></tr>
-    
-    <!-- TYPES --> 
-    
+
+    <!-- TYPES -->
+
     <tr valign="bottom" align="center">
 	<td colspan="1" valign="bottom" align="left">
 	    <c:if test="${!empty types}">
@@ -113,7 +113,7 @@
 					<c:param name="uri" value="${type.URI}"/>
 				</c:url>
 				<li><input type="checkbox" name="TypeURI" value="${type.URI}" class="form-item"/><a href="${typeURL}"> ${type.pickListName} </a></li>
-			</c:forEach>	
+			</c:forEach>
 			</ul>
 			<input type="hidden" name="individualURI" value="${individual.URI}"/>
 			<input type="submit" class="form-button" value="Remove Checked Asserted Types"/>
@@ -123,20 +123,20 @@
              </c:if>
         <form action="editForm" method="get">
 			<input type="hidden" name="controller" value="IndividualType"/>
-			<input type="hidden" name="IndividualURI" value="${individual.URI}"/> 
+			<input type="hidden" name="IndividualURI" value="${individual.URI}"/>
 			<input type="submit" class="form-button" value="Add Type"/>
 		</form>
-	</td>    
+	</td>
 
-<td colspan="2">    
+<td colspan="2">
     &nbsp; <!--  empty now that flags are gone -->
 </td>
 
 </tr>
-  
+
 	</table>
 
-	<c:if test="${dwrDisabled != true}"> 
+	<c:if test="${dwrDisabled != true}">
     	<div id="entityUriForDwr" style="visibility:hidden;">${individual.URI}</div>
     		<div>
         	<table class="form-background" border="0" cellpadding="2" cellspacing="2" width="100%">
@@ -186,8 +186,8 @@
                 	<tr><td>Object Individual:</td>
                     	<td colspan="9"><select id="entitiesList" class="form-item"><option>select individual</option></select></td>
                 	</tr>
-                	
-                	
+
+
                 	<tr>
                     	<td><input type="button" id="saveButt" class="form-button"
                                	   value="Save" onclick="writeProp()"/></td>
diff --git a/webapp/src/main/webapp/templates/edit/specific/fauxProperty_retry.jsp b/webapp/src/main/webapp/templates/edit/specific/fauxProperty_retry.jsp
index d47fa1c61..beeae3259 100644
--- a/webapp/src/main/webapp/templates/edit/specific/fauxProperty_retry.jsp
+++ b/webapp/src/main/webapp/templates/edit/specific/fauxProperty_retry.jsp
@@ -108,8 +108,8 @@
             </c:when>
             <c:otherwise>
                 <input name="CollateBySubclass" type="checkbox" value="TRUE"/>collate by subclass
-            </c:otherwise>            
-        </c:choose>            
+            </c:otherwise>
+        </c:choose>
     </td>
 </tr>
 
diff --git a/webapp/src/main/webapp/templates/edit/specific/hasValueRestriction_retry.jsp b/webapp/src/main/webapp/templates/edit/specific/hasValueRestriction_retry.jsp
index 9f1568b44..d3f167237 100644
--- a/webapp/src/main/webapp/templates/edit/specific/hasValueRestriction_retry.jsp
+++ b/webapp/src/main/webapp/templates/edit/specific/hasValueRestriction_retry.jsp
@@ -7,16 +7,16 @@
     <td>
 
         <b>has value</b><br/>
-        <c:choose>    
-            <c:when test="${requestScope.propertyType eq 'object'}">    
+        <c:choose>
+            <c:when test="${requestScope.propertyType eq 'object'}">
                 <p><input name="ValueIndividual"/> <em>enter complete URI</em> </p> <!-- TODO: make nice way of dealing with picklists -->
             </c:when>
             <c:otherwise>
                 <p>
                     <input name="ValueLexicalForm"/>
-                    datatype <select name="ValueDatatype"> 
+                    datatype <select name="ValueDatatype">
                         <form:option name="ValueDatatype"/>
-                    </select> 
+                    </select>
                 </p>
             </c:otherwise>
         </c:choose>
diff --git a/webapp/src/main/webapp/templates/edit/specific/merge_result.jsp b/webapp/src/main/webapp/templates/edit/specific/merge_result.jsp
index 63dd30147..ce00e01f5 100644
--- a/webapp/src/main/webapp/templates/edit/specific/merge_result.jsp
+++ b/webapp/src/main/webapp/templates/edit/specific/merge_result.jsp
@@ -7,4 +7,4 @@
 
 <h3>Merge Individuals</h3>
 <%String result = (String) request.getAttribute("result");%>
-<p><b><%=result%></b></p>
\ No newline at end of file
+<p><b><%=result%></b></p>
diff --git a/webapp/src/main/webapp/templates/edit/specific/ontology_retry.jsp b/webapp/src/main/webapp/templates/edit/specific/ontology_retry.jsp
index 314561f61..ed95e3b87 100644
--- a/webapp/src/main/webapp/templates/edit/specific/ontology_retry.jsp
+++ b/webapp/src/main/webapp/templates/edit/specific/ontology_retry.jsp
@@ -38,7 +38,7 @@
 		</td>
 	</tr>
 <script  type="text/javascript">
-$(document).ready(function() {   
+$(document).ready(function() {
       var source = "";
     $('input#primaryAction').click(function() {
         source = "submit";
diff --git a/webapp/src/main/webapp/templates/edit/specific/properties2properties_retry.jsp b/webapp/src/main/webapp/templates/edit/specific/properties2properties_retry.jsp
index 95dbf425e..0b4cb0e54 100644
--- a/webapp/src/main/webapp/templates/edit/specific/properties2properties_retry.jsp
+++ b/webapp/src/main/webapp/templates/edit/specific/properties2properties_retry.jsp
@@ -35,6 +35,6 @@
             <span class="warning"><form:error name="SubpropertyURI"/></span>
         </td>
     </tr>
-    
+
     <input type="hidden" name="operation" value="${operation}" />
-    <input type="hidden" name="opMode" value="${opMode}" />
\ No newline at end of file
+    <input type="hidden" name="opMode" value="${opMode}" />
diff --git a/webapp/src/main/webapp/templates/edit/specific/property_retry.jsp b/webapp/src/main/webapp/templates/edit/specific/property_retry.jsp
index 8b4c1a54e..5cb3682d0 100644
--- a/webapp/src/main/webapp/templates/edit/specific/property_retry.jsp
+++ b/webapp/src/main/webapp/templates/edit/specific/property_retry.jsp
@@ -91,7 +91,7 @@
     <td valign="top" style="vertical-align:top;" colspan="1">
         <b>Inverse label</b><br/>
         <input type="text" class="fullWidthInput" name="RangePublic" value="<form:value name="RangePublic"/>" maxlength="80" /><br/>
-        <br/> 
+        <br/>
         <c:set var="RangePublicError"><form:error name="RangePublic"/></c:set>
         <c:if test="${!empty RangePublicError}">
             <span class="notice"><c:out value="${RangePublicError}"/></span>
@@ -122,7 +122,7 @@
                 <input name="Transitive" type="checkbox" value="TRUE"/>transitive
             </c:otherwise>
         </c:choose>
-        <span class="checkboxSpacer">&nbsp;</span>   
+        <span class="checkboxSpacer">&nbsp;</span>
             <c:choose>
                <c:when test="${symmetric}">
                    <input name="Symmetric" type="checkbox" value="TRUE" checked="checked"/> symmetric
@@ -142,7 +142,7 @@
                 <input name="Functional" type="checkbox" value="TRUE"/> functional
             </c:otherwise>
         </c:choose>
-        <span class="checkboxSpacer">&nbsp;</span> 
+        <span class="checkboxSpacer">&nbsp;</span>
         <c:choose>
             <c:when test="${inverseFunctional}">
                 <input name="InverseFunctional" type="checkbox" value="TRUE" checked="checked"/> inverse functional
@@ -236,8 +236,8 @@
             </c:when>
             <c:otherwise>
                 <input name="CollateBySubclass" type="checkbox" value="TRUE"/>collate by subclass
-            </c:otherwise>            
-        </c:choose>            
+            </c:otherwise>
+        </c:choose>
     </td>
 </tr>
 <tr class="editformcell" >
@@ -267,12 +267,12 @@
 <tr class="editformcell">
     <td valign="top" colspan="2">
         <%-- Removed "Number of individuals to display" control per NIHVIVO-3921 --%>
-    </td>    
+    </td>
     <td valign="top" colspan="3">
         <b>Sort direction</b> for related individuals, alphabetically by their name (rdfs:label)<br/>
         <input type="text" class="shortInput" name="DomainEntitySortDirection" value="<form:value name="DomainEntitySortDirection"/>" /><br/>
         <i>blank for ascending, &quot;desc&quot; for descending</i><br/>
-        <i><b>Note:</b> will be ignored if a custom list view has been configured for this property</i><br/> 
+        <i><b>Note:</b> will be ignored if a custom list view has been configured for this property</i><br/>
         <c:set var="DomainEntitySortDirectionError"><form:error name="DomainEntitySortDirection"/></c:set>
         <c:if test="${!empty DomainEntitySortDirectionError}">
             <span class="notice"><c:out value="${DomainEntitySortDirectionError}"/></span>
diff --git a/webapp/src/main/webapp/templates/edit/specific/props_edit.jsp b/webapp/src/main/webapp/templates/edit/specific/props_edit.jsp
index 6a5b62409..d9eaba69c 100644
--- a/webapp/src/main/webapp/templates/edit/specific/props_edit.jsp
+++ b/webapp/src/main/webapp/templates/edit/specific/props_edit.jsp
@@ -37,7 +37,7 @@
         <form action="showObjectPropertyHierarchy" method="get">
 	    	<input type="hidden" name="propertyUri" value="${property.URI}"/>
             <input type="submit" class="form-button" value="Show Hierarchy below This Property"/>
-        </form>      
+        </form>
         <form action="listVClassWebapps" method="get">
 			<input type="hidden" name="showPropertyRestrictions" value="true"/>
 			<input type="hidden" name="propertyURI" value="${property.URI}"/>
@@ -121,7 +121,7 @@
 			      <a href="${fauxpropertyURL}">${fauxproperty.pickListName}</a>
 			      domain: ${fauxproperty.domainLabel},
 			    </c:otherwise>
-			  </c:choose> 
+			  </c:choose>
 			  range: ${fauxproperty.rangeLabel}
 			</li>
 		  </ul>
@@ -158,7 +158,7 @@
 			</ul>
 			<input type="hidden" name="SubpropertyURI" value="${property.URI}"/>
 			<input type="hidden" name="operation" value="remove"/>
-		    <input type="hidden" name="_epoKey" value="${epoKey}"/>	
+		    <input type="hidden" name="_epoKey" value="${epoKey}"/>
 			<input type="submit" class="form-button" value="Remove Checked Superproperty Links"/>
 		</form>
 	    </c:if>
@@ -172,7 +172,7 @@
 		</form>
 	</td>
 </tr>
-<tr><td colspan="3"><hr/></td></tr>			
+<tr><td colspan="3"><hr/></td></tr>
 <!-- _______________________________________________ subproperties _____________________________________________ -->
 <tr valign="bottom" align="center">
 	<td colspan="2" valign="bottom" align="left">
@@ -185,8 +185,8 @@
 				</c:url>
 				<li><input type="checkbox" name="SubpropertyURI" value="${subproperty.URI}" class="form-item"/>
 					 <a href="${subpropertyURL}"> ${subproperty.pickListName} </a>
-				</li>						
-			</c:forEach>	
+				</li>
+			</c:forEach>
 			</ul>
 			<input type="hidden" name="SuperpropertyURI" value="${property.URI}"/>
 			<input type="submit" class="form-button" value="Remove Checked Subproperty Links"/>
@@ -203,7 +203,7 @@
 			<input type="submit" class="form-button" value="New Link to Subproperty"/>
 		</form>
 		<form action="editForm" method="get">
-			<input type="hidden" name="controller" value="Property"/> 
+			<input type="hidden" name="controller" value="Property"/>
 			<input type="hidden" name="parentId" value="${property.URI}" />
 			<input type="submit" class="form-button" value="Add New Subproperty of This Property"/>
 		</form>
@@ -222,8 +222,8 @@
                 </c:url>
                 <li><input type="checkbox" name="SubpropertyURI" value="${eqproperty.URI}" class="form-item"/>
                      <a href="${eqpropertyURL}"> ${eqproperty.pickListName} </a>
-                </li>                       
-            </c:forEach>    
+                </li>
+            </c:forEach>
             </ul>
             <input type="hidden" name="SuperpropertyURI" value="${property.URI}"/>
             <input type="submit" class="form-button" value="Remove Checked Equivalent Property Links"/>
diff --git a/webapp/src/main/webapp/templates/edit/specific/upload_rdf.jsp b/webapp/src/main/webapp/templates/edit/specific/upload_rdf.jsp
index 8ec42e696..948235d4b 100644
--- a/webapp/src/main/webapp/templates/edit/specific/upload_rdf.jsp
+++ b/webapp/src/main/webapp/templates/edit/specific/upload_rdf.jsp
@@ -13,19 +13,19 @@
 
 <form action="uploadRDF" method="post"  enctype="multipart/form-data" >
 
-<c:if test="${!empty param.errMsg}">       
+<c:if test="${!empty param.errMsg}">
     <p><strong class="warning">${errMsg}</strong></p>
 </c:if>
 
     <p>Enter Web-accessible URL of document containing RDF to add or remove:</p>
     <p><input name="rdfUrl" type="text" style="width:67%;" value="<c:out value='${param.rdfUrl}'/>"/></p>
-    
+
     <p>Or upload a file from your computer: </p>
     <p><input type="file" name="rdfStream" size="60"/> </p>
-    
+
     <ul style="list-style-type:none;">
-        <li><input type="radio" name="mode" value="directAddABox" checked="checked"/>add instance data (supports large data files)</li> 
-        <li><input type="radio" name="mode" value="add"/>add mixed RDF (instances and/or ontology)</li> 
+        <li><input type="radio" name="mode" value="directAddABox" checked="checked"/>add instance data (supports large data files)</li>
+        <li><input type="radio" name="mode" value="add"/>add mixed RDF (instances and/or ontology)</li>
         <li><input type="radio" name="mode" value="remove"/>remove mixed RDF (instances and/or ontology)</li>
     </ul>
 
@@ -37,7 +37,7 @@
     </select>
     <p><input type="checkbox" name="makeClassgroups" value="true"/> create classgroups automatically</p>
 
-    <p><input id="submit" type="submit" name="submit" value="submit"/></p>     
+    <p><input id="submit" type="submit" name="submit" value="submit"/></p>
 </form>
 
 </div>
diff --git a/webapp/src/main/webapp/templates/edit/specific/user_retry_head.jsp b/webapp/src/main/webapp/templates/edit/specific/user_retry_head.jsp
index 5b5d9e426..92d6b8f29 100644
--- a/webapp/src/main/webapp/templates/edit/specific/user_retry_head.jsp
+++ b/webapp/src/main/webapp/templates/edit/specific/user_retry_head.jsp
@@ -3,7 +3,7 @@
 <script language="JavaScript" type="text/javascript">
 <!--
      var bypassValidateUF = false;
-     
+
      function forceCancel(theForm) {           // we don't want validation to stop us if we're canceling
          theForm.Md5password.value = "CANCEL"; // a dummy string to force validation to succeed
          theForm.passwordConfirmation.value = theForm.Md5password.value;
@@ -35,7 +35,7 @@
              theForm.LastName.focus();
              return false;
          }
-		 else {    
+		 else {
              return true;
          }
      }
@@ -56,11 +56,11 @@
              return false;
          }
          if (theForm.Md5password.value.length < 6 || theForm.Md5password.value.length > 12) {
-             alert("Please enter a password between 6 and 12 characters long."); 
+             alert("Please enter a password between 6 and 12 characters long.");
              theForm.Md5password.focus();
              return false;
-         } 
- 		 else {    
+         }
+ 		 else {
              return true;
          }
      }
@@ -69,7 +69,7 @@
         bypassValidateUF = true;
         var msg="Are you SURE you want to delete this user? If in doubt, CANCEL."
         var answer = confirm(msg)
-        if ( answer ) 
+        if ( answer )
                 return true;
         else
                 bypassValidateUF = false;
diff --git a/webapp/src/main/webapp/templates/entity/entityListForTabs.jsp b/webapp/src/main/webapp/templates/entity/entityListForTabs.jsp
index e085127e0..3ea942a80 100644
--- a/webapp/src/main/webapp/templates/entity/entityListForTabs.jsp
+++ b/webapp/src/main/webapp/templates/entity/entityListForTabs.jsp
@@ -31,7 +31,7 @@
 		<c:param name="uri" value="${ent.URI}"/>
 	</c:url>
         <li>
-            <a href='<c:out value="${entHref}"/>'>${ent.name}</a> 
+            <a href='<c:out value="${entHref}"/>'>${ent.name}</a>
 			<c:if test="${!empty ent.moniker}">
 			  <span class="tab-moniker">
 				| <c:out value="${ent.moniker}"/>
@@ -45,7 +45,7 @@
 				</c:forEach>
 			</c:if>
 			<c:set var="anchorText" value="${ent.anchor}"/>
-						
+
 			<c:if test="${(!empty customSearchView) && (!empty anchorText)}">
                 <c:set scope="request" var="individual" value="${ent}"/>
                 <c:if test="${!empty ent.url}">
@@ -55,8 +55,8 @@
                 <c:remove var="individual"/>
                 <c:remove var="individualURL"/>
                 <c:remove var="anchorText"/>
-			</c:if>		
-			
+			</c:if>
+
             <c:if test="${!empty anchorText}">
               <span class="tab-extLink"> |
                 <c:choose>
@@ -86,8 +86,8 @@
 </ul>
 
 <%-- Show pages to select from --%>
-<%  
-if( request.getAttribute("alpha") != null && ! "all".equalsIgnoreCase((String)request.getAttribute("alpha"))) {  
+<%
+if( request.getAttribute("alpha") != null && ! "all".equalsIgnoreCase((String)request.getAttribute("alpha"))) {
   request.setAttribute("pageAlpha",request.getAttribute("alpha"));
 }else{
   request.setAttribute("pageAlpha",request.getAttribute("all"));
@@ -100,8 +100,8 @@ if( request.getAttribute("alpha") != null && ! "all".equalsIgnoreCase((String)re
 	<c:forEach items='${requestScope.pages }' var='page'>
 	   <c:url var='pageUrl' value=".${requestScope.servlet}">
 	     <c:param name ="primary">${requestScope.tabId}</c:param>
-	     <c:param name="page">${page.index}</c:param>	     
-	     <c:if test="${not empty requestScope.pageAlpha}">	     
+	     <c:param name="page">${page.index}</c:param>
+	     <c:if test="${not empty requestScope.pageAlpha}">
 	       <c:param name="alpha">${requestScope.pageAlpha}</c:param>
           </c:if>
 	   </c:url>
@@ -109,8 +109,8 @@ if( request.getAttribute("alpha") != null && ! "all".equalsIgnoreCase((String)re
 	     ${page.text}
 	   </c:if>
 	   <c:if test="${ not page.selected }">
-	     <a class="minimumFontMain" href="${pageUrl}">${page.text} </a>    
-	   </c:if>   
+	     <a class="minimumFontMain" href="${pageUrl}">${page.text} </a>
+	   </c:if>
 	</c:forEach>
     </div>
 </c:if>
diff --git a/webapp/src/main/webapp/templates/entity/entityListPages.jsp b/webapp/src/main/webapp/templates/entity/entityListPages.jsp
index decc0637c..737b147ff 100644
--- a/webapp/src/main/webapp/templates/entity/entityListPages.jsp
+++ b/webapp/src/main/webapp/templates/entity/entityListPages.jsp
@@ -4,8 +4,8 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <%-- Show pages to select from --%>
-<%  
-if( request.getAttribute("alpha") != null && ! "all".equalsIgnoreCase((String)request.getAttribute("alpha"))) {  
+<%
+if( request.getAttribute("alpha") != null && ! "all".equalsIgnoreCase((String)request.getAttribute("alpha"))) {
   request.setAttribute("pageAlpha",request.getAttribute("alpha"));
 }else{
   request.setAttribute("pageAlpha",request.getAttribute("all"));
@@ -13,13 +13,13 @@ if( request.getAttribute("alpha") != null && ! "all".equalsIgnoreCase((String)re
 %>
 
 <c:if test="${ requestScope.showPages }">
-    <div class="searchpages minimumFontMain">    
-    
+    <div class="searchpages minimumFontMain">
+
     Pages:
     <c:forEach items='${requestScope.pages }' var='page'>
-       <c:url var='pageUrl' value=".${requestScope.servlet}">                           
-         <c:param name="page">${page.index}</c:param>        
-         <c:if test="${not empty requestScope.alpha}">       
+       <c:url var='pageUrl' value=".${requestScope.servlet}">
+         <c:param name="page">${page.index}</c:param>
+         <c:if test="${not empty requestScope.alpha}">
            <c:param name="alpha">${requestScope.pageAlpha}</c:param>
           </c:if>
        </c:url>
@@ -27,8 +27,8 @@ if( request.getAttribute("alpha") != null && ! "all".equalsIgnoreCase((String)re
          ${page.text}
        </c:if>
        <c:if test="${ not page.selected }">
-         <a class="minimumFontMain" href="${pageUrl}&amp;${requestScope.controllerParam}">${page.text} </a>    
-       </c:if>   
+         <a class="minimumFontMain" href="${pageUrl}&amp;${requestScope.controllerParam}">${page.text} </a>
+       </c:if>
     </c:forEach>
     </div>
-</c:if>
\ No newline at end of file
+</c:if>
diff --git a/webapp/src/main/webapp/templates/error/error500.jsp b/webapp/src/main/webapp/templates/error/error500.jsp
index fc8e6d48f..8540166d6 100644
--- a/webapp/src/main/webapp/templates/error/error500.jsp
+++ b/webapp/src/main/webapp/templates/error/error500.jsp
@@ -32,7 +32,7 @@ Stack trace:
 <c:forEach var="trace" items="${pageContext.exception.stackTrace}">
   ${trace} <%="\n"%>
 </c:forEach>
-___________________________________________________________________________ 
+___________________________________________________________________________
 
 </div><!-- hiddenErrorDiv -->
 
diff --git a/webapp/src/main/webapp/templates/freemarker/ajax/autocompleteResults.ftl b/webapp/src/main/webapp/templates/freemarker/ajax/autocompleteResults.ftl
index 2aaa4c7bb..13a8178f9 100644
--- a/webapp/src/main/webapp/templates/freemarker/ajax/autocompleteResults.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/ajax/autocompleteResults.ftl
@@ -7,11 +7,11 @@
 <@json.array results />
 -->
 
-[ 
+[
 <#if results??>
     <#list results as result>
         <#-- result.jsonLabel and result.jsonUri are already quoted -->
-        { "label": ${result.jsonLabel}, "uri": ${result.jsonUri} }<#if result_has_next>,</#if>       
+        { "label": ${result.jsonLabel}, "uri": ${result.jsonUri} }<#if result_has_next>,</#if>
     </#list>
 </#if>
 ]
diff --git a/webapp/src/main/webapp/templates/freemarker/body/about.ftl b/webapp/src/main/webapp/templates/freemarker/body/about.ftl
index c8b9b5a48..8e28c1df0 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/about.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/about.ftl
@@ -7,7 +7,7 @@
 <#if aboutText?has_content>
     <div class="pageGroupBody" id="aboutText">${aboutText}</div>
 </#if>
-    
+
 <#if acknowledgeText?has_content>
-    <div class="pageGroupBody" id="acknowledgementText">${acknowledgeText}</div> 
+    <div class="pageGroupBody" id="acknowledgementText">${acknowledgeText}</div>
 </#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-acctCreatedEmail.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-acctCreatedEmail.ftl
index ff6ae3c32..8831581f6 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-acctCreatedEmail.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-acctCreatedEmail.ftl
@@ -23,7 +23,7 @@
         </p>
 
         <p>
-            If you did not request this new account you can safely ignore this email. 
+            If you did not request this new account you can safely ignore this email.
             This request will expire if not acted upon for 30 days.
         </p>
 
@@ -54,10 +54,10 @@ Congratulations!
 We have created your new account on ${siteName},
 associated with ${userAccount.emailAddress}.
 
-If you did not request this new account you can safely ignore this email. 
+If you did not request this new account you can safely ignore this email.
 This request will expire if not acted upon for 30 days.
 
-Paste the link below into your browser's address bar to create your password 
+Paste the link below into your browser's address bar to create your password
 for your new account using our secure server.
 
 ${passwordLink}
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-acctCreatedExternalOnlyEmail.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-acctCreatedExternalOnlyEmail.ftl
index 87b0b92ad..b502008f4 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-acctCreatedExternalOnlyEmail.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-acctCreatedExternalOnlyEmail.ftl
@@ -34,7 +34,7 @@ ${userAccount.firstName} ${userAccount.lastName}
 
 Congratulations!
 
-We have created your new VIVO account associated with 
+We have created your new VIVO account associated with
 ${userAccount.emailAddress}.
 
 Thanks!
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-add.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-add.ftl
index c443575b0..9ee42d7a9 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-add.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-add.ftl
@@ -40,10 +40,10 @@
         <label for="email-address">${strings.email_address}<span class="requiredHint"> *</span></label>
         <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input" />
 
-        <label for="first-name">${strings.first_name}<span class="requiredHint"> *</span></label> 
+        <label for="first-name">${strings.first_name}<span class="requiredHint"> *</span></label>
         <input type="text" name="firstName" value="${firstName}" id="first-name" role="input" />
 
-        <label for="last-name">${strings.last_name}<span class="requiredHint"> *</span></label> 
+        <label for="last-name">${strings.last_name}<span class="requiredHint"> *</span></label>
         <input type="text" name="lastName" value="${lastName}" id="last-name" role="input" />
 
         <#include "userAccounts-associateProfilePanel.ftl">
@@ -63,12 +63,12 @@
                 <label for="initial-password">${strings.initial_password}<span class="requiredHint"> *</span></label>
                 <input type="password" name="initialPassword" value="${initialPassword}" id="initial-password" role="input" />
                 <p class="note">${strings.minimum_password_length(minimumLength, maximumLength)}</p>
-                
-                <label for="confirm-password">${strings.confirm_initial_password}<span class="requiredHint"> *</span></label> 
+
+                <label for="confirm-password">${strings.confirm_initial_password}<span class="requiredHint"> *</span></label>
                 <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
             </section>
         </#if>
-        
+
         <p><input type="submit" name="submitAdd" value="${strings.submit_add_new_account}" class="submit" /> ${strings.or} <a class="cancel" href="${formUrls.list}" title="${strings.cancel_title}">${strings.cancel_link}</a></p>
 
         <p class="requiredHint">* ${strings.required_fields}</p>
@@ -78,4 +78,4 @@
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')}
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />')}
 
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/account/accountExternalAuthFlag.js"></script>')}
\ No newline at end of file
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/account/accountExternalAuthFlag.js"></script>')}
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl
index 5654391ec..8fce90d68 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl
@@ -10,12 +10,12 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/auto
     <div id="associateProfileBackgroundOne">
         <div id="alignExternalAuthId">
         <#if showAssociation??>
-             <label for="externalAuthId">${strings.auth_matching_id_label}</label> 
+             <label for="externalAuthId">${strings.auth_matching_id_label}</label>
             <input type="text" name="externalAuthId" value="${externalAuthId}" id="externalAuthId" role="input "/>
             <span id="externalAuthIdInUse" >${strings.auth_id_in_use}</span>
             <p class="explanatoryText">${strings.auth_id_explanation}</p>
         <#else>
-            <label for="externalAuthId">${strings.auth_id_label}</label> 
+            <label for="externalAuthId">${strings.auth_id_label}</label>
             <input type="text" name="externalAuthId" value="${externalAuthId}" id="externalAuthId" role="input "/>
             <span id="externalAuthIdInUse" >${strings.auth_id_in_use}</span>
         </#if>
@@ -34,7 +34,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/auto
             <input type="hidden" id="associatedProfileUri" name="associatedProfileUri" value="" />
         </div>
     </section>
-            
+
     <#-- If we haven't selected one, show these instead -->
     <section id="associationOptions">
         <div id="associateProfileBackgroundThree">
@@ -45,14 +45,14 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/auto
         </div>
         <div id="associateProfileBackgroundFour">
             <p> - ${strings.or} - </p>
-            <p> 
-                <label for="">${strings.create_associated_profile}</label> 
+            <p>
+                <label for="">${strings.create_associated_profile}</label>
                 <select name="newProfileClassUri" id="newProfileClassUri" >
                     <option value="" selected="selected">${strings.select_one}</option>
                     <#list profileTypes?keys as key>
-                        <option value="${key}" <#if newProfileClassUri = key> selected </#if> >${profileTypes[key]}</option>           
-                    </#list>    
-                </select>    
+                        <option value="${key}" <#if newProfileClassUri = key> selected </#if> >${profileTypes[key]}</option>
+                    </#list>
+                </select>
             </p>
         </div>
     </section>
@@ -61,14 +61,14 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/auto
 var associateProfileFieldsData = {
     <#if userUri??>
         userUri: '${userUri}' ,
-    <#else>    
+    <#else>
         userUri: '' ,
     </#if>
-    
+
     <#if associationIsReset??>
         associationIsReset: 'true' ,
     </#if>
-    
+
     <#if associatedProfileInfo??>
         associatedProfileInfo: {
             label: '${associatedProfileInfo.label}',
@@ -76,7 +76,7 @@ var associateProfileFieldsData = {
             url: '${associatedProfileInfo.url}'
         },
     </#if>
-    
+
     <#if showAssociation??>
         associationEnabled: true ,
     </#if>
@@ -86,5 +86,5 @@ var associateProfileFieldsData = {
 </script>
 
 ${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/account/accountAssociateProfile.js"></script>')}   
+              '<script type="text/javascript" src="${urls.base}/js/account/accountAssociateProfile.js"></script>')}
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-confirmEmailChangedEmail.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-confirmEmailChangedEmail.ftl
index eba796d4a..cfa872e9f 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-confirmEmailChangedEmail.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-confirmEmailChangedEmail.ftl
@@ -15,7 +15,7 @@
         </p>
 
         <p>
-            You recently changed the email address associated with 
+            You recently changed the email address associated with
             ${userAccount.firstName} ${userAccount.lastName}
         </p>
 
@@ -29,7 +29,7 @@
 <#assign text>
 Hi, ${userAccount.firstName} ${userAccount.lastName}
 
-You recently changed the email address associated with 
+You recently changed the email address associated with
 ${userAccount.firstName} ${userAccount.lastName}
 
 Thank you.
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-createPassword.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-createPassword.ftl
index 720cd6041..a3ba4273c 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-createPassword.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-createPassword.ftl
@@ -27,10 +27,10 @@
     <form method="POST" action="${formUrls.createPassword}" class="customForm" role="create password">
         <input type="hidden" name="user" value="${userAccount.emailAddress}" role="input" />
         <input type="hidden" name="key"  value="${userAccount.passwordLinkExpiresHash}" role="input" />
-    
+
         <label for="new-password">${strings.new_password}<span class="requiredHint"> *</span></label>
         <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
-        
+
         <p class="note">${strings.minimum_password_length(minimumLength, maximumLength)}</p>
 
         <label for="confirm-password">${strings.confirm_password}<span class="requiredHint"> *</span></label>
@@ -43,4 +43,4 @@
 </section>
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')}
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />')}
\ No newline at end of file
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />')}
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-edit.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-edit.ftl
index 040156296..b41a8d74a 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-edit.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-edit.ftl
@@ -27,7 +27,7 @@
     <#elseif errorPasswordsDontMatch??>
         <#assign errorMessage = strings.error_password_mismatch />
     </#if>
-    
+
     <#if errorMessage?has_content>
         <section id="error-alert" role="alert">
             <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${strings.alt_error_alert}" />
@@ -40,10 +40,10 @@
         <label for="email-address">${strings.email_address}<span class="requiredHint"> *</span></label>
         <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input" />
 
-        <label for="first-name">${strings.first_name}<span class="requiredHint"> *</span></label> 
+        <label for="first-name">${strings.first_name}<span class="requiredHint"> *</span></label>
         <input type="text" name="firstName" value="${firstName}" id="first-name" role="input" />
 
-        <label for="last-name">${strings.last_name}<span class="requiredHint"> *</span></label> 
+        <label for="last-name">${strings.last_name}<span class="requiredHint"> *</span></label>
         <input type="text" name="lastName" value="${lastName}" id="last-name" role="input" />
 
 		<#if externalAuthPermitted??>
@@ -74,8 +74,8 @@
                 <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
                 <p class="note">${strings.minimum_password_length(minimumLength, maximumLength)}<br />
                 ${strings.leave_password_unchanged}</p>
-                
-                <label for="confirm-password">${strings.confirm_password}</label> 
+
+                <label for="confirm-password">${strings.confirm_password}</label>
                 <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
             </section>
         </#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl
index 1fa2d32d5..3d43eb478 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl
@@ -31,11 +31,11 @@
     <form method="POST" action="${formUrls.firstTimeExternal}" class="customForm" role="my account">
         <input type="hidden" name="externalAuthId" value="${externalAuthId}" role="input" />
         <input type="hidden" name="afterLoginUrl" value="${afterLoginUrl}" role="input" />
-    
-        <label for="first-name">${strings.first_name}<span class="requiredHint"> *</span></label> 
+
+        <label for="first-name">${strings.first_name}<span class="requiredHint"> *</span></label>
         <input type="text" name="firstName" value="${firstName}" id="first-name" role="input" />
 
-        <label for="last-name">${strings.last_name}<span class="requiredHint"> *</span></label> 
+        <label for="last-name">${strings.last_name}<span class="requiredHint"> *</span></label>
         <input type="text" name="lastName" value="${lastName}" id="last-name" role="input" />
 
         <label for="email-address">${strings.email_address}<span class="requiredHint"> *</span></label>
@@ -46,7 +46,7 @@
         </#if>
 
         <p><input type="submit" name="submit" value="${strings.create_account}" class="submit"/>
-            ${strings.or} 
+            ${strings.or}
             <a class="cancel" href="${urls.home}" title="${strings.cancel_title}">${strings.cancel_link}</a>
         </p>
 
@@ -55,4 +55,4 @@
 </section>
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')}
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />')}
\ No newline at end of file
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />')}
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-firstTimeExternalEmail.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-firstTimeExternalEmail.ftl
index bac6da921..1c43a27cc 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-firstTimeExternalEmail.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-firstTimeExternalEmail.ftl
@@ -34,7 +34,7 @@ ${userAccount.firstName} ${userAccount.lastName}
 
 Congratulations!
 
-We have created your new VIVO account associated with 
+We have created your new VIVO account associated with
 ${userAccount.emailAddress}.
 
 Thanks!
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-list.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-list.ftl
index fc174288a..ce5d2a8a2 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-list.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-list.ftl
@@ -49,11 +49,11 @@
             </#list>
             <!--
             When roleFilterUri or searchTerm changes,
-            pageIndex should be set to 1. When any of these changes (including pageIndex), the form 
+            pageIndex should be set to 1. When any of these changes (including pageIndex), the form
             should be submitted.
             -->
         </select>
-        
+
         <#if roleFilterUri?has_content>
              <span><a href="${formUrls.list}" title="${strings.view_all_accounts_title}">${strings.view_all_accounts}</a></span>
         </#if>
@@ -65,11 +65,11 @@
         <input type="text" name="searchTerm" />
         <input class="submit" type="submit" value="${strings.search_accounts_button}"/>
         <!--
-            When searchTerm changes, 
+            When searchTerm changes,
             set pageIndex to 1
             set orderDirection to "ASC"
-            set orderField to "email" 
-            submit the form (submit action is "list") 
+            set orderField to "email"
+            submit the form (submit action is "list")
         -->
     </form>
 </section>
@@ -80,7 +80,7 @@
 </#if>
 <form method="POST" action="${formUrls.list}" id="account-display" class="customForm" role="accounts display">
     <@p.accountsNav />
-    
+
     <table id="table-listing">
         <caption>${strings.account_management}</caption>
 
@@ -89,41 +89,41 @@
                <th scope="col"> <input  class="delete-all hidden" type="checkbox" name="delete-all">
                    ${strings.email_address}
                    <nav class="account-alpha-browse">
-                       <a class="sort-asc" href="?accountsPerPage=${accountsPerPage}&orderField=email&orderDirection=ASC" title="${strings.ascending_order}"></a> 
+                       <a class="sort-asc" href="?accountsPerPage=${accountsPerPage}&orderField=email&orderDirection=ASC" title="${strings.ascending_order}"></a>
                        <a class="sort-desc" href="?accountsPerPage=${accountsPerPage}&orderField=email&orderDirection=DESC" title="${strings.descending_order}"></a>
                    </nav>
                 </th>
-                
+
                 <th scope="col">
                     ${strings.first_name}
                     <nav class="account-alpha-browse">
-                        <a class="sort-asc" href="?accountsPerPage=${accountsPerPage}&orderField=firstName&orderDirection=ASC" title="${strings.ascending_order}"></a> 
+                        <a class="sort-asc" href="?accountsPerPage=${accountsPerPage}&orderField=firstName&orderDirection=ASC" title="${strings.ascending_order}"></a>
                         <a class="sort-desc" href="?accountsPerPage=${accountsPerPage}&orderField=firstName&orderDirection=DESC" title="${strings.descending_order}"></a>
                     </nav>
                 </th>
-                
+
                 <th scope="col">
                     ${strings.last_name}
                     <nav class="account-alpha-browse">
-                        <a class="sort-asc" href="?accountsPerPage=${accountsPerPage}&orderField=lastName&orderDirection=ASC" title="${strings.ascending_order}"></a> 
+                        <a class="sort-asc" href="?accountsPerPage=${accountsPerPage}&orderField=lastName&orderDirection=ASC" title="${strings.ascending_order}"></a>
                         <a class="sort-desc" href="?accountsPerPage=${accountsPerPage}&orderField=lastName&orderDirection=DESC" title="${strings.descending_order}"></a>
                     </nav>
                 </th>
-                
+
                 <th scope="col">
                     ${strings.status}
                     <nav class="account-alpha-browse">
-                        <a class="sort-asc" href="?accountsPerPage=${accountsPerPage}&orderField=status&orderDirection=ASC" title="${strings.ascending_order}"></a> 
+                        <a class="sort-asc" href="?accountsPerPage=${accountsPerPage}&orderField=status&orderDirection=ASC" title="${strings.ascending_order}"></a>
                         <a class="sort-desc" href="?accountsPerPage=${accountsPerPage}&orderField=status&orderDirection=DESC" title="${strings.descending_order}"></a>
                     </nav>
                 </th>
-                
+
                 <th scope="col">${strings.roles}</th>
-                
+
                 <th scope="col">
                     ${strings.login_count}
                     <nav class="account-alpha-browse">
-                        <a class="sort-asc" href="?accountsPerPage=${accountsPerPage}&orderField=count&orderDirection=ASC" title="${strings.ascending_order}"></a> 
+                        <a class="sort-asc" href="?accountsPerPage=${accountsPerPage}&orderField=count&orderDirection=ASC" title="${strings.ascending_order}"></a>
                         <a class="sort-desc" href="?accountsPerPage=${accountsPerPage}&orderField=count&orderDirection=DESC" title="${strings.descending_order}"></a>
                     </nav>
                 </th>
@@ -131,13 +131,13 @@
                 <th scope="col">
                     ${strings.last_login}
                     <nav class="account-alpha-browse">
-                        <a class="sort-asc" href="?accountsPerPage=${accountsPerPage}&orderField=lastLogin&orderDirection=ASC" title="${strings.ascending_order}"></a> 
+                        <a class="sort-asc" href="?accountsPerPage=${accountsPerPage}&orderField=lastLogin&orderDirection=ASC" title="${strings.ascending_order}"></a>
                         <a class="sort-desc" href="?accountsPerPage=${accountsPerPage}&orderField=lastLogin&orderDirection=DESC" title="${strings.descending_order}"></a>
                     </nav>
                 </th>
             </tr>
         </thead>
-    
+
         <tbody>
             <#list accounts as account>
                 <tr>
@@ -149,7 +149,7 @@
                         <#else>
                              <#assign disableDeleteAccount = 'class="disable-delete"' />
                         </#if>
-    
+
                         <#if account.editUrl != "">
                             <a ${disableDeleteAccount} href="${account.editUrl}"  title="${strings.click_to_view_account}">${account.emailAddress}</a>
                             <!-- when this link is clicked, editAccount is noticed and all other fields are ignored. -->
@@ -176,7 +176,7 @@
             </#list>
         </tbody>
     </table>
-    
+
     <@p.accountsNav />
 </form>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-myAccount.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-myAccount.ftl
index 93ff3ef66..2d5f79688 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-myAccount.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-myAccount.ftl
@@ -36,11 +36,11 @@
     <#if confirmChange??>
         <#assign confirmMessage = strings.myAccount_confirm_changes />
     </#if>
-    
+
     <#if confirmEmailSent??>
         <#assign confirmMessage = strings.myAccount_confirm_changes_plus_note(emailAddress) />
     </#if>
-    
+
     <#if confirmMessage?has_content>
         <section  class="account-feedback" role="alert">
             <p><img class="middle" src="${urls.images}/iconConfirmation.png" alt="${strings.alt_confirmation}"/> ${confirmMessage}</p>
@@ -57,11 +57,11 @@
         <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input" />
 
         <p class="note">${strings.email_change_will_be_confirmed}</p>
-        
-        <label for="first-name">${strings.first_name}<span class="requiredHint"> *</span></label> 
+
+        <label for="first-name">${strings.first_name}<span class="requiredHint"> *</span></label>
         <input type="text" name="firstName" value="${firstName}" id="first-name" role="input" />
 
-        <label for="last-name">${strings.last_name}<span class="requiredHint"> *</span></label> 
+        <label for="last-name">${strings.last_name}<span class="requiredHint"> *</span></label>
         <input type="text" name="lastName" value="${lastName}" id="last-name" role="input" />
 
         <#if !externalAuth??>
@@ -70,13 +70,13 @@
 
             <p class="note">${strings.minimum_password_length(minimumLength, maximumLength)}<br />${strings.leave_password_unchanged}</p>
 
-            <label for="confirm-password">${strings.confirm_password}</label> 
+            <label for="confirm-password">${strings.confirm_password}</label>
             <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
         </#if>
 
         <p>
-            <input type="submit" id="submitMyAccount" name="submitMyAccount" value="${strings.save_changes}" class="submit" disabled /> 
-            ${strings.or} 
+            <input type="submit" id="submitMyAccount" name="submitMyAccount" value="${strings.save_changes}" class="submit" disabled />
+            ${strings.or}
             <a class="cancel" href="${urls.referringPage}" title="${strings.cancel_title}">${strings.cancel_link}</a>
         </p>
 
@@ -88,4 +88,4 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.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/account/accountListenerSetup.js"></script>')}
\ No newline at end of file
+              '<script type="text/javascript" src="${urls.base}/js/account/accountListenerSetup.js"></script>')}
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-myProxiesPanel.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-myProxiesPanel.ftl
index a42432e30..7bd14ea42 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-myProxiesPanel.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-myProxiesPanel.ftl
@@ -6,18 +6,18 @@
 
 <section id="edit-myProxy" name="proxyProxiesPanel" role="region">
     <h4>${strings.who_can_edit_profile}</h4>
-    
+
     <label for="addProfileEditor">${strings.add_profile_editor}</label>
-    <input id="addProfileEditor" type="text" name="proxySelectorAC" class="acSelector" size="35" 
+    <input id="addProfileEditor" type="text" name="proxySelectorAC" class="acSelector" size="35"
             value="${strings.select_existing_last_name}" role="input" />
     <span><img class="loading-profileMyAccoount hidden" src="${urls.images}/indicatorWhite.gif" /></span>
-    
+
     <p class="search-status">
         <span name='proxySelectorSearchStatus' moreCharsText='${strings.type_more_characters}' noMatchText='${strings.no_match}'>&nbsp;</span>
     </p>
     <p name="excludeUri" style="display: none">${myAccountUri}<p>
     <p class="selected-editors">${strings.selected_editors}:</p>
-    
+
     <#-- Magic ul that holds all of the proxy data and the template that shows how to display it. -->
     <ul name="proxyData" role="navigation">
         <#list proxies as proxy>
@@ -29,20 +29,20 @@
             </div>
         </#list>
 
-        <#-- 
+        <#--
             Each proxy will be shown using the HTML inside this div.
             It must contain at least:
               -- a link with templatePart="remove"
-              -- a hidden input field with templatePart="uriField"  
+              -- a hidden input field with templatePart="uriField"
         -->
         <div name="template" style="display: none">
             <li role="listitem">
                 <img class="photo-profile" width="90" alt="%label%" src="%imageUrl%">
-                
+
                 <p class="proxy-info">%label% | <span class="class-label">%classLabel%</span>
                     <br />
                     <a class='remove-proxy' href="." templatePart="remove" title="${strings.remove_selection_title}">${strings.remove_selection}</a>
-                    
+
                     <input type="hidden" name="proxyUri" value="%uri%" role="input" />
                 </p>
             </li>
@@ -64,6 +64,6 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/auto
                    '<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css" />')}
 
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/account/proxyUtils.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/account/accountProxyCommon.js"></script>',   
-              '<script type="text/javascript" src="${urls.base}/js/account/accountProxyItemsPanel.js"></script>',  
-              '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>')}
\ No newline at end of file
+              '<script type="text/javascript" src="${urls.base}/js/account/accountProxyCommon.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/account/accountProxyItemsPanel.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>')}
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-passwordCreatedEmail.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-passwordCreatedEmail.ftl
index cf15083a1..1321ad26b 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-passwordCreatedEmail.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-passwordCreatedEmail.ftl
@@ -34,7 +34,7 @@ ${userAccount.firstName} ${userAccount.lastName}
 
 Password successfully created.
 
-Your new password associated with ${userAccount.emailAddress} 
+Your new password associated with ${userAccount.emailAddress}
 has been created.
 
 Thank you.
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-passwordResetCompleteEmail.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-passwordResetCompleteEmail.ftl
index e036f20a4..93562b1b9 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-passwordResetCompleteEmail.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-passwordResetCompleteEmail.ftl
@@ -35,7 +35,7 @@ ${userAccount.firstName} ${userAccount.lastName}
 
 Password successfully changed.
 
-Your new password associated with ${userAccount.emailAddress} 
+Your new password associated with ${userAccount.emailAddress}
 has been changed.
 
 Thank you.
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-passwordResetPendingEmail.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-passwordResetPendingEmail.ftl
index a1c3cb414..dbae3c6fc 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-passwordResetPendingEmail.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-passwordResetPendingEmail.ftl
@@ -13,27 +13,27 @@
         <p>
             Dear ${userAccount.firstName} ${userAccount.lastName}:
         </p>
-        
+
         <p>
-            We have received a request to reset the password for your ${siteName} account (${userAccount.emailAddress}). 
+            We have received a request to reset the password for your ${siteName} account (${userAccount.emailAddress}).
         </p>
-        
+
         <p>
             Please follow the instructions below to proceed with your password reset.
         </p>
-        
+
         <p>
-            If you did not request this new account you can safely ignore this email. 
+            If you did not request this new account you can safely ignore this email.
             This request will expire if not acted upon within 30 days.
         </p>
-        
+
         <p>
-            Click on the link below or paste it into your browser's address bar to reset your password 
+            Click on the link below or paste it into your browser's address bar to reset your password
             using our secure server.
         </p>
-        
+
         <p>${passwordLink}</p>
-        
+
         <p>Thank you!</p>
     </body>
 </html>
@@ -41,20 +41,20 @@
 
 <#assign text>
 Dear ${userAccount.firstName} ${userAccount.lastName}:
-        
-We have received a request to reset the password for your ${siteName} account 
-(${userAccount.emailAddress}). 
+
+We have received a request to reset the password for your ${siteName} account
+(${userAccount.emailAddress}).
 
 Please follow the instructions below to proceed with your password reset.
 
-If you did not request this new account you can safely ignore this email. 
+If you did not request this new account you can safely ignore this email.
 This request will expire if not acted upon within 30 days.
 
-Paste the link below into your browser's address bar to reset your password 
+Paste the link below into your browser's address bar to reset your password
 using our secure server.
 
 ${passwordLink}
-        
+
 Thank you!
 </#assign>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-resetPassword.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-resetPassword.ftl
index d3a068e28..cf11f0a72 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-resetPassword.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-resetPassword.ftl
@@ -27,10 +27,10 @@
     <form method="POST" action="${formUrls.resetPassword}" class="customForm" role="create password">
         <input type="hidden" name="user" value="${userAccount.emailAddress}" />
         <input type="hidden" name="key"  value="${userAccount.passwordLinkExpiresHash}" />
-        
+
         <label for="new-password">${strings.new_password}<span class="requiredHint"> *</span></label>
         <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
-            
+
         <p class="note">${strings.minimum_password_length(minimumLength, maximumLength)}</p>
 
         <label for="confirm-password">${strings.confirm_password}<span class="requiredHint"> *</span></label>
@@ -43,4 +43,4 @@
 </section>
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')}
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />')}
\ No newline at end of file
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />')}
diff --git a/webapp/src/main/webapp/templates/freemarker/body/admin/admin-restrictLogins.ftl b/webapp/src/main/webapp/templates/freemarker/body/admin/admin-restrictLogins.ftl
index 1ced0f28b..7b7441843 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/admin/admin-restrictLogins.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/admin/admin-restrictLogins.ftl
@@ -6,11 +6,11 @@
     <#if messageAlreadyRestricted??>
         <#assign errorMessage = "${i18n().logins_already_restricted}" />
     </#if>
-    
+
     <#if messageAlreadyOpen??>
         <#assign errorMessage = "${i18n().logins_not_already_restricted}" />
     </#if>
-    
+
     <#if errorMessage?has_content>
         <section id="error-alert" role="alert">
             <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
@@ -21,7 +21,7 @@
     <#if messageRestricting??>
         <#assign successMessage = "${i18n().logins_restricted}" />
     </#if>
-    
+
     <#if messageOpening??>
         <#assign successMessage = "${i18n().logins_not_restricted}" />
     </#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/admin/admin-showAuth.ftl b/webapp/src/main/webapp/templates/freemarker/body/admin/admin-showAuth.ftl
index 21681cc99..d0b15c4f7 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/admin/admin-showAuth.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/admin/admin-showAuth.ftl
@@ -23,7 +23,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showAuth.css" /
         <tr><th>${i18n().not_logged_in}</th></tr>
     </#if>
     </table>
-   
+
     <h4>${i18n().identifiers}:</h4>
     <table summary="Identifiers">
         <#list identifiers as identifier>
@@ -34,7 +34,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showAuth.css" /
     </table>
 
     <h4>
-        ${i18n().associated_individuals}: 
+        ${i18n().associated_individuals}:
         <#if matchingProperty??>
             (${i18n().match_by(matchingProperty)})
         <#else>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/admin/admin-showSources.ftl b/webapp/src/main/webapp/templates/freemarker/body/admin/admin-showSources.ftl
index debc55141..107b78397 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/admin/admin-showSources.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/admin/admin-showSources.ftl
@@ -8,9 +8,9 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showSources.css
     <p>
         <em>The information displayed here has also been written to the log.</em>
     </p>
-    
+
     <h2>Current RDF Data Structures</h2>
-    
+
     <h3>RDFServices</h3>
     <table>
         <tr>
@@ -37,7 +37,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showSources.css
                 <td><pre>${datasets[which].request}</pre></td>
             </tr>
         </#list>
-    </table> 
+    </table>
 
     <h3>ModelAccess</h3>
     <table>
@@ -54,10 +54,10 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showSources.css
     <h3>Models</h3>
     <table>
         <tr>
-            <th>Name</th><th>(Context only)</th> 
+            <th>Name</th><th>(Context only)</th>
         </tr>
         <tr>
-            <th>&nbsp;</th><th>CONFIGURATION</th> 
+            <th>&nbsp;</th><th>CONFIGURATION</th>
         </tr>
         <#list models.CONFIGURATION?keys as name>
             <tr>
@@ -66,7 +66,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showSources.css
             </tr>
         </#list>
         <tr>
-            <th>&nbsp;</th><th>CONTENT</th> 
+            <th>&nbsp;</th><th>CONTENT</th>
         </tr>
         <#list models.CONTENT?keys as name>
             <tr>
@@ -74,7 +74,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showSources.css
                 <td><pre>${models.CONTENT[name].context}</pre></td>
             </tr>
         </#list>
-    </table> 
+    </table>
 
     <h3>OntModels</h3>
     <table>
@@ -88,6 +88,6 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showSources.css
                 <td><pre>${ontModels[name].request}</pre></td>
             </tr>
         </#list>
-    </table> 
+    </table>
 
-</section>
\ No newline at end of file
+</section>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/admin/admin-showThreads.ftl b/webapp/src/main/webapp/templates/freemarker/body/admin/admin-showThreads.ftl
index 370ef669b..e7691a23b 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/admin/admin-showThreads.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/admin/admin-showThreads.ftl
@@ -35,4 +35,4 @@ table.threadInfo th {
                 <td>${threadInfo.flags}</td>
         </#list>
     </table>
-</section>
\ No newline at end of file
+</section>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/admin/searchIndex.ftl b/webapp/src/main/webapp/templates/freemarker/body/admin/searchIndex.ftl
index 5d0286fe1..e10e4ad9b 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/admin/searchIndex.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/admin/searchIndex.ftl
@@ -1,8 +1,8 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- 
+<#--
     Template for the page that displays the status of the Search Indexer.
-    Most of it is provided by the AJAX call. 
+    Most of it is provided by the AJAX call.
 -->
 
 <h2>${i18n().search_index_status}</h2>
@@ -19,5 +19,5 @@
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/search/searchIndex.css" />')}
 
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/search/searchIndex.js"></script>')}   
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/search/searchIndex.js"></script>')}
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>')}
diff --git a/webapp/src/main/webapp/templates/freemarker/body/admin/searchIndexStatus.ftl b/webapp/src/main/webapp/templates/freemarker/body/admin/searchIndexStatus.ftl
index dce9263ce..b1570dcf4 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/admin/searchIndexStatus.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/admin/searchIndexStatus.ftl
@@ -1,7 +1,7 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- 
-    Template for the page that controls the updating or rebuilding of the Search Index. 
+<#--
+    Template for the page that controls the updating or rebuilding of the Search Index.
 -->
 
 <section id="indexer" role="region">
@@ -25,8 +25,8 @@
     <#else>
         <h3>The search indexer status is: ${status.statusType}
     </#if>
-    
-    
+
+
     <form action="${rebuildUrl}" method="POST">
         <p>
             <#if status.statusType == "IDLE">
@@ -75,6 +75,6 @@
        Number of document before rebuild: ${counts.documentsBefore}
        <#if counts.documentsAfter != 0>
            - after rebuild: ${counts.documentsAfter}
-       </#if> 
+       </#if>
    </#if>
 </#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/admin/startupStatus-display.ftl b/webapp/src/main/webapp/templates/freemarker/body/admin/startupStatus-display.ftl
index 49b4a3e66..efc6fde02 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/admin/startupStatus-display.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/admin/startupStatus-display.ftl
@@ -1,8 +1,8 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- 
-    Template for the page that displays the StartupStatus on request. 
-    
+<#--
+    Template for the page that displays the StartupStatus on request.
+
     Unlike the "raw" page, this one assumes that the usual Freemarker framework is in place.
 -->
 
@@ -21,7 +21,7 @@
 
     <li class="item ${color}" role="listitem">
         <h4>${item.level}: ${item.shortSourceName}</h4>
-        
+
         <ul class="item-spec" role="navigation">
             <li role="listitem">${item.message}</li>
             <li role="listitem">${item.sourceName}</li>
@@ -36,9 +36,9 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/startupStatus.c
 
 <#if status.errorItems?has_content>
     <h2>${i18n().fatal_error}</h2>
-    
+
     <p>${i18n().fatal_error_detected(applicationName)}</p>
-   
+
     <ul id="startup-trace" cellspacing="0" class="trace" role="navigation">
     <#list status.errorItems as item>
       <@statusItem item=item />
@@ -48,9 +48,9 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/startupStatus.c
 
 <#if status.warningItems?has_content>
     <h2>${i18n().warning}</h2>
-    
+
     <p>${i18n().warnings_issued(applicationName)}</p>
-    
+
     <ul id="startup-trace" cellspacing="0" class="trace" role="navigation"><#list status.warningItems as item>
       <@statusItem item=item />
     </#list>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/admin/startupStatus-displayRaw.ftl b/webapp/src/main/webapp/templates/freemarker/body/admin/startupStatus-displayRaw.ftl
index 3905b6d46..29ae2e02a 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/admin/startupStatus-displayRaw.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/admin/startupStatus-displayRaw.ftl
@@ -3,10 +3,10 @@
 <#--
     Template for the raw page that displays the StartupStatus if there
     are warnings or errors.
-    
+
     "raw" because this template works outside of the usual framework, in
     case the Freemarker context didn't initialize properly.
-    
+
     This file can't even include a reference to an external CSS file, in case
     the servlet routing filters are broken.
 -->
@@ -25,7 +25,7 @@
     </#if>
     <li class="item ${color}" role="listitem">
         <h4>${item.level}: ${item.shortSourceName}</h4>
-        
+
         <ul class="item-spec" role="navigation">
             <li role="listitem">${item.message}</li>
             <li role="listitem">${item.sourceName}</li>
@@ -41,7 +41,7 @@
 <html lang="en">
     <head>
         <title>Startup Status</title>
-        
+
         <style TYPE="text/css">
            #startup-trace {
                width: 100%;
@@ -71,7 +71,7 @@
            #startup-trace li.not_executed {
                background-color: #F3F3F0;
            }
-           
+
         </style>
     </head>
 
@@ -97,12 +97,12 @@
               <@statusItem item=item />
             </#list>
             </ul>
-            
+
             <#-- If there were no fatal errors, let them go forward from here. -->
             <#if showLink>
                 <p><a href="${url}" title="continue">Continue</a></p>
      </#if>
-            
+
         </#if>
 
         <h2>Startup trace</h2>
@@ -115,4 +115,4 @@
               </#list>
         </ul>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/classGroups.ftl b/webapp/src/main/webapp/templates/freemarker/body/classGroups.ftl
index d57effb40..a646adaca 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/classGroups.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/classGroups.ftl
@@ -14,7 +14,7 @@
                 <#-- Only render classgroups that have at least one populated class -->
                 <#if (classGroup.individualCount > 0)>
 
-                    <#list classGroup.classes as class>  
+                    <#list classGroup.classes as class>
                         <#if (class.individualCount > 0)>
                             <#assign groupSize = groupSize + 1 >
                         </#if>
@@ -23,7 +23,7 @@
                     <li class="wookmark-group" style="float: left;">
                     <h2>${classGroup.displayName}</h2>
                         <ul id="class-group-list" role="list">
-                            <#list classGroup.classes as class> 
+                            <#list classGroup.classes as class>
                                 <#-- Only render populated classes -->
                                 <#if (class.individualCount > 0)>
                                     <li role="listitem"><a href="${class.url}" title="${i18n().class_name}">${class.name}</a> (${class.individualCount})</li>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-backup.ftl b/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-backup.ftl
index 1d804b24f..b204ef111 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-backup.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-backup.ftl
@@ -7,7 +7,7 @@
 <#if spamReason??>
     <section id="error-alert" role="alert">
         <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
-        
+
         <p>${i18n().rejected_spam}</p>
         <p>${spamReason}</p>
     </section>
@@ -15,4 +15,4 @@
 
 ${msgText}
 
-<hr />
\ No newline at end of file
+<hr />
diff --git a/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-confirmation.ftl b/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-confirmation.ftl
index 8b0316e96..36df72ef2 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-confirmation.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-confirmation.ftl
@@ -5,4 +5,4 @@
 <h2>${i18n().feedback_thanks_heading}</h2>
 
 <p>${i18n().feedback_thanks_text}</p>
-<p>${i18n().return_to_the} <a href="${urls.home}" title="${i18n().home_page}">${i18n().home_page}</a>.</p>
\ No newline at end of file
+<p>${i18n().return_to_the} <a href="${urls.home}" title="${i18n().home_page}">${i18n().home_page}</a>.</p>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-email.ftl b/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-email.ftl
index b2df29573..d1f6e0d1e 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-email.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-email.ftl
@@ -8,21 +8,21 @@
     <head>
         <title>${subject}</title>
     </head>
-    
+
     <body>
         <h3>${subject}</h3>
-        
+
         <p><strong>${i18n().from_capitalized}:</strong> ${name}</p>
 
         <p><strong>${i18n().email_address}:</strong> ${emailAddress}</p>
-            
+
         <p>
             <strong>${i18n().ip_address}:</strong> ${ip}<br />
             <#if referrer??>
                 <em>${i18n().viewing_page}: ${referrer}</em>
             </#if>
-        </p>  
-        
+        </p>
+
         <p><strong>${i18n().comments}:</strong> ${comments}</p>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-error.ftl b/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-error.ftl
index c26ab5067..e0edb1a95 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-error.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-error.ftl
@@ -4,12 +4,12 @@
 
 <h2>${title!}</h2>
 
-<#if errorMessage?has_content>       
+<#if errorMessage?has_content>
     <section id="error-alert"><img src="${urls.images}/iconAlert.png" role="error alert"/>
         <p>${errorMessage}</p>
     </section>
 </#if>
 
-<p class="contactUsReturnHome">${i18n().return_to_the} 
+<p class="contactUsReturnHome">${i18n().return_to_the}
     <a href="${urls.home}" title="${i18n().home_page}">${i18n().home_page}</a>.
-</p> 
\ No newline at end of file
+</p>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-form.ftl b/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-form.ftl
index 2799aa6b0..303311e14 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-form.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-form.ftl
@@ -4,42 +4,42 @@
 
 <section class="staticPageBackground feedbackForm" role="region">
     <h2>${title!}</h2>
-    
-    <#if errorMessage?has_content>       
+
+    <#if errorMessage?has_content>
         <section id="error-alert"><img src="${urls.images}/iconAlert.png" role="error alert"/>
             <p>${errorMessage}</p>
         </section>
     </#if>
 
     <p>${i18n().interest_thanks(siteName)}</p>
-        
+
     <form name="contact_form" id="contact_form" class="customForm" action="${formAction!}" method="post" onSubmit="return ValidateForm('contact_form');" role="contact form">
         <input type="hidden" name="RequiredFields" value="webusername,webuseremail,s34gfd88p9x1" />
         <input type="hidden" name="RequiredFieldsNames" value="Name,Email address,Comments" />
         <input type="hidden" name="EmailFields" value="webuseremail" />
         <input type="hidden" name="EmailFieldsNames" value="emailaddress" />
         <input type="hidden" name="DeliveryType" value="contact" />
-    
+
         <label for="webusername">${i18n().full_name} <span class="requiredHint"> *</span></label>
         <input type="text" name="webusername" value="${webusername!}"/>
-        
+
         <label for="webuseremail">${i18n().email_address} <span class="requiredHint"> *</span></label>
         <input type="text" name="webuseremail"  value="${webuseremail!}"/>
 
         <label>${i18n().comments_questions} <span class="requiredHint"> *</span></label>
         <textarea name="s34gfd88p9x1" rows="10" cols="90">${comments!}</textarea>
-        
-       
+
+
     	<p><label class="realpersonLabel">${i18n().enter_in_security_field}:<span class="requiredHint"> *</span></label>
 
     		<input type="text" id="defaultReal" name="defaultReal"></p>
-        
+
         <div class="buttons">
             <br /><input id="submit" type="submit" value="${i18n().send_mail}" />
         </div>
-        
+
         <p class="requiredHint">* ${i18n().required_fields}</p>
-    </form>    
+    </form>
 </section>
 <script type="text/javascript">
     var i18nStrings = {
diff --git a/webapp/src/main/webapp/templates/freemarker/body/datatools/datatools-dumpRestore.ftl b/webapp/src/main/webapp/templates/freemarker/body/datatools/datatools-dumpRestore.ftl
index bb54c077e..6541b5ddc 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/datatools/datatools-dumpRestore.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/datatools/datatools-dumpRestore.ftl
@@ -14,11 +14,11 @@ table.choices td {
 <h2>Dump or Restore the knowledge base</h2>
 
 <p class="explain">
-    <b>Content models</b> hold the data that VIVO contains and operates on. 
+    <b>Content models</b> hold the data that VIVO contains and operates on.
     This includes the ABox and the TBox, instances and ontologies, assertions and inferences.
 </p>
 <p class="explain">
-    <b>Configuration models</b> hold the data that controls VIVO, 
+    <b>Configuration models</b> hold the data that controls VIVO,
     including display options, privacy restrictions, and user accounts.
 </p>
 
@@ -27,7 +27,7 @@ table.choices td {
 <h3>Dump</h3>
 
 <p class="explain">
-    Dumping the content models make take several minutes, and may produce large files. 
+    Dumping the content models make take several minutes, and may produce large files.
     For example, dumping a fully populated VIVO instance may take 20 minutes and produce a file of 3 gigabytes.
 </p>
 
@@ -56,10 +56,10 @@ table.choices td {
 <h3>Restore</h3>
 
 <p class="explain">
-    The restore process is additive: it will not delete existing triples. 
+    The restore process is additive: it will not delete existing triples.
 </p>
 <p class="explain">
-    Choosing to purge large models can result in an OutOfMemory error. 
+    Choosing to purge large models can result in an OutOfMemory error.
     It is better to start with a small or empty knowledge base.
 </p>
 <p class="explain">
diff --git a/webapp/src/main/webapp/templates/freemarker/body/displayEdit/displayConfig.ftl b/webapp/src/main/webapp/templates/freemarker/body/displayEdit/displayConfig.ftl
index 3fca1501d..5e146a16e 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/displayEdit/displayConfig.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/displayEdit/displayConfig.ftl
@@ -2,21 +2,21 @@
 
 <div>
     <h2>Display Admin and configuration</h2>
-    
+
     <#if errorMessage??>
         <div id="errorAlert">
             <img src="../images/iconAlert.png" alt="Error alert icon" height="31" width="32">
             <p>${errorMessage}</p>
         </div>
     </#if>
-    
+
     <#if message??>
         <p>${message}</p>
     </#if>
-    
-    
+
+
     <ul>
     <li> Some link to a display config and amdin page </li>
     </ul>
-    
-</div>
\ No newline at end of file
+
+</div>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/error/error-display.ftl b/webapp/src/main/webapp/templates/freemarker/body/error/error-display.ftl
index 07ccdc14e..edc8afbe5 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/error/error-display.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/error/error-display.ftl
@@ -3,12 +3,12 @@
 <#-- Template for general system error. -->
 
 <p>
-    ${i18n().we_have_an_error} 
+    ${i18n().we_have_an_error}
     <#if sentEmail>
-        ${i18n().error_was_reported} 
+        ${i18n().error_was_reported}
     </#if>
-</p>  
-    
+</p>
+
 <#if adminErrorData??> <#-- view for site administrators -->
    <#if adminErrorData.errorMessage?has_content>
         <p><strong>${i18n().error_message}:</strong> ${adminErrorData.errorMessage?html}</p>
@@ -17,13 +17,13 @@
         <p>
             <strong>${i18n().stack_trace}</strong> (${i18n().trace_available(siteName!)}): ${adminErrorData.stackTrace?html}
         </p>
-                   
+
         <#if adminErrorData.cause?has_content>
-            <p><strong>${i18n().caused_by}:</strong> ${adminErrorData.cause?html}</p>            
+            <p><strong>${i18n().caused_by}:</strong> ${adminErrorData.cause?html}</p>
         </#if>
-    </#if>  
+    </#if>
 
 <#elseif ! errorOnHomePage> <#-- view for other users -->
-    <p>${i18n().return_to_the} <a href="${urls.home}" title="${i18n().home_page}">${i18n().home_page}</a></p> 
+    <p>${i18n().return_to_the} <a href="${urls.home}" title="${i18n().home_page}">${i18n().home_page}</a></p>
 </#if>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/error/error-email.ftl b/webapp/src/main/webapp/templates/freemarker/body/error/error-email.ftl
index f8453f892..fa804266e 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/error/error-email.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/error/error-email.ftl
@@ -15,28 +15,28 @@
         <p>
             ${i18n().error_occurred_at(siteName!,datetime!)}
         </p>
-        
+
         <p>
             <strong>${i18n().requested_url}:</strong> ${requestedUrl!}
         </p>
-        
+
         <p>
         <#if errorMessage?has_content>
             <strong>${i18n().error_message}:</strong> ${errorMessage!}
         </#if>
         </p>
-        
+
         <p>
-            <strong>${i18n().stack_trace}</strong> (${i18n().trace_available(siteName!)}): 
+            <strong>${i18n().stack_trace}</strong> (${i18n().trace_available(siteName!)}):
             <pre>${stackTrace!}</pre>
         </p>
-        
+
         <#if cause?has_content>
-            <p><strong>${i18n().caused_by}:</strong> 
+            <p><strong>${i18n().caused_by}:</strong>
                 <pre>${cause!}</pre>
             </p>
         </#if>
-        
+
     </body>
 </html>
 </#assign>
@@ -50,13 +50,13 @@ ${i18n().requested_url}: ${requestedUrl!}
     ${i18n().error_message}: ${errorMessage!}
 </#if>
 
-${i18n().stack_trace} (${i18n().trace_available(siteName!)}): 
+${i18n().stack_trace} (${i18n().trace_available(siteName!)}):
 ${stackTrace!}
 
 <#if cause?has_content>
-${i18n().caused_by}: 
+${i18n().caused_by}:
 ${cause!}
-</#if>       
+</#if>
 </#assign>
 
-<@email subject=subject html=html text=text />
\ No newline at end of file
+<@email subject=subject html=html text=text />
diff --git a/webapp/src/main/webapp/templates/freemarker/body/error/error-message.ftl b/webapp/src/main/webapp/templates/freemarker/body/error/error-message.ftl
index 4f911c9d9..306eb4ea5 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/error/error-message.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/error/error-message.ftl
@@ -4,4 +4,4 @@
 
 <#if errorMessage??>
     <p>${errorMessage}</p>
-</#if>
\ No newline at end of file
+</#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/error/error-standard.ftl b/webapp/src/main/webapp/templates/freemarker/body/error/error-standard.ftl
index c84fefbd9..c118bd125 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/error/error-standard.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/error/error-standard.ftl
@@ -4,4 +4,4 @@
 
 <p>${i18n().we_have_an_error}.</p>
 
-<p>${i18n().return_to_the} <a href="${urls.home}" title="${i18n().home_page}">${i18n().home_page}</a></p>
\ No newline at end of file
+<p>${i18n().return_to_the} <a href="${urls.home}" title="${i18n().home_page}">${i18n().home_page}</a></p>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/error/error-titled.ftl b/webapp/src/main/webapp/templates/freemarker/body/error/error-titled.ftl
index bd0a228f2..d1a6b8528 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/error/error-titled.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/error/error-titled.ftl
@@ -4,4 +4,4 @@
 
 <h2>${title!}</h2>
 
-<#include "error-message.ftl">
\ No newline at end of file
+<#include "error-message.ftl">
diff --git a/webapp/src/main/webapp/templates/freemarker/body/home.ftl b/webapp/src/main/webapp/templates/freemarker/body/home.ftl
index ef3de803f..1aabf4ece 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/home.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/home.ftl
@@ -1,7 +1,7 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- Template for home page body contents. This file is deliberately empty, for use by themes that define a full
-page template for the home page and do not use a separate body template. The HomePageController defines a 
+page template for the home page and do not use a separate body template. The HomePageController defines a
 body template, for those themes that do not use a distinct page template for the home page, so that they
 can provide the home page body content. The default empty template is defined so Freemarker doesn't throw an error
 when it tries to get the template. (Or should we just let Freemarker log an error? It doesn't prevent the page
diff --git a/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl b/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl
index 8729870fb..eeb2df0ac 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl
@@ -8,15 +8,15 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery_plugin
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/uploadImages.css" />',
                   '<link rel="stylesheet" href="${urls.base}/js/jquery_plugins/jcrop/jquery.Jcrop.css" />')}
 
-<#--Reduce original image to fit in the page layout  
-	If the width of the image is bigger or equal to 500 pixels, 
-	the script below will reduce the width to 500 pixels and 
+<#--Reduce original image to fit in the page layout
+	If the width of the image is bigger or equal to 500 pixels,
+	the script below will reduce the width to 500 pixels and
 	the height will be in proportion to the new height-->
 
 <#--<#macro newImageSize>
 <#if (imageWidth >= 500)>
-		width="500" height="${(500*imageHeight)/imageWidth}" 
-</#if>	   
+		width="500" height="${(500*imageHeight)/imageWidth}"
+</#if>
 </#macro>-->
 
 
@@ -24,33 +24,33 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/uploadImages.cs
 
 <section id="photoCroppingContainer" role="region">
     <h2>${i18n.upload_heading}</h2>
-    
+
     <!-- This is the image we're attaching Jcrop to -->
     <section id="photoCroppingPreview" role="region">
-        
+
         <p class="photoCroppingTitleBody">${i18n.cropping_caption}</p>
-        
+
         <section class="photoCroppedPreview" role="region">
             <img src="${imageUrl}" id="preview" alt="${i18n.alt_image_to_crop}"/>
         </section>
-        
+
         <section id="photoCroppingHowTo" role="region">
             <p class="photoCroppingNote">${i18n.cropping_note}</p>
-            
+
             <form id="cropImage" action="${formAction}"  method="post" role="form">
                 <!-- Javascript will populate these values -->
                 <input type="hidden" name="x" value="" />
                 <input type="hidden" name="y" value="" />
                 <input type="hidden" name="w" value="" />
                 <input type="hidden" name="h" value="" />
-                                      
+
                 <input  class="submit" type="submit" value="${i18n.submit_save}">
-                
+
                 <span class="or"> ${i18n.or} <a class="cancel"  href="${cancelUrl}" title="${i18n.cancel_title}">${i18n.cancel_link}</a></span>
             </form>
        </section>
     </section>
-    
+
     <section id="photoCropping" role="region">
         <img src="${imageUrl}" id="cropbox" alt="${i18n.alt_preview_crop}" />
     </section
diff --git a/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl b/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
index bb4d7346e..6c2d6540a 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
@@ -10,7 +10,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/uploadImages.cs
 
 <section id="photoUploadContainer" role="region">
     <h2>${i18n.upload_heading}</h2>
-              
+
     <#if errorMessage??>
         <section id="error-alert" role="alert"><img src="${urls.images}/iconAlert.png" alt="${i18n.alt_error_alert}" />
             <p>${errorMessage}</p>
@@ -19,18 +19,18 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/uploadImages.cs
 
     <section id="photoUploadDefaultImage" role="region">
         <h3>${i18n.current_photo}</h3>
-        
-        <img src="${thumbnailUrl}" width="115" height="115" alt="${i18n.alt_thumbnail_photo}" /> 
+
+        <img src="${thumbnailUrl}" width="115" height="115" alt="${i18n.alt_thumbnail_photo}" />
     </section>
-          
+
     <form id="photoUploadForm" action="${formAction}" enctype="multipart/form-data" method="post" role="form">
         <label>${i18n.upload_photo} <span>${i18n.photo_types}</span></label>
-        
+
         <input id="datafile" type="file" name="datafile" size="30" />
          <p class="note">${i18n.maximum_file_size(maxFileSize)}<br />
         ${i18n.minimum_image_dimensions(thumbnailWidth, thumbnailHeight)}</p>
         <input class="submit" type="submit" value="${i18n.submit_upload}"/>
-        
+
         <span class="or"> ${i18n.or} <a class="cancel"  href="${cancelUrl}" title="${i18n.cancel_title}">${i18n.cancel_link}</a></span>
     </form>
 </section>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl b/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
index a51f4ab26..862034ba6 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
@@ -16,11 +16,11 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/uploadImages.cs
             <p>${errorMessage}</p>
         </section>
     </#if>
-    
+
     <section id="photoUploadDefaultImage" role="region">
         <h3>${i18n.current_photo}</h3>
             <img src="${thumbnailUrl}" width="115" alt="${i18n.alt_thumbnail_photo}" />
-            
+
             <a class="thumbnail" href="${deleteUrl}">${i18n.delete_link}</a>
     </section>
 
@@ -30,7 +30,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/uploadImages.cs
         <input type="file" name="datafile" size="30">
          <p class="note">${i18n.maximum_file_size(maxFileSize)}<br />
         ${i18n.minimum_image_dimensions(thumbnailWidth, thumbnailHeight)}</p>
-        <input class="submit" type="submit" value="${i18n.submit_upload}"> 
+        <input class="submit" type="submit" value="${i18n.submit_upload}">
 
         <span class="or"> ${i18n.or} <a class="cancel"  href="${cancelUrl}" title="${i18n.cancel_title}">${i18n.cancel_link}</a></span>
      </form>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual-menu.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual-menu.ftl
index 722e270d9..2b44602b5 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual-menu.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual-menu.ftl
@@ -11,20 +11,20 @@
     <script type="text/javascript">
         var menuItemData = [];
     </script>
-    
+
     <h3>${i18n().menu_ordering}</h3>
-    
+
     <#-- List the menu items -->
     <ul class="menuItems">
         <#list hasElement.statements as statement>
             <li class="menuItem"><#include "${hasElement.template}"> <span class="controls"><!--p.editingLinks "hasElement" "" statement editable /--></span></li>
         </#list>
     </ul>
-    
+
     <#-- Link to add a new menu item -->
     <#if editable>
 	    <form id="pageListForm" action="${urls.base}/editRequestDispatch" method="get">
-	        <input type="hidden" name="typeOfNew" value="http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page">              
+	        <input type="hidden" name="typeOfNew" value="http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page">
 	        <input type="hidden" name="switchToDisplayModel" value="1">
 	        <input type="hidden" name="editForm" value="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator" role="input">
 	   		<input type="hidden" name="addMenuItem" value="true" />
@@ -34,19 +34,19 @@
 	   	    <span class="or"> ${i18n().or} </span>
 	   	    <a  style="margin-left:7px" href="${urls.base}/pageList" title="Return to Profile Page">Return to Page Management</a>
 	   	</#if>
-	    
+
 	    </form>
 	    <br />
 	    <p class="note">${i18n().refresh_page_after_reordering}</p>
     </#if>
-    
+
     ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/individual/individual.css" />',
                       '<link rel="stylesheet" href="${urls.base}/css/individual/menuManagement-menuItems.css" />')}
-                      
+
     ${headScripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>')}
-    
+
     <#assign positionPredicate = "${namespaces.display}menuPosition" />
-    
+
     <script type="text/javascript">
         // <#-- We need the controller to provide ${reorderUrl}. This is where ajax request will be sent on drag-n-drop events. -->
         var menuManagementData = {
@@ -58,7 +58,7 @@
             reorderingFailed: '${i18n().reordering_menus_failed}'
         };
     </script>
-    
+
     ${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/menuManagement.js"></script>')}
 <#else>
     <p id="error-alert">${i18n().display_has_element_error}</p>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual-vitro.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual-vitro.ftl
index 0ce4bcf98..efbaedd82 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual-vitro.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual-vitro.ftl
@@ -12,7 +12,7 @@
 <#--Number of distinct languages represented, with no language tag counting as a language, across labels-->
 <#if !languageCount??>
 	<#assign languageCount = 1>
-</#if>	
+</#if>
 
 <#-- Default individual profile page template -->
 <#--@dumpAll /-->
@@ -44,8 +44,8 @@
         <header>
             <#if relatedSubject??>
                 <h2>${relatedSubject.relatingPredicateDomainPublic} for ${relatedSubject.name}</h2>
-                <p><a href="${relatedSubject.url}" title="${i18n().return_to(relatedSubject.name)}">&larr; ${i18n().return_to(relatedSubject.name)}</a></p>                
-            <#else>                
+                <p><a href="${relatedSubject.url}" title="${i18n().return_to(relatedSubject.name)}">&larr; ${i18n().return_to(relatedSubject.name)}</a></p>
+            <#else>
                 <h1 class="fn" itemprop="name">
                     <#-- Label -->
                     <@p.label individual editable labelCount localesCount languageCount/>
@@ -56,7 +56,7 @@
                 </h1>
             </#if>
         </header>
-                
+
     <#if individualProductExtension??>
         ${individualProductExtension}
     <#else>
@@ -64,15 +64,15 @@
         </section> <!-- individual-intro -->
     </#if>
 
-<#assign nameForOtherGroup = "${i18n().other}"> 
+<#assign nameForOtherGroup = "${i18n().other}">
 
 <!-- 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/templates/freemarker/body/individual/individual.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual.ftl
index cfc239539..e999dfbb5 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual.ftl
@@ -4,4 +4,4 @@
 
 <#include "individual-setup.ftl">
 
-<#include "individual-vitro.ftl">
\ No newline at end of file
+<#include "individual-vitro.ftl">
diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividual.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividual.ftl
index 78e3cebfc..199b3aa29 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividual.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividual.ftl
@@ -38,11 +38,11 @@
 
 
     <section id="rdfsLabels" role="container">
-    
+
      <script type="text/javascript">
         var existingLabelsData = [];
     </script>
-    
+
         <ul id="existingLabelsList" name="existingLabelsList">
         <#if editConfiguration.pageData.labelsSortedByLanguageName?has_content>
         	<#--List of labelInformation objects as value where key = language name -->
@@ -50,32 +50,32 @@
         	<#--Keys would be the actual names of languages-->
         	<#assign labelLanguages = labelsSorted?keys?sort />
         	<#assign editGenerator = "editForm=edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.RDFSLabelGenerator" />
-        	
+
         	<#--What we need here is printing out the labels by the language Name and not language code, starting with untyped first-->
         	<@m.displayExistingLabelsForLanguage "untyped" labelsSorted editable editGenerator/>
         	<@m.displayExistingTypedLabels  labelLanguages labelsSorted editable editGenerator/>
-        	
+
         </#if>
         </ul>
 
-        <br />   
-        <p>      
-        
-	    <#if editable>   
+        <br />
+        <p>
+
+	    <#if editable>
 		    <#include "manageLabelsForIndividualSubmissionErrors.ftl">
 			<div id="showAddForm">
-				<input type="submit" value="${i18n().add_label}" id="showAddFormButton" name="showAddFormButton">  ${i18n().or} 
+				<input type="submit" value="${i18n().add_label}" id="showAddFormButton" name="showAddFormButton">  ${i18n().or}
 				<a class="cancel" href="${cancelUrl}&url=/individual" title="${returnText}">${returnText}</a>
-			</div>  
+			</div>
 			<div id="showCancelOnly">
 				<a class="cancel" href="${cancelUrl}&url=/individual" title="${returnText}">${returnText}</a>
 			</div>
 		    <#include "manageLabelsForIndividualAddForm.ftl" >
 	    </#if>
-	    
+
 		</p>
 	</section>
-	    
+
 
 <script type="text/javascript">
 var selectLocalesFullList = [];
@@ -86,7 +86,7 @@ var selectLocalesFullList = [];
 		<#assign label= localeInfo["label"] />
 		selectLocalesFullList.push({'code':'${code}', 'label':'${label}'});
 	</#list>
-	
+
 </#if>
 
 var customFormData = {
@@ -107,4 +107,4 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/sm
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/utils.js"></script>',
               '<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/individual/manageLabelsForIndividual.js"></script>')}
-              
+
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 99d2748e7..a60e30d86 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl
@@ -8,22 +8,22 @@
 </p>
 <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 />
 	<#--Use the list of names because that is the order we want displayed-->
 
 	<#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>
 
-</form>
\ No newline at end of file
+</form>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualMacros.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualMacros.ftl
index e10006cc6..117b4b918 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualMacros.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualMacros.ftl
@@ -6,7 +6,7 @@
 		<#assign labelList = labelsSorted[lang] />
 		<#--Reset for every language-->
 		<#assign labelSeq = []/>
-		
+
 		<#list labelList as labelObject>
 			<#assign labelLiteral = labelObject.labelLiteral />
 			<#assign labelStringValue = labelObject.labelStringValue />
@@ -18,7 +18,7 @@
 			<#if labelObject.editLinkURL?has_content>
 				<#assign labelEditLink = labelObject.editLinkURL/>
 			</#if>
-		
+
 			<#if label?? && ( label?index_of("@") > -1 ) >
 		    	<#assign labelStr = label?substring(0, label?index_of("@")) >
 		    	<#assign tagOrTypeStr = label?substring(label?index_of("@")) >
@@ -32,7 +32,7 @@
 		        <#assign tagOrTypeStr = "" >
 		    </#if>
 		    <@displayLabel labelSeq labelStr languageCode labelEditLink tagOrTypeStr editGenerator editable displayRemoveLink/>
-		    
+
 		    <#assign labelSeq = labelSeq + [labelStr]>
 		</#list>
 	</#if>
@@ -40,8 +40,8 @@
 
 <#--ignore 'untyped' and display everything-->
 <#macro displayExistingTypedLabels langList labelsSorted editable editGenerator="" displayRemoveLink=true>
-	
-	
+
+
 	<#list langList as lang>
 		<#if lang != "untyped">
 			<h3 languageName="${lang}">${lang}</h3>
@@ -80,13 +80,13 @@
 </#macro>
 
 <#macro displayLabel labelSeq labelStr languageCode labelEditLink tagOrTypeStr editGenerator editable displayRemoveLink>
-    <li>${labelStr} <#if labelSeq?seq_contains(labelStr)> (duplicate value) </#if> 
+    <li>${labelStr} <#if labelSeq?seq_contains(labelStr)> (duplicate value) </#if>
     <#if editable> <#if labelEditLink?has_content> <a href="${labelEditLink}&${editGenerator}">Edit</a></#if>
     <#if displayRemoveLink>
 	<a href="${urls.base}/edit/primitiveRdfEdit" languageName="${labelLang}" languageCode="${languageCode}"
 	labelValue="${labelStr}" tagOrType="${tagOrTypeStr!}" class="remove" title="${i18n().remove_capitalized}">${i18n().remove_capitalized}</a>
 	</#if>
 	</#if>
-    
+
     </li>
-</#macro>
\ No newline at end of file
+</#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualSubmissionErrors.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualSubmissionErrors.ftl
index fcb0a290f..af25b2cb4 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualSubmissionErrors.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualSubmissionErrors.ftl
@@ -11,4 +11,4 @@
     	</#list>
         </p>
     </section>
-</#if>
\ No newline at end of file
+</#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualTerms.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualTerms.ftl
index 7d4161685..cc59e1175 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualTerms.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualTerms.ftl
@@ -1,4 +1,4 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#--Some values for labels etc. may be different between vitro and other systems -->
-<#assign returnText = "${i18n().return_to_individual}" />
\ No newline at end of file
+<#assign returnText = "${i18n().return_to_individual}" />
diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/viewLabelsForIndividual.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/viewLabelsForIndividual.ftl
index 7dc9aca19..4320bc82b 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individual/viewLabelsForIndividual.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individual/viewLabelsForIndividual.ftl
@@ -18,23 +18,23 @@
 
 
     <section id="rdfsLabels" role="container">
-    
+
         <ul id="existingLabelsList" name="existingLabelsList">
         <#if labelsSortedByLanguageName?has_content>
         	<#--List of labelInformation objects as value where key = language name -->
         	<#assign labelsSorted = labelsSortedByLanguageName />
         	<#--Keys would be the actual names of languages-->
         	<#assign labelLanguages = labelsSorted?keys?sort />
-        	
+
         	<#--What we need here is printing out the labels by the language Name and not language code, starting with untyped first-->
         	<@m.displayExistingLabelsForLanguage "untyped" labelsSorted editable ""/>
         	<@m.displayExistingTypedLabels  labelLanguages labelsSorted editable ""/>
-        	
+
         </#if>
         </ul>
 
 	</section>
-	    
+
 
 
 
@@ -42,4 +42,4 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/sm
 
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/utils.js"></script>',
               '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>')}
-              
+
diff --git a/webapp/src/main/webapp/templates/freemarker/body/individualList-checkForData.ftl b/webapp/src/main/webapp/templates/freemarker/body/individualList-checkForData.ftl
index f9a49b5f7..5978a9995 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individualList-checkForData.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individualList-checkForData.ftl
@@ -6,7 +6,7 @@
     <#assign noData = true />
 </#if>
 
-<#assign noDataNotification>    
+<#assign noDataNotification>
     <#if user.loggedIn>
         <#if user.authorizedToRebuildSearchIndex>
             <span class="contentNote">
@@ -19,10 +19,10 @@
             <p>${i18n().please} <a href="${urls.login}" title="${i18n().login_to_manage_site}">${i18n().log_in}</a> ${i18n().to_manage_content}</p>
         </span>
     </#if>
-    
+
     <h3>${i18n().no_content_in_system(title)}</h3>
-    
+
     <#if user.loggedIn && 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>
     </#if>
-</#assign>
\ No newline at end of file
+</#assign>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/individualList.ftl b/webapp/src/main/webapp/templates/freemarker/body/individualList.ftl
index d5461b333..10c3e567f 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individualList.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individualList.ftl
@@ -9,7 +9,7 @@
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css" />')}
 
 <section class="individualList">
-    <h2>${title!} 
+    <h2>${title!}
         <#if rdfUrl?has_content>
             <span class="rdfLink"><a class="icon-rdf" href="${rdfUrl}" title="${i18n().view_list_in_rdf(title)}">${i18n().rdf}</a></span>
         </#if>
@@ -17,7 +17,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css
     <#if subtitle?has_content>
         <h4>${subtitle}</h4>
     </#if>
-    
+
     <#if (!noData)>
         <#if errorMessage?has_content>
             <p>${errorMessage}</p>
@@ -37,20 +37,20 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css
                     </ul>
                 </#if>
             </#assign>
-            
+
             ${pagination}
-            
+
             <ul>
                 <#list individuals as individual>
-                    <li>       
+                    <li>
                         <@shortView uri=individual.uri viewContext="index" />
                     </li>
                 </#list>
             </ul>
-            
+
             ${pagination}
         </#if>
     <#else>
         ${noDataNotification}
     </#if>
-</section> <!-- .individualList -->
\ No newline at end of file
+</section> <!-- .individualList -->
diff --git a/webapp/src/main/webapp/templates/freemarker/body/login/adminLogin.ftl b/webapp/src/main/webapp/templates/freemarker/body/login/adminLogin.ftl
index 1cc2549d9..af7447a7a 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/login/adminLogin.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/login/adminLogin.ftl
@@ -8,38 +8,38 @@
     <#if errorNoEmail??>
         <#assign errorMessage = "${i18n().no_email_supplied}" />
     </#if>
-    
+
     <#if errorNoPassword??>
         <#assign errorMessage = "${i18n().no_password_supplied}" />
     </#if>
-    
+
     <#if errorLoginDisabled??>
         <#assign errorMessage = "${i18n().logins_temporarily_disabled}" />
     </#if>
-    
+
     <#if errorLoginFailed??>
         <#assign errorMessage = "${i18n().incorrect_email_password}" />
     </#if>
-    
+
     <#if errorNewPasswordWrongLength??>
         <#assign errorMessage = "${i18n().password_length(minPasswordLength, maxPasswordLength)}" />
     </#if>
-    
+
     <#if errorNewPasswordsDontMatch??>
         <#assign errorMessage = "${i18n().password_mismatch}" />
     </#if>
-    
+
     <#if errorNewPasswordMatchesOld??>
         <#assign errorMessage = "${i18n().new_pwd_matches_existing}" />
     </#if>
-    
+
     <#if errorMessage?has_content>
         <section id="error-alert" role="alert">
             <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}"/>
             <p>${errorMessage}</p>
         </section>
     </#if>
-    
+
     <#if !newPasswordRequired??>
         <p>${i18n().enter_email_password}</p>
     <#else>
@@ -50,12 +50,12 @@
         <#if newPasswordRequired??>
             <label for="newPassword">${i18n().new_password}</label>
             <input name="newPassword" id="newPassword" class="text-field" type="password" required autofocus />
-            
+
             <p class="password-note">${i18n().minimum_password_length(minPasswordLength)}</p>
-            
+
             <label for="confirmPassword">${i18n().confirm_password}</label>
             <input id="confirmPassword" name="confirmPassword" class="text-field" type="password" required />
-            
+
             <input id="email" name="email" type="hidden" value="${email!}" />
             <input id="password" name="password" type="hidden" value="${password!}" />
         <#else>
@@ -68,4 +68,4 @@
 
 		<p class="submit"><input name="loginForm" type="submit" class="green button" value="${i18n().login_button}"/></p>
 	</form>
-</section>
\ No newline at end of file
+</section>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/login/fakeExternalAuth.ftl b/webapp/src/main/webapp/templates/freemarker/body/login/fakeExternalAuth.ftl
index 238f133aa..d4e536002 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/login/fakeExternalAuth.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/login/fakeExternalAuth.ftl
@@ -4,7 +4,7 @@
 
 <section role="region">
     <h2>${i18n().fake_external_auth}</h2>
-    
+
     <p>
       ${i18n().enter_id_to_login}
     </p>
@@ -12,8 +12,8 @@
 		<form action="${controllerUrl}">
 			${i18n().username}:
 			<input type="text" name="username" />
-			<input type="submit" value="${i18n().submit_button}" /> 
-			<input type="submit" name="cancel" value="${i18n().cancel_link}" /> 
+			<input type="submit" value="${i18n().submit_button}" />
+			<input type="submit" name="cancel" value="${i18n().cancel_link}" />
 		</form>
     <br/>
 </section>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/login/login.ftl b/webapp/src/main/webapp/templates/freemarker/body/login/login.ftl
index dd5e3adf5..d2859dddc 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/login/login.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/login/login.ftl
@@ -5,4 +5,4 @@
 <@widget name="login" />
 <script>
 $('div.vivoAccount').show();
-</script>
\ No newline at end of file
+</script>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/manageproxies/manageProxies-list.ftl b/webapp/src/main/webapp/templates/freemarker/body/manageproxies/manageProxies-list.ftl
index 28fe3f776..d0c1bd307 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/manageproxies/manageProxies-list.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/manageproxies/manageProxies-list.ftl
@@ -6,10 +6,10 @@
 
 <#if message??>
     <section class="account-feedback" role="region">
-        <#if message.success?? > 
+        <#if message.success?? >
             <p>${i18n().operation_successful}</p>
         </#if>
-    
+
         <#if message.failure?? >
             <p>${i18n().operation_unsuccessful}</p>
         </#if>
@@ -23,28 +23,28 @@
 
 <section class="proxy-profile">
     <h4>${i18n().relate_editors_profiles} <img src="${urls.images}/iconInfo.png" alt="${i18n().info_icon}" title="${i18n().profile_editing_title(siteName!)}" /></h4>
-    
+
     <form id="add-relation" action="${formUrls.create}" method="POST">
         <fieldset class="proxy">
             <legend>${i18n().select_editors}</legend>
-            
+
             <section name="proxyProxiesPanel" role="section">
                 <label for="selectProfileEditors">${i18n().select_editors}</label>
                 <input id="selectProfileEditors" type="text" name="proxySelectorAC" class="acSelector" size="35" value="${i18n().select_last_name}" role="input" /><span><img class="loading-relateEditor hidden" src="${urls.images}/indicatorWhite.gif" alt="${i18n().processing_indicator}"/></span>
                 <p class="search-status"><span name='proxySelectorSearchStatus' moreCharsText='${i18n().type_more_chars}' noMatchText='${i18n().no_match}'>&nbsp;</span></p>
-    
+
                 <#-- Magic div that holds all of the proxy data and the template that shows how to display it. -->
                 <ul name="proxyData" role="navigation">
-                <#-- 
+                <#--
                     Each proxy will be shown using the HTML inside this div.
                     It must contain at least:
                     -- a link with templatePart="remove"
-                    -- a hidden input field with templatePart="uriField"  
+                    -- a hidden input field with templatePart="uriField"
                 -->
                     <div name="template" style="display: none">
                         <li role="listitem">
                             <img class="photo-proxy" width="90" alt="%label%" src="%imageUrl%">
-                    
+
                             <p class="proxy-info">
                                 %label% | <span class="class-label">%classLabel%</span>
                                 <br />
@@ -56,32 +56,32 @@
                 </ul>
             </section>
         </fieldset>
-    
+
         <fieldset class="profile">
-          <legend>${i18n().select_profiles}</legend>  
-      
+          <legend>${i18n().select_profiles}</legend>
+
           <section name="proxyProfilesPanel" role="region">
               <label for="selectProfiles">${i18n().select_profiles}</label>
               <input id="selectProfiles" type="text" name="proxySelectorAC" class="acSelector" size="35" value="${i18n().select_last_name}" role="input" /><span><img class="loading-relateProfile hidden" src="${urls.images}/indicatorWhite.gif"  alt="${i18n().processing_indicator}"/></span>
-            
+
               <p class="search-status"><span name='proxySelectorSearchStatus' moreCharsText='${i18n().type_more_chars}' noMatchText='${i18n().no_match}'>&nbsp;</span></p>
 
                 <#-- Magic div thst holds all of the proxy data and the template that shows how to display it. -->
                 <ul name="proxyData" role="navigation">
-                    <#-- 
+                    <#--
                         Each proxy will be shown using the HTML inside this element.
                         It must contain at least:
                         -- a link with templatePart="remove"
-                        -- a hidden input field with templatePart="uriField"  
+                        -- a hidden input field with templatePart="uriField"
                     -->
                     <div name="template" style="display: none">
                         <li role="listitem">
                             <img class="photo-profile" width="60" alt="%label%" src="%imageUrl%">
-                            
+
                             <p class="proxy-info-profile">%label% | <span class="class-label">%classLabel%</span>
                                 <br /><a class='remove-proxy' href="." templatePart="remove" title="${i18n().remove_selection}">${i18n().remove_selection}</a>
                             </p>
-    
+
                             <input type="hidden" name="profileUri" templatePart="uriField" value="%uri%" role="input" />
                         </li>
                     </div>
@@ -99,15 +99,15 @@
 <section id="search-proxy" role="region">
     <form action="${formUrls.list}" method="POST">
         <input type="text" name="searchTerm" role="input" />
-        <input class="submit" type="submit" name="searchByProxy" value="${i18n().search_button}" role="button" /> 
+        <input class="submit" type="submit" name="searchByProxy" value="${i18n().search_button}" role="button" />
             <#if page.previous??>
                | <a href="${formUrls.list}?pageIndex=${page.previous}&searchTerm=${searchTerm}" title="${i18n().previous}">${i18n().previous}</a>
             </#if>
-            
+
             <#if page.last != 0>
                 ${page.current} of ${page.last}
             </#if>
-            
+
             <#if page.next??>
                 <a href="${formUrls.list}?pageIndex=${page.next}&searchTerm=${searchTerm}" title="${i18n().next_capitalized}">${i18n().next_capitalized}</a>
             </#if>
@@ -125,27 +125,27 @@
             <#assign p = r.proxyInfos[0]>
             <div class="proxy-item">
                 <img class="photo-profile" width="90" src="${p.imageUrl}" alt="${p.label}">
-                
+
                 <p class="proxyInfoElement proxy-info">
                     ${p.label} | <span class="class-label">${p.classLabel}</span>
                     <br>
                     <a class="remove-proxyUri" href="${formUrls.edit}?proxyUri=${p.uri}&deleteProxy=Delete proxy" title="${i18n().delete_profile_editor}">${i18n().delete_profile_editor}</a>
                     <input type="hidden" value="${p.uri}" name="proxyUri">
                 </p>
-            </div>       
-        </fieldset>  
-        
+            </div>
+        </fieldset>
+
         <fieldset class="profile">
             <legend>${i18n().add_profile}</legend>
-            
+
             <section name="proxyProfilesPanel" role="region">
                 <label for="addProfile">${i18n().add_profile}</label>
                 <input id="addProfile" type="text" name="proxySelectorAC" class="acSelector" size="35" value="${i18n().select_last_name}" role="input" /><span><img class="loading-addProfile hidden"  alt="${i18n().processing_indicator}" src="${urls.images}/indicatorWhite.gif" /></span>
-                
+
                 <p class="search-status"><span name='proxySelectorSearchStatus' moreCharsText='${i18n().type_more_chars}' noMatchText='${i18n().no_match}'>&nbsp;</span></p>
                 <p name="excludeUri" style="display: none">${r.proxyInfos[0].profileUri}<p>
                 <p class="selected-editors">${i18n().selected_profiles}:</p>
-    
+
                 <#-- Magic div that holds all of the proxy data and the template that shows how to display it. -->
                 <ul name="proxyData" role="navigation">
                     <#list r.profileInfos as p>
@@ -157,28 +157,28 @@
                         </div>
                     </#list>
 
-                    <#-- 
+                    <#--
                         Each proxy will be shown using the HTML inside this element.
                         It must contain at least:
                         -- a link with templatePart="remove"
-                        -- a hidden input field with templatePart="uriField"  
+                        -- a hidden input field with templatePart="uriField"
                     -->
                     <div name="template" style="display: none">
                         <li role="listitem">
                             <img class="photo-profile" width="60" alt="%label%" src="%imageUrl%">
-                             
+
                             <p class="proxy-info-profile">%label% | <span class="class-label">%classLabel%</span>
                                 <br /><a class='remove-proxy' href="." templatePart="remove" title="${i18n().remove_selection}">${i18n().remove_selection}</a>
                             </p>
                         </li>
-                        
+
                         <input type="hidden" name="profileUri" templatePart="uriField" value="%uri%" role="input" />
                     </div>
                 </ul>
             </section>
-            
+
             <input class="submit" type="submit" name="modifyProfileList" value="${i18n().save_profile_changes}" role="button" />
-        </fieldset> 
+        </fieldset>
     </form>
 </section>
 </#list>
@@ -200,5 +200,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>')}
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/account/proxyUtils.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/account/accountProxyCommon.js"></script>',   
-              '<script type="text/javascript" src="${urls.base}/js/account/accountProxyItemsPanel.js"></script>')}   
+              '<script type="text/javascript" src="${urls.base}/js/account/accountProxyCommon.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/account/accountProxyItemsPanel.js"></script>')}
diff --git a/webapp/src/main/webapp/templates/freemarker/body/menuN3Edit.ftl b/webapp/src/main/webapp/templates/freemarker/body/menuN3Edit.ftl
index 2a7f9bdb1..3d8d36eaf 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/menuN3Edit.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/menuN3Edit.ftl
@@ -2,18 +2,18 @@
 
 <div id="navigationManagement">
     <h2>${i18n().menu_management}</h2>
-    
+
     <#if errorMessage??>
         <div id="errorAlert">
             <img src="../images/iconAlert.png" alt="${i18n().error_alert_icon}" height="31" width="32">
             <p>${errorMessage}</p>
         </div>
     </#if>
-    
+
     <#if message??>
         <p>${message}</p>
     </#if>
-    
+
     <#if menuN3??>
         <form class="" action="${urls.currentPage}" method="post">
             <label for="navigatioN3">${i18n().setup_navigation_menu}</label>
@@ -23,4 +23,4 @@
             <input name="submit" id="submit" value="${i18n().save_button}" type="submit"/> or <a href="${urls.base}${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
         </form>
     </#if>
-</div>
\ No newline at end of file
+</div>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/menupage/emptyPage.ftl b/webapp/src/main/webapp/templates/freemarker/body/menupage/emptyPage.ftl
index 926119cfc..d0f12a35c 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/menupage/emptyPage.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/menupage/emptyPage.ftl
@@ -1,10 +1,10 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <div>
-<p>${i18n().page_not_configured}</p> 
+<p>${i18n().page_not_configured}</p>
 
 <p>${i18n().implement_capitalized} <a href="${urls.base}/display?uri=${page.pageUri?url}&switchToDisplayModel=1" title="${i18n().a_link}">${i18n().a_link}</a> ${i18n().configure_page_if_permissable}</p>
 
 
 
-</div> 
\ No newline at end of file
+</div>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/menupage/individualsForClassesMenuPage.ftl b/webapp/src/main/webapp/templates/freemarker/body/menupage/individualsForClassesMenuPage.ftl
index 62b361d26..c1e3c6cbb 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/menupage/individualsForClassesMenuPage.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/menupage/individualsForClassesMenuPage.ftl
@@ -6,12 +6,12 @@
     <section id="menupage-intro" role="region">
         <h2>${page.title}</h2>
     </section>
-    
+
     <#include "menupage-browse.ftl">
-    
+
     ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/menupage/menupage.css" />')}
-    
+
     <#include "menupage-scripts.ftl">
 <#else>
     ${noDataNotification}
-</#if>
\ No newline at end of file
+</#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/menupage/menupage--defaultFixedHtml.ftl b/webapp/src/main/webapp/templates/freemarker/body/menupage/menupage--defaultFixedHtml.ftl
index 8f0552427..bc439fda4 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/menupage/menupage--defaultFixedHtml.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/menupage/menupage--defaultFixedHtml.ftl
@@ -9,7 +9,7 @@
 <#if htmlExists>
 	${.globals[variableName]}
 <#else>
-	${i18n().no_html_specified}  
+	${i18n().no_html_specified}
 </#if>
 
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/menupage/menupage--defaultSearchIndividuals.ftl b/webapp/src/main/webapp/templates/freemarker/body/menupage/menupage--defaultSearchIndividuals.ftl
index 5f57a748c..74a7e702e 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/menupage/menupage--defaultSearchIndividuals.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/menupage/menupage--defaultSearchIndividuals.ftl
@@ -9,12 +9,12 @@
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css" />')}
 
 <section class="individualList">
-    <h2>${title!} 
+    <h2>${title!}
     </h2>
     <#if subtitle?has_content>
         <h4>${subtitle}</h4>
     </#if>
-    
+
     <#if (!noData)>
         <#if errorMessage?has_content>
             <p>${errorMessage}</p>
@@ -34,20 +34,20 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css
                     </ul>
                 </#if>
             </#assign>
-            
+
             ${pagination}
-            
+
             <ul>
                 <#list individuals as individual>
-                    <li>       
+                    <li>
                         <@shortView uri=individual.uri viewContext="index" />
                     </li>
                 </#list>
             </ul>
-            
+
             ${pagination}
         </#if>
     <#else>
         ${noDataNotification}
     </#if>
-</section> <!-- .individualList -->
\ No newline at end of file
+</section> <!-- .individualList -->
diff --git a/webapp/src/main/webapp/templates/freemarker/body/menupage/menupage--defaultSparql.ftl b/webapp/src/main/webapp/templates/freemarker/body/menupage/menupage--defaultSparql.ftl
index 653e8eab5..ef9cf83c1 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/menupage/menupage--defaultSparql.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/menupage/menupage--defaultSparql.ftl
@@ -20,7 +20,7 @@
 			<div class="resultHeading resultRow">
 			<#list resultKeys as resultKey>
 					<div class="resultCell">${resultKey}</div>
-			</#list>	
+			</#list>
 			</div>
 			<#assign firstRow = true/>
 		</#if>
@@ -31,7 +31,7 @@
 		</div>
 	</#list>
 <#else>
-	${i18n().no_results_returned} 
+	${i18n().no_results_returned}
 </#if>
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/menupage/sparqlresults.css" />')}
diff --git a/webapp/src/main/webapp/templates/freemarker/body/menupage/menupage--exampleMultipleContentTypes.ftl b/webapp/src/main/webapp/templates/freemarker/body/menupage/menupage--exampleMultipleContentTypes.ftl
index 46e166e65..7a2cd14c4 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/menupage/menupage--exampleMultipleContentTypes.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/menupage/menupage--exampleMultipleContentTypes.ftl
@@ -1,5 +1,5 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
-<#--This is an example of including multiple content types in the same template, 
+<#--This is an example of including multiple content types in the same template,
     this combines the default templates for Fixed HTML, Class groups and Search Individuals in one template-->
 <#include "menupage-checkForData.ftl">
 <#--Fixed HTML portion-->
@@ -15,7 +15,7 @@ variableName is used below.-->
 <#if htmlExists>
 	${.globals[variableName]}
 <#else>
-	${i18n().no_html_specified}  
+	${i18n().no_html_specified}
 </#if>
 
 <#--Class grou section-->
@@ -23,11 +23,11 @@ variableName is used below.-->
     <section id="menupage-intro" role="region">
         <h2>${page.title}</h2>
     </section>
-    
+
     <#include "menupage-browse.ftl">
-    
+
     ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/menupage/menupage.css" />')}
-    
+
     <#include "menupage-scripts.ftl">
 <#else>
     ${noDataNotification}
@@ -41,12 +41,12 @@ variableName is used below.-->
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css" />')}
 
 <section class="individualList">
-    <h2>${title!} 
+    <h2>${title!}
     </h2>
     <#if subtitle?has_content>
         <h4>${subtitle}</h4>
     </#if>
-    
+
     <#if (!noData)>
         <#if errorMessage?has_content>
             <p>${errorMessage}</p>
@@ -66,20 +66,20 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css
                     </ul>
                 </#if>
             </#assign>
-            
+
             ${pagination}
-            
+
             <ul>
                 <#list individuals as individual>
-                    <li>       
+                    <li>
                         <@shortView uri=individual.uri viewContext="index" />
                     </li>
                 </#list>
             </ul>
-            
+
             ${pagination}
         </#if>
     <#else>
         ${noDataNotification}
     </#if>
-</section> <!-- .individualList -->
\ No newline at end of file
+</section> <!-- .individualList -->
diff --git a/webapp/src/main/webapp/templates/freemarker/body/menupage/page-classgroup.ftl b/webapp/src/main/webapp/templates/freemarker/body/menupage/page-classgroup.ftl
index 62b361d26..c1e3c6cbb 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/menupage/page-classgroup.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/menupage/page-classgroup.ftl
@@ -6,12 +6,12 @@
     <section id="menupage-intro" role="region">
         <h2>${page.title}</h2>
     </section>
-    
+
     <#include "menupage-browse.ftl">
-    
+
     ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/menupage/menupage.css" />')}
-    
+
     <#include "menupage-scripts.ftl">
 <#else>
     ${noDataNotification}
-</#if>
\ No newline at end of file
+</#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/menupage/page-pageList.ftl b/webapp/src/main/webapp/templates/freemarker/body/menupage/page-pageList.ftl
index 4ee23e30a..eb7f752e3 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/menupage/page-pageList.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/menupage/page-pageList.ftl
@@ -4,31 +4,31 @@
 
 <div>
 
-<#if pages?has_content >  
+<#if pages?has_content >
   <table>
     <th>${i18n().title_capitalized}</th><th>URI</th>
-    
-    <#list pages as pagex>      
-      <tr>                
-        <td>${(pagex.title)!i18n().untitled}</td>                  
+
+    <#list pages as pagex>
+      <tr>
+        <td>${(pagex.title)!i18n().untitled}</td>
         <#if pagex.pageUri??>
             <td><a href="${urls.base}/individual?uri=${pagex.pageUri?url}&switchToDisplayModel=1" title="${i18n().page_uri}">${pagex.pageUri}</a></td>
-        <#else>        
+        <#else>
             <td>${i18n().uri_not_defined}</td>
-        </#if>                 
-      </tr>    
-    </#list>    
+        </#if>
+      </tr>
+    </#list>
   </table>
-  
+
 <#else>
     <p>${i18n().no_pages_defined}</p>
 </#if>
-  
+
   <form id="addIndividualClass" action="${urls.base}/editRequestDispatch" method="get">
-      <input type="hidden" name="typeOfNew" value="http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page">              
+      <input type="hidden" name="typeOfNew" value="http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page">
       <input type="hidden" name="switchToDisplayModel" value="1">
       <input type="hidden" name="editForm" value="${generators.NewIndividualFormGenerator}" role="input">
       <input type="submit" id="submit" value="${i18n().add_page}" role="button">
   </form>
 
-</div> 
\ No newline at end of file
+</div>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/message/message-titled.ftl b/webapp/src/main/webapp/templates/freemarker/body/message/message-titled.ftl
index e2a19c1c2..270d683db 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/message/message-titled.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/message/message-titled.ftl
@@ -4,4 +4,4 @@
 
 <h2>${title!}</h2>
 
-<#include "message.ftl">
\ No newline at end of file
+<#include "message.ftl">
diff --git a/webapp/src/main/webapp/templates/freemarker/body/message/message.ftl b/webapp/src/main/webapp/templates/freemarker/body/message/message.ftl
index 974ea8d20..fd491b73f 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/message/message.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/message/message.ftl
@@ -4,4 +4,4 @@
 
 <#if message??>
     <p>${message}</p>
-</#if>
\ No newline at end of file
+</#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/pagemanagement/page-pageList.ftl b/webapp/src/main/webapp/templates/freemarker/body/pagemanagement/page-pageList.ftl
index 027e45c0b..fc8d93fa9 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/pagemanagement/page-pageList.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/pagemanagement/page-pageList.ftl
@@ -4,31 +4,31 @@
 
 <div>
 
-<#if pages?has_content >  
+<#if pages?has_content >
   <table>
     <th>${i18n().title_capitalized}</th><th>URI</th>
-    
-    <#list pages as pagex>      
-      <tr>                
-        <td>${(pagex.title)!'-untitled-'}</td>                  
+
+    <#list pages as pagex>
+      <tr>
+        <td>${(pagex.title)!'-untitled-'}</td>
         <#if pagex.pageUri??>
             <td><a href="${urls.base}/individual?uri=${pagex.pageUri?url}&switchToDisplayModel=1" title="${i18n().page_uri}">${pagex.pageUri}</a></td>
-        <#else>        
+        <#else>
             <td>${i18n().uri_not_defined}</td>
-        </#if>                 
-      </tr>    
-    </#list>    
+        </#if>
+      </tr>
+    </#list>
   </table>
-  
+
 <#else>
     <p>${i18n().no_pages_defined}</p>
 </#if>
-  
+
   <form id="addIndividualClass" action="${urls.base}/editRequestDispatch" method="get">
-      <input type="hidden" name="typeOfNew" value="http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page">              
+      <input type="hidden" name="typeOfNew" value="http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page">
       <input type="hidden" name="switchToDisplayModel" value="1">
       <input type="hidden" name="editForm" value="${generators.NewIndividualFormGenerator}" role="input">
       <input type="submit" id="submit" value="${i18n().Add_page}" role="button">
   </form>
 
-</div> 
\ No newline at end of file
+</div>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/pagemanagement/pageList.ftl b/webapp/src/main/webapp/templates/freemarker/body/pagemanagement/pageList.ftl
index 29339048d..af0636a8a 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/pagemanagement/pageList.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/pagemanagement/pageList.ftl
@@ -6,9 +6,9 @@
     </div>
 
 
-<#if pages?has_content >  
+<#if pages?has_content >
 <table id="table-listing" style="margin-bottom:2px">  <caption>${i18n().page_management}</caption>
-  
+
     <thead>
       <tr>
         <th scope="col">${i18n().title_capitalized}</th>
@@ -19,22 +19,22 @@
         <th id="iconColumns" scope="col">${i18n().controls}</th>
       </tr>
     </thead>
-    
+
     <tbody>
-    <#list pages as pagex>      
-    	 <tr>                
-            <td> 
-            	<#if pagex.listedPageUri?has_content> 
+    <#list pages as pagex>
+    	 <tr>
+            <td>
+            	<#if pagex.listedPageUri?has_content>
             	    <#if pagex.listedPageTitle == "Home" >
             	        ${pagex.listedPageTitle!}
             	    <#else>
             		<a href="${urls.base}/editRequestDispatch?subjectUri=${pagex.listedPageUri?url}&switchToDisplayModel=1&editForm=edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator" title="${i18n().listed_page_title}">${(pagex.listedPageTitle)!i18n().untitled}</a>
             		</#if>
-            		
+
             	<#else>
-            		${i18n().uri_not_defined} 
+            		${i18n().uri_not_defined}
             	</#if>
-            </td>                  
+            </td>
             <!--td> {pagex.dataGetterLabel}</td-->
             <td>${pagex.listedPageUrlMapping}</td>
             <td>${(pagex.listedPageTemplate)!''}</td>
@@ -52,19 +52,19 @@
                     <a cmd="deletePage" pageTitle=" ${pagex.listedPageTitle!}"  href="${urls.base}/deletePageController?pageURI=${pagex.listedPageUri?url}" title="${i18n().delete_page}"><img src="${urls.images!}/individual/deleteIcon.gif" alt="${i18n().delete_page}"></a>
                 </#if>
             </td>
-        </tr>    
-    
- 
-    </#list>   
-    </tbody> 
+        </tr>
+
+
+    </#list>
+    </tbody>
   </table>
-  
+
 <#else>
     <p>${i18n().no_pages_defined}</p>
 </#if>
-  
+
   <form id="pageListForm" action="${urls.base}/editRequestDispatch" method="get">
-      <input type="hidden" name="typeOfNew" value="http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page">              
+      <input type="hidden" name="typeOfNew" value="http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page">
       <input type="hidden" name="switchToDisplayModel" value="1">
       <input type="hidden" name="editForm" value="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator" role="input">
  	<input id="submit" value="${i18n().add_page}" role="button" type="submit" >
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/account/userAccounts-accountsNav.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/account/userAccounts-accountsNav.ftl
index ea81b3c4f..1b36a8e80 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/account/userAccounts-accountsNav.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/account/userAccounts-accountsNav.ftl
@@ -1,7 +1,7 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-----------------------------------------------------------------------------
-    Macro for generating number of accounts, pagination, accounts per page, 
+    Macro for generating number of accounts, pagination, accounts per page,
     and delete function.
 ------------------------------------------------------------------------------>
 
@@ -12,36 +12,36 @@
 
   <section class="accounts">
       <input type="submit" name="delete-account" class="delete-account delete" value="${i18n().delete_button}" onClick="changeAction(this.form, '${formUrls.delete}')" />
-      <!-- 
-          When this is clicked, the checkboxes are noticed and all other fields are ignored. 
+      <!--
+          When this is clicked, the checkboxes are noticed and all other fields are ignored.
           submit the form (submit action is formUrls.delete)
       -->
 
       <nav class="display-tools">
-          <span>| ${total} ${i18n().accounts} | </span>  
+          <span>| ${total} ${i18n().accounts} | </span>
 
           <select name="accountsPerPage" class="accounts-per-page">
               <#list accountsCount as count>
               <option value="${count}" <#if accountsPerPage=count>selected</#if> >${count}</option>
               </#list>
              <option value="${total}" <#if accountsPerPage=total>selected</#if> >All</option>
-              <!--     
-                  When accountsPerPage changes, 
-                  set pageIndex to 1 
-                  submit the form (submit action is formUrls.list) 
-              -->     
+              <!--
+                  When accountsPerPage changes,
+                  set pageIndex to 1
+                  submit the form (submit action is formUrls.list)
+              -->
           </select>
 
-          ${i18n().accounts_per_page} <input type="submit" name="accounts-per-page" value="${i18n().update_button}" /> | 
+          ${i18n().accounts_per_page} <input type="submit" name="accounts-per-page" value="${i18n().update_button}" /> |
           <input id="roleTypeContainer" type="hidden" name="roleFilterUri" value="">
           <#if page.previous?has_content>
               <a id="previousPage" href="${formUrls.list}?accountsPerPage=${accountsPerPage}&pageIndex=${page.previous}" title="${i18n().previous}">${i18n().previous}</a> <!-- only present if current page is not 1.-->
           </#if>
-              ${page.current} of ${page.last} 
+              ${page.current} of ${page.last}
           <#if page.next?has_content>
               <a id="nextPage" href="${formUrls.list}?accountsPerPage=${accountsPerPage}&pageIndex=${page.next}" title="${i18n().next_capitalized}">${i18n().next_capitalized}</a><!-- only present if current page is not last page.-->
           </#if>
       </nav>
   </section>
 
-</#macro>
\ No newline at end of file
+</#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/browse-classgroups.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/browse-classgroups.ftl
index 51b61466c..28fb6e4ce 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/browse-classgroups.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/browse-classgroups.ftl
@@ -28,19 +28,19 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseClassGrou
             </#if>
         </#list>
     </#assign>
-    
+
     <#-- Display the class group browse only if we have at least one populated class group -->
     <#if firstPopulatedClassGroup??>
         <section id="browse" role="region">
             <h4>${i18n().browse_by}</h4>
-            
+
             <ul id="browse-classgroups" role="list">
                 ${classGroupList}
             </ul>
-            
+
             <#-- If requesting the home page without any additional URL parameters, select the first populated class group-->
             <#assign defaultSelectedClassGroup = firstPopulatedClassGroup />
-            
+
             <section id="browse-classes" role="navigation">
                 <nav>
                     <ul id="classes-in-classgroup" class="vis" role="list">
@@ -62,7 +62,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseClassGrou
                 </#if>
             </section> <!-- #browse-classes -->
         </section> <!-- #browse -->
-        
+
         <#-- For v1.3: The controller should pass in the dataservice url. -->
         <script type="text/javascript">
             var browseData = {
@@ -75,7 +75,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseClassGrou
                 browseAllString: '${i18n().browse_all}',
                 contentString: '${i18n().content}'
             };
-            
+
         </script>
         ${scripts.add('<script type="text/javascript" src="${urls.base}/js/browseClassGroups.js"></script>')}
 
@@ -83,7 +83,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseClassGrou
         <#-- Would be nice to update classgroups-checkForData.ftl with macro so it could be used here as well -->
         <#-- <#include "classgroups-checkForData.ftl"> -->
         <h3>${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>
@@ -108,8 +108,8 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseClassGrou
     <section id="visual-graph" class="barchart" role="region">
         <#-- Will be populated dynamically via AJAX request -->
     </section>
-    
+
     ${scripts.add('<script type="text/javascript" src="${urls.base}/js/raphael/raphael.js"></script>',
                   '<script type="text/javascript" src="${urls.base}/js/raphael/g.raphael.js"></script>',
                   '<script type="text/javascript" src="${urls.base}/js/raphael/g.bar.js"></script>')}
-</#macro>
\ No newline at end of file
+</#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/classgroups-checkForData.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/classgroups-checkForData.ftl
index 947174bbd..9b2ed5d74 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/classgroups-checkForData.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/classgroups-checkForData.ftl
@@ -14,7 +14,7 @@
     <#assign noData = false />
 </#if>
 
-<#assign noDataNotification>    
+<#assign noDataNotification>
     <#if user.loggedIn>
         <#if user.authorizedToRebuildSearchIndex>
             <span class="contentNote">
@@ -27,10 +27,10 @@
             <p>${i18n().please} <a href="${urls.login}" title="${i18n().login_to_manage_site}">${i18n().log_in}</a> ${i18n().to_manage_content}</p>
         </span>
     </#if>
-    
+
     <h3>${i18n().no_content_create_groups_classes}</h3>
-    
+
     <#if user.loggedIn && 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>
     </#if>
-</#assign>
\ No newline at end of file
+</#assign>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/dump/dump.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/dump/dump.ftl
index daf433fc4..d6a0ffbd9 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/dump/dump.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/dump/dump.ftl
@@ -6,9 +6,9 @@
 
 <div class="dump">
     <h3>${title!}</h3>
-    
-    <#-- dump has been changed to dumpValue to avoid confusion 
-    with the dump directive which is stored in the DataModel as 'dump' -->    
+
+    <#-- dump has been changed to dumpValue to avoid confusion
+    with the dump directive which is stored in the DataModel as 'dump' -->
     <@doDump dumpValue />
 </div>
 
@@ -17,17 +17,17 @@
         <ul>
             <#list dumpValue?keys as key>
                 <li class="variable">
-                    <p><strong>Variable name:</strong> ${key}</p>  
-                    
+                    <p><strong>Variable name:</strong> ${key}</p>
+
                     <#local type = dumpValue[key].type!>
-                    <#if type == "Directive" || type == "Method"> 
+                    <#if type == "Directive" || type == "Method">
                         <@doMethod dumpValue[key] />
-                    <#else>                
+                    <#else>
                         <@doTypeAndValue dumpValue[key] />
                     </#if>
-                </li>       
+                </li>
             </#list>
-        </ul> 
+        </ul>
     </#if>
 </#macro>
 
@@ -35,25 +35,25 @@
     <#local type = map.type!>
     <#if type?has_content>
         <p><strong>Type:</strong> ${type}</p>
-        
+
         <#if map.dateType?has_content>
             <p><strong>Date type:</strong> ${map.dateType}</p>
         </#if>
-    </#if>   
+    </#if>
 
-    <#local value = map.value!>   
+    <#local value = map.value!>
     <#-- Not value?has_content: we want to print [empty] for empty strings.
          See doScalarValue macro. For methods, we don't show a list of values
-         unless there is a value. --> 
-    <#if value?? && (value?has_content || ! isMethod)> 
+         unless there is a value. -->
+    <#if value?? && (value?has_content || ! isMethod)>
         <div class="values">
             <#if type?contains(".")><@doObjectValue value />
             <#elseif value?is_sequence><@doSequenceValue value type />
-            <#elseif value?is_hash_ex><@doMapValue value />            
+            <#elseif value?is_hash_ex><@doMapValue value />
             <#else><@doScalarValue value />
             </#if>
        </div>
-    </#if>                         
+    </#if>
 </#macro>
 
 <#macro doObjectValue obj>
@@ -67,7 +67,7 @@
             </#list>
         </ul>
     </#if>
-    
+
     <#if obj.methods?has_content>
         <p><strong>Methods:</strong</p>
         <ul class="methods">
@@ -75,7 +75,7 @@
                 <#local value = obj.methods[method]>
                 <@liItem>
                     <#if ! value?has_content> <#-- no return value -->
-                        ${method} 
+                        ${method}
                     <#elseif value?is_string> <#-- value is return type -->
                         ${method} => ${value}
                     <#else> <#-- no-arg method: value is result of method invocation -->
@@ -95,10 +95,10 @@
             <#list seq as item>
                 <@liItem>
                     <#if type == "Sequence">
-                        Item ${item_index}: 
+                        Item ${item_index}:
                         <@divValue><@doTypeAndValue item /></@divValue>
                     <#else><@doTypeAndValue item />
-                    </#if>                    
+                    </#if>
                 </@liItem>
             </#list>
         </ul>
@@ -122,15 +122,15 @@
 
 <#macro doScalarValue value>
     <strong>Value:</strong>
-    
+
     <#if value?is_string>
         <#if value?has_content>${value}
         <#else>[empty]
-        </#if>    
+        </#if>
     <#elseif value?is_number>${value?c}
     <#elseif value?is_boolean>${value?string}
     <#elseif value?is_date>${value?string("EEEE, MMMM dd, yyyy hh:mm:ss a zzz")}
-    </#if>    
+    </#if>
 </#macro>
 
 <#macro doMethod method>
@@ -142,7 +142,7 @@
             <#list help?keys as key>
                 <li>
                     <#local value = help[key]>
-                    <@divValue>                        
+                    <@divValue>
                         <#if value?is_string><p><strong>${key?cap_first}:</strong> ${value}</p>
                         <#else>
                             <p><strong>${key?cap_first}:</strong></p>
@@ -160,7 +160,7 @@
                         </#if>
                     </@divValue>
                 </li>
-            </#list>        
+            </#list>
         </ul>
     </#if>
 </#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-adminPanel.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-adminPanel.ftl
index 821383767..38989d4f5 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-adminPanel.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-adminPanel.ftl
@@ -7,7 +7,7 @@
 <#if individual.showAdminPanel>
     <section id="admin">
         <h3 id="adminPanel">${i18n().admin_panel}</h3><a class="edit-individual" href="${individual.controlPanelUrl()}" title="${i18n().edit_this_individual}">${i18n().edit_this_individual}</a>
-        
+
         <section id = "verbose-mode">
         <#if verbosePropertySwitch?has_content>
             <#assign anchorId = "verbosePropertySwitch">
@@ -15,9 +15,9 @@
             <#assign newValue = verbosePropertySwitch.currentValue?string("${i18n().verbose_status_off}", "${i18n().verbose_status_on}")>
             <span>${i18n().verbose_property_status} <b>${currentValue}</b> | </span>
             <a id="${anchorId}" class="verbose-toggle small" href="${verbosePropertySwitch.url}" title="${i18n().verbose_control}"><#if verbosePropertySwitch.currentValue!>${i18n().verbose_turn_off}<#else>${i18n().verbose_turn_on}</#if></a>
-        </#if> 
+        </#if>
         </section>
 
         <p class="uri-link">${i18n().resource_uri}: <a href="${individual.uri}" target="_blank" title="${i18n().resource_uri}">${individual.uri}</a></p>
     </section>
-</#if>
\ No newline at end of file
+</#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-properties.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-properties.ftl
index 0ac17a5e6..665318b09 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-properties.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-properties.ftl
@@ -9,23 +9,23 @@
             <#elseif property.rangeUri?has_content >
                 <#assign rangeClass = property.rangeUri?substring(property.rangeUri?last_index_of("/")+1)>
             </#if>
-        
+
             <article class="property" role="article">
                 <#-- Property display name -->
                 <#if rangeClass == "Authorship" && individual.editable && (property.domainUri)?? && property.domainUri?contains("Person")>
-                    <h3 id="${property.localName}-${rangeClass}" title="${property.publicDescription!}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> 
+                    <h3 id="${property.localName}-${rangeClass}" title="${property.publicDescription!}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property />
                         <a id="managePubLink" class="manageLinks" href="${urls.base}/managePublications?subjectUri=${subjectUri[1]!}" title="${i18n().manage_publications_link}" <#if verbose>style="padding-top:10px"</#if> >
                             ${i18n().manage_publications_link}
                         </a>
                     </h3>
                 <#elseif rangeClass == "ResearcherRole" && individual.editable  >
-                    <h3 id="${property.localName}-${rangeClass}" title="${property.publicDescription!}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> 
+                    <h3 id="${property.localName}-${rangeClass}" title="${property.publicDescription!}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property />
                         <a id="manageGrantLink" class="manageLinks" href="${urls.base}/manageGrants?subjectUri=${subjectUri[1]!}" title="${i18n().manage_grants_and_projects_link}" <#if verbose>style="padding-top:10px"</#if> >
                             ${i18n().manage_grants_and_projects_link}
                         </a>
                     </h3>
                 <#elseif rangeClass == "Position" && individual.editable  >
-                    <h3 id="${property.localName}-${rangeClass}" title="${property.publicDescription!}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> 
+                    <h3 id="${property.localName}-${rangeClass}" title="${property.publicDescription!}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property />
                         <a id="managePeopleLink" class="manageLinks" href="${urls.base}/managePeople?subjectUri=${subjectUri[1]!}" title="${i18n().manage_affiliated_people}" <#if verbose>style="padding-top:10px"</#if> >
                             ${i18n().manage_affiliated_people_link}
                         </a>
@@ -52,7 +52,7 @@
                         <@p.dataPropertyList property editable />
                     <#-- object property -->
                     <#else>
-                        <@p.objectProperty property editable /> 
+                        <@p.objectProperty property editable />
                     </#if>
                 </ul>
             </article> <!-- end property -->
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-property-group-menus.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-property-group-menus.ftl
index df7679833..4c2eec37f 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-property-group-menus.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-property-group-menus.ftl
@@ -6,14 +6,14 @@
 <#assign subjectUri = individual.controlPanelUrl()?split("=") >
 
 <#if (propertyGroups.all)??>
-    <#assign groups = propertyGroups.all>   
+    <#assign groups = propertyGroups.all>
     <#if groups?has_content>
-        <#if (groups?size > 1) || (groups?first).getName(nameForOtherGroup)?has_content> 
+        <#if (groups?size > 1) || (groups?first).getName(nameForOtherGroup)?has_content>
             <nav id="property-group-menu" role="navigation">
                 <ul role="list">
                     <#list groups as group>
                       <#if (group.properties?size > 0) >
-                        <#assign groupname = group.getName(nameForOtherGroup)>                        
+                        <#assign groupname = group.getName(nameForOtherGroup)>
                         <#if groupname?has_content>
                     		<#--create property group html id is the function that will replace all spaces with underscore to make a valid id-->
                         	<#assign groupnameHtmlId = p.createPropertyGroupHtmlId(groupname) >
@@ -32,15 +32,15 @@
   <#if (group.properties?size > 0)>
     <#assign groupName = group.getName(nameForOtherGroup)>
     <#assign verbose = (verbosePropertySwitch.currentValue)!false>
-    
+
     <section class="property-group" role="region">
         <nav class="scroll-up" role="navigation">
             <a href="#branding" title="${i18n().scroll_to_menus}">
                 <img src="${urls.images}/individual/scroll-up.gif" alt="${i18n().scroll_to_menus}" />
             </a>
         </nav>
-        
-        <#-- Display the group heading --> 
+
+        <#-- Display the group heading -->
         <#if groupName?has_content>
     		<#--the function replaces spaces in the name with underscores, also called for the property group menu-->
         	<#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
@@ -48,7 +48,7 @@
         <#else>
             <h2 id="properties">${i18n().properties_capitalized}</h2>
         </#if>
-        
+
         <#-- List the properties in the group -->
         <#include "individual-properties.ftl">
     </section> <!-- end property-group -->
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl
index 853b2d197..d4ac60e9b 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl
@@ -45,8 +45,8 @@
                 <img src="${urls.images}/individual/scroll-up.gif" alt="${i18n().scroll_to_menus}" />
             </a>
         </nav>
-    
-        <#-- Display the group heading --> 
+
+        <#-- Display the group heading -->
         <#if groupName?has_content>
 		    <#--the function replaces spaces in the name with underscores, also called for the property group menu-->
     	    <#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-propertyGroupMenu.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-propertyGroupMenu.ftl
index e389ea32e..42fecaf4e 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-propertyGroupMenu.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-propertyGroupMenu.ftl
@@ -6,13 +6,13 @@
 
 <#if (propertyGroups.all)??>
     <#assign groups = propertyGroups.all>
-    
+
     <#if groups?has_content>
-        <#if (groups?size > 1) || (groups?first).getName(nameForOtherGroup)?has_content> 
+        <#if (groups?size > 1) || (groups?first).getName(nameForOtherGroup)?has_content>
             <nav id="property-group-menu" role="navigation">
                 <ul role="list">
                     <#list groups as group>
-                        <#assign groupname = group.getName(nameForOtherGroup)>                        
+                        <#assign groupname = group.getName(nameForOtherGroup)>
                         <#if groupname?has_content>
                     		<#--create property group html id is the function that will replace all spaces with underscore to make a valid id-->
                         	<#assign groupnameHtmlId = p.createPropertyGroupHtmlId(groupname) >
@@ -23,6 +23,6 @@
                     </#list>
                 </ul>
             </nav>
-        </#if> 
+        </#if>
     </#if>
-</#if>
\ No newline at end of file
+</#if>
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
index 8c32eda0d..5e6e66fc8 100644
--- 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
@@ -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-datetime.ftl" as dt>
 <#import "lib-meta-tags.ftl" as lmt>
@@ -19,7 +19,7 @@
     <#if datatype == "anyURI" && theValue?starts_with("http")>
 	<#assign theValue = "<a href=\"" + statement.value + "\" target=\"_blank\">" + statement.value + "</a>" />
     </#if>
-	
+
     <#if theValue?contains("<ul>") >
         <#assign theValue = theValue?replace("<ul>","<ul class='tinyMCEDisc'>") />
     </#if>
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 9fd92e85c..207977e9a 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$ -->
 
-<#-- Default object property statement template. 
-    
+<#-- 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.
  -->
 
-<a href="${profileUrl(statement.uri("object"))}" title="${i18n().name}">${statement.label!statement.localName!}</a> 
+<a href="${profileUrl(statement.uri("object"))}" title="${i18n().name}">${statement.label!statement.localName!}</a>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasElement.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasElement.ftl
index 960f09d5f..3a7aa084c 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasElement.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-hasElement.ftl
@@ -1,15 +1,15 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- Template for display:hasElement (used for menu system). 
-    
+<#-- Template for display:hasElement (used for menu system).
+
      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.
  -->
 
-${statement.linkText} 
+${statement.linkText}
 
 <script type="text/javascript">
     menuItemData.push({
         'menuItemUri': '${statement.menuItem}'
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-simple.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-simple.ftl
index 587b2c0c6..5a1738325 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-simple.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-simple.ftl
@@ -1,4 +1,4 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <#-- Simple object property statement template -->
-<a href="${profileUrl(statement.uri("object"))}" title="${i18n().name}">${statement.name!}</a>  
+<a href="${profileUrl(statement.uri("object"))}" title="${i18n().name}">${statement.name!}</a>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl
index b9d65cf6e..bf9882b19 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl
@@ -35,7 +35,7 @@
             </ul>
         </nav>
     </nav>
-    
+
     <section id="individuals-in-class" role="region">
         <ul role="list">
 
@@ -46,4 +46,4 @@
 </section>
 <script type="text/javascript">
     $('section#noJavascriptContainer').removeClass('hidden');
-</script>
\ No newline at end of file
+</script>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-checkForData.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-checkForData.ftl
index e9599e7c6..82cc8211b 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-checkForData.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-checkForData.ftl
@@ -30,11 +30,11 @@
             <p>${i18n().please} <a href="${urls.login}" title="${i18n().login_to_manage_site}">${i18n().log_in}</a> ${i18n().to_manage_content}</p>
         </span>
     </#if>
-    
+
     <h3>${i18n().no_content_in_system(page.title)}</h3>
     <#if user.loggedIn && user.hasSiteAdminAccess>
         <p>${i18n().you_can} <a href="${urls.siteAdmin}" title="Manage content">${i18n().add_content_manage_site}</a> ${i18n().from_site_admin_page}</p>
     </#if>
-    
+
     <p>${i18n().browse_all_public_content} <a href="${urls.index}" title="${i18n().browse_all_content}">${i18n().index_page}</a>.</p>
-</#assign>
\ No newline at end of file
+</#assign>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-scripts.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-scripts.ftl
index a0bc43140..3459054c4 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-scripts.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-scripts.ftl
@@ -46,4 +46,4 @@
 
 <#-- Script to enable browsing individuals within a class -->
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.scrollTo-min.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/menupage/browseByVClass.js"></script>')}
\ No newline at end of file
+              '<script type="text/javascript" src="${urls.base}/js/menupage/browseByVClass.js"></script>')}
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-vClassesInClassgroup.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-vClassesInClassgroup.ftl
index 0906cbb4e..5863aea10 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-vClassesInClassgroup.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-vClassesInClassgroup.ftl
@@ -17,4 +17,4 @@
         </#if>
     </#list>
     </ul>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-index-default.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-index-default.ftl
index 20dfa1cbc..427c41df0 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-index-default.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-index-default.ftl
@@ -6,4 +6,4 @@
 
 <a href="${individual.profileUrl}" title="${i18n().name}">${individual.name}</a>
 
-<@p.mostSpecificTypes individual  />
\ No newline at end of file
+<@p.mostSpecificTypes individual  />
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-search-default.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-search-default.ftl
index 429e42609..5606236dd 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-search-default.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/shortview/view-search-default.ftl
@@ -8,4 +8,4 @@
 
 <@p.mostSpecificTypes individual />
 
-<p class="snippet">${individual.snippet}</p>
\ No newline at end of file
+<p class="snippet">${individual.snippet}</p>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/recomputeInferences.ftl b/webapp/src/main/webapp/templates/freemarker/body/recomputeInferences.ftl
index 08b509c04..9ea5de729 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/recomputeInferences.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/recomputeInferences.ftl
@@ -8,4 +8,4 @@
 
 <#if message?has_content>
     <p>${message}</p>
-</#if>
\ No newline at end of file
+</#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/revisionInfo.ftl b/webapp/src/main/webapp/templates/freemarker/body/revisionInfo.ftl
index 5ac37385e..0961669b1 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/revisionInfo.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/revisionInfo.ftl
@@ -6,12 +6,12 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/revision.css" /
 
 <section role="region">
     <h2>${i18n().revision_info}</h2>
-    
+
     <section id="revision-levels" role="region">
-        
+
         <table summary="VIVO revision's levels table">
             <caption>${i18n().levels}:</caption>
-            
+
             <tr>
                 <th>${i18n().name}</th>
                 <th>${i18n().release}</th>
@@ -26,10 +26,10 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/revision.css" /
             </#list>
         </table>
     </section>
-    
+
     <section id="revision-build-date" role="region">
         <h3>${i18n().build_date}:</h3>
-    
+
         <p>${revisionInfoBean.buildDate?datetime?string.full}</p>
     </section>
 </section>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/sdbSetup.ftl b/webapp/src/main/webapp/templates/freemarker/body/sdbSetup.ftl
index 4e534a9b0..01f351850 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/sdbSetup.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/sdbSetup.ftl
@@ -9,4 +9,4 @@
 </#if>
 <#if message??>
     <p>${message}</p>
-</#if>
\ No newline at end of file
+</#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 e6f89821d..6bcc3173b 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, URI, URL
-<#list individuals as individual>                 
+<#list individuals as individual>
 "${individual.name}","${individual.uri}","${individual.profileUrl}"
 </#list>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/search/search-error.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-error.ftl
index ee18214f0..711a2bafe 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/search/search-error.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/search/search-error.ftl
@@ -9,4 +9,4 @@
 <p>
 ${message?html}
 </p>
-<#include "search-help.ftl" >
\ No newline at end of file
+<#include "search-help.ftl" >
diff --git a/webapp/src/main/webapp/templates/freemarker/body/search/search-help.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-help.ftl
index d6d4b7acd..b69e4a57f 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/search/search-help.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/search/search-help.ftl
@@ -6,7 +6,7 @@
         <a href="#" onClick="history.back();return false;" title="back to results">Back to results</a>
     </span>
 <#else>
-    <h3>Search Tips</h3>        
+    <h3>Search Tips</h3>
 </#if>
 <ul class="searchTips">
     <li>Keep it simple! Use short, single terms unless your searches are returning too many results.</li>
@@ -14,30 +14,30 @@
     <li>Except for boolean operators, searches are <strong>not</strong> case-sensitive, so "Geneva" and "geneva" are equivalent</li>
     <li>If you are unsure of the correct spelling, put ~ at the end of your search term -- e.g., <i>cabage~</i> finds <i>cabbage</i>, <i>steven~</i> finds <i>Stephen</i> and <i>Stefan</i> (as well as other similar names).</li>
 </ul>
-    
-<h4><a id="advTipsLink" href="#">Advanced Tips</a></h4>    
+
+<h4><a id="advTipsLink" href="#">Advanced Tips</a></h4>
 <ul id="advanced" class="searchTips" style="visibility:hidden">
     <li>When you enter more than one term, search will return results containing all of them unless you add the Boolean "OR" -- e.g., <i>chicken</i> OR <i>egg</i>.</li>
     <li>NOT" can help limit searches -- e.g., <i>climate</i> NOT <i>change</i>.</li>
     <li>Phrase searches may be combined with Boolean operators -- e.g. "<i>climate change</i>" OR "<i>global warming</i>".</li>
     <li>Close word variations will also be found -- e.g., <i>sequence</i> matches <i>sequences</i> and <i>sequencing</i>.</li>
     <li>Use the wildcard * character to match an even wider variation -- e.g., <i>nano*</i> will match both <i>nanotechnology</i> and <i>nanofabrication</i>.</li>
-    <li>Search uses shortened versions of words -- e.g., a search for <i>cogniti*</i> finds nothing, while <i>cognit*</i> finds both <i>cognitive</i> and <i>cognition</i>.</li> 
+    <li>Search uses shortened versions of words -- e.g., a search for <i>cogniti*</i> finds nothing, while <i>cognit*</i> finds both <i>cognitive</i> and <i>cognition</i>.</li>
 </ul>
 <a id="closeLink" href="#"  style="visibility:hidden;font-size:.825em;padding-left:8px">Close</a>
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/search.css" />')}
 <script type="text/javascript">
     $(document).ready(function(){
         $('a#advTipsLink').click(function() {
-           $('ul#advanced').css("visibility","visible"); 
+           $('ul#advanced').css("visibility","visible");
            $('a#closeLink').css("visibility","visible");
            $('a#closeLink').click(function() {
-              $('ul#advanced').css("visibility","hidden"); 
+              $('ul#advanced').css("visibility","hidden");
               $('a#closeLink').css("visibility","hidden");
               return false;
            });
            return false;
         });
     });
-    
-</script>
\ No newline at end of file
+
+</script>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl
index 2b77e2acf..5d8f0f244 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl
@@ -9,14 +9,14 @@
     <#if typeName?has_content>${i18n().limited_to_type} '${typeName}'</#if>
 </#escape>
 <script type="text/javascript">
-	var url = window.location.toString();	
+	var url = window.location.toString();
 	if (url.indexOf("?") == -1){
 		var queryText = 'querytext=${querytext}';
 	} else {
 		var urlArray = url.split("?");
 		var queryText = urlArray[1];
 	}
-	
+
 	var urlsBase = '${urls.base}';
 </script>
 
@@ -30,12 +30,12 @@
     <#-- Refinement links -->
     <#if classGroupLinks?has_content>
         <div class="searchTOC">
-            <h4>${i18n().display_only}</h4>           
-            <ul>           
+            <h4>${i18n().display_only}</h4>
+            <ul>
             <#list classGroupLinks as link>
                 <li><a href="${link.url}" title="${i18n().class_group_link}">${link.text}</a><span>(${link.count})</span></li>
             </#list>
-            </ul>           
+            </ul>
         </div>
     </#if>
 
@@ -46,7 +46,7 @@
             <#else>
                 <h4>${i18n().limit_to}</h4>
             </#if>
-            <ul>           
+            <ul>
             <#list classLinks as link>
                 <li><a href="${link.url}" title="${i18n().class_link}">${link.text}</a><span>(${link.count})</span></li>
             </#list>
@@ -57,17 +57,17 @@
     <#-- Search results -->
     <ul class="searchhits">
         <#list individuals as individual>
-            <li>                        
+            <li>
             	<@shortView uri=individual.uri viewContext="search" />
             </li>
         </#list>
     </ul>
-    
+
 
     <#-- Paging controls -->
     <#if (pagingLinks?size > 0)>
         <div class="searchpages">
-            ${i18n().pages}: 
+            ${i18n().pages}:
             <#if prevPage??><a class="prev" href="${prevPage}" title="${i18n().previous}">${i18n().previous}</a></#if>
             <#list pagingLinks as link>
                 <#if link.url??>
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 c1b296a00..7f65b9e68 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,17 +6,17 @@
     <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>
           <str name="vivo-url">${individual.profileUrl?xml}"</str>
         </doc>
     </#list>
   </result>
-  
-</response>
\ No newline at end of file
+
+</response>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/search/searchService-help.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/searchService-help.ftl
index c0925ee2e..2ec0eaa19 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/search/searchService-help.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/search/searchService-help.ftl
@@ -15,8 +15,8 @@ multpart/form-data. The service inspect all parts of this POST for
 lists of URIs to reindex. The URIs should be separated by commas and/or white space.
 If no information can be found for a URI it will be ignored.</p>
 
-<p>The request parameters email and password allow the form to be submitted 
-for a user account.  Only internal accounts are supported, external authentication 
+<p>The request parameters email and password allow the form to be submitted
+for a user account.  Only internal accounts are supported, external authentication
 is not supported.</p>
 
 <h2>Example form for Update Search Index for URIs</h2>
@@ -25,7 +25,7 @@ is not supported.</p>
 <form action="${urls.base}/searchService/updateUrisInSearch"
       enctype="multipart/form-data"
       method="post">
-      
+
     <label for="email">Account email</label>
     <input type="text" name="email" id="email"/>
 
@@ -36,4 +36,4 @@ is not supported.</p>
     <input type="file" name="datafile" size="30" />
 
     <button type="submit">submit</button>
-</form>
\ No newline at end of file
+</form>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-advancedDataTools.ftl b/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-advancedDataTools.ftl
index 2098a6d2a..d71875e1f 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-advancedDataTools.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-advancedDataTools.ftl
@@ -5,23 +5,23 @@
 <#if dataTools?has_content>
     <section class="pageBodyGroup" role="region">
         <h3>${i18n().advanced_data_tools}</h3>
-        
+
         <ul role="navigation">
             <#if dataTools.rdfData?has_content>
                 <li role="listitem"><a href="${dataTools.rdfData}" title="${i18n().add_remove_rdf}">${i18n().add_remove_rdf}</a></li>
-            </#if>     
+            </#if>
             <#if dataTools.ingest?has_content>
                 <li role="listitem"><a href="${dataTools.ingest}" title="${i18n().ingest_tools}">${i18n().ingest_tools}</a></li>
-            </#if>     
+            </#if>
             <#if dataTools.rdfExport?has_content>
                 <li role="listitem"><a href="${dataTools.rdfExport}" title="${i18n().rdf_export}">${i18n().rdf_export}</a></li>
-            </#if>     
+            </#if>
             <#if dataTools.sparqlQuery?has_content>
                 <li role="listitem"><a href="${dataTools.sparqlQuery}" title="${i18n().sparql_query}">${i18n().sparql_query}</a></li>
-            </#if>     
+            </#if>
             <#if dataTools.sparqlQueryBuilder?has_content>
                 <li role="listitem"><a href="${dataTools.sparqlQueryBuilder}" title="${i18n().sparql_query_builder}">${i18n().sparql_query_builder}</a></li>
-            </#if>     
+            </#if>
         </ul>
     </section>
-</#if>
\ No newline at end of file
+</#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-classHierarchy.ftl b/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-classHierarchy.ftl
index 6e5e1ab02..3cb450f96 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-classHierarchy.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-classHierarchy.ftl
@@ -6,7 +6,7 @@
 		<br/>
 	<#else>
     	<h2>${pageTitle!}</h2>
-    	
+
     	<#if !displayOption?has_content>
     	    <#assign displayOption = "asserted">
     	</#if>
@@ -23,7 +23,7 @@
     	            <input type="submit" id="addGroup" class="form-button" value="${i18n().add_new_group}"/>
     	    </#if>
     	</form>
-    	    
+
     	<#if displayOption == "group">
     	    <div id="expandLink"><span id="expandAll" ><a href="javascript:" title="${i18n().hide_show_subclasses}">${i18n().hide_subclasses}</a></span></div>
     	<#else>
@@ -54,11 +54,11 @@
 <script language="javascript" type="text/javascript" >
 $(document).ready(function() {
     classHierarchyUtils.onLoad("${urls.base!}","${displayOption!}");
-});    
+});
 </script>
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/classHierarchy.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/siteAdmin/classHierarchyUtils.js"></script>')}
-              
+
diff --git a/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl b/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl
index 20b088a3b..4ac735ac1 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl
@@ -16,7 +16,7 @@
             <input type="hidden" name="editForm" value="${generators.NewIndividualFormGenerator}" role="input" />
             <input type="submit" id="submit" value="${i18n().add_individual_of_class}" role="button" />
         </form>
-        
+
         <section id="addClassBubble" role="region">
             <p>${i18n().please_create} <a title="${i18n().create_classgroup}" href="${urls.base}/editForm?controller=Classgroup">${i18n().a_classgroup}</a> ${i18n().associate_classes_with_group}</p>
         </section>
@@ -26,4 +26,4 @@
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.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/siteAdmin/siteAdminUtils.js"></script>')}
\ No newline at end of file
+              '<script type="text/javascript" src="${urls.base}/js/siteAdmin/siteAdminUtils.js"></script>')}
diff --git a/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-fauxPropertiesList.ftl b/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-fauxPropertiesList.ftl
index beac65fc2..0e0c2fd20 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-fauxPropertiesList.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-fauxPropertiesList.ftl
@@ -1,8 +1,8 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- 
+<#--
         Used to display both the object and data property hierarchies, though there are
-        separate controllers for those. Also used to display lists of "all" object and 
+        separate controllers for those. Also used to display lists of "all" object and
         data properties, though there are separate controllers for those, too.
  -->
  <#if propertyType??>
@@ -56,7 +56,7 @@
           </tr>
         </tbody>
       </table>
-      </section>	
+      </section>
     </#list>
   <#else>
 	<#assign keys = fauxProps?keys />
@@ -95,9 +95,9 @@
 		  </table>
 		  <#assign firstLoop = false />
       </#list>
-      </section>	
+      </section>
 	</#list>
-  </#if> 
+  </#if>
   </section>
   </#if>
 </section>
@@ -110,7 +110,7 @@
 <script language="javascript" type="text/javascript" >
 $(document).ready(function() {
     fauxPropertiesListingUtils.onLoad();
-});    
+});
 </script>
 
 
@@ -118,4 +118,4 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/classHierarchy.
 
 ${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/siteAdmin/fauxPropertiesListingUtils.js"></script>')}
-              
+
diff --git a/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-main.ftl b/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-main.ftl
index 0df68dc91..83507975a 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-main.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-main.ftl
@@ -14,4 +14,4 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/admin.css" />')
     <#include "siteAdmin-ontologyEditor.ftl">
     <#include "siteAdmin-advancedDataTools.ftl">
     <#include "siteAdmin-siteMaintenance.ftl">
-</div>
\ No newline at end of file
+</div>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-objectPropHierarchy.ftl b/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-objectPropHierarchy.ftl
index c005076d9..fac6c3b9e 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-objectPropHierarchy.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-objectPropHierarchy.ftl
@@ -1,8 +1,8 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- 
+<#--
         Used to display both the object and data property hierarchies, though there are
-        separate controllers for those. Also used to display lists of "all" object and 
+        separate controllers for those. Also used to display lists of "all" object and
         data properties, though there are separate controllers for those, too.
  -->
  <#if propertyType??>
@@ -13,13 +13,13 @@
 
 
 <section role="region">
-    
+
     <h2>${pageTitle!}</h2>
 
     <#if !displayOption?has_content>
         <#assign displayOption = "hierarchy">
     </#if>
-   
+
     <#if propType == "group">
         <form action="editForm" method="get">
             <input type="submit" class="form-button" id="addProperty" value="${i18n().add_property_group}"/>
@@ -67,7 +67,7 @@
 <script language="javascript" type="text/javascript" >
 $(document).ready(function() {
     objectPropHierarchyUtils.onLoad("${urls.base!}","${displayOption!}","${propType}");
-});    
+});
 </script>
 
 
@@ -75,4 +75,4 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/classHierarchy.
 
 ${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/siteAdmin/objectPropertyHierarchyUtils.js"></script>')}
-              
+
diff --git a/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl b/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
index 5955d6fe5..ef467b846 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
@@ -5,7 +5,7 @@
 <#if ontologyEditor?has_content>
     <section class="pageBodyGroup" role="region">
         <h3>${i18n().ontology_editor}</h3>
-        
+
         <#if ontologyEditor.tboxReasonerStatus?has_content>
             <div class="notice">
                 <p>${ontologyEditor.tboxReasonerStatus.error}</p>
@@ -14,28 +14,28 @@
                 </#if>
             </div>
         </#if>
-        
+
         <ul role="navigation">
             <li role="listitem">
                 <a href="${ontologyEditor.urls.ontologies}" title="${i18n().ontology_list}">${i18n().ontology_list}</a>
             </li>
         </ul>
-    
+
         <h4>${i18n().class_management}</h4>
-        
+
         <ul role="navigation">
             <li role="listitem"><a href="${ontologyEditor.urls.classHierarchy}" title="${i18n().class_hierarchy}">${i18n().class_hierarchy}</a></li>
             <li role="listitem"><a href="${ontologyEditor.urls.classGroups}" title="${i18n().class_groups}">${i18n().class_groups}</a></li>
         </ul>
-        
+
         <h4>${i18n().property_management}</h4>
-        
+
         <ul role="navigation">
             <li role="listitem"><a href="${ontologyEditor.urls.objectPropertyHierarchy}" title="${i18n().object_property_hierarchy}">${i18n().object_property_hierarchy}</a></li>
             <li role="listitem"><a href="${ontologyEditor.urls.dataPropertyHierarchy}" title="${i18n().data_property_hierarchy}">${i18n().data_property_hierarchy}</a></li>
             <li role="listitem"><a href="${ontologyEditor.urls.fauxPropertyList}" title="${i18n().data_property_hierarchy}">${i18n().faux_property_listing}</a></li>
             <li role="listitem"><a href="${ontologyEditor.urls.propertyGroups}" title="${i18n().property_groups}">${i18n().property_groups}</a></li>
         </ul>
-        
+
     </section>
-</#if>
\ No newline at end of file
+</#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl b/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
index a61f80342..894b1725a 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
@@ -5,31 +5,31 @@
 <#if siteConfig?has_content>
     <section class="pageBodyGroup" role="region">
         <h3>${i18n().site_config}</h3>
-        
+
         <ul role="navigation">
             <#if siteConfig.internalClass?has_content>
                 <li role="listitem"><a href="${siteConfig.internalClass}" title="${i18n().internal_class}">${i18n().internal_class_i_capped}</a></li>
-            </#if>     
-            
+            </#if>
+
             <#if siteConfig.manageProxies?has_content>
                 <li role="listitem"><a href="${siteConfig.manageProxies}" title="${i18n().manage_profile_editing}">${i18n().manage_profile_editing}</a></li>
-            </#if>  
-            
+            </#if>
+
             <#if siteConfig.pageManagement?has_content>
                 <li role="listitem"><a href="${siteConfig.pageManagement}" title="${i18n().page_management}">${i18n().page_management}</a></li>
-            </#if>        
-            
+            </#if>
+
             <#if siteConfig.menuManagement?has_content>
                 <li role="listitem"><a href="${siteConfig.menuManagement}" title="${i18n().menu_ordering}">${i18n().menu_ordering_mixed_caps}</a></li>
-            </#if>      
-            
+            </#if>
+
             <#if siteConfig.siteInfo?has_content>
                 <li role="listitem"><a href="${siteConfig.siteInfo}" title="${i18n().site_information}">${i18n().site_information}</a></li>
             </#if>
-            
+
              <#if siteConfig.userAccounts?has_content>
                 <li role="listitem"><a href="${siteConfig.userAccounts}" title="${i18n().user_accounts}">${i18n().user_accounts}</a></li>
-             </#if>        
+             </#if>
         </ul>
     </section>
 </#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-siteMaintenance.ftl b/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-siteMaintenance.ftl
index b7aa807f2..d0af6e46e 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-siteMaintenance.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-siteMaintenance.ftl
@@ -5,20 +5,20 @@
 <#if siteMaintenance?has_content>
     <section class="pageBodyGroup" role="region">
         <h3>${i18n().site_maintenance}</h3>
-        
-        <ul role="navigation">                        
+
+        <ul role="navigation">
             <#if siteMaintenance.rebuildSearchIndex?has_content>
                 <li role="listitem"><a href="${siteMaintenance.rebuildSearchIndex }" title="${i18n().rebuild_search_index}">${i18n().rebuild_search_index}</a></li>
             </#if>
-            
+
             <#if siteMaintenance.rebuildVisCache?has_content>
                 <li role="listitem"><a href="${siteMaintenance.rebuildVisCache}" title="${i18n().rebuild_vis_cache}">${i18n().rebuild_vis_cache}</a></li>
             </#if>
-            
+
             <#if siteMaintenance.recomputeInferences?has_content>
                 <li role="listitem"><a href="${siteMaintenance.recomputeInferences}" title="${i18n().recompute_inferences}">${i18n().recompute_inferences_mixed_caps}</a></li>
             </#if>
-            
+
             <#if siteMaintenance.startupStatus?has_content>
                 <li role="listitem">
                     <a href="${siteMaintenance.startupStatus}" title="${i18n().startup_status}">${i18n().startup_status}</a>
@@ -26,15 +26,15 @@
                         <img id="alertIcon" src="${urls.images}/iconAlert.png" width="20" height="20" alt="${i18n().error_alert_icon}" />
                     </#if>
                 </li>
-            </#if>   
-            
+            </#if>
+
             <#if siteMaintenance.restrictLogins?has_content>
                 <li role="listitem"><a href="${siteMaintenance.restrictLogins}" title="${i18n().restrict_logins}">${i18n().restrict_logins_mixed_caps}</a></li>
             </#if>
-            
+
             <#if siteMaintenance.activateDeveloperPanel?has_content>
                 <li role="listitem"><a href="${siteMaintenance.activateDeveloperPanel}" title="${i18n().activate_developer_panel}">${i18n().activate_developer_panel_mixed_caps}</a></li>
             </#if>
         </ul>
     </section>
-</#if>
\ No newline at end of file
+</#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/termsOfUse.ftl b/webapp/src/main/webapp/templates/freemarker/body/termsOfUse.ftl
index b2de1b4fc..205a0012e 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/termsOfUse.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/termsOfUse.ftl
@@ -2,7 +2,7 @@
 
 <section id="terms" role="region">
     <h2>Terms of Use</h2>
-    
+
     <h3>Disclaimers</h3>
     <p>This ${termsOfUse.siteName} website contains material&mdash;text information, publication
     citations, links, and images&mdash;provided by ${termsOfUse.siteHost} and by various
@@ -10,25 +10,25 @@
     the information presented on the VIVO website and available as Resource Description Framework (RDF) data
     from VIVO at ${termsOfUse.siteHost} is intended for public use and is freely distributed under the terms of the
     <a href="http://creativecommons.org/licenses/by/3.0/" target="_blank" title="creative commons">Creative Commons CC-BY 3.0</a> license which allows you
-    to copy, distribute, display and make derivatives of this information provided you give credit to 
+    to copy, distribute, display and make derivatives of this information provided you give credit to
     ${termsOfUse.siteHost}. Any non-copyrightable information is available to you under a
     <a href="http://creativecommons.org/publicdomain/zero/1.0/"  target="_blank" title="cco waiver">CC0 waiver</a>.  However, source documents,
     images or web pages attached to or linked from VIVO may contain copyrighted information and should only be
     used or distributed under terms included with each source or in accordance with the principles of fair use.
     </p>
-    
+
     <h3>Disclaimer of Liability</h3>
-    <p>${termsOfUse.siteHost?cap_first} makes no warranty, expressed or implied, including the warranties of merchantability 
-    and fitness for a particular purpose, or assumes any legal liability or responsibility for the accuracy, 
-    completeness, currency or usefulness of any material displayed or distributed through the 
-     ${termsOfUse.siteName} website or represents that its use would not infringe privately owned rights. 
-    ${termsOfUse.siteHost?cap_first} disclaims all warranties with regard to the information provided. Any reliance upon such information 
-    is at your own risk. In no event will ${termsOfUse.siteHost} be liable to you for any damages or losses whatsoever resulting 
-    from or caused by the ${siteName} website or its contents.</p> 
-    
+    <p>${termsOfUse.siteHost?cap_first} makes no warranty, expressed or implied, including the warranties of merchantability
+    and fitness for a particular purpose, or assumes any legal liability or responsibility for the accuracy,
+    completeness, currency or usefulness of any material displayed or distributed through the
+     ${termsOfUse.siteName} website or represents that its use would not infringe privately owned rights.
+    ${termsOfUse.siteHost?cap_first} disclaims all warranties with regard to the information provided. Any reliance upon such information
+    is at your own risk. In no event will ${termsOfUse.siteHost} be liable to you for any damages or losses whatsoever resulting
+    from or caused by the ${siteName} website or its contents.</p>
+
     <h3>Disclaimer of Endorsement</h3>
-    <p>Reference herein to any specific commercial product, process, or service by trade name, 
-    trademark, manufacturer, or otherwise, does not necessarily constitute or imply its endorsement or recommendation 
-    by ${termsOfUse.siteHost}. The views and opinions of authors expressed herein do not necessarily state or reflect those of 
-    ${termsOfUse.siteHost} and shall not be used for advertising or product endorsement purposes.</p> 
-</section>
\ No newline at end of file
+    <p>Reference herein to any specific commercial product, process, or service by trade name,
+    trademark, manufacturer, or otherwise, does not necessarily constitute or imply its endorsement or recommendation
+    by ${termsOfUse.siteHost}. The views and opinions of authors expressed herein do not necessarily state or reflect those of
+    ${termsOfUse.siteHost} and shall not be used for advertising or product endorsement purposes.</p>
+</section>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/unrecognizedUser.ftl b/webapp/src/main/webapp/templates/freemarker/body/unrecognizedUser.ftl
index 3f88989ef..106503fd3 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/unrecognizedUser.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/unrecognizedUser.ftl
@@ -4,7 +4,7 @@
 
 <section role="region">
     <h2>${i18n().unrecognized_user}</h2>
-    
+
     <p>
       ${i18n().no_individual_associated_with_id(siteName!)}
     </p>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/dateTimeWithPrecision.ftl b/webapp/src/main/webapp/templates/freemarker/edit/dateTimeWithPrecision.ftl
index 2ce1d3ce2..62de6f4df 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/dateTimeWithPrecision.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/dateTimeWithPrecision.ftl
@@ -6,7 +6,7 @@ an example and I didn't really see any other way to get the jsp custom forms to
 this at the moment. Needless to say, we need to be able to call the macro and pass
 parameters from within the original custom form -->
 
-<#-- 
+<#--
 Available variables:
 
 fieldName -- name of field
@@ -68,8 +68,8 @@ precisionConstants.second -- URI for precision
         <#assign reqLevel = 0 />
     </#if>
 
-    <fieldset class="dateTime">              
-    
+    <fieldset class="dateTime">
+
         <#if precLevel gte 1>
             <#-- Only text input field in the mix. We should have some validation to ensure it's a valid year (4 digits, integer, etc) -->
             <label for="${fieldName}-year">Year<#if reqLevel gte 1> <span class="requiredHint">*</span></#if></label>
@@ -144,4 +144,4 @@ precisionConstants.second -- URI for precision
             </select>
         </#if>
     </fieldset>
-</#macro>
\ No newline at end of file
+</#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
index 99d25997f..d979f65c0 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteObjectPropForm.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 rangeVClassURI = editConfiguration.objectPredicateProperty.rangeVClassURI!"" />
 <#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/confirmDeletePropertyForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
index 792da929d..05690c81d 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
@@ -10,24 +10,24 @@
     	<#assign property = editConfiguration.objectPropertyStatementDisplayPropertyModel />
     </#if>
 <#else>
-	<#assign statement = editConfiguration.dataLiteralValuesAsString />   
+	<#assign statement = editConfiguration.dataLiteralValuesAsString />
 </#if>
 
 <#assign deletionTemplateName = editConfiguration.deleteTemplate/>
 
 <form action="${editConfiguration.deleteProcessingUrl}" method="get">
     <h2>${i18n().confirm_entry_deletion_from} <em>${editConfiguration.propertyName}</em>?</h2>
-    
+
     <p class="toBeDeleted ${toBeDeletedClass}">
         <#if editConfiguration.objectProperty = true>
             <#if statement?has_content>
                 <#include deletionTemplateName />
             </#if>
         <#else>
-            ${statement}  
+            ${statement}
         </#if>
     </p>
-    
+
     <input type="hidden" name="subjectUri"   value="${editConfiguration.subjectUri}" role="input" />
     <input type="hidden" name="predicateUri" value="${editConfiguration.predicateUri}" role="input" />
     <input type="hidden" name="domainUri" value="${editConfiguration.domainUri!}" role="input" />
@@ -39,13 +39,13 @@
     <#else>
         <input type="hidden" name="objectUri"    value="${editConfiguration.objectUri}" role="input" />
     </#if>
-    
+
    <br />
     <#if editConfiguration.objectProperty = true>
     <p class="submit">
     </#if>
         <input type="submit" id="submit" value="${i18n().delete_button}" role="button"/>
-        or 
+        or
         <a class="cancel" title="${i18n().cancel_title}" href="${editConfiguration.cancelUrl}">${i18n().cancel_link}</a>
     <#if editConfiguration.objectProperty = true>
     </p>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/css/customForm.css b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/customForm.css
index e5f60a9c5..fe05157bf 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/css/customForm.css
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/customForm.css
@@ -16,7 +16,7 @@ form.customForm div.addNewLink {
     border: 1px solid #9c9c9c;
     display: none; /* Hide if Javascript disabled. Javascript will show. */
 }
-form.customForm .existing span.requiredHint, 
+form.customForm .existing span.requiredHint,
 form.customForm .new span.requiredHint,
 #ie67DisableWrapper {
     display: none; /* Hide if Javascript disabled. Javascript will show. */
@@ -44,7 +44,7 @@ form.customForm p.inline.year input {
     margin-top: -1.75em;
 }
 input,
-select, 
+select,
 form.customForm p {
     margin-top: 0;
     padding-top: 0;
@@ -78,9 +78,9 @@ form.customForm p.validationError {
 form.customForm a.close {
     float: right;
     margin-right: 1em;
-    font-size: 90%;    
+    font-size: 90%;
 }
-form.customForm a.close:link, 
+form.customForm a.close:link,
 form.customForm a.close:visited {
     border-color: #ff7700;
     color: #ff7700;
@@ -105,7 +105,7 @@ form.customForm p.inline-search #searchTerm{
     margin-top: 6px;
 }
 /* <------ DATE TIME*/
-form.customForm fieldset, 
+form.customForm fieldset,
 fieldset.dateTime label,
 form.customForm label.dateTime {
     display: inline;
@@ -144,14 +144,14 @@ img#indicator {
 }
 /* for placeholder text */
 ::-webkit-input-placeholder { /* WebKit browsers */
-   opacity:  .25; 
+   opacity:  .25;
 }
 :-moz-placeholder { /* Mozilla Firefox 4 to 18 */
-   opacity:  .25; 
+   opacity:  .25;
 }
 ::-moz-placeholder { /* Mozilla Firefox 19+ */
-   opacity:  .25; 
+   opacity:  .25;
 }
 :-ms-input-placeholder { /* Internet Explorer 10+ */
-   opacity:  .25; 
+   opacity:  .25;
 }
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css
index cd338215e..f9ccd1b55 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css
@@ -1,11 +1,11 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
-@import url("autocomplete.css"); 
+@import url("autocomplete.css");
 
 /* Although Javascript hides these on page load, hide here as well to avoid the flash on page load.
    This needs to be removed to support a non-JS version of the form. */
-.fullViewOnly, 
-#submit, 
+.fullViewOnly,
+#submit,
 .or,
 #requiredLegend {
     display: none;
@@ -31,7 +31,7 @@ form.customForm h4 {
 span.readOnly {
     color: #000;
 }
-/* special styles for addPublicationToPerson.ftl 
+/* special styles for addPublicationToPerson.ftl
    volume, number, issue fields and start/end page fields */
 label.vniLabels {
     padding-left: 50px;
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/customErrorMessages.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/customErrorMessages.ftl
index d56e8c962..0c4c9b756 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/customErrorMessages.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/customErrorMessages.ftl
@@ -5,4 +5,4 @@
 <p>${customErrorMessages}</p>
 <p>
 <a class="cancel" href="${cancelUrl}&url=/individual" title="${i18n().return_to_profile}">${i18n().return_to_profile}</a>
-</p>
\ No newline at end of file
+</p>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeEntryForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeEntryForm.ftl
index fe9877b1d..45b992577 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeEntryForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeEntryForm.ftl
@@ -1,6 +1,6 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<fieldset class="dateTime">              
+<fieldset class="dateTime">
   <input type="hidden" id="literal" name="literal" value="${literalValues}" role="input"/>
   <#if datatype?contains("#date") || datatype?contains("Year") >
     <label for="dateTimeField-year">Year</label>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeIntervalForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeIntervalForm.ftl
index 22770b2d2..9e4077951 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeIntervalForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeIntervalForm.ftl
@@ -6,12 +6,12 @@
 <#assign editMode = editConfiguration.pageData.editMode />
 <#assign htmlForElements = editConfiguration.pageData.htmlForElements />
 
-<#if editMode == "edit">        
-        <#assign titleVerb="${i18n().edit_capitalized}">        
+<#if editMode == "edit">
+        <#assign titleVerb="${i18n().edit_capitalized}">
         <#assign submitButtonText="${i18n().edit_date_time_value}">
         <#assign disabledVal="disabled">
 <#else>
-        <#assign titleVerb="${i18n().create_capitalized}">        
+        <#assign titleVerb="${i18n().create_capitalized}">
         <#assign submitButtonText="${i18n().create_date_time_value}">
         <#assign disabledVal=""/>
 </#if>
@@ -62,9 +62,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>
@@ -72,4 +72,4 @@
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
 
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/utils.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>')}
\ No newline at end of file
+              '<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>')}
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 09afbe142..47817c4e9 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeValueForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeValueForm.ftl
@@ -6,12 +6,12 @@
 <#assign editMode = editConfiguration.pageData.editMode />
 <#assign htmlForElements = editConfiguration.pageData.htmlForElements />
 
-<#if editMode == "edit">        
-        <#assign titleVerb="${i18n().edit_capitalized}">        
+<#if editMode == "edit">
+        <#assign titleVerb="${i18n().edit_capitalized}">
         <#assign submitButtonText="${i18n().edit_date_time_value}">
         <#assign disabledVal="disabled">
 <#else>
-        <#assign titleVerb="${i18n().create_capitalized}">        
+        <#assign titleVerb="${i18n().create_capitalized}">
         <#assign submitButtonText="${i18n().create_date_time_value}">
         <#assign disabledVal=""/>
 </#if>
@@ -27,13 +27,13 @@
     <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>
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />')}
 
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/utils.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>')}
\ No newline at end of file
+              '<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>')}
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 2b5ed63a7..2bfa211f9 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl
@@ -16,10 +16,10 @@
 <form class="editForm" action="${submitUrl}">
     <input type="hidden" name="editKey" id="editKey" value="${editKey}" role="input" />
     <input type="text" name="name" id="name" label="name (required)" size="30" role="input" />
-    
+
     <p class="submit">
         <input type="submit" id="submit" value="${submitLabel}" role="submit" />
         <span class="or"> or </span>
         <a title="${i18n().cancel_title}" href="${editConfiguration.cancelUrl}">${i18n().cancel_link}</a>
-    </p>     
-</form>
\ No newline at end of file
+    </p>
+</form>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl
index 7e2093814..62ab74c31 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl
@@ -13,11 +13,11 @@
     <section id="error-alert" role="alert">
         <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
         <p>
-        
+
         <#list submissionErrors?keys as errorFieldName>
             ${submissionErrors[errorFieldName]}
         </#list>
-                        
+
         </p>
     </section>
 </#if>
@@ -29,17 +29,17 @@
     <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>   
-	
+    </#if>
+
 	<#if "HTML" == editConfiguration.dataPredicateProperty.editing!>
 		<textarea rows="2" id="literal" name="literal" class="useTinyMce" role="textarea">${literalValues}</textarea>
-		
+
 	<#elseif datatype = "http://www.w3.org/2001/XMLSchema#integer" || datatype = "http://www.w3.org/2001/XMLSchema#int">
     	<input type="text" id="literal" name="literal" value="${literalValues}" placeholder="123456" />
-		
+
     <#elseif datatype = "http://www.w3.org/2001/XMLSchema#float">
         <input type="text" id="literal" name="literal" value="${literalValues}" placeholder="12.345" />
-		
+
     <#elseif datatype = "http://www.w3.org/2001/XMLSchema#boolean">
         <select id="literal" name="literal">
             <#if literalValues = "true">
@@ -50,22 +50,22 @@
                 <option value="false" selected="true">false</option>
             </#if>
         </select>
-		
+
     <#elseif datatype = "http://www.w3.org/2001/XMLSchema#anyURI">
         <input type="text" id="literal" name="literal" value="${literalValues}" placeholder="http://..." />
-		
-    <#elseif datatype = "http://www.w3.org/2001/XMLSchema#dateTime" || 
+
+    <#elseif datatype = "http://www.w3.org/2001/XMLSchema#dateTime" ||
         		datatype = "http://www.w3.org/2001/XMLSchema#date" ||
         		datatype = "http://www.w3.org/2001/XMLSchema#time" ||
         		datatype = "http://www.w3.org/2001/XMLSchema#gYearMonth" ||
         		datatype = "http://www.w3.org/2001/XMLSchema#gYear"	||
         		datatype = "http://www.w3.org/2001/XMLSchema#gMonth" >
         <#include "dateTimeEntryForm.ftl">
-		
+
     <#else>
         <input type="text" size="70" id="literal" name="literal" value="${literalValues}" />
 
-    </#if> 
+    </#if>
 
     <br />
     <#--The submit label should be set within the template itself, right now
@@ -94,9 +94,9 @@
     	decimal_only: '${i18n().decimal_only}',
     	whole_number: '${i18n().whole_number}'
 	};
-</script> 
+</script>
 
-<#include "defaultFormScripts.ftl">     
+<#include "defaultFormScripts.ftl">
 
 ${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/defaultDeletePropertyForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl
index 1da5d4155..cdc1dae87 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl
@@ -1,10 +1,10 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<form class="deleteForm" action="${editConfiguration.mainEditUrl}" method="get"> 
+<form class="deleteForm" action="${editConfiguration.mainEditUrl}" method="get">
     <h3 class="delete-entry">${i18n().delete_entry_capitalized}</h3>
-          
+
     <label for="delete"></label>
-    
+
     <input type="hidden" name="subjectUri"   value="${editConfiguration.subjectUri}"/>
     <input type="hidden" name="predicateUri" value="${editConfiguration.predicateUri}"/>
     <input type="hidden" name="domainUri" value="${editConfiguration.domainUri!}"/>
@@ -15,24 +15,24 @@
         <input type="hidden" name="datapropKey" value="${editConfiguration.datapropKey}" />
         <input type="submit" id="delete" value="${i18n().delete_button}" role="button "/>
     </#if>
-    
+
     <#--The original jsp included vinput tag with cancel=empty string for case where both select from existing
     and offer create new option are true below so leaving as Cancel for first option but not second below-->
-    <#if editConfiguration.objectProperty = true> 
-        <input type="hidden" name="objectUri" value="${editConfiguration.objectUri}"/>    
-    
+    <#if editConfiguration.objectProperty = true>
+        <input type="hidden" name="objectUri" value="${editConfiguration.objectUri}"/>
+
         <#if editConfiguration.propertySelectFromExisting = false && editConfiguration.propertyOfferCreateNewOption = false>
             <p>
                 <input type="submit" id="delete" value="${i18n().delete_button}" role="button "/>
                 <span class="or"> ${i18n().or} </span>
                 <a title="${i18n().cancel_title}" href="${editConfiguration.cancelUrl}">${i18n().cancel_link}</a>
-            </p> 
+            </p>
         </#if>
-        
+
         <#if editConfiguration.propertySelectFromExisting = true || editConfiguration.propertyOfferCreateNewOption = true>
             <p>
                 <input type="submit" id="delete" value="${i18n().delete_button}" role="button "/>
-            </p>      
+            </p>
         </#if>
     </#if>
 </form>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultFormScripts.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultFormScripts.ftl
index 9676ce9d1..0405d2f58 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultFormScripts.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultFormScripts.ftl
@@ -5,7 +5,7 @@
 <#-- Like original jsp, allow the passing of variables -->
 <#assign defaultHeight="200" />
 <#assign defaultWidth="75%" />
-<#assign defaultButton="bold,italic,underline,separator,link,bullist,numlist,separator,sub,sup,charmap,separator,undo,redo,separator,code"/>   
+<#assign defaultButton="bold,italic,underline,separator,link,bullist,numlist,separator,sub,sup,charmap,separator,undo,redo,separator,code"/>
 <#assign defaultToolbarLocation = "top" />
 <#if !height?has_content>
 	<#assign height=defaultHeight/>
@@ -82,4 +82,4 @@
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/tiny_mce/tiny_mce.js"></script>',
               '<script type="text/javascript" src="${urls.base}/js/tiny_mce/jquery.tinymce.js"></script>',
               '<script type="text/javascript" src="${urls.base}/js/edit/initTinyMce.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/defaultDataPropertyUtils.js"></script>')}
\ No newline at end of file
+              '<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/defaultDataPropertyUtils.js"></script>')}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl
index b4a6fa455..a86c8e5ba 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl
@@ -1,38 +1,38 @@
  <#-- $This file is distributed under the terms of the license in LICENSE$ -->
- 
+
  <#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.offerTypesCreateNew />
-<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" />      
+<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" name="domainUri" value="${editConfiguration.domainUri!}"/>
     <input type="hidden" name="rangeUri" value="${editConfiguration.rangeUri!}"/>
-    <input type="hidden" value="create" name="cmd" 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>
+
 
-               
\ No newline at end of file
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultPropertyForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultPropertyForm.ftl
index 9464d6d80..4bcebae84 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultPropertyForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultPropertyForm.ftl
@@ -20,13 +20,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>
@@ -34,7 +34,7 @@
             </p>
         </form>
     <#else>
-        <p> ${i18n().there_are_no_entries_for_selection}  </p>  
+        <p> ${i18n().there_are_no_entries_for_selection}  </p>
     </#if>
 </#if>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js
index 857caef8e..2b15ad9bd 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js
@@ -1,24 +1,24 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
 var customForm = {
-    
+
     /* *** Initial page setup *** */
    //Setting the default Concept class here
 	//This would need to change if we update the ontology, etc.
 	conceptClassURI: "http://www.w3.org/2004/02/skos/core#Concept",
     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()) {
@@ -26,8 +26,8 @@ var customForm = {
                 $('.noIE67').hide();
                 return true;
             }
-        }            
-        return false;      
+        }
+        return false;
     },
 
     mixIn: function() {
@@ -38,7 +38,7 @@ var customForm = {
         $.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(){
@@ -50,26 +50,26 @@ var customForm = {
         this.typeSelector = this.form.find('select#typeSelector');
         this.typeSelectorInput = this.form.find('input#typeSelectorInput');
         this.typeSelectorSpan = this.form.find('span#typeSelectorSpan');
-        this.or = $('span.or');       
+        this.or = $('span.or');
         this.cancel = this.form.find('.cancel');
-        this.acHelpTextClass = 'acSelectorWithHelpText';   
+        this.acHelpTextClass = 'acSelectorWithHelpText';
         // this.verifyMatch is referenced in bindEventListeners to size and open
         // the verify popup window. Although there could be multiple verifyMatch objects
-        // selecting one and binding the event works for all of them     
+        // selecting one and binding the event works for all of them
         this.verifyMatch = this.form.find('.verifyMatch');
-        this.defaultAcType = ""; // will be set in setType() first time through 
+        this.defaultAcType = ""; // will be set in setType() first time through
         this.templateDefinedAcTypes = false;
         if ( this.acTypes != undefined ) {
             this.templateDefinedAcTypes = true;
         }
-        
-        // find all the acSelector input elements 
+
+        // find all the acSelector input elements
         this.acSelectors = [] ;
-        
+
         this.form.find('.acSelector').each(function() {
             customForm.acSelectors.push($(this));
         });
-        
+
         // find all the acSelection div elements
         this.acSelections = new Object();
 
@@ -77,13 +77,13 @@ var customForm = {
             var groupName  = $(this).attr('acGroupName');
             customForm.acSelections[groupName] = $(this);
         });
-        
+
         // 2-stage forms with only one ac field will not have the acTypes defined
         // so create an object for when the user selects a type via the typeSelector
         if ( this.acTypes == undefined || this.acTypes == null ) {
             this.acTypes = new Object();
         }
-        
+
         // forms with multi ac fields will have this defined in customFormData
         // this is helpful when the type to display is not a single word, like "Subject Area"
         this.hasMultipleTypeNames = false;
@@ -102,13 +102,13 @@ var customForm = {
         if (!this.editMode) {
             this.editMode = 'add'; // edit vs add: default to add
         }
-        
+
         //Flag to clear label of selected object from autocomplete on submission
         //This is used in the case where the label field is submitted only when a new object is being created
         if(!this.flagClearLabelForExisting) {
         	this.flagClearLabelForExisting = null;
         }
-               
+
         if (!this.formSteps) { // Don't override formSteps specified in form data
             if ( !this.fullViewOnly.length || this.editMode === 'edit' || this.editMode === 'repair' ) {
                 this.formSteps = 1;
@@ -118,19 +118,19 @@ var customForm = {
                 this.formSteps = 2;
             }
         }
-        
+
         if(!this.doNotRemoveOriginalObject) {
         	this.doNotRemoveOriginalObject = false;
         }
-        
+
         this.bindEventListeners();
-        
+
        $.each(this.acSelectors, function() {
             customForm.initAutocomplete($(this));
         });
 
         this.initElementData();
-        
+
         this.initFormView();
 
         // Set the initial autocomplete help text in the acSelector fields.
@@ -140,8 +140,8 @@ var customForm = {
     },
 
     initFormView: function() {
-      
-        var typeVal = this.typeSelector.val();  
+
+        var typeVal = this.typeSelector.val();
 
         // Put this case first, because in edit mode with
         // validation errors we just want initFormFullView.
@@ -155,15 +155,15 @@ var customForm = {
 
         // 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.        
+        // twice to get to full view.
         else if ( this.formSteps == 1 || typeVal.length ) {
             this.initFormFullView();
         }
         else {
             this.initFormTypeView();
-        }     
+        }
     },
-    
+
     initFormTypeView: function() {
 
         this.setType(); // empty any previous values (perhaps not needed)
@@ -174,7 +174,7 @@ var customForm = {
 
         this.cancel.unbind('click');
     },
-    
+
     initFormFullView: function() {
 
         this.setType();
@@ -182,24 +182,24 @@ var customForm = {
         this.or.show();
         this.requiredLegend.show();
         this.button.show();
-        this.setLabels(); 
+        this.setLabels();
 
         // Set the initial autocomplete help text in the acSelector fields.
         $.each(this.acSelectors, function() {
                 customForm.addAcHelpText($(this));
         });
 
-        this.cancel.unbind('click');           
-        if (this.formSteps > 1) {     
+        this.cancel.unbind('click');
+        if (this.formSteps > 1) {
             this.cancel.click(function() {
                 customForm.clearFormData(); // clear any input and validation errors
                 customForm.initFormTypeView();
                 customForm.clearAcSelections = true;
-                return false;            
+                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, 
+        // autocomplete type can be determined. If a type selection has been made,
         // unhide the acSelector field.
         } else if (this.typeSelector.length) {
             this.typeSelector.val() ? this.fullViewOnly.show() : this.hideFields(this.fullViewOnly);
@@ -208,23 +208,23 @@ var customForm = {
             this.disableSubmit();
         }
     },
-    
+
     initFormWithValidationErrors: function() {
         // Call initFormFullView first, because showAutocompleteSelection needs
-        // acType, which is set in initFormFullView. 
+        // acType, which is set in initFormFullView.
         this.initFormFullView();
 
         $.each(this.acSelectors, function() {
             var $acSelection = customForm.acSelections[$(this).attr('acGroupName')];
             var uri   = $acSelection.find('input.acUriReceiver').val(),
                 label = $(this).val();
-            if (uri && uri != ">SUBMITTED VALUE WAS BLANK<") {            
+            if (uri && uri != ">SUBMITTED VALUE WAS BLANK<") {
                 customForm.showAutocompleteSelection(label, uri, $(this));
             }
         });
 
     },
-  
+
     // 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() {
@@ -232,11 +232,11 @@ var customForm = {
         this.typeSelector.change(function() {
             var typeVal = $(this).val();
             this.acCache = {};
-            
+
             // If an autocomplete selection has been made, undo it.
             // NEED TO LINK THE TYPE SELECTOR TO THE ACSELECTOR IT'S ASSOCIATED WITH
             // BECAUSE THERE COULD BE MORE THAN ONE AC FIELD. ASSOCIATION IS MADE VIA
-            // THE SPECIAL "acGroupName" ATTRIBUTE WHICH IS SHARED AMONG THE SELECT AND  
+            // THE SPECIAL "acGroupName" ATTRIBUTE WHICH IS SHARED AMONG THE SELECT AND
             // THE INPUT AND THE AC SELECTION DIV.
             if (customForm.editMode != "edit") {
                 customForm.undoAutocompleteSelection($(this));
@@ -249,13 +249,13 @@ var customForm = {
 			else {
 				customForm.initFormFullView();
 			}
-        }); 
-        
+        });
+
         this.verifyMatch.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;
-        });   
-        
+        });
+
         // loop through all the acSelectors
         $.each(this.acSelectors, function() {
             $(this).focus(function() {
@@ -265,14 +265,14 @@ var customForm = {
                 customForm.addAcHelpText($(this));
             });
         });
-        
+
         this.form.submit(function() {
         	//TODO: update the following
-        	//custom submission for edit mode in case where existing object should not remove original object 
+        	//custom submission for edit mode in case where existing object should not remove original object
         	//if edit mode and custom flag and original uri not equivalent to new uri, then
         	//clear out label field entirely
         	//originally checked edit mode but want to add to work the same way in case an existing object
-        	//is selected since the n3 now governs how labels 
+        	//is selected since the n3 now governs how labels
         	if(customForm.flagClearLabelForExisting != null) {
         		//Find the elements that have had autocomplete executed, tagged by class "userSelected"
         		customForm.form.find('.acSelection.userSelected').each(function() {
@@ -285,21 +285,21 @@ var customForm = {
         			    var $displayInput = $("input.display[acGroupName='" + groupName + "']");
     					$displayInput.val($selectorInput.val());
     					$selectorInput.val('');
-        			} 
+        			}
                 });
         	}
-        	
+
             customForm.deleteAcHelpText();
         });
     },
-    
+
     initAutocomplete: function(selectedObj) {
         this.getAcFilter();
         //If specific individuals are to be filtered out, add them here
         //to the filtering list
         this.getAcFilterForIndividuals();
         this.acCache = {};
-        
+
         $(selectedObj).autocomplete({
             minLength: 3,
             source: function(request, response) {
@@ -322,8 +322,8 @@ var customForm = {
                         multipleTypes:(customForm.acMultipleTypes == undefined || customForm.acMultipleTypes == null)? null: customForm.acMultipleTypes
                     },
                     complete: function(xhr, status) {
-                        // Not sure why, but we need an explicit json parse here. 
-                        var results = $.parseJSON(xhr.responseText);                        
+                        // Not sure why, but we need an explicit json parse here.
+                        var results = $.parseJSON(xhr.responseText);
                         var filteredResults = customForm.filterAcResults(results);
                         /*
                         if ( customForm.acTypes[$(selectedObj).attr('acGroupName')] == customForm.conceptClassURI ) {
@@ -346,7 +346,7 @@ var customForm = {
             }
         });
     },
-    
+
     //Method to check whether we need to filter to individuals with a most specific type = Concept or other allowed subclasses
     doRemoveConceptSubclasses:function() {
     	//if this array of allowable subclasses was declared annd there is at least one element in it
@@ -355,21 +355,21 @@ var customForm = {
     	}
     	return false;
     },
-    
+
     // 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());
 
     },
@@ -381,7 +381,7 @@ var customForm = {
             this.acFilter = null;
             return;
         }
-        
+
         //console.log("sparql for autocomplete filter: " + this.sparqlForAcFilter);
 
         // Define this.acFilter here, so in case the sparql query fails
@@ -398,24 +398,24 @@ var customForm = {
             }
         });
     },
-    
+
     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() {
             if ($.inArray(this.uri, customForm.acFilter) == -1) {
@@ -438,10 +438,10 @@ var customForm = {
         }
        //add this list to the ac filter list
         customForm.acFilter = customForm.acFilter.concat(this.acFilterForIndividuals);
-        
+
     },
-       
-    //Updating this code to utilize an array to 
+
+    //Updating this code to utilize an array to
     removeConceptSubclasses: function(array) {
     	//Using map because the resulting array might be different from the original
     	array = jQuery.map(array, function(arrayValue, i) {
@@ -454,7 +454,7 @@ var customForm = {
        	  //If there are multiple most specific types returned, check if none of them equals concept
        	  removeElement = true;
        	  var j;
-       	 
+
        	  for(j = 0; j < allMsTypes.length; j++) {
        		  //this refers to the element itself
        		  if(customForm.isAllowedConceptSubclass(allMsTypes[j])) {
@@ -464,14 +464,14 @@ var customForm = {
        		 }
        	  }
          }
-         
-         if(removeElement) 
+
+         if(removeElement)
         	 return null;
-         else 
+         else
         	 return arrayValue;
     	});
-    	
-       
+
+
        return array;
     },
     isAllowedConceptSubclass:function(classURI) {
@@ -497,15 +497,15 @@ var customForm = {
         // provides a way to monitor selection in other js files, e.g. to hide fields upon selection
         $acDiv.addClass("userSelected");
 
-        // If the form has a type selector, add type name to label in add mode. In edit mode, 
-        // use typeSelectorSpan html. The second case is an "else if" and not an else because 
-        // the template may not be passing the label to the acSelection macro or it may not be 
+        // If the form has a type selector, add type name to label in add mode. In edit mode,
+        // use typeSelectorSpan html. The second case is an "else if" and not an else because
+        // the template may not be passing the label to the acSelection macro or it may not be
         // using the macro at all and the label is hard-coded in the html.
         // ** With release 1.6 and display of all fields, more labels are hard-coded in html.
         // ** So check if there's a label before doing anything else.
-        
+
         if ( $acDiv.find('label').html().length === 0 ) {
-                    
+
             if ( this.typeSelector.length && ($acDiv.attr('acGroupName') == this.typeSelector.attr('acGroupName')) ) {
                 $acDiv.find('label').html('Selected ' + this.typeName + ':');
             }
@@ -516,7 +516,7 @@ var customForm = {
                 $acDiv.find('label').html('Selected ' + this.multipleTypeNames[$(selectedObj).attr('acGroupName')] + ':');
             }
         }
-        
+
         $acDiv.show();
         $acDiv.find("input").val(uri);
         $acDiv.find("span").html(label);
@@ -529,10 +529,10 @@ var customForm = {
 
         if ( this.acSelectOnly ) {
         	//On initialization in this mode, submit button is disabled
-        	this.enableSubmit();  
+        	this.enableSubmit();
         }
     },
-    
+
     undoAutocompleteSelection: function(selectedObj) {
         // 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
@@ -549,7 +549,7 @@ var customForm = {
         // boolean controls whether the acSelector value gets cleared.
 
         var clearAcSelectorVal = true;
-        
+
         if ( $(selectedObj).attr('id') == "typeSelector" ) {
             $acSelectionObj = customForm.acSelections[$(selectedObj).attr('acGroupName')];
             if ( $acSelectionObj.is(':hidden') ) {
@@ -588,7 +588,7 @@ var customForm = {
         }
         this.clearAcSelections = false;
     },
-    
+
     // this is essentially a subtask of undoAutocompleteSelection
     resetAcSelection: function(selectedObj) {
         this.hideFields($(selectedObj));
@@ -609,14 +609,14 @@ var customForm = {
         });
         return $selector;
     },
-    
+
     // Set type uri for autocomplete, and type name for labels and button text.
     // Note: we still need this in edit mode, to set the text values.
     setType: function() {
         var selectedType;
         // If there's no type selector, these values have been specified in customFormData,
         // and will not change over the life of the form.
-        if (!this.typeSelector.length) {    
+        if (!this.typeSelector.length) {
             if ( this.editMode == 'edit' && (this.typeSelectorSpan.html() != null && this.typeSelectorInput.val() != null) ) {
                 this.typeName = this.typeSelectorSpan.html();
                 this.acTypes[this.typeSelectorInput.attr('acGroupName')] = this.typeSelectorInput.val();
@@ -637,8 +637,8 @@ var customForm = {
                 var $acSelect = this.acSelections[acTypeKey];
                 $acSelect.find('label').html( customForm.selectedString + ' ' + this.typeName + ':');
             }
-        } 
-        // reset to empty values; 
+        }
+        // reset to empty values;
         else {
             if ( this.templateDefinedAcTypes ) {
                 this.acTypes[acTypeKey] = this.defaultAcType;
@@ -661,7 +661,7 @@ var customForm = {
         });
 
     },
-    
+
     getTypeNameForLabels: function(selectedObj) {
         // If this.acType is empty, we are either in a one-step form with no type yet selected,
         // or in repair mode in a two-step form with no type selected. Use the default type
@@ -671,7 +671,7 @@ var customForm = {
                 return this.typeName;
             }
             else {
-                return this.capitalize(this.defaultTypeName);                
+                return this.capitalize(this.defaultTypeName);
             }
         }
         else if ( selectedObj && ( $(selectedObj).attr('acGroupName') == this.typeSelector.attr('acGroupName') ) ) {
@@ -679,7 +679,7 @@ var customForm = {
                 return this.typeName;
             }
             else {
-                return this.capitalize(this.defaultTypeName);                
+                return this.capitalize(this.defaultTypeName);
             }
         }
         else {
@@ -694,14 +694,14 @@ var customForm = {
         // First case applies on page load; second case applies when the type gets changed. With multiple
         // ac fields there are cases where we also have to check if the help text is already there
         if (!$(selectedObj).val() || $(selectedObj).hasClass(this.acHelpTextClass) || $(selectedObj).val().substring(0, 18) == customForm.selectAnExisting ) {
-        	typeText = this.getTypeNameForLabels($(selectedObj));            
+        	typeText = this.getTypeNameForLabels($(selectedObj));
         	var helpText = customForm.selectAnExisting + " " + typeText + " " + customForm.orCreateNewOne ;
         	//Different for object property autocomplete
         	if ( this.acSelectOnly ) {
         		helpText = customForm.selectAnExisting + " " + typeText;
         	}
     		$(selectedObj).val(helpText)
-    	               .addClass(this.acHelpTextClass);     
+    	               .addClass(this.acHelpTextClass);
     	}
     },
 
@@ -712,7 +712,7 @@ var customForm = {
             if ($(selectedObj).hasClass(this.acHelpTextClass)) {
         		$(selectedObj).val('')
         	                  .removeClass(this.acHelpTextClass);
-        	}            
+        	}
         }
         else {
             $.each(this.acSelectors, function() {
@@ -722,11 +722,11 @@ var customForm = {
     	        }
     	    });
     	}
-    },	
+    },
     disableSubmit: function() {
 		 //Disable submit button until selection made
       this.button.attr('disabled', 'disabled');
-      this.button.addClass('disabledSubmit');  
+      this.button.addClass('disabledSubmit');
 	},
 	enableSubmit:function() {
 		this.button.removeAttr('disabled');
@@ -740,7 +740,7 @@ var customForm = {
         var $acDiv = this.acSelections[$(selectedObj).attr('acGroupName')];
         $acDiv.find("input").val(customForm.blankSentinel);
 	}
-	
+
 };
 
 $(document).ready(function() {
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/defaultDataPropertyUtils.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/defaultDataPropertyUtils.js
index f949e94dd..2438d27d6 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/defaultDataPropertyUtils.js
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/defaultDataPropertyUtils.js
@@ -1,10 +1,10 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 
 var defaultDataPropertyUtils = {
-        
+
     onLoad: function() {
 
-        this.initObjectReferences();                 
+        this.initObjectReferences();
         this.bindEventListeners();
 		if ( $('#literal').val().length > 0 ) {
 			this.parseLiteralValue();
@@ -12,7 +12,7 @@ var defaultDataPropertyUtils = {
     },
 
     initObjectReferences: function() {
-    
+
         this.form = $('form.editForm');
         this.textArea = $('textarea.useTinyMce');
 
@@ -26,34 +26,34 @@ var defaultDataPropertyUtils = {
         this.form.submit(function() {
 			if ( defaultDataPropertyUtils.textArea.length ) {
 	            var theText = tinyMCE.get('literal').getContent();
-	
+
 	            if ( theText.indexOf("<!--") > -1 && theText.indexOf("-->") > -1 ) {
 	                var start = theText.indexOf("<p><!--");
 	                var end = (theText.indexOf("--></p>") + 10);
 	                var removeText = theText.slice(start,end);
 	                var newText = theText.replace(removeText,"");
-	                tinyMCE.get('literal').setContent(newText);                
+	                tinyMCE.get('literal').setContent(newText);
 	            }
 	            else if ( theText.indexOf("&lt;!--") > -1 && theText.indexOf("--&gt;") > -1 ) {
 	                var start = theText.indexOf("<p>&lt;!--");
 	                var end = (theText.indexOf("--&gt;</p>") + 10);
 	                var removeText = theText.slice(start,end);
 	                var newText = theText.replace(removeText,"");
-	                tinyMCE.get('literal').setContent(newText);                
+	                tinyMCE.get('literal').setContent(newText);
 	            }
 			}
-			else { 
-				return defaultDataPropertyUtils.createAndValidateLiteralValue(); 
+			else {
+				return defaultDataPropertyUtils.createAndValidateLiteralValue();
 			}
 			return true;
-        });               
+        });
     },
 
 	createAndValidateLiteralValue: function() {
 		var theType = datatype.substring(datatype.lastIndexOf("#") + 1);
 		var temp = "";
 		if ( $('#literal').attr("type") == "hidden" ) {
-			if ( $('#dateTimeField-year').length ) { 
+			if ( $('#dateTimeField-year').length ) {
 				if ( $('#dateTimeField-year').val().length < 4 ) {
 					alert(defaultDataPropertyUtils.four_digit_year);
 					return false;
@@ -66,9 +66,9 @@ var defaultDataPropertyUtils = {
 			}
 			switch (theType) {
 				case 'date':
-					temp = $('#dateTimeField-year').val() + "-" 
+					temp = $('#dateTimeField-year').val() + "-"
 					         + $('#dateTimeField-month').val() + "-"
-					         + $('#dateTimeField-day').val(); 
+					         + $('#dateTimeField-day').val();
 					if ( temp.indexOf("-") == 0 || temp.lastIndexOf("-") == (temp.length - 1) || temp.indexOf("--") > 0 ) {
 						alert(defaultDataPropertyUtils.year_month_day);
 						return false;
@@ -76,11 +76,11 @@ var defaultDataPropertyUtils = {
 					$('#literal').val(temp);
 					break;
 				case 'dateTime':
-					temp = $('#dateTimeField-year').val() + "-" 
+					temp = $('#dateTimeField-year').val() + "-"
 				         	+ $('#dateTimeField-month').val() + "-"
-				         	+ $('#dateTimeField-day').val() + "T" 
+				         	+ $('#dateTimeField-day').val() + "T"
 							+ ($('#dateTimeField-hour').val().length == 0 ? "00" : $('#dateTimeField-hour').val()) + ":"
-							+ ($('#dateTimeField-minute').val().length == 0 ? "00" : $('#dateTimeField-minute').val()) + ":" 
+							+ ($('#dateTimeField-minute').val().length == 0 ? "00" : $('#dateTimeField-minute').val()) + ":"
 							+ ($('#dateTimeField-second').val().length == 0 ? "00" : $('#dateTimeField-second').val());
 					if ( temp.indexOf("-") == 0 || temp.indexOf("-T") > 0 || temp.indexOf("--") > 0 ) {
 						alert(defaultDataPropertyUtils.minimum_ymd);
@@ -90,7 +90,7 @@ var defaultDataPropertyUtils = {
 					break;
 				case 'time':
 					temp = $('#dateTimeField-hour').val() + ":"
-							+ ($('#dateTimeField-minute').val().length == 0 ? "00" : $('#dateTimeField-minute').val()) + ":" 
+							+ ($('#dateTimeField-minute').val().length == 0 ? "00" : $('#dateTimeField-minute').val()) + ":"
 							+ ($('#dateTimeField-second').val().length == 0 ? "00" : $('#dateTimeField-second').val());
 					if ( temp.indexOf(":") == 0 ) {
 						alert(defaultDataPropertyUtils.minimum_hour);
@@ -114,7 +114,7 @@ var defaultDataPropertyUtils = {
 						temp = "--" + $('#dateTimeField-month').val()
 						$('input#literal').val(temp);
 					}
-					break;			
+					break;
 			}
 		}
 		else if (  $('#literal').attr("type") == "text" ) {
@@ -142,28 +142,28 @@ var defaultDataPropertyUtils = {
 		}
 		return true;
 	},
-	
+
 	parseLiteralValue: function() {
 		var theType = datatype.substring(datatype.lastIndexOf("#") + 1);
 		var temp = $('#literal').val();
-		
+
 		switch (theType) {
 			case 'date':
 				$('#dateTimeField-year').val(temp.substring(0, temp.indexOf("-")));
 				$('#dateTimeField-month').val(temp.substring(temp.indexOf("-")+1,temp.lastIndexOf("-")));
-				$('#dateTimeField-day').val(temp.substring(temp.lastIndexOf("-")+1)); 
+				$('#dateTimeField-day').val(temp.substring(temp.lastIndexOf("-")+1));
 				break;
 			case 'dateTime':
 				$('#dateTimeField-year').val(temp.substring(0, temp.indexOf("-")));
 				$('#dateTimeField-month').val(temp.substring(temp.indexOf("-")+1,temp.lastIndexOf("-")));
-				$('#dateTimeField-day').val(temp.substring(temp.lastIndexOf("-")+1,temp.indexOf("T"))); 
+				$('#dateTimeField-day').val(temp.substring(temp.lastIndexOf("-")+1,temp.indexOf("T")));
 				$('#dateTimeField-hour').val(temp.substring(temp.indexOf("T")+1,temp.indexOf(":")));
-				$('#dateTimeField-minute').val(temp.substring(temp.indexOf(":")+1,temp.lastIndexOf(":"))); 
+				$('#dateTimeField-minute').val(temp.substring(temp.indexOf(":")+1,temp.lastIndexOf(":")));
 				$('#dateTimeField-second').val(temp.substring(temp.lastIndexOf(":")+1));
 				break;
 			case 'time':
 				$('#dateTimeField-hour').val(temp.substring(0,temp.indexOf(":")));
-				$('#dateTimeField-minute').val(temp.substring(temp.indexOf(":")+1,temp.lastIndexOf(":"))); 
+				$('#dateTimeField-minute').val(temp.substring(temp.indexOf(":")+1,temp.lastIndexOf(":")));
 				$('#dateTimeField-second').val(temp.substring(temp.lastIndexOf(":")+1));
 				break;
 			case 'gYear':
@@ -175,12 +175,12 @@ var defaultDataPropertyUtils = {
 				break;
 			case 'gMonth':
 				$('#dateTimeField-month').val(temp.substring(temp.lastIndexOf("-")+1));
-				break;			
+				break;
 		}
 	}
-	
+
 }
 $(document).ready(function(){
 	defaultDataPropertyUtils.onLoad();
 });
- 
+
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 a8d3a807c..6fa2358c9 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,3 +1,3 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- Placeholder for class intersection segment of menu management form. This file is deliberately empty for vitro. -->
\ No newline at end of file
+<#-- Placeholder for class intersection segment of menu management form. This file is deliberately empty for vitro. -->
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement.ftl
index 8b1a0da50..4643480ed 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement.ftl
@@ -22,26 +22,26 @@
         <input type="hidden" name="cmd" id="cmd" value="${menuAction}" role="input" />
         <input type="hidden" name="menuItem" id="menuItem" value="${menuItem}" role="input" />
         <input type="hidden" name="switchToDisplayModel" id="switchToDisplayModel" value="true" role="input" />
-         
+
         <label for="menu-name">${i18n().name}<span class="requiredHint"> *</span></label>
         <input type="text" name="menuName" value="${menuName}" role="input" />
 
-        <label for="pretty-url">${i18n().pretty_url}<span class="requiredHint"> *</span></label> 
+        <label for="pretty-url">${i18n().pretty_url}<span class="requiredHint"> *</span></label>
         <input type="text" name="prettyUrl" value="${prettyUrl}" role="input" />
         <p class="note">${i18n().start_with_leading_slash}</p>
-        
+
         <p>${i18n().template_capitalized}<span class="requiredHint"> *</span></p>
-        
+
         <input type="radio" class="default-template" name="selectedTemplate" value="default" <#if selectedTemplateType = "default">checked</#if> role="radio" />
         <label class="inline" for="default"> ${i18n().default}</label>
         <br />
         <input type="radio" name="selectedTemplate" class="custom-template" value="custom" <#if selectedTemplateType = "custom">checked</#if> role="input" />
         <label class="inline" for="custom"> ${i18n().custom_template_mixed_caps}</label>
-        
+
         <section id="custom-template" <#if selectedTemplateType != 'custom'>class="hidden" </#if>role="region">
             <input type="text" name="customTemplate" value="${customTemplate!}" size="40" role="input" /><span class="requiredHint"> *</span>
         </section>
-        
+
         <section id="existingContentType" name="existingContentType" ${existingClassGroupStyle} role="region">
             <p>${i18n().selected_page_content_type}</p>
             <p>
@@ -49,25 +49,25 @@
                 <a href="#" id="changeContentType" name="changeContentType" title="${i18n().change_content_type}">${i18n().change_content_type}</a>
             </p>
         </section>
-        
+
         <#-- Select class group -->
-        <section id="selectContentType" name="selectContentType" ${selectClassGroupStyle} role="region">     
+        <section id="selectContentType" name="selectContentType" ${selectClassGroupStyle} role="region">
            <label for="selectClassGroup">${i18n().select_page_content_type}<span class="requiredHint"> *</span></label>
-           
+
            <select name="selectClassGroup" id="selectClassGroup" role="combobox">
                <option value="-1" role="option">${i18n().select_one}</option>
                <#list classGroups as aClassGroup>
                     <option value="${aClassGroup.URI}" <#if aClassGroup.URI = associatedPageURI>selected</#if> role="option">${aClassGroup.publicName}</option>
                </#list>
            </select>
-        </section> 
-        
+        </section>
+
         <section id="classesInSelectedGroup" name="classesInSelectedGroup" ${existingClassGroupStyle}>
-            <#-- Select classes in a class group -->    
+            <#-- Select classes in a class group -->
             <p id="selectClassesMessage" name="selectClassesMessage">${i18n().select_content_display}<span class="requiredHint"> *</span></p>
-            
+
             <#include "menuManagement--classIntersections.ftl">
-            
+
             <ul id="selectedClasses" name="selectedClasses" role="menu">
                 <#--Adding a default class for "ALL" in case all classes selected-->
                 <li class="ui-state-default" role="menuitem">
@@ -76,7 +76,7 @@
                 </li>
                 <#list classGroup as classInClassGroup>
                 <li class="ui-state-default" role="menuitem">
-                    <input type="checkbox" id="classInClassGroup" name="classInClassGroup" value="${classInClassGroup.URI}" <#if includeAllClasses = true>checked</#if> 
+                    <input type="checkbox" id="classInClassGroup" name="classInClassGroup" value="${classInClassGroup.URI}" <#if includeAllClasses = true>checked</#if>
                      <#if isIndividualsForClassesPage?has_content>
                             <#list includeClasses as includeClass>
                                 <#if includeClass = classInClassGroup.URI>
@@ -91,7 +91,7 @@
                 </#list>
             </ul>
         </section>
-        
+
         <input type="submit" name="submit-${menuAction}" value="${i18n().save_changes}" class="submit" role="input" /> ${i18n().or} <a class="cancel" href="${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
 
         <p class="requiredHint">* ${i18n().required_fields}</p>
@@ -112,4 +112,4 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/menupage/menuMa
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />')}
 
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.scrollTo-min.js"></script>')}
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/menumanagement_edit.js"></script>')}
\ No newline at end of file
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/menumanagement_edit.js"></script>')}
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 416009109..c067f3abd 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/newIndividualForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/newIndividualForm.ftl
@@ -31,10 +31,10 @@
 
 <#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">
- 
+
       <p>
           <label for="name">${i18n().name} ${requiredHint}</label>
           <input size="30"  type="text" id="label" name="label" value="" />
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--browseClassGroups.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--browseClassGroups.ftl
index c6f99d655..d912e1641 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--browseClassGroups.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--browseClassGroups.ftl
@@ -18,9 +18,9 @@
 
 <#--HTML Portion-->
  <section id="browseClassGroup" class="contentSectionContainer">
-                       
-                <section id="selectContentType" name="selectContentType" ${selectClassGroupStyle} role="region">     
-                    
+
+                <section id="selectContentType" name="selectContentType" ${selectClassGroupStyle} role="region">
+
                     <label for="selectClassGroup">${i18n().class_group_all_caps}<span class="requiredHint"> *</span></label>
                     <select name="selectClassGroup" id="selectClassGroup" role="combobox">
                         <option value="-1" role="option">${i18n().select_one}</option>
@@ -29,10 +29,10 @@
                         </#list>
                     </select>
                 </section>
-                
-                
+
+
                 <section id="classesInSelectedGroup" name="classesInSelectedGroup" ${existingClassGroupStyle}>
-                    <#-- Select classes in a class group -->    
+                    <#-- Select classes in a class group -->
                     <p id="selectClassesMessage" name="selectClassesMessage">${i18n().select_content_display}<span class="requiredHint"> *</span></p>
 
                     <#include "pageManagement--classIntersections.ftl">
@@ -47,7 +47,7 @@
                         <li class="ui-state-default" role="menuitem">
                             <input type="checkbox" id="classInClassGroup" name="classInClassGroup" value="${classInClassGroup.URI}" checked="checked" />
                             <label class="inline" for="${classInClassGroup.name}"> ${classInClassGroup.name}</label>
-                            <span class="ui-icon-sortable"></span> 
+                            <span class="ui-icon-sortable"></span>
                         </li>
                         </#list>
                     </ul><br />
@@ -65,5 +65,5 @@
         selectClasses: '${i18n().select_classes_to_display}'
     };
 </script>
- <#--Include JavaScript specific to the types of data getters related to this content-->           
- <#include "pageManagement--browseClassGroupsScripts.ftl">
\ No newline at end of file
+ <#--Include JavaScript specific to the types of data getters related to this content-->
+ <#include "pageManagement--browseClassGroupsScripts.ftl">
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--contentTemplates.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--contentTemplates.ftl
index a0f655c61..891497e46 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--contentTemplates.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--contentTemplates.ftl
@@ -3,4 +3,4 @@
 <#include "pageManagement--browseClassGroups.ftl">
 <#include "pageManagement--sparqlQuery.ftl">
 <#include "pageManagement--fixedHtml.ftl">
-<#include "pageManagement--searchIndividuals.ftl">
\ No newline at end of file
+<#include "pageManagement--searchIndividuals.ftl">
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 349fdf019..ec6fed225 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,6 +1,6 @@
 <#-- $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 
+file to ensure this script is always loaded first.  Can also make sure placed first in
 scripts list.-->
 
 <script type="text/javascript">
@@ -16,4 +16,4 @@ scripts list.-->
       		"searchIndividuals":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SearchIndividualsDataGetter"
       }
     };
-</script>
\ No newline at end of file
+</script>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement.ftl
index 25a0d94e1..64b7473da 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement.ftl
@@ -10,7 +10,7 @@
 <#assign pageName = "" />
 <#assign selectedTemplateType = "default" />
 <#assign prettyUrl = ""/>
-<#assign menuItem = ""/>    	
+<#assign menuItem = ""/>
 <#assign menuLinkText = "" />
 <#assign action = "" />
 <#assign menuPosition = pageData.highestMenuPosition />
@@ -23,7 +23,7 @@
 <#--Existing Values For Editing condition-->
 <#assign literalValues = editConfiguration.existingLiteralValues />
 <#assign uriValues = editConfiguration.existingUriValues />
-<#if menuAction = "Edit"> 
+<#if menuAction = "Edit">
 	<#assign pageName = lvf.getFormFieldValue(editSubmission, editConfiguration, "pageName")/>
 	<#assign prettyUrl = lvf.getFormFieldValue(editSubmission, editConfiguration, "prettyUrl")/>
 	<#assign menuItem =  lvf.getFormFieldValue(editSubmission, editConfiguration, "menuItem")/>
@@ -31,7 +31,7 @@
 	<#assign customTemplate = lvf.getFormFieldValue(editSubmission, editConfiguration, "customTemplate")/>
 	<#assign selfContainedTemplate = lvf.getFormFieldValue(editSubmission, editConfiguration, "isSelfContainedTemplate")/>
 	<#assign action = lvf.getFormFieldValue(editSubmission, editConfiguration, "action")/>
-	
+
 	<#assign pageHeading = "${i18n().edit_page(pageName)}" />
     <#assign saveBtnText = "${i18n().save_changes}" />
 	<#if customTemplate?has_content>
@@ -45,7 +45,7 @@
 	<#--if menu position exists for a menu item, then use that, otherwise use the highest available menu position number from page data-->
 	<#if editMenuPosition?has_content && editMenuPosition != "">
 		<#assign menuPosition = editMenuPosition/>
-	</#if>	
+	</#if>
 </#if>
 <#--If edit submission exists, then retrieve validation errors if they exist-->
 <#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content>
@@ -75,23 +75,23 @@
     <section id="floatRight">
         <div id="rightSide" <#if selectedTemplateType="selfContained">style="display:none;"</#if>>
             <section id="addPageOne" role="region" >
-            <label for="contentType">${i18n().content_type}<span class="requiredHint"> *</span></label> 
+            <label for="contentType">${i18n().content_type}<span class="requiredHint"> *</span></label>
             <select id="typeSelect"  name="typeSelect" >
                 <option value="" selected="selected">${i18n().select_type}</option>
-                <option value="browseClassGroup">${i18n().browse_class_group}</option>           
-                <option value="fixedHtml">${i18n().fixed_html}</option>           
-                <option value="sparqlQuery">${i18n().sparql_query_results}</option>   
-                <option value="searchIndividuals">${i18n().search_individual_results}</option>                   
+                <option value="browseClassGroup">${i18n().browse_class_group}</option>
+                <option value="fixedHtml">${i18n().fixed_html}</option>
+                <option value="sparqlQuery">${i18n().sparql_query_results}</option>
+                <option value="searchIndividuals">${i18n().search_individual_results}</option>
              </select>&nbsp;<span class="note">${i18n().add_types}</span>
             </section>
             <section id="contentDivs"></section>
             <section id="headerBar" >
             </section>
-            
+
             <#--This include file contains links to the templates that will be cloned and used for the different content types-->
 			 <!--This content will be copied/shown for these particular content types, so any fields for n3 editing need to be included
             here that correspond to a specific content type.  These are related to specific "data getters" on the server side.  -->
-			<#include "pageManagement--contentTemplates.ftl">                    
+			<#include "pageManagement--contentTemplates.ftl">
         </div>
     </section>
     <!--Information for page or menu item level-->
@@ -99,7 +99,7 @@
         <section id="pageDetails" role="region" >
             <label for="page-name">${i18n().title_capitalized}<span class="requiredHint"> *</span></label>
             <input id="pageName" type="text" name="pageName" value="${pageName!''}" role="input" />
-            <label for="pretty-url">${i18n().pretty_url}<span class="requiredHint"> *</span></label> 
+            <label for="pretty-url">${i18n().pretty_url}<span class="requiredHint"> *</span></label>
             <input type="text" name="prettyUrl" value="${prettyUrl!''}" role="input" />
             <p class="note">${i18n().begin_with_slash_no_example} <br />${i18n().slash_example}</p>
             <p id="templatePTag">${i18n().template_capitalized}<span class="requiredHint"> *</span></p>
@@ -118,7 +118,7 @@
             <p id="menuCheckboxPTag"><input id="menuCheckbox" type="checkbox" name="menuCheckbox"
             <#if (menuAction="Edit" && menuItem?has_content) || (menuAction="Add" && addMenuItem = "true")>checked="checked"</#if>
             > ${i18n().a_menu_page}</p>
-            <section id="menu" role="region" 
+            <section id="menu" role="region"
             <#--Do not display menu section unless editing an existing menu item-->
             <#if (menuAction = "Add" && addMenuItem != "true")  || (menuAction="Edit" && (!menuItem?has_content || menuItem = "")) >
             class="hideMenuSection"
@@ -127,20 +127,20 @@
             </#if>
             >
                 <label for="default">${i18n().menu_item_name}</label>
-           
+
                 <input type="hidden" id="menuItem" name="menuItem" value="${menuItem!''}" />
                 <input type="text" id="menuLinkText" name="menuLinkText" value="${menuLinkText!''}" size="28" role="input" />
                 <input type="hidden" id="menuPosition" name="menuPosition" value="${menuPosition!''}" />
-                
-                
+
+
                 <p class="note">${i18n().if_blank_page_title_used}</p>
-              
-                
+
+
             </section>
             <section id="pagePermissions">
             <br/>
               <label for="action">${i18n().page_select_permission}</label>
-              
+
                 <select id="action" name="action">
                 	<option value="">${i18n().page_select_permission_option}</option>
                 <#list pageAvailablePermissionsURIsList as permissionURI>
@@ -152,7 +152,7 @@
         </section>
     </div>
     <section >
-        <span id="saveButton" ><input  id="pageSave" type="submit" name="submit-Add" value="${saveBtnText}" class="submit" role="input" /> or </span> 
+        <span id="saveButton" ><input  id="pageSave" type="submit" name="submit-Add" value="${saveBtnText}" class="submit" role="input" /> or </span>
         <a class="cancel" href="${cancelUrl!}"  id="cancelPage" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
         <br />
         <p class="requiredHint">* ${i18n().required_fields}</p>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/rdfTypeForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/rdfTypeForm.ftl
index 93aa92f73..aa49ee237 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/rdfTypeForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/rdfTypeForm.ftl
@@ -13,13 +13,13 @@
     <#if rangeOptionsExist  = true >
         <#assign rangeOptionKeys = rangeOptions?keys />
         <form class="editForm" action = "${submitUrl}">
-            <input type="hidden" name="editKey" id="editKey" value="${editKey}" role="input" />                
+            <input type="hidden" name="editKey" id="editKey" value="${editKey}" role="input" />
             <select id="object" name="object" 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>
@@ -27,7 +27,7 @@
             </p>
         </form>
     <#else>
-        <p> ${i18n().no_classes_to_select}  </p>  
+        <p> ${i18n().no_classes_to_select}  </p>
     </#if>
 
 <#if editConfiguration.propertyOfferCreateNewOption = true>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/rdfsLabelForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/rdfsLabelForm.ftl
index 5b318a2f2..92f15d56f 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/rdfsLabelForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/rdfsLabelForm.ftl
@@ -14,14 +14,14 @@
     <input type="text" name="${editConfiguration.varNameForObject}" id="label" size="70" value="${literalValues?html}" role="input"/>
     <input type="hidden" name="editKey" id="editKey" value="${editKey}" role="input"/>
     <input type="hidden" name="vitroNsProp" value="true" role="input"/>
-    
+
     <p class="submit">
         <input type="submit" id="submit" value="${submitLabel}" role="input"/>
         or <a href="${cancelUrl}" class="cancel" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
     </p>
-    
+
 </form>
 
-<#--The original jsp included a delete form for deleting rdfs label.  
-If required, deletion can be supported but it does not appear that is required currently. 
--->
\ No newline at end of file
+<#--The original jsp included a delete form for deleting rdfs label.
+If required, deletion can be supported but it does not appear that is required currently.
+-->
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/missingEditConfig.ftl b/webapp/src/main/webapp/templates/freemarker/edit/missingEditConfig.ftl
index 375c23924..f98ec578f 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/missingEditConfig.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/missingEditConfig.ftl
@@ -2,7 +2,7 @@
 
 <p>Unable to process the edit, possibly due to session experation.</p>
 
-<#list params?keys as key>   
+<#list params?keys as key>
   <#if key != "editKey">
 
   <div id=${key}>
@@ -14,4 +14,4 @@
 
  </#if>
 </#list>
-  
\ No newline at end of file
+
diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-datetime.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-datetime.ftl
index 610b63878..241ab31c8 100644
--- a/webapp/src/main/webapp/templates/freemarker/lib/lib-datetime.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-datetime.ftl
@@ -1,11 +1,11 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- Macros for datetime formatting 
+<#-- Macros for datetime formatting
 
      In this library, functions are used to format the datetime or interval
      according to a format string and precision, returning a raw string.
      Macros are used to generate the string with appropriate markup.
---> 
+-->
 
 <#-- MACROS -->
 
@@ -20,10 +20,10 @@
     <#local yearInterval = yearInterval(startDateTime, endDateTime, endYearAsRange)>
     <#if yearInterval?has_content>
         <@dateTimeSpan>${yearInterval}</@dateTimeSpan>
-    </#if>  
+    </#if>
 </#macro>
 
-<#-- Display the datetime value or interval in a classed span appropriate for 
+<#-- Display the datetime value or interval in a classed span appropriate for
      a property statement list -->
 <#macro dateTimeSpan>
     <span class="listDateTime"><#nested></span>
@@ -50,14 +50,14 @@
 <#-- Generate a datetime interval -->
 <#function dateTimeInterval dateTimeStart="" precisionStart="" dateTimeEnd="" precisionEnd="" formatType="short" endAsRange=true>
 
-    <#if dateTimeStart?has_content>   
+    <#if dateTimeStart?has_content>
         <#local start = formatXsdDateTime(dateTimeStart, precisionStart, formatType)>
     </#if>
-    
+
     <#if dateTimeEnd?has_content>
         <#local end = formatXsdDateTime(dateTimeEnd, precisionEnd, formatType)>
     </#if>
-    
+
     <#local interval>
         <#if start?? && end??>
             <#if start == end>
@@ -71,7 +71,7 @@
             <#if endAsRange>-&nbsp;</#if>${end}
         </#if>
     </#local>
-    
+
     <#return interval?trim>
 </#function>
 
@@ -81,7 +81,7 @@
      implementation; see NIHVIVO-1567. We want the Java code to apply the precision to the datetime string to pass only the
      meaningful data to the templates. The templates can format as they like, so these functions/macros would do display formatting
      but not data extraction.
-     
+
      On the other hand, this is so easy that it may not be worth re-implementing to gain a bit more MVC compliance.
 -->
 
@@ -116,18 +116,18 @@
     <#if ! dateTimeStr?matches("(\\d{4})-(\\d{2})-(\\d{2}) (\\d{2}):(\\d{2}):(\\d{2})")>
         <#return dateTimeStr>
     </#if>
-    
+
     <#-- Convert the string to a datetime object. -->
     <#local dateTimeObj = dateTimeStr?datetime("yyyy-MM-dd HH:mm:ss")>
 
     <#-- If no precision is specified, assign it from the datetime value.
          Pass dateTimeStr rather than dateTimeObj, because dateTimeObj
-         replaces zeroes with default values, whereas we want to set 
+         replaces zeroes with default values, whereas we want to set
          precision based on whether the times values are all 0. -->
     <#if ! precision?has_content>
         <#local precision = getPrecision(dateTimeStr)>
     </#if>
-    
+
     <#-- Get the format string for the datetime output -->
     <#local format = getFormat(formatType, precision)>
 
@@ -142,21 +142,21 @@
     <#list match as m>
         <#local hours = m?groups[4]?number>
         <#local minutes = m?groups[5]?number>
-        <#local seconds = m?groups[6]?number> 
-    </#list> 
-    
-    <#local precision>   
+        <#local seconds = m?groups[6]?number>
+    </#list>
+
+    <#local precision>
         <#if hours == 0 && minutes == 0 && seconds == 0>yearMonthDayPrecision
         <#else>yearMonthDayTimePrecision
         </#if>
-    </#local> 
-    
-    <#return precision?trim>  
+    </#local>
+
+    <#return precision?trim>
 </#function>
 
 <#function getFormat formatType precision>
-    <#-- Use the precision to determine which portion to display, 
-         and the format type to determine how to display it.  -->    
+    <#-- Use the precision to determine which portion to display,
+         and the format type to determine how to display it.  -->
     <#local format>
         <#if formatType == "long">
             <#if precision?ends_with("yearPrecision")>yyyy
@@ -173,8 +173,8 @@
             </#if>
         </#if>
     </#local>
-    
+
     <#return format?trim>
 </#function>
-  
+
 
diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-form.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-form.ftl
index c31353682..dcc639aa1 100644
--- a/webapp/src/main/webapp/templates/freemarker/lib/lib-form.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-form.ftl
@@ -2,13 +2,13 @@
 
 <#-- Macros for form controls -->
 
-<#-- 
+<#--
     Macro: optionGroups
-    
+
     Output: a sequence of option groups with options.
-    
+
     Input: a map of option groups to lists of Option objects.
-    
+
     Usage: <@optionGroups groups=myOptionGroups />
 -->
 <#macro optionGroups groups>
@@ -21,30 +21,30 @@
 
 <#---------------------------------------------------------------------------->
 
-<#-- 
+<#--
     Macro: options
-    
+
     Output: a sequence of options.
-    
+
     Input: a list of Option objects.
-    
+
     Usage: <@options opts=myOptions />
 -->
 <#macro options opts>
     <#list opts as opt>
-        <option value="${opt.value}"<#if opt.selected> selected="selected"</#if>>${opt.body}</option> 
+        <option value="${opt.value}"<#if opt.selected> selected="selected"</#if>>${opt.body}</option>
     </#list>
 </#macro>
 
 <#---------------------------------------------------------------------------->
 
-<#-- 
+<#--
     Macro: hiddenInputs
-    
+
     Output hidden inputs from a map of names to values.
-    
+
     Input: a map of strings (names) to strings (values). May be null.
-    
+
     Usage: <@hiddenInputs inputs />
 -->
 <#macro hiddenInputs inputs="">
@@ -53,4 +53,4 @@
             <input type="hidden" name="${name}" value="${inputs[name]}" />
         </#list>
     </#if>
-</#macro>
\ No newline at end of file
+</#macro>
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 ec8f576f0..8c13926cd 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
@@ -52,7 +52,7 @@
                             <#assign groupCount = groupCount + 1>
                         </#if>
                     </#if>
-                    
+
                 </#list>
             </ul>
         </section>
@@ -63,7 +63,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>
@@ -72,5 +72,5 @@
             <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>
diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-json.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-json.ftl
index 46284d71a..91fd55fe4 100644
--- a/webapp/src/main/webapp/templates/freemarker/lib/lib-json.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-json.ftl
@@ -3,11 +3,11 @@
 <#-- Macros for json output -->
 
 <#macro array data>
-[ 
+[
 <#if data??>
-    <#list data as obj>   
+    <#list data as obj>
         ${obj.json}<#if obj_has_next>,</#if>
     </#list>
 </#if>
 ]
-</#macro>
\ No newline at end of file
+</#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-list.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-list.ftl
index 079c4145a..e9bf64759 100644
--- a/webapp/src/main/webapp/templates/freemarker/lib/lib-list.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-list.ftl
@@ -2,26 +2,26 @@
 
 <#-- Macros for generating html lists -->
 
-<#-- 
+<#--
     Macro: firstLastList
 
-    Output a sequence of <li> elements, adding classes "first" and "last" to first and last list elements, respectively. 
+    Output a sequence of <li> elements, adding classes "first" and "last" to first and last list elements, respectively.
     Especially useful when the list elements are generated conditionally, to avoid complex tests for the presence/absence
     of other list elements in order to assign these classes.
-    
+
     Input should be a series of <li> elements. It is currently not supported for these <li> elements to contain nested
     <li> elements. An <li> element may span multiple lines.
-    
+
     Usage:
         <@firstLastList>
             <li>apples</li>
             <li>bananas</li>
             <li>oranges</li>
         </@firstLastList>
-        
+
         <@firstLastList>
             <#list animals as animal>
-                <#if animal != "cow"> 
+                <#if animal != "cow">
                     <li>${animal}</li>
                 </#if>
             </#list>
@@ -29,7 +29,7 @@
 
     RY Consider rewriting in Java. Probably designers won't want to modify this. That would allow us to support
     nested <li> elements.
-           
+
 -->
 <#macro firstLastList>
     <#local text>
@@ -41,41 +41,41 @@
 
 <#---------------------------------------------------------------------------->
 
-<#-- 
+<#--
     Macro: firstLastListNested
-    
-    Output a sequence of <li> elements, adding classes "first" and "last" to first and last list elements, respectively. 
+
+    Output a sequence of <li> elements, adding classes "first" and "last" to first and last list elements, respectively.
     Especially useful when the list elements are generated conditionally, to avoid complex tests for the presence/absence
     of other list elements in order to assign these classes.
-    
+
     Input should be a series of <li> elements separated by some delimiter. Default delimiter value is ",".
-    
+
     Tolerates a delimiter following the last <li> element.
-    
+
     Unlike firstLastList, this macro can process <li> elements that contain other <li> elements, because the delimiters
     indicate how to split the text.
-    
+
     Usage:
         <@firstLastListNested>
             <li>apples</li>,
             <li>bananas</li>,
             <li>oranges</li>
         </@firstLastListNested>
-        
+
         <@firstLastListNested>
             <#list animals as animal>
-                <#if animal != "cow"> 
+                <#if animal != "cow">
                     <li>${animal}</li>,
                 </#if>
             </#list>
         </@firstLastListNested>
-        
+
         <@firstLastListNested delim="??">
             <li>apples, oranges</li>??
             <li>bananas, lemons</li>??
             <li>grapefruit, limes</li>
         </@firstLastListNested>
-        
+
         <@firstLastListNested delim="??">
             <li>Books
                 <ul>
@@ -98,7 +98,7 @@
         <#nested>
     </#local>
 
-    <#-- Strip out a list-final delimiter, else (unlike most languages) it 
+    <#-- Strip out a list-final delimiter, else (unlike most languages) it
     results in an empty final array item. -->
     <#local text = text?replace("${delim}\\s*$", "", "r")>
 
@@ -108,12 +108,12 @@
 
 <#---------------------------------------------------------------------------->
 
-<#-- 
-    Macro: processListItems 
+<#--
+    Macro: processListItems
 
      Given a list of <li> elements, adds class "first" to the first item and
      "last" to the last item. The <li> elements must have already been put into
-     a list; this macro does not handle the raw text. Can be called from 
+     a list; this macro does not handle the raw text. Can be called from
      firstLastList
 
 -->
@@ -124,7 +124,7 @@
         <#local newItem = item?trim>
 
         <#local classVal = "">
-        
+
         <#-- Keep any class value already assigned -->
         <#local classMatch = newItem?matches("^<li [^>]*(class=([\'\"])(.*?)\\2)")>
         <#list classMatch as m>
@@ -132,17 +132,17 @@
             <#local newItem = newItem?replace(m?groups[1], "")> <#-- remove 'class="xyz"' -->
         </#list>
 
-        <#if item_index == 0> 
+        <#if item_index == 0>
             <#local classVal = "${classVal} first">
         </#if>
-        <#if ! item_has_next>       
+        <#if ! item_has_next>
             <#local classVal = "${classVal} last">
         </#if>
-        
+
         <#local classVal = classVal?trim>
-        
-        <#if classVal?has_content>    
-            <#-- Replace first instance only, in case the item contains nested li tags. -->     
+
+        <#if classVal?has_content>
+            <#-- Replace first instance only, in case the item contains nested li tags. -->
             <#local newItem = newItem?replace("<li", "<li class=\"${classVal}\"", "f")>
         </#if>
         ${newItem}
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 e21e53159..259babeb7 100644
--- a/webapp/src/main/webapp/templates/freemarker/lib/lib-microformats.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-microformats.ftl
@@ -2,4 +2,4 @@
 
 <#macro sectionSchema individual>
 	<#-- Placeholder macro only. Will generate errors if this file is removed from the Vitro source. -->
-</#macro>
\ No newline at end of file
+</#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl
index 164cf85a1..3e5223fc6 100644
--- a/webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl
@@ -10,13 +10,13 @@
 <#function hasStatements propertyGroups propertyName>
 
     <#local property = propertyGroups.getProperty(propertyName)!>
-    
+
     <#-- First ensure that the property is defined
     (an unpopulated property while logged out is undefined) -->
     <#if ! property?has_content>
         <#return false>
     </#if>
-    
+
     <#if property.collatedBySubclass!false> <#-- collated object property-->
         <#return property.subclasses?has_content>
     <#else>
@@ -28,13 +28,13 @@
 <#function hasVisualizationStatements propertyGroups propertyName rangeUri>
 
     <#local property = propertyGroups.getProperty(propertyName, rangeUri)!>
-    
+
         <#-- First ensure that the property is defined
         (an unpopulated property while logged out is undefined) -->
         <#if ! property?has_content>
             <#return false>
         </#if>
-    
+
         <#if property.collatedBySubclass!false> <#-- collated object property-->
             <#return property.subclasses?has_content>
         <#else>
@@ -57,7 +57,7 @@
 <#macro dataPropertyList property editable template=property.template>
     <#list property.statements as statement>
         <@propertyListItem property statement editable ><#include "${template}"></@propertyListItem>
-    </#list> 
+    </#list>
 </#macro>
 
 <#macro objectProperty property editable template=property.template>
@@ -90,11 +90,11 @@
     </#list>
 </#macro>
 
-<#-- Full object property listing, including heading and ul wrapper element. 
+<#-- Full object property listing, including heading and ul wrapper element.
 Assumes property is non-null. -->
 <#macro objectPropertyListing property editable template=property.template>
     <#local localName = property.localName>
-    <h2 id="${localName}" class="mainPropGroup" title="${property.publicDescription!}">${property.name?capitalize} <@addLink property editable /> <@verboseDisplay property /></h2>    
+    <h2 id="${localName}" class="mainPropGroup" title="${property.publicDescription!}">${property.name?capitalize} <@addLink property editable /> <@verboseDisplay property /></h2>
     <ul id="individual-${localName}" role="list">
         <@objectProperty property editable />
     </ul>
@@ -106,35 +106,35 @@ Assumes property is non-null. -->
     </#list>
 </#macro>
 
-<#-- Some properties usually display without a label. But if there's an add link, 
+<#-- Some properties usually display without a label. But if there's an add link,
 we need to also show the property label. If no label is specified, the property
 name will be used as the label. -->
 <#macro addLinkWithLabel property editable label="${property.name?capitalize}">
     <#local addLink><@addLink property editable label /></#local>
     <#local verboseDisplay><@verboseDisplay property /></#local>
-    <#-- Changed to display the label when user is in edit mode, even if there's no add link (due to 
-    displayLimitAnnot, for example). Otherwise the display looks odd, since neighboring 
-    properties have labels. 
+    <#-- Changed to display the label when user is in edit mode, even if there's no add link (due to
+    displayLimitAnnot, for example). Otherwise the display looks odd, since neighboring
+    properties have labels.
     <#if addLink?has_content || verboseDisplay?has_content>
-        <h2 id="${property.localName}" title="${property.publicDescription!}">${label}  ${addLink!} ${verboseDisplay!}</h2>         
+        <h2 id="${property.localName}" title="${property.publicDescription!}">${label}  ${addLink!} ${verboseDisplay!}</h2>
     </#if>
     -->
-    <#if editable> 
+    <#if editable>
         <h2 id="${property.localName!}" title="${property.publicDescription!}">${label}  ${addLink!}</h2>
         ${verboseDisplay!}
     </#if>
 </#macro>
 
-<#macro addLink property editable label="${property.name}">    
+<#macro addLink property editable label="${property.name}">
     <#if property.rangeUri?? >
-        <#local rangeUri = property.rangeUri /> 
+        <#local rangeUri = property.rangeUri />
     <#else>
-        <#local rangeUri = "" /> 
+        <#local rangeUri = "" />
     </#if>
     <#if property.domainUri?? >
-        <#local domainUri = property.domainUri /> 
+        <#local domainUri = property.domainUri />
     <#else>
-        <#local domainUri = "" /> 
+        <#local domainUri = "" />
     </#if>
     <#if editable>
         <#if property.addUrl?has_content>
@@ -155,18 +155,18 @@ name will be used as the label. -->
 </#macro>
 
 <#macro propertyLabel property label="${property.name?capitalize}">
-    <h2 id="${property.localName}" title="${property.publicDescription!}">${label}  <@verboseDisplay property /></h2>     
+    <h2 id="${property.localName}" title="${property.publicDescription!}">${label}  <@verboseDisplay property /></h2>
 </#macro>
 
 
 <#macro propertyListItem property statement editable >
     <#if property.rangeUri?? >
-        <#local rangeUri = property.rangeUri /> 
+        <#local rangeUri = property.rangeUri />
     <#else>
-        <#local rangeUri = "" /> 
+        <#local rangeUri = "" />
     </#if>
-    <li role="listitem">    
-        <#nested>       
+    <li role="listitem">
+        <#nested>
         <@editingLinks "${property.localName}" "${property.name}" statement editable rangeUri/>
     </li>
 </#macro>
@@ -176,7 +176,7 @@ name will be used as the label. -->
         <#if (!rangeUri?contains("Authorship") && !rangeUri?contains("URL") && !rangeUri?contains("Editorship") && propertyLocalName != "hasResearchArea")>
             <@editLink propertyLocalName propertyName statement rangeUri/>
             <@deleteLink propertyLocalName propertyName statement rangeUri/>
-        </#if>    
+        </#if>
     </#if>
 </#macro>
 <#macro editLink propertyLocalName propertyName statement rangeUri="">
@@ -203,7 +203,7 @@ name will be used as the label. -->
     <a class="edit-${propertyLocalName}" href="${url}" title="${i18n().edit_entry}"><img class="edit-individual" data-range="${rangeUri}" src="${urls.images}/individual/editIcon.gif" alt="${i18n().edit_entry}" /></a>
 </#macro>
 
-<#macro deleteLink propertyLocalName propertyName statement rangeUri=""> 
+<#macro deleteLink propertyLocalName propertyName statement rangeUri="">
     <#local url = statement.deleteUrl>
     <#if url?has_content>
     	<#--We need to specify the actual object to be deleted as it is different from the object uri-->
@@ -230,14 +230,14 @@ name will be used as the label. -->
 
 <#macro verboseDisplay property>
     <#local verboseDisplay = property.verboseDisplay!>
-    <#if verboseDisplay?has_content>       
+    <#if verboseDisplay?has_content>
         <section class="verbosePropertyListing">
             <#if verboseDisplay.fauxProperty?has_content>
                  <a class="propertyLink" href="${verboseDisplay.fauxProperty.propertyEditUrl}" title="${i18n().name}">
                  ${verboseDisplay.fauxProperty.displayName}</a>
                  is a faux property of
             </#if>
-            <a class="propertyLink" href="${verboseDisplay.propertyEditUrl}" title="${i18n().name}">${verboseDisplay.localName}</a> 
+            <a class="propertyLink" href="${verboseDisplay.propertyEditUrl}" title="${i18n().name}">${verboseDisplay.localName}</a>
             (<span>${property.type?lower_case}</span> property);
             order in group: <span>${verboseDisplay.displayRank}</span>;
             display level: <span>${verboseDisplay.displayLevel}</span>;
@@ -251,10 +251,10 @@ name will be used as the label. -->
     Macros for specific properties
 ------------------------------------------------------------------------------>
 
-<#-- Image 
+<#-- Image
+
+     Values for showPlaceholder: "always", "never", "with_add_link"
 
-     Values for showPlaceholder: "always", "never", "with_add_link" 
-     
      Note that this macro has a side-effect in the call to propertyGroups.pullProperty().
 -->
 <#macro image individual propertyGroups namespaces editable showPlaceholder="never" imageWidth=160 >
@@ -308,10 +308,10 @@ name will be used as the label. -->
     		<#assign labelLink= "${urls.base}/editRequestDispatch?subjectUri=${individualUri}&editForm=${generators.ManageLabelsGenerator}&predicateUri=${labelPropertyUri}${extraParameters}">
     	<#else>
 			<#assign linkTitle = "${i18n().view_list_of_labels}">
-			<#assign imageAlt = "${i18n().view}" /> 
+			<#assign imageAlt = "${i18n().view}" />
 			<#assign labelLink= "${urls.base}/viewLabels?subjectUri=${individualUri}${extraParameters}">
     	</#if>
-    	
+
         <span class="inline">
             <a class="add-label" href="${labelLink}"
              title="${linkTitle}">
diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-sequence.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-sequence.ftl
index e358c22bc..a79bdac50 100644
--- a/webapp/src/main/webapp/templates/freemarker/lib/lib-sequence.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-sequence.ftl
@@ -6,7 +6,7 @@
 
 <#macro join arr glue=", ">
     <#assign count = 0>
-    <#-- Freemarker is very finicky about whitespace here. The compress directives and formatting 
+    <#-- Freemarker is very finicky about whitespace here. The compress directives and formatting
     here work; do not alter them. -->
     <#list arr as el>
         <#if el?has_content>
diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-string.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-string.ftl
index dc5ff3043..a893b41cd 100644
--- a/webapp/src/main/webapp/templates/freemarker/lib/lib-string.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-string.ftl
@@ -14,4 +14,4 @@
         <#local out = out + " " + word?uncap_first>
     </#list>
     <#return out?trim>
-</#function>
\ No newline at end of file
+</#function>
diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-vitro-form.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-vitro-form.ftl
index 6395c676d..2e46c6454 100644
--- a/webapp/src/main/webapp/templates/freemarker/lib/lib-vitro-form.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-vitro-form.ftl
@@ -68,7 +68,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/page/page-home.ftl b/webapp/src/main/webapp/templates/freemarker/page/page-home.ftl
index ae331a85f..8f5775b43 100644
--- a/webapp/src/main/webapp/templates/freemarker/page/page-home.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/page/page-home.ftl
@@ -2,4 +2,4 @@
 
 <#-- Page template for home page, for themes that do not use a home-page specific layout. -->
 
-<#include "page.ftl">
\ No newline at end of file
+<#include "page.ftl">
diff --git a/webapp/src/main/webapp/templates/freemarker/page/page.ftl b/webapp/src/main/webapp/templates/freemarker/page/page.ftl
index 60dcf1016..8d7432cab 100644
--- a/webapp/src/main/webapp/templates/freemarker/page/page.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/page/page.ftl
@@ -11,30 +11,30 @@
             <header id="branding" role="banner">
                 <#include "identity.ftl">
             </header>
-            
+
             <#-- Note to UI team: do not change this div without also making the corresponding change in menu.jsp -->
             <div id="navAndSearch" class="block">
-                <#include "menu.ftl">  
-                <#include "search.ftl">                
-            </div> <!-- navAndSearch --> 
-            
-            <#include "breadcrumbs.ftl">         
-        </div> <!-- header --> 
+                <#include "menu.ftl">
+                <#include "search.ftl">
+            </div> <!-- navAndSearch -->
+
+            <#include "breadcrumbs.ftl">
+        </div> <!-- header -->
 
         <hr class="hidden" />
 
         <div id="contentwrap">
             <#include "flash.ftl">
 
-            <div id="content">                      
+            <div id="content">
                 ${body}
             </div> <!-- content -->
         </div> <!-- contentwrap -->
-    
+
         <#include "footer.ftl">
     </div> <!-- wrap -->
-    
-    <#include "scripts.ftl"> 
+
+    <#include "scripts.ftl">
 </body>
 </html>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/breadcrumbs.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/breadcrumbs.ftl
index 32df5b2a6..59ebf3077 100644
--- a/webapp/src/main/webapp/templates/freemarker/page/partials/breadcrumbs.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/page/partials/breadcrumbs.ftl
@@ -2,4 +2,4 @@
 
 <#-- By default, not used. Uncomment if desired, and unhide in CSS.
 <div id="breadcrumbs" class="small">${breadcrumbs}</div>
--->
\ No newline at end of file
+-->
diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/developer.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/developer.ftl
index 4d5103881..359935a28 100644
--- a/webapp/src/main/webapp/templates/freemarker/page/partials/developer.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/page/partials/developer.ftl
@@ -5,5 +5,5 @@
     developerAjaxUrl = '${urls.developerAjax}'
     developerCssLinks = ["${urls.base}/css/developer/developerPanel.css", "${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.12.1.css"]
 </script>
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/developer/developerPanel.js"></script>')}   
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/developer/developerPanel.js"></script>')}
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.12.1.min.js"></script>')}
diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/developerPanel.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/developerPanel.ftl
index 8b1b6ab39..4ab08a563 100644
--- a/webapp/src/main/webapp/templates/freemarker/page/partials/developerPanel.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/page/partials/developerPanel.ftl
@@ -22,42 +22,42 @@
 	</div>
 <#else>
 	<div class="developer">
-		<h1 id="developerPanelClickMe">${siteName} is running in developer mode.  
+		<h1 id="developerPanelClickMe">${siteName} is running in developer mode.
 			<span id="developerPanelClickText">(click for Options)</span>
 		</h1>
 		<div id="developerPanelBody">
 			<div>
-				<@showCheckbox "developer_enabled", 
+				<@showCheckbox "developer_enabled",
 						"Enable developer mode" />
-				<@showCheckbox "developer_permitAnonymousControl", 
+				<@showCheckbox "developer_permitAnonymousControl",
 						"Allow anonymous user to see and modify developer settings" />
 			</div>
-			
+
 			<div id="developerTabs">
 				<ul>
 					<li><a href="#developerTabGeneral"><span>General</span></a></li>
 					<li><a href="#developerTabSearch"><span>Search</span></a></li>
 					<li><a href="#developerTabAuthorization"><span>Authorization</span></a></li>
 				</ul>
-			
+
 				<div id="developerTabGeneral">
 					<div class="devright">
 						<div class="container">
 							Page configuration
-							<@showCheckbox "developer_pageContents_logCustomListView", 
+							<@showCheckbox "developer_pageContents_logCustomListView",
 									"Log the use of custom list view XML files." />
-							<@showCheckbox "developer_pageContents_logCustomShortView" , 
+							<@showCheckbox "developer_pageContents_logCustomShortView" ,
 									"Log the use of custom short views in search, index and browse pages."/>
 						</div>
-						
+
 						<div class="container">
 							Language support
-							<@showCheckbox "developer_i18n_defeatCache", 
+							<@showCheckbox "developer_i18n_defeatCache",
 									"Defeat the cache of language property files" />
-							<@showCheckbox "developer_i18n_logStringRequests", 
+							<@showCheckbox "developer_i18n_logStringRequests",
 									"Log the retrieval of language strings" />
 						</div>
-		
+
 						<div class="container">
 							Links
 							<br/>
@@ -70,31 +70,31 @@
 							<a href="${urls.base}/admin/showSources">Show RDF data sources</a>
 						</div>
 					</div>
-						
+
 					<div class="devleft">
 						<div class="container">
 							Freemarker templates
-							<@showCheckbox "developer_defeatFreemarkerCache", 
+							<@showCheckbox "developer_defeatFreemarkerCache",
 									"Defeat the template cache" />
-							<@showCheckbox "developer_insertFreemarkerDelimiters", 
+							<@showCheckbox "developer_insertFreemarkerDelimiters",
 									"Insert HTML comments at start and end of templates" />
 						</div>
-		
+
 						<div class="container">
 							SPARQL Queries
 							<@showCheckbox "developer_loggingRDFService_enable", "Log each query" />
 							<div class="within">
-								<@showCheckbox "developer_loggingRDFService_stackTrace", 
+								<@showCheckbox "developer_loggingRDFService_stackTrace",
 										"Show stack trace" />
-								<@showTextbox "developer_loggingRDFService_queryRestriction", 
+								<@showTextbox "developer_loggingRDFService_queryRestriction",
 										"Restrict by query string" />
-								<@showTextbox "developer_loggingRDFService_stackRestriction", 
+								<@showTextbox "developer_loggingRDFService_stackRestriction",
 										"Restrict by calling stack" />
 							</div>
 						</div>
 					</div>
 				</div>
-				
+
 				<div id="developerTabSearch">
 					<div class="devright">
 						<div class="container">
@@ -103,50 +103,50 @@
 							<div class="within">
 								<@showCheckbox "developer_searchEngine_addStackTrace", "Show stack trace" />
 								<@showCheckbox "developer_searchEngine_addResults", "Show search results" />
-								<@showTextbox "developer_searchEngine_queryRestriction", 
+								<@showTextbox "developer_searchEngine_queryRestriction",
 										"Restrict by query string" />
-								<@showTextbox "developer_searchEngine_stackRestriction", 
+								<@showTextbox "developer_searchEngine_stackRestriction",
 										"Restrict by calling stack" />
 							</div>
 						</div>
-						
+
 						<div class="container">
 							Links
 							<br/>
 							<a href="${urls.base}/SearchIndex">Rebuild search index</a>
 						</div>
 					</div>
-						
+
 					<div class="devleft">
 						<div class="container">
 							Indexing
 							<@showCheckbox "developer_searchIndex_enable", "Log indexing." />
 							<div class="within">
-								<@showCheckbox "developer_searchIndex_showDocuments", 
+								<@showCheckbox "developer_searchIndex_showDocuments",
 										"Show document contents" />
-								<@showTextbox "developer_searchIndex_uriOrNameRestriction", 
+								<@showTextbox "developer_searchIndex_uriOrNameRestriction",
 										"Restrict by URI or name" />
-								<@showTextbox "developer_searchIndex_documentRestriction", 
+								<@showTextbox "developer_searchIndex_documentRestriction",
 										"Restrict by document contents" />
 							</div>
-							<@showCheckbox "developer_searchIndex_logIndexingBreakdownTimings", 
+							<@showCheckbox "developer_searchIndex_logIndexingBreakdownTimings",
 									"Log breakdown timings for indexing operation." />
 							<@showCheckbox "developer_searchDeletions_enable", "Log deletions." />
 							<div class="container">
-								<@showCheckbox "developer_searchIndex_suppressModelChangeListener", 
+								<@showCheckbox "developer_searchIndex_suppressModelChangeListener",
 										"Suppress the automatic indexing of changed triples." />
 							</div>
 						</div>
 					</div>
 				</div>
-				
+
 				<div id="developerTabAuthorization">
-					<@showCheckbox "developer_authorization_logDecisions_enable", 
+					<@showCheckbox "developer_authorization_logDecisions_enable",
 							"Write policy decisions to the log" />
 					<div class="within">
-						<@showCheckbox "developer_authorization_logDecisions_skipInconclusive", 
+						<@showCheckbox "developer_authorization_logDecisions_skipInconclusive",
 								"Skip inconclusive decisions" />
-						<@showCheckbox "developer_authorization_logDecisions_addIdentifiers", 
+						<@showCheckbox "developer_authorization_logDecisions_addIdentifiers",
 								"Include the user identifiers in the log record" />
 						<@showTextbox "developer_authorization_logDecisions_actionRestriction",
 								"Restrict by requested action" />
@@ -163,4 +163,4 @@
 			</div>
 		</div>
 	</div>
-</#if>	
\ No newline at end of file
+</#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/doctype.html b/webapp/src/main/webapp/templates/freemarker/page/partials/doctype.html
index 141b48874..54a77eca4 100644
--- a/webapp/src/main/webapp/templates/freemarker/page/partials/doctype.html
+++ b/webapp/src/main/webapp/templates/freemarker/page/partials/doctype.html
@@ -1,3 +1,3 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">  
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
\ No newline at end of file
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/headScripts.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/headScripts.ftl
index 2c571fba4..bc71431c8 100644
--- a/webapp/src/main/webapp/templates/freemarker/page/partials/headScripts.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/page/partials/headScripts.ftl
@@ -15,4 +15,4 @@ var i18nStrings = {
 <script type="text/javascript" src="${urls.base}/js/html5.js"></script>
 <![endif]-->
 
-${headScripts.list()} 
+${headScripts.list()}
diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/languageSelector.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/languageSelector.ftl
index 454872c86..80a0c633f 100644
--- a/webapp/src/main/webapp/templates/freemarker/page/partials/languageSelector.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/page/partials/languageSelector.ftl
@@ -1,16 +1,16 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#-- 
+<#--
   How can this done with images instead of buttons containing images?
   Why don't the "alt" values show as tooltips?"
   What was the right way to do this?
  -->
 
-<#-- This is included by identity.ftl  --> 
+<#-- This is included by identity.ftl  -->
 <#if selectLocale??>
-<li><ul class="language-dropdown">  <li id="language-menu"><a id="lang-link" href="#" title="user">${i18n().select_a_language}</a><ul class="sub_menu">   
+<li><ul class="language-dropdown">  <li id="language-menu"><a id="lang-link" href="#" title="user">${i18n().select_a_language}</a><ul class="sub_menu">
     <#list selectLocale.locales as locale>
-        
+
             <li <#if locale.selected>status="selected"</#if>>
                 	<a href="${selectLocale.selectLocaleUrl}?selection=${locale.code}" title="${i18n().select_locale} -- ${locale.label}"><img src="${locale.imageUrl}" title="${i18n().select_locale} -- ${locale.label}" height="15" style="vertical-align:middle" alt="${locale.label}"/></a>
             </li>
@@ -19,7 +19,7 @@
 </li></ul></li>
 </#if>
 
-<#-- 
+<#--
  * selectLocale
  * -- selectLocaleUrl
  * -- locales [list of maps]
diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/pageSetup.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/pageSetup.ftl
index 51676483e..aa1a35381 100644
--- a/webapp/src/main/webapp/templates/freemarker/page/partials/pageSetup.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/page/partials/pageSetup.ftl
@@ -6,14 +6,14 @@ the domain of the controllers. -->
 
 <#assign bodyClasses>
     <#-- The compress directives and formatting here resolve whitespace issues in output; please do not alter them. -->
-    <#-- Add the ?html builtin to currentServlet to guard against hacks. 
+    <#-- Add the ?html builtin to currentServlet to guard against hacks.
          Otherwise, the servletPath portion of the URL is rendered verbatim into the HTML -->
     <#compress>
     <#assign bodyClassList = [(currentServlet?html)!]>
-    
-    <#if user.loggedIn> 
+
+    <#if user.loggedIn>
         <#assign bodyClassList = bodyClassList + ["loggedIn"]/>
-    </#if> 
+    </#if>
     <#list bodyClassList as class>${class}<#if class_has_next> </#if></#list>
     </#compress>
-</#assign>
\ No newline at end of file
+</#assign>
diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/search.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/search.ftl
index dd74cf830..6dca21038 100644
--- a/webapp/src/main/webapp/templates/freemarker/page/partials/search.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/page/partials/search.ftl
@@ -1,7 +1,7 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <div id="searchBlock">
-    <form id="searchForm" action="${urls.search}" accept-charset="UTF-8" method="POST">                    
+    <form id="searchForm" action="${urls.search}" accept-charset="UTF-8" method="POST">
         <label for="search">${i18n().search_button}</label>
         <input type="text" name="querytext" id="search" class="search-form-item" value="${querytext!}" size="20" autocapitalize="off" />
         <input class="search-form-submit" name="submit" type="submit"  value="${i18n().search_button}" />
diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/stylesheets.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/stylesheets.ftl
index 566f523dc..5f91aac92 100644
--- a/webapp/src/main/webapp/templates/freemarker/page/partials/stylesheets.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/page/partials/stylesheets.ftl
@@ -8,4 +8,4 @@
 ${stylesheets.list()}
 
 <#--temporary until edit controller can include this when needed -->
-<link rel="stylesheet" href="${urls.base}/css/edit.css" />
\ No newline at end of file
+<link rel="stylesheet" href="${urls.base}/css/edit.css" />
diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/subMenuLinks.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/subMenuLinks.ftl
index a1a46c7f7..b9321c874 100644
--- a/webapp/src/main/webapp/templates/freemarker/page/partials/subMenuLinks.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/page/partials/subMenuLinks.ftl
@@ -5,6 +5,6 @@
 <li><a href="${urls.about}">About</a></li>
 <#if urls.contact??>
     <li><a href="${urls.contact}">Contact Us</a></li>
-</#if> 
+</#if>
 <li><a href="http://www.vivoweb.org/support" title="${i18n().support}">${i18n().support}</a></li>
-<li><a href="${urls.index}" title="${i18n().index}">${i18n().index}</a></li>
\ No newline at end of file
+<li><a href="${urls.index}" title="${i18n().index}">${i18n().index}</a></li>
diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/version.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/version.ftl
index accc500c7..8c1b3038b 100644
--- a/webapp/src/main/webapp/templates/freemarker/page/partials/version.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/page/partials/version.ftl
@@ -7,4 +7,4 @@
     <div id="revision">
         ${i18n().version} <a href="${version.moreInfoUrl}" title="${i18n().version}">${version.label}</a>
     </div>
-</#if>
\ No newline at end of file
+</#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/widgets/widget-SelectList.ftl b/webapp/src/main/webapp/templates/freemarker/widgets/widget-SelectList.ftl
index c7722ad6b..3c88b6fa7 100644
--- a/webapp/src/main/webapp/templates/freemarker/widgets/widget-SelectList.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/widgets/widget-SelectList.ftl
@@ -6,12 +6,12 @@
     <#--
     ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/something.css" />')}
     ${scripts.add('<script type="text/javascript" src="${urls.base}/js/somejavascript.js"></script>')}
-    --> 
+    -->
 </#macro>
 
-<#macro markup>                      
+<#macro markup>
           <#assign keys = selectList?keys>
           <#list keys as key>
-             <option value="${key}" >${selectList[key]}</option>           
-          </#list>    
+             <option value="${key}" >${selectList[key]}</option>
+          </#list>
 </#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/widgets/widget-browse.ftl b/webapp/src/main/webapp/templates/freemarker/widgets/widget-browse.ftl
index a8354a001..be81fd766 100644
--- a/webapp/src/main/webapp/templates/freemarker/widgets/widget-browse.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/widgets/widget-browse.ftl
@@ -3,17 +3,17 @@
 <#-- Browse widget -->
 
 <#macro assets>
-  <#-- 
-   Are there stylesheets or scripts needed? 
+  <#--
+   Are there stylesheets or scripts needed?
    ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browse.css" />')}
    ${scripts.add('<script type="text/javascript" src="${urls.base}/js/browse.js"></script>'}
-   -->        
+   -->
 </#macro>
 
 <#macro allClassGroups>
     <section id="browse" role="region">
         <h4>${i18n().browse_capitalized}</h4>
-        
+
         <ul id="browse-classgroups" role="list">
         <#list vclassGroupList as group>
             <#if (group.individualCount > 0)>
@@ -22,14 +22,14 @@
         </#list>
         </ul>
     </section>
-    
+
     <#-- <@classGroup /> -->
 </#macro>
 
 <#macro classGroup>
     <section id="browse" role="region">
         <h4>${i18n().browse_capitalized}</h4>
-        
+
          <section id="browse-classes" role="navigation">
              <nav>
                  <ul id="classes-in-classgroup" role="list">
@@ -46,12 +46,12 @@
 
 <#macro vclass>
     <section id="browse" role="region">
-    <h4>${i18n().browse_capitalized}</h4>    
+    <h4>${i18n().browse_capitalized}</h4>
         <div>
             vclass ${class.name} from ${classGroup.displayName}
             This has classGroup, classes, individualsInClass and class.
-        </div> 
-         
+        </div>
+
         <ul>
             <#list individualsInClass as ind>
                 <li><a href="${urls.base}/individual?uri=${ind.uri?url}" title="${i18n().individual_nam}">${ind.name}</a></li>
@@ -61,7 +61,7 @@
 
 <#macro vclassAlpha>
     <section id="browse" role="region">
-    <h4>${i18n().browse_capitalized}</h4>     
-        <div>${i18n().vclassAlpha_not_implemented}</div> 
+    <h4>${i18n().browse_capitalized}</h4>
+        <div>${i18n().vclassAlpha_not_implemented}</div>
     </section>
 </#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/widgets/widget-login.ftl b/webapp/src/main/webapp/templates/freemarker/widgets/widget-login.ftl
index f095ea5d9..10cd4dda0 100644
--- a/webapp/src/main/webapp/templates/freemarker/widgets/widget-login.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/widgets/widget-login.ftl
@@ -5,8 +5,8 @@
 <#macro assets>
     <#-- RY This test should be replaced by login widget controller logic which displays different assets macros depending
          on login status, but currently there's no widget-specific doAssets() method. See NIHVIVO-1357. The test doesn't work
-         because we don't have the user in the template data model when we generate the assets. This can also be fixed by 
-         NIHVIVO-1357.     
+         because we don't have the user in the template data model when we generate the assets. This can also be fixed by
+         NIHVIVO-1357.
     <#if ! user.loggedIn> -->
         ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/login.css" />')}
         <#-- ${scripts.add("")} -->
@@ -30,41 +30,41 @@
 
     <section id="login" class="hidden">
         <h2>${i18n().login_button}</h2>
-    
+
         <#if infoMessage??>
             <h3>${infoMessage}</h3>
         </#if>
-       
+
         <#if errorMessage??>
             <#assign infoClassShow = ' id="vivoAccountError"'/>
-        
+
             <section id="error-alert" role="alert"><img src="${urls.images}/iconAlert.png" alt="${i18n().error_alert_icon}" />
                 <p class="login-alert">${errorMessage}</p>
             </section>
         </#if>
-       
+
         <form role="form" id="login-form" action="${formAction}" method="post" name="login-form" />
             <#if externalAuthUrl??>
                 <#assign infoClassHide = 'class="vivoAccount"'/>
-            
+
                 <p class="external-auth"><a class="blue button" href="${externalAuthUrl}" title="${i18n().external_auth_name}">${i18n().external_login_text}</a></p>
                 <!--<p class="or-auth">or</p>-->
                 <h3 class="internal-auth"><!--Log in using your--> <b>${i18n().or}</b> ${siteName} ${i18n().account}</h3>
-                
+
             </#if>
-            
+
             <div ${infoClassHide} ${infoClassShow}>
-            
+
                 <label for="loginName">${i18n().email_capitalized}</label>
                 <input id="loginName" name="loginName" class="text-field focus" type="text" value="${loginName!}" autocapitalize="off" required autofocus />
 
                 <label for="loginPassword">${i18n().password_capitalized}</label>
                 <input id="loginPassword" name="loginPassword" class="text-field" type="password" required />
-          
+
                 <p class="submit"><input name="loginForm" class="green button" type="submit" value="${i18n().login_button}"/></p>
-          
+
                 <#-- NC: remember me won't be ready for r1.2
-                <input class="checkbox-remember-me" name="remember-me" type="checkbox" value="" />  
+                <input class="checkbox-remember-me" name="remember-me" type="checkbox" value="" />
                 <label class="label-remember-me" for="remember-me">Remember me</label> -->
                 <#-- mb863: forgot password and request an account won't be part of VIVO r1.2
                 <p class="forgot-password"><a href="#" title="forgot password">Forgot your password?</a></p>
@@ -74,27 +74,27 @@
         </form>
 
     </section><!-- #log-in -->
-</#macro> 
+</#macro>
 
 <#macro forcePasswordChange>
     <section id="login">
         <h2>${i18n().change_password_to_login}</h2>
-           
+
             <#if errorMessage??>
                 <div id="error-alert" role="alert"><img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}"/>
                     <p>${errorMessage}</p>
                 </div>
             </#if>
-           
+
             <form role="form" id="login-form" action="${formAction}" method="post" name="login-form" />
                 <label for="newPassword">${i18n().new_password_capitalized}</label>
                 <input id="newPassword" name="newPassword" class="text-field focus" type="password" required autofocus/>
-                
+
                 <p class="password-note">${i18n().minimum_password_length(minimumPasswordLength, maximumPasswordLength)}</p>
-                
+
                 <label for="confirmPassword">${i18n().confirm_password_capitalized}</label>
                 <input id="confirmPassword" name="confirmPassword" class="text-field" type="password" required />
-                
+
                  <p class="submit-password"><input name="passwordChangeForm" class="green button" type="submit" value="${i18n().login_button}"/> <span class="or">or <a class="cancel" href="${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a></span></p>
             </form>
     </section>
@@ -107,4 +107,4 @@
 
 <#macro error>
     <p>${i18n().we_have_an_error}</p>
-</#macro>
\ No newline at end of file
+</#macro>
diff --git a/webapp/src/main/webapp/templates/freemarker/widgets/widget-test.ftl b/webapp/src/main/webapp/templates/freemarker/widgets/widget-test.ftl
index bb58d7a5c..7605f70d8 100644
--- a/webapp/src/main/webapp/templates/freemarker/widgets/widget-test.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/widgets/widget-test.ftl
@@ -10,14 +10,14 @@
 
 <#macro loggedIn>
     <div class="testWidget">
-        <h4>${i18n().test_for_logged_in_users}</h4>    
+        <h4>${i18n().test_for_logged_in_users}</h4>
         <p>${i18n().login_status} ${status}.</p>
     </div>
 </#macro>
 
 <#macro notLoggedIn>
     <div class="testWidget">
-        <h4>${i18n().test_for_nonlogged_in_users}</h4>    
+        <h4>${i18n().test_for_nonlogged_in_users}</h4>
         <p>${i18n().login_status} ${status}.</p>
     </div>
-</#macro>
\ No newline at end of file
+</#macro>
diff --git a/webapp/src/main/webapp/templates/page/basicPage.jsp b/webapp/src/main/webapp/templates/page/basicPage.jsp
index 874e6f978..4b10b7a42 100644
--- a/webapp/src/main/webapp/templates/page/basicPage.jsp
+++ b/webapp/src/main/webapp/templates/page/basicPage.jsp
@@ -13,17 +13,17 @@
          The html <HEAD> is generated followed by the banners and menu.
          After that the result of the jsp in the attribute bodyJsp is inserted.
          Finally comes the footer.
-         
-         request.attributes:                    
+
+         request.attributes:
             "bodyJsp" - jsp of the body of this page.
             "title" - title of page
             "css" - optional additional css for page
             "scripts" - optional name of file containing <script> elements to be included in the page
             "bodyAttr" - optional attributes for the <body> tag, e.g. 'onload': use leading space
-            
+
           Consider sticking < % = MiscWebUtils.getReqInfo(request) % > in the html output
           for debugging info.
-                 
+
          bdc34 2006-02-03 created
         **********************************************/
         /*
@@ -52,18 +52,18 @@
 <html lang="en">
     <head>
         ${ftl_head}
-        
+
         <c:if test="${!empty scripts}"><jsp:include page="${scripts}"/></c:if>
     </head>
-    
+
     <body ${requestScope.bodyAttr}>
             ${ftl_identity}
             ${ftl_search}
             ${ftl_menu}
-            
+
                 <c:import url="${bodyJsp}"/>
-            
+
             ${ftl_footer}
 
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/webapp/src/main/webapp/templates/page/blankPage.jsp b/webapp/src/main/webapp/templates/page/blankPage.jsp
index 9e3b83ca9..902318bff 100644
--- a/webapp/src/main/webapp/templates/page/blankPage.jsp
+++ b/webapp/src/main/webapp/templates/page/blankPage.jsp
@@ -7,30 +7,30 @@
          The html <HEAD> is generated followed by the banners and menu.
          After that the result of the jsp in the attribute bodyJsp is inserted.
          Finally comes the footer.
-         
-         request.attributes:                    
+
+         request.attributes:
             "bodyJsp" - jsp of the body of this page.
             "title" - title of page
             "css" - optional additional css for page
             "scripts" - optional name of file containing <script> elements to be included in the page
             "bodyAttr" - optional attributes for the <body> tag, e.g. 'onload': use leading space
-                     
+
           Consider sticking < % = MiscWebUtils.getReqInfo(request) % > in the html output
           for debugging info.
-                 
-         bdc34 2006-02-03 created        
+
+         bdc34 2006-02-03 created
         **********************************************/
         /*
         String e = "";
         if (request.getAttribute("bodyJsp") == null){
-            e+="basicPage.jsp expects that request parameter 'bodyJsp' be set to the jsp to display as the page body.\n";           
-        }         
+            e+="basicPage.jsp expects that request parameter 'bodyJsp' be set to the jsp to display as the page body.\n";
+        }
         if (request.getAttribute("title") == null){
-            e+="basicPage.jsp expects that request parameter 'title' be set to the title to use for page.\n";           
-        }         
+            e+="basicPage.jsp expects that request parameter 'title' be set to the title to use for page.\n";
+        }
         if (request.getAttribute("css") == null){
-            e+="basicPage.jsp expects that request parameter 'css' be set to css to include in page.\n";            
-        }         
+            e+="basicPage.jsp expects that request parameter 'css' be set to css to include in page.\n";
+        }
         if( e.length() > 0 ){
             throw new JspException(e);
         }
diff --git a/webapp/src/main/webapp/templates/page/bodyMsg.jsp b/webapp/src/main/webapp/templates/page/bodyMsg.jsp
index 5e5a4ce65..db88240a2 100644
--- a/webapp/src/main/webapp/templates/page/bodyMsg.jsp
+++ b/webapp/src/main/webapp/templates/page/bodyMsg.jsp
@@ -3,20 +3,20 @@
 <%  /***********************************************
      A JSP for displaying a simple message.
      This JSP is intened to be wraped by basicPage.jsp
-         
+
      request.attributes:
          "msg" the message to display on the page.
-                     
-     bdc34 2009-02-03 created        
+
+     bdc34 2009-02-03 created
      **********************************************/
-          
+
      if (request.getAttribute("msg") == null ){
          throw new JspException(
                  "bodyMsg.jsp expects that request parameter 'msg' be set to"
                  + " the message for the page.\n"
           );
      }
-   // only get the msg from the attributes, because of cross site exploits, 
+   // only get the msg from the attributes, because of cross site exploits,
    // never from the parameters.
    out.print( (String)request.getAttribute("msg") );
-%>        
+%>
diff --git a/webapp/src/main/webapp/templates/page/debug.jsp b/webapp/src/main/webapp/templates/page/debug.jsp
index 189bbd731..1d6835231 100644
--- a/webapp/src/main/webapp/templates/page/debug.jsp
+++ b/webapp/src/main/webapp/templates/page/debug.jsp
@@ -3,12 +3,12 @@
 <%@ page import="edu.cornell.mannlib.vitro.webapp.web.MiscWebUtils" %>
 <%	/***********************************************
 		 debug.jsp will just display the request info in a div.
-		 
+
 		 It is uesful to use at the body jsp for a new controller before
 		 you have writen the jsp that you intend to use.
-		  		 
+
 		 bdc34 2006-02-06
-        **********************************************/		                      
+        **********************************************/
 %>
 <div class='debug'>
     <%= MiscWebUtils.getReqInfo(request) %>
diff --git a/webapp/src/main/webapp/templates/page/doctype.jsp b/webapp/src/main/webapp/templates/page/doctype.jsp
index ca6936ba9..0df266df4 100644
--- a/webapp/src/main/webapp/templates/page/doctype.jsp
+++ b/webapp/src/main/webapp/templates/page/doctype.jsp
@@ -1,5 +1,5 @@
 <%-- $This file is distributed under the terms of the license in LICENSE$ --%>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">  
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
\ No newline at end of file
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
diff --git a/webapp/src/main/webapp/templates/page/freemarkerTransition/footer.jsp b/webapp/src/main/webapp/templates/page/freemarkerTransition/footer.jsp
index 42d900f0e..b42e1e792 100644
--- a/webapp/src/main/webapp/templates/page/freemarkerTransition/footer.jsp
+++ b/webapp/src/main/webapp/templates/page/freemarkerTransition/footer.jsp
@@ -3,13 +3,13 @@
 <%-- DO NOT MODIFY THIS FILE. IT IS NOT USED IN THEME CUSTOMIZATION. --%>
 
 <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %>
-<% 
+<%
     // This is here as a safety net. We should have gotten the values in identity.jsp,
     // since it's the first jsp we hit.
     String footer = (String) request.getAttribute("ftl_footer");
     if (footer == null) {
         FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
-    } 
+    }
 %>
 
 ${ftl_footer}
diff --git a/webapp/src/main/webapp/templates/page/freemarkerTransition/identity.jsp b/webapp/src/main/webapp/templates/page/freemarkerTransition/identity.jsp
index cfae9fbf4..2f772e8a2 100644
--- a/webapp/src/main/webapp/templates/page/freemarkerTransition/identity.jsp
+++ b/webapp/src/main/webapp/templates/page/freemarkerTransition/identity.jsp
@@ -3,7 +3,7 @@
 <%-- DO NOT MODIFY THIS FILE. IT IS NOT USED IN THEME CUSTOMIZATION. --%>
 
 <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %>
-<% 
+<%
 FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
 %>
 
diff --git a/webapp/src/main/webapp/templates/page/freemarkerTransition/menu.jsp b/webapp/src/main/webapp/templates/page/freemarkerTransition/menu.jsp
index 5e4dd2606..db4829370 100644
--- a/webapp/src/main/webapp/templates/page/freemarkerTransition/menu.jsp
+++ b/webapp/src/main/webapp/templates/page/freemarkerTransition/menu.jsp
@@ -3,13 +3,13 @@
 <%-- DO NOT MODIFY THIS FILE. IT IS NOT USED IN THEME CUSTOMIZATION. --%>
 
 <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet" %>
-<% 
+<%
     // This is here as a safety net. We should have gotten the values in identity.jsp,
     // since it's the first jsp we hit.
     String menu = (String) request.getAttribute("ftl_menu");
     if (menu == null) {
         FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
-    } 
+    }
 %>
 
 ${ftl_menu}
diff --git a/webapp/src/main/webapp/templates/page/headContent.jsp b/webapp/src/main/webapp/templates/page/headContent.jsp
index fad0a9377..e53ba32db 100644
--- a/webapp/src/main/webapp/templates/page/headContent.jsp
+++ b/webapp/src/main/webapp/templates/page/headContent.jsp
@@ -7,14 +7,14 @@
 <%@ page import="edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean"%>
 <%@ page import="org.apache.commons.logging.Log" %>
 <%@ page import="org.apache.commons.logging.LogFactory" %>
-<%! 
+<%!
   public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.templates.page.headContent.jsp");
 %>
 <%
-  VitroRequest vreq = new VitroRequest(request); 
+  VitroRequest vreq = new VitroRequest(request);
 
   String themeDir = vreq.getAppBean().getThemeDir();
-  themeDir = vreq.getContextPath() + '/' + themeDir;   
+  themeDir = vreq.getContextPath() + '/' + themeDir;
 %>
 
 <!-- headContent.jsp -->
@@ -30,4 +30,4 @@
 <c:if test="${!empty scripts}"><jsp:include page="${scripts}"/></c:if>
 
 <!-- end headContent.jsp -->
-     
\ No newline at end of file
+
diff --git a/webapp/src/main/webapp/templates/parts/emailUsers.jsp b/webapp/src/main/webapp/templates/parts/emailUsers.jsp
index 820e541ed..4a1a7d075 100644
--- a/webapp/src/main/webapp/templates/parts/emailUsers.jsp
+++ b/webapp/src/main/webapp/templates/parts/emailUsers.jsp
@@ -18,13 +18,13 @@
 		<input type="hidden" name="EmailFields" value="webuseremail"/>
 		<input type="hidden" name="EmailFieldsNames" value="emailaddress"/>
 		<input type="hidden" name="DeliveryType" value="comment"/>
-		
+
 		<p class="normal">My email address is (e.g., userid<b>@institution.edu</b>):</p>
 		<input style="width:25%;" type="text" name="webuseremail" maxlength="255"/><br/><br/>
 		<p class="normal">My full name is:</p>
 		<input style="width:33%;" type="text" name="webusername" maxlength="255"/><br/><br/>
 
-		
+
 		<h3>Enter your message below. This message will be emailed to all email addresses associated with user accounts. </h3>
 
 		<textarea name="s34gfd88p9x1" rows="10" cols="90"></textarea>
diff --git a/webapp/src/main/webapp/themes/vitro/css/reset.css b/webapp/src/main/webapp/themes/vitro/css/reset.css
index 7a1b4d25c..e927a4639 100644
--- a/webapp/src/main/webapp/themes/vitro/css/reset.css
+++ b/webapp/src/main/webapp/themes/vitro/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,15 +79,15 @@ q:after {
     content: none;
 }
 /* remember to define focus styles! */
-:focus {    
-    outline: 0; 
+:focus {
+    outline: 0;
 }
 /* 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 {
@@ -95,12 +95,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; 
-}
\ No newline at end of file
diff --git a/webapp/src/main/webapp/themes/vitro/css/screen.css b/webapp/src/main/webapp/themes/vitro/css/screen.css
index 63af944c0..96cfc0ed8 100644
--- a/webapp/src/main/webapp/themes/vitro/css/screen.css
+++ b/webapp/src/main/webapp/themes/vitro/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
- 
+
 *****************************************
 *****************************************/
 
@@ -24,4 +24,4 @@ VIVO wilma theme: screen styles
 
 @import url("reset.css");
 @import url("vitroTheme.css");
-@import url("../../../local/css/local.css");
\ No newline at end of file
+@import url("../../../local/css/local.css");
diff --git a/webapp/src/main/webapp/themes/vitro/css/vitroTheme.css b/webapp/src/main/webapp/themes/vitro/css/vitroTheme.css
index a04606c4b..91bb45aa5 100644
--- a/webapp/src/main/webapp/themes/vitro/css/vitroTheme.css
+++ b/webapp/src/main/webapp/themes/vitro/css/vitroTheme.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: #fff url(../images/header-background.gif) center 0 repeat-x; 
+   background: #fff url(../images/header-background.gif) center 0 repeat-x;
 }
 a {
     color: #47B6D0;
@@ -54,9 +54,9 @@ h2 {
 h2 a {
     color: #006279;
 }
-h2 a:link, 
+h2 a:link,
 h2 a:visited {
-    text-decoration: underline; 
+    text-decoration: underline;
 }
 h3 {
     padding: 10px 0 12px 0;
@@ -79,7 +79,7 @@ h5 {
 /* ------------------------------------------------->  */
 /* EDITING STYLES ---------------------------------->  */
 /* ------------------------------------------------->  */
-input[type="text"], 
+input[type="text"],
 input[type="password"] {
     border: 0;
     font-size: 14px;
@@ -101,12 +101,12 @@ label {
 .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 {
@@ -116,7 +116,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;
@@ -130,7 +130,7 @@ input.form-button:visited {
     margin-right: .6em;
     margin-top: .5em;
     margin-bottom: .5em;
-    
+
 }
 #verbose-mode .small {
     font-size: 12px;
@@ -151,7 +151,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;
@@ -190,8 +190,8 @@ input.form-button: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;
     font-style: normal;
@@ -203,7 +203,7 @@ form textarea {
 #authorships a.remove:link,
 #webpageList a.remove:link,
 #showAddForm a.cancel:link,
-form a:link.cancel, 
+form a:link.cancel,
 form a:visited.cancel {
     text-decoration: underline;
     color: #f70;
@@ -216,7 +216,7 @@ form a:visited.cancel {
 #webpageList 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;
@@ -356,11 +356,11 @@ 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,
 ul#alpha-browse-individuals a,
 ul#browse-classes a,
@@ -369,7 +369,7 @@ ul#vgraph-classes a {
     text-decoration: none;
     color: #5E6363;
 }
-a.ingestMenu:hover, 
+a.ingestMenu:hover,
 a.ingestMenu:active {
     text-decoration: none;
     color: #47B6D0;
@@ -400,7 +400,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 {
@@ -409,7 +409,7 @@ hr.formDivider {
     height: 1px;
     margin-bottom: 20px;
     margin-top: 15px;
-    opacity: 0.3;   
+    opacity: 0.3;
 }
 .editingForm table {
     width: 100%;
@@ -580,7 +580,7 @@ p.forgot-password a,
 h3.internal-auth:hover {
     color: #47B6D0
 }
-/* LOG IN------>  */          
+/* LOG IN------>  */
 #login {
     float: right;
     width: 314px;
@@ -639,11 +639,11 @@ body.login #login {
     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(0, 168, 196, .1);   
+    border: 1px solid rgba(57, 138, 172, .5);
+    background-color: rgba(0, 168, 196, .1);
 }
 #login-form p.submit {
     width: 100px;
@@ -695,12 +695,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 {
@@ -717,7 +717,7 @@ p.password-note {
     height:34px;
 }
 
-/* SEARCH HOME------>  */ 
+/* SEARCH HOME------>  */
 
 #search-home-field {
 		background: url(../images/search-field-and-button.gif) 0 0 no-repeat;
@@ -759,7 +759,7 @@ p.request-account a,
 ul#header-nav a,
 ul#browse-classgroups a.selected span.count-classes,
 ul#browse-classgroups a:hover span.count-classes {
-   color: #fff; 
+   color: #fff;
 }
 #filter-search-nav a {
 		border-bottom: 1px dotted #4f5656;
@@ -786,7 +786,7 @@ ul#browse-classgroups {
 ul#browse-classgroups li {
     border-bottom: 1px solid #bbbbb9;
 }
-ul#browse-classgroups a:hover, 
+ul#browse-classgroups a:hover,
 ul#browse-classgroups a.selected,
 ul#classes-in-classgroup a:hover {
     background-image: none;
@@ -923,7 +923,7 @@ p {
 .button:visited {
     font-size: 16px;
     font-weight: normal;
-    line-height: 1; 
+    line-height: 1;
 }
 .green.button,
 .green.button:visited {
@@ -954,15 +954,15 @@ p {
 .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: #47B6D0;
 }
 
@@ -1051,7 +1051,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 {
@@ -1086,8 +1086,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 a:hover {
@@ -1107,7 +1107,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;
 }
 ul#alpha-browse-individuals,
@@ -1195,8 +1195,8 @@ article.property ul.property-list {
     padding-top: .2em;
 }
 #individual-intro h1 {
-    font-size: 1.375em; 
-    color: #47B6D0; 
+    font-size: 1.375em;
+    color: #47B6D0;
 }
 #individual-intro span.display-title,
 h1.fn .display-title {
@@ -1232,11 +1232,11 @@ ul#individual-tools {
 ul.individual-urls {
     list-style: url(../images/bullet.gif);
 }
-ul#individual-email, 
+ul#individual-email,
 ul#individual-phone {
     list-style-type: none;
 }
-ul#individual-email li, 
+ul#individual-email li,
 ul#individual-phone li {
     line-height: 1.6em;
 }
@@ -1255,7 +1255,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;
@@ -1472,4 +1472,4 @@ form.customForm .requiredHint {
 form.customForm #requiredLegend {
     font-style: italic;
     margin-top: .5em;
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/webapp/themes/vitro/templates/flash.ftl b/webapp/src/main/webapp/themes/vitro/templates/flash.ftl
index fc92131d6..30ef0aa89 100644
--- a/webapp/src/main/webapp/themes/vitro/templates/flash.ftl
+++ b/webapp/src/main/webapp/themes/vitro/templates/flash.ftl
@@ -16,4 +16,4 @@
 <noscript>
     <p class="ie-alert">${i18n().javascript_ie_alert_text} Here are the <a href="http://www.enable-javascript.com" title="javascript instructions">${i18n().to_enable_javascript}</a>.</p>
 </noscript>
-<![endif]-->
\ No newline at end of file
+<![endif]-->
diff --git a/webapp/src/main/webapp/themes/vitro/templates/identity.ftl b/webapp/src/main/webapp/themes/vitro/templates/identity.ftl
index ac8d3abc4..06c02f470 100644
--- a/webapp/src/main/webapp/themes/vitro/templates/identity.ftl
+++ b/webapp/src/main/webapp/themes/vitro/templates/identity.ftl
@@ -34,4 +34,4 @@
         </#if>
     </ul>
 
-</nav>
\ No newline at end of file
+</nav>
diff --git a/webapp/src/main/webapp/themes/vitro/templates/page-home.ftl b/webapp/src/main/webapp/themes/vitro/templates/page-home.ftl
index 357bfabd0..086218a15 100644
--- a/webapp/src/main/webapp/themes/vitro/templates/page-home.ftl
+++ b/webapp/src/main/webapp/themes/vitro/templates/page-home.ftl
@@ -8,7 +8,7 @@
     <head>
         <#include "head.ftl">
     </head>
-    
+
     <body class="${bodyClasses!}">
         <header id="branding" role="banner">
             <#include "identity.ftl">
@@ -58,15 +58,15 @@
             <!-- Statistical information relating to property groups and their classes; displayed horizontally, not vertically-->
             <@lh.allClassGroups vClassGroups! />
         </div>
-        
+
         <#include "footer.ftl">
         <script>
             // this will ensure that the hidden classgroup input is cleared if the back button is used
             // to return to the home page from the search results. Not in vitroUtils.js because that
             // gets loaded on every page.
             $(document).ready(function(){
-                $('input[name="classgroup"]').val("");    
+                $('input[name="classgroup"]').val("");
             });
         </script>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/webapp/src/main/webapp/themes/vitro/templates/page.ftl b/webapp/src/main/webapp/themes/vitro/templates/page.ftl
index 01090ddd3..223a7fc87 100644
--- a/webapp/src/main/webapp/themes/vitro/templates/page.ftl
+++ b/webapp/src/main/webapp/themes/vitro/templates/page.ftl
@@ -7,7 +7,7 @@
     <head>
         <#include "head.ftl">
     </head>
-    
+
     <body class="${bodyClasses!}">
         <header id="branding" role="banner">
             <#include "identity.ftl">
@@ -20,4 +20,4 @@
         </div>
         <#include "footer.ftl">
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/webapp/src/main/webapp/themes/vitro/templates/search.ftl b/webapp/src/main/webapp/themes/vitro/templates/search.ftl
index 744a9d15b..0ad97790b 100644
--- a/webapp/src/main/webapp/themes/vitro/templates/search.ftl
+++ b/webapp/src/main/webapp/themes/vitro/templates/search.ftl
@@ -1,14 +1,14 @@
  <#-- $This file is distributed under the terms of the license in LICENSE$ -->
- 
+
 <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"> 
+        <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-vitro" value="${querytext!}" autocapitalize="off" />
                 <input type="submit" value="${i18n().search_button}" class="search">
             </div>
         </form>
     </fieldset>
-</section>
\ No newline at end of file
+</section>
diff --git a/webapp/src/main/webapp/xslt/xml2rdf.xsl b/webapp/src/main/webapp/xslt/xml2rdf.xsl
index 709f05655..858d1eb90 100644
--- a/webapp/src/main/webapp/xslt/xml2rdf.xsl
+++ b/webapp/src/main/webapp/xslt/xml2rdf.xsl
@@ -1,82 +1,82 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $This file is distributed under the terms of the license in LICENSE$ -->
-<xsl:stylesheet 
+<xsl:stylesheet
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"    
-    xmlns:vitro="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#"    
-    version="2.0">    
-<xsl:output method="xml" indent="yes"/>    
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:vitro="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#"
+    version="2.0">
+<xsl:output method="xml" indent="yes"/>
     <!--
         XSLT to produce RDF/XML from XML.  This template does not handle
         narrative content.
-        
+
         This uses XSLT 2.0 and XPath 2.0 so use Saxon.
         Here is an example of how to do use XSLT 2.0 in ant:
-        
-        <xslt style="${ingest.dir}/xsl/activityInsight2n3Rdf.xsl" 
+
+        <xslt style="${ingest.dir}/xsl/activityInsight2n3Rdf.xsl"
             in ="${ingest.dir}/ai_xml/document1.xml"
-            out="${ingest.dir}/ai_xml/document1.n3"      
-            <classpath location="${ingest.dir}/lib/saxon8.jar" /> 
-        
+            out="${ingest.dir}/ai_xml/document1.n3"
+            <classpath location="${ingest.dir}/lib/saxon8.jar" />
+
         Here is an example of how to run saxon from the command line:
         java -Xmx512m -jar /home/bdc34/bin/saxon9he.jar \
         -s:filteredbjltest1.xml  -xsl:xsl/activityInsight2n3Rdf.xsl  -o:filteredbjltest2.rdf
-        
+
         2009 Mann Library, Brian Caruso.
     -->
-    
+
     <!-- This XSL will attempt to use URIs from namespaces that are found
         in the XML document.  If an Element lacks a namespace then this NS is used. -->
     <xsl:variable name="defaultNS">http://ingest.mannlib.cornell.edu/generalizedXMLtoRDF/0.1/</xsl:variable>
-    
-    <!-- This is a regular expression used to test then QNames of nodes.  Any node 
-         with a QName that matches this regex will have position dataproperties on each of 
+
+    <!-- This is a regular expression used to test then QNames of nodes.  Any node
+         with a QName that matches this regex will have position dataproperties on each of
          their children nodes -->
-    <xsl:param name="positionParentRegex" select="''"/>    
-    
+    <xsl:param name="positionParentRegex" select="''"/>
+
     <xsl:template match="/">
-      <rdf:RDF>                               
+      <rdf:RDF>
         <xsl:apply-templates mode="rdfDescription" select="*"/>
       </rdf:RDF>
     </xsl:template>
-    
+
     <!-- create description elements -->
-    <xsl:template mode="rdfDescription" match="*">        
-      <rdf:Description>                             
+    <xsl:template mode="rdfDescription" match="*">
+      <rdf:Description>
         <xsl:element name="rdf:type">
-          <xsl:attribute name="rdf:resource" 
+          <xsl:attribute name="rdf:resource"
                          select="concat((if(namespace-uri())then namespace-uri() else $defaultNS),local-name())"/>
         </xsl:element>
         <xsl:apply-templates select="*"/>
       </rdf:Description>
-    </xsl:template>   
-    
+    </xsl:template>
+
     <!-- Recursive tempate to turn Elements with Attributes and/or Text into bnodes -->
     <xsl:template match="*">
-        <xsl:element 
-            name="{ local-name() }" 
+        <xsl:element
+            name="{ local-name() }"
             namespace="{ (if(namespace-uri() and string-length(namespace-uri())>0 )then namespace-uri() else $defaultNS) }" >
             <rdf:Description>
             <xsl:apply-templates select="*|@*"/>
-                
+
             <xsl:if test="not(*) and string-length(text())>0">
                     <vitro:value><xsl:copy-of select="text()"/></vitro:value>
             </xsl:if>
-                                                            
-            <xsl:if test="matches(../name(),$positionParentRegex) or 
-                          matches(concat(../namespace-uri(),../local-name()),$positionParentRegex)">                            
+
+            <xsl:if test="matches(../name(),$positionParentRegex) or
+                          matches(concat(../namespace-uri(),../local-name()),$positionParentRegex)">
                 <vitro:position><xsl:value-of select="position()"/></vitro:position>
             </xsl:if>
 
             </rdf:Description>
         </xsl:element>
     </xsl:template>
-    
+
     <!-- Match all leaf Elements that have Attributes and/or Text and turn them into bnodes -->
     <xsl:template  match="*[not(*) and @* and string-length(text())>0]">
         <xsl:element
-            name="{ local-name() }" 
-            namespace="{ (if(namespace-uri() and string-length(namespace-uri())>0 )then namespace-uri() else $defaultNS) }" >                                                   
+            name="{ local-name() }"
+            namespace="{ (if(namespace-uri() and string-length(namespace-uri())>0 )then namespace-uri() else $defaultNS) }" >
             <rdf:Description>
                 <xsl:apply-templates  select="@*"/>
                 <vitro:value>
@@ -85,23 +85,23 @@
             </rdf:Description>
         </xsl:element>
     </xsl:template>
-    
+
     <!-- Match all attributes and turn them into data properties. -->
-    <xsl:template match="@*">       
-        <xsl:element 
-            name="{ local-name() }" 
-            namespace="{ (if(namespace-uri() and string-length(namespace-uri())>0 )then namespace-uri() else $defaultNS) }" >                                   
+    <xsl:template match="@*">
+        <xsl:element
+            name="{ local-name() }"
+            namespace="{ (if(namespace-uri() and string-length(namespace-uri())>0 )then namespace-uri() else $defaultNS) }" >
             <xsl:value-of select="."/>
         </xsl:element>
     </xsl:template>
-   
+
    <!-- Match all Elements with only a text node and turn them into data properties. -->
-    <xsl:template match="*[not(*) and not(@*) and string-length(text())>0]">       
-        <xsl:element 
-            name="{ local-name() }" 
-            namespace="{ (if(namespace-uri() and string-length(namespace-uri())>0 )then namespace-uri() else $defaultNS) }" >             
+    <xsl:template match="*[not(*) and not(@*) and string-length(text())>0]">
+        <xsl:element
+            name="{ local-name() }"
+            namespace="{ (if(namespace-uri() and string-length(namespace-uri())>0 )then namespace-uri() else $defaultNS) }" >
             <xsl:value-of select="."/>
         </xsl:element>
     </xsl:template>
-    
+
 </xsl:stylesheet>